Index: branches/2019Q3/www/chromium/Makefile =================================================================== --- branches/2019Q3/www/chromium/Makefile (revision 508998) +++ branches/2019Q3/www/chromium/Makefile (revision 508999) @@ -1,343 +1,343 @@ # Created by: Florent Thoumie # $FreeBSD$ PORTNAME= chromium -PORTVERSION= 75.0.3770.142 -PORTREVISION= 2 +PORTVERSION= 76.0.3809.100 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 \ 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 + # ANGLE, EGL, Vk +.for f in libEGL.so libGLESv2.so libVkICD_mock_icd.so libVkLayer_core_validation.so libVkLayer_object_lifetimes.so \ + libVkLayer_stateless_validation.so libVkLayer_thread_safety.so libVkLayer_unique_objects.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: branches/2019Q3/www/chromium/distinfo =================================================================== --- branches/2019Q3/www/chromium/distinfo (revision 508998) +++ branches/2019Q3/www/chromium/distinfo (revision 508999) @@ -1,7 +1,7 @@ -TIMESTAMP = 1563322422 -SHA256 (chromium-75.0.3770.142.tar.xz) = 510e6ca7ccc218b401b375c13656f6aecab196b03142026dc3602b9d1804a5ac -SIZE (chromium-75.0.3770.142.tar.xz) = 709968204 -SHA256 (chromium-75.0.3770.142-testdata.tar.xz) = 4a5736d686d4081c2e550089691670d81959a5e7d8f9c02ad973e797390da476 -SIZE (chromium-75.0.3770.142-testdata.tar.xz) = 352138048 +TIMESTAMP = 1565536681 +SHA256 (chromium-76.0.3809.100.tar.xz) = 8cd93ada3e0837ced512f69783400991d3b82e0d9622e04fab5922877577d26d +SIZE (chromium-76.0.3809.100.tar.xz) = 728852892 +SHA256 (chromium-76.0.3809.100-testdata.tar.xz) = 95eed86c25e75b9b8cb611a3a63debb0d9243e2e314ffe121890a80c5446954f +SIZE (chromium-76.0.3809.100-testdata.tar.xz) = 262859232 SHA256 (test_fonts.tar.xz) = cf9cbe3b7f1c4c42d426bddc65ec178d333ad7e205a36fe0a606a3c0c545ece1 SIZE (test_fonts.tar.xz) = 200040 Index: branches/2019Q3/www/chromium/files/patch-device_usb_usb__error.cc =================================================================== --- branches/2019Q3/www/chromium/files/patch-device_usb_usb__error.cc (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-device_usb_usb__error.cc (nonexistent) @@ -1,11 +0,0 @@ ---- device/usb/usb_error.cc.orig 2019-03-11 22:00:58 UTC -+++ device/usb/usb_error.cc -@@ -9,7 +9,7 @@ - namespace device { - - std::string ConvertPlatformUsbErrorToString(int errcode) { -- return libusb_strerror(static_cast(errcode)); -+ return ""; - } - - } // namespace device Property changes on: branches/2019Q3/www/chromium/files/patch-device_usb_usb__error.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: branches/2019Q3/www/chromium/files/patch-device_usb_usb__service__impl.h =================================================================== --- branches/2019Q3/www/chromium/files/patch-device_usb_usb__service__impl.h (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-device_usb_usb__service__impl.h (nonexistent) @@ -1,26 +0,0 @@ ---- device/usb/usb_service_impl.h.orig 2019-03-11 22:00:58 UTC -+++ device/usb/usb_service_impl.h -@@ -73,11 +73,13 @@ class UsbServiceImpl : - scoped_refptr device); - void RemoveDevice(scoped_refptr device); - -+#if !defined(OS_FREEBSD) - // Handle hotplug events from libusb. - static int LIBUSB_CALL HotplugCallback(libusb_context* context, - libusb_device* device, - libusb_hotplug_event event, - void* user_data); -+#endif - // These functions release a reference to the provided platform device. - void OnPlatformDeviceAdded(ScopedLibusbDeviceRef platform_device); - void OnPlatformDeviceRemoved(ScopedLibusbDeviceRef platform_device); -@@ -97,7 +99,9 @@ class UsbServiceImpl : - // connected instead of only when a full enumeration is requested. - // TODO(reillyg): Support this on all platforms. crbug.com/411715 - bool hotplug_enabled_ = false; -+#if !defined(OS_FREEBSD) - libusb_hotplug_callback_handle hotplug_handle_; -+#endif - - // Enumeration callbacks are queued until an enumeration completes. - bool enumeration_ready_ = false; Property changes on: branches/2019Q3/www/chromium/files/patch-device_usb_usb__service__impl.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: branches/2019Q3/www/chromium/files/patch-services_network_public_cpp_features.cc =================================================================== --- branches/2019Q3/www/chromium/files/patch-services_network_public_cpp_features.cc (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-services_network_public_cpp_features.cc (nonexistent) @@ -1,11 +0,0 @@ ---- services/network/public/cpp/features.cc.orig 2019-04-30 22:22:56 UTC -+++ services/network/public/cpp/features.cc -@@ -20,7 +20,7 @@ const base::Feature kNetworkErrorLogging{"NetworkError - const base::Feature kNetworkService { - "NetworkService", - #if defined(OS_WIN) || defined(OS_MACOSX) || \ -- (defined(OS_LINUX) && !defined(IS_CHROMECAST)) -+ (defined(OS_LINUX) && !defined(IS_CHROMECAST)) || defined(OS_BSD) - base::FEATURE_ENABLED_BY_DEFAULT - }; - #else Property changes on: branches/2019Q3/www/chromium/files/patch-services_network_public_cpp_features.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: branches/2019Q3/www/chromium/files/patch-v8_src_api.cc =================================================================== --- branches/2019Q3/www/chromium/files/patch-v8_src_api.cc (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-v8_src_api.cc (nonexistent) @@ -1,20 +0,0 @@ ---- v8/src/api.cc.orig 2019-06-04 18:58:07 UTC -+++ v8/src/api.cc -@@ -109,7 +109,7 @@ - #include "src/wasm/wasm-result.h" - #include "src/wasm/wasm-serialization.h" - --#if V8_OS_LINUX || V8_OS_MACOSX -+#if V8_OS_LINUX || V8_OS_MACOSX || V8_OS_OPENBSD || V8_OS_FREEBSD - #include - #include "include/v8-wasm-trap-handler-posix.h" - #include "src/trap-handler/handler-inside-posix.h" -@@ -5762,7 +5762,7 @@ bool v8::V8::Initialize() { - return true; - } - --#if V8_OS_LINUX || V8_OS_MACOSX -+#if V8_OS_LINUX || V8_OS_MACOSX || V8_OS_OPENBSD || V8_OS_FREEBSD - bool TryHandleWebAssemblyTrapPosix(int sig_code, siginfo_t* info, - void* context) { - #if V8_TARGET_ARCH_X64 && !V8_OS_ANDROID Property changes on: branches/2019Q3/www/chromium/files/patch-v8_src_api.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: branches/2019Q3/www/chromium/files/patch-third__party_angle_src_common_system__utils__posix.cpp =================================================================== --- branches/2019Q3/www/chromium/files/patch-third__party_angle_src_common_system__utils__posix.cpp (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-third__party_angle_src_common_system__utils__posix.cpp (nonexistent) @@ -1,11 +0,0 @@ ---- third_party/angle/src/common/system_utils_posix.cpp.orig 2019-04-30 22:25:51 UTC -+++ third_party/angle/src/common/system_utils_posix.cpp -@@ -17,7 +17,7 @@ - - // On mac, environ is not declared anywhere: - // https://stackoverflow.com/a/31347357/912144 --#if defined(ANGLE_PLATFORM_APPLE) -+#if defined(ANGLE_PLATFORM_APPLE) || defined(__FreeBSD__) - extern char **environ; - #endif - Property changes on: branches/2019Q3/www/chromium/files/patch-third__party_angle_src_common_system__utils__posix.cpp ___________________________________________________________________ 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: branches/2019Q3/www/chromium/files/patch-third__party_webrtc_rtc__base_string__utils.h =================================================================== --- branches/2019Q3/www/chromium/files/patch-third__party_webrtc_rtc__base_string__utils.h (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-third__party_webrtc_rtc__base_string__utils.h (nonexistent) @@ -1,17 +0,0 @@ ---- third_party/webrtc/rtc_base/string_utils.h.orig 2019-03-11 22:08:16 UTC -+++ third_party/webrtc/rtc_base/string_utils.h -@@ -25,11 +25,11 @@ - #endif // WEBRTC_WIN - - #if defined(WEBRTC_POSIX) --#ifdef BSD -+#if defined(WEBRTC_BSD) || defined(BSD) - #include --#else // BSD -+#else // WEBRTC_BSD - #include --#endif // !BSD -+#endif // !WEBRTC_BSD - #include - #endif // WEBRTC_POSIX - Property changes on: branches/2019Q3/www/chromium/files/patch-third__party_webrtc_rtc__base_string__utils.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: branches/2019Q3/www/chromium/files/patch-v8_src_external-reference-table.cc =================================================================== --- branches/2019Q3/www/chromium/files/patch-v8_src_external-reference-table.cc (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-v8_src_external-reference-table.cc (nonexistent) @@ -1,11 +0,0 @@ ---- v8/src/external-reference-table.cc.orig 2019-03-17 16:08:28 UTC -+++ v8/src/external-reference-table.cc -@@ -9,7 +9,7 @@ - #include "src/external-reference.h" - #include "src/ic/stub-cache.h" - --#if defined(DEBUG) && defined(V8_OS_LINUX) && !defined(V8_OS_ANDROID) -+#if defined(DEBUG) && (defined(V8_OS_LINUX) || defined(V8_OS_FREEBSD)) && !defined(V8_OS_ANDROID) - #define SYMBOLIZE_FUNCTION - #include - #include Property changes on: branches/2019Q3/www/chromium/files/patch-v8_src_external-reference-table.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: branches/2019Q3/www/chromium/files/patch-components_sync_base_get__session__name.cc =================================================================== --- branches/2019Q3/www/chromium/files/patch-components_sync_base_get__session__name.cc (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-components_sync_base_get__session__name.cc (nonexistent) @@ -1,20 +0,0 @@ ---- components/sync/base/get_session_name.cc.orig 2019-04-30 22:22:44 UTC -+++ components/sync/base/get_session_name.cc -@@ -17,7 +17,7 @@ - - #if defined(OS_CHROMEOS) - #include "chromeos/constants/devicetype.h" --#elif defined(OS_LINUX) -+#elif defined(OS_LINUX) || defined(OS_BSD) - #include "components/sync/base/get_session_name_linux.h" - #elif defined(OS_IOS) - #include "components/sync/base/get_session_name_ios.h" -@@ -53,7 +53,7 @@ std::string GetSessionNameBlocking() { - session_name = "Chromebook"; - break; - } --#elif defined(OS_LINUX) -+#elif defined(OS_LINUX) || defined(OS_BSD) - session_name = internal::GetHostname(); - #elif defined(OS_IOS) - session_name = internal::GetComputerName(); Property changes on: branches/2019Q3/www/chromium/files/patch-components_sync_base_get__session__name.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: branches/2019Q3/www/chromium/files/patch-content_public_app_content__packaged__services__manifest.cc =================================================================== --- branches/2019Q3/www/chromium/files/patch-content_public_app_content__packaged__services__manifest.cc (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-content_public_app_content__packaged__services__manifest.cc (nonexistent) @@ -1,20 +0,0 @@ ---- 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 - -@@ -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) Property changes on: branches/2019Q3/www/chromium/files/patch-content_public_app_content__packaged__services__manifest.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: branches/2019Q3/www/chromium/files/patch-device_usb_usb__context.cc =================================================================== --- branches/2019Q3/www/chromium/files/patch-device_usb_usb__context.cc (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-device_usb_usb__context.cc (nonexistent) @@ -1,12 +0,0 @@ ---- device/usb/usb_context.cc.orig 2019-03-11 22:00:58 UTC -+++ device/usb/usb_context.cc -@@ -58,7 +58,9 @@ void UsbContext::UsbEventHandler::Run() { - - void UsbContext::UsbEventHandler::Stop() { - base::subtle::Release_Store(&running_, 0); -+#if !defined(OS_FREEBSD) // XXX(rene) not available in base version - libusb_interrupt_handle_event(context_); -+#endif - } - - UsbContext::UsbContext(PlatformUsbContext context) : context_(context) { Property changes on: branches/2019Q3/www/chromium/files/patch-device_usb_usb__context.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: branches/2019Q3/www/chromium/files/patch-components_sync_base_get__session__name__linux.cc =================================================================== --- branches/2019Q3/www/chromium/files/patch-components_sync_base_get__session__name__linux.cc (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-components_sync_base_get__session__name__linux.cc (nonexistent) @@ -1,14 +0,0 @@ ---- components/sync/base/get_session_name_linux.cc.orig 2019-03-11 22:00:57 UTC -+++ components/sync/base/get_session_name_linux.cc -@@ -13,8 +13,9 @@ namespace syncer { - namespace internal { - - std::string GetHostname() { -- char hostname[HOST_NAME_MAX]; -- if (gethostname(hostname, HOST_NAME_MAX) == 0) // Success. -+ int len = sysconf(_SC_HOST_NAME_MAX); -+ char hostname[len]; -+ if (gethostname(hostname, len) == 0) // Success. - return hostname; - return base::GetLinuxDistro(); - } Property changes on: branches/2019Q3/www/chromium/files/patch-components_sync_base_get__session__name__linux.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: branches/2019Q3/www/chromium/files/patch-device_usb_BUILD.gn =================================================================== --- branches/2019Q3/www/chromium/files/patch-device_usb_BUILD.gn (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-device_usb_BUILD.gn (nonexistent) @@ -1,21 +0,0 @@ ---- device/usb/BUILD.gn.orig 2019-03-11 22:00:58 UTC -+++ device/usb/BUILD.gn -@@ -112,10 +112,17 @@ static_library("usb") { - ] - } - -- if (is_android || is_chromeos || is_linux) { -+ if (is_android || is_chromeos || (is_linux && !is_bsd)) { - sources += [ - "usb_device_handle_usbfs.cc", - "usb_device_handle_usbfs.h", -+ ] -+ } -+ -+ if (is_bsd) { -+ sources -= [ -+ "usb_device_linux.cc", -+ "usb_device_linux.h", - ] - } - Property changes on: branches/2019Q3/www/chromium/files/patch-device_usb_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: branches/2019Q3/www/chromium/files/patch-cc_scheduler_compositor__frame__reporting__controller.cc =================================================================== --- branches/2019Q3/www/chromium/files/patch-cc_scheduler_compositor__frame__reporting__controller.cc (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-cc_scheduler_compositor__frame__reporting__controller.cc (nonexistent) @@ -1,11 +0,0 @@ ---- 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: branches/2019Q3/www/chromium/files/patch-cc_scheduler_compositor__frame__reporting__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: branches/2019Q3/www/chromium/files/patch-device_usb_usb__service__impl.cc =================================================================== --- branches/2019Q3/www/chromium/files/patch-device_usb_usb__service__impl.cc (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-device_usb_usb__service__impl.cc (nonexistent) @@ -1,45 +0,0 @@ ---- device/usb/usb_service_impl.cc.orig 2019-06-04 18:55:24 UTC -+++ device/usb/usb_service_impl.cc -@@ -234,8 +234,10 @@ UsbServiceImpl::UsbServiceImpl() - - UsbServiceImpl::~UsbServiceImpl() { - NotifyWillDestroyUsbService(); -+#if !defined(OS_FREEBSD) - if (hotplug_enabled_) - libusb_hotplug_deregister_callback(context_->context(), hotplug_handle_); -+#endif // !defined(OS_FREEBSD) - } - - void UsbServiceImpl::GetDevices(const GetDevicesCallback& callback) { -@@ -290,6 +292,7 @@ void UsbServiceImpl::OnUsbContext(scoped_refptrcontext(), - static_cast(LIBUSB_HOTPLUG_EVENT_DEVICE_ARRIVED | -@@ -302,6 +305,7 @@ void UsbServiceImpl::OnUsbContext(scoped_refptrOnDisconnect(); - } - -+#if !defined(OS_FREEBSD) - // static - int LIBUSB_CALL UsbServiceImpl::HotplugCallback(libusb_context* context, - libusb_device* device_raw, -@@ -531,6 +536,7 @@ int LIBUSB_CALL UsbServiceImpl::HotplugCallback(libusb - - return 0; - } -+#endif // !defined(OS_FREEBSD) - - void UsbServiceImpl::OnPlatformDeviceAdded( - ScopedLibusbDeviceRef platform_device) { Property changes on: branches/2019Q3/www/chromium/files/patch-device_usb_usb__service__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: branches/2019Q3/www/chromium/files/patch-chromecast_browser_metrics_cast__metrics__service__client.cc =================================================================== --- branches/2019Q3/www/chromium/files/patch-chromecast_browser_metrics_cast__metrics__service__client.cc (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-chromecast_browser_metrics_cast__metrics__service__client.cc (nonexistent) @@ -1,102 +0,0 @@ ---- chromecast/browser/metrics/cast_metrics_service_client.cc.orig 2019-06-04 18:55:20 UTC -+++ chromecast/browser/metrics/cast_metrics_service_client.cc -@@ -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" -@@ -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( - : 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(); - } - Property changes on: branches/2019Q3/www/chromium/files/patch-chromecast_browser_metrics_cast__metrics__service__client.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: branches/2019Q3/www/chromium/files/patch-third__party_skia_src_ports_SkFontHost__FreeType.cpp =================================================================== --- branches/2019Q3/www/chromium/files/patch-third__party_skia_src_ports_SkFontHost__FreeType.cpp (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-third__party_skia_src_ports_SkFontHost__FreeType.cpp (nonexistent) @@ -1,77 +0,0 @@ ---- third_party/skia/src/ports/SkFontHost_FreeType.cpp.orig 2019-06-04 18:58:12 UTC -+++ third_party/skia/src/ports/SkFontHost_FreeType.cpp -@@ -128,8 +128,6 @@ class FreeTypeLibrary : SkNoncopyable { (public) - : fGetVarDesignCoordinates(nullptr) - , fGetVarAxisFlags(nullptr) - , fLibrary(nullptr) -- , fIsLCDSupported(false) -- , fLCDExtra(0) - { - if (FT_New_Library(&gFTMemory, &fLibrary)) { - return; -@@ -189,12 +187,7 @@ class FreeTypeLibrary : SkNoncopyable { (public) - } - #endif - -- // Setup LCD filtering. This reduces color fringes for LCD smoothed glyphs. -- // The default has changed over time, so this doesn't mean the same thing to all users. -- if (FT_Library_SetLcdFilter(fLibrary, FT_LCD_FILTER_DEFAULT) == 0) { -- fIsLCDSupported = true; -- fLCDExtra = 2; //Using a filter adds one full pixel to each side. -- } -+ FT_Library_SetLcdFilter(fLibrary, FT_LCD_FILTER_DEFAULT); - } - ~FreeTypeLibrary() { - if (fLibrary) { -@@ -203,8 +196,6 @@ class FreeTypeLibrary : SkNoncopyable { (public) - } - - FT_Library library() { return fLibrary; } -- bool isLCDSupported() { return fIsLCDSupported; } -- int lcdExtra() { return fLCDExtra; } - - // FT_Get_{MM,Var}_{Blend,Design}_Coordinates were added in FreeType 2.7.1. - // Prior to this there was no way to get the coordinates out of the FT_Face. -@@ -221,8 +212,6 @@ class FreeTypeLibrary : SkNoncopyable { (public) - - private: - FT_Library fLibrary; -- bool fIsLCDSupported; -- int fLCDExtra; - - // FT_Library_SetLcdFilterWeights was introduced in FreeType 2.4.0. - // The following platforms provide FreeType of at least 2.4.0. -@@ -718,17 +707,6 @@ void SkTypeface_FreeType::onFilterRec(SkScalerContextR - rec->fTextSize = SkIntToScalar(1 << 14); - } - -- if (isLCD(*rec)) { -- // TODO: re-work so that FreeType is set-up and selected by the SkFontMgr. -- SkAutoMutexAcquire ama(gFTMutex); -- ref_ft_library(); -- if (!gFTLibrary->isLCDSupported()) { -- // If the runtime Freetype library doesn't support LCD, disable it here. -- rec->fMaskFormat = SkMask::kA8_Format; -- } -- unref_ft_library(); -- } -- - SkFontHinting h = rec->getHinting(); - if (kFull_SkFontHinting == h && !isLCD(*rec)) { - // collapse full->normal hinting if we're not doing LCD -@@ -1121,11 +1099,11 @@ bool SkScalerContext_FreeType::getCBoxForLetter(char l - void SkScalerContext_FreeType::updateGlyphIfLCD(SkGlyph* glyph) { - if (glyph->fMaskFormat == SkMask::kLCD16_Format) { - if (fLCDIsVert) { -- glyph->fHeight += gFTLibrary->lcdExtra(); -- glyph->fTop -= gFTLibrary->lcdExtra() >> 1; -+ glyph->fHeight += 2; -+ glyph->fTop -= 1; - } else { -- glyph->fWidth += gFTLibrary->lcdExtra(); -- glyph->fLeft -= gFTLibrary->lcdExtra() >> 1; -+ glyph->fWidth += 2; -+ glyph->fLeft -= 1; - } - } - } Property changes on: branches/2019Q3/www/chromium/files/patch-third__party_skia_src_ports_SkFontHost__FreeType.cpp ___________________________________________________________________ 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: branches/2019Q3/www/chromium/files/patch-chromecast_browser_metrics_cast__metrics__service__client.h =================================================================== --- branches/2019Q3/www/chromium/files/patch-chromecast_browser_metrics_cast__metrics__service__client.h (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-chromecast_browser_metrics_cast__metrics__service__client.h (nonexistent) @@ -1,15 +0,0 @@ ---- chromecast/browser/metrics/cast_metrics_service_client.h.orig 2019-06-04 18:55:20 UTC -+++ chromecast/browser/metrics/cast_metrics_service_client.h -@@ -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_; Property changes on: branches/2019Q3/www/chromium/files/patch-chromecast_browser_metrics_cast__metrics__service__client.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: branches/2019Q3/www/chromium/files/patch-v8_src_log-utils.h =================================================================== --- branches/2019Q3/www/chromium/files/patch-v8_src_log-utils.h (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-v8_src_log-utils.h (nonexistent) @@ -1,11 +0,0 @@ ---- v8/src/log-utils.h.orig 2019-03-11 22:08:08 UTC -+++ v8/src/log-utils.h -@@ -16,6 +16,8 @@ - #include "src/flags.h" - #include "src/ostreams.h" - -+#include -+ - namespace v8 { - namespace internal { - Property changes on: branches/2019Q3/www/chromium/files/patch-v8_src_log-utils.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: branches/2019Q3/www/chromium/files/patch-BUILD.gn =================================================================== --- branches/2019Q3/www/chromium/files/patch-BUILD.gn (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-BUILD.gn (revision 508999) @@ -1,95 +1,95 @@ ---- BUILD.gn.orig 2019-06-04 18:55:14 UTC +--- BUILD.gn.orig 2019-07-24 18:58:00 UTC +++ BUILD.gn -@@ -385,7 +385,7 @@ group("gn_all") { +@@ -386,7 +386,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", -@@ -426,8 +426,6 @@ group("gn_all") { +@@ -427,8 +427,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", ] -@@ -482,10 +480,6 @@ group("gn_all") { +@@ -483,10 +481,6 @@ group("gn_all") { "//chrome/test:load_library_perf_tests", "//chrome/test:sync_performance_tests", "//chrome/test/chromedriver:chromedriver", - "//courgette:courgette", - "//courgette:courgette_fuzz", - "//courgette:courgette_minimal_tool", - "//courgette:courgette_unittests", "//media/cast:generate_barcode_video", "//media/cast:generate_timecode_audio", "//net:crash_cache", -@@ -540,10 +534,6 @@ group("gn_all") { +@@ -541,10 +535,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) { -@@ -618,7 +608,7 @@ group("gn_all") { +@@ -619,7 +609,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)" ] } -@@ -757,7 +747,6 @@ group("gn_all") { +@@ -758,7 +748,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) { +@@ -877,7 +866,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 +1017,7 @@ if (!is_ios) { +@@ -1033,7 +1021,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 +1026,7 @@ if (!is_ios) { +@@ -1042,7 +1030,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)" ] } -@@ -1181,9 +1169,6 @@ group("chromium_builder_perf") { +@@ -1185,9 +1173,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: branches/2019Q3/www/chromium/files/patch-base_BUILD.gn =================================================================== --- branches/2019Q3/www/chromium/files/patch-base_BUILD.gn (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-base_BUILD.gn (revision 508999) @@ -1,67 +1,67 @@ ---- base/BUILD.gn.orig 2019-06-04 18:55:15 UTC +--- base/BUILD.gn.orig 2019-07-24 18:58:01 UTC +++ base/BUILD.gn -@@ -1234,7 +1234,7 @@ jumbo_component("base") { +@@ -1258,7 +1258,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" ] } -@@ -1260,7 +1260,7 @@ jumbo_component("base") { +@@ -1284,7 +1284,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 += [ -@@ -1813,6 +1813,33 @@ jumbo_component("base") { +@@ -1862,6 +1862,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([]) -@@ -2910,6 +2937,12 @@ test("base_unittests") { +@@ -2999,6 +3026,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: branches/2019Q3/www/chromium/files/patch-base_allocator_allocator__shim.cc =================================================================== --- branches/2019Q3/www/chromium/files/patch-base_allocator_allocator__shim.cc (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-base_allocator_allocator__shim.cc (revision 508999) @@ -1,11 +1,11 @@ ---- base/allocator/allocator_shim.cc.orig 2019-04-30 22:22:27 UTC +--- base/allocator/allocator_shim.cc.orig 2019-07-24 18:58:01 UTC +++ base/allocator/allocator_shim.cc -@@ -69,7 +69,7 @@ inline const base::allocator::AllocatorDispatch* GetCh +@@ -70,7 +70,7 @@ inline const base::allocator::AllocatorDispatch* GetCh // Unfortunately due to that bug NoBarrier_Load() is mistakenly fully // barriered on Linux+Clang, and that causes visible perf regressons. return reinterpret_cast( -#if defined(OS_LINUX) && defined(__clang__) +#if (defined(OS_BSD) || defined(OS_LINUX)) && defined(__clang__) *static_cast(&g_chain_head) #else base::subtle::NoBarrier_Load(&g_chain_head) Index: branches/2019Q3/www/chromium/files/patch-base_allocator_allocator__shim__default__dispatch__to__glibc.cc =================================================================== --- branches/2019Q3/www/chromium/files/patch-base_allocator_allocator__shim__default__dispatch__to__glibc.cc (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-base_allocator_allocator__shim__default__dispatch__to__glibc.cc (revision 508999) @@ -1,77 +1,76 @@ ---- base/allocator/allocator_shim_default_dispatch_to_glibc.cc.orig 2019-03-11 22:00:51 UTC +--- base/allocator/allocator_shim_default_dispatch_to_glibc.cc.orig 2019-07-24 18:58:01 UTC +++ base/allocator/allocator_shim_default_dispatch_to_glibc.cc -@@ -3,19 +3,28 @@ - // found in the LICENSE file. - +@@ -5,18 +5,28 @@ #include "base/allocator/allocator_shim.h" + + #include +-#include +#include +#include +#include --#include -- // This translation unit defines a default dispatch for the allocator shim which // routes allocations to libc functions. -// The code here is strongly inspired from tcmalloc's libc_override_glibc.h. +// The code here is strongly inspired from tcmalloc's override_glibc.h. extern "C" { -void* __libc_malloc(size_t size); -void* __libc_calloc(size_t n, size_t size); -void* __libc_realloc(void* address, size_t size); -void* __libc_memalign(size_t alignment, size_t size); -void __libc_free(void* ptr); +void* __malloc(size_t size); +void* __calloc(size_t n, size_t size); -+void* __realloc(void* address, size_t size); ++void* __realloc(void* address, size_t len); +void* __memalign(size_t alignment, size_t size) { + void *ret; + if (__posix_memalign(&ret, alignment, size) != 0) { -+ return nullptr; ++ return nullptr; + } else { -+ return ret; ++ return ret; + } +} +int __posix_memalign(void **ptr, size_t alignment, size_t size); +void __free(void* ptr); } // extern "C" namespace { -@@ -23,32 +32,32 @@ namespace { +@@ -24,32 +34,32 @@ namespace { using base::allocator::AllocatorDispatch; void* GlibcMalloc(const AllocatorDispatch*, size_t size, void* context) { - return __libc_malloc(size); + return __malloc(size); } void* GlibcCalloc(const AllocatorDispatch*, size_t n, size_t size, void* context) { - return __libc_calloc(n, size); + return __calloc(n, size); } void* GlibcRealloc(const AllocatorDispatch*, void* address, size_t size, void* context) { - return __libc_realloc(address, size); + return __realloc(address, size); } void* GlibcMemalign(const AllocatorDispatch*, size_t alignment, size_t size, void* context) { - return __libc_memalign(alignment, size); + return __memalign(alignment, size); } void GlibcFree(const AllocatorDispatch*, void* address, void* context) { - __libc_free(address); + __free(address); } size_t GlibcGetSizeEstimate(const AllocatorDispatch*, Index: branches/2019Q3/www/chromium/files/patch-base_allocator_partition__allocator_page__allocator__internals__posix.h =================================================================== --- branches/2019Q3/www/chromium/files/patch-base_allocator_partition__allocator_page__allocator__internals__posix.h (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-base_allocator_partition__allocator_page__allocator__internals__posix.h (revision 508999) @@ -1,11 +1,11 @@ ---- 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.orig 2019-07-24 18:58:01 UTC +++ base/allocator/partition_allocator/page_allocator_internals_posix.h -@@ -14,7 +14,7 @@ - #if defined(OS_MACOSX) +@@ -16,7 +16,7 @@ + #include #endif -#if defined(OS_LINUX) +#if defined(OS_BSD) || defined(OS_LINUX) #include #include Index: branches/2019Q3/www/chromium/files/patch-base_base__switches.cc =================================================================== --- branches/2019Q3/www/chromium/files/patch-base_base__switches.cc (nonexistent) +++ branches/2019Q3/www/chromium/files/patch-base_base__switches.cc (revision 508999) @@ -0,0 +1,20 @@ +--- base/base_switches.cc.orig 2019-07-29 16:52:17 UTC ++++ base/base_switches.cc +@@ -107,7 +107,7 @@ const char kProfilingFlush[] = "profiling-flush"; + const char kDisableUsbKeyboardDetect[] = "disable-usb-keyboard-detect"; + #endif + +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + // The /dev/shm partition is too small in certain VM environments, causing + // Chrome to fail or crash (see http://crbug.com/715363). Use this flag to + // work-around this issue (a temporary directory will always be used to create +@@ -128,7 +128,7 @@ const char kEnableCrashReporterForTesting[] = + const char kEnableReachedCodeProfiler[] = "enable-reached-code-profiler"; + #endif + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + // Controls whether or not retired instruction counts are surfaced for threads + // in trace events on Linux. + // Property changes on: branches/2019Q3/www/chromium/files/patch-base_base__switches.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: branches/2019Q3/www/chromium/files/patch-base_base__switches.h =================================================================== --- branches/2019Q3/www/chromium/files/patch-base_base__switches.h (nonexistent) +++ branches/2019Q3/www/chromium/files/patch-base_base__switches.h (revision 508999) @@ -0,0 +1,20 @@ +--- base/base_switches.h.orig 2019-07-29 18:05:10 UTC ++++ base/base_switches.h +@@ -36,7 +36,7 @@ extern const char kWaitForDebugger[]; + extern const char kDisableUsbKeyboardDetect[]; + #endif + +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + extern const char kDisableDevShmUsage[]; + #endif + +@@ -49,7 +49,7 @@ extern const char kEnableReachedCodeProfiler[]; + extern const char kOrderfileMemoryOptimization[]; + #endif + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + extern const char kEnableThreadInstructionCount[]; + #endif + Property changes on: branches/2019Q3/www/chromium/files/patch-base_base__switches.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: branches/2019Q3/www/chromium/files/patch-base_cpu.cc =================================================================== --- branches/2019Q3/www/chromium/files/patch-base_cpu.cc (nonexistent) +++ branches/2019Q3/www/chromium/files/patch-base_cpu.cc (revision 508999) @@ -0,0 +1,38 @@ +--- base/cpu.cc.orig 2019-07-29 18:05:46 UTC ++++ base/cpu.cc +@@ -15,7 +15,7 @@ + #include "base/stl_util.h" + #include "build/build_config.h" + +-#if defined(ARCH_CPU_ARM_FAMILY) && (defined(OS_ANDROID) || defined(OS_LINUX)) ++#if defined(ARCH_CPU_ARM_FAMILY) && (defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD)) + #include "base/files/file_util.h" + #endif + +@@ -97,7 +97,7 @@ uint64_t xgetbv(uint32_t xcr) { + + #endif // ARCH_CPU_X86_FAMILY + +-#if defined(ARCH_CPU_ARM_FAMILY) && (defined(OS_ANDROID) || defined(OS_LINUX)) ++#if defined(ARCH_CPU_ARM_FAMILY) && (defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD)) + std::string* CpuInfoBrand() { + static std::string* brand = []() { + // This function finds the value from /proc/cpuinfo under the key "model +@@ -127,7 +127,7 @@ std::string* CpuInfoBrand() { + return brand; + } + #endif // defined(ARCH_CPU_ARM_FAMILY) && (defined(OS_ANDROID) || +- // defined(OS_LINUX)) ++ // defined(OS_LINUX) || defined(OS_BSD)) + + } // namespace + +@@ -252,7 +252,7 @@ void CPU::Initialize() { + } + } + #elif defined(ARCH_CPU_ARM_FAMILY) +-#if (defined(OS_ANDROID) || defined(OS_LINUX)) ++#if (defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD)) + cpu_brand_ = *CpuInfoBrand(); + #elif defined(OS_WIN) + // Windows makes high-resolution thread timing information available in Property changes on: branches/2019Q3/www/chromium/files/patch-base_cpu.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: branches/2019Q3/www/chromium/files/patch-base_files_file__path__watcher.cc =================================================================== --- branches/2019Q3/www/chromium/files/patch-base_files_file__path__watcher.cc (nonexistent) +++ branches/2019Q3/www/chromium/files/patch-base_files_file__path__watcher.cc (revision 508999) @@ -0,0 +1,11 @@ +--- base/files/file_path_watcher.cc.orig 2019-07-29 18:12:09 UTC ++++ base/files/file_path_watcher.cc +@@ -20,7 +20,7 @@ FilePathWatcher::~FilePathWatcher() { + // static + bool FilePathWatcher::RecursiveWatchAvailable() { + #if (defined(OS_MACOSX) && !defined(OS_IOS)) || defined(OS_WIN) || \ +- defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_AIX) ++ defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_AIX) || defined(OS_BSD) + return true; + #else + // FSEvents isn't available on iOS. Property changes on: branches/2019Q3/www/chromium/files/patch-base_files_file__path__watcher.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: branches/2019Q3/www/chromium/files/patch-base_files_file__util.h =================================================================== --- branches/2019Q3/www/chromium/files/patch-base_files_file__util.h (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-base_files_file__util.h (revision 508999) @@ -1,11 +1,11 @@ ---- base/files/file_util.h.orig 2019-06-04 18:55:15 UTC +--- base/files/file_util.h.orig 2019-07-24 18:58:02 UTC +++ base/files/file_util.h -@@ -467,7 +467,7 @@ BASE_EXPORT bool VerifyPathControlledByAdmin(const bas +@@ -476,7 +476,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: branches/2019Q3/www/chromium/files/patch-base_files_scoped__file.cc =================================================================== --- branches/2019Q3/www/chromium/files/patch-base_files_scoped__file.cc (nonexistent) +++ branches/2019Q3/www/chromium/files/patch-base_files_scoped__file.cc (revision 508999) @@ -0,0 +1,11 @@ +--- base/files/scoped_file.cc.orig 2019-07-29 18:17:43 UTC ++++ base/files/scoped_file.cc +@@ -30,7 +30,7 @@ void ScopedFDCloseTraits::Free(int fd) { + // a single open directory would bypass the entire security model. + int ret = IGNORE_EINTR(close(fd)); + +-#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_FUCHSIA) || \ ++#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_FUCHSIA) || defined(OS_BSD) || \ + defined(OS_ANDROID) + // NB: Some file descriptors can return errors from close() e.g. network + // filesystems such as NFS and Linux input devices. On Linux, macOS, and Property changes on: branches/2019Q3/www/chromium/files/patch-base_files_scoped__file.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: branches/2019Q3/www/chromium/files/patch-base_i18n_icu__util.cc =================================================================== --- branches/2019Q3/www/chromium/files/patch-base_i18n_icu__util.cc (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-base_i18n_icu__util.cc (revision 508999) @@ -1,20 +1,20 @@ ---- base/i18n/icu_util.cc.orig 2019-03-11 22:00:51 UTC +--- base/i18n/icu_util.cc.orig 2019-07-24 18:58:02 UTC +++ base/i18n/icu_util.cc @@ -20,7 +20,7 @@ #include "build/build_config.h" #include "third_party/icu/source/common/unicode/putil.h" #include "third_party/icu/source/common/unicode/udata.h" -#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_ANDROID) +#if (defined(OS_LINUX) || defined(OS_BSD) && !defined(OS_CHROMEOS)) || defined(OS_ANDROID) #include "third_party/icu/source/i18n/unicode/timezone.h" #endif -@@ -315,7 +315,7 @@ bool InitializeICU() { +@@ -285,7 +285,7 @@ bool InitializeICU() { // TODO(jungshik): Some callers do not care about tz at all. If necessary, // add a boolean argument to this function to init'd the default tz only // when requested. -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) if (result) std::unique_ptr zone(icu::TimeZone::createDefault()); #endif Index: branches/2019Q3/www/chromium/files/patch-base_logging__unittest.cc =================================================================== --- branches/2019Q3/www/chromium/files/patch-base_logging__unittest.cc (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-base_logging__unittest.cc (revision 508999) @@ -1,11 +1,11 @@ ---- base/logging_unittest.cc.orig 2019-04-30 22:22:28 UTC +--- base/logging_unittest.cc.orig 2019-07-24 18:58:02 UTC +++ base/logging_unittest.cc -@@ -421,7 +421,7 @@ void CheckCrashTestSighandler(int, siginfo_t* info, vo +@@ -444,7 +444,7 @@ void CheckCrashTestSighandler(int, siginfo_t* info, vo // need the arch-specific boilerplate below, which is inspired by breakpad. // At the same time, on OSX, ucontext.h is deprecated but si_addr works fine. uintptr_t crash_addr = 0; -#if defined(OS_MACOSX) +#if defined(OS_MACOSX) || defined(OS_BSD) crash_addr = reinterpret_cast(info->si_addr); #else // OS_POSIX && !OS_MACOSX ucontext_t* context = reinterpret_cast(context_ptr); Index: branches/2019Q3/www/chromium/files/patch-base_process_process__metrics.cc =================================================================== --- branches/2019Q3/www/chromium/files/patch-base_process_process__metrics.cc (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-base_process_process__metrics.cc (revision 508999) @@ -1,20 +1,38 @@ ---- base/process/process_metrics.cc.orig 2019-04-30 22:22:28 UTC +--- base/process/process_metrics.cc.orig 2019-07-24 18:58:02 UTC +++ base/process/process_metrics.cc +@@ -57,7 +57,7 @@ SystemMetrics SystemMetrics::Sample() { + SystemMetrics system_metrics; + + system_metrics.committed_memory_ = GetSystemCommitCharge(); +-#if defined(OS_LINUX) || defined(OS_ANDROID) ++#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) + GetSystemMemoryInfo(&system_metrics.memory_info_); + GetVmStatInfo(&system_metrics.vmstat_info_); + GetSystemDiskInfo(&system_metrics.disk_info_); +@@ -75,7 +75,7 @@ std::unique_ptr SystemMetrics::ToValue() const + std::unique_ptr res(new DictionaryValue()); + + res->SetIntKey("committed_memory", static_cast(committed_memory_)); +-#if defined(OS_LINUX) || defined(OS_ANDROID) ++#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) + std::unique_ptr meminfo = memory_info_.ToValue(); + std::unique_ptr vmstat = vmstat_info_.ToValue(); + meminfo->MergeDictionary(vmstat.get()); @@ -126,7 +126,7 @@ double ProcessMetrics::GetPlatformIndependentCPUUsage( } #endif -#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_AIX) +#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_AIX) || defined(OS_BSD) int ProcessMetrics::CalculateIdleWakeupsPerSecond( uint64_t absolute_idle_wakeups) { return CalculateEventsPerSecond(absolute_idle_wakeups, @@ -138,7 +138,7 @@ int ProcessMetrics::GetIdleWakeupsPerSecond() { NOTIMPLEMENTED(); // http://crbug.com/120488 return 0; } -#endif // defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_AIX) +#endif // defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_AIX) || defined(OS_BSD) #if defined(OS_MACOSX) int ProcessMetrics::CalculatePackageIdleWakeupsPerSecond( Index: branches/2019Q3/www/chromium/files/patch-base_process_process__metrics.h =================================================================== --- branches/2019Q3/www/chromium/files/patch-base_process_process__metrics.h (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-base_process_process__metrics.h (revision 508999) @@ -1,121 +1,131 @@ ---- base/process/process_metrics.h.orig 2019-04-30 22:22:28 UTC +--- base/process/process_metrics.h.orig 2019-07-24 18:58:02 UTC +++ base/process/process_metrics.h @@ -41,7 +41,7 @@ namespace base { // Full declaration is in process_metrics_iocounters.h. struct IoCounters; -#if defined(OS_LINUX) || defined(OS_ANDROID) +#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) // Minor and major page fault counts since the process creation. // Both counts are process-wide, and exclude child processes. // @@ -51,7 +51,7 @@ struct PageFaultCounts { int64_t minor; int64_t major; }; -#endif // defined(OS_LINUX) || defined(OS_ANDROID) +#endif // defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) // Convert a POSIX timeval to microseconds. BASE_EXPORT int64_t TimeValToMicroseconds(const struct timeval& tv); @@ -92,7 +92,7 @@ class BASE_EXPORT ProcessMetrics { // convenience wrapper for CreateProcessMetrics(). static std::unique_ptr CreateCurrentProcessMetrics(); -#if defined(OS_LINUX) || defined(OS_ANDROID) +#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) // Resident Set Size is a Linux/Android specific memory concept. Do not // attempt to extend this to other platforms. BASE_EXPORT size_t GetResidentSetSize() const; @@ -199,14 +199,14 @@ class BASE_EXPORT ProcessMetrics { int GetOpenFdSoftLimit() const; #endif // defined(OS_POSIX) -#if defined(OS_LINUX) || defined(OS_ANDROID) +#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) // Bytes of swap as reported by /proc/[pid]/status. uint64_t GetVmSwapBytes() const; // Minor and major page fault count as reported by /proc/[pid]/stat. // Returns true for success. bool GetPageFaultCounts(PageFaultCounts* counts) const; -#endif // defined(OS_LINUX) || defined(OS_ANDROID) +#endif // defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) // Returns total memory usage of malloc. size_t GetMallocUsage(); @@ -218,7 +218,7 @@ class BASE_EXPORT ProcessMetrics { ProcessMetrics(ProcessHandle process, PortProvider* port_provider); #endif // !defined(OS_MACOSX) || defined(OS_IOS) -#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_AIX) +#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_AIX) || defined(OS_BSD) int CalculateIdleWakeupsPerSecond(uint64_t absolute_idle_wakeups); #endif #if defined(OS_MACOSX) @@ -247,7 +247,7 @@ class BASE_EXPORT ProcessMetrics { // Number of bytes transferred to/from disk in bytes. uint64_t last_cumulative_disk_usage_ = 0; -#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_AIX) +#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_AIX) || defined(OS_BSD) // Same thing for idle wakeups. TimeTicks last_idle_wakeups_time_; uint64_t last_absolute_idle_wakeups_; -@@ -293,7 +293,7 @@ BASE_EXPORT void IncreaseFdLimitTo(unsigned int max_de +@@ -292,7 +292,7 @@ BASE_EXPORT size_t GetMaxFds(); + BASE_EXPORT void IncreaseFdLimitTo(unsigned int max_descriptors); #endif // defined(OS_POSIX) - #if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \ -- defined(OS_ANDROID) || defined(OS_AIX) || defined(OS_FUCHSIA) -+ defined(OS_ANDROID) || defined(OS_AIX) || 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_ANDROID) || defined(OS_AIX) || defined(OS_FUCHSIA) // Data about system-wide memory consumption. Values are in KB. Available on // Windows, Mac, Linux, Android and Chrome OS. - // @@ -326,7 +326,7 @@ struct BASE_EXPORT SystemMemoryInfoKB { int avail_phys = 0; #endif -#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_AIX) +#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_AIX) || defined(OS_BSD) // This provides an estimate of available memory as described here: // https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=34e431b0ae398fc54ea69ff85ec700722c9da773 // NOTE: this is ONLY valid in kernels 3.14 and up. Its value will always -@@ -341,7 +341,7 @@ struct BASE_EXPORT SystemMemoryInfoKB { +@@ -340,7 +340,7 @@ struct BASE_EXPORT SystemMemoryInfoKB { + int swap_free = 0; #endif - #if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_AIX) || \ -- defined(OS_FUCHSIA) -+ defined(OS_FUCHSIA) || defined(OS_BSD) +-#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_AIX) || \ ++#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_AIX) || defined(OS_BSD) || \ + defined(OS_FUCHSIA) int buffers = 0; int cached = 0; - int active_anon = 0; -@@ -351,7 +351,7 @@ struct BASE_EXPORT SystemMemoryInfoKB { +@@ -350,7 +350,7 @@ struct BASE_EXPORT SystemMemoryInfoKB { + int inactive_file = 0; int dirty = 0; int reclaimable = 0; - #endif // defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_AIX) || -- // defined(OS_FUCHSIA) -+ // defined(OS_FUCHSIA) || defined(OS_BSD) +-#endif // defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_AIX) || ++#endif // defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_AIX) || defined(OS_BSD) || + // defined(OS_FUCHSIA) #if defined(OS_CHROMEOS) - int shmem = 0; -@@ -377,9 +377,9 @@ struct BASE_EXPORT SystemMemoryInfoKB { +@@ -376,10 +376,10 @@ struct BASE_EXPORT SystemMemoryInfoKB { + // Exposed for memory debugging widget. BASE_EXPORT bool GetSystemMemoryInfo(SystemMemoryInfoKB* meminfo); - #endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || -- // defined(OS_ANDROID) || defined(OS_AIX) || defined(OS_FUCHSIA) -+ // defined(OS_ANDROID) || defined(OS_AIX) || defined(OS_FUCHSIA) || defined(OS_BSD) +-#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || ++#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) + // defined(OS_ANDROID) || defined(OS_AIX) || defined(OS_FUCHSIA) -#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_AIX) +#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_AIX) || defined(OS_BSD) // Parse the data found in /proc//stat and return the sum of the // CPU-related ticks. Returns -1 on parse error. // Exposed for testing. @@ -452,7 +452,7 @@ BASE_EXPORT bool GetSystemDiskInfo(SystemDiskInfo* dis // Returns the amount of time spent in user space since boot across all CPUs. BASE_EXPORT TimeDelta GetUserCpuTimeSinceBoot(); -#endif // defined(OS_LINUX) || defined(OS_ANDROID) +#endif // defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) #if defined(OS_CHROMEOS) // Data from files in directory /sys/block/zram0 about ZRAM usage. +@@ -547,7 +547,7 @@ class BASE_EXPORT SystemMetrics { + FRIEND_TEST_ALL_PREFIXES(SystemMetricsTest, SystemMetrics); + + size_t committed_memory_; +-#if defined(OS_LINUX) || defined(OS_ANDROID) ++#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) + SystemMemoryInfoKB memory_info_; + VmStatInfo vmstat_info_; + SystemDiskInfo disk_info_; Index: branches/2019Q3/www/chromium/files/patch-base_process_process__metrics__freebsd.cc =================================================================== --- branches/2019Q3/www/chromium/files/patch-base_process_process__metrics__freebsd.cc (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-base_process_process__metrics__freebsd.cc (revision 508999) @@ -1,122 +1,259 @@ ---- base/process/process_metrics_freebsd.cc.orig 2019-04-30 22:22:28 UTC +--- base/process/process_metrics_freebsd.cc.orig 2019-07-24 18:58:02 UTC +++ base/process/process_metrics_freebsd.cc @@ -5,6 +5,7 @@ #include "base/process/process_metrics.h" #include +#include #include #include #include -@@ -14,11 +15,15 @@ +@@ -14,11 +15,29 @@ #include "base/process/process_metrics_iocounters.h" #include "base/stl_util.h" +#include /* getpagesize() */ +#include /* O_RDONLY */ +#include +#include + namespace base { ++namespace { ++int GetPageShift() { ++ int pagesize = getpagesize(); ++ int pageshift = 0; ++ ++ while (pagesize > 1) { ++ pageshift++; ++ pagesize >>= 1; ++ } ++ ++ return pageshift; ++} ++} ++ ProcessMetrics::ProcessMetrics(ProcessHandle process) - : process_(process), - last_cpu_(0) {} + : process_(process) {} // static std::unique_ptr ProcessMetrics::CreateProcessMetrics( -@@ -69,4 +74,93 @@ size_t GetSystemCommitCharge() { +@@ -69,4 +88,216 @@ size_t GetSystemCommitCharge() { return mem_total - (mem_free*pagesize) - (mem_inactive*pagesize); } +int GetNumberOfThreads(ProcessHandle process) { + // Taken from FreeBSD top (usr.bin/top/machine.c) + + kvm_t* kd = kvm_open(NULL, "/dev/null", NULL, O_RDONLY, "kvm_open"); + if (kd == NULL) + return 0; + + struct kinfo_proc* pbase; + int nproc; + pbase = kvm_getprocs(kd, KERN_PROC_PID, process, &nproc); + if (pbase == NULL) + return 0; + + if (kvm_close(kd) == -1) + return 0; + + return nproc; +} + +bool GetSystemMemoryInfo(SystemMemoryInfoKB *meminfo) { + unsigned int mem_total, mem_free, swap_total, swap_used; + size_t length; + int pagesizeKB; + + pagesizeKB = getpagesize() / 1024; + + length = sizeof(mem_total); + if (sysctlbyname("vm.stats.vm.v_page_count", &mem_total, + &length, NULL, 0) != 0 || length != sizeof(mem_total)) + return false; + + length = sizeof(mem_free); + if (sysctlbyname("vm.stats.vm.v_free_count", &mem_free, &length, NULL, 0) + != 0 || length != sizeof(mem_free)) + return false; + + length = sizeof(swap_total); + if (sysctlbyname("vm.swap_size", &swap_total, &length, NULL, 0) + != 0 || length != sizeof(swap_total)) + return false; + + length = sizeof(swap_used); + if (sysctlbyname("vm.swap_anon_use", &swap_used, &length, NULL, 0) + != 0 || length != sizeof(swap_used)) + return false; + + meminfo->total = mem_total * pagesizeKB; + meminfo->free = mem_free * pagesizeKB; + meminfo->swap_total = swap_total * pagesizeKB; + meminfo->swap_free = (swap_total - swap_used) * pagesizeKB; + + return true; +} + +int ProcessMetrics::GetOpenFdCount() const { + struct kinfo_file * kif; + int cnt; + + if ((kif = kinfo_getfile(process_, &cnt)) == NULL) + return -1; + + free(kif); + + return cnt; +} + +int ProcessMetrics::GetOpenFdSoftLimit() const { + size_t length; + int total_count = 0; + int mib[] = { CTL_KERN, KERN_MAXFILESPERPROC }; + + length = sizeof(total_count); + + if (sysctl(mib, base::size(mib), &total_count, &length, NULL, 0) < 0) { + total_count = -1; + } + + return total_count; +} + ++size_t ProcessMetrics::GetResidentSetSize() const { ++ kvm_t *kd = kvm_open(nullptr, "/dev/null", nullptr, O_RDONLY, "kvm_open"); ++ ++ if (kd == nullptr) ++ return 0; ++ ++ struct kinfo_proc *pp; ++ int nproc; ++ ++ if ((pp = kvm_getprocs(kd, KERN_PROC_PID, process_, &nproc)) == nullptr) { ++ kvm_close(kd); ++ return 0; ++ } ++ ++ size_t rss; ++ ++ if (nproc > 0) { ++ rss = pp->ki_rssize << GetPageShift(); ++ } else { ++ rss = 0; ++ } ++ ++ kvm_close(kd); ++ return rss; ++} ++ +uint64_t ProcessMetrics::GetVmSwapBytes() const { -+ NOTIMPLEMENTED(); -+ return 0; ++ kvm_t *kd = kvm_open(nullptr, "/dev/null", nullptr, O_RDONLY, "kvm_open"); ++ ++ if (kd == nullptr) ++ return 0; ++ ++ struct kinfo_proc *pp; ++ int nproc; ++ ++ if ((pp = kvm_getprocs(kd, KERN_PROC_PID, process_, &nproc)) == nullptr) { ++ kvm_close(kd); ++ return 0; ++ } ++ ++ size_t swrss; ++ ++ if (nproc > 0) { ++ swrss = pp->ki_swrss > pp->ki_rssize ++ ? (pp->ki_swrss - pp->ki_rssize) << GetPageShift() ++ : 0; ++ } else { ++ swrss = 0; ++ } ++ ++ kvm_close(kd); ++ return swrss; +} + +int ProcessMetrics::GetIdleWakeupsPerSecond() { + NOTIMPLEMENTED(); + return 0; ++} ++ ++bool GetSystemDiskInfo(SystemDiskInfo* diskinfo) { ++ NOTIMPLEMENTED(); ++ return false; ++} ++ ++bool GetVmStatInfo(VmStatInfo* vmstat) { ++ NOTIMPLEMENTED(); ++ return false; ++} ++ ++SystemDiskInfo::SystemDiskInfo() { ++ reads = 0; ++ reads_merged = 0; ++ sectors_read = 0; ++ read_time = 0; ++ writes = 0; ++ writes_merged = 0; ++ sectors_written = 0; ++ write_time = 0; ++ io = 0; ++ io_time = 0; ++ weighted_io_time = 0; ++} ++ ++SystemDiskInfo::SystemDiskInfo(const SystemDiskInfo& other) = default; ++ ++std::unique_ptr SystemDiskInfo::ToValue() const { ++ auto res = std::make_unique(); ++ ++ // Write out uint64_t variables as doubles. ++ // Note: this may discard some precision, but for JS there's no other option. ++ res->SetDouble("reads", static_cast(reads)); ++ res->SetDouble("reads_merged", static_cast(reads_merged)); ++ res->SetDouble("sectors_read", static_cast(sectors_read)); ++ res->SetDouble("read_time", static_cast(read_time)); ++ res->SetDouble("writes", static_cast(writes)); ++ res->SetDouble("writes_merged", static_cast(writes_merged)); ++ res->SetDouble("sectors_written", static_cast(sectors_written)); ++ res->SetDouble("write_time", static_cast(write_time)); ++ res->SetDouble("io", static_cast(io)); ++ res->SetDouble("io_time", static_cast(io_time)); ++ res->SetDouble("weighted_io_time", static_cast(weighted_io_time)); ++ ++ return std::move(res); ++} ++ ++std::unique_ptr SystemMemoryInfoKB::ToValue() const { ++ auto res = std::make_unique(); ++ res->SetIntKey("total", total); ++ res->SetIntKey("free", free); ++ res->SetIntKey("available", available); ++ res->SetIntKey("buffers", buffers); ++ res->SetIntKey("cached", cached); ++ res->SetIntKey("active_anon", active_anon); ++ res->SetIntKey("inactive_anon", inactive_anon); ++ res->SetIntKey("active_file", active_file); ++ res->SetIntKey("inactive_file", inactive_file); ++ res->SetIntKey("swap_total", swap_total); ++ res->SetIntKey("swap_free", swap_free); ++ res->SetIntKey("swap_used", swap_total - swap_free); ++ res->SetIntKey("dirty", dirty); ++ res->SetIntKey("reclaimable", reclaimable); ++ ++ return res; ++} ++ ++std::unique_ptr VmStatInfo::ToValue() const { ++ auto res = std::make_unique(); ++ res->SetIntKey("pswpin", pswpin); ++ res->SetIntKey("pswpout", pswpout); ++ res->SetIntKey("pgmajfault", pgmajfault); ++ return res; +} } // namespace base Index: branches/2019Q3/www/chromium/files/patch-base_profiler_stack__sampling__profiler__unittest.cc =================================================================== --- branches/2019Q3/www/chromium/files/patch-base_profiler_stack__sampling__profiler__unittest.cc (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-base_profiler_stack__sampling__profiler__unittest.cc (revision 508999) @@ -1,11 +1,11 @@ ---- base/profiler/stack_sampling_profiler_unittest.cc.orig 2019-03-11 22:00:51 UTC +--- base/profiler/stack_sampling_profiler_unittest.cc.orig 2019-07-24 18:58:02 UTC +++ base/profiler/stack_sampling_profiler_unittest.cc -@@ -39,7 +39,7 @@ +@@ -41,7 +41,7 @@ #include #include #include -#else +#elif !defined(OS_BSD) #include #endif Index: branches/2019Q3/www/chromium/files/patch-base_sampling__heap__profiler_sampling__heap__profiler.cc =================================================================== --- branches/2019Q3/www/chromium/files/patch-base_sampling__heap__profiler_sampling__heap__profiler.cc (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-base_sampling__heap__profiler_sampling__heap__profiler.cc (revision 508999) @@ -1,24 +1,24 @@ ---- base/sampling_heap_profiler/sampling_heap_profiler.cc.orig 2019-06-13 09:11:51.000000000 +0200 -+++ base/sampling_heap_profiler/sampling_heap_profiler.cc 2019-06-14 21:28:04.089347000 +0200 +--- base/sampling_heap_profiler/sampling_heap_profiler.cc.orig 2019-07-24 18:58:02 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 @@ +@@ -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) && defined(HAVE_PTHREAD_GET_NAME_NP) ++#elif defined(OS_BSD) && __FreeBSD__ >= 12 + pthread_get_name_np(pthread_self(), name, kBufferLen); + if (*name != '\0') return strdup(name); #endif // defined(OS_LINUX) || defined(OS_ANDROID) Index: branches/2019Q3/www/chromium/files/patch-base_system_sys__info__posix.cc =================================================================== --- branches/2019Q3/www/chromium/files/patch-base_system_sys__info__posix.cc (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-base_system_sys__info__posix.cc (revision 508999) @@ -1,38 +1,38 @@ ---- base/system/sys_info_posix.cc.orig 2019-04-30 22:22:28 UTC +--- base/system/sys_info_posix.cc.orig 2019-07-24 18:58:02 UTC +++ base/system/sys_info_posix.cc @@ -38,7 +38,7 @@ namespace { -#if !defined(OS_OPENBSD) && !defined(OS_FUCHSIA) -+#if !defined(OS_BSD) && !defined(OS_FUCHSIA) ++#if !defined(OS_FUCHSIA) && !defined(OS_BSD) int NumberOfProcessors() { // sysconf returns the number of "logical" (not "physical") processors on both // Mac and Linux. So we get the number of max available "logical" processors. @@ -64,7 +64,7 @@ int NumberOfProcessors() { base::LazyInstance>:: Leaky g_lazy_number_of_processors = LAZY_INSTANCE_INITIALIZER; -#endif // !defined(OS_OPENBSD) && !defined(OS_FUCHSIA) -+#endif // !defined(OS_BSD) && !defined(OS_FUCHSIA) ++#endif // !defined(OS_FUCHSIA) && !defined(OS_BSD) #if !defined(OS_FUCHSIA) int64_t AmountOfVirtualMemory() { @@ -132,7 +132,7 @@ bool GetDiskSpaceInfo(const base::FilePath& path, namespace base { -#if !defined(OS_OPENBSD) && !defined(OS_FUCHSIA) -+#if !defined(OS_BSD) && !defined(OS_FUCHSIA) ++#if !defined(OS_FUCHSIA) && !defined(OS_BSD) int SysInfo::NumberOfProcessors() { return g_lazy_number_of_processors.Get().value(); } @@ -227,6 +227,8 @@ std::string SysInfo::OperatingSystemArchitecture() { arch = "x86"; } else if (arch == "amd64") { arch = "x86_64"; + } else if (arch == "arm64") { + arch = "aarch64"; } else if (std::string(info.sysname) == "AIX") { arch = "ppc64"; } Index: branches/2019Q3/www/chromium/files/patch-base_task_thread__pool_environment__config__unittest.cc =================================================================== --- branches/2019Q3/www/chromium/files/patch-base_task_thread__pool_environment__config__unittest.cc (nonexistent) +++ branches/2019Q3/www/chromium/files/patch-base_task_thread__pool_environment__config__unittest.cc (revision 508999) @@ -0,0 +1,11 @@ +--- base/task/thread_pool/environment_config_unittest.cc.orig 2019-07-29 13:26:54 UTC ++++ base/task/thread_pool/environment_config_unittest.cc +@@ -14,7 +14,7 @@ namespace internal { + TEST(ThreadPoolEnvironmentConfig, CanUseBackgroundPriorityForWorker) { + #if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_IOS) + EXPECT_TRUE(CanUseBackgroundPriorityForWorkerThread()); +-#elif defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FUCHSIA) || \ ++#elif defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FUCHSIA) || defined(OS_BSD) || \ + defined(OS_CHROMEOS) || defined(OS_NACL) + EXPECT_FALSE(CanUseBackgroundPriorityForWorkerThread()); + #else Property changes on: branches/2019Q3/www/chromium/files/patch-base_task_thread__pool_environment__config__unittest.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: branches/2019Q3/www/chromium/files/patch-build_config_BUILD.gn =================================================================== --- branches/2019Q3/www/chromium/files/patch-build_config_BUILD.gn (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-build_config_BUILD.gn (revision 508999) @@ -1,30 +1,30 @@ ---- build/config/BUILD.gn.orig 2019-06-04 18:55:15 UTC +--- build/config/BUILD.gn.orig 2019-07-24 18:58:02 UTC +++ build/config/BUILD.gn -@@ -163,7 +163,7 @@ config("debug") { +@@ -161,7 +161,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? -@@ -264,9 +264,7 @@ config("default_libs") { +@@ -259,9 +259,7 @@ config("default_libs") { ] } else if (is_linux) { libs = [ - "dl", "pthread", - "rt", ] } } -@@ -354,7 +352,7 @@ config("executable_config") { +@@ -349,7 +347,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: branches/2019Q3/www/chromium/files/patch-build_config_compiler_BUILD.gn =================================================================== --- branches/2019Q3/www/chromium/files/patch-build_config_compiler_BUILD.gn (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-build_config_compiler_BUILD.gn (revision 508999) @@ -1,92 +1,92 @@ ---- build/config/compiler/BUILD.gn.orig 2019-06-04 18:55:15 UTC +--- build/config/compiler/BUILD.gn.orig 2019-07-24 18:58:02 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) @@ -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 @@ -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", @@ -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 += [ "-fcrash-diagnostics-dir=" + rebase_path("//tools/clang/crashreports", root_build_dir) ] -@@ -740,7 +740,7 @@ config("compiler_cpu_abi") { +@@ -741,7 +741,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" ] } -@@ -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) { +@@ -1102,7 +1102,7 @@ config("compiler_deterministic") { + "-Xclang", + ".", + ] - if (!is_win) { + if (!is_win && !is_bsd) { # We don't use clang -cc1as on Windows (yet? https://crbug.com/762167) asmflags = [ "-Wa,-fdebug-compilation-dir,." ] } -@@ -1490,7 +1490,7 @@ config("default_warnings") { +@@ -1492,7 +1492,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 += [ -@@ -1699,7 +1699,7 @@ config("thin_archive") { +@@ -1701,7 +1701,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" ] -@@ -2286,7 +2286,7 @@ config("symbols") { +@@ -2288,7 +2288,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) { -@@ -2307,7 +2307,7 @@ config("symbols") { +@@ -2309,7 +2309,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: branches/2019Q3/www/chromium/files/patch-build_config_compiler_compiler.gni =================================================================== --- branches/2019Q3/www/chromium/files/patch-build_config_compiler_compiler.gni (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-build_config_compiler_compiler.gni (revision 508999) @@ -1,11 +1,11 @@ ---- build/config/compiler/compiler.gni.orig 2019-04-30 22:22:28 UTC +--- build/config/compiler/compiler.gni.orig 2019-07-24 18:58:02 UTC +++ build/config/compiler/compiler.gni -@@ -181,7 +181,7 @@ declare_args() { +@@ -179,7 +179,7 @@ declare_args() { declare_args() { # Whether to use the gold linker from binutils instead of lld or bfd. use_gold = - !use_lld && !(is_chromecast && is_linux && + !is_bsd && !use_lld && !(is_chromecast && is_linux && (current_cpu == "arm" || current_cpu == "mipsel")) && ((is_linux && (current_cpu == "x64" || current_cpu == "x86" || current_cpu == "arm" || current_cpu == "arm64" || Index: branches/2019Q3/www/chromium/files/patch-build_config_linux_pkg-config.py =================================================================== --- branches/2019Q3/www/chromium/files/patch-build_config_linux_pkg-config.py (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-build_config_linux_pkg-config.py (revision 508999) @@ -1,26 +1,26 @@ ---- build/config/linux/pkg-config.py.orig 2019-03-11 22:00:52 UTC +--- build/config/linux/pkg-config.py.orig 2019-07-24 18:58:02 UTC +++ build/config/linux/pkg-config.py -@@ -57,8 +57,12 @@ def SetConfigPath(options): - print "You must specify an architecture via -a if using a sysroot." +@@ -59,8 +59,12 @@ def SetConfigPath(options): + print("You must specify an architecture via -a if using a sysroot.") sys.exit(1) - libdir = sysroot + '/usr/' + options.system_libdir + '/pkgconfig' - libdir += ':' + sysroot + '/usr/share/pkgconfig' + if "linux" in sys.platform: + libdir = sysroot + '/libdata/' + options.system_libdir + '/pkgconfig' + libdir += ':' + sysroot + '/usr/share/pkgconfig' + elif "bsd" in sys.platform: + libdir = sysroot + '/libdata/pkgconfig' + libdir += ':' + '/usr/libdata/pkgconfig' os.environ['PKG_CONFIG_LIBDIR'] = libdir return libdir -@@ -107,7 +111,7 @@ def main(): +@@ -109,7 +113,7 @@ def main(): # If this is run on non-Linux platforms, just return nothing and indicate # success. This allows us to "kind of emulate" a Linux build from other # platforms. - if "linux" not in sys.platform: + if "bsd" not in sys.platform: - print "[[],[],[],[],[]]" + print("[[],[],[],[],[]]") return 0 Index: branches/2019Q3/www/chromium/files/patch-build_detect__host__arch.py =================================================================== --- branches/2019Q3/www/chromium/files/patch-build_detect__host__arch.py (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-build_detect__host__arch.py (revision 508999) @@ -1,11 +1,11 @@ ---- build/detect_host_arch.py.orig 2019-04-30 22:22:28 UTC +--- build/detect_host_arch.py.orig 2019-07-24 18:58:02 UTC +++ build/detect_host_arch.py -@@ -19,6 +19,8 @@ def HostArch(): +@@ -21,6 +21,8 @@ def HostArch(): host_arch = 'ia32' elif host_arch in ['x86_64', 'amd64']: host_arch = 'x64' + elif host_arch.startswith('arm64'): + host_arch = 'arm64' elif host_arch.startswith('arm'): host_arch = 'arm' elif host_arch.startswith('aarch64'): Index: branches/2019Q3/www/chromium/files/patch-build_gn__run__binary.py =================================================================== --- branches/2019Q3/www/chromium/files/patch-build_gn__run__binary.py (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-build_gn__run__binary.py (revision 508999) @@ -1,11 +1,11 @@ ---- build/gn_run_binary.py.orig 2019-03-11 22:00:52 UTC +--- build/gn_run_binary.py.orig 2019-07-24 18:58:02 UTC +++ build/gn_run_binary.py -@@ -22,7 +22,7 @@ if not os.path.isabs(path): +@@ -24,7 +24,7 @@ if not os.path.isabs(path): # The rest of the arguments are passed directly to the executable. args = [path] + sys.argv[2:] -ret = subprocess.call(args) +ret = subprocess.call(args, env={"CHROME_EXE_PATH":"${WRKSRC}/out/Release/chrome"}) if ret != 0: if ret <= -100: # Windows error codes such as 0xC0000005 and 0xC0000409 are much easier to Index: branches/2019Q3/www/chromium/files/patch-cc_BUILD.gn =================================================================== --- branches/2019Q3/www/chromium/files/patch-cc_BUILD.gn (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-cc_BUILD.gn (revision 508999) @@ -1,21 +1,21 @@ ---- cc/BUILD.gn.orig 2019-06-04 18:55:15 UTC +--- cc/BUILD.gn.orig 2019-07-24 18:58:02 UTC +++ cc/BUILD.gn -@@ -562,7 +562,7 @@ cc_test_static_library("test_support") { +@@ -566,7 +566,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", ] -@@ -762,9 +762,6 @@ cc_test("cc_unittests") { +@@ -767,9 +767,6 @@ cc_test("cc_unittests") { "//ui/gfx/geometry", "//ui/gl", "//ui/gl:test_support", - ] - data_deps = [ - "//third_party/mesa_headers", ] } Index: branches/2019Q3/www/chromium/files/patch-cc_trees_property__tree.cc =================================================================== --- branches/2019Q3/www/chromium/files/patch-cc_trees_property__tree.cc (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-cc_trees_property__tree.cc (revision 508999) @@ -1,20 +1,20 @@ ---- cc/trees/property_tree.cc.orig 2019-06-04 18:55:15 UTC +--- cc/trees/property_tree.cc.orig 2019-07-24 18:58:03 UTC +++ cc/trees/property_tree.cc -@@ -1334,13 +1334,13 @@ gfx::ScrollOffset ScrollTree::MaxScrollOffset(int scro +@@ -1348,13 +1348,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: branches/2019Q3/www/chromium/files/patch-chrome_app_chrome__content__browser__overlay__manifest.cc =================================================================== --- branches/2019Q3/www/chromium/files/patch-chrome_app_chrome__content__browser__overlay__manifest.cc (nonexistent) +++ branches/2019Q3/www/chromium/files/patch-chrome_app_chrome__content__browser__overlay__manifest.cc (revision 508999) @@ -0,0 +1,20 @@ +--- chrome/app/chrome_content_browser_overlay_manifest.cc.orig 2019-07-29 18:39:15 UTC ++++ chrome/app/chrome_content_browser_overlay_manifest.cc +@@ -79,7 +79,7 @@ + #include "chrome/services/app_service/public/cpp/manifest.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) || \ + defined(OS_CHROMEOS) + #include "chrome/browser/performance_manager/webui_graph_dump.mojom.h" // nogncheck + #include "chrome/browser/ui/webui/discards/discards.mojom.h" +@@ -240,7 +240,7 @@ const service_manager::Manifest& GetChromeContentBrows + #else + app_management::mojom::PageHandlerFactory, + #endif +-#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) + mojom::DiscardsDetailsProvider, + performance_manager::mojom::WebUIGraphDump, Property changes on: branches/2019Q3/www/chromium/files/patch-chrome_app_chrome__content__browser__overlay__manifest.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: branches/2019Q3/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc =================================================================== --- branches/2019Q3/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc (revision 508999) @@ -1,128 +1,137 @@ ---- chrome/app/chrome_main_delegate.cc.orig 2019-06-04 18:55:16 UTC +--- chrome/app/chrome_main_delegate.cc.orig 2019-07-24 18:58:05 UTC +++ chrome/app/chrome_main_delegate.cc @@ -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 -@@ -240,7 +240,7 @@ bool UseHooks() { +@@ -241,7 +241,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; -@@ -299,7 +299,7 @@ void AdjustLinuxOOMScore(const std::string& process_ty +@@ -300,7 +300,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. -@@ -344,7 +344,7 @@ bool HandleVersionSwitches(const base::CommandLine& co +@@ -345,7 +345,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) || -@@ -354,7 +354,7 @@ void HandleHelpSwitches(const base::CommandLine& comma +@@ -355,7 +355,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) { -@@ -408,7 +408,7 @@ void InitializeUserDataDir(base::CommandLine* command_ +@@ -409,7 +409,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. -@@ -420,7 +420,7 @@ void InitializeUserDataDir(base::CommandLine* command_ +@@ -421,7 +421,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 -@@ -477,7 +477,7 @@ void InitLogging(const std::string& process_type) { +@@ -478,7 +478,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()); -@@ -619,7 +619,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi +@@ -650,7 +650,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 -@@ -643,7 +643,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi +@@ -674,7 +674,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 -@@ -965,7 +965,7 @@ void ChromeMainDelegate::PreSandboxStartup() { +@@ -868,7 +868,7 @@ void ChromeMainDelegate::PreSandboxStartup() { + #if defined(OS_WIN) + child_process_logging::Init(); + #endif +-#if defined(ARCH_CPU_ARM_FAMILY) && (defined(OS_ANDROID) || defined(OS_LINUX)) ++#if defined(ARCH_CPU_ARM_FAMILY) && (defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD)) + // Create an instance of the CPU class to parse /proc/cpuinfo and cache + // cpu_brand info. + base::CPU cpu_info; +@@ -996,7 +996,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) -@@ -980,7 +980,7 @@ void ChromeMainDelegate::PreSandboxStartup() { +@@ -1011,7 +1011,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. -@@ -990,7 +990,7 @@ void ChromeMainDelegate::PreSandboxStartup() { +@@ -1021,7 +1021,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: branches/2019Q3/www/chromium/files/patch-chrome_app_chromium__strings.grd =================================================================== --- branches/2019Q3/www/chromium/files/patch-chrome_app_chromium__strings.grd (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-chrome_app_chromium__strings.grd (revision 508999) @@ -1,29 +1,29 @@ ---- chrome/app/chromium_strings.grd.orig 2019-06-04 18:55:16 UTC +--- chrome/app/chromium_strings.grd.orig 2019-07-24 18:58:05 UTC +++ chrome/app/chromium_strings.grd -@@ -710,7 +710,7 @@ Signing in anyway will merge Chromium information like +@@ -690,7 +690,7 @@ Signing in anyway will merge Chromium information like - + Your system administrator has configured Chromium to open an alternative browser to access $1example.com. -@@ -839,7 +839,7 @@ Signing in anyway will merge Chromium information like +@@ -815,7 +815,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. -@@ -1098,7 +1098,7 @@ Please check your email at $2 +@@ -1074,7 +1074,7 @@ Please check your email at $2 - + Restart Chromium to enable $1Flash Index: branches/2019Q3/www/chromium/files/patch-chrome_app_generated__resources.grd =================================================================== --- branches/2019Q3/www/chromium/files/patch-chrome_app_generated__resources.grd (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-chrome_app_generated__resources.grd (revision 508999) @@ -1,29 +1,29 @@ ---- chrome/app/generated_resources.grd.orig 2019-06-04 18:55:16 UTC +--- chrome/app/generated_resources.grd.orig 2019-07-24 18:58:05 UTC +++ chrome/app/generated_resources.grd -@@ -4793,7 +4793,7 @@ Keep your key file in a safe place. You will need it t +@@ -4805,7 +4805,7 @@ Keep your key file in a safe place. You will need it t - + Legacy Browser Support -@@ -6304,7 +6304,7 @@ the Bookmarks menu."> +@@ -6370,7 +6370,7 @@ the Bookmarks menu."> Google Pay - + Use system title bar and borders -@@ -7127,7 +7127,7 @@ Please help our engineers fix this problem. Tell us wh +@@ -7223,7 +7223,7 @@ Please help our engineers fix this problem. Tell us wh Set as default - + Minimize Index: branches/2019Q3/www/chromium/files/patch-chrome_app_google__chrome__strings.grd =================================================================== --- branches/2019Q3/www/chromium/files/patch-chrome_app_google__chrome__strings.grd (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-chrome_app_google__chrome__strings.grd (revision 508999) @@ -1,29 +1,29 @@ ---- chrome/app/google_chrome_strings.grd.orig 2019-06-04 18:55:16 UTC +--- chrome/app/google_chrome_strings.grd.orig 2019-07-24 18:58:05 UTC +++ chrome/app/google_chrome_strings.grd -@@ -722,7 +722,7 @@ Signing in anyway will merge Chrome information like b +@@ -702,7 +702,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. -@@ -851,7 +851,7 @@ Signing in anyway will merge Chrome information like b +@@ -827,7 +827,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. -@@ -1117,7 +1117,7 @@ Please check your email at $2 +@@ -1093,7 +1093,7 @@ Please check your email at $2 - + Restart Chrome to enable $1Flash Index: branches/2019Q3/www/chromium/files/patch-chrome_app_settings__strings.grdp =================================================================== --- branches/2019Q3/www/chromium/files/patch-chrome_app_settings__strings.grdp (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-chrome_app_settings__strings.grdp (revision 508999) @@ -1,20 +1,20 @@ ---- chrome/app/settings_strings.grdp.orig 2019-06-04 18:55:16 UTC +--- chrome/app/settings_strings.grdp.orig 2019-07-24 18:58:07 UTC +++ chrome/app/settings_strings.grdp -@@ -634,7 +634,7 @@ +@@ -653,7 +653,7 @@ Themes - + GTK+ -@@ -648,7 +648,7 @@ +@@ -667,7 +667,7 @@ Use Classic - + Reset to default Index: branches/2019Q3/www/chromium/files/patch-chrome_app_theme_chrome__unscaled__resources.grd =================================================================== --- branches/2019Q3/www/chromium/files/patch-chrome_app_theme_chrome__unscaled__resources.grd (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-chrome_app_theme_chrome__unscaled__resources.grd (revision 508999) @@ -1,11 +1,20 @@ ---- chrome/app/theme/chrome_unscaled_resources.grd.orig 2019-03-11 22:00:52 UTC +--- chrome/app/theme/chrome_unscaled_resources.grd.orig 2019-07-24 18:58:07 UTC +++ chrome/app/theme/chrome_unscaled_resources.grd +@@ -18,7 +18,7 @@ + + + +- ++ + + + @@ -100,7 +100,7 @@ - + Index: branches/2019Q3/www/chromium/files/patch-chrome_browser_about__flags.cc =================================================================== --- branches/2019Q3/www/chromium/files/patch-chrome_browser_about__flags.cc (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-chrome_browser_about__flags.cc (revision 508999) @@ -1,127 +1,183 @@ ---- chrome/browser/about_flags.cc.orig 2019-06-04 18:55:16 UTC +--- chrome/browser/about_flags.cc.orig 2019-07-24 18:58:07 UTC +++ chrome/browser/about_flags.cc -@@ -1533,13 +1533,13 @@ const FeatureEntry kFeatureEntries[] = { +@@ -621,7 +621,7 @@ const FeatureEntry::FeatureVariation + nullptr}}; + #endif // 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) + const FeatureEntry::FeatureParam + kAutofillSaveCreditCardUsesImprovedMessagingStoreCard[] = { + {autofill::features:: +@@ -668,7 +668,7 @@ const FeatureEntry::FeatureVariation + kAutofillSaveCreditCardUsesImprovedMessagingConfirmAndSaveCard), + nullptr}, + }; +-#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) ++#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) + + const FeatureEntry::Choice kMemlogModeChoices[] = { + {flags_ui::kGenericExperimentChoiceDisabled, "", ""}, +@@ -776,7 +776,7 @@ const FeatureEntry::FeatureVariation kOmniboxMaxURLMat + {"6 matches", kOmniboxMaxURLMatches6, base::size(kOmniboxMaxURLMatches6), + nullptr}}; + +-#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || \ ++#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD) || \ + defined(OS_CHROMEOS) + const FeatureEntry::FeatureParam kTranslateBubbleUIButton[] = { + {language::kTranslateUIBubbleKey, language::kTranslateUIBubbleButtonValue}}; +@@ -792,7 +792,7 @@ const FeatureEntry::FeatureVariation kTranslateBubbleU + {"Tab", kTranslateBubbleUITab, base::size(kTranslateBubbleUITab), nullptr}, + {"Button_GM2", kTranslateBubbleUIButtonGM2, + base::size(kTranslateBubbleUIButton), nullptr}}; +-#endif // OS_LINUX || OS_MACOSX || OS_WIN || OS_CHROMEOS ++#endif // OS_LINUX || OS_MACOSX || OS_WIN || OS_BSD || OS_CHROMEOS + + const FeatureEntry::FeatureParam kOmniboxUIVerticalMargin0px[] = { + {OmniboxFieldTrial::kUIVerticalMarginParam, "0"}}; +@@ -1567,13 +1567,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, -@@ -1741,7 +1741,7 @@ const FeatureEntry kFeatureEntries[] = { - flag_descriptions::kEnableDataSaverLiteModeRebrandName, - flag_descriptions::kEnableDataSaverLiteModeRebrandDescription, kOsAll, - FEATURE_VALUE_TYPE(previews::features::kDataSaverLiteModeRebranding)}, +@@ -1614,14 +1614,14 @@ const FeatureEntry kFeatureEntries[] = { + "OverrideTranslateTriggerInIndia")}, + #endif // OS_ANDROID + +-#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || \ ++#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD) || \ + defined(OS_CHROMEOS) + {"translate-ui-bubble-options", flag_descriptions::kTranslateBubbleUIName, + flag_descriptions::kTranslateBubbleUIDescription, kOsDesktop, + FEATURE_WITH_PARAMS_VALUE_TYPE(language::kUseButtonTranslateBubbleUI, + kTranslateBubbleUIVariations, + "UseButtonTranslateBubbleUI")}, +-#endif // OS_LINUX || OS_MACOSX || OS_WIN || OS_CHROMEOS ++#endif // OS_LINUX || OS_MACOSX || OS_WIN || OS_BSD || OS_CHROMEOS + + #if BUILDFLAG(ENABLE_NATIVE_NOTIFICATIONS) && !defined(OS_CHROMEOS) + {"enable-native-notifications", +@@ -1762,7 +1762,7 @@ const FeatureEntry kFeatureEntries[] = { + FEATURE_VALUE_TYPE( + previews::features::kHTTPSServerPreviewsUsingURLLoader)}, + #endif // OS_ANDROID -#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-brotli", flag_descriptions::kEnableBrotliName, - flag_descriptions::kEnableBrotliDescription, kOsAll, - FEATURE_VALUE_TYPE(features::kBrotliEncoding)}, -@@ -2132,12 +2132,12 @@ const FeatureEntry kFeatureEntries[] = { +@@ -2091,12 +2091,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, -@@ -2520,7 +2520,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -2423,7 +2423,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, -@@ -2556,7 +2556,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -2470,7 +2470,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, -@@ -2857,7 +2857,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -2696,7 +2696,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, -@@ -2868,7 +2868,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -2707,7 +2707,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, -@@ -3731,7 +3731,7 @@ const FeatureEntry kFeatureEntries[] = { + {"chrome-colors", flag_descriptions::kChromeColorsName, +@@ -3514,7 +3514,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:: -@@ -3739,7 +3739,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -3522,7 +3522,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", -@@ -3785,13 +3785,13 @@ const FeatureEntry kFeatureEntries[] = { +@@ -3562,13 +3562,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", +@@ -3895,7 +3895,7 @@ const FeatureEntry kFeatureEntries[] = { + flag_descriptions::kAudioWorkletRealtimeThreadDescription, kOsAll, + FEATURE_VALUE_TYPE(blink::features::kAudioWorkletRealtimeThread)}, + +-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) ++#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) + {"enable-autofill-save-credit-card-uses-improved-messaging", + flag_descriptions::kEnableAutofillSaveCreditCardUsesImprovedMessagingName, + flag_descriptions:: +@@ -3905,7 +3905,7 @@ const FeatureEntry kFeatureEntries[] = { + autofill::features::kAutofillSaveCreditCardUsesImprovedMessaging, + kAutofillSaveCreditCardUsesImprovedMessagingVariations, + "AutofillSaveCreditCardUsesImprovedMessaging")}, +-#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_CHROMEOS) + {"smart-dim-model-v3", flag_descriptions::kSmartDimModelV3Name, Index: branches/2019Q3/www/chromium/files/patch-chrome_browser_after__startup__task__utils.cc =================================================================== --- branches/2019Q3/www/chromium/files/patch-chrome_browser_after__startup__task__utils.cc (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-chrome_browser_after__startup__task__utils.cc (revision 508999) @@ -1,38 +1,38 @@ ---- chrome/browser/after_startup_task_utils.cc.orig 2019-03-11 22:00:53 UTC +--- chrome/browser/after_startup_task_utils.cc.orig 2019-07-24 18:58:07 UTC +++ chrome/browser/after_startup_task_utils.cc -@@ -29,7 +29,7 @@ - #include "content/public/browser/web_contents.h" - #include "content/public/browser/web_contents_observer.h" +@@ -32,7 +32,7 @@ + #include "chrome/browser/ui/tabs/tab_strip_model.h" + #endif -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) #include "ui/views/linux_ui/linux_ui.h" #endif -@@ -115,7 +115,7 @@ void QueueTask(std::unique_ptr queue +@@ -118,7 +118,7 @@ void QueueTask(std::unique_ptr queue void SetBrowserStartupIsComplete() { DCHECK_CURRENTLY_ON(BrowserThread::UI); -#if defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_LINUX) +#if defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) // Process::Current().CreationTime() is not available on all platforms. const base::Time process_creation_time = base::Process::Current().CreationTime(); -@@ -123,7 +123,7 @@ void SetBrowserStartupIsComplete() { +@@ -126,7 +126,7 @@ void SetBrowserStartupIsComplete() { UMA_HISTOGRAM_LONG_TIMES("Startup.AfterStartupTaskDelayedUntilTime", base::Time::Now() - process_creation_time); } -#endif // defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_LINUX) +#endif // defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) UMA_HISTOGRAM_COUNTS_10000("Startup.AfterStartupTaskCount", g_after_startup_tasks.Get().size()); g_startup_complete_flag.Get().Set(); -@@ -132,7 +132,7 @@ void SetBrowserStartupIsComplete() { +@@ -135,7 +135,7 @@ void SetBrowserStartupIsComplete() { g_after_startup_tasks.Get().clear(); g_after_startup_tasks.Get().shrink_to_fit(); -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) // Make sure we complete the startup notification sequence, or launchers will // get confused by not receiving the expected message from the main process. views::LinuxUI* linux_ui = views::LinuxUI::instance(); Index: branches/2019Q3/www/chromium/files/patch-chrome_browser_browser__resources.grd =================================================================== --- branches/2019Q3/www/chromium/files/patch-chrome_browser_browser__resources.grd (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-chrome_browser_browser__resources.grd (revision 508999) @@ -1,20 +1,20 @@ ---- chrome/browser/browser_resources.grd.orig 2019-06-04 18:55:16 UTC +--- chrome/browser/browser_resources.grd.orig 2019-07-24 18:58:07 UTC +++ chrome/browser/browser_resources.grd @@ -77,7 +77,7 @@ - + - + - - - -@@ -690,7 +690,7 @@ + + + +@@ -666,7 +666,7 @@ - + Index: branches/2019Q3/www/chromium/files/patch-chrome_browser_chrome__browser__main.cc =================================================================== --- branches/2019Q3/www/chromium/files/patch-chrome_browser_chrome__browser__main.cc (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-chrome_browser_chrome__browser__main.cc (revision 508999) @@ -1,75 +1,75 @@ ---- chrome/browser/chrome_browser_main.cc.orig 2019-06-04 18:55:16 UTC +--- chrome/browser/chrome_browser_main.cc.orig 2019-07-24 18:58:07 UTC +++ chrome/browser/chrome_browser_main.cc -@@ -218,9 +218,9 @@ +@@ -220,9 +220,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_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) #if defined(OS_LINUX) #include "components/crash/content/app/breakpad_linux.h" -@@ -258,7 +258,7 @@ +@@ -260,7 +260,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" + #include "chrome/browser/profiles/profile_activity_metrics_recorder.h" #endif - -@@ -1047,7 +1047,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { +@@ -1079,7 +1079,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 . -@@ -1056,14 +1056,14 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { +@@ -1088,14 +1088,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 -@@ -1091,7 +1091,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { +@@ -1125,7 +1125,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(); + ProfileActivityMetricsRecorder::Initialize(); #endif - metrics::RendererUptimeTracker::Initialize(); -@@ -1253,6 +1253,7 @@ void ChromeBrowserMainParts::PostBrowserStart() { +@@ -1291,6 +1291,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( -@@ -1261,6 +1262,7 @@ void ChromeBrowserMainParts::PostBrowserStart() { +@@ -1299,6 +1300,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: branches/2019Q3/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.cc =================================================================== --- branches/2019Q3/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.cc (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.cc (revision 508999) @@ -1,83 +1,92 @@ ---- chrome/browser/chrome_content_browser_client.cc.orig 2019-06-04 18:55:16 UTC +--- chrome/browser/chrome_content_browser_client.cc.orig 2019-07-24 18:58:07 UTC +++ chrome/browser/chrome_content_browser_client.cc -@@ -418,7 +418,7 @@ +@@ -429,7 +429,7 @@ + #include "chromeos/services/secure_channel/secure_channel_service.h" #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" -@@ -467,7 +467,7 @@ +@@ -484,7 +484,7 @@ #endif // !defined(OS_ANDROID) #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 -@@ -493,7 +493,7 @@ +@@ -510,7 +510,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 - -@@ -1197,7 +1197,7 @@ content::BrowserMainParts* ChromeContentBrowserClient: ++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + #if defined(USE_X11) + #include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views_linux_x11.h" + #else +@@ -1250,7 +1250,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts( #elif defined(OS_CHROMEOS) - main_parts = - new chromeos::ChromeBrowserMainPartsChromeos(parameters, startup_data_); + main_parts = std::make_unique( + parameters, startup_data_); -#elif defined(OS_LINUX) +#elif defined(OS_LINUX) || defined(OS_BSD) - main_parts = new ChromeBrowserMainPartsLinux(parameters, startup_data_); + main_parts = + std::make_unique(parameters, startup_data_); #elif defined(OS_ANDROID) - 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. +@@ -1276,7 +1276,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts( + // Construct additional browser parts. Stages are called in the order in + // which they are added. #if defined(TOOLKIT_VIEWS) --#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(USE_OZONE) -+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) && !defined(USE_OZONE) - main_parts->AddParts(new ChromeBrowserMainExtraPartsViewsLinux()); +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + #if defined(USE_X11) + main_parts->AddParts(new ChromeBrowserMainExtraPartsViewsLinuxX11()); #else - main_parts->AddParts(new ChromeBrowserMainExtraPartsViews()); -@@ -2034,7 +2034,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin +@@ -2093,7 +2093,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 -@@ -3614,7 +3614,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst +@@ -2318,7 +2318,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin + process_type, + command_line); + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + // Processes may only query perf_event_open with the BPF sandbox disabled. + if (browser_command_line.HasSwitch(switches::kEnableThreadInstructionCount) && + command_line->HasSwitch(service_manager::switches::kNoSandbox)) { +@@ -3660,7 +3660,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, -@@ -4389,7 +4389,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati +@@ -4362,7 +4362,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati } #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 :: MaybeCreateThrottleFor(handle); -@@ -5228,7 +5228,7 @@ bool ChromeContentBrowserClient::HandleExternalProtoco +@@ -5205,7 +5205,7 @@ bool ChromeContentBrowserClient::HandleExternalProtoco std::unique_ptr ChromeContentBrowserClient::CreateWindowForPictureInPicture( content::PictureInPictureWindowController* controller) { -#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 Index: branches/2019Q3/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.h =================================================================== --- branches/2019Q3/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.h (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.h (revision 508999) @@ -1,17 +1,17 @@ ---- chrome/browser/chrome_content_browser_client.h.orig 2019-06-04 18:55:16 UTC +--- chrome/browser/chrome_content_browser_client.h.orig 2019-07-24 18:58:07 UTC +++ chrome/browser/chrome_content_browser_client.h -@@ -376,12 +376,12 @@ class ChromeContentBrowserClient : public content::Con +@@ -380,12 +380,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: branches/2019Q3/www/chromium/files/patch-chrome_browser_download_chrome__download__manager__delegate.cc =================================================================== --- branches/2019Q3/www/chromium/files/patch-chrome_browser_download_chrome__download__manager__delegate.cc (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-chrome_browser_download_chrome__download__manager__delegate.cc (revision 508999) @@ -1,20 +1,20 @@ ---- chrome/browser/download/chrome_download_manager_delegate.cc.orig 2019-06-04 18:55:17 UTC +--- chrome/browser/download/chrome_download_manager_delegate.cc.orig 2019-07-24 18:58:09 UTC +++ chrome/browser/download/chrome_download_manager_delegate.cc -@@ -1228,7 +1228,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe +@@ -1237,7 +1237,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 -@@ -1248,7 +1248,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe +@@ -1267,7 +1267,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: branches/2019Q3/www/chromium/files/patch-chrome_browser_download_download__commands.cc =================================================================== --- branches/2019Q3/www/chromium/files/patch-chrome_browser_download_download__commands.cc (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-chrome_browser_download_download__commands.cc (revision 508999) @@ -1,20 +1,35 @@ ---- chrome/browser/download/download_commands.cc.orig 2019-04-30 22:22:33 UTC +--- chrome/browser/download/download_commands.cc.orig 2019-07-24 18:58:09 UTC +++ chrome/browser/download/download_commands.cc -@@ -159,7 +159,7 @@ Browser* DownloadCommands::GetBrowser() const { - return browser_displayer.browser(); +@@ -30,7 +30,7 @@ + #include "net/base/url_util.h" + #include "ui/base/clipboard/scoped_clipboard_writer.h" + +-#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) ++#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) + #include "chrome/browser/ui/browser.h" + #include "chrome/browser/ui/browser_finder.h" + #include "chrome/browser/ui/scoped_tabbed_browser_displayer.h" +@@ -157,7 +157,7 @@ void DownloadCommands::ExecuteCommand(Command command) + model_->ExecuteCommand(this, command); } -#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) +#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) - bool DownloadCommands::IsDownloadPdf() const { - base::FilePath path = model_->GetTargetFilePath(); - return path.MatchesExtension(FILE_PATH_LITERAL(".pdf")); -@@ -176,7 +176,7 @@ bool DownloadCommands::CanOpenPdfInSystemViewer() cons + + Browser* DownloadCommands::GetBrowser() const { + chrome::ScopedTabbedBrowserDisplayer browser_displayer(model_->profile()); +@@ -180,12 +180,12 @@ bool DownloadCommands::CanOpenPdfInSystemViewer() cons return IsDownloadPdf() && (IsAdobeReaderDefaultPDFViewer() ? is_adobe_pdf_reader_up_to_date : true); -#elif defined(OS_MACOSX) || defined(OS_LINUX) +#elif defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) return IsDownloadPdf(); #endif } + +-#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) ++#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) + + void DownloadCommands::CopyFileAsImageToClipboard() { + if (model_->GetState() != download::DownloadItem::COMPLETE || Index: branches/2019Q3/www/chromium/files/patch-chrome_browser_download_download__commands.h =================================================================== --- branches/2019Q3/www/chromium/files/patch-chrome_browser_download_download__commands.h (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-chrome_browser_download_download__commands.h (revision 508999) @@ -1,11 +1,11 @@ ---- chrome/browser/download/download_commands.h.orig 2019-03-11 22:00:53 UTC +--- chrome/browser/download/download_commands.h.orig 2019-07-24 18:58:09 UTC +++ chrome/browser/download/download_commands.h -@@ -42,7 +42,7 @@ class DownloadCommands { +@@ -45,7 +45,7 @@ class DownloadCommands { bool IsCommandVisible(Command command) const; void ExecuteCommand(Command command); -#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) +#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) bool IsDownloadPdf() const; bool CanOpenPdfInSystemViewer() const; - #endif + Browser* GetBrowser() const; Index: branches/2019Q3/www/chromium/files/patch-chrome_browser_download_download__item__model.cc =================================================================== --- branches/2019Q3/www/chromium/files/patch-chrome_browser_download_download__item__model.cc (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-chrome_browser_download_download__item__model.cc (revision 508999) @@ -1,20 +1,20 @@ ---- chrome/browser/download/download_item_model.cc.orig 2019-03-11 22:00:53 UTC +--- chrome/browser/download/download_item_model.cc.orig 2019-07-24 18:58:09 UTC +++ chrome/browser/download/download_item_model.cc -@@ -555,7 +555,7 @@ bool DownloadItemModel::IsCommandChecked( +@@ -560,7 +560,7 @@ bool DownloadItemModel::IsCommandChecked( return download_->GetOpenWhenComplete() || download_crx_util::IsExtensionDownload(*download_); case DownloadCommands::ALWAYS_OPEN_TYPE: -#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) +#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) if (download_commands->CanOpenPdfInSystemViewer()) { DownloadPrefs* prefs = DownloadPrefs::FromBrowserContext(profile()); return prefs->ShouldOpenPdfInSystemReader(); -@@ -592,7 +592,7 @@ void DownloadItemModel::ExecuteCommand(DownloadCommand +@@ -597,7 +597,7 @@ void DownloadItemModel::ExecuteCommand(DownloadCommand bool is_checked = IsCommandChecked(download_commands, DownloadCommands::ALWAYS_OPEN_TYPE); DownloadPrefs* prefs = DownloadPrefs::FromBrowserContext(profile()); -#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) +#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) if (download_commands->CanOpenPdfInSystemViewer()) { prefs->SetShouldOpenPdfInSystemReader(!is_checked); SetShouldPreferOpeningInBrowser(is_checked); Index: branches/2019Q3/www/chromium/files/patch-chrome_browser_extensions_BUILD.gn =================================================================== --- branches/2019Q3/www/chromium/files/patch-chrome_browser_extensions_BUILD.gn (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-chrome_browser_extensions_BUILD.gn (revision 508999) @@ -1,15 +1,15 @@ ---- chrome/browser/extensions/BUILD.gn.orig 2019-06-04 18:55:17 UTC +--- chrome/browser/extensions/BUILD.gn.orig 2019-07-24 18:58:09 UTC +++ chrome/browser/extensions/BUILD.gn -@@ -1133,6 +1133,12 @@ jumbo_static_library("extensions") { +@@ -1135,6 +1135,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: branches/2019Q3/www/chromium/files/patch-chrome_browser_extensions_browser__context__keyed__service__factories.cc =================================================================== --- branches/2019Q3/www/chromium/files/patch-chrome_browser_extensions_browser__context__keyed__service__factories.cc (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-chrome_browser_extensions_browser__context__keyed__service__factories.cc (revision 508999) @@ -1,20 +1,20 @@ ---- chrome/browser/extensions/browser_context_keyed_service_factories.cc.orig 2019-03-11 22:00:53 UTC +--- chrome/browser/extensions/browser_context_keyed_service_factories.cc.orig 2019-07-24 18:58:09 UTC +++ chrome/browser/extensions/browser_context_keyed_service_factories.cc @@ -54,7 +54,7 @@ #include "chrome/browser/chromeos/extensions/input_method_api.h" #include "chrome/browser/chromeos/extensions/media_player_api.h" #include "chrome/browser/extensions/api/input_ime/input_ime_api.h" -#elif defined(OS_LINUX) || defined(OS_WIN) +#elif defined(OS_LINUX) || defined(OS_WIN) || defined(OS_BSD) #include "chrome/browser/extensions/api/input_ime/input_ime_api.h" #endif -@@ -93,7 +93,7 @@ void EnsureBrowserContextKeyedServiceFactoriesBuilt() +@@ -92,7 +92,7 @@ void EnsureBrowserContextKeyedServiceFactoriesBuilt() #if defined(OS_CHROMEOS) extensions::InputImeAPI::GetFactoryInstance(); extensions::InputMethodAPI::GetFactoryInstance(); -#elif defined(OS_LINUX) || defined(OS_WIN) +#elif defined(OS_LINUX) || defined(OS_WIN) || defined(OS_BSD) extensions::InputImeAPI::GetFactoryInstance(); #endif extensions::LanguageSettingsPrivateDelegateFactory::GetInstance(); Index: branches/2019Q3/www/chromium/files/patch-chrome_browser_extensions_external__provider__impl.cc =================================================================== --- branches/2019Q3/www/chromium/files/patch-chrome_browser_extensions_external__provider__impl.cc (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-chrome_browser_extensions_external__provider__impl.cc (revision 508999) @@ -1,20 +1,20 @@ ---- chrome/browser/extensions/external_provider_impl.cc.orig 2019-04-30 22:22:33 UTC +--- chrome/browser/extensions/external_provider_impl.cc.orig 2019-07-24 18:58:09 UTC +++ chrome/browser/extensions/external_provider_impl.cc -@@ -753,7 +753,7 @@ void ExternalProviderImpl::CreateExternalProviders( +@@ -755,7 +755,7 @@ void ExternalProviderImpl::CreateExternalProviders( chromeos::DemoSession::Get()->SetExtensionsExternalLoader(loader); provider_list->push_back(std::move(demo_apps_provider)); } -#elif defined(OS_LINUX) +#elif defined(OS_LINUX) || defined(OS_BSD) provider_list->push_back(std::make_unique( service, new ExternalPrefLoader(chrome::DIR_STANDALONE_EXTERNAL_EXTENSIONS, -@@ -780,7 +780,7 @@ void ExternalProviderImpl::CreateExternalProviders( +@@ -782,7 +782,7 @@ void ExternalProviderImpl::CreateExternalProviders( bundled_extension_creation_flags)); // Define a per-user source of external extensions. -#if defined(OS_MACOSX) || (defined(OS_LINUX) && defined(CHROMIUM_BUILD)) +#if defined(OS_MACOSX) || ((defined(OS_LINUX) || defined(OS_BSD)) && defined(CHROMIUM_BUILD)) provider_list->push_back(std::make_unique( service, new ExternalPrefLoader(chrome::DIR_USER_EXTERNAL_EXTENSIONS, Index: branches/2019Q3/www/chromium/files/patch-chrome_browser_first__run_first__run__dialog.h =================================================================== --- branches/2019Q3/www/chromium/files/patch-chrome_browser_first__run_first__run__dialog.h (nonexistent) +++ branches/2019Q3/www/chromium/files/patch-chrome_browser_first__run_first__run__dialog.h (revision 508999) @@ -0,0 +1,11 @@ +--- chrome/browser/first_run/first_run_dialog.h.orig 2019-07-29 18:50:26 UTC ++++ chrome/browser/first_run/first_run_dialog.h +@@ -9,7 +9,7 @@ + #include "build/build_config.h" + + // Hide this function on platforms where the dialog does not exist. +-#if defined(OS_MACOSX) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) ++#if defined(OS_MACOSX) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + + class Profile; + Property changes on: branches/2019Q3/www/chromium/files/patch-chrome_browser_first__run_first__run__dialog.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: branches/2019Q3/www/chromium/files/patch-chrome_browser_first__run_first__run__internal.h =================================================================== --- branches/2019Q3/www/chromium/files/patch-chrome_browser_first__run_first__run__internal.h (nonexistent) +++ branches/2019Q3/www/chromium/files/patch-chrome_browser_first__run_first__run__internal.h (revision 508999) @@ -0,0 +1,18 @@ +--- chrome/browser/first_run/first_run_internal.h.orig 2019-07-29 18:50:45 UTC ++++ chrome/browser/first_run/first_run_internal.h +@@ -64,13 +64,13 @@ FirstRunState DetermineFirstRunState(bool has_sentinel + bool force_first_run, + bool no_first_run); + +-#if defined(OS_MACOSX) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) ++#if defined(OS_MACOSX) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + // For testing, forces the first run dialog to either be shown or not. If not + // called, the decision to show the dialog or not will be made by Chrome based + // on a number of factors (such as install type, whether it's a Chrome-branded + // build, etc). + void ForceFirstRunDialogShownForTesting(bool shown); +-#endif // defined(OS_MACOSX) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) ++#endif // defined(OS_MACOSX) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + + } // namespace internal + } // namespace first_run Property changes on: branches/2019Q3/www/chromium/files/patch-chrome_browser_first__run_first__run__internal.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: branches/2019Q3/www/chromium/files/patch-chrome_browser_flag__descriptions.cc =================================================================== --- branches/2019Q3/www/chromium/files/patch-chrome_browser_flag__descriptions.cc (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-chrome_browser_flag__descriptions.cc (revision 508999) @@ -1,38 +1,28 @@ ---- chrome/browser/flag_descriptions.cc.orig 2019-06-04 18:55:17 UTC +--- chrome/browser/flag_descriptions.cc.orig 2019-07-24 18:58:09 UTC +++ chrome/browser/flag_descriptions.cc -@@ -3465,29 +3465,29 @@ const char kInstallableInkDropDescription[] = +@@ -3256,21 +3256,21 @@ 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) || 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: branches/2019Q3/www/chromium/files/patch-chrome_browser_flag__descriptions.h =================================================================== --- branches/2019Q3/www/chromium/files/patch-chrome_browser_flag__descriptions.h (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-chrome_browser_flag__descriptions.h (revision 508999) @@ -1,35 +1,26 @@ ---- chrome/browser/flag_descriptions.h.orig 2019-06-04 18:55:17 UTC +--- chrome/browser/flag_descriptions.h.orig 2019-07-24 18:58:09 UTC +++ chrome/browser/flag_descriptions.h -@@ -2094,26 +2094,26 @@ extern const char kInstallableInkDropDescription[]; +@@ -1963,19 +1963,19 @@ 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) -#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: branches/2019Q3/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__logging__handler__host.cc =================================================================== --- branches/2019Q3/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__logging__handler__host.cc (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__logging__handler__host.cc (revision 508999) @@ -1,33 +1,33 @@ ---- chrome/browser/media/webrtc/webrtc_logging_handler_host.cc.orig 2019-04-30 22:22:34 UTC +--- chrome/browser/media/webrtc/webrtc_logging_handler_host.cc.orig 2019-07-24 18:58:09 UTC +++ chrome/browser/media/webrtc/webrtc_logging_handler_host.cc @@ -26,10 +26,10 @@ #include "content/public/browser/content_browser_client.h" #include "content/public/browser/render_process_host.h" -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) #include "content/public/browser/child_process_security_policy.h" #include "storage/browser/fileapi/isolated_context.h" -#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) +#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) using content::BrowserThread; using webrtc_event_logging::WebRtcEventLogManager; @@ -281,7 +281,7 @@ void WebRtcLoggingHandlerHost::StartEventLogging( web_app_id, callback); } -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) void WebRtcLoggingHandlerHost::GetLogsDirectory( const LogsDirectoryCallback& callback, const LogsDirectoryErrorCallback& error_callback) { -@@ -327,7 +327,7 @@ void WebRtcLoggingHandlerHost::GrantLogsDirectoryAcces +@@ -328,7 +328,7 @@ void WebRtcLoggingHandlerHost::GrantLogsDirectoryAcces FROM_HERE, {BrowserThread::UI}, - base::BindOnce(callback, filesystem_id, registered_name)); + base::BindOnce(callback, file_system.id(), registered_name)); } -#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) +#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD void WebRtcLoggingHandlerHost::OnRtpPacket( std::unique_ptr packet_header, Index: branches/2019Q3/www/chromium/files/patch-chrome_browser_metrics_chrome__metrics__service__client.cc =================================================================== --- branches/2019Q3/www/chromium/files/patch-chrome_browser_metrics_chrome__metrics__service__client.cc (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-chrome_browser_metrics_chrome__metrics__service__client.cc (revision 508999) @@ -1,11 +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.orig 2019-07-24 18:58:09 UTC +++ chrome/browser/metrics/chrome_metrics_service_client.cc -@@ -898,7 +898,7 @@ bool ChromeMetricsServiceClient::RegisterForProfileEve +@@ -902,7 +902,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( Index: branches/2019Q3/www/chromium/files/patch-chrome_browser_metrics_process__memory__metrics__emitter.cc =================================================================== --- branches/2019Q3/www/chromium/files/patch-chrome_browser_metrics_process__memory__metrics__emitter.cc (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-chrome_browser_metrics_process__memory__metrics__emitter.cc (revision 508999) @@ -1,20 +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.orig 2019-07-24 18:58:09 UTC +++ chrome/browser/metrics/process_memory_metrics_emitter.cc -@@ -359,7 +359,7 @@ void EmitProcessUmaAndUkm(const GlobalMemoryDump::Proc +@@ -360,7 +360,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 +@@ -383,7 +383,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); Index: branches/2019Q3/www/chromium/files/patch-chrome_browser_net_system__network__context__manager.cc =================================================================== --- branches/2019Q3/www/chromium/files/patch-chrome_browser_net_system__network__context__manager.cc (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-chrome_browser_net_system__network__context__manager.cc (revision 508999) @@ -1,65 +1,65 @@ ---- chrome/browser/net/system_network_context_manager.cc.orig 2019-06-04 18:55:17 UTC +--- chrome/browser/net/system_network_context_manager.cc.orig 2019-07-24 18:58:09 UTC +++ chrome/browser/net/system_network_context_manager.cc @@ -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 { -@@ -198,10 +198,10 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut +@@ -191,10 +191,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 +@@ -434,10 +434,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 +@@ -486,10 +486,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 +@@ -586,7 +586,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: branches/2019Q3/www/chromium/files/patch-chrome_browser_password__manager_chrome__password__manager__client.cc =================================================================== --- branches/2019Q3/www/chromium/files/patch-chrome_browser_password__manager_chrome__password__manager__client.cc (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-chrome_browser_password__manager_chrome__password__manager__client.cc (revision 508999) @@ -1,14 +1,14 @@ ---- 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.orig 2019-07-24 18:58:10 UTC +++ chrome/browser/password_manager/chrome_password_manager_client.cc -@@ -81,7 +81,11 @@ +@@ -82,7 +82,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(FULL_SAFE_BROWSING) Index: branches/2019Q3/www/chromium/files/patch-chrome_browser_policy_configuration__policy__handler__list__factory.cc =================================================================== --- branches/2019Q3/www/chromium/files/patch-chrome_browser_policy_configuration__policy__handler__list__factory.cc (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-chrome_browser_policy_configuration__policy__handler__list__factory.cc (revision 508999) @@ -1,20 +1,34 @@ ---- 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.orig 2019-07-24 18:58:10 UTC +++ chrome/browser/policy/configuration_policy_handler_list_factory.cc @@ -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)) + #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_prefs.h" #endif -@@ -994,7 +994,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = - prefs::kAllowPopupsDuringPageUnload, + +@@ -321,11 +321,11 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = + { key::kSafeSitesFilterBehavior, + policy_prefs::kSafeSitesFilterBehavior, + base::Value::Type::INTEGER}, +-#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_CHROMEOS) || defined(OS_BSD) + { key::kAuthNegotiateDelegateByKdcPolicy, + prefs::kAuthNegotiateDelegateByKdcPolicy, base::Value::Type::BOOLEAN }, +-#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_CHROMEOS) ++#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_CHROMEOS) || defined(OS_BSD) + #if defined(OS_POSIX) + { key::kNtlmV2Enabled, + prefs::kNtlmV2Enabled, +@@ -1021,7 +1021,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = + 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)) + #if defined(OS_WIN) || defined(OS_MACOSX) || \ +- (defined(OS_LINUX) && !defined(OS_CHROMEOS)) ++ (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) { key::kAlternativeBrowserPath, browser_switcher::prefs::kAlternativeBrowserPath, + base::Value::Type::STRING }, Index: branches/2019Q3/www/chromium/files/patch-chrome_browser_prefs_browser__prefs.cc =================================================================== --- branches/2019Q3/www/chromium/files/patch-chrome_browser_prefs_browser__prefs.cc (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-chrome_browser_prefs_browser__prefs.cc (revision 508999) @@ -1,20 +1,20 @@ ---- chrome/browser/prefs/browser_prefs.cc.orig 2019-06-04 18:55:17 UTC +--- chrome/browser/prefs/browser_prefs.cc.orig 2019-07-24 18:58:10 UTC +++ chrome/browser/prefs/browser_prefs.cc -@@ -332,7 +332,7 @@ - #include "chrome/browser/safe_browsing/settings_reset_prompt/settings_reset_prompt_prefs_manager.h" +@@ -338,7 +338,7 @@ #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) #include "chrome/browser/browser_switcher/browser_switcher_prefs.h" #endif -@@ -849,7 +849,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync - safe_browsing::PostCleanupSettingsResetter::RegisterProfilePrefs(registry); + +@@ -872,7 +872,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync #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) browser_switcher::BrowserSwitcherPrefs::RegisterProfilePrefs(registry); #endif + Index: branches/2019Q3/www/chromium/files/patch-chrome_browser_profiles_chrome__browser__main__extra__parts__profiles.cc =================================================================== --- branches/2019Q3/www/chromium/files/patch-chrome_browser_profiles_chrome__browser__main__extra__parts__profiles.cc (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-chrome_browser_profiles_chrome__browser__main__extra__parts__profiles.cc (revision 508999) @@ -1,11 +1,11 @@ ---- 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.orig 2019-07-24 18:58:10 UTC +++ chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc -@@ -329,7 +329,7 @@ void ChromeBrowserMainExtraPartsProfiles:: - #if !defined(OS_ANDROID) +@@ -330,7 +330,7 @@ void ChromeBrowserMainExtraPartsProfiles:: 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)) + #if defined(OS_WIN) || defined(OS_MACOSX) || \ +- (defined(OS_LINUX) && !defined(OS_CHROMEOS)) ++ (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) metrics::DesktopProfileSessionDurationsServiceFactory::GetInstance(); #endif + ModelTypeStoreServiceFactory::GetInstance(); Index: branches/2019Q3/www/chromium/files/patch-chrome_browser_profiles_profile__attributes__entry.cc =================================================================== --- branches/2019Q3/www/chromium/files/patch-chrome_browser_profiles_profile__attributes__entry.cc (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-chrome_browser_profiles_profile__attributes__entry.cc (revision 508999) @@ -1,11 +1,11 @@ ---- chrome/browser/profiles/profile_attributes_entry.cc.orig 2019-03-11 22:00:53 UTC +--- chrome/browser/profiles/profile_attributes_entry.cc.orig 2019-07-24 18:58:10 UTC +++ chrome/browser/profiles/profile_attributes_entry.cc -@@ -57,7 +57,7 @@ void ProfileAttributesEntry::Initialize(ProfileInfoCac +@@ -83,7 +83,7 @@ void ProfileAttributesEntry::Initialize(ProfileInfoCac if (is_force_signin_enabled_) { if (!IsAuthenticated()) is_force_signin_profile_locked_ = true; -#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_WIN) +#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_WIN) || defined(OS_BSD) } else if (IsSigninRequired()) { // Profiles that require signin in the absence of an enterprise policy are // left-overs from legacy supervised users. Just unlock them, so users can Index: branches/2019Q3/www/chromium/files/patch-chrome_browser_renderer__context__menu_render__view__context__menu.cc =================================================================== --- branches/2019Q3/www/chromium/files/patch-chrome_browser_renderer__context__menu_render__view__context__menu.cc (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-chrome_browser_renderer__context__menu_render__view__context__menu.cc (revision 508999) @@ -1,29 +1,29 @@ ---- 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.orig 2019-07-24 18:58:10 UTC +++ chrome/browser/renderer_context_menu/render_view_context_menu.cc -@@ -1531,7 +1531,7 @@ void RenderViewContextMenu::AppendEditableItems() { +@@ -1672,7 +1672,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, -@@ -1573,7 +1573,7 @@ void RenderViewContextMenu::AppendLanguageSettings() { +@@ -1714,7 +1714,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 -@@ -1851,7 +1851,7 @@ bool RenderViewContextMenu::IsCommandIdEnabled(int id) +@@ -1994,7 +1994,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: branches/2019Q3/www/chromium/files/patch-chrome_browser_renderer__preferences__util.cc =================================================================== --- branches/2019Q3/www/chromium/files/patch-chrome_browser_renderer__preferences__util.cc (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-chrome_browser_renderer__preferences__util.cc (revision 508999) @@ -1,29 +1,29 @@ ---- chrome/browser/renderer_preferences_util.cc.orig 2019-06-04 18:55:17 UTC +--- chrome/browser/renderer_preferences_util.cc.orig 2019-07-24 18:58:10 UTC +++ chrome/browser/renderer_preferences_util.cc -@@ -29,7 +29,7 @@ +@@ -30,7 +30,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 +@@ -130,7 +130,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 +@@ -149,7 +149,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); #endif Index: branches/2019Q3/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.js =================================================================== --- branches/2019Q3/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.js (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.js (revision 508999) @@ -1,33 +1,33 @@ ---- chrome/browser/resources/settings/appearance_page/appearance_page.js.orig 2019-03-11 22:00:54 UTC +--- chrome/browser/resources/settings/appearance_page/appearance_page.js.orig 2019-07-24 18:58:11 UTC +++ chrome/browser/resources/settings/appearance_page/appearance_page.js -@@ -120,7 +120,7 @@ Polymer({ +@@ -125,7 +125,7 @@ Polymer({ 'defaultFontSizeChanged_(prefs.webkit.webprefs.default_font_size.value)', 'themeChanged_(prefs.extensions.theme.id.value, useSystemTheme_)', - // + // // NOTE: this pref only exists on Linux. 'useSystemThemePrefChanged_(prefs.extensions.theme.use_system.value)', // -@@ -223,7 +223,7 @@ Polymer({ +@@ -228,7 +228,7 @@ Polymer({ this.browserProxy_.useDefaultTheme(); }, - // + // /** * @param {boolean} useSystemTheme * @private -@@ -292,10 +292,10 @@ Polymer({ +@@ -304,10 +304,10 @@ Polymer({ } let i18nId; - // + // i18nId = useSystemTheme ? 'systemTheme' : 'classicTheme'; // - // + // i18nId = 'chooseFromWebStore'; // this.themeSublabel_ = this.i18n(i18nId); Index: branches/2019Q3/www/chromium/files/patch-chrome_browser_send__tab__to__self_send__tab__to__self__client__service.cc =================================================================== --- branches/2019Q3/www/chromium/files/patch-chrome_browser_send__tab__to__self_send__tab__to__self__client__service.cc (nonexistent) +++ branches/2019Q3/www/chromium/files/patch-chrome_browser_send__tab__to__self_send__tab__to__self__client__service.cc (revision 508999) @@ -0,0 +1,11 @@ +--- chrome/browser/send_tab_to_self/send_tab_to_self_client_service.cc.orig 2019-07-29 18:57:56 UTC ++++ chrome/browser/send_tab_to_self/send_tab_to_self_client_service.cc +@@ -41,7 +41,7 @@ void SendTabToSelfClientService::SendTabToSelfModelLoa + void SendTabToSelfClientService::EntriesAddedRemotely( + const std::vector& new_entries) { + for (const std::unique_ptr& handler : GetHandlers()) { +-#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) ++#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD) + // Only respond to notifications corresponding to this service's profile + // for these OSes; mobile does not have a Profile. + // Cast note: on desktop, handlers are guaranteed to be the derived class Property changes on: branches/2019Q3/www/chromium/files/patch-chrome_browser_send__tab__to__self_send__tab__to__self__client__service.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: branches/2019Q3/www/chromium/files/patch-chrome_browser_signin_signin__util.cc =================================================================== --- branches/2019Q3/www/chromium/files/patch-chrome_browser_signin_signin__util.cc (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-chrome_browser_signin_signin__util.cc (revision 508999) @@ -1,11 +1,20 @@ ---- chrome/browser/signin/signin_util.cc.orig 2019-03-11 22:00:54 UTC +--- chrome/browser/signin/signin_util.cc.orig 2019-07-24 18:58:11 UTC +++ chrome/browser/signin/signin_util.cc -@@ -42,7 +42,7 @@ namespace { +@@ -33,7 +33,7 @@ + #include "services/identity/public/cpp/primary_account_mutator.h" + #include "ui/base/l10n/l10n_util.h" + +-#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) ++#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) + #include "chrome/browser/ui/browser_finder.h" + #include "chrome/browser/ui/browser_list.h" + #include "chrome/browser/ui/browser_list_observer.h" +@@ -45,7 +45,7 @@ namespace { constexpr char kSignoutSettingKey[] = "signout_setting"; -#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) +#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) #define CAN_DELETE_PROFILE #endif Index: branches/2019Q3/www/chromium/files/patch-chrome_browser_ssl_ssl__error__controller__client.cc =================================================================== --- branches/2019Q3/www/chromium/files/patch-chrome_browser_ssl_ssl__error__controller__client.cc (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-chrome_browser_ssl_ssl__error__controller__client.cc (revision 508999) @@ -1,20 +1,20 @@ ---- chrome/browser/ssl/ssl_error_controller_client.cc.orig 2019-06-04 18:55:18 UTC +--- chrome/browser/ssl/ssl_error_controller_client.cc.orig 2019-07-24 18:58:11 UTC +++ chrome/browser/ssl/ssl_error_controller_client.cc @@ -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; -@@ -221,7 +221,7 @@ void SSLErrorControllerClient::Proceed() { +@@ -218,7 +218,7 @@ void SSLErrorControllerClient::Proceed() { } bool SSLErrorControllerClient::CanLaunchDateAndTimeSettings() { -#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 Index: branches/2019Q3/www/chromium/files/patch-chrome_browser_sync_chrome__sync__client.cc =================================================================== --- branches/2019Q3/www/chromium/files/patch-chrome_browser_sync_chrome__sync__client.cc (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-chrome_browser_sync_chrome__sync__client.cc (revision 508999) @@ -1,20 +1,20 @@ ---- chrome/browser/sync/chrome_sync_client.cc.orig 2019-06-04 18:55:18 UTC +--- chrome/browser/sync/chrome_sync_client.cc.orig 2019-07-24 18:58:12 UTC +++ chrome/browser/sync/chrome_sync_client.cc -@@ -441,7 +441,7 @@ ChromeSyncClient::CreateDataTypeControllers(syncer::Sy - } +@@ -372,7 +372,7 @@ ChromeSyncClient::CreateDataTypeControllers(syncer::Sy + dump_stack)); #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)) { -@@ -457,7 +457,7 @@ ChromeSyncClient::CreateDataTypeControllers(syncer::Sy - base::CreateSequencedTaskRunnerWithTraits({BrowserThread::UI}))); - } + controllers.push_back( +@@ -382,7 +382,7 @@ ChromeSyncClient::CreateDataTypeControllers(syncer::Sy + base::Unretained(this), syncer::DICTIONARY), + dump_stack)); } -#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: branches/2019Q3/www/chromium/files/patch-chrome_browser_tracing_crash__service__uploader.cc =================================================================== --- branches/2019Q3/www/chromium/files/patch-chrome_browser_tracing_crash__service__uploader.cc (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-chrome_browser_tracing_crash__service__uploader.cc (revision 508999) @@ -1,11 +1,11 @@ ---- chrome/browser/tracing/crash_service_uploader.cc.orig 2019-04-30 22:22:36 UTC +--- chrome/browser/tracing/crash_service_uploader.cc.orig 2019-07-24 18:58:12 UTC +++ chrome/browser/tracing/crash_service_uploader.cc -@@ -163,6 +163,8 @@ void TraceCrashServiceUploader::DoCompressOnBackground +@@ -162,6 +162,8 @@ void TraceCrashServiceUploader::DoCompressOnBackground const char product[] = "Chrome_Linux"; #elif defined(OS_ANDROID) const char product[] = "Chrome_Android"; +#elif defined(OS_FREEBSD) + const char product[] = "Chrome_FreeBSD"; #else #error Platform not supported. #endif Index: branches/2019Q3/www/chromium/files/patch-chrome_browser_ui_browser__command__controller.cc =================================================================== --- branches/2019Q3/www/chromium/files/patch-chrome_browser_ui_browser__command__controller.cc (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-chrome_browser_ui_browser__command__controller.cc (revision 508999) @@ -1,38 +1,38 @@ ---- chrome/browser/ui/browser_command_controller.cc.orig 2019-06-04 18:55:18 UTC +--- chrome/browser/ui/browser_command_controller.cc.orig 2019-07-24 18:58:12 UTC +++ chrome/browser/ui/browser_command_controller.cc -@@ -80,7 +80,7 @@ +@@ -81,7 +81,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 -@@ -216,7 +216,7 @@ bool BrowserCommandController::IsReservedCommandOrKey( +@@ -251,7 +251,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 = -@@ -426,7 +426,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo +@@ -461,7 +461,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; -@@ -863,7 +863,7 @@ void BrowserCommandController::InitCommandState() { +@@ -911,7 +911,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: branches/2019Q3/www/chromium/files/patch-chrome_browser_ui_browser__window.h =================================================================== --- branches/2019Q3/www/chromium/files/patch-chrome_browser_ui_browser__window.h (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-chrome_browser_ui_browser__window.h (revision 508999) @@ -1,11 +1,11 @@ ---- chrome/browser/ui/browser_window.h.orig 2019-06-04 18:55:18 UTC +--- chrome/browser/ui/browser_window.h.orig 2019-07-24 18:58:12 UTC +++ chrome/browser/ui/browser_window.h -@@ -435,7 +435,7 @@ class BrowserWindow : public ui::BaseWindow { +@@ -448,7 +448,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: branches/2019Q3/www/chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator.cc =================================================================== --- branches/2019Q3/www/chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator.cc (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator.cc (revision 508999) @@ -1,22 +1,22 @@ ---- chrome/browser/ui/startup/startup_browser_creator.cc.orig 2019-06-04 18:55:18 UTC +--- chrome/browser/ui/startup/startup_browser_creator.cc.orig 2019-07-24 18:58:12 UTC +++ chrome/browser/ui/startup/startup_browser_creator.cc @@ -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 -@@ -652,8 +652,10 @@ bool StartupBrowserCreator::ProcessCmdLineImpl( +@@ -663,8 +663,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: branches/2019Q3/www/chromium/files/patch-chrome_browser_ui_tab__helpers.cc =================================================================== --- branches/2019Q3/www/chromium/files/patch-chrome_browser_ui_tab__helpers.cc (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-chrome_browser_ui_tab__helpers.cc (revision 508999) @@ -1,25 +1,25 @@ ---- chrome/browser/ui/tab_helpers.cc.orig 2019-06-04 18:55:18 UTC +--- chrome/browser/ui/tab_helpers.cc.orig 2019-07-24 18:58:12 UTC +++ chrome/browser/ui/tab_helpers.cc -@@ -118,7 +118,7 @@ +@@ -119,7 +119,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: branches/2019Q3/www/chromium/files/patch-chrome_browser_ui_toolbar_app__menu__model.cc =================================================================== --- branches/2019Q3/www/chromium/files/patch-chrome_browser_ui_toolbar_app__menu__model.cc (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-chrome_browser_ui_toolbar_app__menu__model.cc (revision 508999) @@ -1,11 +1,11 @@ ---- chrome/browser/ui/toolbar/app_menu_model.cc.orig 2019-06-04 18:55:18 UTC +--- chrome/browser/ui/toolbar/app_menu_model.cc.orig 2019-07-24 18:58:12 UTC +++ chrome/browser/ui/toolbar/app_menu_model.cc -@@ -670,7 +670,7 @@ bool AppMenuModel::IsCommandIdVisible(int command_id) +@@ -671,7 +671,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: branches/2019Q3/www/chromium/files/patch-chrome_browser_ui_views_chrome__browser__main__extra__parts__views.cc =================================================================== --- branches/2019Q3/www/chromium/files/patch-chrome_browser_ui_views_chrome__browser__main__extra__parts__views.cc (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-chrome_browser_ui_views_chrome__browser__main__extra__parts__views.cc (revision 508999) @@ -1,38 +1,38 @@ ---- 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.orig 2019-07-24 18:58:12 UTC +++ chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc -@@ -33,7 +33,7 @@ +@@ -32,7 +32,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 @@ +@@ -42,7 +42,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() {} -@@ -89,7 +89,7 @@ void ChromeBrowserMainExtraPartsViews::PreProfileInit( +@@ -87,7 +87,7 @@ void ChromeBrowserMainExtraPartsViews::PreProfileInit( g_browser_process->system_network_context_manager()->GetContext()); } -#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. -@@ -120,7 +120,7 @@ void ChromeBrowserMainExtraPartsViews::PreProfileInit( +@@ -118,7 +118,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: branches/2019Q3/www/chromium/files/patch-chrome_browser_ui_views_first__run__dialog.cc =================================================================== --- branches/2019Q3/www/chromium/files/patch-chrome_browser_ui_views_first__run__dialog.cc (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-chrome_browser_ui_views_first__run__dialog.cc (revision 508999) @@ -1,24 +1,24 @@ ---- chrome/browser/ui/views/first_run_dialog.cc.orig 2019-03-11 22:00:54 UTC +--- chrome/browser/ui/views/first_run_dialog.cc.orig 2019-07-24 18:58:12 UTC +++ chrome/browser/ui/views/first_run_dialog.cc @@ -37,8 +37,10 @@ namespace { void InitCrashReporterIfEnabled(bool enabled) { +#if !defined(OS_BSD) if (enabled) breakpad::InitCrashReporter(std::string()); +#endif } } // namespace @@ -111,8 +113,10 @@ views::View* FirstRunDialog::CreateExtraView() { bool FirstRunDialog::Accept() { GetWidget()->Hide(); +#if !defined(OS_BSD) - ChangeMetricsReportingStateWithReply(report_crashes_->checked(), + ChangeMetricsReportingStateWithReply(report_crashes_->GetChecked(), base::Bind(&InitCrashReporterIfEnabled)); +#endif - if (make_default_->checked()) + if (make_default_->GetChecked()) shell_integration::SetAsDefaultBrowser(); Index: branches/2019Q3/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__view.cc =================================================================== --- branches/2019Q3/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__view.cc (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__view.cc (revision 508999) @@ -1,11 +1,11 @@ ---- chrome/browser/ui/views/frame/browser_view.cc.orig 2019-06-04 18:55:18 UTC +--- chrome/browser/ui/views/frame/browser_view.cc.orig 2019-07-24 18:58:12 UTC +++ chrome/browser/ui/views/frame/browser_view.cc -@@ -1502,7 +1502,7 @@ void BrowserView::UserChangedTheme(BrowserThemeChangeT - // light to dark mode. +@@ -1557,7 +1557,7 @@ void BrowserView::UserChangedTheme(BrowserThemeChangeT 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: branches/2019Q3/www/chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.cc =================================================================== --- branches/2019Q3/www/chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.cc (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.cc (revision 508999) @@ -1,29 +1,29 @@ ---- 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.orig 2019-07-24 18:58:13 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 @@ -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_, + menu_runner.RunMenuAt( @@ -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: branches/2019Q3/www/chromium/files/patch-chrome_browser_ui_views_frame_system__menu__model__builder.cc =================================================================== --- branches/2019Q3/www/chromium/files/patch-chrome_browser_ui_views_frame_system__menu__model__builder.cc (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-chrome_browser_ui_views_frame_system__menu__model__builder.cc (revision 508999) @@ -1,29 +1,29 @@ ---- chrome/browser/ui/views/frame/system_menu_model_builder.cc.orig 2019-03-11 22:00:54 UTC +--- chrome/browser/ui/views/frame/system_menu_model_builder.cc.orig 2019-07-24 18:58:13 UTC +++ chrome/browser/ui/views/frame/system_menu_model_builder.cc -@@ -78,7 +78,7 @@ void SystemMenuModelBuilder::BuildMenu(ui::SimpleMenuM +@@ -79,7 +79,7 @@ void SystemMenuModelBuilder::BuildMenu(ui::SimpleMenuM void SystemMenuModelBuilder::BuildSystemMenuForBrowserWindow( ui::SimpleMenuModel* model) { -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) model->AddItemWithStringId(IDC_MINIMIZE_WINDOW, IDS_MINIMIZE_WINDOW_MENU); model->AddItemWithStringId(IDC_MAXIMIZE_WINDOW, IDS_MAXIMIZE_WINDOW_MENU); model->AddItemWithStringId(IDC_RESTORE_WINDOW, IDS_RESTORE_WINDOW_MENU); -@@ -90,7 +90,7 @@ void SystemMenuModelBuilder::BuildSystemMenuForBrowser +@@ -91,7 +91,7 @@ void SystemMenuModelBuilder::BuildSystemMenuForBrowser model->AddSeparator(ui::NORMAL_SEPARATOR); model->AddItemWithStringId(IDC_TASK_MANAGER, IDS_TASK_MANAGER); } -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) model->AddSeparator(ui::NORMAL_SEPARATOR); model->AddCheckItemWithStringId(IDC_USE_SYSTEM_TITLE_BAR, IDS_SHOW_WINDOW_DECORATIONS_MENU); -@@ -126,7 +126,7 @@ void SystemMenuModelBuilder::BuildSystemMenuForAppOrPo +@@ -127,7 +127,7 @@ void SystemMenuModelBuilder::BuildSystemMenuForAppOrPo model->AddSeparator(ui::NORMAL_SEPARATOR); model->AddItemWithStringId(IDC_TASK_MANAGER, IDS_TASK_MANAGER); } -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) model->AddSeparator(ui::NORMAL_SEPARATOR); model->AddItemWithStringId(IDC_CLOSE_WINDOW, IDS_CLOSE); #endif Index: branches/2019Q3/www/chromium/files/patch-chrome_browser_ui_views_tabs_new__tab__button.cc =================================================================== --- branches/2019Q3/www/chromium/files/patch-chrome_browser_ui_views_tabs_new__tab__button.cc (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-chrome_browser_ui_views_tabs_new__tab__button.cc (revision 508999) @@ -1,11 +1,11 @@ ---- 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.orig 2019-07-24 18:58:13 UTC +++ chrome/browser/ui/views/tabs/new_tab_button.cc -@@ -65,7 +65,7 @@ const gfx::Size NewTabButton::kButtonSize{28, 28}; +@@ -69,7 +69,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: branches/2019Q3/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab.cc =================================================================== --- branches/2019Q3/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab.cc (nonexistent) +++ branches/2019Q3/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab.cc (revision 508999) @@ -0,0 +1,20 @@ +--- chrome/browser/ui/views/tabs/tab.cc.orig 2019-07-29 18:58:58 UTC ++++ chrome/browser/ui/views/tabs/tab.cc +@@ -525,7 +525,7 @@ void Tab::OnMouseCaptureLost() { + void Tab::OnMouseMoved(const ui::MouseEvent& event) { + tab_style_->SetHoverLocation(event.location()); + controller_->OnMouseEventInTab(this, event); +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + MaybeUpdateHoverStatus(event); + #endif + } +@@ -535,7 +535,7 @@ void Tab::OnMouseEntered(const ui::MouseEvent& event) + } + + void Tab::MaybeUpdateHoverStatus(const ui::MouseEvent& event) { +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + // Move the hit test area for hovering up so that it is not overlapped by tab + // hover cards when they are shown. + // TODO(crbug/978134): Once Linux/CrOS widget transparency is solved, remove Property changes on: branches/2019Q3/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab.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: branches/2019Q3/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__drag__controller.cc =================================================================== --- branches/2019Q3/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__drag__controller.cc (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__drag__controller.cc (revision 508999) @@ -1,29 +1,29 @@ ---- 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.orig 2019-07-24 18:58:13 UTC +++ chrome/browser/ui/views/tabs/tab_drag_controller.cc -@@ -436,7 +436,7 @@ void TabDragController::Init(TabStrip* source_tabstrip +@@ -444,7 +444,7 @@ void TabDragController::Init(TabDragContext* source_co // synchronous on desktop Linux, so use that. // - Chrome OS // Releasing capture on Ash cancels gestures so avoid it. -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) can_release_capture_ = false; #endif start_point_in_screen_ = gfx::Point(source_tab_offset, mouse_offset.y()); -@@ -868,7 +868,7 @@ TabDragController::DragBrowserToNewTabStrip(TabStrip* +@@ -872,7 +872,7 @@ TabDragController::DragBrowserToNewTabStrip(TabDragCon else - target_tabstrip->GetWidget()->SetCapture(attached_tabstrip_); + SetCapture(target_context); -#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. -@@ -2044,7 +2044,7 @@ TabDragController::Liveness TabDragController::GetLoca +@@ -2023,7 +2023,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: branches/2019Q3/www/chromium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc =================================================================== --- branches/2019Q3/www/chromium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc (revision 508999) @@ -1,55 +1,55 @@ ---- 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.orig 2019-07-24 18:58:13 UTC +++ chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc -@@ -202,11 +202,11 @@ +@@ -205,11 +205,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 -@@ -322,7 +322,7 @@ bool IsAboutUI(const GURL& url) { +@@ -325,7 +325,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) -@@ -619,7 +619,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we +@@ -627,7 +627,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 -@@ -664,17 +664,17 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we +@@ -672,17 +672,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: branches/2019Q3/www/chromium/files/patch-chrome_browser_ui_webui_settings_settings__localized__strings__provider.cc =================================================================== --- branches/2019Q3/www/chromium/files/patch-chrome_browser_ui_webui_settings_settings__localized__strings__provider.cc (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-chrome_browser_ui_webui_settings_settings__localized__strings__provider.cc (revision 508999) @@ -1,20 +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.orig 2019-07-24 18:58:13 UTC +++ chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc -@@ -566,7 +566,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht +@@ -585,7 +585,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}, +@@ -605,7 +605,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht + {"openWallpaperApp", IDS_OS_SETTINGS_OPEN_WALLPAPER_APP}, + {"setWallpaper", IDS_OS_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) Index: branches/2019Q3/www/chromium/files/patch-chrome_common_BUILD.gn =================================================================== --- branches/2019Q3/www/chromium/files/patch-chrome_common_BUILD.gn (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-chrome_common_BUILD.gn (revision 508999) @@ -1,13 +1,13 @@ ---- chrome/common/BUILD.gn.orig 2019-06-04 18:55:18 UTC +--- chrome/common/BUILD.gn.orig 2019-07-24 18:58:13 UTC +++ chrome/common/BUILD.gn -@@ -306,6 +306,10 @@ static_library("common") { +@@ -298,6 +298,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: branches/2019Q3/www/chromium/files/patch-chrome_common_chrome__features.cc =================================================================== --- branches/2019Q3/www/chromium/files/patch-chrome_common_chrome__features.cc (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-chrome_common_chrome__features.cc (revision 508999) @@ -1,36 +1,27 @@ ---- chrome/common/chrome_features.cc.orig 2019-06-04 18:55:18 UTC +--- chrome/common/chrome_features.cc.orig 2019-07-24 18:58:13 UTC +++ chrome/common/chrome_features.cc -@@ -92,13 +92,13 @@ const base::Feature kAutoFetchOnNetErrorPage{"AutoFetc +@@ -98,13 +98,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. -@@ -144,7 +144,7 @@ const base::Feature kThirdPartyModulesBlocking{ +@@ -150,7 +150,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{ -@@ -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) || \ -+#if defined(OS_CHROMEOS) || defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) || \ - defined(OS_MACOSX) - base::FEATURE_ENABLED_BY_DEFAULT - #else Index: branches/2019Q3/www/chromium/files/patch-chrome_common_chrome__features.h =================================================================== --- branches/2019Q3/www/chromium/files/patch-chrome_common_chrome__features.h (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-chrome_common_chrome__features.h (revision 508999) @@ -1,24 +1,24 @@ ---- chrome/common/chrome_features.h.orig 2019-06-04 18:55:18 UTC +--- chrome/common/chrome_features.h.orig 2019-07-24 18:58:13 UTC +++ chrome/common/chrome_features.h -@@ -60,10 +60,10 @@ COMPONENT_EXPORT(CHROME_FEATURES) +@@ -65,10 +65,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; -@@ -79,7 +79,7 @@ extern const base::Feature kBrowserHangFixesExperiment +@@ -84,7 +84,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: branches/2019Q3/www/chromium/files/patch-chrome_common_chrome__paths__internal.h =================================================================== --- branches/2019Q3/www/chromium/files/patch-chrome_common_chrome__paths__internal.h (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-chrome_common_chrome__paths__internal.h (revision 508999) @@ -1,11 +1,11 @@ ---- chrome/common/chrome_paths_internal.h.orig 2019-06-04 18:55:18 UTC +--- chrome/common/chrome_paths_internal.h.orig 2019-07-24 18:58:13 UTC +++ chrome/common/chrome_paths_internal.h -@@ -47,7 +47,7 @@ void GetUserCacheDirectory(const base::FilePath& profi +@@ -45,7 +45,7 @@ void GetUserCacheDirectory(const base::FilePath& profi // Get the path to the user's documents directory. bool GetUserDocumentsDirectory(base::FilePath* result); -#if defined(OS_WIN) || defined(OS_LINUX) +#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) // Gets the path to a safe default download directory for a user. bool GetUserDownloadsDirectorySafe(base::FilePath* result); #endif Index: branches/2019Q3/www/chromium/files/patch-chrome_common_chrome__switches.cc =================================================================== --- branches/2019Q3/www/chromium/files/patch-chrome_common_chrome__switches.cc (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-chrome_common_chrome__switches.cc (revision 508999) @@ -1,17 +1,11 @@ ---- chrome/common/chrome_switches.cc.orig 2019-06-04 18:55:18 UTC +--- chrome/common/chrome_switches.cc.orig 2019-07-24 18:58:13 UTC +++ chrome/common/chrome_switches.cc -@@ -878,12 +878,12 @@ const char kAllowNaClFileHandleAPI[] = "allow-n +@@ -853,7 +853,7 @@ 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: branches/2019Q3/www/chromium/files/patch-chrome_common_chrome__switches.h =================================================================== --- branches/2019Q3/www/chromium/files/patch-chrome_common_chrome__switches.h (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-chrome_common_chrome__switches.h (revision 508999) @@ -1,17 +1,11 @@ ---- chrome/common/chrome_switches.h.orig 2019-06-04 18:55:18 UTC +--- chrome/common/chrome_switches.h.orig 2019-07-24 18:58:13 UTC +++ chrome/common/chrome_switches.h -@@ -269,12 +269,12 @@ extern const char kAllowNaClFileHandleAPI[]; +@@ -265,7 +265,7 @@ 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: branches/2019Q3/www/chromium/files/patch-chrome_common_extensions_api_api__sources.gni =================================================================== --- branches/2019Q3/www/chromium/files/patch-chrome_common_extensions_api_api__sources.gni (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-chrome_common_extensions_api_api__sources.gni (revision 508999) @@ -1,11 +1,11 @@ ---- chrome/common/extensions/api/api_sources.gni.orig 2019-06-04 18:55:18 UTC +--- chrome/common/extensions/api/api_sources.gni.orig 2019-07-24 18:58:13 UTC +++ chrome/common/extensions/api/api_sources.gni -@@ -108,7 +108,7 @@ if (is_chromeos) { +@@ -106,7 +106,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: branches/2019Q3/www/chromium/files/patch-chrome_common_features.gni =================================================================== --- branches/2019Q3/www/chromium/files/patch-chrome_common_features.gni (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-chrome_common_features.gni (revision 508999) @@ -1,14 +1,14 @@ ---- chrome/common/features.gni.orig 2019-03-11 22:00:54 UTC +--- chrome/common/features.gni.orig 2019-07-24 18:58:14 UTC +++ chrome/common/features.gni @@ -41,9 +41,9 @@ declare_args() { (is_desktop_linux && use_dbus) || is_chromeos enable_one_click_signin = - is_win || is_mac || (is_linux && !is_chromeos && !is_chromecast) + is_win || is_mac || is_bsd || (is_linux && !is_chromeos && !is_chromecast) -- enable_service_discovery = (enable_mdns && !is_android && !is_ios) || is_mac -+ enable_service_discovery = (enable_mdns && !is_android && !is_ios) || is_mac || is_bsd +- enable_service_discovery = (enable_mdns && !is_android) || is_mac ++ enable_service_discovery = (enable_mdns && !is_android) || is_mac || is_bsd # Enables use of the session service, which is enabled by default. # Android stores them separately on the Java side. Index: branches/2019Q3/www/chromium/files/patch-chrome_common_pref__names.cc =================================================================== --- branches/2019Q3/www/chromium/files/patch-chrome_common_pref__names.cc (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-chrome_common_pref__names.cc (revision 508999) @@ -1,44 +1,44 @@ ---- chrome/common/pref_names.cc.orig 2019-06-04 18:55:19 UTC +--- chrome/common/pref_names.cc.orig 2019-07-24 18:58:14 UTC +++ chrome/common/pref_names.cc -@@ -953,7 +953,7 @@ const char kForceYouTubeRestrict[] = "settings.force_y +@@ -982,7 +982,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 -@@ -1047,7 +1047,7 @@ const char kShowUpdatePromotionInfoBar[] = +@@ -1076,7 +1076,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"; -@@ -1434,7 +1434,7 @@ const char kDownloadDefaultDirectory[] = "download.def +@@ -1468,7 +1468,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[] = +@@ -1730,12 +1730,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: branches/2019Q3/www/chromium/files/patch-chrome_common_pref__names.h =================================================================== --- branches/2019Q3/www/chromium/files/patch-chrome_common_pref__names.h (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-chrome_common_pref__names.h (revision 508999) @@ -1,41 +1,41 @@ ---- chrome/common/pref_names.h.orig 2019-06-04 18:55:19 UTC +--- chrome/common/pref_names.h.orig 2019-07-24 18:58:14 UTC +++ chrome/common/pref_names.h -@@ -302,7 +302,7 @@ extern const char kHistoryMenuPromoShown[]; +@@ -309,7 +309,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[]; -@@ -332,7 +332,7 @@ extern const char kDefaultBrowserSettingEnabled[]; +@@ -339,7 +339,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) -@@ -488,7 +488,7 @@ extern const char kAppWindowPlacement[]; +@@ -496,7 +496,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[]; +@@ -696,9 +696,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: branches/2019Q3/www/chromium/files/patch-chrome_common_webui__url__constants.cc =================================================================== --- branches/2019Q3/www/chromium/files/patch-chrome_common_webui__url__constants.cc (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-chrome_common_webui__url__constants.cc (revision 508999) @@ -1,48 +1,48 @@ ---- chrome/common/webui_url_constants.cc.orig 2019-06-04 18:55:19 UTC +--- chrome/common/webui_url_constants.cc.orig 2019-07-24 18:58:14 UTC +++ chrome/common/webui_url_constants.cc -@@ -251,7 +251,7 @@ const char kChromeUIMetroFlowURL[] = "chrome://make-me +@@ -299,7 +299,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"; -@@ -262,17 +262,17 @@ const char kChromeUIHatsURL[] = "chrome://hats/"; +@@ -310,17 +310,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) || \ - (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 -@@ -463,13 +463,13 @@ const char* const kChromeHostURLs[] = { +@@ -525,13 +525,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: branches/2019Q3/www/chromium/files/patch-chrome_common_webui__url__constants.h =================================================================== --- branches/2019Q3/www/chromium/files/patch-chrome_common_webui__url__constants.h (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-chrome_common_webui__url__constants.h (revision 508999) @@ -1,32 +1,32 @@ ---- chrome/common/webui_url_constants.h.orig 2019-06-04 18:55:19 UTC +--- chrome/common/webui_url_constants.h.orig 2019-07-24 18:58:14 UTC +++ chrome/common/webui_url_constants.h -@@ -246,7 +246,7 @@ extern const char kChromeUIMetroFlowURL[]; +@@ -262,7 +262,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[]; -@@ -258,17 +258,17 @@ extern const char kChromeUIHatsURL[]; +@@ -274,17 +274,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) || \ - (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: branches/2019Q3/www/chromium/files/patch-chrome_renderer_chrome__content__renderer__client.cc =================================================================== --- branches/2019Q3/www/chromium/files/patch-chrome_renderer_chrome__content__renderer__client.cc (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-chrome_renderer_chrome__content__renderer__client.cc (revision 508999) @@ -1,11 +1,11 @@ ---- chrome/renderer/chrome_content_renderer_client.cc.orig 2019-06-04 18:55:19 UTC +--- chrome/renderer/chrome_content_renderer_client.cc.orig 2019-07-24 18:58:14 UTC +++ chrome/renderer/chrome_content_renderer_client.cc -@@ -986,7 +986,7 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin( +@@ -1011,7 +1011,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: branches/2019Q3/www/chromium/files/patch-chrome_test_BUILD.gn =================================================================== --- branches/2019Q3/www/chromium/files/patch-chrome_test_BUILD.gn (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-chrome_test_BUILD.gn (revision 508999) @@ -1,11 +1,11 @@ ---- chrome/test/BUILD.gn.orig 2019-06-04 18:55:19 UTC +--- chrome/test/BUILD.gn.orig 2019-07-24 18:58:15 UTC +++ chrome/test/BUILD.gn -@@ -5399,7 +5399,7 @@ test("chrome_app_unittests") { +@@ -5475,7 +5475,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: branches/2019Q3/www/chromium/files/patch-chrome_test_base_in__process__browser__test.cc =================================================================== --- branches/2019Q3/www/chromium/files/patch-chrome_test_base_in__process__browser__test.cc (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-chrome_test_base_in__process__browser__test.cc (revision 508999) @@ -1,22 +1,22 @@ ---- chrome/test/base/in_process_browser_test.cc.orig 2019-06-04 18:55:19 UTC +--- chrome/test/base/in_process_browser_test.cc.orig 2019-07-24 18:58:15 UTC +++ chrome/test/base/in_process_browser_test.cc -@@ -74,6 +74,10 @@ +@@ -75,6 +75,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" -@@ -106,7 +110,7 @@ +@@ -101,7 +105,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: branches/2019Q3/www/chromium/files/patch-chrome_test_base_testing__browser__process.h =================================================================== --- branches/2019Q3/www/chromium/files/patch-chrome_test_base_testing__browser__process.h (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-chrome_test_base_testing__browser__process.h (revision 508999) @@ -1,13 +1,13 @@ ---- chrome/test/base/testing_browser_process.h.orig 2019-03-11 22:00:54 UTC +--- chrome/test/base/testing_browser_process.h.orig 2019-07-24 18:58:15 UTC +++ chrome/test/base/testing_browser_process.h -@@ -119,8 +119,8 @@ class TestingBrowserProcess : public BrowserProcess { - DownloadStatusUpdater* download_status_updater() override; +@@ -120,8 +120,8 @@ class TestingBrowserProcess : public BrowserProcess { DownloadRequestLimiter* download_request_limiter() override; + StartupData* startup_data() override; -#if (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) - void StartAutoupdateTimer() override {} +#if (defined(OS_WIN) || defined(OS_LINUX) || defined(OS_FREEBSD)) && !defined(OS_CHROMEOS) + void StartAutoupdateTimer() /*override*/ {} #endif net_log::ChromeNetLog* net_log() override; Index: branches/2019Q3/www/chromium/files/patch-chromecast_browser_cast__browser__main__parts.cc =================================================================== --- branches/2019Q3/www/chromium/files/patch-chromecast_browser_cast__browser__main__parts.cc (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-chromecast_browser_cast__browser__main__parts.cc (revision 508999) @@ -1,38 +1,38 @@ ---- chromecast/browser/cast_browser_main_parts.cc.orig 2019-06-04 18:55:20 UTC +--- chromecast/browser/cast_browser_main_parts.cc.orig 2019-07-24 18:58:17 UTC +++ chromecast/browser/cast_browser_main_parts.cc -@@ -67,7 +67,7 @@ +@@ -68,7 +68,7 @@ #include "ui/base/ui_base_switches.h" #include "ui/gl/gl_switches.h" -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) #include #include #include -@@ -263,7 +263,7 @@ const DefaultCommandLineSwitch kDefaultSwitches[] = { +@@ -280,7 +280,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. -@@ -273,7 +273,7 @@ const DefaultCommandLineSwitch kDefaultSwitches[] = { +@@ -290,7 +290,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. -@@ -412,7 +412,7 @@ void CastBrowserMainParts::PostMainMessageLoopStart() - } +@@ -435,7 +435,7 @@ void CastBrowserMainParts::ToolkitInitialized() { + views_delegate_ = std::make_unique(); + #endif // defined(USE_AURA) - 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: branches/2019Q3/www/chromium/files/patch-chromecast_browser_cast__content__browser__client.cc =================================================================== --- branches/2019Q3/www/chromium/files/patch-chromecast_browser_cast__content__browser__client.cc (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-chromecast_browser_cast__content__browser__client.cc (revision 508999) @@ -1,11 +1,11 @@ ---- chromecast/browser/cast_content_browser_client.cc.orig 2019-06-04 18:55:20 UTC +--- chromecast/browser/cast_content_browser_client.cc.orig 2019-07-24 18:58:17 UTC +++ chromecast/browser/cast_content_browser_client.cc -@@ -575,7 +575,7 @@ void CastContentBrowserClient::AppendExtraCommandLineS +@@ -576,7 +576,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: branches/2019Q3/www/chromium/files/patch-chromecast_browser_metrics_BUILD.gn =================================================================== --- branches/2019Q3/www/chromium/files/patch-chromecast_browser_metrics_BUILD.gn (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-chromecast_browser_metrics_BUILD.gn (revision 508999) @@ -1,11 +1,11 @@ ---- chromecast/browser/metrics/BUILD.gn.orig 2019-06-04 18:55:20 UTC +--- chromecast/browser/metrics/BUILD.gn.orig 2019-07-24 18:58:17 UTC +++ chromecast/browser/metrics/BUILD.gn -@@ -31,7 +31,7 @@ cast_source_set("metrics") { +@@ -32,7 +32,7 @@ cast_source_set("metrics") { "//third_party/metrics_proto", ] - if (is_linux) { + if (is_linux || is_bsd) { sources += [ "external_metrics.cc", "external_metrics.h", Index: branches/2019Q3/www/chromium/files/patch-components_autofill_core_browser_autofill__experiments.cc =================================================================== --- branches/2019Q3/www/chromium/files/patch-components_autofill_core_browser_autofill__experiments.cc (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-components_autofill_core_browser_autofill__experiments.cc (revision 508999) @@ -1,11 +1,11 @@ ---- components/autofill/core/browser/autofill_experiments.cc.orig 2019-06-04 18:55:21 UTC +--- components/autofill/core/browser/autofill_experiments.cc.orig 2019-07-24 18:58:18 UTC +++ components/autofill/core/browser/autofill_experiments.cc -@@ -227,7 +227,7 @@ bool IsAutofillNoLocalSaveOnUploadSuccessExperimentEna +@@ -215,7 +215,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( Index: branches/2019Q3/www/chromium/files/patch-components_autofill_core_browser_personal__data__manager.cc =================================================================== --- branches/2019Q3/www/chromium/files/patch-components_autofill_core_browser_personal__data__manager.cc (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-components_autofill_core_browser_personal__data__manager.cc (revision 508999) @@ -1,15 +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.orig 2019-07-24 18:58:18 UTC +++ components/autofill/core/browser/personal_data_manager.cc -@@ -1949,10 +1949,10 @@ bool PersonalDataManager::IsServerCard(const CreditCar +@@ -1940,10 +1940,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 Index: branches/2019Q3/www/chromium/files/patch-components_autofill_core_common_autofill__util.cc =================================================================== --- branches/2019Q3/www/chromium/files/patch-components_autofill_core_common_autofill__util.cc (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-components_autofill_core_common_autofill__util.cc (revision 508999) @@ -1,11 +1,11 @@ ---- components/autofill/core/common/autofill_util.cc.orig 2019-04-30 22:22:41 UTC +--- components/autofill/core/common/autofill_util.cc.orig 2019-07-24 18:58:18 UTC +++ components/autofill/core/common/autofill_util.cc -@@ -202,7 +202,7 @@ bool SanitizedFieldIsEmpty(const base::string16& value +@@ -203,7 +203,7 @@ bool SanitizedFieldIsEmpty(const base::string16& value } bool ShouldAutoselectFirstSuggestionOnArrowDown() { -#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) +#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) return true; #else return false; Index: branches/2019Q3/www/chromium/files/patch-components_crash_content_app_BUILD.gn =================================================================== --- branches/2019Q3/www/chromium/files/patch-components_crash_content_app_BUILD.gn (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-components_crash_content_app_BUILD.gn (revision 508999) @@ -1,29 +1,20 @@ ---- components/crash/content/app/BUILD.gn.orig 2019-04-30 22:22:41 UTC +--- components/crash/content/app/BUILD.gn.orig 2019-07-24 18:58:18 UTC +++ components/crash/content/app/BUILD.gn -@@ -36,12 +36,12 @@ static_library("app") { +@@ -37,7 +37,7 @@ static_library("app") { sources += [ "crashpad.cc" ] } -- if (is_android || (is_linux && !is_chromeos)) { -+ if (is_android || (is_linux && !is_chromeos && !is_bsd)) { - set_sources_assignment_filter([]) - sources += [ "crashpad_linux.cc" ] - } - - if (is_linux) { + if (is_linux && !is_bsd) { sources += [ "breakpad_linux.cc", "breakpad_linux.h", -@@ -82,7 +82,10 @@ static_library("app") { - "//third_party/crashpad/crashpad/snapshot", +@@ -78,7 +78,7 @@ static_library("app") { + "//sandbox", ] - if (is_linux) { -+ if (is_bsd) { -+ deps -= [ "//third_party/crashpad/crashpad/snapshot" ] -+ } + if (is_linux && !is_bsd) { deps += [ "//third_party/breakpad:client" ] } } Index: branches/2019Q3/www/chromium/files/patch-components_crash_core_common_BUILD.gn =================================================================== --- branches/2019Q3/www/chromium/files/patch-components_crash_core_common_BUILD.gn (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-components_crash_core_common_BUILD.gn (revision 508999) @@ -1,28 +1,28 @@ ---- components/crash/core/common/BUILD.gn.orig 2019-04-30 22:22:41 UTC +--- components/crash/core/common/BUILD.gn.orig 2019-07-24 18:58:18 UTC +++ components/crash/core/common/BUILD.gn -@@ -6,7 +6,7 @@ import("//build/buildflag_header.gni") +@@ -7,7 +7,7 @@ import("//components/gwp_asan/buildflags/buildflags.gn declare_args() { # If set to true, this will stub out and disable the entire crash key system. - use_crash_key_stubs = is_fuchsia + use_crash_key_stubs = is_fuchsia || is_bsd } group("common") { -@@ -92,7 +92,6 @@ target(crash_key_target_type, "crash_key") { +@@ -93,7 +93,6 @@ target(crash_key_target_type, "crash_key") { ] } - deps += [ "//third_party/breakpad:client" ] } } -@@ -147,7 +146,7 @@ source_set("unit_tests") { +@@ -153,7 +152,7 @@ source_set("unit_tests") { sources += [ "objc_zombie_unittest.mm" ] } - if (!is_mac && !is_win && !is_fuchsia && !is_android) { + if (!is_mac && !is_win && !is_fuchsia && !is_android && !is_bsd) { include_dirs = [ "//third_party/breakpad/breakpad/src/" ] sources += [ "crash_key_breakpad_unittest.cc" ] } Index: branches/2019Q3/www/chromium/files/patch-components_download_internal_common_base__file.cc =================================================================== --- branches/2019Q3/www/chromium/files/patch-components_download_internal_common_base__file.cc (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-components_download_internal_common_base__file.cc (revision 508999) @@ -1,20 +1,20 @@ ---- components/download/internal/common/base_file.cc.orig 2019-04-30 22:22:41 UTC +--- components/download/internal/common/base_file.cc.orig 2019-07-24 18:58:19 UTC +++ components/download/internal/common/base_file.cc -@@ -494,7 +494,7 @@ DownloadInterruptReason BaseFile::PublishDownload() { +@@ -516,7 +516,7 @@ DownloadInterruptReason BaseFile::PublishDownload() { } #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) namespace { -@@ -578,7 +578,7 @@ DownloadInterruptReason BaseFile::AnnotateWithSourceIn +@@ -600,7 +600,7 @@ DownloadInterruptReason BaseFile::AnnotateWithSourceIn } return DOWNLOAD_INTERRUPT_REASON_FILE_FAILED; } -#else // !OS_WIN && !OS_MACOSX && !OS_LINUX +#else // !OS_WIN && !OS_MACOSX && !OS_LINUX && !OS_BSD DownloadInterruptReason BaseFile::AnnotateWithSourceInformation( const std::string& client_guid, const GURL& source_url, Index: branches/2019Q3/www/chromium/files/patch-components_feature__engagement_public_event__constants.cc =================================================================== --- branches/2019Q3/www/chromium/files/patch-components_feature__engagement_public_event__constants.cc (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-components_feature__engagement_public_event__constants.cc (revision 508999) @@ -1,14 +1,14 @@ ---- components/feature_engagement/public/event_constants.cc.orig 2019-03-11 22:00:56 UTC +--- components/feature_engagement/public/event_constants.cc.orig 2019-07-24 18:58:19 UTC +++ components/feature_engagement/public/event_constants.cc -@@ -26,9 +26,9 @@ const char kReopenTabConditionsMet[] = "reopen_tab_con - const char kTabReopened[] = "tab_reopened"; +@@ -29,9 +29,9 @@ const char kFocusModeOpened[] = "focus_mode_opened"; + const char kFocusModeConditionsMet[] = "focus_mode_conditions_met"; #endif // BUILDFLAG(ENABLE_DESKTOP_IN_PRODUCT_HELP) -#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_IOS) +#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_IOS) || defined(OS_BSD) const char kNewTabOpened[] = "new_tab_opened"; -#endif // defined(OS_WIN) || defined(OS_LINUX) || defined(OS_IOS) +#endif // defined(OS_WIN) || defined(OS_LINUX) || defined(OS_IOS) || defined(OS_BSD) #if defined(OS_IOS) const char kChromeOpened[] = "chrome_opened"; Index: branches/2019Q3/www/chromium/files/patch-components_feature__engagement_public_event__constants.h =================================================================== --- branches/2019Q3/www/chromium/files/patch-components_feature__engagement_public_event__constants.h (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-components_feature__engagement_public_event__constants.h (revision 508999) @@ -1,20 +1,20 @@ ---- components/feature_engagement/public/event_constants.h.orig 2019-03-11 22:00:56 UTC +--- components/feature_engagement/public/event_constants.h.orig 2019-07-24 18:58:19 UTC +++ components/feature_engagement/public/event_constants.h -@@ -49,7 +49,7 @@ extern const char kReopenTabConditionsMet[]; - extern const char kTabReopened[]; +@@ -57,7 +57,7 @@ extern const char kFocusModeOpened[]; + extern const char kFocusModeConditionsMet[]; #endif // BUILDFLAG(ENABLE_DESKTOP_IN_PRODUCT_HELP) -#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_IOS) +#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_IOS) || defined(OS_BSD) // This event is included in the deferred onboarding events for the New Tab // described above, but it is also used on iOS, so it must be compiled // separately. -@@ -57,7 +57,7 @@ extern const char kTabReopened[]; +@@ -65,7 +65,7 @@ extern const char kFocusModeConditionsMet[]; // The user has explicitly opened a new tab via an entry point from inside of // Chrome. extern const char kNewTabOpened[]; -#endif // defined(OS_WIN) || defined(OS_LINUX) || defined(OS_IOS) +#endif // defined(OS_WIN) || defined(OS_LINUX) || defined(OS_IOS) || defined(OS_BSD) #if defined(OS_IOS) // The user has opened Chrome (cold start or from background). Index: branches/2019Q3/www/chromium/files/patch-components_gcm__driver_gcm__client__impl.cc =================================================================== --- branches/2019Q3/www/chromium/files/patch-components_gcm__driver_gcm__client__impl.cc (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-components_gcm__driver_gcm__client__impl.cc (revision 508999) @@ -1,12 +1,12 @@ ---- components/gcm_driver/gcm_client_impl.cc.orig 2019-03-11 22:00:56 UTC +--- components/gcm_driver/gcm_client_impl.cc.orig 2019-07-24 18:58:19 UTC +++ components/gcm_driver/gcm_client_impl.cc -@@ -150,6 +150,9 @@ void ToCheckinProtoVersion( +@@ -149,6 +149,9 @@ void ToCheckinProtoVersion( case GCMClient::PLATFORM_CROS: platform = checkin_proto::ChromeBuildProto_Platform_PLATFORM_CROS; break; + case GCMClient::PLATFORM_BSD: + platform = checkin_proto::ChromeBuildProto_Platform_PLATFORM_LINUX; + break; case GCMClient::PLATFORM_UNSPECIFIED: // For unknown platform, return as LINUX. platform = checkin_proto::ChromeBuildProto_Platform_PLATFORM_LINUX; Index: branches/2019Q3/www/chromium/files/patch-components_metrics_BUILD.gn =================================================================== --- branches/2019Q3/www/chromium/files/patch-components_metrics_BUILD.gn (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-components_metrics_BUILD.gn (revision 508999) @@ -1,14 +1,14 @@ ---- components/metrics/BUILD.gn.orig 2019-04-30 22:22:42 UTC +--- components/metrics/BUILD.gn.orig 2019-07-24 18:58:19 UTC +++ components/metrics/BUILD.gn -@@ -144,6 +144,11 @@ jumbo_static_library("metrics") { +@@ -146,6 +146,11 @@ jumbo_static_library("metrics") { if (is_fuchsia) { sources += [ "drive_metrics_provider_fuchsia.cc" ] } + + if (is_bsd) { + sources -= [ "system_memory_stats_recorder_linux.cc" ] + } + } # The component metrics provider is a separate target because it depends upon Index: branches/2019Q3/www/chromium/files/patch-components_metrics_metrics__log.cc =================================================================== --- branches/2019Q3/www/chromium/files/patch-components_metrics_metrics__log.cc (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-components_metrics_metrics__log.cc (revision 508999) @@ -1,11 +1,11 @@ ---- components/metrics/metrics_log.cc.orig 2019-06-04 18:55:21 UTC +--- components/metrics/metrics_log.cc.orig 2019-07-24 18:58:19 UTC +++ components/metrics/metrics_log.cc -@@ -197,7 +197,7 @@ void MetricsLog::RecordCoreSystemProfile(MetricsServic +@@ -210,7 +210,7 @@ void MetricsLog::RecordCoreSystemProfile( // 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: branches/2019Q3/www/chromium/files/patch-components_network__session__configurator_browser_network__session__configurator.cc =================================================================== --- branches/2019Q3/www/chromium/files/patch-components_network__session__configurator_browser_network__session__configurator.cc (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-components_network__session__configurator_browser_network__session__configurator.cc (revision 508999) @@ -1,11 +1,11 @@ ---- components/network_session_configurator/browser/network_session_configurator.cc.orig 2019-04-30 22:22:42 UTC +--- components/network_session_configurator/browser/network_session_configurator.cc.orig 2019-07-24 18:58:19 UTC +++ components/network_session_configurator/browser/network_session_configurator.cc -@@ -697,7 +697,7 @@ net::URLRequestContextBuilder::HttpCacheParams::Type C +@@ -716,7 +716,7 @@ net::URLRequestContextBuilder::HttpCacheParams::Type C } #endif // #if !defined(OS_ANDROID) -#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) return net::URLRequestContextBuilder::HttpCacheParams::DISK_SIMPLE; #else return net::URLRequestContextBuilder::HttpCacheParams::DISK_BLOCKFILE; Index: branches/2019Q3/www/chromium/files/patch-components_policy_resources_policy__templates.json =================================================================== --- branches/2019Q3/www/chromium/files/patch-components_policy_resources_policy__templates.json (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-components_policy_resources_policy__templates.json (revision 508999) @@ -1,83 +1,83 @@ ---- components/policy/resources/policy_templates.json.orig 2019-06-04 18:55:21 UTC +--- components/policy/resources/policy_templates.json.orig 2019-07-24 18:58:20 UTC +++ components/policy/resources/policy_templates.json -@@ -984,7 +984,7 @@ +@@ -1019,7 +1019,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 @@ +@@ -1048,7 +1048,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 @@ +@@ -1074,7 +1074,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 @@ +@@ -1767,7 +1767,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, -@@ -3369,7 +3369,7 @@ +@@ -3399,7 +3399,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, -@@ -3421,7 +3421,7 @@ +@@ -3450,7 +3450,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, -@@ -6537,7 +6537,7 @@ +@@ -6637,7 +6637,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, -@@ -7667,7 +7667,7 @@ +@@ -7761,7 +7761,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, -@@ -8183,7 +8183,7 @@ +@@ -8277,7 +8277,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: branches/2019Q3/www/chromium/files/patch-components_services_filesystem_file__system__app.cc =================================================================== --- branches/2019Q3/www/chromium/files/patch-components_services_filesystem_file__system__app.cc (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-components_services_filesystem_file__system__app.cc (revision 508999) @@ -1,20 +1,20 @@ ---- components/services/filesystem/file_system_app.cc.orig 2019-04-30 22:22:43 UTC +--- components/services/filesystem/file_system_app.cc.orig 2019-07-24 18:58:21 UTC +++ components/services/filesystem/file_system_app.cc -@@ -20,7 +20,7 @@ +@@ -19,7 +19,7 @@ #elif defined(OS_ANDROID) #include "base/base_paths_android.h" #include "base/path_service.h" -#elif defined(OS_LINUX) +#elif defined(OS_LINUX) || defined(OS_BSD) #include "base/environment.h" #include "base/nix/xdg_util.h" #elif defined(OS_MACOSX) -@@ -74,7 +74,7 @@ base::FilePath FileSystemApp::GetUserDataDir() { +@@ -68,7 +68,7 @@ base::FilePath FileSystemApp::GetUserDataDir() { CHECK(base::PathService::Get(base::DIR_APP_DATA, &path)); #elif defined(OS_ANDROID) CHECK(base::PathService::Get(base::DIR_ANDROID_APP_DATA, &path)); -#elif defined(OS_LINUX) +#elif defined(OS_LINUX) || defined(OS_BSD) std::unique_ptr env(base::Environment::Create()); path = base::nix::GetXDGDirectory( env.get(), base::nix::kXdgConfigHomeEnvVar, base::nix::kDotConfigDir); Index: branches/2019Q3/www/chromium/files/patch-components_sync__device__info_local__device__info__util__linux.cc =================================================================== --- branches/2019Q3/www/chromium/files/patch-components_sync__device__info_local__device__info__util__linux.cc (nonexistent) +++ branches/2019Q3/www/chromium/files/patch-components_sync__device__info_local__device__info__util__linux.cc (revision 508999) @@ -0,0 +1,26 @@ +--- components/sync_device_info/local_device_info_util_linux.cc.orig 2019-07-29 16:01:57 UTC ++++ components/sync_device_info/local_device_info_util_linux.cc +@@ -30,6 +30,23 @@ std::string GetSessionNameInternal() { + break; + } + return "Chromebook"; ++#elif defined(OS_BSD) ++ long len = sysconf(_SC_HOST_NAME_MAX); ++ ++ if (len == -1) ++ return "FreeBSD"; ++ ++ char *hostname = new (std::nothrow) char[len](); ++ ++ if ((hostname == nullptr) || (gethostname(hostname, len) == -1)) { ++ delete[](hostname); ++ return "FreeBSD"; ++ } ++ ++ std::string res{hostname}; ++ ++ delete[](hostname); ++ return res; + #else + char hostname[HOST_NAME_MAX]; + if (gethostname(hostname, HOST_NAME_MAX) == 0) // Success. Property changes on: branches/2019Q3/www/chromium/files/patch-components_sync__device__info_local__device__info__util__linux.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: branches/2019Q3/www/chromium/files/patch-content_app_content__main__runner__impl.cc =================================================================== --- branches/2019Q3/www/chromium/files/patch-content_app_content__main__runner__impl.cc (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-content_app_content__main__runner__impl.cc (revision 508999) @@ -1,73 +1,73 @@ ---- content/app/content_main_runner_impl.cc.orig 2019-04-30 22:22:45 UTC +--- content/app/content_main_runner_impl.cc.orig 2019-07-24 18:58:23 UTC +++ content/app/content_main_runner_impl.cc -@@ -96,17 +96,17 @@ +@@ -99,17 +99,17 @@ #include "base/posix/global_descriptors.h" #include "content/public/common/content_descriptors.h" -#if !defined(OS_MACOSX) +#if !defined(OS_MACOSX) && !defined(OS_BSD) #include "services/service_manager/zygote/common/zygote_fork_delegate_linux.h" #endif -#if !defined(OS_MACOSX) && !defined(OS_ANDROID) +#if !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD) #include "sandbox/linux/services/libc_interceptor.h" #include "services/service_manager/zygote/zygote_main.h" #endif #endif // OS_POSIX || OS_FUCHSIA -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) #include "base/native_library.h" #include "base/rand_util.h" #include "services/service_manager/zygote/common/common_sandbox_support_linux.h" -@@ -127,7 +127,7 @@ +@@ -130,7 +130,7 @@ #include "content/public/common/content_client.h" #endif -#endif // OS_LINUX +#endif // OS_LINUX || defined(OS_BSD) #if !defined(CHROME_MULTIPLE_DLL_BROWSER) #include "content/child/field_trial.h" -@@ -319,7 +319,7 @@ void InitializeZygoteSandboxForBrowserProcess( +@@ -322,7 +322,7 @@ void InitializeZygoteSandboxForBrowserProcess( } #endif // BUILDFLAG(USE_ZYGOTE_HANDLE) -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) #if BUILDFLAG(ENABLE_PLUGINS) // Loads the (native) libraries but does not initialize them (i.e., does not -@@ -416,7 +416,7 @@ void PreSandboxInit() { +@@ -419,7 +419,7 @@ void PreSandboxInit() { } #endif // BUILDFLAG(USE_ZYGOTE_HANDLE) -#endif // OS_LINUX +#endif // OS_LINUX || OS_BSD } // namespace -@@ -474,7 +474,7 @@ int RunZygote(ContentMainDelegate* delegate) { +@@ -477,7 +477,7 @@ int RunZygote(ContentMainDelegate* delegate) { delegate->ZygoteStarting(&zygote_fork_delegates); media::InitializeMediaLibrary(); -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) PreSandboxInit(); #endif -@@ -647,11 +647,11 @@ int ContentMainRunnerImpl::Initialize(const ContentMai +@@ -642,11 +642,11 @@ int ContentMainRunnerImpl::Initialize(const ContentMai base::GlobalDescriptors::kBaseDescriptor); #endif // !OS_ANDROID -#if defined(OS_LINUX) || defined(OS_OPENBSD) +#if defined(OS_LINUX) g_fds->Set(service_manager::kCrashDumpSignal, service_manager::kCrashDumpSignal + base::GlobalDescriptors::kBaseDescriptor); -#endif // OS_LINUX || OS_OPENBSD +#endif // OS_LINUX #endif // !OS_WIN Index: branches/2019Q3/www/chromium/files/patch-content_browser_BUILD.gn =================================================================== --- branches/2019Q3/www/chromium/files/patch-content_browser_BUILD.gn (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-content_browser_BUILD.gn (revision 508999) @@ -1,14 +1,11 @@ ---- content/browser/BUILD.gn.orig 2019-06-04 18:55:22 UTC +--- content/browser/BUILD.gn.orig 2019-07-24 18:58:23 UTC +++ content/browser/BUILD.gn -@@ -1982,11 +1982,6 @@ jumbo_source_set("browser") { - "tracing/cros_tracing_agent.h", +@@ -2058,7 +2058,7 @@ jumbo_source_set("browser") { + "//chromeos/resources", + "//components/chromeos_camera:mojo_mjpeg_decode_accelerator", ] - deps += [ "//chromeos/resources" ] - } else { -- sources += [ -- "memory/memory_monitor_linux.cc", -- "memory/memory_monitor_linux.h", -- ] - } - - if (is_chromeos || is_android || is_chromecast) { ++ } else if (!is_bsd) { + sources += [ + "memory/memory_monitor_linux.cc", + "memory/memory_monitor_linux.h", Index: branches/2019Q3/www/chromium/files/patch-content_browser_browser__main__loop.cc =================================================================== --- branches/2019Q3/www/chromium/files/patch-content_browser_browser__main__loop.cc (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-content_browser_browser__main__loop.cc (revision 508999) @@ -1,46 +1,46 @@ ---- content/browser/browser_main_loop.cc.orig 2019-06-04 18:55:22 UTC +--- content/browser/browser_main_loop.cc.orig 2019-07-24 18:58:23 UTC +++ content/browser/browser_main_loop.cc @@ -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 -@@ -593,6 +600,11 @@ int BrowserMainLoop::EarlyInitialization() { +@@ -576,6 +583,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) -@@ -636,7 +648,7 @@ int BrowserMainLoop::EarlyInitialization() { +@@ -619,7 +631,7 @@ int BrowserMainLoop::EarlyInitialization() { } #endif // defined(OS_ANDROID) || defined(OS_CHROMEOS) -#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. -@@ -646,7 +658,7 @@ int BrowserMainLoop::EarlyInitialization() { +@@ -629,7 +641,7 @@ int BrowserMainLoop::EarlyInitialization() { // users can easily hit this limit with many open tabs. Bump up the limit to // an arbitrarily high number. See https://crbug.com/539567 base::IncreaseFdLimitTo(8192); -#endif // defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_CHROMEOS) || +#endif // defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) || // defined(OS_ANDROID) #if defined(OS_WIN) Index: branches/2019Q3/www/chromium/files/patch-content_browser_builtin__service__manifests.cc =================================================================== --- branches/2019Q3/www/chromium/files/patch-content_browser_builtin__service__manifests.cc (nonexistent) +++ branches/2019Q3/www/chromium/files/patch-content_browser_builtin__service__manifests.cc (revision 508999) @@ -0,0 +1,20 @@ +--- content/browser/builtin_service_manifests.cc.orig 2019-07-29 19:11:14 UTC ++++ content/browser/builtin_service_manifests.cc +@@ -33,7 +33,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 + +@@ -99,7 +99,7 @@ const std::vector& GetBuilt + : service_manager::Manifest::ExecutionMode:: + kInProcessBuiltin), + viz::GetManifest(), +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + font_service::GetManifest(), + #endif + #if defined(OS_CHROMEOS) Property changes on: branches/2019Q3/www/chromium/files/patch-content_browser_builtin__service__manifests.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: branches/2019Q3/www/chromium/files/patch-content_browser_gpu_gpu__process__host.cc =================================================================== --- branches/2019Q3/www/chromium/files/patch-content_browser_gpu_gpu__process__host.cc (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-content_browser_gpu_gpu__process__host.cc (revision 508999) @@ -1,11 +1,11 @@ ---- content/browser/gpu/gpu_process_host.cc.orig 2019-06-04 18:55:23 UTC +--- content/browser/gpu/gpu_process_host.cc.orig 2019-07-24 18:58:23 UTC +++ content/browser/gpu/gpu_process_host.cc -@@ -1082,7 +1082,7 @@ bool GpuProcessHost::LaunchGpuProcess() { +@@ -1062,7 +1062,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 + #elif defined(OS_MACOSX) Index: branches/2019Q3/www/chromium/files/patch-content_browser_ppapi__plugin__process__host.cc =================================================================== --- branches/2019Q3/www/chromium/files/patch-content_browser_ppapi__plugin__process__host.cc (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-content_browser_ppapi__plugin__process__host.cc (revision 508999) @@ -1,11 +1,11 @@ ---- content/browser/ppapi_plugin_process_host.cc.orig 2019-05-04 09:03:05 UTC +--- content/browser/ppapi_plugin_process_host.cc.orig 2019-07-24 18:58:23 UTC +++ content/browser/ppapi_plugin_process_host.cc -@@ -343,7 +343,7 @@ bool PpapiPluginProcessHost::Init(const PepperPluginIn +@@ -361,7 +361,7 @@ bool PpapiPluginProcessHost::Init(const PepperPluginIn base::CommandLine::StringType plugin_launcher = browser_command_line.GetSwitchValueNative(switches::kPpapiPluginLauncher); -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) int flags = plugin_launcher.empty() ? ChildProcessHost::CHILD_ALLOW_SELF : ChildProcessHost::CHILD_NORMAL; - #else + #elif defined(OS_MACOSX) Index: branches/2019Q3/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.cc =================================================================== --- branches/2019Q3/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.cc (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.cc (revision 508999) @@ -1,38 +1,38 @@ ---- 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.orig 2019-07-24 18:58:24 UTC +++ content/browser/renderer_host/render_process_host_impl.cc -@@ -231,7 +231,7 @@ +@@ -229,7 +229,7 @@ #include "content/browser/compositor/image_transport_factory.h" #endif -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) #include #include #endif -@@ -1211,7 +1211,7 @@ static constexpr size_t kUnknownPlatformProcessLimit = +@@ -1231,7 +1231,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; -@@ -1222,7 +1222,7 @@ size_t GetPlatformProcessLimit() { +@@ -1242,7 +1242,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() { +@@ -1654,7 +1654,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 + #elif defined(OS_MACOSX) Index: branches/2019Q3/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.h =================================================================== --- branches/2019Q3/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.h (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.h (revision 508999) @@ -1,15 +1,15 @@ ---- 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.orig 2019-07-24 18:58:24 UTC +++ content/browser/renderer_host/render_process_host_impl.h -@@ -401,10 +401,10 @@ class CONTENT_EXPORT RenderProcessHostImpl +@@ -400,10 +400,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: branches/2019Q3/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc =================================================================== --- branches/2019Q3/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc (revision 508999) @@ -1,29 +1,29 @@ ---- 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.orig 2019-07-24 18:58:24 UTC +++ content/browser/renderer_host/render_widget_host_view_aura.cc -@@ -124,7 +124,7 @@ +@@ -117,7 +117,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 -@@ -2287,7 +2287,7 @@ bool RenderWidgetHostViewAura::NeedsInputGrab() { +@@ -2200,7 +2200,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; -@@ -2485,7 +2485,7 @@ void RenderWidgetHostViewAura::ForwardKeyboardEventWit +@@ -2397,7 +2397,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: branches/2019Q3/www/chromium/files/patch-content_browser_service__manager_service__manager__context.cc =================================================================== --- branches/2019Q3/www/chromium/files/patch-content_browser_service__manager_service__manager__context.cc (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-content_browser_service__manager_service__manager__context.cc (revision 508999) @@ -1,35 +1,35 @@ ---- content/browser/service_manager/service_manager_context.cc.orig 2019-06-04 18:55:23 UTC +--- content/browser/service_manager/service_manager_context.cc.orig 2019-07-24 18:58:24 UTC +++ content/browser/service_manager/service_manager_context.cc -@@ -99,7 +99,7 @@ +@@ -98,7 +98,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" + #include "components/services/font/public/interfaces/constants.mojom.h" // nogncheck #endif -@@ -378,12 +378,12 @@ void CreateInProcessAudioService( +@@ -342,12 +342,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) { -@@ -605,7 +605,7 @@ ServiceManagerContext::ServiceManagerContext( +@@ -665,7 +665,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, + font_service::mojom::kServiceName, base::CreateSequencedTaskRunnerWithTraits( Index: branches/2019Q3/www/chromium/files/patch-content_browser_webui_shared__resources__data__source.cc =================================================================== --- branches/2019Q3/www/chromium/files/patch-content_browser_webui_shared__resources__data__source.cc (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-content_browser_webui_shared__resources__data__source.cc (revision 508999) @@ -1,14 +1,17 @@ ---- content/browser/webui/shared_resources_data_source.cc.orig 2019-06-04 18:55:23 UTC +--- content/browser/webui/shared_resources_data_source.cc.orig 2019-07-24 18:58:24 UTC +++ content/browser/webui/shared_resources_data_source.cc -@@ -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"}, +@@ -119,12 +119,12 @@ const std::map CreateMojoResourceIdT + "mojo/mojo/public/mojom/base/string16.mojom.html"}, + {IDR_MOJO_STRING16_MOJOM_LITE_JS, + "mojo/mojo/public/mojom/base/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"}, + {IDR_MOJO_TIME_MOJOM_HTML, + "mojo/mojo/public/mojom/base/time.mojom.html"}, + {IDR_MOJO_TIME_MOJOM_LITE_JS, + "mojo/mojo/public/mojom/base/time.mojom-lite.js"}, -#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) +#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) }; } Index: branches/2019Q3/www/chromium/files/patch-content_common_BUILD.gn =================================================================== --- branches/2019Q3/www/chromium/files/patch-content_common_BUILD.gn (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-content_common_BUILD.gn (revision 508999) @@ -1,15 +1,15 @@ ---- content/common/BUILD.gn.orig 2019-06-04 18:55:23 UTC +--- content/common/BUILD.gn.orig 2019-07-24 18:58:24 UTC +++ content/common/BUILD.gn -@@ -375,6 +375,12 @@ source_set("common") { +@@ -381,6 +381,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: branches/2019Q3/www/chromium/files/patch-content_gpu_gpu__main.cc =================================================================== --- branches/2019Q3/www/chromium/files/patch-content_gpu_gpu__main.cc (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-content_gpu_gpu__main.cc (revision 508999) @@ -1,47 +1,47 @@ ---- content/gpu/gpu_main.cc.orig 2019-04-30 22:22:47 UTC +--- content/gpu/gpu_main.cc.orig 2019-07-24 18:58:24 UTC +++ content/gpu/gpu_main.cc @@ -79,7 +79,7 @@ #include "ui/gfx/x/x11_switches.h" // nogncheck #endif -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) #include "content/gpu/gpu_sandbox_hook_linux.h" #include "content/public/common/sandbox_init.h" #include "services/service_manager/sandbox/linux/sandbox_linux.h" @@ -112,7 +112,7 @@ namespace content { namespace { -#if defined(OS_LINUX) +#if defined(OS_LINUX) && !defined(OS_BSD) bool StartSandboxLinux(gpu::GpuWatchdogThread*, const gpu::GPUInfo*, const gpu::GpuPreferences&); @@ -173,7 +173,7 @@ class ContentSandboxHelper : public gpu::GpuSandboxHel bool EnsureSandboxInitialized(gpu::GpuWatchdogThread* watchdog_thread, const gpu::GPUInfo* gpu_info, const gpu::GpuPreferences& gpu_prefs) override { -#if defined(OS_LINUX) +#if defined(OS_LINUX) && !defined(OS_BSD) return StartSandboxLinux(watchdog_thread, gpu_info, gpu_prefs); #elif defined(OS_WIN) return StartSandboxWindows(sandbox_info_); -@@ -363,7 +363,7 @@ int GpuMain(const MainFunctionParams& parameters) { +@@ -369,7 +369,7 @@ int GpuMain(const MainFunctionParams& parameters) { namespace { -#if defined(OS_LINUX) +#if defined(OS_LINUX) && !defined(OS_BSD) bool StartSandboxLinux(gpu::GpuWatchdogThread* watchdog_thread, const gpu::GPUInfo* gpu_info, const gpu::GpuPreferences& gpu_prefs) { -@@ -398,7 +398,7 @@ bool StartSandboxLinux(gpu::GpuWatchdogThread* watchdo +@@ -404,7 +404,7 @@ bool StartSandboxLinux(gpu::GpuWatchdogThread* watchdo return res; } -#endif // defined(OS_LINUX) +#endif // defined(OS_LINUX) && !defined(OS_BSD) #if defined(OS_WIN) bool StartSandboxWindows(const sandbox::SandboxInterfaceInfo* sandbox_info) { Index: branches/2019Q3/www/chromium/files/patch-content_gpu_gpu__sandbox__hook__linux.cc =================================================================== --- branches/2019Q3/www/chromium/files/patch-content_gpu_gpu__sandbox__hook__linux.cc (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-content_gpu_gpu__sandbox__hook__linux.cc (revision 508999) @@ -1,58 +1,58 @@ ---- content/gpu/gpu_sandbox_hook_linux.cc.orig 2019-03-11 22:00:58 UTC +--- content/gpu/gpu_sandbox_hook_linux.cc.orig 2019-07-24 18:58:24 UTC +++ content/gpu/gpu_sandbox_hook_linux.cc @@ -95,8 +95,9 @@ static const char kLibV4lEncPluginPath[] = "/usr/lib/libv4l/plugins/libv4l-encplugin.so"; #endif -constexpr int dlopen_flag = RTLD_NOW | RTLD_GLOBAL | RTLD_NODELETE; +constexpr int dlopen_flag = RTLD_NOW | RTLD_GLOBAL; +#if !defined(OS_BSD) void AddV4L2GpuWhitelist( std::vector* permissions, const service_manager::SandboxSeccompBPF::Options& options) { -@@ -277,8 +278,10 @@ std::vector FilePermissionsForGp +@@ -287,8 +288,10 @@ std::vector FilePermissionsForGp AddStandardGpuWhiteList(&permissions); return permissions; } +#endif void LoadArmGpuLibraries() { +#if !defined(OS_BSD) // Preload the Mali library. if (UseChromecastSandboxWhitelist()) { for (const char* path : kWhitelistedChromecastPaths) { -@@ -293,6 +296,7 @@ void LoadArmGpuLibraries() { +@@ -303,6 +306,7 @@ void LoadArmGpuLibraries() { // Preload the Tegra V4L2 (video decode acceleration) library. dlopen(kLibTegraPath, dlopen_flag); } +#endif } bool LoadAmdGpuLibraries() { -@@ -348,6 +352,7 @@ bool LoadLibrariesForGpu( +@@ -358,6 +362,7 @@ bool LoadLibrariesForGpu( return true; } +#if !defined(OS_BSD) sandbox::syscall_broker::BrokerCommandSet CommandSetForGPU( const service_manager::SandboxLinux::Options& options) { sandbox::syscall_broker::BrokerCommandSet command_set; -@@ -368,13 +373,17 @@ bool BrokerProcessPreSandboxHook( +@@ -378,13 +383,17 @@ bool BrokerProcessPreSandboxHook( service_manager::SetProcessTitleFromCommandLine(nullptr); return true; } +#endif } // namespace bool GpuProcessPreSandboxHook(service_manager::SandboxLinux::Options options) { + NOTIMPLEMENTED(); +#if !defined(OS_BSD) service_manager::SandboxLinux::GetInstance()->StartBrokerProcess( CommandSetForGPU(options), FilePermissionsForGpu(options), base::BindOnce(BrokerProcessPreSandboxHook), options); +#endif if (!LoadLibrariesForGpu(options)) return false; Index: branches/2019Q3/www/chromium/files/patch-content_public_common_child__process__host.h =================================================================== --- branches/2019Q3/www/chromium/files/patch-content_public_common_child__process__host.h (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-content_public_common_child__process__host.h (revision 508999) @@ -1,20 +1,11 @@ ---- content/public/common/child_process_host.h.orig 2019-06-04 18:55:23 UTC +--- content/public/common/child_process_host.h.orig 2019-07-24 18:58:24 UTC +++ content/public/common/child_process_host.h @@ -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. -@@ -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: branches/2019Q3/www/chromium/files/patch-content_public_common_common__param__traits__macros.h =================================================================== --- branches/2019Q3/www/chromium/files/patch-content_public_common_common__param__traits__macros.h (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-content_public_common_common__param__traits__macros.h (revision 508999) @@ -1,11 +1,11 @@ ---- content/public/common/common_param_traits_macros.h.orig 2019-06-04 18:55:23 UTC +--- content/public/common/common_param_traits_macros.h.orig 2019-07-24 18:58:24 UTC +++ content/public/common/common_param_traits_macros.h -@@ -331,7 +331,7 @@ IPC_STRUCT_TRAITS_BEGIN(blink::mojom::RendererPreferen +@@ -329,7 +329,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: branches/2019Q3/www/chromium/files/patch-content_public_common_content__features.cc =================================================================== --- branches/2019Q3/www/chromium/files/patch-content_public_common_content__features.cc (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-content_public_common_content__features.cc (revision 508999) @@ -1,20 +1,20 @@ ---- content/public/common/content_features.cc.orig 2019-06-04 18:55:23 UTC +--- content/public/common/content_features.cc.orig 2019-07-24 18:58:24 UTC +++ content/public/common/content_features.cc -@@ -559,7 +559,7 @@ const base::Feature kWebAssemblyThreads { +@@ -577,7 +577,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}; -@@ -594,7 +594,7 @@ const base::Feature kWebAuthBle{"WebAuthenticationBle" +@@ -612,7 +612,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: branches/2019Q3/www/chromium/files/patch-content_public_common_content__switches.cc =================================================================== --- branches/2019Q3/www/chromium/files/patch-content_public_common_content__switches.cc (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-content_public_common_content__switches.cc (revision 508999) @@ -1,11 +1,11 @@ ---- content/public/common/content_switches.cc.orig 2019-06-04 18:55:23 UTC +--- content/public/common/content_switches.cc.orig 2019-07-24 18:58:24 UTC +++ content/public/common/content_switches.cc -@@ -959,7 +959,7 @@ const char kEnableAutomation[] = "enable-automation"; +@@ -949,7 +949,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: branches/2019Q3/www/chromium/files/patch-content_public_test_browser__test__base.cc =================================================================== --- branches/2019Q3/www/chromium/files/patch-content_public_test_browser__test__base.cc (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-content_public_test_browser__test__base.cc (revision 508999) @@ -1,13 +1,13 @@ ---- content/public/test/browser_test_base.cc.orig 2019-04-30 22:22:47 UTC +--- content/public/test/browser_test_base.cc.orig 2019-07-24 18:58:24 UTC +++ content/public/test/browser_test_base.cc -@@ -63,6 +63,10 @@ +@@ -75,6 +75,10 @@ #include "ui/views/test/event_generator_delegate_mac.h" #endif +#if defined(OS_FREEBSD) +#include +#endif + #if defined(OS_POSIX) #include "base/process/process_handle.h" #endif Index: branches/2019Q3/www/chromium/files/patch-content_renderer_render__process__impl.cc =================================================================== --- branches/2019Q3/www/chromium/files/patch-content_renderer_render__process__impl.cc (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-content_renderer_render__process__impl.cc (revision 508999) @@ -1,11 +1,11 @@ ---- content/renderer/render_process_impl.cc.orig 2019-06-04 18:55:23 UTC +--- content/renderer/render_process_impl.cc.orig 2019-07-24 18:58:25 UTC +++ content/renderer/render_process_impl.cc -@@ -161,7 +161,7 @@ RenderProcessImpl::RenderProcessImpl( +@@ -157,7 +157,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(); + if (!command_line->HasSwitch( Index: branches/2019Q3/www/chromium/files/patch-content_renderer_render__thread__impl.cc =================================================================== --- branches/2019Q3/www/chromium/files/patch-content_renderer_render__thread__impl.cc (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-content_renderer_render__thread__impl.cc (revision 508999) @@ -1,51 +1,51 @@ ---- content/renderer/render_thread_impl.cc.orig 2019-06-04 18:55:23 UTC +--- content/renderer/render_thread_impl.cc.orig 2019-07-24 18:58:25 UTC +++ content/renderer/render_thread_impl.cc -@@ -191,12 +191,21 @@ +@@ -187,12 +187,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() { +@@ -907,7 +916,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() { +@@ -939,7 +948,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 -@@ -1332,7 +1341,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl: +@@ -1321,7 +1330,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: branches/2019Q3/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.cc =================================================================== --- branches/2019Q3/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.cc (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.cc (revision 508999) @@ -1,56 +1,56 @@ ---- content/renderer/renderer_blink_platform_impl.cc.orig 2019-06-04 18:55:23 UTC +--- content/renderer/renderer_blink_platform_impl.cc.orig 2019-07-24 18:58:25 UTC +++ content/renderer/renderer_blink_platform_impl.cc -@@ -113,7 +113,7 @@ +@@ -108,7 +108,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 -@@ -206,7 +206,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl( +@@ -199,7 +199,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 -@@ -215,7 +215,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl( +@@ -208,7 +208,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())); -@@ -243,7 +243,7 @@ RendererBlinkPlatformImpl::~RendererBlinkPlatformImpl( +@@ -236,7 +236,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() -@@ -324,7 +324,7 @@ RendererBlinkPlatformImpl::CreateNetworkURLLoaderFacto +@@ -311,7 +311,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); -@@ -337,7 +337,7 @@ blink::BlameContext* RendererBlinkPlatformImpl::GetTop +@@ -324,7 +324,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: branches/2019Q3/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.h =================================================================== --- branches/2019Q3/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.h (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.h (revision 508999) @@ -1,29 +1,29 @@ ---- content/renderer/renderer_blink_platform_impl.h.orig 2019-06-04 18:55:23 UTC +--- content/renderer/renderer_blink_platform_impl.h.orig 2019-07-24 18:58:25 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/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 -@@ -273,7 +273,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi +@@ -258,7 +258,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 -@@ -311,7 +311,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi +@@ -296,7 +296,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: branches/2019Q3/www/chromium/files/patch-content_shell_BUILD.gn =================================================================== --- branches/2019Q3/www/chromium/files/patch-content_shell_BUILD.gn (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-content_shell_BUILD.gn (revision 508999) @@ -1,11 +1,11 @@ ---- content/shell/BUILD.gn.orig 2019-06-04 18:55:23 UTC +--- content/shell/BUILD.gn.orig 2019-07-24 18:58:25 UTC +++ content/shell/BUILD.gn -@@ -947,7 +947,7 @@ group("content_shell_crash_test") { +@@ -961,7 +961,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) { +- if (is_posix) { ++ if (is_posix && !is_bsd) { data_deps += [ - "//third_party/breakpad:dump_syms($host_toolchain)", - "//third_party/breakpad:minidump_stackwalk($host_toolchain)", + "//third_party/breakpad:dump_syms", + "//third_party/breakpad:minidump_stackwalk", Index: branches/2019Q3/www/chromium/files/patch-content_shell_app_shell__main__delegate.cc =================================================================== --- branches/2019Q3/www/chromium/files/patch-content_shell_app_shell__main__delegate.cc (nonexistent) +++ branches/2019Q3/www/chromium/files/patch-content_shell_app_shell__main__delegate.cc (revision 508999) @@ -0,0 +1,20 @@ +--- content/shell/app/shell_main_delegate.cc.orig 2019-07-29 19:14:59 UTC ++++ content/shell/app/shell_main_delegate.cc +@@ -170,7 +170,7 @@ bool ShellMainDelegate::BasicStartupComplete(int* exit + + v8_crashpad_support::SetUp(); + #endif +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + breakpad::SetFirstChanceExceptionHandler(v8::TryHandleWebAssemblyTrapPosix); + #endif + #if defined(OS_MACOSX) +@@ -314,7 +314,7 @@ bool ShellMainDelegate::BasicStartupComplete(int* exit + } + + void ShellMainDelegate::PreSandboxStartup() { +-#if defined(ARCH_CPU_ARM_FAMILY) && (defined(OS_ANDROID) || defined(OS_LINUX)) ++#if defined(ARCH_CPU_ARM_FAMILY) && (defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD)) + // Create an instance of the CPU class to parse /proc/cpuinfo and cache + // cpu_brand info. + base::CPU cpu_info; Property changes on: branches/2019Q3/www/chromium/files/patch-content_shell_app_shell__main__delegate.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: branches/2019Q3/www/chromium/files/patch-content_shell_browser_shell__browser__context.cc =================================================================== --- branches/2019Q3/www/chromium/files/patch-content_shell_browser_shell__browser__context.cc (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-content_shell_browser_shell__browser__context.cc (revision 508999) @@ -1,20 +1,20 @@ ---- content/shell/browser/shell_browser_context.cc.orig 2019-06-04 18:55:23 UTC +--- content/shell/browser/shell_browser_context.cc.orig 2019-07-24 18:58:25 UTC +++ content/shell/browser/shell_browser_context.cc -@@ -30,7 +30,7 @@ +@@ -32,7 +32,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" -@@ -108,7 +108,7 @@ void ShellBrowserContext::InitWhileIOAllowed() { +@@ -115,7 +115,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: branches/2019Q3/www/chromium/files/patch-content_shell_browser_web__test_web__test__browser__main__parts.cc =================================================================== --- branches/2019Q3/www/chromium/files/patch-content_shell_browser_web__test_web__test__browser__main__parts.cc (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-content_shell_browser_web__test_web__test__browser__main__parts.cc (revision 508999) @@ -1,11 +1,11 @@ ---- 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.orig 2019-07-24 18:58:25 UTC +++ content/shell/browser/web_test/web_test_browser_main_parts.cc -@@ -42,7 +42,7 @@ +@@ -37,7 +37,7 @@ #if defined(USE_AURA) && defined(USE_X11) #include "ui/events/devices/x11/touch_factory_x11.h" // nogncheck #endif -#if !defined(OS_CHROMEOS) && defined(USE_AURA) && defined(OS_LINUX) +#if !defined(OS_CHROMEOS) && defined(USE_AURA) && (defined(OS_LINUX) || defined(OS_BSD)) #include "ui/base/ime/init/input_method_initializer.h" #endif Index: branches/2019Q3/www/chromium/files/patch-content_shell_test__runner_test__runner.cc =================================================================== --- branches/2019Q3/www/chromium/files/patch-content_shell_test__runner_test__runner.cc (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-content_shell_test__runner_test__runner.cc (revision 508999) @@ -1,29 +1,29 @@ ---- content/shell/test_runner/test_runner.cc.orig 2019-06-04 18:55:23 UTC +--- content/shell/test_runner/test_runner.cc.orig 2019-07-24 18:58:25 UTC +++ content/shell/test_runner/test_runner.cc @@ -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) +-#if defined(OS_LINUX) || defined(OS_FUCHSIA) ++#if defined(OS_LINUX) || defined(OS_FUCHSIA) || defined(OS_BSD) #include "third_party/blink/public/platform/web_font_render_style.h" #endif -@@ -1546,7 +1546,7 @@ void TestRunner::Reset() { +@@ -1538,7 +1538,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) +-#if defined(OS_LINUX) || defined(OS_FUCHSIA) ++#if defined(OS_LINUX) || defined(OS_FUCHSIA) || defined(OS_BSD) blink::WebFontRenderStyle::SetSubpixelPositioning(false); #endif -@@ -2075,7 +2075,7 @@ void TestRunner::AddOriginAccessAllowListEntry( +@@ -2065,7 +2065,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) +-#if defined(OS_LINUX) || defined(OS_FUCHSIA) ++#if defined(OS_LINUX) || defined(OS_FUCHSIA) || defined(OS_BSD) // Since FontConfig doesn't provide a variable to control subpixel // positioning, we'll fall back to setting it globally for all fonts. blink::WebFontRenderStyle::SetSubpixelPositioning(value); Index: branches/2019Q3/www/chromium/files/patch-extensions_browser_api_declarative__webrequest_webrequest__action.cc =================================================================== --- branches/2019Q3/www/chromium/files/patch-extensions_browser_api_declarative__webrequest_webrequest__action.cc (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-extensions_browser_api_declarative__webrequest_webrequest__action.cc (revision 508999) @@ -1,14 +1,14 @@ ---- extensions/browser/api/declarative_webrequest/webrequest_action.cc.orig 2019-03-11 22:00:58 UTC +--- extensions/browser/api/declarative_webrequest/webrequest_action.cc.orig 2019-07-24 18:58:27 UTC +++ extensions/browser/api/declarative_webrequest/webrequest_action.cc -@@ -28,7 +28,11 @@ +@@ -29,7 +29,11 @@ #include "extensions/common/extension.h" #include "net/base/registry_controlled_domains/registry_controlled_domain.h" #include "net/http/http_util.h" +#if defined(OS_BSD) +#include +#else #include "third_party/re2/src/re2/re2.h" +#endif using content::ResourceRequestInfo; using extension_web_request_api_helpers::EventResponseDelta; Index: branches/2019Q3/www/chromium/files/patch-extensions_common_api___permission__features.json =================================================================== --- branches/2019Q3/www/chromium/files/patch-extensions_common_api___permission__features.json (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-extensions_common_api___permission__features.json (revision 508999) @@ -1,29 +1,29 @@ ---- extensions/common/api/_permission_features.json.orig 2019-04-30 22:22:49 UTC +--- extensions/common/api/_permission_features.json.orig 2019-07-24 18:58:27 UTC +++ extensions/common/api/_permission_features.json @@ -135,7 +135,7 @@ { "channel": "stable", "extension_types": ["platform_app"], - "platforms": ["chromeos", "win", "mac", "linux"], + "platforms": ["chromeos", "win", "mac", "linux", "bsd"], "whitelist": [ "1C93BD3CF875F4A73C0B2A163BB8FBDA8B8B3D80", // http://crbug.com/387169 "A3BC37E2148AC4E99BE4B16AF9D42DD1E592BBBE", // http://crbug.com/387169 -@@ -473,7 +473,7 @@ +@@ -469,7 +469,7 @@ }, { "channel": "stable", "extension_types": ["extension", "legacy_packaged_app", "platform_app"], - "platforms": ["chromeos", "mac", "win", "linux"], + "platforms": ["chromeos", "mac", "win", "linux", "bsd"], "whitelist": [ "0DE0F05680A4A056BCEC864ED8DDA84296F82B40", // http://crbug.com/434651 "1C93BD3CF875F4A73C0B2A163BB8FBDA8B8B3D80", // http://crbug.com/293683 -@@ -504,7 +504,7 @@ +@@ -500,7 +500,7 @@ "networkingPrivate": { "channel": "stable", "extension_types": ["extension", "legacy_packaged_app", "platform_app"], - "platforms": ["chromeos", "mac", "win", "linux"], + "platforms": ["chromeos", "mac", "win", "linux", "bsd"], "whitelist": [ // DO NOT ADD ANY MORE ENTRIES HERE. // networkingPrivate is being migrated to networking.onc. Index: branches/2019Q3/www/chromium/files/patch-extensions_common_features_feature.cc =================================================================== --- branches/2019Q3/www/chromium/files/patch-extensions_common_features_feature.cc (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-extensions_common_features_feature.cc (revision 508999) @@ -1,11 +1,11 @@ ---- extensions/common/features/feature.cc.orig 2019-03-11 22:00:58 UTC +--- extensions/common/features/feature.cc.orig 2019-07-24 18:58:27 UTC +++ extensions/common/features/feature.cc -@@ -26,6 +26,8 @@ Feature::Platform Feature::GetCurrentPlatform() { +@@ -20,7 +20,7 @@ namespace extensions { + Feature::Platform Feature::GetCurrentPlatform() { + #if defined(OS_CHROMEOS) + return CHROMEOS_PLATFORM; +-#elif defined(OS_LINUX) ++#elif defined(OS_LINUX) || defined(OS_BSD) + return LINUX_PLATFORM; + #elif defined(OS_MACOSX) return MACOSX_PLATFORM; - #elif defined(OS_WIN) - return WIN_PLATFORM; -+#elif defined(OS_BSD) -+ return LINUX_PLATFORM; - #else - return UNSPECIFIED_PLATFORM; - #endif Index: branches/2019Q3/www/chromium/files/patch-gpu_command__buffer_service_external__vk__image__backing.cc =================================================================== --- branches/2019Q3/www/chromium/files/patch-gpu_command__buffer_service_external__vk__image__backing.cc (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-gpu_command__buffer_service_external__vk__image__backing.cc (revision 508999) @@ -1,29 +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.orig 2019-07-24 18:58:27 UTC +++ gpu/command_buffer/service/external_vk_image_backing.cc -@@ -18,7 +18,7 @@ +@@ -26,7 +26,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 +@@ -439,7 +439,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 +@@ -502,7 +502,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 } Index: branches/2019Q3/www/chromium/files/patch-gpu_ipc_service_gpu__init.cc =================================================================== --- branches/2019Q3/www/chromium/files/patch-gpu_ipc_service_gpu__init.cc (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-gpu_ipc_service_gpu__init.cc (revision 508999) @@ -1,83 +1,83 @@ ---- gpu/ipc/service/gpu_init.cc.orig 2019-06-04 18:55:24 UTC +--- gpu/ipc/service/gpu_init.cc.orig 2019-07-24 18:58:27 UTC +++ gpu/ipc/service/gpu_init.cc -@@ -88,7 +88,7 @@ void InitializeDirectCompositionOverlaySupport(GPUInfo +@@ -107,7 +107,7 @@ void InitializePlatformOverlaySettings(GPUInfo* gpu_in + #endif } - #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() { +@@ -118,7 +118,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 +@@ -150,7 +150,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 +@@ -220,7 +220,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 +@@ -229,7 +229,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 +@@ -328,7 +328,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL + InitializePlatformOverlaySettings(&gpu_info_); + -#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 +@@ -350,7 +350,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 +@@ -516,7 +516,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c + InitializePlatformOverlaySettings(&gpu_info_); + -#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 +@@ -536,7 +536,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c } } } -#endif // defined(OS_LINUX) +#endif // defined(OS_LINUX) || defined(OS_BSD) if (use_swiftshader) { AdjustInfoToSwiftShader(); Index: branches/2019Q3/www/chromium/files/patch-gpu_ipc_service_gpu__memory__buffer__factory.cc =================================================================== --- branches/2019Q3/www/chromium/files/patch-gpu_ipc_service_gpu__memory__buffer__factory.cc (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-gpu_ipc_service_gpu__memory__buffer__factory.cc (revision 508999) @@ -1,20 +1,20 @@ ---- gpu/ipc/service/gpu_memory_buffer_factory.cc.orig 2019-06-04 18:55:24 UTC +--- gpu/ipc/service/gpu_memory_buffer_factory.cc.orig 2019-07-24 18:58:27 UTC +++ gpu/ipc/service/gpu_memory_buffer_factory.cc @@ -12,7 +12,7 @@ #include "gpu/ipc/service/gpu_memory_buffer_factory_io_surface.h" #endif -#if defined(OS_LINUX) || defined(OS_FUCHSIA) +#if defined(OS_LINUX) || defined(OS_FUCHSIA) || defined(OS_BSD) #include "gpu/ipc/service/gpu_memory_buffer_factory_native_pixmap.h" #endif -@@ -33,7 +33,7 @@ GpuMemoryBufferFactory::CreateNativeType() { - return base::WrapUnique(new GpuMemoryBufferFactoryIOSurface); +@@ -34,7 +34,7 @@ GpuMemoryBufferFactory::CreateNativeType( + return std::make_unique(); #elif defined(OS_ANDROID) - return base::WrapUnique(new GpuMemoryBufferFactoryAndroidHardwareBuffer); + return std::make_unique(); -#elif defined(OS_LINUX) || defined(OS_FUCHSIA) +#elif defined(OS_LINUX) || defined(OS_FUCHSIA) || defined(OS_BSD) - return base::WrapUnique(new GpuMemoryBufferFactoryNativePixmap); + return std::make_unique( + vulkan_context_provider); #elif defined(OS_WIN) - return base::WrapUnique(new GpuMemoryBufferFactoryDXGI); Index: branches/2019Q3/www/chromium/files/patch-gpu_ipc_service_gpu__watchdog__thread.cc =================================================================== --- branches/2019Q3/www/chromium/files/patch-gpu_ipc_service_gpu__watchdog__thread.cc (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-gpu_ipc_service_gpu__watchdog__thread.cc (revision 508999) @@ -1,73 +1,73 @@ ---- gpu/ipc/service/gpu_watchdog_thread.cc.orig 2019-06-04 18:55:24 UTC +--- gpu/ipc/service/gpu_watchdog_thread.cc.orig 2019-07-24 18:58:27 UTC +++ gpu/ipc/service/gpu_watchdog_thread.cc -@@ -54,8 +54,10 @@ const int kGpuTimeout = 10000; +@@ -55,8 +55,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 -@@ -78,8 +80,10 @@ GpuWatchdogThread::GpuWatchdogThread() +@@ -79,8 +81,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); -@@ -94,7 +98,9 @@ GpuWatchdogThread::GpuWatchdogThread() +@@ -95,7 +99,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_); -@@ -242,8 +248,10 @@ GpuWatchdogThread::~GpuWatchdogThread() { +@@ -231,8 +237,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_); -@@ -467,7 +475,7 @@ void GpuWatchdogThread::DeliberatelyTerminateToRecover +@@ -436,7 +444,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) { -@@ -554,7 +562,9 @@ void GpuWatchdogThread::SetupXServer() { +@@ -510,7 +518,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() { -@@ -657,7 +667,7 @@ base::ThreadTicks GpuWatchdogThread::GetWatchedThreadT +@@ -611,7 +621,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: branches/2019Q3/www/chromium/files/patch-gpu_ipc_service_gpu__watchdog__thread.h =================================================================== --- branches/2019Q3/www/chromium/files/patch-gpu_ipc_service_gpu__watchdog__thread.h (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-gpu_ipc_service_gpu__watchdog__thread.h (revision 508999) @@ -1,13 +1,13 @@ ---- gpu/ipc/service/gpu_watchdog_thread.h.orig 2019-06-04 18:55:24 UTC +--- gpu/ipc/service/gpu_watchdog_thread.h.orig 2019-07-24 18:58:27 UTC +++ gpu/ipc/service/gpu_watchdog_thread.h -@@ -195,8 +195,10 @@ class GPU_IPC_SERVICE_EXPORT GpuWatchdogThread : publi +@@ -191,8 +191,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: branches/2019Q3/www/chromium/files/patch-gpu_vulkan_vulkan__function__pointers.cc =================================================================== --- branches/2019Q3/www/chromium/files/patch-gpu_vulkan_vulkan__function__pointers.cc (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-gpu_vulkan_vulkan__function__pointers.cc (revision 508999) @@ -1,20 +1,20 @@ ---- gpu/vulkan/vulkan_function_pointers.cc.orig 2019-06-04 18:55:24 UTC +--- gpu/vulkan/vulkan_function_pointers.cc.orig 2019-07-24 18:58:27 UTC +++ gpu/vulkan/vulkan_function_pointers.cc -@@ -305,7 +305,7 @@ bool VulkanFunctionPointers::BindDeviceFunctionPointer +@@ -352,7 +352,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 +@@ -366,7 +366,7 @@ bool VulkanFunctionPointers::BindDeviceFunctionPointer #endif -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) vkGetMemoryFdKHRFn = reinterpret_cast( vkGetDeviceProcAddrFn(vk_device, "vkGetMemoryFdKHR")); Index: branches/2019Q3/www/chromium/files/patch-gpu_vulkan_vulkan__function__pointers.h =================================================================== --- branches/2019Q3/www/chromium/files/patch-gpu_vulkan_vulkan__function__pointers.h (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-gpu_vulkan_vulkan__function__pointers.h (revision 508999) @@ -1,35 +1,35 @@ ---- gpu/vulkan/vulkan_function_pointers.h.orig 2019-06-04 18:55:24 UTC +--- gpu/vulkan/vulkan_function_pointers.h.orig 2019-07-24 18:58:27 UTC +++ gpu/vulkan/vulkan_function_pointers.h -@@ -131,13 +131,13 @@ struct VulkanFunctionPointers { +@@ -145,13 +145,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 -@@ -286,14 +286,14 @@ struct VulkanFunctionPointers { +@@ -313,14 +313,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: branches/2019Q3/www/chromium/files/patch-headless_lib_browser_headless__content__browser__client.cc =================================================================== --- branches/2019Q3/www/chromium/files/patch-headless_lib_browser_headless__content__browser__client.cc (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-headless_lib_browser_headless__content__browser__client.cc (revision 508999) @@ -1,20 +1,20 @@ ---- headless/lib/browser/headless_content_browser_client.cc.orig 2019-04-30 22:22:49 UTC +--- headless/lib/browser/headless_content_browser_client.cc.orig 2019-07-24 18:58:27 UTC +++ headless/lib/browser/headless_content_browser_client.cc -@@ -189,7 +189,7 @@ HeadlessContentBrowserClient::GetGeneratedCodeCacheSet +@@ -178,7 +178,7 @@ HeadlessContentBrowserClient::GetGeneratedCodeCacheSet return content::GeneratedCodeCacheSettings(true, 0, context->GetPath()); } -#if defined(OS_POSIX) && !defined(OS_MACOSX) +#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD) void HeadlessContentBrowserClient::GetAdditionalMappedFilesForChildProcess( const base::CommandLine& command_line, int child_process_id, -@@ -200,7 +200,7 @@ void HeadlessContentBrowserClient::GetAdditionalMapped +@@ -189,7 +189,7 @@ void HeadlessContentBrowserClient::GetAdditionalMapped mappings->Share(service_manager::kCrashDumpSignal, crash_signal_fd); #endif // defined(HEADLESS_USE_BREAKPAD) } -#endif // defined(OS_POSIX) && !defined(OS_MACOSX) +#endif // defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD) void HeadlessContentBrowserClient::AppendExtraCommandLineSwitches( base::CommandLine* command_line, Index: branches/2019Q3/www/chromium/files/patch-headless_lib_browser_headless__content__browser__client.h =================================================================== --- branches/2019Q3/www/chromium/files/patch-headless_lib_browser_headless__content__browser__client.h (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-headless_lib_browser_headless__content__browser__client.h (revision 508999) @@ -1,11 +1,11 @@ ---- headless/lib/browser/headless_content_browser_client.h.orig 2019-06-04 18:55:24 UTC +--- headless/lib/browser/headless_content_browser_client.h.orig 2019-07-24 18:58:27 UTC +++ headless/lib/browser/headless_content_browser_client.h -@@ -35,7 +35,7 @@ class HeadlessContentBrowserClient : public content::C +@@ -36,7 +36,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: branches/2019Q3/www/chromium/files/patch-ipc_ipc__message__utils.cc =================================================================== --- branches/2019Q3/www/chromium/files/patch-ipc_ipc__message__utils.cc (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-ipc_ipc__message__utils.cc (revision 508999) @@ -1,11 +1,11 @@ ---- ipc/ipc_message_utils.cc.orig 2019-06-04 18:55:25 UTC +--- ipc/ipc_message_utils.cc.orig 2019-07-24 18:58:29 UTC +++ ipc/ipc_message_utils.cc -@@ -356,7 +356,7 @@ void ParamTraits::Log(const param_type& +@@ -355,7 +355,7 @@ void ParamTraits::Log(const param_type& l->append(base::NumberToString(p)); } -#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_FUCHSIA) || \ +#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_FUCHSIA) || defined(OS_BSD) || \ (defined(OS_ANDROID) && defined(ARCH_CPU_64_BITS)) void ParamTraits::Log(const param_type& p, std::string* l) { l->append(base::NumberToString(p)); Index: branches/2019Q3/www/chromium/files/patch-ipc_ipc__message__utils.h =================================================================== --- branches/2019Q3/www/chromium/files/patch-ipc_ipc__message__utils.h (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-ipc_ipc__message__utils.h (revision 508999) @@ -1,11 +1,11 @@ ---- ipc/ipc_message_utils.h.orig 2019-06-04 18:55:25 UTC +--- ipc/ipc_message_utils.h.orig 2019-07-24 18:58:29 UTC +++ ipc/ipc_message_utils.h -@@ -204,7 +204,7 @@ struct ParamTraits { +@@ -205,7 +205,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) || \ +#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_FUCHSIA) || defined(OS_BSD) || \ (defined(OS_ANDROID) && defined(ARCH_CPU_64_BITS)) template <> struct ParamTraits { Index: branches/2019Q3/www/chromium/files/patch-media_base_video__frame.cc =================================================================== --- branches/2019Q3/www/chromium/files/patch-media_base_video__frame.cc (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-media_base_video__frame.cc (revision 508999) @@ -1,47 +1,47 @@ ---- media/base/video_frame.cc.orig 2019-06-04 18:55:25 UTC +--- media/base/video_frame.cc.orig 2019-07-24 18:58:30 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 && @@ -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, @@ -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_); + if (frame.storage_type() == STORAGE_DMABUFS) { + wrapping_frame->dmabuf_fds_ = DuplicateFDs(frame.dmabuf_fds_); @@ -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: branches/2019Q3/www/chromium/files/patch-media_base_video__frame.h =================================================================== --- branches/2019Q3/www/chromium/files/patch-media_base_video__frame.h (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-media_base_video__frame.h (revision 508999) @@ -1,38 +1,38 @@ ---- media/base/video_frame.h.orig 2019-06-04 18:55:25 UTC +--- media/base/video_frame.h.orig 2019-07-24 18:58:30 UTC +++ media/base/video_frame.h -@@ -72,7 +72,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte +@@ -74,7 +74,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 -@@ -266,7 +266,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte +@@ -268,7 +268,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 -@@ -458,7 +458,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte +@@ -464,7 +464,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 -@@ -652,7 +652,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte +@@ -663,7 +663,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: branches/2019Q3/www/chromium/files/patch-media_capture_video_video__capture__device__client.cc =================================================================== --- branches/2019Q3/www/chromium/files/patch-media_capture_video_video__capture__device__client.cc (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-media_capture_video_video__capture__device__client.cc (revision 508999) @@ -1,11 +1,11 @@ ---- media/capture/video/video_capture_device_client.cc.orig 2019-06-04 18:55:25 UTC +--- media/capture/video/video_capture_device_client.cc.orig 2019-07-24 18:58:30 UTC +++ media/capture/video/video_capture_device_client.cc -@@ -238,7 +238,7 @@ void VideoCaptureDeviceClient::OnIncomingCapturedData( +@@ -298,7 +298,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) fourcc_format = libyuv::FOURCC_RAW; #elif defined(OS_WIN) fourcc_format = libyuv::FOURCC_24BG; Index: branches/2019Q3/www/chromium/files/patch-media_gpu_libyuv__image__processor.cc =================================================================== --- branches/2019Q3/www/chromium/files/patch-media_gpu_libyuv__image__processor.cc (nonexistent) +++ branches/2019Q3/www/chromium/files/patch-media_gpu_libyuv__image__processor.cc (revision 508999) @@ -0,0 +1,38 @@ +--- media/gpu/libyuv_image_processor.cc.orig 2019-07-29 19:24:17 UTC ++++ media/gpu/libyuv_image_processor.cc +@@ -91,7 +91,7 @@ std::unique_ptr LibYUVImageProce + // LibYUVImageProcessor supports only memory-based video frame for input. + VideoFrame::StorageType input_storage_type = VideoFrame::STORAGE_UNKNOWN; + for (auto input_type : input_config.preferred_storage_types) { +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + if (input_type == VideoFrame::STORAGE_DMABUFS) { + video_frame_mapper = VideoFrameMapperFactory::CreateMapper( + input_config.layout.format(), true); +@@ -100,7 +100,7 @@ std::unique_ptr LibYUVImageProce + break; + } + } +-#endif // defined(OS_LINUX) ++#endif // defined(OS_LINUX) || defined(OS_BSD) + + if (VideoFrame::IsStorageTypeMappable(input_type)) { + input_storage_type = input_type; +@@ -203,7 +203,7 @@ void LibYUVImageProcessor::ProcessTask(scoped_refptrBelongsToCurrentThread()); + DVLOGF(4); +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + if (input_frame->storage_type() == VideoFrame::STORAGE_DMABUFS) { + DCHECK_NE(video_frame_mapper_.get(), nullptr); + input_frame = video_frame_mapper_->Map(std::move(input_frame)); +@@ -213,7 +213,7 @@ void LibYUVImageProcessor::ProcessTask(scoped_refptr duped_fds = -@@ -124,7 +124,7 @@ gfx::GpuMemoryBufferHandle CreateGpuMemoryBufferHandle +@@ -126,7 +126,7 @@ gfx::GpuMemoryBufferHandle CreateGpuMemoryBufferHandle } #else NOTREACHED(); -#endif // defined(OS_LINUX) +#endif // defined(OS_LINUX) || defined(OS_BSD) return handle; } Index: branches/2019Q3/www/chromium/files/patch-media_gpu_vaapi_vaapi__dmabuf__video__frame__mapper.cc =================================================================== --- branches/2019Q3/www/chromium/files/patch-media_gpu_vaapi_vaapi__dmabuf__video__frame__mapper.cc (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-media_gpu_vaapi_vaapi__dmabuf__video__frame__mapper.cc (revision 508999) @@ -1,20 +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.orig 2019-07-24 18:58:30 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: +@@ -137,7 +137,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()) { Index: branches/2019Q3/www/chromium/files/patch-media_gpu_vaapi_vaapi__video__encode__accelerator.cc =================================================================== --- branches/2019Q3/www/chromium/files/patch-media_gpu_vaapi_vaapi__video__encode__accelerator.cc (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-media_gpu_vaapi_vaapi__video__encode__accelerator.cc (revision 508999) @@ -1,20 +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.orig 2019-07-24 18:58:30 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 +@@ -558,7 +558,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()) { Index: branches/2019Q3/www/chromium/files/patch-media_gpu_video__frame__mapper__factory.cc =================================================================== --- branches/2019Q3/www/chromium/files/patch-media_gpu_video__frame__mapper__factory.cc (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-media_gpu_video__frame__mapper__factory.cc (revision 508999) @@ -1,49 +1,51 @@ ---- media/gpu/video_frame_mapper_factory.cc.orig 2019-06-04 18:55:25 UTC +--- media/gpu/video_frame_mapper_factory.cc.orig 2019-07-24 18:58:30 UTC +++ media/gpu/video_frame_mapper_factory.cc -@@ -7,36 +7,36 @@ +@@ -7,38 +7,38 @@ #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() { + std::unique_ptr VideoFrameMapperFactory::CreateMapper( + VideoPixelFormat format) { -#if BUILDFLAG(USE_VAAPI) && defined(OS_LINUX) +#if BUILDFLAG(USE_VAAPI) && (defined(OS_LINUX) || defined(OS_BSD)) - return CreateMapper(false); + return CreateMapper(format, false); #else - return CreateMapper(true); + return CreateMapper(format, true); -#endif // BUILDFLAG(USE_VAAPI) && defined(OS_LINUX) +#endif // BUILDFLAG(USE_VAAPI) && (defined(OS_LINUX) || defined(OS_BSD)) } // static std::unique_ptr VideoFrameMapperFactory::CreateMapper( + VideoPixelFormat format, bool linear_buffer_mapper) { -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) if (linear_buffer_mapper) - return std::make_unique(); + return GenericDmaBufVideoFrameMapper::Create(format); -#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(); + return VaapiDmaBufVideoFrameMapper::Create(format); -#endif // BUILDFLAG(USE_VAAPI) && defined(OS_LINUX) +#endif // BUILDFLAG(USE_VAAPI) && (defined(OS_LINUX) || defined(OS_BSD)) return nullptr; } Index: branches/2019Q3/www/chromium/files/patch-media_media__options.gni =================================================================== --- branches/2019Q3/www/chromium/files/patch-media_media__options.gni (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-media_media__options.gni (revision 508999) @@ -1,12 +1,12 @@ ---- media/media_options.gni.orig 2019-06-04 18:55:25 UTC +--- media/media_options.gni.orig 2019-07-24 18:58:30 UTC +++ media/media_options.gni -@@ -111,6 +111,9 @@ declare_args() { +@@ -110,6 +110,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: branches/2019Q3/www/chromium/files/patch-media_mojo_services_gpu__mojo__media__client.cc =================================================================== --- branches/2019Q3/www/chromium/files/patch-media_mojo_services_gpu__mojo__media__client.cc (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-media_mojo_services_gpu__mojo__media__client.cc (revision 508999) @@ -1,20 +1,20 @@ ---- media/mojo/services/gpu_mojo_media_client.cc.orig 2019-06-04 18:55:25 UTC +--- media/mojo/services/gpu_mojo_media_client.cc.orig 2019-07-24 18:58:30 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, @@ -199,7 +199,7 @@ std::unique_ptr GpuMojoMediaClient::Crea - std::make_unique(gpu_task_runner_, - std::move(get_stub_cb))); + std::make_unique( + gpu_task_runner_, std::move(get_stub_cb), gpu_preferences_)); #elif defined(OS_CHROMEOS) || defined(OS_MACOSX) || defined(OS_WIN) || \ - defined(OS_LINUX) + defined(OS_LINUX) || defined(OS_BSD) video_decoder = VdaVideoDecoder::Create( task_runner, gpu_task_runner_, media_log->Clone(), target_color_space, gpu_preferences_, gpu_workarounds_, Index: branches/2019Q3/www/chromium/files/patch-media_video_gpu__memory__buffer__video__frame__pool.cc =================================================================== --- branches/2019Q3/www/chromium/files/patch-media_video_gpu__memory__buffer__video__frame__pool.cc (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-media_video_gpu__memory__buffer__video__frame__pool.cc (revision 508999) @@ -1,11 +1,11 @@ ---- media/video/gpu_memory_buffer_video_frame_pool.cc.orig 2019-04-30 22:22:53 UTC +--- media/video/gpu_memory_buffer_video_frame_pool.cc.orig 2019-07-24 18:58:31 UTC +++ media/video/gpu_memory_buffer_video_frame_pool.cc -@@ -598,7 +598,7 @@ void GpuMemoryBufferVideoFramePool::PoolImpl::CreateHa +@@ -597,7 +597,7 @@ void GpuMemoryBufferVideoFramePool::PoolImpl::CreateHa } bool is_software_backed_video_frame = !video_frame->HasTextures(); -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) is_software_backed_video_frame &= !video_frame->HasDmaBufs(); #endif Index: branches/2019Q3/www/chromium/files/patch-mojo_public_js_mojo__bindings__resources.grd =================================================================== --- branches/2019Q3/www/chromium/files/patch-mojo_public_js_mojo__bindings__resources.grd (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-mojo_public_js_mojo__bindings__resources.grd (revision 508999) @@ -1,11 +1,11 @@ ---- mojo/public/js/mojo_bindings_resources.grd.orig 2019-06-04 18:55:26 UTC +--- mojo/public/js/mojo_bindings_resources.grd.orig 2019-07-24 18:58:31 UTC +++ mojo/public/js/mojo_bindings_resources.grd -@@ -41,7 +41,7 @@ +@@ -60,7 +60,7 @@ use_base_dir="false" type="BINDATA" compress="gzip" /> - + - (); -#elif defined(OS_LINUX) +#elif defined(OS_LINUX) || defined(OS_BSD) std::unique_ptr linux_config_service( new ProxyConfigServiceLinux()); Index: branches/2019Q3/www/chromium/files/patch-net_tools_cert__verify__tool_cert__verify__tool.cc =================================================================== --- branches/2019Q3/www/chromium/files/patch-net_tools_cert__verify__tool_cert__verify__tool.cc (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-net_tools_cert__verify__tool_cert__verify__tool.cc (revision 508999) @@ -1,20 +1,20 @@ ---- net/tools/cert_verify_tool/cert_verify_tool.cc.orig 2019-04-30 22:22:55 UTC +--- net/tools/cert_verify_tool/cert_verify_tool.cc.orig 2019-07-24 18:58:33 UTC +++ net/tools/cert_verify_tool/cert_verify_tool.cc @@ -28,7 +28,7 @@ #include "net/url_request/url_request_context_builder.h" #include "net/url_request/url_request_context_getter.h" -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) #include "net/proxy_resolution/proxy_config.h" #include "net/proxy_resolution/proxy_config_service_fixed.h" #endif -@@ -47,7 +47,7 @@ void SetUpOnNetworkThread(std::unique_ptr URLRequestContextBu +@@ -534,7 +534,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. -@@ -542,7 +542,7 @@ std::unique_ptr URLRequestContextBu +@@ -543,7 +543,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: branches/2019Q3/www/chromium/files/patch-remoting_host_remoting__me2me__host.cc =================================================================== --- branches/2019Q3/www/chromium/files/patch-remoting_host_remoting__me2me__host.cc (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-remoting_host_remoting__me2me__host.cc (revision 508999) @@ -1,108 +1,108 @@ ---- remoting/host/remoting_me2me_host.cc.orig 2019-04-30 22:22:56 UTC +--- remoting/host/remoting_me2me_host.cc.orig 2019-07-24 18:58:34 UTC +++ remoting/host/remoting_me2me_host.cc -@@ -117,13 +117,13 @@ +@@ -126,13 +126,13 @@ #include "remoting/host/mac/permission_utils.h" #endif // defined(OS_MACOSX) -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) #include #include "base/linux_util.h" #include "remoting/host/audio_capturer_linux.h" #include "remoting/host/linux/certificate_watcher.h" #include "ui/gfx/x/x11.h" -#endif // defined(OS_LINUX) +#endif // defined(OS_LINUX) || defined(OS_BSD) #if defined(OS_WIN) #include -@@ -158,11 +158,11 @@ const char kApplicationName[] = "chromoting"; +@@ -167,11 +167,11 @@ const char kApplicationName[] = "chromoting"; const char kStdinConfigPath[] = "-"; #endif // !defined(REMOTING_MULTI_PROCESS) -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) // The command line switch used to pass name of the pipe to capture audio on // linux. const char kAudioPipeSwitchName[] = "audio-pipe-name"; -#endif // defined(OS_LINUX) +#endif // defined(OS_LINUX) || defined(OS_BSD) #if defined(OS_POSIX) // The command line switch used to pass name of the unix domain socket used to -@@ -354,7 +354,7 @@ class HostProcess : public ConfigWatcher::Delegate, +@@ -369,7 +369,7 @@ class HostProcess : public ConfigWatcher::Delegate, std::unique_ptr context_; -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) // Watch for certificate changes and kill the host when changes occur std::unique_ptr cert_watcher_; #endif -@@ -563,10 +563,10 @@ bool HostProcess::InitWithCommandLine(const base::Comm +@@ -589,10 +589,10 @@ bool HostProcess::InitWithCommandLine(const base::Comm enable_window_capture_ = cmd_line->HasSwitch(kWindowIdSwitchName); if (enable_window_capture_) { -#if defined(OS_LINUX) || defined(OS_WIN) +#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_BSD) LOG(WARNING) << "Window capturing is not fully supported on Linux or " "Windows."; -#endif // defined(OS_LINUX) || defined(OS_WIN) +#endif // defined(OS_LINUX) || defined(OS_WIN) || defined(OS_BSD) // uint32_t is large enough to hold window IDs on all platforms. uint32_t window_id; -@@ -760,7 +760,7 @@ void HostProcess::CreateAuthenticatorFactory() { +@@ -788,7 +788,7 @@ void HostProcess::CreateAuthenticatorFactory() { DCHECK(third_party_auth_config_.token_url.is_valid()); DCHECK(third_party_auth_config_.token_validation_url.is_valid()); -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) if (!cert_watcher_) { cert_watcher_.reset(new CertificateWatcher( base::Bind(&HostProcess::ShutdownHost, this, kSuccessExitCode), -@@ -846,7 +846,7 @@ void HostProcess::StartOnUiThread() { +@@ -874,7 +874,7 @@ void HostProcess::StartOnUiThread() { base::Bind(&HostProcess::OnPolicyUpdate, base::Unretained(this)), base::Bind(&HostProcess::OnPolicyError, base::Unretained(this))); -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) // If an audio pipe is specific on the command-line then initialize // AudioCapturerLinux to capture from it. base::FilePath audio_pipe_name = base::CommandLine::ForCurrentProcess()-> -@@ -855,7 +855,7 @@ void HostProcess::StartOnUiThread() { +@@ -883,7 +883,7 @@ void HostProcess::StartOnUiThread() { remoting::AudioCapturerLinux::InitializePipeReader( context_->audio_task_runner(), audio_pipe_name); } -#endif // defined(OS_LINUX) +#endif // defined(OS_LINUX) || defined(OS_BSD) #if defined(OS_POSIX) base::FilePath security_key_socket_name = -@@ -912,7 +912,7 @@ void HostProcess::ShutdownOnUiThread() { +@@ -940,7 +940,7 @@ void HostProcess::ShutdownOnUiThread() { // It is now safe for the HostProcess to be deleted. self_ = nullptr; -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) // Cause the global AudioPipeReader to be freed, otherwise the audio // thread will remain in-use and prevent the process from exiting. // TODO(wez): DesktopEnvironmentFactory should own the pipe reader. -@@ -1564,7 +1564,7 @@ void HostProcess::StartHost() { +@@ -1634,7 +1634,7 @@ void HostProcess::StartHost() { host_->AddExtension(std::make_unique()); // TODO(simonmorris): Get the maximum session duration from a policy. -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) host_->SetMaximumSessionDuration(base::TimeDelta::FromHours(20)); #endif -@@ -1736,7 +1736,7 @@ void HostProcess::OnCrash(const std::string& function_ +@@ -1819,7 +1819,7 @@ void HostProcess::OnCrash(const std::string& function_ int HostProcessMain() { HOST_LOG << "Starting host process: version " << STRINGIZE(VERSION); -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) if (!base::CommandLine::ForCurrentProcess()->HasSwitch( kReportOfflineReasonSwitchName)) { // Required in order for us to run multiple X11 threads. Index: branches/2019Q3/www/chromium/files/patch-services_content_simple__browser_simple__browser__service.cc =================================================================== --- branches/2019Q3/www/chromium/files/patch-services_content_simple__browser_simple__browser__service.cc (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-services_content_simple__browser_simple__browser__service.cc (revision 508999) @@ -1,20 +1,20 @@ ---- services/content/simple_browser/simple_browser_service.cc.orig 2019-04-30 22:22:56 UTC +--- services/content/simple_browser/simple_browser_service.cc.orig 2019-07-24 18:58:34 UTC +++ services/content/simple_browser/simple_browser_service.cc @@ -7,7 +7,7 @@ #include "build/build_config.h" #include "services/content/simple_browser/window.h" -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) #include "third_party/skia/include/ports/SkFontConfigInterface.h" // nogncheck #endif -@@ -27,7 +27,7 @@ SimpleBrowserService::~SimpleBrowserService() = defaul +@@ -23,7 +23,7 @@ SimpleBrowserService::~SimpleBrowserService() = defaul void SimpleBrowserService::OnStart() { if (ui_initialization_mode_ == UIInitializationMode::kInitializeUI) { -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) font_loader_ = sk_make_sp(service_binding_.GetConnector()); SkFontConfigInterface::SetGlobal(font_loader_); Index: branches/2019Q3/www/chromium/files/patch-services_content_simple__browser_simple__browser__service.h =================================================================== --- branches/2019Q3/www/chromium/files/patch-services_content_simple__browser_simple__browser__service.h (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-services_content_simple__browser_simple__browser__service.h (revision 508999) @@ -1,20 +1,20 @@ ---- services/content/simple_browser/simple_browser_service.h.orig 2019-03-11 22:01:01 UTC +--- services/content/simple_browser/simple_browser_service.h.orig 2019-07-24 18:58:34 UTC +++ services/content/simple_browser/simple_browser_service.h -@@ -16,7 +16,7 @@ +@@ -15,7 +15,7 @@ #include "services/service_manager/public/cpp/service_binding.h" #include "services/service_manager/public/mojom/service.mojom.h" -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) #include "components/services/font/public/cpp/font_loader.h" // nogncheck #endif -@@ -50,7 +50,7 @@ class COMPONENT_EXPORT(SIMPLE_BROWSER) SimpleBrowserSe +@@ -45,7 +45,7 @@ class COMPONENT_EXPORT(SIMPLE_BROWSER) SimpleBrowserSe // service_manager::Service: void OnStart() override; -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) sk_sp font_loader_; #endif Index: branches/2019Q3/www/chromium/files/patch-services_device_usb_BUILD.gn =================================================================== --- branches/2019Q3/www/chromium/files/patch-services_device_usb_BUILD.gn (nonexistent) +++ branches/2019Q3/www/chromium/files/patch-services_device_usb_BUILD.gn (revision 508999) @@ -0,0 +1,11 @@ +--- services/device/usb/BUILD.gn.orig 2019-07-29 14:20:42 UTC ++++ services/device/usb/BUILD.gn +@@ -111,7 +111,7 @@ static_library("usb") { + ] + } + +- if (is_android || is_chromeos || is_linux) { ++ if ((is_android || is_chromeos || is_linux) && !is_bsd) { + sources += [ + "usb_device_handle_usbfs.cc", + "usb_device_handle_usbfs.h", Property changes on: branches/2019Q3/www/chromium/files/patch-services_device_usb_BUILD.gn ___________________________________________________________________ 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: branches/2019Q3/www/chromium/files/patch-services_network_BUILD.gn =================================================================== --- branches/2019Q3/www/chromium/files/patch-services_network_BUILD.gn (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-services_network_BUILD.gn (revision 508999) @@ -1,10 +1,10 @@ ---- services/network/BUILD.gn.orig 2019-06-04 18:55:28 UTC +--- services/network/BUILD.gn.orig 2019-07-24 18:58:34 UTC +++ services/network/BUILD.gn -@@ -247,7 +247,6 @@ jumbo_component("network_service") { +@@ -253,7 +253,6 @@ jumbo_component("network_service") { if (is_linux) { deps += [ - "//sandbox/linux:sandbox_services", "//services/service_manager/sandbox:sandbox", ] } Index: branches/2019Q3/www/chromium/files/patch-services_network_network__context.cc =================================================================== --- branches/2019Q3/www/chromium/files/patch-services_network_network__context.cc (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-services_network_network__context.cc (revision 508999) @@ -1,38 +1,11 @@ ---- services/network/network_context.cc.orig 2019-06-04 18:55:28 UTC +--- services/network/network_context.cc.orig 2019-07-24 18:58:34 UTC +++ services/network/network_context.cc -@@ -132,7 +132,7 @@ - #endif // defined(USE_NSS_CERTS) +@@ -1711,7 +1711,7 @@ URLRequestContextOwner NetworkContext::ApplyContextPar - #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 - } -@@ -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."; -@@ -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: branches/2019Q3/www/chromium/files/patch-services_network_network__service.cc =================================================================== --- branches/2019Q3/www/chromium/files/patch-services_network_network__service.cc (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-services_network_network__service.cc (revision 508999) @@ -1,20 +1,20 @@ ---- services/network/network_service.cc.orig 2019-06-04 18:55:28 UTC +--- services/network/network_service.cc.orig 2019-07-24 18:58:34 UTC +++ services/network/network_service.cc -@@ -62,7 +62,7 @@ +@@ -60,7 +60,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 -@@ -596,7 +596,7 @@ void NetworkService::OnCertDBChanged() { +@@ -625,7 +625,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: branches/2019Q3/www/chromium/files/patch-services_network_network__service.h =================================================================== --- branches/2019Q3/www/chromium/files/patch-services_network_network__service.h (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-services_network_network__service.h (revision 508999) @@ -1,11 +1,11 @@ ---- services/network/network_service.h.orig 2019-06-04 18:55:28 UTC +--- services/network/network_service.h.orig 2019-07-24 18:58:34 UTC +++ services/network/network_service.h -@@ -182,7 +182,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkService - #endif // !BUILDFLAG(IS_CT_SUPPORTED) +@@ -176,7 +176,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkService + mojom::NetworkService::GetNetworkListCallback callback) override; 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: branches/2019Q3/www/chromium/files/patch-services_resource__coordinator_memory__instrumentation_queued__request__dispatcher.cc =================================================================== --- branches/2019Q3/www/chromium/files/patch-services_resource__coordinator_memory__instrumentation_queued__request__dispatcher.cc (nonexistent) +++ branches/2019Q3/www/chromium/files/patch-services_resource__coordinator_memory__instrumentation_queued__request__dispatcher.cc (revision 508999) @@ -0,0 +1,20 @@ +--- services/resource_coordinator/memory_instrumentation/queued_request_dispatcher.cc.orig 2019-07-29 19:31:28 UTC ++++ services/resource_coordinator/memory_instrumentation/queued_request_dispatcher.cc +@@ -42,7 +42,7 @@ namespace { + uint32_t CalculatePrivateFootprintKb(const mojom::RawOSMemDump& os_dump, + uint32_t shared_resident_kb) { + DCHECK(os_dump.platform_private_footprint); +-#if defined(OS_LINUX) || defined(OS_ANDROID) ++#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) + uint64_t rss_anon_bytes = os_dump.platform_private_footprint->rss_anon_bytes; + uint64_t vm_swap_bytes = os_dump.platform_private_footprint->vm_swap_bytes; + return (rss_anon_bytes + vm_swap_bytes) / 1024; +@@ -151,7 +151,7 @@ memory_instrumentation::mojom::OSMemDumpPtr CreatePubl + os_dump->is_peak_rss_resettable = internal_os_dump.is_peak_rss_resettable; + os_dump->private_footprint_kb = + CalculatePrivateFootprintKb(internal_os_dump, shared_resident_kb); +-#if defined(OS_LINUX) || defined(OS_ANDROID) ++#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) + os_dump->private_footprint_swap_kb = + internal_os_dump.platform_private_footprint->vm_swap_bytes / 1024; + #endif Property changes on: branches/2019Q3/www/chromium/files/patch-services_resource__coordinator_memory__instrumentation_queued__request__dispatcher.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: branches/2019Q3/www/chromium/files/patch-services_resource__coordinator_public_cpp_memory__instrumentation_os__metrics.h =================================================================== --- branches/2019Q3/www/chromium/files/patch-services_resource__coordinator_public_cpp_memory__instrumentation_os__metrics.h (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-services_resource__coordinator_public_cpp_memory__instrumentation_os__metrics.h (revision 508999) @@ -1,32 +1,32 @@ ---- services/resource_coordinator/public/cpp/memory_instrumentation/os_metrics.h.orig 2019-04-30 22:22:56 UTC +--- services/resource_coordinator/public/cpp/memory_instrumentation/os_metrics.h.orig 2019-07-24 18:58:35 UTC +++ services/resource_coordinator/public/cpp/memory_instrumentation/os_metrics.h @@ -28,9 +28,9 @@ class COMPONENT_EXPORT( mojom::RawOSMemDump*); static std::vector GetProcessMemoryMaps(base::ProcessId); -#if defined(OS_LINUX) || defined(OS_ANDROID) +#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) static void SetProcSmapsForTesting(FILE*); -#endif // defined(OS_LINUX) || defined(OS_ANDROID) +#endif // defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) private: FRIEND_TEST_ALL_PREFIXES(OSMetricsTest, ParseProcSmaps); @@ -44,7 +44,7 @@ class COMPONENT_EXPORT( static std::vector GetProcessModules(base::ProcessId); #endif -#if defined(OS_LINUX) || defined(OS_ANDROID) +#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) // Provides information on the dump state of resident pages. enum class MappedAndResidentPagesDumpState { // Access to /proc//pagemap can be denied for android devices running -@@ -65,7 +65,7 @@ class COMPONENT_EXPORT( - const size_t end_address, - std::vector* accessed_pages_bitmap); - +@@ -68,7 +68,7 @@ class COMPONENT_EXPORT( + // TODO(chiniforooshan): move to /base/process/process_metrics_linux.cc after + // making sure that peak RSS is useful. + static size_t GetPeakResidentSetSize(base::ProcessId pid); -#endif // defined(OS_LINUX) || defined(OS_ANDROID) +#endif // defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) }; } // namespace memory_instrumentation Index: branches/2019Q3/www/chromium/files/patch-services_resource__coordinator_public_cpp_memory__instrumentation_os__metrics__linux.cc =================================================================== --- branches/2019Q3/www/chromium/files/patch-services_resource__coordinator_public_cpp_memory__instrumentation_os__metrics__linux.cc (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-services_resource__coordinator_public_cpp_memory__instrumentation_os__metrics__linux.cc (revision 508999) @@ -1,100 +1,103 @@ ---- services/resource_coordinator/public/cpp/memory_instrumentation/os_metrics_linux.cc.orig 2019-04-30 22:22:56 UTC +--- services/resource_coordinator/public/cpp/memory_instrumentation/os_metrics_linux.cc.orig 2019-07-24 18:58:35 UTC +++ services/resource_coordinator/public/cpp/memory_instrumentation/os_metrics_linux.cc -@@ -19,8 +19,10 @@ +@@ -22,8 +22,10 @@ #include "build/build_config.h" #include "services/resource_coordinator/public/cpp/memory_instrumentation/os_metrics.h" +#if !defined(OS_BSD) // Symbol with virtual address of the start of ELF header of the current binary. extern char __ehdr_start; +#endif namespace memory_instrumentation { -@@ -69,6 +71,7 @@ struct ModuleData { +@@ -86,6 +88,7 @@ struct ModuleData { ModuleData GetMainModuleData() { ModuleData module_data; +#if !defined(OS_BSD) Dl_info dl_info; if (dladdr(&__ehdr_start, &dl_info)) { base::debug::ElfBuildIdBuffer build_id; -@@ -79,6 +82,7 @@ ModuleData GetMainModuleData() { +@@ -96,6 +99,7 @@ ModuleData GetMainModuleData() { module_data.build_id = std::string(build_id, build_id_length); } } +#endif return module_data; } -@@ -126,14 +130,14 @@ bool ParseSmapsHeader(const char* header_line, +@@ -143,14 +147,14 @@ bool ParseSmapsHeader(const char* header_line, // Build ID is needed to symbolize heap profiles, and is generated only on // official builds. Build ID is only added for the current library (chrome) // since it is racy to read other libraries which can be unmapped any time. -#if defined(OFFICIAL_BUILD) +#if defined(OFFICIAL_BUILD) && !defined(OS_BSD) if (!region->mapped_file.empty() && base::StartsWith(main_module_data.path, region->mapped_file, base::CompareCase::SENSITIVE) && !main_module_data.build_id.empty()) { region->module_debugid = main_module_data.build_id; } -#endif // defined(OFFICIAL_BUILD) +#endif // defined(OFFICIAL_BUILD) && !defined(OS_BSD) return res; } -@@ -220,6 +224,10 @@ void OSMetrics::SetProcSmapsForTesting(FILE* f) { - // static - bool OSMetrics::FillOSMemoryDump(base::ProcessId pid, +@@ -239,6 +243,7 @@ bool OSMetrics::FillOSMemoryDump(base::ProcessId pid, mojom::RawOSMemDump* dump) { -+#if defined(OS_BSD) -+ NOTIMPLEMENTED(); -+ return false; -+#else - base::ScopedFD autoclose = OpenStatm(pid); + // TODO(chiniforooshan): There is no need to read both /statm and /status + // files. Refactor to get everything from /status using ProcessMetric. ++#if !defined(OS_BSD) + auto statm_file = GetProcPidDir(pid).Append("statm"); + auto autoclose = base::ScopedFD(open(statm_file.value().c_str(), O_RDONLY)); int statm_fd = autoclose.get(); +@@ -253,6 +258,10 @@ bool OSMetrics::FillOSMemoryDump(base::ProcessId pid, -@@ -267,10 +275,15 @@ bool OSMetrics::FillOSMemoryDump(base::ProcessId pid, - #endif // defined(OS_ANDROID) - - return true; + if (!success) + return false; ++#else ++ uint64_t resident_pages = 0; ++ uint64_t shared_pages = 0; +#endif - } + auto process_metrics = CreateProcessMetrics(pid); + +@@ -293,6 +302,10 @@ bool OSMetrics::FillOSMemoryDump(base::ProcessId pid, + // static std::vector OSMetrics::GetProcessMemoryMaps(base::ProcessId pid) { +#if defined(OS_BSD) + NOTIMPLEMENTED(); + return std::vector(); +#else std::vector maps; uint32_t res = 0; if (g_proc_smaps_for_testing) { -@@ -288,6 +301,7 @@ std::vector OSMetrics::GetProcessMemoryMa +@@ -310,6 +323,7 @@ std::vector OSMetrics::GetProcessMemoryMa return std::vector(); return maps; +#endif } // static -@@ -295,6 +309,10 @@ OSMetrics::MappedAndResidentPagesDumpState OSMetrics:: +@@ -317,6 +331,10 @@ OSMetrics::MappedAndResidentPagesDumpState OSMetrics:: const size_t start_address, const size_t end_address, std::vector* accessed_pages_bitmap) { +#if defined(OS_BSD) + NOTIMPLEMENTED(); + return OSMetrics::MappedAndResidentPagesDumpState::kFailure; +#else const char* kPagemap = "/proc/self/pagemap"; base::ScopedFILE pagemap_file(fopen(kPagemap, "r")); -@@ -336,6 +354,7 @@ OSMetrics::MappedAndResidentPagesDumpState OSMetrics:: +@@ -358,6 +376,7 @@ OSMetrics::MappedAndResidentPagesDumpState OSMetrics:: } } return OSMetrics::MappedAndResidentPagesDumpState::kSuccess; +#endif } - } // namespace memory_instrumentation + // static Index: branches/2019Q3/www/chromium/files/patch-services_service__manager_embedder_main.cc =================================================================== --- branches/2019Q3/www/chromium/files/patch-services_service__manager_embedder_main.cc (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-services_service__manager_embedder_main.cc (revision 508999) @@ -1,11 +1,11 @@ ---- services/service_manager/embedder/main.cc.orig 2019-06-04 18:55:28 UTC +--- services/service_manager/embedder/main.cc.orig 2019-07-24 18:58:35 UTC +++ services/service_manager/embedder/main.cc -@@ -264,7 +264,7 @@ int Main(const MainParams& params) { +@@ -271,7 +271,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: branches/2019Q3/www/chromium/files/patch-third__party_angle_BUILD.gn =================================================================== --- branches/2019Q3/www/chromium/files/patch-third__party_angle_BUILD.gn (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-third__party_angle_BUILD.gn (revision 508999) @@ -1,21 +1,21 @@ ---- third_party/angle/BUILD.gn.orig 2019-06-04 18:57:56 UTC +--- third_party/angle/BUILD.gn.orig 2019-07-24 19:03:24 UTC +++ third_party/angle/BUILD.gn -@@ -319,6 +319,7 @@ angle_static_library("angle_gpu_info_util") { +@@ -322,6 +322,7 @@ angle_static_library("angle_gpu_info_util") { "X11", "Xi", "Xext", + "GL", ] } } -@@ -916,10 +917,6 @@ foreach(is_shared_library, +@@ -929,10 +930,6 @@ foreach(is_shared_library, libs = [] if (is_linux) { sources += util_linux_sources - libs += [ - "rt", - "dl", - ] } if (is_mac) { Index: branches/2019Q3/www/chromium/files/patch-third__party_blink_renderer_BUILD.gn =================================================================== --- branches/2019Q3/www/chromium/files/patch-third__party_blink_renderer_BUILD.gn (nonexistent) +++ branches/2019Q3/www/chromium/files/patch-third__party_blink_renderer_BUILD.gn (revision 508999) @@ -0,0 +1,13 @@ +--- third_party/blink/renderer/BUILD.gn.orig 2019-07-29 20:47:32 UTC ++++ third_party/blink/renderer/BUILD.gn +@@ -45,8 +45,8 @@ config("inside_blink") { + "-Wconversion", + "-Wno-float-conversion", + "-Wno-sign-conversion", +- "-Wno-implicit-float-conversion", +- "-Wno-implicit-int-conversion", ++# "-Wno-implicit-float-conversion", ++# "-Wno-implicit-int-conversion", + ] + } + } Property changes on: branches/2019Q3/www/chromium/files/patch-third__party_blink_renderer_BUILD.gn ___________________________________________________________________ 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: branches/2019Q3/www/chromium/files/patch-third__party_blink_renderer_core_html_canvas_canvas__async__blob__creator.cc =================================================================== --- branches/2019Q3/www/chromium/files/patch-third__party_blink_renderer_core_html_canvas_canvas__async__blob__creator.cc (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-third__party_blink_renderer_core_html_canvas_canvas__async__blob__creator.cc (revision 508999) @@ -1,11 +1,11 @@ ---- third_party/blink/renderer/core/html/canvas/canvas_async_blob_creator.cc.orig 2019-03-11 22:01:03 UTC +--- third_party/blink/renderer/core/html/canvas/canvas_async_blob_creator.cc.orig 2019-07-24 18:58:40 UTC +++ third_party/blink/renderer/core/html/canvas/canvas_async_blob_creator.cc -@@ -39,7 +39,7 @@ constexpr TimeDelta kEncodeRowSlackBeforeDeadline = +@@ -40,7 +40,7 @@ constexpr TimeDelta kEncodeRowSlackBeforeDeadline = TimeDelta::FromMicroseconds(100); /* The value is based on user statistics on Nov 2017. */ -#if (defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN)) +#if (defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN)) || defined(OS_BSD) const double kIdleTaskStartTimeoutDelayMs = 1000.0; #else const double kIdleTaskStartTimeoutDelayMs = 4000.0; // For ChromeOS, Mobile Index: branches/2019Q3/www/chromium/files/patch-third__party_blink_renderer_core_layout_layout__view.cc =================================================================== --- branches/2019Q3/www/chromium/files/patch-third__party_blink_renderer_core_layout_layout__view.cc (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-third__party_blink_renderer_core_layout_layout__view.cc (revision 508999) @@ -1,20 +1,20 @@ ---- third_party/blink/renderer/core/layout/layout_view.cc.orig 2019-03-17 20:57:47 UTC +--- third_party/blink/renderer/core/layout/layout_view.cc.orig 2019-07-24 18:58:40 UTC +++ third_party/blink/renderer/core/layout/layout_view.cc @@ -58,7 +58,7 @@ + #include "third_party/blink/renderer/platform/instrumentation/tracing/traced_value.h" #include "third_party/blink/renderer/platform/runtime_enabled_features.h" - #include "third_party/blink/renderer/platform/transforms/transform_state.h" -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) #include "third_party/blink/renderer/platform/fonts/font_cache.h" #endif @@ -321,7 +321,7 @@ void LayoutView::UpdateLayout() { DCHECK(!layout_state_); LayoutState root_layout_state(*this); -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) // The font code in FontPlatformData does not have a direct connection to the // document, the frame or anything from which we could retrieve the device // scale factor. After using zoom for DSF, the GraphicsContext does only ever Index: branches/2019Q3/www/chromium/files/patch-third__party_blink_renderer_platform_BUILD.gn =================================================================== --- branches/2019Q3/www/chromium/files/patch-third__party_blink_renderer_platform_BUILD.gn (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-third__party_blink_renderer_platform_BUILD.gn (revision 508999) @@ -1,10 +1,10 @@ ---- third_party/blink/renderer/platform/BUILD.gn.orig 2019-06-04 18:55:30 UTC +--- third_party/blink/renderer/platform/BUILD.gn.orig 2019-07-24 18:58:42 UTC +++ third_party/blink/renderer/platform/BUILD.gn -@@ -137,6 +137,7 @@ executable("character_data_generator") { +@@ -111,6 +111,7 @@ executable("character_data_generator") { "//build/win:default_exe_manifest", "//third_party/icu", ] + libs = [ "cxxrt" ] } # This isn't strictly necessary since we can just add the deps to "platform", Index: branches/2019Q3/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.cc =================================================================== --- branches/2019Q3/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.cc (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.cc (revision 508999) @@ -1,20 +1,20 @@ ---- third_party/blink/renderer/platform/fonts/font_cache.cc.orig 2019-04-30 22:23:02 UTC +--- third_party/blink/renderer/platform/fonts/font_cache.cc.orig 2019-07-24 18:58:42 UTC +++ third_party/blink/renderer/platform/fonts/font_cache.cc -@@ -67,7 +67,7 @@ namespace blink { +@@ -72,7 +72,7 @@ static const char kColorEmojiLocale[] = "und-Zsye"; SkFontMgr* FontCache::static_font_manager_ = nullptr; -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) float FontCache::device_scale_factor_ = 1.0; #endif -@@ -90,7 +90,7 @@ FontCache::FontCache() +@@ -95,7 +95,7 @@ FontCache::FontCache() FontPlatformData* FontCache::SystemFontPlatformData( const FontDescription& font_description) { const AtomicString& family = FontCache::SystemFontFamily(); -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) if (family.IsEmpty() || family == font_family_names::kSystemUi) return nullptr; #else Index: branches/2019Q3/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.h =================================================================== --- branches/2019Q3/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.h (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.h (revision 508999) @@ -1,53 +1,53 @@ ---- third_party/blink/renderer/platform/fonts/font_cache.h.orig 2019-04-30 22:23:02 UTC +--- third_party/blink/renderer/platform/fonts/font_cache.h.orig 2019-07-24 18:58:42 UTC +++ third_party/blink/renderer/platform/fonts/font_cache.h @@ -155,7 +155,7 @@ class PLATFORM_EXPORT FontCache { sk_sp FontManager() { return font_manager_; } static void SetFontManager(sk_sp); -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) // These are needed for calling QueryRenderStyleForStrike, since // gfx::GetFontRenderParams makes distinctions based on DSF. static float DeviceScaleFactor() { return device_scale_factor_; } @@ -216,7 +216,7 @@ class PLATFORM_EXPORT FontCache { const FontDescription&); #endif // defined(OS_ANDROID) -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) struct PlatformFallbackFont { String name; CString filename; @@ -228,7 +228,7 @@ class PLATFORM_EXPORT FontCache { static void GetFontForCharacter(UChar32, const char* preferred_locale, PlatformFallbackFont*); -#endif // defined(OS_LINUX) +#endif // defined(OS_LINUX) || defined(OS_BSD) scoped_refptr FontDataFromFontPlatformData( const FontPlatformData*, -@@ -292,12 +292,12 @@ class PLATFORM_EXPORT FontCache { +@@ -301,12 +301,12 @@ class PLATFORM_EXPORT FontCache { const FontFaceCreationParams&, CString& name); --#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_FUCHSIA) -+#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_FUCHSIA) || defined(OS_BSD) +-#if defined(OS_ANDROID) || defined(OS_LINUX) ++#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD) static AtomicString GetFamilyNameForCharacter(SkFontMgr*, UChar32, const FontDescription&, FontFallbackPriority); --#endif // defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_FUCHSIA) -+#endif // defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_FUCHSIA) || defined(OS_BSD) +-#endif // defined(OS_ANDROID) || defined(OS_LINUX) ++#endif // defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD) - scoped_refptr FallbackOnStandardFontStyle(const FontDescription&, - UChar32); -@@ -328,7 +328,7 @@ class PLATFORM_EXPORT FontCache { + scoped_refptr FallbackOnStandardFontStyle( + const FontDescription&, +@@ -338,7 +338,7 @@ class PLATFORM_EXPORT FontCache { bool is_test_font_mgr_ = false; #endif // defined(OS_WIN) -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) static float device_scale_factor_; #endif Index: branches/2019Q3/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__metrics.cc =================================================================== --- branches/2019Q3/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__metrics.cc (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__metrics.cc (revision 508999) @@ -1,29 +1,29 @@ ---- third_party/blink/renderer/platform/fonts/font_metrics.cc.orig 2019-03-11 22:01:04 UTC +--- third_party/blink/renderer/platform/fonts/font_metrics.cc.orig 2019-07-24 18:58:42 UTC +++ third_party/blink/renderer/platform/fonts/font_metrics.cc -@@ -39,7 +39,7 @@ +@@ -38,7 +38,7 @@ namespace blink { -#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FUCHSIA) +#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FUCHSIA) || defined(OS_BSD) // This is the largest VDMX table which we'll try to load and parse. static const size_t kMaxVDMXTableSize = 1024 * 1024; // 1 MB #endif -@@ -61,7 +61,7 @@ void FontMetrics::AscentDescentWithHacks( +@@ -60,7 +60,7 @@ void FontMetrics::AscentDescentWithHacks( int vdmx_ascent = 0, vdmx_descent = 0; bool is_vdmx_valid = false; -#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FUCHSIA) +#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FUCHSIA) || defined(OS_BSD) // Manually digging up VDMX metrics is only applicable when bytecode hinting // using FreeType. With DirectWrite or CoreText, no bytecode hinting is ever // done. This code should be pushed into FreeType (hinted font metrics). -@@ -107,7 +107,7 @@ void FontMetrics::AscentDescentWithHacks( +@@ -106,7 +106,7 @@ void FontMetrics::AscentDescentWithHacks( visual_overflow_inflation_for_ascent = 1; if (descent < metrics.fDescent) { visual_overflow_inflation_for_descent = 1; -#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FUCHSIA) +#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FUCHSIA) || defined(OS_BSD) // When subpixel positioning is enabled, if the descent is rounded down, // the descent part of the glyph may be truncated when displayed in a // 'overflow: hidden' container. To avoid that, borrow 1 unit from the Index: branches/2019Q3/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_shaping_shape__result__inline__headers.h =================================================================== --- branches/2019Q3/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_shaping_shape__result__inline__headers.h (nonexistent) +++ branches/2019Q3/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_shaping_shape__result__inline__headers.h (revision 508999) @@ -0,0 +1,78 @@ +--- third_party/blink/renderer/platform/fonts/shaping/shape_result_inline_headers.h.orig 2019-07-29 20:52:32 UTC ++++ third_party/blink/renderer/platform/fonts/shaping/shape_result_inline_headers.h +@@ -251,37 +251,6 @@ struct ShapeResult::RunInfo : public RefCounted + struct iterator final {}; + +- // For non-zero glyph offset array +- template <> +- struct iterator final { +- // The constructor for ShapeResult +- explicit iterator(const GlyphOffsetArray& array) +- : pointer(array.storage_.get()) { +- DCHECK(pointer); +- } +- +- // The constructor for ShapeResultView +- explicit iterator(const GlyphDataRange& range) : pointer(range.offsets) { +- DCHECK(pointer); +- } +- +- GlyphOffset operator*() const { return *pointer; } +- void operator++() { ++pointer; } +- +- const GlyphOffset* pointer; +- }; +- +- // For zero glyph offset array +- template <> +- struct iterator final { +- explicit iterator(const GlyphOffsetArray& array) { +- DCHECK(!array.HasStorage()); +- } +- explicit iterator(const GlyphDataRange& range) { DCHECK(!range.offsets); } +- GlyphOffset operator*() const { return GlyphOffset(); } +- void operator++() {} +- }; +- + template + iterator GetIterator() const { + return iterator(*this); +@@ -493,6 +462,37 @@ struct ShapeResult::RunInfo : public RefCounted ++struct ShapeResult::RunInfo::GlyphOffsetArray::iterator final { ++ // The constructor for ShapeResult ++ explicit iterator(const GlyphOffsetArray& array) ++ : pointer(array.storage_.get()) { ++ DCHECK(pointer); ++ } ++ ++ // The constructor for ShapeResultView ++ explicit iterator(const GlyphDataRange& range) : pointer(range.offsets) { ++ DCHECK(pointer); ++ } ++ ++ GlyphOffset operator*() const { return *pointer; } ++ void operator++() { ++pointer; } ++ ++ const GlyphOffset* pointer; ++}; ++ ++// For zero glyph offset array ++template <> ++struct ShapeResult::RunInfo::GlyphOffsetArray::iterator final { ++ explicit iterator(const GlyphOffsetArray& array) { ++ DCHECK(!array.HasStorage()); ++ } ++ explicit iterator(const GlyphDataRange& range) { DCHECK(!range.offsets); } ++ GlyphOffset operator*() const { return GlyphOffset(); } ++ void operator++() {} + }; + + // Find the range of HarfBuzzRunGlyphData for the specified character index Property changes on: branches/2019Q3/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_shaping_shape__result__inline__headers.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: branches/2019Q3/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_skia_font__cache__skia.cc =================================================================== --- branches/2019Q3/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_skia_font__cache__skia.cc (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_skia_font__cache__skia.cc (revision 508999) @@ -1,38 +1,38 @@ ---- third_party/blink/renderer/platform/fonts/skia/font_cache_skia.cc.orig 2019-03-11 22:01:04 UTC +--- third_party/blink/renderer/platform/fonts/skia/font_cache_skia.cc.orig 2019-07-24 18:58:42 UTC +++ third_party/blink/renderer/platform/fonts/skia/font_cache_skia.cc @@ -60,7 +60,7 @@ AtomicString ToAtomicString(const SkString& str) { return AtomicString::FromUTF8(str.c_str(), str.size()); } --#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_FUCHSIA) -+#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_FUCHSIA) || defined(OS_BSD) - // Android special locale for retrieving the color emoji font - // based on the proposed changes in UTR #51 for introducing - // an Emoji script code: -@@ -104,7 +104,7 @@ AtomicString FontCache::GetFamilyNameForCharacter( +-#if defined(OS_ANDROID) || defined(OS_LINUX) ++#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD) + // This function is called on android or when we are emulating android fonts on + // linux and the embedder has overriden the default fontManager with + // WebFontRendering::setSkiaFontMgr. +@@ -83,7 +83,7 @@ AtomicString FontCache::GetFamilyNameForCharacter( typeface->getFamilyName(&skia_family_name); return ToAtomicString(skia_family_name); } --#endif // defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_FUCHSIA) -+#endif // defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_FUCHSIA) || defined(OS_BSD) +-#endif // defined(OS_ANDROID) || defined(OS_LINUX) ++#endif // defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD) void FontCache::PlatformInit() {} -@@ -249,7 +249,7 @@ sk_sp FontCache::CreateTypeface( +@@ -228,7 +228,7 @@ sk_sp FontCache::CreateTypeface( } #endif -#if defined(OS_LINUX) || defined(OS_WIN) +#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_BSD) // On linux if the fontManager has been overridden then we should be calling // the embedder provided font Manager rather than calling // SkTypeface::CreateFromName which may redirect the call to the default font -@@ -276,7 +276,7 @@ std::unique_ptr FontCache::CreateFon +@@ -255,7 +255,7 @@ std::unique_ptr FontCache::CreateFon CString name; sk_sp typeface; -#if defined(OS_ANDROID) || defined(OS_LINUX) +#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD) if (alternate_name == AlternateFontName::kLocalUniqueFace && RuntimeEnabledFeatures::FontSrcLocalMatchingEnabled()) { typeface = CreateTypefaceFromUniqueName(creation_params, name); Index: branches/2019Q3/www/chromium/files/patch-third__party_pdfium_core_fxcrt_cfx__datetime.cpp =================================================================== --- branches/2019Q3/www/chromium/files/patch-third__party_pdfium_core_fxcrt_cfx__datetime.cpp (nonexistent) +++ branches/2019Q3/www/chromium/files/patch-third__party_pdfium_core_fxcrt_cfx__datetime.cpp (revision 508999) @@ -0,0 +1,11 @@ +--- third_party/pdfium/core/fxcrt/cfx_datetime.cpp.orig 2019-07-29 13:55:20 UTC ++++ third_party/pdfium/core/fxcrt/cfx_datetime.cpp +@@ -9,7 +9,7 @@ + #include "build/build_config.h" + #include "core/fxcrt/fx_system.h" + +-#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_MACOSX) || \ ++#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) || \ + defined(OS_ASMJS) || defined(__wasm__) + #include + #include Property changes on: branches/2019Q3/www/chromium/files/patch-third__party_pdfium_core_fxcrt_cfx__datetime.cpp ___________________________________________________________________ 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: branches/2019Q3/www/chromium/files/patch-third__party_pdfium_core_fxcrt_fx__system.h =================================================================== --- branches/2019Q3/www/chromium/files/patch-third__party_pdfium_core_fxcrt_fx__system.h (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-third__party_pdfium_core_fxcrt_fx__system.h (revision 508999) @@ -1,11 +1,11 @@ ---- third_party/pdfium/core/fxcrt/fx_system.h.orig 2019-06-04 18:58:01 UTC +--- third_party/pdfium/core/fxcrt/fx_system.h.orig 2019-07-24 19:03:29 UTC +++ third_party/pdfium/core/fxcrt/fx_system.h -@@ -36,7 +36,7 @@ +@@ -26,7 +26,7 @@ + #define _FX_PLATFORM_ _FX_PLATFORM_WINDOWS_ #elif defined(_WIN64) - #define _FX_OS_ _FX_OS_WIN64_ #define _FX_PLATFORM_ _FX_PLATFORM_WINDOWS_ -#elif defined(__linux__) +#elif defined(__linux__) || defined(__FreeBSD__) - #define _FX_OS_ _FX_OS_LINUX_ #define _FX_PLATFORM_ _FX_PLATFORM_LINUX_ #elif defined(__APPLE__) + #define _FX_PLATFORM_ _FX_PLATFORM_APPLE_ Index: branches/2019Q3/www/chromium/files/patch-third__party_pdfium_core_fxge_fx__ge__linux.cpp =================================================================== --- branches/2019Q3/www/chromium/files/patch-third__party_pdfium_core_fxge_fx__ge__linux.cpp (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-third__party_pdfium_core_fxge_fx__ge__linux.cpp (revision 508999) @@ -1,14 +1,14 @@ ---- third_party/pdfium/core/fxge/fx_ge_linux.cpp.orig 2019-04-30 22:25:55 UTC +--- third_party/pdfium/core/fxge/fx_ge_linux.cpp.orig 2019-07-24 19:03:29 UTC +++ third_party/pdfium/core/fxge/fx_ge_linux.cpp -@@ -147,9 +147,8 @@ std::unique_ptr SystemFontInfoIfa +@@ -151,9 +151,8 @@ std::unique_ptr SystemFontInfoIfa const char** pUserPaths) { auto pInfo = pdfium::MakeUnique(); if (!pInfo->ParseFontCfg(pUserPaths)) { - pInfo->AddPath("/usr/share/fonts"); - pInfo->AddPath("/usr/share/X11/fonts/Type1"); - pInfo->AddPath("/usr/share/X11/fonts/TTF"); + pInfo->AddPath("/usr/local/share/fonts/Type1"); + pInfo->AddPath("/usr/local/share/fonts/TTF"); pInfo->AddPath("/usr/local/share/fonts"); } return std::move(pInfo); Index: branches/2019Q3/www/chromium/files/patch-third__party_pdfium_fxjs_fx__date__helpers.cpp =================================================================== --- branches/2019Q3/www/chromium/files/patch-third__party_pdfium_fxjs_fx__date__helpers.cpp (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-third__party_pdfium_fxjs_fx__date__helpers.cpp (revision 508999) @@ -1,22 +1,22 @@ ---- third_party/pdfium/fxjs/fx_date_helpers.cpp.orig 2019-03-11 22:08:02 UTC +--- third_party/pdfium/fxjs/fx_date_helpers.cpp.orig 2019-07-24 19:03:29 UTC +++ third_party/pdfium/fxjs/fx_date_helpers.cpp -@@ -34,6 +34,11 @@ double GetLocalTZA() { +@@ -35,6 +35,11 @@ double GetLocalTZA() { return 0; time_t t = 0; FXSYS_time(&t); +#ifdef __FreeBSD__ + struct tm lt; + localtime_r(&t, <); + return (double)(-(lt.tm_gmtoff * 1000)); +#else FXSYS_localtime(&t); - #if _FX_PLATFORM_ == _FX_PLATFORM_WINDOWS_ + #if defined(OS_WIN) // In gcc 'timezone' is a global variable declared in time.h. In VC++, that -@@ -42,6 +47,7 @@ double GetLocalTZA() { +@@ -43,6 +48,7 @@ double GetLocalTZA() { _get_timezone(&timezone); - #endif // _FX_PLATFORM_ == _FX_PLATFORM_WINDOWS_ + #endif return (double)(-(timezone * 1000)); +#endif // __FreeBSD__ } int GetDaylightSavingTA(double d) { Index: branches/2019Q3/www/chromium/files/patch-third__party_pdfium_xfa_fgas_font_cfx__fontsourceenum__file.cpp =================================================================== --- branches/2019Q3/www/chromium/files/patch-third__party_pdfium_xfa_fgas_font_cfx__fontsourceenum__file.cpp (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-third__party_pdfium_xfa_fgas_font_cfx__fontsourceenum__file.cpp (revision 508999) @@ -1,14 +1,14 @@ ---- third_party/pdfium/xfa/fgas/font/cfx_fontsourceenum_file.cpp.orig 2019-06-04 18:58:01 UTC +--- third_party/pdfium/xfa/fgas/font/cfx_fontsourceenum_file.cpp.orig 2019-07-24 19:03:30 UTC +++ third_party/pdfium/xfa/fgas/font/cfx_fontsourceenum_file.cpp -@@ -16,8 +16,9 @@ constexpr char kFolderSeparator = '/'; +@@ -16,9 +16,8 @@ constexpr char kFolderSeparator = '/'; - constexpr const char* g_FontFolders[] = { + constexpr const char* kFontFolders[] = { #if _FX_PLATFORM_ == _FX_PLATFORM_LINUX_ -- "/usr/share/fonts", "/usr/share/X11/fonts/Type1", -- "/usr/share/X11/fonts/TTF", "/usr/local/share/fonts", +- "/usr/share/fonts", +- "/usr/share/X11/fonts/Type1", +- "/usr/share/X11/fonts/TTF", + "/usr/local/share/fonts/Type1", + "/usr/local/share/fonts/TTF", -+ "/usr/local/share/fonts", - #elif _FX_PLATFORM_ == _FX_PLATFORM_APPLE_ - "~/Library/Fonts", "/Library/Fonts", "/System/Library/Fonts", - #elif defined(OS_ANDROID) + "/usr/local/share/fonts", + #elif defined(OS_MACOSX) + "~/Library/Fonts", Index: branches/2019Q3/www/chromium/files/patch-third__party_pdfium_xfa_fwl_cfwl__notedriver.cpp =================================================================== --- branches/2019Q3/www/chromium/files/patch-third__party_pdfium_xfa_fwl_cfwl__notedriver.cpp (nonexistent) +++ branches/2019Q3/www/chromium/files/patch-third__party_pdfium_xfa_fwl_cfwl__notedriver.cpp (revision 508999) @@ -0,0 +1,19 @@ +--- third_party/pdfium/xfa/fwl/cfwl_notedriver.cpp.orig 2019-07-29 19:41:09 UTC ++++ third_party/pdfium/xfa/fwl/cfwl_notedriver.cpp +@@ -83,14 +83,14 @@ bool CFWL_NoteDriver::SetFocus(CFWL_Widget* pFocus) { + } + + void CFWL_NoteDriver::Run() { +-#if defined(OS_LINUX) || defined(OS_WIN) ++#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_BSD) + for (;;) { + CFWL_NoteLoop* pTopLoop = GetTopLoop(); + if (!pTopLoop || !pTopLoop->ContinueModal()) + break; + UnqueueMessageAndProcess(pTopLoop); + } +-#endif // defined(OS_LINUX) || defined(OS_WIN) ++#endif // defined(OS_LINUX) || defined(OS_WIN) || defined(OS_BSD) + } + + void CFWL_NoteDriver::NotifyTargetHide(CFWL_Widget* pNoteTarget) { Property changes on: branches/2019Q3/www/chromium/files/patch-third__party_pdfium_xfa_fwl_cfwl__notedriver.cpp ___________________________________________________________________ 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: branches/2019Q3/www/chromium/files/patch-third__party_perfetto_src_base_unix__socket.cc =================================================================== --- branches/2019Q3/www/chromium/files/patch-third__party_perfetto_src_base_unix__socket.cc (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-third__party_perfetto_src_base_unix__socket.cc (revision 508999) @@ -1,12 +1,12 @@ ---- third_party/perfetto/src/base/unix_socket.cc.orig 2019-04-30 22:25:55 UTC +--- third_party/perfetto/src/base/unix_socket.cc.orig 2019-07-24 19:03:29 UTC +++ third_party/perfetto/src/base/unix_socket.cc -@@ -524,7 +524,8 @@ void UnixSocket::DoConnect(const std::string& socket_n +@@ -523,7 +523,8 @@ void UnixSocket::DoConnect(const std::string& socket_n void UnixSocket::ReadPeerCredentials() { #if PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) || \ - PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID) + PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID) || \ + PERFETTO_BUILDFLAG(PERFETTO_OS_FREEBSD) struct ucred user_cred; socklen_t len = sizeof(user_cred); int fd = sock_raw_.fd(); Index: branches/2019Q3/www/chromium/files/patch-third__party_perfetto_src_tracing_core_tracing__service__impl.cc =================================================================== --- branches/2019Q3/www/chromium/files/patch-third__party_perfetto_src_tracing_core_tracing__service__impl.cc (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-third__party_perfetto_src_tracing_core_tracing__service__impl.cc (revision 508999) @@ -1,22 +1,22 @@ ---- third_party/perfetto/src/tracing/core/tracing_service_impl.cc.orig 2019-06-04 18:58:01 UTC +--- third_party/perfetto/src/tracing/core/tracing_service_impl.cc.orig 2019-07-24 19:03:29 UTC +++ third_party/perfetto/src/tracing/core/tracing_service_impl.cc -@@ -1953,7 +1953,8 @@ void TracingServiceImpl::OnStartTriggersTimeout(Tracin +@@ -2053,7 +2053,8 @@ void TracingServiceImpl::OnStartTriggersTimeout(Tracin void TracingServiceImpl::UpdateMemoryGuardrail() { #if !PERFETTO_BUILDFLAG(PERFETTO_EMBEDDER_BUILD) && \ - !PERFETTO_BUILDFLAG(PERFETTO_OS_MACOSX) + !PERFETTO_BUILDFLAG(PERFETTO_OS_MACOSX) && \ + !PERFETTO_BUILDFLAG(PERFETTO_OS_FREEBSD) uint64_t total_buffer_bytes = 0; // Sum up all the shared memory buffers. -@@ -2005,7 +2006,8 @@ void TracingServiceImpl::SnapshotClocks(std::vector static uint32_t read_cpu_features() { +return 0; +#if 0 const uint32_t kHWCAP_CRC32 = (1<< 7), kHWCAP_ASIMDHP = (1<<10); -@@ -82,6 +84,7 @@ - if (hwcaps & kHWCAP_CRC32 ) { features |= SkCpu::CRC32; } - if (hwcaps & kHWCAP_ASIMDHP) { features |= SkCpu::ASIMDHP; } +@@ -112,6 +114,7 @@ + } + } return features; +#endif } #elif defined(SK_CPU_ARM32) && __has_include() && \ Index: branches/2019Q3/www/chromium/files/patch-third__party_skia_src_sksl_SkSLString.h =================================================================== --- branches/2019Q3/www/chromium/files/patch-third__party_skia_src_sksl_SkSLString.h (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-third__party_skia_src_sksl_SkSLString.h (revision 508999) @@ -1,11 +1,11 @@ ---- third_party/skia/src/sksl/SkSLString.h.orig 2019-03-11 22:08:28 UTC +--- third_party/skia/src/sksl/SkSLString.h.orig 2019-07-24 19:03:37 UTC +++ third_party/skia/src/sksl/SkSLString.h @@ -22,6 +22,8 @@ - #include "SkString.h" + #include "include/core/SkString.h" #endif +#include + namespace SkSL { // Represents a (not necessarily null-terminated) slice of a string. Index: branches/2019Q3/www/chromium/files/patch-third__party_sqlite_BUILD.gn =================================================================== --- branches/2019Q3/www/chromium/files/patch-third__party_sqlite_BUILD.gn (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-third__party_sqlite_BUILD.gn (revision 508999) @@ -1,11 +1,11 @@ ---- third_party/sqlite/BUILD.gn.orig 2019-03-11 22:01:16 UTC +--- third_party/sqlite/BUILD.gn.orig 2019-07-24 18:59:14 UTC +++ third_party/sqlite/BUILD.gn -@@ -251,7 +251,7 @@ config("sqlite_warnings") { +@@ -258,7 +258,7 @@ config("sqlite_warnings") { ] } } - if (is_linux) { + if (is_linux && !is_bsd) { cflags += [ # SQLite doesn't believe in compiler warnings, preferring testing. # http://www.sqlite.org/faq.html#q17 Index: branches/2019Q3/www/chromium/files/patch-third__party_webrtc_rtc__base_BUILD.gn =================================================================== --- branches/2019Q3/www/chromium/files/patch-third__party_webrtc_rtc__base_BUILD.gn (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-third__party_webrtc_rtc__base_BUILD.gn (revision 508999) @@ -1,20 +1,20 @@ ---- third_party/webrtc/rtc_base/BUILD.gn.orig 2019-06-04 18:58:09 UTC +--- third_party/webrtc/rtc_base/BUILD.gn.orig 2019-07-24 19:03:36 UTC +++ third_party/webrtc/rtc_base/BUILD.gn -@@ -947,8 +947,6 @@ rtc_static_library("rtc_base") { +@@ -952,8 +952,6 @@ rtc_static_library("rtc_base") { if (rtc_use_x11) { libs += [ - "dl", - "rt", "Xext", "X11", "Xcomposite", -@@ -956,7 +954,7 @@ rtc_static_library("rtc_base") { +@@ -961,7 +959,7 @@ rtc_static_library("rtc_base") { ] } - if (is_linux) { + if (is_linux && !is_bsd) { libs += [ "dl", "rt", Index: branches/2019Q3/www/chromium/files/patch-third__party_webrtc_rtc__base_physical__socket__server.cc =================================================================== --- branches/2019Q3/www/chromium/files/patch-third__party_webrtc_rtc__base_physical__socket__server.cc (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-third__party_webrtc_rtc__base_physical__socket__server.cc (revision 508999) @@ -1,56 +1,65 @@ ---- third_party/webrtc/rtc_base/physical_socket_server.cc.orig 2019-03-11 22:08:16 UTC +--- third_party/webrtc/rtc_base/physical_socket_server.cc.orig 2019-07-24 19:03:36 UTC +++ third_party/webrtc/rtc_base/physical_socket_server.cc -@@ -66,7 +66,7 @@ typedef void* SockOptArg; +@@ -51,7 +51,7 @@ + #include "rtc_base/null_socket_server.h" + #include "rtc_base/time_utils.h" +-#if defined(WEBRTC_LINUX) ++#if defined(WEBRTC_LINUX) && !defined(WEBRTC_BSD) + #include + #endif + +@@ -70,7 +70,7 @@ typedef void* SockOptArg; + #endif // WEBRTC_POSIX -#if defined(WEBRTC_POSIX) && !defined(WEBRTC_MAC) && !defined(__native_client__) +#if defined(WEBRTC_POSIX) && !defined(WEBRTC_MAC) && !defined(WEBRTC_BSD) && !defined(__native_client__) int64_t GetSocketRecvTimestamp(int socket) { struct timeval tv_ioctl; -@@ -286,7 +286,7 @@ int PhysicalSocket::GetOption(Option opt, int* value) +@@ -290,7 +290,7 @@ int PhysicalSocket::GetOption(Option opt, int* value) socklen_t optlen = sizeof(*value); int ret = ::getsockopt(s_, slevel, sopt, (SockOptArg)value, &optlen); if (ret != -1 && opt == OPT_DONTFRAGMENT) { -#if defined(WEBRTC_LINUX) && !defined(WEBRTC_ANDROID) +#if defined(WEBRTC_LINUX) && !defined(WEBRTC_ANDROID) && !defined(WEBRTC_BSD) *value = (*value != IP_PMTUDISC_DONT) ? 1 : 0; #endif } -@@ -299,7 +299,7 @@ int PhysicalSocket::SetOption(Option opt, int value) { +@@ -303,7 +303,7 @@ int PhysicalSocket::SetOption(Option opt, int value) { if (TranslateOption(opt, &slevel, &sopt) == -1) return -1; if (opt == OPT_DONTFRAGMENT) { -#if defined(WEBRTC_LINUX) && !defined(WEBRTC_ANDROID) +#if defined(WEBRTC_LINUX) && !defined(WEBRTC_ANDROID) && !defined(WEBRTC_BSD) value = (value) ? IP_PMTUDISC_DO : IP_PMTUDISC_DONT; #endif } -@@ -309,7 +309,7 @@ int PhysicalSocket::SetOption(Option opt, int value) { +@@ -313,7 +313,7 @@ int PhysicalSocket::SetOption(Option opt, int value) { int PhysicalSocket::Send(const void* pv, size_t cb) { int sent = DoSend( s_, reinterpret_cast(pv), static_cast(cb), -#if defined(WEBRTC_LINUX) && !defined(WEBRTC_ANDROID) +#if defined(WEBRTC_LINUX) && !defined(WEBRTC_ANDROID) && !defined(WEBRTC_BSD) // Suppress SIGPIPE. Without this, attempting to send on a socket whose // other end is closed will result in a SIGPIPE signal being raised to // our process, which by default will terminate the process, which we -@@ -338,7 +338,7 @@ int PhysicalSocket::SendTo(const void* buffer, +@@ -342,7 +342,7 @@ int PhysicalSocket::SendTo(const void* buffer, size_t len = addr.ToSockAddrStorage(&saddr); int sent = DoSendTo(s_, static_cast(buffer), static_cast(length), -#if defined(WEBRTC_LINUX) && !defined(WEBRTC_ANDROID) +#if defined(WEBRTC_LINUX) && !defined(WEBRTC_ANDROID) && !defined(WEBRTC_BSD) // Suppress SIGPIPE. See above for explanation. MSG_NOSIGNAL, #else -@@ -529,7 +529,7 @@ int PhysicalSocket::TranslateOption(Option opt, int* s +@@ -533,7 +533,7 @@ int PhysicalSocket::TranslateOption(Option opt, int* s *slevel = IPPROTO_IP; *sopt = IP_DONTFRAGMENT; break; -#elif defined(WEBRTC_MAC) || defined(BSD) || defined(__native_client__) +#elif defined(WEBRTC_MAC) || defined(WEBRTC_BSD) || defined(__native_client__) RTC_LOG(LS_WARNING) << "Socket::OPT_DONTFRAGMENT not supported."; return -1; #elif defined(WEBRTC_POSIX) Index: branches/2019Q3/www/chromium/files/patch-tools_gn_build_gen.py =================================================================== --- branches/2019Q3/www/chromium/files/patch-tools_gn_build_gen.py (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-tools_gn_build_gen.py (revision 508999) @@ -1,33 +1,33 @@ ---- tools/gn/build/gen.py.orig 2019-06-04 19:02:25 UTC +--- tools/gn/build/gen.py.orig 2019-07-24 19:05:33 UTC +++ tools/gn/build/gen.py -@@ -44,7 +44,7 @@ class Platform(object): +@@ -46,7 +46,7 @@ class Platform(object): @staticmethod def known_platforms(): -- return ['linux', 'darwin', 'msvc', 'aix', 'fuchsia'] -+ return ['linux', 'darwin', 'msvc', 'aix', 'fuchsia', 'freebsd'] +- return ['linux', 'darwin', 'msvc', 'aix', 'fuchsia', 'openbsd'] ++ return ['linux', 'darwin', 'msvc', 'aix', 'fuchsia', 'openbsd', 'freebsd'] def platform(self): return self._platform -@@ -67,6 +67,9 @@ class Platform(object): +@@ -69,6 +69,9 @@ class Platform(object): def is_aix(self): return self._platform == 'aix' + def is_freebsd(self): + return self._platform == 'freebsd' + def is_posix(self): - return self._platform in ['linux', 'freebsd', 'darwin', 'aix'] + return self._platform in ['linux', 'freebsd', 'darwin', 'aix', 'openbsd'] -@@ -332,6 +335,11 @@ def WriteGNNinja(path, platform, host, options): +@@ -335,6 +338,11 @@ def WriteGNNinja(path, platform, host, options): elif platform.is_aix(): cflags_cc.append('-maix64') ldflags.append('-maix64') + elif platform.is_freebsd(): + cflags.extend(['-Wno-deprecated-register', '-Wno-parentheses-equality']) + ldflags.extend(['-pthread']) + libs.extend(['-lexecinfo', '-lkvm', '-lutil']) + include_dirs += ['/usr/local/include'] if platform.is_posix(): ldflags.append('-pthread') Index: branches/2019Q3/www/chromium/files/patch-tools_json__schema__compiler_feature__compiler.py =================================================================== --- branches/2019Q3/www/chromium/files/patch-tools_json__schema__compiler_feature__compiler.py (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-tools_json__schema__compiler_feature__compiler.py (revision 508999) @@ -1,10 +1,10 @@ ---- tools/json_schema_compiler/feature_compiler.py.orig 2019-06-04 18:55:48 UTC +--- tools/json_schema_compiler/feature_compiler.py.orig 2019-07-24 18:59:16 UTC +++ tools/json_schema_compiler/feature_compiler.py -@@ -212,6 +212,7 @@ FEATURE_GRAMMAR = ( +@@ -213,6 +213,7 @@ FEATURE_GRAMMAR = ( 'enum_map': { 'chromeos': 'Feature::CHROMEOS_PLATFORM', 'linux': 'Feature::LINUX_PLATFORM', + 'bsd': 'Feature::LINUX_PLATFORM', 'mac': 'Feature::MACOSX_PLATFORM', 'win': 'Feature::WIN_PLATFORM', } Index: branches/2019Q3/www/chromium/files/patch-tools_variations_fieldtrial__to__struct.py =================================================================== --- branches/2019Q3/www/chromium/files/patch-tools_variations_fieldtrial__to__struct.py (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-tools_variations_fieldtrial__to__struct.py (revision 508999) @@ -1,10 +1,10 @@ ---- tools/variations/fieldtrial_to_struct.py.orig 2019-03-11 22:01:18 UTC +--- tools/variations/fieldtrial_to_struct.py.orig 2019-07-24 18:59:17 UTC +++ tools/variations/fieldtrial_to_struct.py -@@ -24,6 +24,7 @@ finally: +@@ -33,6 +33,7 @@ finally: _platforms = [ 'android', 'android_webview', + 'freebsd', 'chromeos', 'fuchsia', 'ios', Index: branches/2019Q3/www/chromium/files/patch-ui_base_dragdrop_os__exchange__data__provider__factory.cc =================================================================== --- branches/2019Q3/www/chromium/files/patch-ui_base_dragdrop_os__exchange__data__provider__factory.cc (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-ui_base_dragdrop_os__exchange__data__provider__factory.cc (revision 508999) @@ -1,20 +1,20 @@ ---- ui/base/dragdrop/os_exchange_data_provider_factory.cc.orig 2019-03-11 22:01:19 UTC +--- ui/base/dragdrop/os_exchange_data_provider_factory.cc.orig 2019-07-24 18:59:18 UTC +++ ui/base/dragdrop/os_exchange_data_provider_factory.cc @@ -8,7 +8,7 @@ #if defined(USE_X11) #include "ui/base/dragdrop/os_exchange_data_provider_aurax11.h" -#elif defined(OS_LINUX) +#elif defined(OS_LINUX) || defined(OS_BSD) #include "ui/base/dragdrop/os_exchange_data_provider_aura.h" #elif defined(OS_MACOSX) #include "ui/base/dragdrop/os_exchange_data_provider_builder_mac.h" -@@ -42,7 +42,7 @@ OSExchangeDataProviderFactory::CreateProvider() { - +@@ -23,7 +23,7 @@ std::unique_ptr + OSExchangeDataProviderFactory::CreateProvider() { #if defined(USE_X11) return std::make_unique(); -#elif defined(OS_LINUX) +#elif defined(OS_LINUX) || defined(OS_BSD) return std::make_unique(); #elif defined(OS_MACOSX) return ui::BuildOSExchangeDataProviderMac(); Index: branches/2019Q3/www/chromium/files/patch-ui_base_resource_resource__bundle.cc =================================================================== --- branches/2019Q3/www/chromium/files/patch-ui_base_resource_resource__bundle.cc (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-ui_base_resource_resource__bundle.cc (revision 508999) @@ -1,20 +1,20 @@ ---- ui/base/resource/resource_bundle.cc.orig 2019-03-11 22:01:19 UTC +--- ui/base/resource/resource_bundle.cc.orig 2019-07-24 18:59:19 UTC +++ ui/base/resource/resource_bundle.cc -@@ -692,7 +692,7 @@ void ResourceBundle::ReloadFonts() { +@@ -701,7 +701,7 @@ void ResourceBundle::ReloadFonts() { } ScaleFactor ResourceBundle::GetMaxScaleFactor() const { -#if defined(OS_WIN) || defined(OS_LINUX) +#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) return max_scale_factor_; #else return GetSupportedScaleFactors().back(); -@@ -745,7 +745,7 @@ void ResourceBundle::InitSharedInstance(Delegate* dele +@@ -754,7 +754,7 @@ void ResourceBundle::InitSharedInstance(Delegate* dele // On platforms other than iOS, 100P is always a supported scale factor. // For Windows we have a separate case in this function. supported_scale_factors.push_back(SCALE_FACTOR_100P); -#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_WIN) +#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_WIN) || defined(OS_BSD) supported_scale_factors.push_back(SCALE_FACTOR_200P); #endif #endif Index: branches/2019Q3/www/chromium/files/patch-ui_base_webui_web__ui__util.cc =================================================================== --- branches/2019Q3/www/chromium/files/patch-ui_base_webui_web__ui__util.cc (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-ui_base_webui_web__ui__util.cc (revision 508999) @@ -1,11 +1,11 @@ ---- ui/base/webui/web_ui_util.cc.orig 2019-03-11 22:01:19 UTC +--- ui/base/webui/web_ui_util.cc.orig 2019-07-24 18:59:19 UTC +++ ui/base/webui/web_ui_util.cc -@@ -217,7 +217,7 @@ std::string GetFontFamily() { +@@ -215,7 +215,7 @@ std::string GetFontFamily() { // TODO(dnicoara) Remove Ozone check when PlatformFont support is introduced // into Ozone: crbug.com/320050 -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(USE_OZONE) +#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) && !defined(USE_OZONE) font_family = ui::ResourceBundle::GetSharedInstance().GetFont( ui::ResourceBundle::BaseFont).GetFontName() + ", " + font_family; #endif Index: branches/2019Q3/www/chromium/files/patch-ui_gfx_BUILD.gn =================================================================== --- branches/2019Q3/www/chromium/files/patch-ui_gfx_BUILD.gn (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-ui_gfx_BUILD.gn (revision 508999) @@ -1,11 +1,11 @@ ---- ui/gfx/BUILD.gn.orig 2019-06-04 18:55:50 UTC +--- ui/gfx/BUILD.gn.orig 2019-07-24 18:59:22 UTC +++ ui/gfx/BUILD.gn -@@ -546,7 +546,7 @@ jumbo_source_set("memory_buffer_sources") { +@@ -550,7 +550,7 @@ jumbo_source_set("memory_buffer_sources") { deps += [ "//build/config/linux/libdrm" ] } - if (is_linux || is_android) { + if ((is_linux || is_android) && !is_bsd) { deps += [ "//third_party/libsync" ] } Index: branches/2019Q3/www/chromium/files/patch-ui_gfx_font__render__params.h =================================================================== --- branches/2019Q3/www/chromium/files/patch-ui_gfx_font__render__params.h (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-ui_gfx_font__render__params.h (revision 508999) @@ -1,18 +1,18 @@ ---- ui/gfx/font_render_params.h.orig 2019-03-11 22:01:19 UTC +--- ui/gfx/font_render_params.h.orig 2019-07-24 18:59:22 UTC +++ ui/gfx/font_render_params.h @@ -111,13 +111,13 @@ GFX_EXPORT FontRenderParams GetFontRenderParams( const FontRenderParamsQuery& query, std::string* family_out); -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) // Clears GetFontRenderParams()'s cache. Intended to be called by tests that are // changing Fontconfig's configuration. GFX_EXPORT void ClearFontRenderParamsCacheForTest(); #endif --#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FUCHSIA) -+#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FUCHSIA) || defined(OS_BSD) +-#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_ANDROID) || \ ++#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) || \ + defined(OS_FUCHSIA) // Gets the device scale factor to query the FontRenderParams. GFX_EXPORT float GetFontRenderParamsDeviceScaleFactor(); - Index: branches/2019Q3/www/chromium/files/patch-ui_gfx_ipc_gfx__param__traits__macros.h =================================================================== --- branches/2019Q3/www/chromium/files/patch-ui_gfx_ipc_gfx__param__traits__macros.h (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-ui_gfx_ipc_gfx__param__traits__macros.h (revision 508999) @@ -1,36 +1,35 @@ ---- ui/gfx/ipc/gfx_param_traits_macros.h.orig 2019-06-04 18:55:50 UTC +--- ui/gfx/ipc/gfx_param_traits_macros.h.orig 2019-07-24 18:59:22 UTC +++ ui/gfx/ipc/gfx_param_traits_macros.h @@ -18,7 +18,7 @@ #include "ui/gfx/selection_bound.h" #include "ui/gfx/swap_result.h" -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) #include "ui/gfx/native_pixmap_handle.h" #endif @@ -51,7 +51,7 @@ IPC_STRUCT_TRAITS_BEGIN(gfx::GpuMemoryBufferHandle) IPC_STRUCT_TRAITS_MEMBER(region) IPC_STRUCT_TRAITS_MEMBER(offset) IPC_STRUCT_TRAITS_MEMBER(stride) -#if defined(OS_LINUX) || defined(OS_FUCHSIA) +#if defined(OS_LINUX) || defined(OS_FUCHSIA) || defined(OS_BSD) IPC_STRUCT_TRAITS_MEMBER(native_pixmap_handle) #elif defined(OS_MACOSX) IPC_STRUCT_TRAITS_MEMBER(mach_port) -@@ -66,13 +66,13 @@ IPC_STRUCT_TRAITS_BEGIN(gfx::GpuMemoryBufferId) +@@ -66,12 +66,12 @@ IPC_STRUCT_TRAITS_BEGIN(gfx::GpuMemoryBufferId) IPC_STRUCT_TRAITS_MEMBER(id) IPC_STRUCT_TRAITS_END() -#if defined(OS_LINUX) || defined(OS_FUCHSIA) +#if defined(OS_LINUX) || defined(OS_FUCHSIA) || defined(OS_BSD) IPC_STRUCT_TRAITS_BEGIN(gfx::NativePixmapPlane) IPC_STRUCT_TRAITS_MEMBER(stride) IPC_STRUCT_TRAITS_MEMBER(offset) IPC_STRUCT_TRAITS_MEMBER(size) - IPC_STRUCT_TRAITS_MEMBER(modifier) -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) IPC_STRUCT_TRAITS_MEMBER(fd) #elif defined(OS_FUCHSIA) IPC_STRUCT_TRAITS_MEMBER(vmo) Index: branches/2019Q3/www/chromium/files/patch-ui_gfx_linux_client__native__pixmap__dmabuf.cc =================================================================== --- branches/2019Q3/www/chromium/files/patch-ui_gfx_linux_client__native__pixmap__dmabuf.cc (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-ui_gfx_linux_client__native__pixmap__dmabuf.cc (revision 508999) @@ -1,25 +1,25 @@ ---- ui/gfx/linux/client_native_pixmap_dmabuf.cc.orig 2019-04-30 22:23:42 UTC +--- ui/gfx/linux/client_native_pixmap_dmabuf.cc.orig 2019-07-24 18:59:22 UTC +++ ui/gfx/linux/client_native_pixmap_dmabuf.cc @@ -5,7 +5,9 @@ #include "ui/gfx/linux/client_native_pixmap_dmabuf.h" #include +#if !defined(__FreeBSD__) #include +#endif #include #include #include -@@ -22,11 +24,7 @@ - #include "base/trace_event/trace_event.h" +@@ -24,11 +26,7 @@ #include "build/build_config.h" + #include "ui/gfx/switches.h" -#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0) -#include -#else -#include - +#if defined(__FreeBSD__) struct dma_buf_sync { __u64 flags; }; Index: branches/2019Q3/www/chromium/files/patch-ui_gfx_mojo_buffer__types__struct__traits.cc =================================================================== --- branches/2019Q3/www/chromium/files/patch-ui_gfx_mojo_buffer__types__struct__traits.cc (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-ui_gfx_mojo_buffer__types__struct__traits.cc (revision 508999) @@ -1,66 +1,66 @@ ---- ui/gfx/mojo/buffer_types_struct_traits.cc.orig 2019-06-04 18:55:50 UTC +--- ui/gfx/mojo/buffer_types_struct_traits.cc.orig 2019-07-24 18:59:22 UTC +++ ui/gfx/mojo/buffer_types_struct_traits.cc @@ -24,15 +24,15 @@ bool StructTraitsusage) && data.ReadFormat(&out->format); } -#if defined(OS_LINUX) || defined(USE_OZONE) +#if defined(OS_LINUX) || defined(USE_OZONE) || defined(OS_BSD) mojo::ScopedHandle StructTraits< gfx::mojom::NativePixmapPlaneDataView, gfx::NativePixmapPlane>::buffer_handle(gfx::NativePixmapPlane& plane) { -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) return mojo::WrapPlatformFile(plane.fd.release()); #elif defined(OS_FUCHSIA) return mojo::WrapPlatformHandle(mojo::PlatformHandle(std::move(plane.vmo))); -#endif // defined(OS_LINUX) +#endif // defined(OS_LINUX) || defined(OS_BSD) } bool StructTraits< -@@ -46,7 +46,7 @@ bool StructTraits< +@@ -45,7 +45,7 @@ bool StructTraits< mojo::PlatformHandle handle = mojo::UnwrapPlatformHandle(data.TakeBufferHandle()); -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) if (!handle.is_fd()) return false; out->fd = handle.TakeFD(); -@@ -54,7 +54,7 @@ bool StructTraits< - if (!handle.is_valid_handle()) +@@ -53,7 +53,7 @@ bool StructTraits< + if (!handle.is_handle()) return false; out->vmo = zx::vmo(handle.TakeHandle()); -#endif // defined(OS_LINUX) +#endif // defined(OS_LINUX) || defined(OS_BSD) return true; } -@@ -65,7 +65,7 @@ bool StructTraits< - gfx::NativePixmapHandle* out) { +@@ -71,7 +71,7 @@ bool StructTraits< + out->modifier = data.modifier(); return data.ReadPlanes(&out->planes); } -#endif // defined(OS_LINUX) || defined(USE_OZONE) +#endif // defined(OS_LINUX) || defined(USE_OZONE) || defined(OS_BSD) gfx::mojom::GpuMemoryBufferPlatformHandlePtr StructTraits< gfx::mojom::GpuMemoryBufferHandleDataView, -@@ -78,7 +78,7 @@ gfx::mojom::GpuMemoryBufferPlatformHandlePtr StructTra +@@ -84,7 +84,7 @@ gfx::mojom::GpuMemoryBufferPlatformHandlePtr StructTra return gfx::mojom::GpuMemoryBufferPlatformHandle::NewSharedMemoryHandle( std::move(handle.region)); case gfx::NATIVE_PIXMAP: -#if defined(OS_LINUX) || defined(USE_OZONE) +#if defined(OS_LINUX) || defined(USE_OZONE) || defined(OS_BSD) return gfx::mojom::GpuMemoryBufferPlatformHandle::NewNativePixmapHandle( std::move(handle.native_pixmap_handle)); #else -@@ -154,7 +154,7 @@ bool StructTraitstype = gfx::SHARED_MEMORY_BUFFER; out->region = std::move(platform_handle->get_shared_memory_handle()); return true; -#if defined(OS_LINUX) || defined(USE_OZONE) +#if defined(OS_LINUX) || defined(USE_OZONE) || defined(OS_BSD) case gfx::mojom::GpuMemoryBufferPlatformHandleDataView::Tag:: NATIVE_PIXMAP_HANDLE: out->type = gfx::NATIVE_PIXMAP; Index: branches/2019Q3/www/chromium/files/patch-ui_gfx_mojo_buffer__types__struct__traits.h =================================================================== --- branches/2019Q3/www/chromium/files/patch-ui_gfx_mojo_buffer__types__struct__traits.h (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-ui_gfx_mojo_buffer__types__struct__traits.h (revision 508999) @@ -1,20 +1,20 @@ ---- ui/gfx/mojo/buffer_types_struct_traits.h.orig 2019-06-04 18:55:50 UTC +--- ui/gfx/mojo/buffer_types_struct_traits.h.orig 2019-07-24 18:59:22 UTC +++ ui/gfx/mojo/buffer_types_struct_traits.h -@@ -186,7 +186,7 @@ struct StructTraits struct StructTraits { -@@ -218,7 +218,7 @@ struct StructTraits struct StructTraits #include "base/posix/eintr_wrapper.h" #endif @@ -20,7 +20,7 @@ namespace gfx { -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) - static_assert(NativePixmapPlane::kNoModifier == DRM_FORMAT_MOD_INVALID, - "gfx::NativePixmapPlane::kNoModifier should be an alias for" + static_assert(NativePixmapHandle::kNoModifier == DRM_FORMAT_MOD_INVALID, + "gfx::NativePixmapHandle::kNoModifier should be an alias for" "DRM_FORMAT_MOD_INVALID"); -@@ -32,7 +32,7 @@ NativePixmapPlane::NativePixmapPlane() +@@ -31,7 +31,7 @@ NativePixmapPlane::NativePixmapPlane() : stride(0), of NativePixmapPlane::NativePixmapPlane(int stride, int offset, - uint64_t size, + uint64_t size -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) - base::ScopedFD fd, + , + base::ScopedFD fd #elif defined(OS_FUCHSIA) - zx::vmo vmo, @@ -42,7 +42,7 @@ NativePixmapPlane::NativePixmapPlane(int stride, + : stride(stride), offset(offset), - size(size), - modifier(modifier) + size(size) -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) , fd(std::move(fd)) #elif defined(OS_FUCHSIA) @@ -70,7 +70,7 @@ NativePixmapHandle& NativePixmapHandle::operator=(Nati NativePixmapHandle CloneHandleForIPC(const NativePixmapHandle& handle) { NativePixmapHandle clone; for (auto& plane : handle.planes) { -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) DCHECK(plane.fd.is_valid()); base::ScopedFD fd_dup(HANDLE_EINTR(dup(plane.fd.get()))); if (!fd_dup.is_valid()) { Index: branches/2019Q3/www/chromium/files/patch-ui_gfx_native__pixmap__handle.h =================================================================== --- branches/2019Q3/www/chromium/files/patch-ui_gfx_native__pixmap__handle.h (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-ui_gfx_native__pixmap__handle.h (revision 508999) @@ -1,29 +1,29 @@ ---- ui/gfx/native_pixmap_handle.h.orig 2019-06-04 18:55:50 UTC +--- ui/gfx/native_pixmap_handle.h.orig 2019-07-24 18:59:22 UTC +++ ui/gfx/native_pixmap_handle.h -@@ -13,7 +13,7 @@ +@@ -15,7 +15,7 @@ #include "build/build_config.h" #include "ui/gfx/gfx_export.h" -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) #include "base/files/scoped_file.h" #endif -@@ -35,7 +35,7 @@ struct GFX_EXPORT NativePixmapPlane { +@@ -32,7 +32,7 @@ struct GFX_EXPORT NativePixmapPlane { NativePixmapPlane(int stride, int offset, - uint64_t size, + uint64_t size -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) - base::ScopedFD fd, + , + base::ScopedFD fd #elif defined(OS_FUCHSIA) - zx::vmo vmo, -@@ -58,7 +58,7 @@ struct GFX_EXPORT NativePixmapPlane { - // Chromium code. Also one per plane per entry. - uint64_t modifier; +@@ -53,7 +53,7 @@ struct GFX_EXPORT NativePixmapPlane { + // This is necessary to map the buffers. + uint64_t size; -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) // File descriptor for the underlying memory object (usually dmabuf). base::ScopedFD fd; #elif defined(OS_FUCHSIA) Index: branches/2019Q3/www/chromium/files/patch-ui_gfx_render__text.cc =================================================================== --- branches/2019Q3/www/chromium/files/patch-ui_gfx_render__text.cc (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-ui_gfx_render__text.cc (revision 508999) @@ -1,46 +1,46 @@ ---- ui/gfx/render_text.cc.orig 2019-03-11 22:01:19 UTC +--- ui/gfx/render_text.cc.orig 2019-07-24 18:59:22 UTC +++ ui/gfx/render_text.cc -@@ -934,32 +934,33 @@ void RenderText::SetDisplayOffset(int horizontal_offse +@@ -976,32 +976,33 @@ void RenderText::SetDisplayOffset(int horizontal_offse const int extra_content = GetContentWidth() - display_rect_.width(); const int cursor_width = cursor_enabled_ ? 1 : 0; - int min_offset = 0; - int max_offset = 0; + // avoid collisions with vm_map.h on FreeBSD --cmt + int _min_offset = 0; + int _max_offset = 0; if (extra_content > 0) { switch (GetCurrentHorizontalAlignment()) { case ALIGN_LEFT: - min_offset = -extra_content; + _min_offset = -extra_content; break; case ALIGN_RIGHT: - max_offset = extra_content; + _max_offset = extra_content; break; case ALIGN_CENTER: // The extra space reserved for cursor at the end of the text is ignored // when centering text. So, to calculate the valid range for offset, we // exclude that extra space, calculate the range, and add it back to the // range (if cursor is enabled). - min_offset = -(extra_content - cursor_width + 1) / 2 - cursor_width; - max_offset = (extra_content - cursor_width) / 2; + _min_offset = -(extra_content - cursor_width + 1) / 2 - cursor_width; + _max_offset = (extra_content - cursor_width) / 2; break; default: break; } } - if (horizontal_offset < min_offset) - horizontal_offset = min_offset; - else if (horizontal_offset > max_offset) - horizontal_offset = max_offset; + if (horizontal_offset < _min_offset) + horizontal_offset = _min_offset; + else if (horizontal_offset > _max_offset) + horizontal_offset = _max_offset; cached_bounds_and_offset_valid_ = true; display_offset_.set_x(horizontal_offset); Index: branches/2019Q3/www/chromium/files/patch-ui_gl_BUILD.gn =================================================================== --- branches/2019Q3/www/chromium/files/patch-ui_gl_BUILD.gn (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-ui_gl_BUILD.gn (revision 508999) @@ -1,23 +1,11 @@ ---- ui/gl/BUILD.gn.orig 2019-06-04 18:55:50 UTC +--- ui/gl/BUILD.gn.orig 2019-07-24 18:59:22 UTC +++ ui/gl/BUILD.gn @@ -215,7 +215,7 @@ jumbo_component("gl") { ] } - if (is_posix && !is_fuchsia && !is_mac) { + if (is_posix && !is_fuchsia && !is_mac && !is_bsd) { # Windows has USE_EGL but doesn't support base::FileDescriptor. # libsync isn't supported or needed on MacOSX. # Fuchsia is excluded due to a libsync dependency and because it's -@@ -274,7 +274,10 @@ jumbo_component("gl") { - "//build/config/linux:xext", - ] - -- deps += [ "//ui/gfx/x" ] -+ deps += [ -+ "//ui/base/x", -+ "//ui/gfx/x", -+ ] - } - if (is_win) { - sources += [ Index: branches/2019Q3/www/chromium/files/patch-ui_gl_generate__bindings.py =================================================================== --- branches/2019Q3/www/chromium/files/patch-ui_gl_generate__bindings.py (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-ui_gl_generate__bindings.py (revision 508999) @@ -1,12 +1,12 @@ ---- ui/gl/generate_bindings.py.orig 2019-06-04 18:55:50 UTC +--- ui/gl/generate_bindings.py.orig 2019-07-24 18:59:22 UTC +++ ui/gl/generate_bindings.py -@@ -2683,6 +2683,9 @@ GLX_FUNCTIONS = [ +@@ -2684,6 +2684,9 @@ GLX_FUNCTIONS = [ 'arguments': 'Display* dpy, GLXDrawable drawable, int32_t* numerator, ' 'int32_t* denominator' }, +{ 'return_type': '__GLXextFuncPtr', + 'names': ['glXGetProcAddressARB'], + 'arguments': 'const GLubyte* procName', }, { 'return_type': 'void', 'names': ['glXGetSelectedEvent'], 'arguments': 'Display* dpy, GLXDrawable drawable, unsigned long* mask', }, Index: branches/2019Q3/www/chromium/files/patch-ui_gl_gl__surface__glx.cc =================================================================== --- branches/2019Q3/www/chromium/files/patch-ui_gl_gl__surface__glx.cc (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-ui_gl_gl__surface__glx.cc (revision 508999) @@ -1,64 +1,14 @@ ---- ui/gl/gl_surface_glx.cc.orig 2019-06-04 18:55:50 UTC +--- ui/gl/gl_surface_glx.cc.orig 2019-07-24 18:59:22 UTC +++ ui/gl/gl_surface_glx.cc -@@ -21,6 +21,7 @@ - #include "base/time/time.h" - #include "base/trace_event/trace_event.h" - #include "build/build_config.h" -+#include "ui/base/x/x11_util.h" - #include "ui/events/platform/platform_event_source.h" - #include "ui/gfx/x/x11.h" - #include "ui/gfx/x/x11_connection.h" -@@ -431,7 +432,9 @@ bool GLSurfaceGLX::InitializeOneOff() { +@@ -431,7 +431,10 @@ bool GLSurfaceGLX::InitializeOneOff() { + return false; } - const XVisualInfo& visual_info = -- gl::GLVisualPickerGLX::GetInstance()->rgba_visual(); -+ ui::IsCompositingManagerPresent() -+ ? gl::GLVisualPickerGLX::GetInstance()->rgba_visual() -+ : gl::GLVisualPickerGLX::GetInstance()->system_visual(); +- const auto& visual_info = gl::GLVisualPickerGLX::GetInstance()->rgba_visual(); ++ const auto& visual_info = ++ ui::IsCompositingManagerPresent() ++ ? gl::GLVisualPickerGLX::GetInstance()->rgba_visual() ++ : gl::GLVisualPickerGLX::GetInstance()->system_visual(); g_visual = visual_info.visual; g_depth = visual_info.depth; g_colormap = -@@ -581,18 +584,30 @@ bool NativeViewGLSurfaceGLX::Initialize(GLSurfaceForma - } - size_ = gfx::Size(attributes.width, attributes.height); - -- XSetWindowAttributes swa; -- memset(&swa, 0, sizeof(swa)); -- swa.background_pixmap = 0; -- swa.bit_gravity = NorthWestGravity; -- swa.colormap = g_colormap; -- swa.background_pixel = 0; -- swa.border_pixel = 0; -- window_ = XCreateWindow( -- gfx::GetXDisplay(), parent_window_, 0 /* x */, 0 /* y */, size_.width(), -- size_.height(), 0 /* border_width */, g_depth, InputOutput, g_visual, -- CWBackPixmap | CWBitGravity | CWColormap | CWBackPixel | CWBorderPixel, -- &swa); -+ XSetWindowAttributes swa = { -+ .background_pixmap = 0, -+ .bit_gravity = NorthWestGravity, -+ .colormap = g_colormap, -+ .background_pixel = 0, // ARGB(0,0,0,0) for compositing WM -+ .border_pixel = 0, -+ }; -+ auto value_mask = CWBackPixmap | CWBitGravity | CWColormap | CWBorderPixel; -+ if (ui::IsCompositingManagerPresent() && -+ XVisualIDFromVisual(attributes.visual) == XVisualIDFromVisual(g_visual)) { -+ // When parent and child are using the same visual, the back buffer will be -+ // shared between parent and child. If WM compositing is enabled, we set -+ // child's background pixel to ARGB(0,0,0,0), so ARGB(0,0,0,0) will be -+ // filled to the shared buffer, when the child window is mapped. It can -+ // avoid an annoying flash when the child window is mapped below. -+ // If WM compositing is disabled, we don't set the background pixel, so -+ // nothing will be draw when the child window is mapped. -+ value_mask |= CWBackPixel; -+ } -+ -+ window_ = -+ XCreateWindow(gfx::GetXDisplay(), parent_window_, 0 /* x */, 0 /* y */, -+ size_.width(), size_.height(), 0 /* border_width */, -+ g_depth, InputOutput, g_visual, value_mask, &swa); - if (!window_) { - LOG(ERROR) << "XCreateWindow failed"; - return false; Index: branches/2019Q3/www/chromium/files/patch-ui_message__center_views_message__popup__view.cc =================================================================== --- branches/2019Q3/www/chromium/files/patch-ui_message__center_views_message__popup__view.cc (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-ui_message__center_views_message__popup__view.cc (revision 508999) @@ -1,11 +1,11 @@ ---- ui/message_center/views/message_popup_view.cc.orig 2019-06-04 18:55:50 UTC +--- ui/message_center/views/message_popup_view.cc.orig 2019-07-24 18:59:22 UTC +++ ui/message_center/views/message_popup_view.cc -@@ -114,7 +114,7 @@ void MessagePopupView::AutoCollapse() { +@@ -103,7 +103,7 @@ void MessagePopupView::AutoCollapse() { void MessagePopupView::Show() { views::Widget::InitParams params(views::Widget::InitParams::TYPE_POPUP); params.keep_on_top = true; -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) // Make the widget explicitly activatable as TYPE_POPUP is not activatable by // default but we need focus for the inline reply textarea. params.activatable = views::Widget::InitParams::ACTIVATABLE_YES; Index: branches/2019Q3/www/chromium/files/patch-ui_views_controls_label.cc =================================================================== --- branches/2019Q3/www/chromium/files/patch-ui_views_controls_label.cc (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-ui_views_controls_label.cc (revision 508999) @@ -1,20 +1,20 @@ ---- ui/views/controls/label.cc.orig 2019-06-04 18:55:50 UTC +--- ui/views/controls/label.cc.orig 2019-07-24 18:59:22 UTC +++ ui/views/controls/label.cc -@@ -544,7 +544,7 @@ bool Label::OnMousePressed(const ui::MouseEvent& event +@@ -548,7 +548,7 @@ bool Label::OnMousePressed(const ui::MouseEvent& event GetFocusManager()->SetFocusedView(this); } -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) if (event.IsOnlyMiddleMouseButton() && GetFocusManager() && !had_focus) GetFocusManager()->SetFocusedView(this); #endif -@@ -729,7 +729,7 @@ bool Label::PasteSelectionClipboard() { +@@ -733,7 +733,7 @@ bool Label::PasteSelectionClipboard() { } void Label::UpdateSelectionClipboard() { -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) if (!obscured()) { ui::ScopedClipboardWriter(ui::CLIPBOARD_TYPE_SELECTION) .WriteText(GetSelectedText()); Index: branches/2019Q3/www/chromium/files/patch-ui_views_controls_textfield_textfield.cc =================================================================== --- branches/2019Q3/www/chromium/files/patch-ui_views_controls_textfield_textfield.cc (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-ui_views_controls_textfield_textfield.cc (revision 508999) @@ -1,73 +1,73 @@ ---- ui/views/controls/textfield/textfield.cc.orig 2019-06-04 18:55:50 UTC +--- ui/views/controls/textfield/textfield.cc.orig 2019-07-24 18:59:22 UTC +++ ui/views/controls/textfield/textfield.cc -@@ -63,7 +63,7 @@ +@@ -62,7 +62,7 @@ #include "base/win/win_util.h" #endif -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) #include "base/strings/utf_string_conversions.h" #include "ui/base/ime/linux/text_edit_command_auralinux.h" #include "ui/base/ime/linux/text_edit_key_bindings_delegate_auralinux.h" -@@ -166,14 +166,14 @@ ui::TextEditCommand GetCommandForKeyEvent(const ui::Ke +@@ -165,14 +165,14 @@ ui::TextEditCommand GetCommandForKeyEvent(const ui::Ke case ui::VKEY_BACK: if (!control) return ui::TextEditCommand::DELETE_BACKWARD; -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) // Only erase by line break on Linux and ChromeOS. if (shift) return ui::TextEditCommand::DELETE_TO_BEGINNING_OF_LINE; #endif return ui::TextEditCommand::DELETE_WORD_BACKWARD; case ui::VKEY_DELETE: -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) // Only erase by line break on Linux and ChromeOS. if (shift && control) return ui::TextEditCommand::DELETE_TO_END_OF_LINE; -@@ -232,7 +232,7 @@ bool IsControlKeyModifier(int flags) { +@@ -240,7 +240,7 @@ bool IsControlKeyModifier(int flags) { // Control-modified key combination, but we cannot extend it to other platforms // as Control has different meanings and behaviors. // https://crrev.com/2580483002/#msg46 -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) return flags & ui::EF_CONTROL_DOWN; #else return false; -@@ -667,7 +667,7 @@ bool Textfield::OnMousePressed(const ui::MouseEvent& e +@@ -675,7 +675,7 @@ bool Textfield::OnMousePressed(const ui::MouseEvent& e #endif } -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) if (!handled && !had_focus && event.IsOnlyMiddleMouseButton()) RequestFocusWithPointer(ui::EventPointerType::POINTER_TYPE_MOUSE); #endif -@@ -713,7 +713,7 @@ bool Textfield::OnKeyPressed(const ui::KeyEvent& event +@@ -721,7 +721,7 @@ bool Textfield::OnKeyPressed(const ui::KeyEvent& event if (!textfield) return handled; -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) ui::TextEditKeyBindingsDelegateAuraLinux* delegate = ui::GetTextEditKeyBindingsDelegate(); std::vector commands; -@@ -882,7 +882,7 @@ void Textfield::AboutToRequestFocusFromTabTraversal(bo +@@ -890,7 +890,7 @@ void Textfield::AboutToRequestFocusFromTabTraversal(bo } bool Textfield::SkipDefaultKeyEventProcessing(const ui::KeyEvent& event) { -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) // Skip any accelerator handling that conflicts with custom keybindings. ui::TextEditKeyBindingsDelegateAuraLinux* delegate = ui::GetTextEditKeyBindingsDelegate(); -@@ -2081,7 +2081,7 @@ bool Textfield::PasteSelectionClipboard() { +@@ -2109,7 +2109,7 @@ bool Textfield::PasteSelectionClipboard() { } void Textfield::UpdateSelectionClipboard() { -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) if (text_input_type_ != ui::TEXT_INPUT_TYPE_PASSWORD) { ui::ScopedClipboardWriter(ui::CLIPBOARD_TYPE_SELECTION) .WriteText(GetSelectedText()); Index: branches/2019Q3/www/chromium/files/patch-ui_views_examples_widget__example.cc =================================================================== --- branches/2019Q3/www/chromium/files/patch-ui_views_examples_widget__example.cc (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-ui_views_examples_widget__example.cc (revision 508999) @@ -1,11 +1,11 @@ ---- ui/views/examples/widget_example.cc.orig 2019-06-04 18:55:50 UTC +--- ui/views/examples/widget_example.cc.orig 2019-07-24 18:59:23 UTC +++ ui/views/examples/widget_example.cc -@@ -78,7 +78,7 @@ void WidgetExample::CreateExampleView(View* container) +@@ -80,7 +80,7 @@ void WidgetExample::CreateExampleView(View* container) BuildButton(container, "Popup widget", POPUP); BuildButton(container, "Dialog widget", DIALOG); BuildButton(container, "Modal Dialog", MODAL_DIALOG); -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) // Windows does not support TYPE_CONTROL top-level widgets. BuildButton(container, "Child widget", CHILD); #endif Index: branches/2019Q3/www/chromium/files/patch-ui_views_style_platform__style.cc =================================================================== --- branches/2019Q3/www/chromium/files/patch-ui_views_style_platform__style.cc (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-ui_views_style_platform__style.cc (revision 508999) @@ -1,11 +1,11 @@ ---- ui/views/style/platform_style.cc.orig 2019-03-11 22:01:19 UTC +--- ui/views/style/platform_style.cc.orig 2019-07-24 18:59:23 UTC +++ ui/views/style/platform_style.cc -@@ -18,7 +18,7 @@ +@@ -17,7 +17,7 @@ #if defined(OS_CHROMEOS) #include "ui/views/controls/scrollbar/overlay_scroll_bar.h" -#elif defined(OS_LINUX) +#elif defined(OS_LINUX) || defined(OS_BSD) #define DESKTOP_LINUX #endif Index: branches/2019Q3/www/chromium/files/patch-ui_views_views__delegate.h =================================================================== --- branches/2019Q3/www/chromium/files/patch-ui_views_views__delegate.h (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-ui_views_views__delegate.h (revision 508999) @@ -1,11 +1,11 @@ ---- ui/views/views_delegate.h.orig 2019-06-04 18:55:50 UTC +--- ui/views/views_delegate.h.orig 2019-07-24 18:59:23 UTC +++ ui/views/views_delegate.h -@@ -147,7 +147,7 @@ class VIEWS_EXPORT ViewsDelegate { +@@ -130,7 +130,7 @@ class VIEWS_EXPORT ViewsDelegate { // Returns true if the window passed in is in the Windows 8 metro // environment. virtual bool IsWindowInMetro(gfx::NativeWindow window) const; -#elif defined(OS_LINUX) && !defined(OS_CHROMEOS) +#elif defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_FREEBSD) virtual gfx::ImageSkia* GetDefaultWindowIcon() const; #endif Index: branches/2019Q3/www/chromium/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__x11.cc =================================================================== --- branches/2019Q3/www/chromium/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__x11.cc (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__x11.cc (revision 508999) @@ -1,32 +1,32 @@ ---- ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc.orig 2019-06-04 18:55:50 UTC +--- ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc.orig 2019-07-24 18:59:23 UTC +++ ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc -@@ -1423,24 +1423,15 @@ void DesktopWindowTreeHostX11::InitX11Window( +@@ -1463,24 +1463,15 @@ void DesktopWindowTreeHostX11::InitX11Window( if (override_redirect_) attribute_mask |= CWOverrideRedirect; - bool enable_transparent_visuals; - switch (params.opacity) { - case Widget::InitParams::OPAQUE_WINDOW: - enable_transparent_visuals = false; - break; - case Widget::InitParams::TRANSLUCENT_WINDOW: - enable_transparent_visuals = true; - break; - case Widget::InitParams::INFER_OPACITY: - default: - enable_transparent_visuals = params.type == Widget::InitParams::TYPE_DRAG; - } - Visual* visual = CopyFromParent; int depth = CopyFromParent; Colormap colormap = CopyFromParent; + + // GLSurfaceGLX always create child window with alpha channel. If the parent + // window doesn't have alpha channel, it causes flash, so always request argb + // visual. ui::XVisualManager::GetInstance()->ChooseVisualForWindow( - enable_transparent_visuals, &visual, &depth, &colormap, + true /* want_argb_visual */, &visual, &depth, &colormap, &use_argb_visual_); if (colormap != CopyFromParent) { Index: branches/2019Q3/www/chromium/files/patch-ui_views_window_custom__frame__view.cc =================================================================== --- branches/2019Q3/www/chromium/files/patch-ui_views_window_custom__frame__view.cc (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-ui_views_window_custom__frame__view.cc (revision 508999) @@ -1,11 +1,11 @@ ---- ui/views/window/custom_frame_view.cc.orig 2019-06-04 18:55:50 UTC +--- ui/views/window/custom_frame_view.cc.orig 2019-07-24 18:59:23 UTC +++ ui/views/window/custom_frame_view.cc -@@ -294,7 +294,7 @@ int CustomFrameView::NonClientTopBorderHeight() const +@@ -291,7 +291,7 @@ int CustomFrameView::NonClientTopBorderHeight() const int CustomFrameView::CaptionButtonY() const { // Maximized buttons start at window top so that even if their images aren't // drawn flush with the screen edge, they still obey Fitts' Law. -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_BSD) return FrameBorderThickness(); #else return frame_->IsMaximized() ? FrameBorderThickness() : kFrameShadowThickness; Index: branches/2019Q3/www/chromium/files/patch-ui_webui_resources_js_cr.js =================================================================== --- branches/2019Q3/www/chromium/files/patch-ui_webui_resources_js_cr.js (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-ui_webui_resources_js_cr.js (revision 508999) @@ -1,14 +1,14 @@ ---- ui/webui/resources/js/cr.js.orig 2019-03-11 22:01:19 UTC +--- ui/webui/resources/js/cr.js.orig 2019-07-24 18:59:23 UTC +++ ui/webui/resources/js/cr.js -@@ -463,6 +463,11 @@ var cr = cr || function(global) { +@@ -425,6 +425,11 @@ var cr = cr || function(global) { get doc() { return document; }, + + /** Whether this is on *BSD. */ + get isBSD() { + return /BSD/.test(navigator.userAgent); + }, /** Whether we are using a Mac or not. */ get isMac() { Index: branches/2019Q3/www/chromium/files/patch-v8_BUILD.gn =================================================================== --- branches/2019Q3/www/chromium/files/patch-v8_BUILD.gn (revision 508998) +++ branches/2019Q3/www/chromium/files/patch-v8_BUILD.gn (revision 508999) @@ -1,32 +1,32 @@ ---- v8/BUILD.gn.orig 2019-06-04 18:58:07 UTC +--- v8/BUILD.gn.orig 2019-07-24 19:03:36 UTC +++ v8/BUILD.gn -@@ -3474,7 +3474,7 @@ v8_component("v8_libbase") { +@@ -3541,7 +3541,7 @@ v8_component("v8_libbase") { } } - if (is_linux) { + if (is_linux && !is_bsd) { sources += [ "src/base/debug/stack_trace_posix.cc", "src/base/platform/platform-linux.cc", -@@ -3494,6 +3494,12 @@ v8_component("v8_libbase") { +@@ -3561,6 +3561,12 @@ v8_component("v8_libbase") { "dl", "rt", ] + } else if (is_bsd) { + sources += [ + "src/base/debug/stack_trace_posix.cc", + "src/base/platform/platform-freebsd.cc", + ] + libs = [ "rt", "execinfo" ] } else if (is_android) { if (current_toolchain == host_toolchain) { libs = [ -@@ -3721,6 +3727,7 @@ if (v8_use_snapshot && current_toolchain == v8_snapsho - "src/snapshot/embedded-file-writer.h", +@@ -3818,6 +3824,7 @@ if (v8_use_snapshot && current_toolchain == v8_snapsho + "src/snapshot/embedded/platform-embedded-file-writer-win.h", "src/snapshot/mksnapshot.cc", ] + libs = ["execinfo"] configs = [ ":internal_config" ] Index: branches/2019Q3/www/chromium/files/patch-v8_src_api_api.cc =================================================================== --- branches/2019Q3/www/chromium/files/patch-v8_src_api_api.cc (nonexistent) +++ branches/2019Q3/www/chromium/files/patch-v8_src_api_api.cc (revision 508999) @@ -0,0 +1,20 @@ +--- v8/src/api/api.cc.orig 2019-07-24 19:03:36 UTC ++++ v8/src/api/api.cc +@@ -110,7 +110,7 @@ + #include "src/wasm/wasm-result.h" + #include "src/wasm/wasm-serialization.h" + +-#if V8_OS_LINUX || V8_OS_MACOSX ++#if V8_OS_LINUX || V8_OS_MACOSX || V8_OS_OPENBSD || V8_OS_FREEBSD + #include + #include "include/v8-wasm-trap-handler-posix.h" + #include "src/trap-handler/handler-inside-posix.h" +@@ -5505,7 +5505,7 @@ bool v8::V8::Initialize() { + return true; + } + +-#if V8_OS_LINUX || V8_OS_MACOSX ++#if V8_OS_LINUX || V8_OS_MACOSX || V8_OS_OPENBSD || V8_OS_FREEBSD + bool TryHandleWebAssemblyTrapPosix(int sig_code, siginfo_t* info, + void* context) { + #if V8_TARGET_ARCH_X64 && !V8_OS_ANDROID Property changes on: branches/2019Q3/www/chromium/files/patch-v8_src_api_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: branches/2019Q3/www/chromium/files/sndio_output.cc =================================================================== --- branches/2019Q3/www/chromium/files/sndio_output.cc (revision 508998) +++ branches/2019Q3/www/chromium/files/sndio_output.cc (revision 508999) @@ -1,179 +1,183 @@ // 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. #include "base/logging.h" #include "base/time/time.h" #include "base/time/default_tick_clock.h" #include "media/audio/audio_manager_base.h" #include "media/base/audio_timestamp_helper.h" #include "media/audio/sndio/sndio_output.h" namespace media { static const SampleFormat kSampleFormat = kSampleFormatS16; void SndioAudioOutputStream::OnMoveCallback(void *arg, int delta) { SndioAudioOutputStream* self = static_cast(arg); self->hw_delay -= delta; } void SndioAudioOutputStream::OnVolCallback(void *arg, unsigned int vol) { SndioAudioOutputStream* self = static_cast(arg); self->vol = vol; } void *SndioAudioOutputStream::ThreadEntry(void *arg) { SndioAudioOutputStream* self = static_cast(arg); self->ThreadLoop(); return NULL; } SndioAudioOutputStream::SndioAudioOutputStream(const AudioParameters& params, AudioManagerBase* manager) : manager(manager), params(params), audio_bus(AudioBus::Create(params)), state(kClosed), mutex(PTHREAD_MUTEX_INITIALIZER) { } SndioAudioOutputStream::~SndioAudioOutputStream() { if (state != kClosed) Close(); } bool SndioAudioOutputStream::Open() { struct sio_par par; int sig; if (params.format() != AudioParameters::AUDIO_PCM_LINEAR && params.format() != AudioParameters::AUDIO_PCM_LOW_LATENCY) { LOG(WARNING) << "Unsupported audio format."; return false; } sio_initpar(&par); par.rate = params.sample_rate(); par.pchan = params.channels(); - par.bits = SampleFormatToBitsPerChannel(kSampleFormat); + par.bits = SampleFormatToBitsPerChannel(kSampleFormat); par.bps = par.bits / 8; par.sig = sig = par.bits != 8 ? 1 : 0; par.le = SIO_LE_NATIVE; par.appbufsz = params.frames_per_buffer(); hdl = sio_open(SIO_DEVANY, SIO_PLAY, 0); if (hdl == NULL) { LOG(ERROR) << "Couldn't open audio device."; return false; } if (!sio_setpar(hdl, &par) || !sio_getpar(hdl, &par)) { LOG(ERROR) << "Couldn't set audio parameters."; goto bad_close; } if (par.rate != (unsigned int)params.sample_rate() || par.pchan != (unsigned int)params.channels() || par.bits != (unsigned int)SampleFormatToBitsPerChannel(kSampleFormat) || par.sig != (unsigned int)sig || (par.bps > 1 && par.le != SIO_LE_NATIVE) || (par.bits != par.bps * 8)) { LOG(ERROR) << "Unsupported audio parameters."; goto bad_close; } state = kStopped; volpending = 0; vol = 0; buffer = new char[audio_bus->frames() * params.GetBytesPerFrame(kSampleFormat)]; sio_onmove(hdl, &OnMoveCallback, this); sio_onvol(hdl, &OnVolCallback, this); return true; bad_close: sio_close(hdl); return false; } void SndioAudioOutputStream::Close() { if (state == kClosed) return; if (state == kRunning) Stop(); state = kClosed; delete [] buffer; sio_close(hdl); manager->ReleaseOutputStream(this); // Calls the destructor } void SndioAudioOutputStream::Start(AudioSourceCallback* callback) { state = kRunning; hw_delay = 0; source = callback; sio_start(hdl); if (pthread_create(&thread, NULL, &ThreadEntry, this) != 0) { LOG(ERROR) << "Failed to create real-time thread."; sio_stop(hdl); state = kStopped; } } void SndioAudioOutputStream::Stop() { if (state == kStopped) return; state = kStopWait; pthread_join(thread, NULL); sio_stop(hdl); state = kStopped; } void SndioAudioOutputStream::SetVolume(double v) { pthread_mutex_lock(&mutex); vol = v * SIO_MAXVOL; volpending = 1; pthread_mutex_unlock(&mutex); } void SndioAudioOutputStream::GetVolume(double* v) { pthread_mutex_lock(&mutex); *v = vol * (1. / SIO_MAXVOL); pthread_mutex_unlock(&mutex); } +// This stream is always used with sub second buffer sizes, where it's +// sufficient to simply always flush upon Start(). +void SndioAudioOutputStream::Flush() {} + void SndioAudioOutputStream::ThreadLoop(void) { int avail, count, result; while (state == kRunning) { // Update volume if needed pthread_mutex_lock(&mutex); if (volpending) { volpending = 0; sio_setvol(hdl, vol); } pthread_mutex_unlock(&mutex); // Get data to play const base::TimeDelta delay = AudioTimestampHelper::FramesToTime(hw_delay, - params.sample_rate()); + params.sample_rate()); count = source->OnMoreData(delay, base::TimeTicks::Now(), 0, audio_bus.get()); audio_bus->ToInterleaved(count, SampleFormatToBytesPerChannel(kSampleFormat), buffer); if (count == 0) { // We have to submit something to the device count = audio_bus->frames(); memset(buffer, 0, count * params.GetBytesPerFrame(kSampleFormat)); LOG(WARNING) << "No data to play, running empty cycle."; } // Submit data to the device avail = count * params.GetBytesPerFrame(kSampleFormat); result = sio_write(hdl, buffer, avail); if (result == 0) { LOG(WARNING) << "Audio device disconnected."; break; } // Update hardware pointer hw_delay += count; } } } // namespace media Index: branches/2019Q3/www/chromium/files/sndio_output.h =================================================================== --- branches/2019Q3/www/chromium/files/sndio_output.h (revision 508998) +++ branches/2019Q3/www/chromium/files/sndio_output.h (revision 508999) @@ -1,85 +1,86 @@ // 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. #ifndef MEDIA_AUDIO_SNDIO_SNDIO_OUTPUT_H_ #define MEDIA_AUDIO_SNDIO_SNDIO_OUTPUT_H_ #include #include #include "base/time/tick_clock.h" #include "base/time/time.h" #include "media/audio/audio_io.h" namespace media { class AudioManagerBase; // Implementation of AudioOutputStream using sndio(7) class SndioAudioOutputStream : public AudioOutputStream { public: // The manager is creating this object SndioAudioOutputStream(const AudioParameters& params, AudioManagerBase* manager); virtual ~SndioAudioOutputStream(); // Implementation of AudioOutputStream. bool Open() override; void Close() override; void Start(AudioSourceCallback* callback) override; void Stop() override; void SetVolume(double volume) override; void GetVolume(double* volume) override; + void Flush() override; friend void sndio_onmove(void *arg, int delta); friend void sndio_onvol(void *arg, unsigned int vol); friend void *sndio_threadstart(void *arg); private: enum StreamState { kClosed, // Not opened yet kStopped, // Device opened, but not started yet kRunning, // Started, device playing kStopWait // Stopping, waiting for the real-time thread to exit }; // C-style call-backs static void OnMoveCallback(void *arg, int delta); static void OnVolCallback(void *arg, unsigned int vol); static void* ThreadEntry(void *arg); // Continuously moves data from the producer to the device void ThreadLoop(void); // Our creator, the audio manager needs to be notified when we close. AudioManagerBase* manager; // Parameters of the source AudioParameters params; // Source stores data here std::unique_ptr audio_bus; // Call-back that produces data to play AudioSourceCallback* source; // Handle of the audio device struct sio_hdl* hdl; // Current state of the stream enum StreamState state; // High priority thread running ThreadLoop() pthread_t thread; // Protects vol, volpending and hw_delay pthread_mutex_t mutex; // Current volume in the 0..SIO_MAXVOL range int vol; // Set to 1 if volumes must be refreshed in the realtime thread int volpending; // Number of frames buffered in the hardware int hw_delay; // Temporary buffer where data is stored sndio-compatible format char* buffer; DISALLOW_COPY_AND_ASSIGN(SndioAudioOutputStream); }; } // namespace media #endif // MEDIA_AUDIO_SNDIO_SNDIO_OUTPUT_H_ Index: branches/2019Q3/www/chromium/pkg-plist =================================================================== --- branches/2019Q3/www/chromium/pkg-plist (revision 508998) +++ branches/2019Q3/www/chromium/pkg-plist (revision 508999) @@ -1,335 +1,336 @@ bin/chrome %%DATADIR%%/chrome %%DATADIR%%/chrome-wrapper %%DATADIR%%/chrome_100_percent.pak %%DATADIR%%/chrome_200_percent.pak %%DATADIR%%/headless_lib.pak %%DATADIR%%/icudtl.dat %%DATADIR%%/libEGL.so %%DATADIR%%/libGLESv2.so +%%DATADIR%%/libVkICD_mock_icd.so +%%DATADIR%%/libVkLayer_core_validation.so +%%DATADIR%%/libVkLayer_object_lifetimes.so +%%DATADIR%%/libVkLayer_stateless_validation.so +%%DATADIR%%/libVkLayer_thread_safety.so +%%DATADIR%%/libVkLayer_unique_objects.so %%DATADIR%%/locales/am.pak %%DATADIR%%/locales/am.pak.info %%DATADIR%%/locales/ar.pak %%DATADIR%%/locales/ar.pak.info %%DATADIR%%/locales/bg.pak %%DATADIR%%/locales/bg.pak.info %%DATADIR%%/locales/bn.pak %%DATADIR%%/locales/bn.pak.info %%DATADIR%%/locales/ca.pak %%DATADIR%%/locales/ca.pak.info %%DATADIR%%/locales/cs.pak %%DATADIR%%/locales/cs.pak.info %%DATADIR%%/locales/da.pak %%DATADIR%%/locales/da.pak.info %%DATADIR%%/locales/de.pak %%DATADIR%%/locales/de.pak.info %%DATADIR%%/locales/el.pak %%DATADIR%%/locales/el.pak.info %%DATADIR%%/locales/en-GB.pak %%DATADIR%%/locales/en-GB.pak.info %%DATADIR%%/locales/en-US.pak %%DATADIR%%/locales/en-US.pak.info %%DATADIR%%/locales/es-419.pak %%DATADIR%%/locales/es-419.pak.info %%DATADIR%%/locales/es.pak %%DATADIR%%/locales/es.pak.info %%DATADIR%%/locales/et.pak %%DATADIR%%/locales/et.pak.info %%DATADIR%%/locales/fa.pak %%DATADIR%%/locales/fa.pak.info %%DATADIR%%/locales/fi.pak %%DATADIR%%/locales/fi.pak.info %%DATADIR%%/locales/fil.pak %%DATADIR%%/locales/fil.pak.info %%DATADIR%%/locales/fr.pak %%DATADIR%%/locales/fr.pak.info %%DATADIR%%/locales/gu.pak %%DATADIR%%/locales/gu.pak.info %%DATADIR%%/locales/he.pak %%DATADIR%%/locales/he.pak.info %%DATADIR%%/locales/hi.pak %%DATADIR%%/locales/hi.pak.info %%DATADIR%%/locales/hr.pak %%DATADIR%%/locales/hr.pak.info %%DATADIR%%/locales/hu.pak %%DATADIR%%/locales/hu.pak.info %%DATADIR%%/locales/id.pak %%DATADIR%%/locales/id.pak.info %%DATADIR%%/locales/it.pak %%DATADIR%%/locales/it.pak.info %%DATADIR%%/locales/ja.pak %%DATADIR%%/locales/ja.pak.info %%DATADIR%%/locales/kn.pak %%DATADIR%%/locales/kn.pak.info %%DATADIR%%/locales/ko.pak %%DATADIR%%/locales/ko.pak.info %%DATADIR%%/locales/lt.pak %%DATADIR%%/locales/lt.pak.info %%DATADIR%%/locales/lv.pak %%DATADIR%%/locales/lv.pak.info %%DATADIR%%/locales/ml.pak %%DATADIR%%/locales/ml.pak.info %%DATADIR%%/locales/mr.pak %%DATADIR%%/locales/mr.pak.info %%DATADIR%%/locales/ms.pak %%DATADIR%%/locales/ms.pak.info %%DATADIR%%/locales/nb.pak %%DATADIR%%/locales/nb.pak.info %%DATADIR%%/locales/nl.pak %%DATADIR%%/locales/nl.pak.info %%DATADIR%%/locales/pl.pak %%DATADIR%%/locales/pl.pak.info %%DATADIR%%/locales/pt-BR.pak %%DATADIR%%/locales/pt-BR.pak.info %%DATADIR%%/locales/pt-PT.pak %%DATADIR%%/locales/pt-PT.pak.info %%DATADIR%%/locales/ro.pak %%DATADIR%%/locales/ro.pak.info %%DATADIR%%/locales/ru.pak %%DATADIR%%/locales/ru.pak.info %%DATADIR%%/locales/sk.pak %%DATADIR%%/locales/sk.pak.info %%DATADIR%%/locales/sl.pak %%DATADIR%%/locales/sl.pak.info %%DATADIR%%/locales/sr.pak %%DATADIR%%/locales/sr.pak.info %%DATADIR%%/locales/sv.pak %%DATADIR%%/locales/sv.pak.info %%DATADIR%%/locales/sw.pak %%DATADIR%%/locales/sw.pak.info %%DATADIR%%/locales/ta.pak %%DATADIR%%/locales/ta.pak.info %%DATADIR%%/locales/te.pak %%DATADIR%%/locales/te.pak.info %%DATADIR%%/locales/th.pak %%DATADIR%%/locales/th.pak.info %%DATADIR%%/locales/tr.pak %%DATADIR%%/locales/tr.pak.info %%DATADIR%%/locales/uk.pak %%DATADIR%%/locales/uk.pak.info %%DATADIR%%/locales/vi.pak %%DATADIR%%/locales/vi.pak.info %%DATADIR%%/locales/zh-CN.pak %%DATADIR%%/locales/zh-CN.pak.info %%DATADIR%%/locales/zh-TW.pak %%DATADIR%%/locales/zh-TW.pak.info %%DATADIR%%/mksnapshot %%DATADIR%%/natives_blob.bin %%DATADIR%%/product_logo_48.png %%DATADIR%%/protoc %%DATADIR%%/resources.pak %%DATADIR%%/resources/inspector/.htaccess %%DATADIR%%/resources/inspector/Images/accelerometer-back.svg %%DATADIR%%/resources/inspector/Images/accelerometer-bottom.png %%DATADIR%%/resources/inspector/Images/accelerometer-front.svg %%DATADIR%%/resources/inspector/Images/accelerometer-left.png %%DATADIR%%/resources/inspector/Images/accelerometer-right.png %%DATADIR%%/resources/inspector/Images/accelerometer-top.png %%DATADIR%%/resources/inspector/Images/audits_logo.svg %%DATADIR%%/resources/inspector/Images/breakpoint.png %%DATADIR%%/resources/inspector/Images/breakpointConditional.png %%DATADIR%%/resources/inspector/Images/breakpointConditional_2x.png %%DATADIR%%/resources/inspector/Images/breakpoint_2x.png %%DATADIR%%/resources/inspector/Images/checker.png %%DATADIR%%/resources/inspector/Images/chromeDisabledSelect.png %%DATADIR%%/resources/inspector/Images/chromeDisabledSelect_2x.png %%DATADIR%%/resources/inspector/Images/chromeLeft.png %%DATADIR%%/resources/inspector/Images/chromeMiddle.png %%DATADIR%%/resources/inspector/Images/chromeRight.png %%DATADIR%%/resources/inspector/Images/chromeSelect.png %%DATADIR%%/resources/inspector/Images/chromeSelect_2x.png %%DATADIR%%/resources/inspector/Images/errorWave.png %%DATADIR%%/resources/inspector/Images/errorWave_2x.png %%DATADIR%%/resources/inspector/Images/ic_info_black_18dp.svg %%DATADIR%%/resources/inspector/Images/ic_warning_black_18dp.svg %%DATADIR%%/resources/inspector/Images/largeIcons.png %%DATADIR%%/resources/inspector/Images/largeIcons_2x.png %%DATADIR%%/resources/inspector/Images/mediumIcons.png %%DATADIR%%/resources/inspector/Images/mediumIcons_2x.png %%DATADIR%%/resources/inspector/Images/navigationControls.png %%DATADIR%%/resources/inspector/Images/navigationControls_2x.png %%DATADIR%%/resources/inspector/Images/nodeIcon.png %%DATADIR%%/resources/inspector/Images/popoverArrows.png %%DATADIR%%/resources/inspector/Images/profileGroupIcon.png %%DATADIR%%/resources/inspector/Images/profileIcon.png %%DATADIR%%/resources/inspector/Images/profileSmallIcon.png %%DATADIR%%/resources/inspector/Images/radioDot.png %%DATADIR%%/resources/inspector/Images/resizeDiagonal.png %%DATADIR%%/resources/inspector/Images/resizeDiagonal_2x.png %%DATADIR%%/resources/inspector/Images/resizeHorizontal.png %%DATADIR%%/resources/inspector/Images/resizeHorizontal_2x.png %%DATADIR%%/resources/inspector/Images/resizeVertical.png %%DATADIR%%/resources/inspector/Images/resizeVertical_2x.png %%DATADIR%%/resources/inspector/Images/resourceCSSIcon.png %%DATADIR%%/resources/inspector/Images/resourceDocumentIcon.png %%DATADIR%%/resources/inspector/Images/resourceDocumentIconSmall.png %%DATADIR%%/resources/inspector/Images/resourceJSIcon.png %%DATADIR%%/resources/inspector/Images/resourcePlainIcon.png %%DATADIR%%/resources/inspector/Images/resourcePlainIconSmall.png %%DATADIR%%/resources/inspector/Images/resourcesTimeGraphIcon.png %%DATADIR%%/resources/inspector/Images/searchNext.png %%DATADIR%%/resources/inspector/Images/searchPrev.png %%DATADIR%%/resources/inspector/Images/securityIcons.png %%DATADIR%%/resources/inspector/Images/securityIcons_2x.png %%DATADIR%%/resources/inspector/Images/smallIcons.png %%DATADIR%%/resources/inspector/Images/smallIcons_2x.png %%DATADIR%%/resources/inspector/Images/speech.png %%DATADIR%%/resources/inspector/Images/toolbarResizerVertical.png %%DATADIR%%/resources/inspector/Images/touchCursor.png %%DATADIR%%/resources/inspector/Images/touchCursor_2x.png %%DATADIR%%/resources/inspector/Images/treeoutlineTriangles.png %%DATADIR%%/resources/inspector/Images/treeoutlineTriangles_2x.png %%DATADIR%%/resources/inspector/Images/whatsnew.png %%DATADIR%%/resources/inspector/InspectorBackendCommands.js %%DATADIR%%/resources/inspector/SupportedCSSProperties.js %%DATADIR%%/resources/inspector/Tests.js %%DATADIR%%/resources/inspector/accessibility/ARIAProperties.js %%DATADIR%%/resources/inspector/accessibility/accessibility_module.js %%DATADIR%%/resources/inspector/accessibility_test_runner/accessibility_test_runner_module.js %%DATADIR%%/resources/inspector/animation/animation_module.js %%DATADIR%%/resources/inspector/application_test_runner/application_test_runner_module.js %%DATADIR%%/resources/inspector/audits2/audits2_module.js %%DATADIR%%/resources/inspector/audits2_test_runner/audits2_test_runner_module.js %%DATADIR%%/resources/inspector/audits2_worker.js %%DATADIR%%/resources/inspector/audits2_worker/audits2_worker_module.js %%DATADIR%%/resources/inspector/axe_core_test_runner/axe_core_test_runner_module.js %%DATADIR%%/resources/inspector/bindings_test_runner/bindings_test_runner_module.js %%DATADIR%%/resources/inspector/browser_debugger/browser_debugger_module.js %%DATADIR%%/resources/inspector/changes/changes_module.js %%DATADIR%%/resources/inspector/cm/cm_module.js %%DATADIR%%/resources/inspector/cm_modes/cm_modes_module.js %%DATADIR%%/resources/inspector/color_picker/color_picker_module.js %%DATADIR%%/resources/inspector/console/console_module.js %%DATADIR%%/resources/inspector/console_test_runner/console_test_runner_module.js %%DATADIR%%/resources/inspector/cookie_table/cookie_table_module.js %%DATADIR%%/resources/inspector/coverage/coverage_module.js %%DATADIR%%/resources/inspector/coverage_test_runner/coverage_test_runner_module.js %%DATADIR%%/resources/inspector/cpu_profiler_test_runner/cpu_profiler_test_runner_module.js %%DATADIR%%/resources/inspector/data_grid/data_grid_module.js %%DATADIR%%/resources/inspector/data_grid_test_runner/data_grid_test_runner_module.js %%DATADIR%%/resources/inspector/device_mode_test_runner/device_mode_test_runner_module.js %%DATADIR%%/resources/inspector/devices/devices_module.js %%DATADIR%%/resources/inspector/devtools_app.html %%DATADIR%%/resources/inspector/devtools_app.js %%DATADIR%%/resources/inspector/devtools_compatibility.js %%DATADIR%%/resources/inspector/devtools_extension_api.js %%DATADIR%%/resources/inspector/diff/diff_module.js %%DATADIR%%/resources/inspector/elements/elements_module.js %%DATADIR%%/resources/inspector/elements_test_runner/elements_test_runner_module.js %%DATADIR%%/resources/inspector/emulated_devices/Nexus5X-landscape.svg %%DATADIR%%/resources/inspector/emulated_devices/Nexus5X-portrait.svg %%DATADIR%%/resources/inspector/emulated_devices/Nexus6P-landscape.svg %%DATADIR%%/resources/inspector/emulated_devices/Nexus6P-portrait.svg %%DATADIR%%/resources/inspector/emulated_devices/emulated_devices_module.js %%DATADIR%%/resources/inspector/emulated_devices/google-nexus-5-horizontal-default-1x.png %%DATADIR%%/resources/inspector/emulated_devices/google-nexus-5-horizontal-default-2x.png %%DATADIR%%/resources/inspector/emulated_devices/google-nexus-5-horizontal-keyboard-1x.png %%DATADIR%%/resources/inspector/emulated_devices/google-nexus-5-horizontal-keyboard-2x.png %%DATADIR%%/resources/inspector/emulated_devices/google-nexus-5-horizontal-navigation-1x.png %%DATADIR%%/resources/inspector/emulated_devices/google-nexus-5-horizontal-navigation-2x.png %%DATADIR%%/resources/inspector/emulated_devices/google-nexus-5-vertical-default-1x.png %%DATADIR%%/resources/inspector/emulated_devices/google-nexus-5-vertical-default-2x.png %%DATADIR%%/resources/inspector/emulated_devices/google-nexus-5-vertical-keyboard-1x.png %%DATADIR%%/resources/inspector/emulated_devices/google-nexus-5-vertical-keyboard-2x.png %%DATADIR%%/resources/inspector/emulated_devices/google-nexus-5-vertical-navigation-1x.png %%DATADIR%%/resources/inspector/emulated_devices/google-nexus-5-vertical-navigation-2x.png %%DATADIR%%/resources/inspector/emulated_devices/google-nexus-5x-horizontal-default-1x.png %%DATADIR%%/resources/inspector/emulated_devices/google-nexus-5x-horizontal-default-2x.png %%DATADIR%%/resources/inspector/emulated_devices/google-nexus-5x-horizontal-keyboard-1x.png %%DATADIR%%/resources/inspector/emulated_devices/google-nexus-5x-horizontal-keyboard-2x.png %%DATADIR%%/resources/inspector/emulated_devices/google-nexus-5x-horizontal-navigation-1x.png %%DATADIR%%/resources/inspector/emulated_devices/google-nexus-5x-horizontal-navigation-2x.png %%DATADIR%%/resources/inspector/emulated_devices/google-nexus-5x-vertical-default-1x.png %%DATADIR%%/resources/inspector/emulated_devices/google-nexus-5x-vertical-default-2x.png %%DATADIR%%/resources/inspector/emulated_devices/google-nexus-5x-vertical-keyboard-1x.png %%DATADIR%%/resources/inspector/emulated_devices/google-nexus-5x-vertical-keyboard-2x.png %%DATADIR%%/resources/inspector/emulated_devices/google-nexus-5x-vertical-navigation-1x.png %%DATADIR%%/resources/inspector/emulated_devices/google-nexus-5x-vertical-navigation-2x.png %%DATADIR%%/resources/inspector/emulated_devices/iPad-landscape.svg %%DATADIR%%/resources/inspector/emulated_devices/iPad-portrait.svg %%DATADIR%%/resources/inspector/emulated_devices/iPhone5-landscape.svg %%DATADIR%%/resources/inspector/emulated_devices/iPhone5-portrait.svg %%DATADIR%%/resources/inspector/emulated_devices/iPhone6-landscape.svg %%DATADIR%%/resources/inspector/emulated_devices/iPhone6-portrait.svg %%DATADIR%%/resources/inspector/emulated_devices/iPhone6Plus-landscape.svg %%DATADIR%%/resources/inspector/emulated_devices/iPhone6Plus-portrait.svg %%DATADIR%%/resources/inspector/event_listeners/event_listeners_module.js %%DATADIR%%/resources/inspector/extensions_test_runner/extensions_test_runner_module.js %%DATADIR%%/resources/inspector/formatter/formatter_module.js %%DATADIR%%/resources/inspector/formatter_worker.js %%DATADIR%%/resources/inspector/har_importer/har_importer_module.js %%DATADIR%%/resources/inspector/heap_profiler_test_runner/heap_profiler_test_runner_module.js %%DATADIR%%/resources/inspector/heap_snapshot_model/heap_snapshot_model_module.js %%DATADIR%%/resources/inspector/heap_snapshot_worker.js %%DATADIR%%/resources/inspector/heap_snapshot_worker/heap_snapshot_worker_module.js %%DATADIR%%/resources/inspector/help/help_module.js %%DATADIR%%/resources/inspector/inline_editor/inline_editor_module.js %%DATADIR%%/resources/inspector/inspector.html %%DATADIR%%/resources/inspector/inspector.js %%DATADIR%%/resources/inspector/integration_test_runner.html %%DATADIR%%/resources/inspector/integration_test_runner.js %%DATADIR%%/resources/inspector/javascript_metadata/javascript_metadata_module.js %%DATADIR%%/resources/inspector/js_app.html %%DATADIR%%/resources/inspector/js_app.js %%DATADIR%%/resources/inspector/js_profiler/js_profiler_module.js %%DATADIR%%/resources/inspector/layer_viewer/layer_viewer_module.js %%DATADIR%%/resources/inspector/layers/layers_module.js %%DATADIR%%/resources/inspector/layers_test_runner/layers_test_runner_module.js %%DATADIR%%/resources/inspector/ndb_app.html %%DATADIR%%/resources/inspector/ndb_app.js %%DATADIR%%/resources/inspector/network/network_module.js %%DATADIR%%/resources/inspector/network_test_runner/network_test_runner_module.js %%DATADIR%%/resources/inspector/node_app.html %%DATADIR%%/resources/inspector/node_app.js %%DATADIR%%/resources/inspector/node_debugger/node_debugger_module.js %%DATADIR%%/resources/inspector/object_ui/object_ui_module.js %%DATADIR%%/resources/inspector/perf_ui/perf_ui_module.js %%DATADIR%%/resources/inspector/performance_monitor/performance_monitor_module.js %%DATADIR%%/resources/inspector/performance_test_runner/performance_test_runner_module.js %%DATADIR%%/resources/inspector/product_registry_impl/product_registry_impl_module.js %%DATADIR%%/resources/inspector/profiler/profiler_module.js %%DATADIR%%/resources/inspector/protocol_monitor/protocol_monitor_module.js %%DATADIR%%/resources/inspector/quick_open/quick_open_module.js %%DATADIR%%/resources/inspector/resources/resources_module.js %%DATADIR%%/resources/inspector/sdk_test_runner/sdk_test_runner_module.js %%DATADIR%%/resources/inspector/search/search_module.js %%DATADIR%%/resources/inspector/security/security_module.js %%DATADIR%%/resources/inspector/security_test_runner/security_test_runner_module.js %%DATADIR%%/resources/inspector/settings/settings_module.js %%DATADIR%%/resources/inspector/shell.js %%DATADIR%%/resources/inspector/snippets/snippets_module.js %%DATADIR%%/resources/inspector/source_frame/source_frame_module.js %%DATADIR%%/resources/inspector/sources/sources_module.js %%DATADIR%%/resources/inspector/sources_test_runner/sources_test_runner_module.js %%DATADIR%%/resources/inspector/terminal/terminal_module.js %%DATADIR%%/resources/inspector/text_editor/text_editor_module.js %%DATADIR%%/resources/inspector/timeline/timeline_module.js %%DATADIR%%/resources/inspector/timeline_model/timeline_model_module.js %%DATADIR%%/resources/inspector/toolbox.html %%DATADIR%%/resources/inspector/toolbox.js +%%DATADIR%%/resources/inspector/web_audio/web_audio_module.js %%DATADIR%%/resources/inspector/worker_app.html %%DATADIR%%/resources/inspector/worker_app.js %%DATADIR%%/resources/inspector/workspace_diff/workspace_diff_module.js %%DATADIR%%/snapshot_blob.bin %%NOT_AARCH64%%%%DATADIR%%/swiftshader/libEGL.so %%NOT_AARCH64%%%%DATADIR%%/swiftshader/libGLESv2.so %%DATADIR%%/v8_context_snapshot.bin -%%DATADIR%%/views_mus_resources.pak %%DEBUG%%%%DATADIR%%/character_data_generator -%%DEBUG%%%%DATADIR%%/libVkICD_mock_icd.so -%%DEBUG%%%%DATADIR%%/libVkLayer_core_validation.so -%%DEBUG%%%%DATADIR%%/libVkLayer_object_lifetimes.so -%%DEBUG%%%%DATADIR%%/libVkLayer_stateless_validation.so -%%DEBUG%%%%DATADIR%%/libVkLayer_thread_safety.so -%%DEBUG%%%%DATADIR%%/libVkLayer_unique_objects.so +%%DEBUG%%%%DATADIR%%/libimmediate_crash_test_helper.so %%DEBUG%%%%DATADIR%%/libmalloc_wrapper.so %%DEBUG%%%%DATADIR%%/libtest_shared_library.so %%DRIVER%%bin/chromedriver man/man1/chrome.1.gz share/applications/chromium-browser.desktop share/icons/hicolor/128x128/apps/chrome.png share/icons/hicolor/22x22/apps/chrome.png share/icons/hicolor/24x24/apps/chrome.png share/icons/hicolor/256x256/apps/chrome.png share/icons/hicolor/48x48/apps/chrome.png share/icons/hicolor/64x64/apps/chrome.png Index: branches/2019Q3 =================================================================== --- branches/2019Q3 (revision 508998) +++ branches/2019Q3 (revision 508999) Property changes on: branches/2019Q3 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r508722,508754