Index: branches/2019Q2/www/chromium/Makefile
===================================================================
--- branches/2019Q2/www/chromium/Makefile (revision 497958)
+++ branches/2019Q2/www/chromium/Makefile (revision 497959)
@@ -1,343 +1,341 @@
# Created by: Florent Thoumie <flz@FreeBSD.org>
# $FreeBSD$
PORTNAME= chromium
-PORTVERSION= 72.0.3626.121
-PORTREVISION= 3
+PORTVERSION= 73.0.3683.86
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_BOOTSTRAP_FLAGS+=--debug \
WANTSPACE="lots of free disk space (~ 13GB)"
DEBUG_VARS_OFF= BUILDTYPE=Release \
GN_ARGS+=is_debug=false \
GN_ARGS+=is_official_build=true \
GN_ARGS+=symbol_level=0 \
GN_ARGS+=remove_webcore_debug_symbols=true \
WANTSPACE="a fair amount of free disk space (~ 6.5GB)"
DRIVER_MAKE_ARGS= chromedriver
KERBEROS_VARS= GN_ARGS+=use_kerberos=true
KERBEROS_VARS_OFF= GN_ARGS+=use_kerberos=false
PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio
PULSEAUDIO_VARS= GN_ARGS+=use_pulseaudio=true
PULSEAUDIO_VARS_OFF= GN_ARGS+=use_pulseaudio=false
# With SNDIO=on we exclude audio_manager_linux from the build (see
# media/audio/BUILD.gn) and use audio_manager_openbsd which does not
# support falling back to ALSA or PulseAudio.
SNDIO_PREVENTS= ALSA PULSEAUDIO
SNDIO_LIB_DEPENDS= libsndio.so:audio/sndio
SNDIO_VARS= GN_ARGS+=use_sndio=true
SNDIO_VARS_OFF= GN_ARGS+=use_sndio=false
.endif
.include "Makefile.tests"
TEST_ALL_TARGET= ${TEST_TARGETS}
TEST_DISTFILES= ${PORTNAME}-${DISTVERSION}-testdata${EXTRACT_SUFX} \
test_fonts${EXTRACT_SUFX}:fonts
.include <bsd.port.options.mk>
# 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 (${ARCH} == amd64 || ${ARCH} == i386) && !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:
- cd ${WRKSRC}/out/${BUILDTYPE}/gn_build && ./gn_unittests
.for t in ${TEST_TARGETS}
cd ${WRKSRC}/out/${BUILDTYPE} && ${SETENV} LC_ALL=en_US.UTF-8 \
./${t} --gtest_filter=-${EXCLUDE_${t}:ts:} || ${TRUE}
.endfor
.if !defined(GN_ONLY)
do-install:
@${MKDIR} ${STAGEDIR}${DATADIR}
${INSTALL_MAN} ${WRKSRC}/chrome/app/resources/manpage.1.in \
${STAGEDIR}${MANPREFIX}/man/man1/chrome.1
.for s in 22 24 48 64 128 256
@${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/${s}x${s}/apps
${INSTALL_DATA} ${WRKSRC}/chrome/app/theme/chromium/product_logo_${s}.png \
${STAGEDIR}${PREFIX}/share/icons/hicolor/${s}x${s}/apps/chrome.png
.endfor
${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/*.png ${STAGEDIR}${DATADIR}
${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/*.pak ${STAGEDIR}${DATADIR}
.for d in protoc icudtl.dat mksnapshot natives_blob.bin snapshot_blob.bin v8_context_snapshot.bin
${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/${d} ${STAGEDIR}${DATADIR}
.endfor
${INSTALL_PROGRAM} ${WRKSRC}/out/${BUILDTYPE}/chrome \
${STAGEDIR}${DATADIR}
cd ${WRKSRC}/out/${BUILDTYPE} && \
${COPYTREE_SHARE} "locales resources" ${STAGEDIR}${DATADIR}
@${MKDIR} ${STAGEDIR}${DESKTOPDIR}
${INSTALL_DATA} ${WRKDIR}/chromium-browser.desktop \
${STAGEDIR}${DESKTOPDIR}
${INSTALL_SCRIPT} ${WRKDIR}/chrome ${STAGEDIR}${PREFIX}/bin
${INSTALL_SCRIPT} ${WRKSRC}/chrome/tools/build/linux/chrome-wrapper \
${STAGEDIR}${DATADIR}
# ANGLE
.for f in libEGL.so libGLESv2.so
${INSTALL_LIB} ${WRKSRC}/out/${BUILDTYPE}/${f} ${STAGEDIR}${DATADIR}
.endfor
# SwiftShader
.if ${ARCH} != aarch64
@${MKDIR} ${STAGEDIR}${DATADIR}/swiftshader
.for g in libEGL.so libGLESv2.so
${INSTALL_LIB} ${WRKSRC}/out/${BUILDTYPE}/swiftshader/${g} \
${STAGEDIR}${DATADIR}/swiftshader
.endfor
.endif
post-install-DEBUG-on:
${INSTALL_LIB} ${WRKSRC}/out/${BUILDTYPE}/*.so \
${STAGEDIR}${DATADIR}
${INSTALL_PROGRAM} ${WRKSRC}/out/${BUILDTYPE}/character_data_generator \
${STAGEDIR}${DATADIR}
post-install-DRIVER-on:
${INSTALL_PROGRAM} ${WRKSRC}/out/${BUILDTYPE}/chromedriver \
${STAGEDIR}${PREFIX}/bin
.endif
.include <bsd.port.mk>
Index: branches/2019Q2/www/chromium/distinfo
===================================================================
--- branches/2019Q2/www/chromium/distinfo (revision 497958)
+++ branches/2019Q2/www/chromium/distinfo (revision 497959)
@@ -1,7 +1,7 @@
-TIMESTAMP = 1551526903
-SHA256 (chromium-72.0.3626.121.tar.xz) = 4c1e554ab606eab328e77f5a92d8244b26a10ffd15d7986d30eab95f37adbc1f
-SIZE (chromium-72.0.3626.121.tar.xz) = 686420260
-SHA256 (chromium-72.0.3626.121-testdata.tar.xz) = 73a1f09a6467f712487c7c7291f2e61050e5f962b85fa3b6e736f13d50067b19
-SIZE (chromium-72.0.3626.121-testdata.tar.xz) = 351922596
+TIMESTAMP = 1553157900
+SHA256 (chromium-73.0.3683.86.tar.xz) = 9ebb731576d25901cee5505f3458cf7780b0a39243743d7779f66514716bbfa3
+SIZE (chromium-73.0.3683.86.tar.xz) = 710449412
+SHA256 (chromium-73.0.3683.86-testdata.tar.xz) = 06e947bfa2de5af00340dcd68341d67794565874a3aa7514799e4af1ba4862d5
+SIZE (chromium-73.0.3683.86-testdata.tar.xz) = 352701364
SHA256 (test_fonts.tar.xz) = cf9cbe3b7f1c4c42d426bddc65ec178d333ad7e205a36fe0a606a3c0c545ece1
SIZE (test_fonts.tar.xz) = 200040
Index: branches/2019Q2/www/chromium/files/patch-services_service__manager_zygote_common_zygote_features.gni
===================================================================
--- branches/2019Q2/www/chromium/files/patch-services_service__manager_zygote_common_zygote_features.gni (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-services_service__manager_zygote_common_zygote_features.gni (nonexistent)
@@ -1,8 +0,0 @@
---- services/service_manager/zygote/common/zygote_features.gni.orig 2018-08-04 19:05:25.641485000 +0200
-+++ services/service_manager/zygote/common/zygote_features.gni 2018-08-04 19:05:36.695208000 +0200
-@@ -2,4 +2,4 @@
- # Use of this source code is governed by a BSD-style license that can be
- # found in the LICENSE file.
-
--use_zygote_handle = is_posix && !is_android && !is_mac
-+use_zygote_handle = is_posix && !is_android && !is_mac && !is_bsd
Property changes on: branches/2019Q2/www/chromium/files/patch-services_service__manager_zygote_common_zygote_features.gni
___________________________________________________________________
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/2019Q2/www/chromium/files/patch-ui_native_theme_native_theme_base.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-ui_native_theme_native_theme_base.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-ui_native_theme_native_theme_base.cc (nonexistent)
@@ -1,11 +0,0 @@
---- ui/native_theme/native_theme_base.cc.orig 2017-09-07 02:01:55.087892000 +0200
-+++ ui/native_theme/native_theme_base.cc 2017-09-07 02:02:23.038570000 +0200
-@@ -172,7 +172,7 @@
- case kCheckbox:
- PaintCheckbox(canvas, state, rect, extra.button);
- break;
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
- case kFrameTopArea:
- PaintFrameTopArea(canvas, state, rect, extra.frame_top_area);
- break;
Property changes on: branches/2019Q2/www/chromium/files/patch-ui_native_theme_native_theme_base.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/2019Q2/www/chromium/files/patch-third_party_perfetto_include_perfetto_base_build_config.h
===================================================================
--- branches/2019Q2/www/chromium/files/patch-third_party_perfetto_include_perfetto_base_build_config.h (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-third_party_perfetto_include_perfetto_base_build_config.h (nonexistent)
@@ -1,37 +0,0 @@
---- third_party/perfetto/include/perfetto/base/build_config.h.orig 2018-08-04 21:12:09.930418000 +0200
-+++ third_party/perfetto/include/perfetto/base/build_config.h 2018-08-04 21:14:11.343838000 +0200
-@@ -28,6 +28,7 @@
- #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_ANDROID() 1
- #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_MACOSX() 0
- #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_LINUX() 0
-+#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_FREEBSD() 0
- #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_WIN() 0
- #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_WASM() 0
- #elif defined(__APPLE__)
-@@ -36,22 +37,25 @@
- #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_LINUX() 0
- #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_WIN() 0
- #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_WASM() 0
--#elif defined(__linux__)
-+#elif defined(__linux__) || defined(__FreeBSD__)
- #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_ANDROID() 0
- #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_MACOSX() 0
- #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_LINUX() 1
-+#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_FREEBSD() 1
- #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_WIN() 0
- #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_WASM() 0
- #elif defined(_WIN32)
- #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_ANDROID() 0
- #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_MACOSX() 0
- #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_LINUX() 0
-+#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_FREEBSD() 0
- #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_WIN() 1
- #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_WASM() 0
- #elif defined(__EMSCRIPTEN__)
- #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_ANDROID() 0
- #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_MACOSX() 0
- #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_LINUX() 0
-+#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_FREEBSD() 0
- #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_WIN() 0
- #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_WASM() 1
- #else
Property changes on: branches/2019Q2/www/chromium/files/patch-third_party_perfetto_include_perfetto_base_build_config.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/2019Q2/www/chromium/files/patch-gpu_ipc_service_gpu_watchdog_thread.h
===================================================================
--- branches/2019Q2/www/chromium/files/patch-gpu_ipc_service_gpu_watchdog_thread.h (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-gpu_ipc_service_gpu_watchdog_thread.h (nonexistent)
@@ -1,13 +0,0 @@
---- gpu/ipc/service/gpu_watchdog_thread.h.orig 2019-01-12 22:38:38.703173000 +0100
-+++ gpu/ipc/service/gpu_watchdog_thread.h 2019-01-12 22:39:05.661205000 +0100
-@@ -190,8 +190,10 @@
- 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_;
Property changes on: branches/2019Q2/www/chromium/files/patch-gpu_ipc_service_gpu_watchdog_thread.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/2019Q2/www/chromium/files/patch-third__party_zlib_BUILD.gn
===================================================================
--- branches/2019Q2/www/chromium/files/patch-third__party_zlib_BUILD.gn (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-third__party_zlib_BUILD.gn (nonexistent)
@@ -1,20 +0,0 @@
---- third_party/zlib/BUILD.gn.orig 2018-08-08 21:11:58.000000000 +0200
-+++ third_party/zlib/BUILD.gn 2018-09-12 01:00:34.445630000 +0200
-@@ -68,7 +68,7 @@
- if (is_android) {
- defines += [ "ARMV8_OS_ANDROID" ]
- } else if (is_linux || is_chromeos) {
-- defines += [ "ARMV8_OS_LINUX" ]
-+# defines += [ "ARMV8_OS_LINUX" ]
- }
- }
- }
-@@ -327,7 +327,7 @@
- ]
- }
-
-- if (is_mac || is_ios || is_android || is_nacl) {
-+ if (is_mac || is_ios || is_android || is_nacl || is_bsd) {
- # Mac, Android and the BSDs don't have fopen64, ftello64, or fseeko64. We
- # use fopen, ftell, and fseek instead on these systems.
- defines = [ "USE_FILE32API" ]
Property changes on: branches/2019Q2/www/chromium/files/patch-third__party_zlib_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/2019Q2/www/chromium/files/patch-chrome_browser_ui_views_tabs_new_tab_button.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-chrome_browser_ui_views_tabs_new_tab_button.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-chrome_browser_ui_views_tabs_new_tab_button.cc (nonexistent)
@@ -1,11 +0,0 @@
---- chrome/browser/ui/views/tabs/new_tab_button.cc.orig 2017-09-10 00:35:35.638045000 +0200
-+++ chrome/browser/ui/views/tabs/new_tab_button.cc 2017-09-10 00:36:04.851309000 +0200
-@@ -49,7 +49,7 @@
- destroyed_(nullptr),
- new_tab_promo_observer_(this) {
- 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
Property changes on: branches/2019Q2/www/chromium/files/patch-chrome_browser_ui_views_tabs_new_tab_button.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/2019Q2/www/chromium/files/patch-gpu_ipc_service_gpu__memory_buffer_factory.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-gpu_ipc_service_gpu__memory_buffer_factory.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-gpu_ipc_service_gpu__memory_buffer_factory.cc (nonexistent)
@@ -1,20 +0,0 @@
---- gpu/ipc/service/gpu_memory_buffer_factory.cc.orig 2018-02-24 16:25:15.000000000 +0100
-+++ gpu/ipc/service/gpu_memory_buffer_factory.cc 2018-03-04 02:47:09.144034000 +0100
-@@ -12,7 +12,7 @@
- #include "gpu/ipc/service/gpu_memory_buffer_factory_io_surface.h"
- #endif
-
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
- #include "gpu/ipc/service/gpu_memory_buffer_factory_native_pixmap.h"
- #endif
-
-@@ -33,7 +33,7 @@
- return base::WrapUnique(new GpuMemoryBufferFactoryIOSurface);
- #elif defined(OS_ANDROID)
- return base::WrapUnique(new GpuMemoryBufferFactoryAndroidHardwareBuffer);
--#elif defined(OS_LINUX)
-+#elif defined(OS_LINUX) || defined(OS_BSD)
- return base::WrapUnique(new GpuMemoryBufferFactoryNativePixmap);
- #elif defined(OS_WIN)
- return base::WrapUnique(new GpuMemoryBufferFactoryDXGI);
Property changes on: branches/2019Q2/www/chromium/files/patch-gpu_ipc_service_gpu__memory_buffer_factory.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/2019Q2/www/chromium/files/patch-sandbox_linux_services_init_process_reaper.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-sandbox_linux_services_init_process_reaper.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-sandbox_linux_services_init_process_reaper.cc (nonexistent)
@@ -1,15 +0,0 @@
---- sandbox/linux/services/init_process_reaper.cc.orig 2018-08-04 19:26:41.605247000 +0200
-+++ sandbox/linux/services/init_process_reaper.cc 2018-08-04 19:27:02.769442000 +0200
-@@ -1,6 +1,7 @@
- // Copyright 2013 The Chromium Authors. All rights reserved.
- // Use of this source code is governed by a BSD-style license that can be
- // found in the LICENSE file.
-+#if 0
-
- #include "sandbox/linux/services/init_process_reaper.h"
-
-@@ -100,3 +101,4 @@
- }
-
- } // namespace sandbox.
-+#endif
Property changes on: branches/2019Q2/www/chromium/files/patch-sandbox_linux_services_init_process_reaper.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/2019Q2/www/chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view__layout.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view__layout.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view__layout.cc (nonexistent)
@@ -1,11 +0,0 @@
---- chrome/browser/ui/views/frame/opaque_browser_frame_view_layout.cc.orig 2018-08-01 00:08:32.000000000 +0200
-+++ chrome/browser/ui/views/frame/opaque_browser_frame_view_layout.cc 2018-08-04 17:27:55.912686000 +0200
-@@ -21,7 +21,7 @@
-
- constexpr int kCaptionButtonHeight = 18;
-
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
- // Default spacing around window caption buttons.
- constexpr int kCaptionButtonSpacing = 2;
- #else
Property changes on: branches/2019Q2/www/chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view__layout.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/2019Q2/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance_page.js
===================================================================
--- branches/2019Q2/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance_page.js (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance_page.js (nonexistent)
@@ -1,33 +0,0 @@
---- chrome/browser/resources/settings/appearance_page/appearance_page.js.orig 2019-01-09 12:45:37.575004000 +0100
-+++ chrome/browser/resources/settings/appearance_page/appearance_page.js 2019-01-09 12:46:51.094149000 +0100
-@@ -120,7 +120,7 @@
- 'defaultFontSizeChanged_(prefs.webkit.webprefs.default_font_size.value)',
- 'themeChanged_(prefs.extensions.theme.id.value, useSystemTheme_)',
-
-- // <if expr="is_linux and not chromeos">
-+ // <if expr="is_bsd and not chromeos">
- // NOTE: this pref only exists on Linux.
- 'useSystemThemePrefChanged_(prefs.extensions.theme.use_system.value)',
- // </if>
-@@ -221,7 +221,7 @@
- this.browserProxy_.useDefaultTheme();
- },
-
-- // <if expr="is_linux and not chromeos">
-+ // <if expr="is_bsd and not chromeos">
- /**
- * @param {boolean} useSystemTheme
- * @private
-@@ -289,10 +289,10 @@
- }
-
- let i18nId;
-- // <if expr="is_linux and not chromeos">
-+ // <if expr="is_bsd and not chromeos">
- i18nId = useSystemTheme ? 'systemTheme' : 'classicTheme';
- // </if>
-- // <if expr="not is_linux or chromeos">
-+ // <if expr="not is_bsd or chromeos">
- i18nId = 'chooseFromWebStore';
- // </if>
- this.themeSublabel_ = this.i18n(i18nId);
Property changes on: branches/2019Q2/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance_page.js
___________________________________________________________________
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/2019Q2/www/chromium/files/patch-third_party_crashpad_crashpad_util_misc_capture_context.h
===================================================================
--- branches/2019Q2/www/chromium/files/patch-third_party_crashpad_crashpad_util_misc_capture_context.h (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-third_party_crashpad_crashpad_util_misc_capture_context.h (nonexistent)
@@ -1,20 +0,0 @@
---- third_party/crashpad/crashpad/util/misc/capture_context.h.orig 2018-08-01 00:09:40.000000000 +0200
-+++ third_party/crashpad/crashpad/util/misc/capture_context.h 2018-08-04 21:08:07.783574000 +0200
-@@ -21,7 +21,7 @@
- #include <mach/mach.h>
- #elif defined(OS_WIN)
- #include <windows.h>
--#elif defined(OS_LINUX) || defined(OS_ANDROID)
-+#elif defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD)
- #include <ucontext.h>
- #elif defined(OS_FUCHSIA)
- #include <signal.h>
-@@ -35,7 +35,7 @@
- #endif
- #elif defined(OS_WIN)
- using NativeCPUContext = CONTEXT;
--#elif defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FUCHSIA)
-+#elif defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FUCHSIA) || defined(OS_BSD)
- using NativeCPUContext = ucontext_t;
- #endif // OS_MACOSX
-
Property changes on: branches/2019Q2/www/chromium/files/patch-third_party_crashpad_crashpad_util_misc_capture_context.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/2019Q2/www/chromium/files/patch-content_utility_utility_main.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-content_utility_utility_main.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-content_utility_utility_main.cc (nonexistent)
@@ -1,11 +0,0 @@
---- content/utility/utility_main.cc.orig 2018-01-20 16:08:49.686959000 +0100
-+++ content/utility/utility_main.cc 2018-01-20 16:09:13.242607000 +0100
-@@ -45,7 +45,7 @@
- if (parameters.command_line.HasSwitch(switches::kUtilityStartupDialog))
- WaitForDebugger("Utility");
-
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) && !defined(OS_BSD)
- // Initializes the sandbox before any threads are created.
- // TODO(jorgelo): move this after GTK initialization when we enable a strict
- // Seccomp-BPF policy.
Property changes on: branches/2019Q2/www/chromium/files/patch-content_utility_utility_main.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/2019Q2/www/chromium/files/patch-chrome_browser_net_system_network_context_manager.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-chrome_browser_net_system_network_context_manager.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-chrome_browser_net_system_network_context_manager.cc (nonexistent)
@@ -1,20 +0,0 @@
---- chrome/browser/net/system_network_context_manager.cc.orig 2019-01-09 22:09:37.510094000 +0100
-+++ chrome/browser/net/system_network_context_manager.cc 2019-01-09 22:10:30.828698000 +0100
-@@ -67,7 +67,7 @@
- #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"
-@@ -513,7 +513,7 @@
- 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();
-
Property changes on: branches/2019Q2/www/chromium/files/patch-chrome_browser_net_system_network_context_manager.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/2019Q2/www/chromium/files/patch-extensions_browser_api_networking__private_networking__private_delegate_factory.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-extensions_browser_api_networking__private_networking__private_delegate_factory.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-extensions_browser_api_networking__private_networking__private_delegate_factory.cc (nonexistent)
@@ -1,20 +0,0 @@
---- extensions/browser/api/networking_private/networking_private_delegate_factory.cc.orig 2018-01-21 13:32:48.139964000 +0100
-+++ extensions/browser/api/networking_private/networking_private_delegate_factory.cc 2018-01-21 13:33:33.051307000 +0100
-@@ -11,7 +11,7 @@
-
- #if defined(OS_CHROMEOS)
- #include "extensions/browser/api/networking_private/networking_private_chromeos.h"
--#elif defined(OS_LINUX)
-+#elif defined(OS_LINUX) || defined(OS_BSD)
- #include "extensions/browser/api/networking_private/networking_private_linux.h"
- #elif defined(OS_WIN) || defined(OS_MACOSX)
- #include "components/wifi/wifi_service.h"
-@@ -61,7 +61,7 @@
- NetworkingPrivateDelegate* delegate;
- #if defined(OS_CHROMEOS)
- delegate = new NetworkingPrivateChromeOS(browser_context);
--#elif defined(OS_LINUX)
-+#elif defined(OS_LINUX) || defined(OS_BSD)
- delegate = new NetworkingPrivateLinux();
- #elif defined(OS_WIN) || defined(OS_MACOSX)
- std::unique_ptr<wifi::WiFiService> wifi_service(wifi::WiFiService::Create());
Property changes on: branches/2019Q2/www/chromium/files/patch-extensions_browser_api_networking__private_networking__private_delegate_factory.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/2019Q2/www/chromium/files/patch-chrome_browser_apps_platform_apps_api_music_manager_private_device__id__linux.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-chrome_browser_apps_platform_apps_api_music_manager_private_device__id__linux.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-chrome_browser_apps_platform_apps_api_music_manager_private_device__id__linux.cc (nonexistent)
@@ -1,70 +0,0 @@
---- chrome/browser/apps/platform_apps/api/music_manager_private/device_id_linux.cc.orig 2018-12-05 14:44:06.182927000 +0100
-+++ chrome/browser/apps/platform_apps/api/music_manager_private/device_id_linux.cc 2018-12-05 15:28:09.650594000 +0100
-@@ -4,6 +4,11 @@
-
- #include "chrome/browser/apps/platform_apps/api/music_manager_private/device_id.h"
-
-+#if defined(OS_FREEBSD)
-+#include <sys/types.h>
-+#include <net/if_dl.h>
-+#endif
-+
- #include <ifaddrs.h>
- #include <net/if.h>
- #include <stddef.h>
-@@ -104,9 +109,36 @@
- const char* const prefixes[],
- size_t prefixes_count) {
- const int MAC_LENGTH = 6;
-+#if defined(OS_FREEBSD)
-+ struct ifaddrs *ifap, *ifinfo;
-+#else
- struct ifreq ifinfo;
-+#endif
-
- memset(&ifinfo, 0, sizeof(ifinfo));
-+
-+#if defined(OS_FREEBSD)
-+ int result = getifaddrs(&ifap);
-+
-+ if (result != 0)
-+ return true;
-+
-+ result = 1; // no MAC found yet
-+
-+ for (ifinfo = ifap; ifinfo != NULL; ifinfo = ifinfo->ifa_next) {
-+ struct sockaddr* sa = ifinfo->ifa_addr;
-+ if (sa->sa_family == AF_LINK &&
-+ !strncmp(ifinfo->ifa_name, ifaddr->ifa_name,
-+ sizeof(ifinfo->ifa_name) - 1)) {
-+ result = 0;
-+ break;
-+ }
-+ }
-+
-+ char mac_address[6];
-+
-+ strncpy(mac_address, (const char*)LLADDR((struct sockaddr_dl*)ifinfo->ifa_addr), sizeof(mac_address));
-+#else
- strncpy(ifinfo.ifr_name, ifaddr->ifa_name, sizeof(ifinfo.ifr_name) - 1);
-
- int sd = socket(AF_INET, SOCK_DGRAM, 0);
-@@ -118,11 +150,18 @@
-
- const char* mac_address =
- static_cast<const char*>(ifinfo.ifr_hwaddr.sa_data);
-+#endif
-+
- if (!is_valid_mac_address_.Run(mac_address, MAC_LENGTH))
- return true;
-
-+#if defined(OS_FREEBSD)
-+ if (!IsValidPrefix(ifinfo->ifa_name, prefixes, prefixes_count))
-+ return true;
-+#else
- if (!IsValidPrefix(ifinfo.ifr_name, prefixes, prefixes_count))
- return true;
-+#endif
-
- // Got one!
- found_mac_address_ =
Property changes on: branches/2019Q2/www/chromium/files/patch-chrome_browser_apps_platform_apps_api_music_manager_private_device__id__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/2019Q2/www/chromium/files/patch-base_trace__event_malloc_dump_provider.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-base_trace__event_malloc_dump_provider.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-base_trace__event_malloc_dump_provider.cc (nonexistent)
@@ -1,21 +0,0 @@
---- base/trace_event/malloc_dump_provider.cc.orig 2019-01-30 02:17:39.000000000 +0100
-+++ base/trace_event/malloc_dump_provider.cc 2019-01-31 22:27:52.377125000 +0100
-@@ -17,6 +17,8 @@
-
- #if defined(OS_MACOSX)
- #include <malloc/malloc.h>
-+#elif defined(OS_BSD)
-+#include "stdlib.h"
- #else
- #include <malloc.h>
- #endif
-@@ -132,6 +134,9 @@
- }
- #elif defined(OS_FUCHSIA)
- // TODO(fuchsia): Port, see https://crbug.com/706592.
-+#elif defined(OS_BSD)
-+ total_virtual_size = 0;
-+ allocated_objects_size = 0;
- #else
- struct mallinfo info = mallinfo();
- DCHECK_GE(info.arena + info.hblkhd, info.uordblks);
Property changes on: branches/2019Q2/www/chromium/files/patch-base_trace__event_malloc_dump_provider.cc
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: branches/2019Q2/www/chromium/files/patch-chrome_browser_media_router_discovery_discovery_network_list_posix.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-chrome_browser_media_router_discovery_discovery_network_list_posix.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-chrome_browser_media_router_discovery_discovery_network_list_posix.cc (nonexistent)
@@ -1,28 +0,0 @@
---- chrome/browser/media/router/discovery/discovery_network_list_posix.cc.orig 2017-09-10 01:42:30.124986000 +0200
-+++ chrome/browser/media/router/discovery/discovery_network_list_posix.cc 2017-09-10 01:44:26.941752000 +0200
-@@ -10,6 +10,7 @@
- #include <netinet/in.h>
- #include <sys/socket.h>
- #include <sys/types.h>
-+#include <sys/time.h>
-
- #include <algorithm>
-
-@@ -19,7 +20,7 @@
- #include "chrome/browser/media/router/discovery/discovery_network_list_wifi.h"
- #include "net/base/net_errors.h"
-
--#if !defined(OS_MACOSX)
-+#if !defined(OS_MACOSX) && !defined(OS_BSD)
- #include <netpacket/packet.h>
- #else
- #include <net/if_dl.h>
-@@ -27,7 +28,7 @@
-
- namespace {
-
--#if !defined(OS_MACOSX)
-+#if !defined(OS_MACOSX) && !defined(OS_BSD)
- using sll = struct sockaddr_ll;
- #define SOCKET_ARP_TYPE(s) ((s)->sll_hatype)
- #define SOCKET_ADDRESS_LEN(s) ((s)->sll_halen)
Property changes on: branches/2019Q2/www/chromium/files/patch-chrome_browser_media_router_discovery_discovery_network_list_posix.cc
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: branches/2019Q2/www/chromium/files/patch-content_public_common_use_zoom_for_dsf_policy.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-content_public_common_use_zoom_for_dsf_policy.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-content_public_common_use_zoom_for_dsf_policy.cc (nonexistent)
@@ -1,11 +0,0 @@
---- content/public/common/use_zoom_for_dsf_policy.cc.orig 2019-01-09 12:03:15.666391000 +0100
-+++ content/public/common/use_zoom_for_dsf_policy.cc 2019-01-09 12:03:35.744606000 +0100
-@@ -25,7 +25,7 @@
- #endif
-
- bool IsUseZoomForDSFEnabledByDefault() {
--#if defined(OS_LINUX) || defined(OS_FUCHSIA)
-+#if defined(OS_LINUX) || defined(OS_FUCHSIA) || defined(OS_BSD)
- return true;
- #elif defined(OS_WIN) || defined(OS_ANDROID)
- return base::FeatureList::IsEnabled(kUseZoomForDsfEnabledByDefault);
Property changes on: branches/2019Q2/www/chromium/files/patch-content_public_common_use_zoom_for_dsf_policy.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/2019Q2/www/chromium/files/patch-device_serial_serial__io__handler__posix.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-device_serial_serial__io__handler__posix.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-device_serial_serial__io__handler__posix.cc (nonexistent)
@@ -1,11 +0,0 @@
---- device/serial/serial_io_handler_posix.cc.orig 2017-06-05 19:03:07 UTC
-+++ device/serial/serial_io_handler_posix.cc
-@@ -61,7 +61,7 @@ bool BitrateToSpeedConstant(int bitrate, speed_t* spee
- BITRATE_TO_SPEED_CASE(9600)
- BITRATE_TO_SPEED_CASE(19200)
- BITRATE_TO_SPEED_CASE(38400)
--#if !defined(OS_MACOSX)
-+#if !defined(OS_MACOSX) && !defined(OS_BSD)
- BITRATE_TO_SPEED_CASE(57600)
- BITRATE_TO_SPEED_CASE(115200)
- BITRATE_TO_SPEED_CASE(230400)
Property changes on: branches/2019Q2/www/chromium/files/patch-device_serial_serial__io__handler__posix.cc
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: branches/2019Q2/www/chromium/files/patch-third__party_blink_renderer_core_scroll_scrollbar_theme_aura.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-third__party_blink_renderer_core_scroll_scrollbar_theme_aura.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-third__party_blink_renderer_core_scroll_scrollbar_theme_aura.cc (nonexistent)
@@ -1,11 +0,0 @@
---- third_party/blink/renderer/core/scroll/scrollbar_theme_aura.cc.orig 2019-01-09 13:20:32.931933000 +0100
-+++ third_party/blink/renderer/core/scroll/scrollbar_theme_aura.cc 2019-01-09 13:21:17.842418000 +0100
-@@ -332,7 +332,7 @@
-
- bool ScrollbarThemeAura::ShouldCenterOnThumb(const Scrollbar& scrollbar,
- const WebMouseEvent& event) {
--#if (defined(OS_LINUX) && !defined(OS_CHROMEOS))
-+#if ((defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS))
- if (event.button == WebPointerProperties::Button::kMiddle)
- return true;
- #endif
Property changes on: branches/2019Q2/www/chromium/files/patch-third__party_blink_renderer_core_scroll_scrollbar_theme_aura.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/2019Q2/www/chromium/files/patch-services_catalog_public_cpp_manifest__parsing__util.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-services_catalog_public_cpp_manifest__parsing__util.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-services_catalog_public_cpp_manifest__parsing__util.cc (nonexistent)
@@ -1,21 +0,0 @@
---- services/catalog/public/cpp/manifest_parsing_util.cc.orig 2017-09-05 21:05:23.000000000 +0200
-+++ services/catalog/public/cpp/manifest_parsing_util.cc 2017-09-06 21:09:16.599702000 +0200
-@@ -17,7 +17,8 @@
- name == Store::kRequiredFilesKey_PlatformValue_Linux ||
- name == Store::kRequiredFilesKey_PlatformValue_MacOSX ||
- name == Store::kRequiredFilesKey_PlatformValue_Android ||
-- name == Store::kRequiredFilesKey_PlatformValue_Fuchsia;
-+ name == Store::kRequiredFilesKey_PlatformValue_Fuchsia ||
-+ name == Store::kRequiredFilesKey_PlatformValue_FreeBSD;
- }
-
- bool IsCurrentPlatform(const std::string& name) {
-@@ -31,6 +32,8 @@
- return name == Store::kRequiredFilesKey_PlatformValue_Android;
- #elif defined(OS_FUCHSIA)
- return name == Store::kRequiredFilesKey_PlatformValue_Fuchsia;
-+#elif defined(OS_BSD)
-+ return name == Store::kRequiredFilesKey_PlatformValue_FreeBSD;
- #else
- #error This architecture is not supported.
- #endif
Property changes on: branches/2019Q2/www/chromium/files/patch-services_catalog_public_cpp_manifest__parsing__util.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/2019Q2/www/chromium/files/patch-services_service__manager_public_cpp_standalone__service_BUILD.gn
===================================================================
--- branches/2019Q2/www/chromium/files/patch-services_service__manager_public_cpp_standalone__service_BUILD.gn (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-services_service__manager_public_cpp_standalone__service_BUILD.gn (nonexistent)
@@ -1,11 +0,0 @@
---- services/service_manager/public/cpp/standalone_service/BUILD.gn.orig 2018-12-03 21:17:09.000000000 +0100
-+++ services/service_manager/public/cpp/standalone_service/BUILD.gn 2018-12-15 14:44:25.857780000 +0100
-@@ -25,7 +25,7 @@
- "//services/service_manager/public/mojom",
- ]
-
-- if (is_linux) {
-+ if (is_linux && !is_bsd) {
- deps += [
- "//sandbox/linux:sandbox",
- "//sandbox/linux:sandbox_services",
Property changes on: branches/2019Q2/www/chromium/files/patch-services_service__manager_public_cpp_standalone__service_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/2019Q2/www/chromium/files/patch-remoting_host_it2me_it2me_native_messaging_host_main.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-remoting_host_it2me_it2me_native_messaging_host_main.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-remoting_host_it2me_it2me_native_messaging_host_main.cc (nonexistent)
@@ -1,20 +0,0 @@
---- remoting/host/it2me/it2me_native_messaging_host_main.cc.orig 2017-08-10 16:26:53.553976000 +0200
-+++ remoting/host/it2me/it2me_native_messaging_host_main.cc 2017-08-10 16:27:23.735020000 +0200
-@@ -25,7 +25,7 @@
- #include "remoting/host/resources.h"
- #include "remoting/host/usage_stats_consent.h"
-
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
- #include <gtk/gtk.h>
- #include <X11/Xlib.h>
-
-@@ -83,7 +83,7 @@
-
- remoting::LoadResources("");
-
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
- // Required in order for us to run multiple X11 threads.
- XInitThreads();
-
Property changes on: branches/2019Q2/www/chromium/files/patch-remoting_host_it2me_it2me_native_messaging_host_main.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/2019Q2/www/chromium/files/patch-third__party_webrtc_rtc_base_ifaddrs__converter.h
===================================================================
--- branches/2019Q2/www/chromium/files/patch-third__party_webrtc_rtc_base_ifaddrs__converter.h (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-third__party_webrtc_rtc_base_ifaddrs__converter.h (nonexistent)
@@ -1,11 +0,0 @@
---- third_party/webrtc/rtc_base/ifaddrs_converter.h.orig 2017-09-07 00:50:44.713781000 +0200
-+++ third_party/webrtc/rtc_base/ifaddrs_converter.h 2017-09-07 00:51:25.775459000 +0200
-@@ -14,6 +14,8 @@
- #if defined(WEBRTC_ANDROID)
- #include "webrtc/rtc_base/ifaddrs-android.h"
- #else
-+#include <sys/types.h>
-+#include <sys/socket.h>
- #include <ifaddrs.h>
- #endif // WEBRTC_ANDROID
-
Property changes on: branches/2019Q2/www/chromium/files/patch-third__party_webrtc_rtc_base_ifaddrs__converter.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/2019Q2/www/chromium/files/patch-ui_strings_app_locale_settings.grd
===================================================================
--- branches/2019Q2/www/chromium/files/patch-ui_strings_app_locale_settings.grd (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-ui_strings_app_locale_settings.grd (nonexistent)
@@ -1,11 +0,0 @@
---- ui/strings/app_locale_settings.grd.orig 2017-09-07 19:24:56.013911000 +0200
-+++ ui/strings/app_locale_settings.grd 2017-09-07 19:26:00.987366000 +0200
-@@ -187,7 +187,7 @@
- 75%
- </message>
- </if>
-- <if expr="(is_linux or is_android or is_bsd) and not chromeos">
-+ <if expr="is_posix and not chromeos">
- <!-- The font used in Web UI (e.g. History). Note that these are only
- backups. We try to use the system font if possible. -->
- <message name="IDS_WEB_FONT_FAMILY" use_name_for_id="true">
Property changes on: branches/2019Q2/www/chromium/files/patch-ui_strings_app_locale_settings.grd
___________________________________________________________________
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/2019Q2/www/chromium/files/patch-components_previews_core_previews_features.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-components_previews_core_previews_features.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-components_previews_core_previews_features.cc (nonexistent)
@@ -1,11 +0,0 @@
---- components/previews/core/previews_features.cc.orig 2019-01-09 12:58:28.080581000 +0100
-+++ components/previews/core/previews_features.cc 2019-01-09 12:58:43.775518000 +0100
-@@ -14,7 +14,7 @@
- // are enabled are controlled by other features.
- const base::Feature kPreviews {
- "Previews",
--#if defined(OS_ANDROID) || defined(OS_LINUX)
-+#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD)
- // Previews allowed for Android (but also allow on Linux for dev/debug).
- base::FEATURE_ENABLED_BY_DEFAULT
- #else // !defined(OS_ANDROID) || defined(OS_LINUX)
Property changes on: branches/2019Q2/www/chromium/files/patch-components_previews_core_previews_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/2019Q2/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font_description.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font_description.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font_description.cc (nonexistent)
@@ -1,20 +0,0 @@
---- third_party/blink/renderer/platform/fonts/font_description.cc.orig 2019-01-09 13:23:01.366176000 +0100
-+++ third_party/blink/renderer/platform/fonts/font_description.cc 2019-01-09 13:23:27.474567000 +0100
-@@ -38,7 +38,7 @@
- #include "third_party/blink/renderer/platform/wtf/text/atomic_string_hash.h"
- #include "third_party/blink/renderer/platform/wtf/text/string_hash.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
-
-@@ -222,7 +222,7 @@
- static_cast<unsigned>(fields_.orientation_) << 1 | // bit 2-3
- static_cast<unsigned>(fields_.subpixel_text_position_); // bit 1
-
--#if defined(OS_LINUX) || defined(OS_CHROMEOS)
-+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
- float device_scale_factor_for_key = FontCache::DeviceScaleFactor();
- #else
- float device_scale_factor_for_key = 1.0f;
Property changes on: branches/2019Q2/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font_description.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/2019Q2/www/chromium/files/patch-ui_gl_gl_bindings_autogen_glx.h
===================================================================
--- branches/2019Q2/www/chromium/files/patch-ui_gl_gl_bindings_autogen_glx.h (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-ui_gl_gl_bindings_autogen_glx.h (nonexistent)
@@ -1,43 +0,0 @@
---- ui/gl/gl_bindings_autogen_glx.h.orig 2017-12-15 02:04:52.000000000 +0100
-+++ ui/gl/gl_bindings_autogen_glx.h 2017-12-30 20:37:25.644088000 +0100
-@@ -104,6 +104,8 @@
- GLXDrawable drawable,
- int32_t* numerator,
- int32_t* denominator);
-+typedef __GLXextFuncPtr(GL_BINDING_CALL* glXGetProcAddressARBProc)(
-+ const GLubyte* procName);
- typedef void(GL_BINDING_CALL* glXGetSelectedEventProc)(Display* dpy,
- GLXDrawable drawable,
- unsigned long* mask);
-@@ -166,6 +168,7 @@
-
- struct ExtensionsGLX {
- bool b_GLX_ARB_create_context;
-+ bool b_GLX_ARB_get_proc_address;
- bool b_GLX_EXT_swap_control;
- bool b_GLX_EXT_texture_from_pixmap;
- bool b_GLX_MESA_copy_sub_buffer;
-@@ -203,6 +206,7 @@
- glXGetFBConfigFromVisualSGIXProc glXGetFBConfigFromVisualSGIXFn;
- glXGetFBConfigsProc glXGetFBConfigsFn;
- glXGetMscRateOMLProc glXGetMscRateOMLFn;
-+ glXGetProcAddressARBProc glXGetProcAddressARBFn;
- glXGetSelectedEventProc glXGetSelectedEventFn;
- glXGetSyncValuesOMLProc glXGetSyncValuesOMLFn;
- glXGetVisualFromFBConfigProc glXGetVisualFromFBConfigFn;
-@@ -310,6 +314,7 @@
- GLXDrawable drawable,
- int32_t* numerator,
- int32_t* denominator) = 0;
-+ virtual __GLXextFuncPtr glXGetProcAddressARBFn(const GLubyte* procName) = 0;
- virtual void glXGetSelectedEventFn(Display* dpy,
- GLXDrawable drawable,
- unsigned long* mask) = 0;
-@@ -394,6 +399,7 @@
- ::gl::g_current_glx_context->glXGetFBConfigFromVisualSGIXFn
- #define glXGetFBConfigs ::gl::g_current_glx_context->glXGetFBConfigsFn
- #define glXGetMscRateOML ::gl::g_current_glx_context->glXGetMscRateOMLFn
-+#define glXGetProcAddressARB ::gl::g_current_glx_context->glXGetProcAddressARBFn
- #define glXGetSelectedEvent ::gl::g_current_glx_context->glXGetSelectedEventFn
- #define glXGetSyncValuesOML ::gl::g_current_glx_context->glXGetSyncValuesOMLFn
- #define glXGetVisualFromFBConfig \
Property changes on: branches/2019Q2/www/chromium/files/patch-ui_gl_gl_bindings_autogen_glx.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/2019Q2/www/chromium/files/patch-third__party_swiftshader_third_party_llvm-subzero_lib_Support_Unix_Process.inc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-third__party_swiftshader_third_party_llvm-subzero_lib_Support_Unix_Process.inc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-third__party_swiftshader_third_party_llvm-subzero_lib_Support_Unix_Process.inc (nonexistent)
@@ -1,11 +0,0 @@
---- third_party/swiftshader/third_party/llvm-subzero/lib/Support/Unix/Process.inc.orig 2017-12-30 20:23:57.746690000 +0100
-+++ third_party/swiftshader/third_party/llvm-subzero/lib/Support/Unix/Process.inc 2017-12-30 20:25:19.279850000 +0100
-@@ -35,7 +35,7 @@
- // DragonFlyBSD, OpenBSD, and Bitrig have deprecated <malloc.h> for
- // <stdlib.h> instead. Unix.h includes this for us already.
- #if defined(HAVE_MALLOC_H) && !defined(__DragonFly__) && \
-- !defined(__OpenBSD__) && !defined(__Bitrig__)
-+ !defined(__FreeBSD__) && !defined(__OpenBSD__) && !defined(__Bitrig__)
- #include <malloc.h>
- #endif
- #if defined(HAVE_MALLCTL)
Property changes on: branches/2019Q2/www/chromium/files/patch-third__party_swiftshader_third_party_llvm-subzero_lib_Support_Unix_Process.inc
___________________________________________________________________
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/2019Q2/www/chromium/files/patch-chrome_browser_media_router_discovery_discovery_network_list_wifi_linux.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-chrome_browser_media_router_discovery_discovery_network_list_wifi_linux.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-chrome_browser_media_router_discovery_discovery_network_list_wifi_linux.cc (nonexistent)
@@ -1,26 +0,0 @@
---- chrome/browser/media/router/discovery/discovery_network_list_wifi_linux.cc.orig 2017-09-05 21:05:13.000000000 +0200
-+++ chrome/browser/media/router/discovery/discovery_network_list_wifi_linux.cc 2017-09-10 03:43:00.933828000 +0200
-@@ -9,8 +9,6 @@
- #include <sys/socket.h>
- #include <sys/types.h>
-
--#include <linux/wireless.h>
--
- #include "base/files/scoped_file.h"
- #include "base/logging.h"
- #include "net/base/network_interfaces_linux.h"
-@@ -18,6 +16,7 @@
- bool MaybeGetWifiSSID(const std::string& if_name, std::string* ssid_out) {
- DCHECK(ssid_out);
-
-+#if !defined(OS_BSD)
- base::ScopedFD ioctl_socket(socket(AF_INET, SOCK_DGRAM, 0));
- if (!ioctl_socket.is_valid())
- return false;
-@@ -34,5 +33,6 @@
- ssid_out->assign(ssid);
- return true;
- }
-+#endif
- return false;
- }
Property changes on: branches/2019Q2/www/chromium/files/patch-chrome_browser_media_router_discovery_discovery_network_list_wifi_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/2019Q2/www/chromium/files/patch-base_task_task_scheduler_scheduler_single_thread_task_runner_manager_unittest.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-base_task_task_scheduler_scheduler_single_thread_task_runner_manager_unittest.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-base_task_task_scheduler_scheduler_single_thread_task_runner_manager_unittest.cc (nonexistent)
@@ -1,12 +0,0 @@
---- base/task/task_scheduler/scheduler_single_thread_task_runner_manager_unittest.cc.orig 2018-12-12 22:56:01.000000000 +0100
-+++ base/task/task_scheduler/scheduler_single_thread_task_runner_manager_unittest.cc 2018-12-16 01:43:12.295373000 +0100
-@@ -295,6 +295,9 @@
- EXPECT_EQ(ThreadPriority::NORMAL, thread_priority_normal);
- }
-
-+#if defined(OS_BSD)
-+#define ThreadNamesSet DISABLED_ThreadNamesSet
-+#endif
- TEST_P(TaskSchedulerSingleThreadTaskRunnerManagerCommonTest, ThreadNamesSet) {
- constexpr TaskTraits foo_traits = {TaskPriority::BEST_EFFORT,
- TaskShutdownBehavior::BLOCK_SHUTDOWN};
Property changes on: branches/2019Q2/www/chromium/files/patch-base_task_task_scheduler_scheduler_single_thread_task_runner_manager_unittest.cc
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: branches/2019Q2/www/chromium/files/patch-third_party_blink_renderer_platform_heap_stack_frame_depth.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-third_party_blink_renderer_platform_heap_stack_frame_depth.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-third_party_blink_renderer_platform_heap_stack_frame_depth.cc (nonexistent)
@@ -1,14 +0,0 @@
---- third_party/blink/renderer/platform/heap/stack_frame_depth.cc.orig 2018-07-19 19:31:59.775056000 +0200
-+++ third_party/blink/renderer/platform/heap/stack_frame_depth.cc 2018-07-19 19:32:43.812459000 +0200
-@@ -15,6 +15,11 @@
- extern "C" void* __libc_stack_end; // NOLINT
- #endif
-
-+#if defined(OS_FREEBSD)
-+#include <sys/signal.h>
-+#include <pthread_np.h>
-+#endif
-+
- namespace blink {
-
- static const char* g_avoid_optimization = nullptr;
Property changes on: branches/2019Q2/www/chromium/files/patch-third_party_blink_renderer_platform_heap_stack_frame_depth.cc
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: branches/2019Q2/www/chromium/files/patch-media_capture_video_shared_memory_handler_provider.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-media_capture_video_shared_memory_handler_provider.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-media_capture_video_shared_memory_handler_provider.cc (nonexistent)
@@ -1,11 +0,0 @@
---- media/capture/video/shared_memory_handle_provider.cc.orig 2019-01-12 22:31:08.999805000 +0100
-+++ media/capture/video/shared_memory_handle_provider.cc 2019-01-12 22:31:53.741578000 +0100
-@@ -63,7 +63,7 @@
- return true;
- }
-
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
- bool SharedMemoryHandleProvider::InitAsReadOnlyFromRawFileDescriptor(
- mojo::ScopedHandle fd_handle,
- uint32_t memory_size_in_bytes) {
Property changes on: branches/2019Q2/www/chromium/files/patch-media_capture_video_shared_memory_handler_provider.cc
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: branches/2019Q2/www/chromium/files/patch-third__party_skia_src_ports_SkOSFile_stdio.cpp
===================================================================
--- branches/2019Q2/www/chromium/files/patch-third__party_skia_src_ports_SkOSFile_stdio.cpp (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-third__party_skia_src_ports_SkOSFile_stdio.cpp (nonexistent)
@@ -1,11 +0,0 @@
---- third_party/skia/src/ports/SkOSFile_stdio.cpp.orig 2017-08-10 02:10:46.427948000 +0200
-+++ third_party/skia/src/ports/SkOSFile_stdio.cpp 2017-08-10 02:11:15.515911000 +0200
-@@ -117,7 +117,7 @@
-
- void sk_fsync(FILE* f) {
- #if !defined(_WIN32) && !defined(SK_BUILD_FOR_ANDROID) && !defined(__UCLIBC__) \
-- && !defined(_NEWLIB_VERSION)
-+ && !defined(_NEWLIB_VERSION) && !defined(__FreeBSD__)
- int fd = fileno(f);
- fsync(fd);
- #endif
Property changes on: branches/2019Q2/www/chromium/files/patch-third__party_skia_src_ports_SkOSFile_stdio.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/2019Q2/www/chromium/files/patch-components_download_quarantine_quarantine_linux.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-components_download_quarantine_quarantine_linux.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-components_download_quarantine_quarantine_linux.cc (nonexistent)
@@ -1,36 +0,0 @@
---- components/download/quarantine/quarantine_linux.cc.orig 2019-01-30 02:17:53.000000000 +0100
-+++ components/download/quarantine/quarantine_linux.cc 2019-01-31 23:40:46.073321000 +0100
-@@ -2,11 +2,15 @@
- // Use of this source code is governed by a BSD-style license that can be
- // found in the LICENSE file.
-
-+#include "build/build_config.h"
-+
- #include "components/download/quarantine/quarantine.h"
-
- #include <stddef.h>
- #include <sys/types.h>
-+#if !defined(OS_BSD)
- #include <sys/xattr.h>
-+#endif
-
- #include "base/files/file_path.h"
- #include "base/logging.h"
-@@ -25,7 +29,7 @@
- int flags) {
- // On Chrome OS, there is no component that can validate these extended
- // attributes so there is no need to set them.
--#if !defined(OS_CHROMEOS)
-+#if !defined(OS_CHROMEOS) && !defined(OS_BSD)
- base::ScopedBlockingCall scoped_blocking_call(base::BlockingType::MAY_BLOCK);
- int result = setxattr(path, name, value, value_size, flags);
- if (result) {
-@@ -33,7 +37,7 @@
- << path;
- return false;
- }
--#endif // !defined(OS_CHROMEOS)
-+#endif // !defined(OS_CHROMEOS) && !defined(OS_BSD)
- return true;
- }
-
Property changes on: branches/2019Q2/www/chromium/files/patch-components_download_quarantine_quarantine_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/2019Q2/www/chromium/files/patch-third_party_crashpad_crashpad_util_misc_metrics.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-third_party_crashpad_crashpad_util_misc_metrics.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-third_party_crashpad_crashpad_util_misc_metrics.cc (nonexistent)
@@ -1,11 +0,0 @@
---- third_party/crashpad/crashpad/util/misc/metrics.cc.orig 2018-07-19 19:45:25.874776000 +0200
-+++ third_party/crashpad/crashpad/util/misc/metrics.cc 2018-07-19 19:45:38.273062000 +0200
-@@ -24,7 +24,7 @@
- #define METRICS_OS_NAME "Win"
- #elif defined(OS_ANDROID)
- #define METRICS_OS_NAME "Android"
--#elif defined(OS_LINUX)
-+#elif defined(OS_LINUX) || defined(OS_BSD)
- #define METRICS_OS_NAME "Linux"
- #elif defined(OS_FUCHSIA)
- #define METRICS_OS_NAME "Fuchsia"
Property changes on: branches/2019Q2/www/chromium/files/patch-third_party_crashpad_crashpad_util_misc_metrics.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/2019Q2/www/chromium/files/patch-content_common_common_sandbox_support_linux.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-content_common_common_sandbox_support_linux.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-content_common_common_sandbox_support_linux.cc (nonexistent)
@@ -1,11 +0,0 @@
---- content/common/common_sandbox_support_linux.cc.orig 2018-08-04 19:46:27.654459000 +0200
-+++ content/common/common_sandbox_support_linux.cc 2018-08-04 19:46:40.138833000 +0200
-@@ -5,6 +5,7 @@
- #include "content/public/common/common_sandbox_support_linux.h"
-
- #include <sys/stat.h>
-+#include <unistd.h>
-
- #include <limits>
- #include <memory>
-
Property changes on: branches/2019Q2/www/chromium/files/patch-content_common_common_sandbox_support_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/2019Q2/www/chromium/files/patch-third__party_webrtc_webrtc.gni
===================================================================
--- branches/2019Q2/www/chromium/files/patch-third__party_webrtc_webrtc.gni (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-third__party_webrtc_webrtc.gni (nonexistent)
@@ -1,11 +0,0 @@
---- third_party/webrtc/webrtc.gni.orig 2019-01-30 02:20:39.000000000 +0100
-+++ third_party/webrtc/webrtc.gni 2019-02-01 14:19:52.625516000 +0100
-@@ -234,7 +234,7 @@
-
- # Desktop capturer is supported only on Windows, OSX and Linux.
- rtc_desktop_capture_supported =
-- is_win || is_mac || (is_linux && (rtc_use_x11 || rtc_use_pipewire))
-+ is_win || is_mac || (is_linux && (rtc_use_x11 || rtc_use_pipewire) && !is_bsd)
-
- ###############################################################################
- # Templates
Property changes on: branches/2019Q2/www/chromium/files/patch-third__party_webrtc_webrtc.gni
___________________________________________________________________
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/2019Q2/www/chromium/files/patch-components_new_or_sad_tab_strings.grdp
===================================================================
--- branches/2019Q2/www/chromium/files/patch-components_new_or_sad_tab_strings.grdp (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-components_new_or_sad_tab_strings.grdp (nonexistent)
@@ -1,38 +0,0 @@
---- components/new_or_sad_tab_strings.grdp.orig 2017-12-15 02:04:14.000000000 +0100
-+++ components/new_or_sad_tab_strings.grdp 2017-12-24 11:49:23.903168000 +0100
-@@ -48,7 +48,7 @@
- Open page in a new Incognito window (⇧⌘N)
- </message>
- </if>
-- <if expr="is_win or is_linux or chromeos">
-+ <if expr="is_win or is_posix or chromeos">
- <message name="IDS_SAD_TAB_RELOAD_INCOGNITO" desc="One of the bullet points displayed on the web page if a reload failed to fix the issue, advising the user to open the web page in Chrome's Incognito mode.">
- Open page in a new Incognito window (Ctrl-Shift-N)
- </message>
-@@ -63,7 +63,7 @@
- Close other tabs or apps
- </message>
- </if>
-- <if expr="is_linux and not chromeos">
-+ <if expr="is_posix and not chromeos">
- <message name="IDS_SAD_TAB_RELOAD_CLOSE_TABS" desc="One of the bullet points displayed on the web page if a reload failed to fix the issue, advising the user to close other Chrome tabs or programs running on their computer.">
- Close other tabs or programs
- </message>
-@@ -73,7 +73,7 @@
- Close other apps
- </message>
- </if>
-- <if expr="is_linux and not chromeos">
-+ <if expr="is_posix and not chromeos">
- <message name="IDS_SAD_TAB_RELOAD_CLOSE_NOTABS" desc="One of the bullet points displayed on the web page if a reload failed to fix the issue, advising the user to close other programs running on their computer (Linux).">
- Close other programs
- </message>
-@@ -88,7 +88,7 @@
- Restart Chromium
- </message>
- </if>
-- <if expr="is_win or is_linux or is_macosx or chromeos">
-+ <if expr="is_win or is_posix or is_macosx or chromeos">
- <message name="IDS_SAD_TAB_RELOAD_RESTART_DEVICE" desc="One of the bullet points displayed on the web page if a reload failed to fix the issue, advising the user to restart their computer.">
- Restart your computer
- </message>
Property changes on: branches/2019Q2/www/chromium/files/patch-components_new_or_sad_tab_strings.grdp
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: branches/2019Q2/www/chromium/files/patch-remoting_host_host_attributes.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-remoting_host_host_attributes.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-remoting_host_host_attributes.cc (nonexistent)
@@ -1,11 +0,0 @@
---- remoting/host/host_attributes.cc.orig 2019-01-09 13:07:49.513766000 +0100
-+++ remoting/host/host_attributes.cc 2019-01-09 13:08:03.536029000 +0100
-@@ -123,7 +123,7 @@
- media::InitializeMediaFoundation()) {
- result.push_back("HWEncoder");
- }
--#elif defined(OS_LINUX)
-+#elif defined(OS_LINUX) || defined(OS_BSD)
- result.push_back("HWEncoder");
- #endif
-
Property changes on: branches/2019Q2/www/chromium/files/patch-remoting_host_host_attributes.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/2019Q2/www/chromium/files/patch-ui_gfx_native_pixmap_handle.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-ui_gfx_native_pixmap_handle.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-ui_gfx_native_pixmap_handle.cc (nonexistent)
@@ -1,28 +0,0 @@
---- ui/gfx/native_pixmap_handle.cc.orig 2018-03-20 23:05:56.000000000 +0100
-+++ ui/gfx/native_pixmap_handle.cc 2018-03-24 19:09:06.975980000 +0100
-@@ -4,14 +4,14 @@
-
- #include "ui/gfx/native_pixmap_handle.h"
-
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
- #include <drm_fourcc.h>
- #include "base/posix/eintr_wrapper.h"
- #endif
-
- 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"
- "DRM_FORMAT_MOD_INVALID");
-@@ -36,7 +36,7 @@
-
- NativePixmapHandle::~NativePixmapHandle() {}
-
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
- NativePixmapHandle CloneHandleForIPC(const NativePixmapHandle& handle) {
- NativePixmapHandle clone;
- std::vector<base::ScopedFD> scoped_fds;
Property changes on: branches/2019Q2/www/chromium/files/patch-ui_gfx_native_pixmap_handle.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/2019Q2/www/chromium/files/patch-services_service__manager_zygote_zygote_host_linux.h
===================================================================
--- branches/2019Q2/www/chromium/files/patch-services_service__manager_zygote_zygote_host_linux.h (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-services_service__manager_zygote_zygote_host_linux.h (nonexistent)
@@ -1,16 +0,0 @@
---- services/service_manager/zygote/zygote_host_linux.h.orig 2018-08-04 19:14:58.401790000 +0200
-+++ services/service_manager/zygote/zygote_host_linux.h 2018-08-04 19:15:49.368693000 +0200
-@@ -30,11 +30,13 @@
- // after the first render has been forked.
- virtual int GetRendererSandboxStatus() const = 0;
-
-+#if !defined(OS_BSD)
- // Adjust the OOM score of the given renderer's PID. The allowed
- // range for the score is [0, 1000], where higher values are more
- // likely to be killed by the OOM killer.
- virtual void AdjustRendererOOMScore(base::ProcessHandle process_handle,
- int score) = 0;
-+#endif
- };
-
- } // namespace service_manager
Property changes on: branches/2019Q2/www/chromium/files/patch-services_service__manager_zygote_zygote_host_linux.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/2019Q2/www/chromium/files/patch-chrome_browser_ui_sad_tab.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-chrome_browser_ui_sad_tab.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-chrome_browser_ui_sad_tab.cc (nonexistent)
@@ -1,11 +0,0 @@
---- chrome/browser/ui/sad_tab.cc.orig 2018-03-03 21:11:09.039038000 +0100
-+++ chrome/browser/ui/sad_tab.cc 2018-03-03 21:11:28.213027000 +0100
-@@ -180,7 +180,7 @@
- // Only show incognito suggestion if not already in Incognito mode.
- if (!web_contents_->GetBrowserContext()->IsOffTheRecord())
- message_ids.insert(message_ids.begin(), IDS_SAD_TAB_RELOAD_INCOGNITO);
--#if defined(OS_MACOSX) || defined(OS_LINUX)
-+#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD)
- // Note: on macOS, Linux and ChromeOS, the first bullet is either one of
- // IDS_SAD_TAB_RELOAD_CLOSE_TABS or IDS_SAD_TAB_RELOAD_CLOSE_NOTABS
- // followed by one of the above suggestions.
Property changes on: branches/2019Q2/www/chromium/files/patch-chrome_browser_ui_sad_tab.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/2019Q2/www/chromium/files/patch-chrome_browser_prefs_pref_service_incognito_whitelist.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-chrome_browser_prefs_pref_service_incognito_whitelist.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-chrome_browser_prefs_pref_service_incognito_whitelist.cc (nonexistent)
@@ -1,11 +0,0 @@
---- chrome/browser/prefs/pref_service_incognito_whitelist.cc.orig 2019-01-13 01:45:22.403758000 +0100
-+++ chrome/browser/prefs/pref_service_incognito_whitelist.cc 2019-01-13 01:45:47.793792000 +0100
-@@ -161,7 +161,7 @@
- prefs::kShowFullscreenToolbar,
- #endif
-
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
- // Toggleing custom frames affects all open windows in the profile, hence
- // should be written to the regular profile when changed in incognito mode.
- prefs::kUseCustomChromeFrame,
Property changes on: branches/2019Q2/www/chromium/files/patch-chrome_browser_prefs_pref_service_incognito_whitelist.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/2019Q2/www/chromium/files/patch-third_party_crashpad_crashpad_util_misc_uuid.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-third_party_crashpad_crashpad_util_misc_uuid.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-third_party_crashpad_crashpad_util_misc_uuid.cc (nonexistent)
@@ -1,11 +0,0 @@
---- third_party/crashpad/crashpad/util/misc/uuid.cc.orig 2018-07-19 19:46:52.081549000 +0200
-+++ third_party/crashpad/crashpad/util/misc/uuid.cc 2018-07-19 19:47:05.207892000 +0200
-@@ -95,7 +95,7 @@
- InitializeFromBytes(uuid);
- return true;
- #elif defined(OS_WIN) || defined(OS_LINUX) || defined(OS_ANDROID) || \
-- defined(OS_FUCHSIA)
-+ defined(OS_FUCHSIA) || defined(OS_BSD)
- // Linux, Android, and Fuchsia do not provide a UUID generator in a
- // widely-available system library. On Linux and Android, uuid_generate()
- // from libuuid is not available everywhere.
Property changes on: branches/2019Q2/www/chromium/files/patch-third_party_crashpad_crashpad_util_misc_uuid.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/2019Q2/www/chromium/files/patch-chrome_browser_media_router_providers_wired_display_wired_display_media_route_provider.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-chrome_browser_media_router_providers_wired_display_wired_display_media_route_provider.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-chrome_browser_media_router_providers_wired_display_wired_display_media_route_provider.cc (nonexistent)
@@ -1,23 +0,0 @@
---- chrome/browser/media/router/providers/wired_display/wired_display_media_route_provider.cc.orig 2018-12-12 22:56:03.000000000 +0100
-+++ chrome/browser/media/router/providers/wired_display/wired_display_media_route_provider.cc 2018-12-16 14:00:18.522246000 +0100
-@@ -111,6 +111,12 @@
- bool incognito,
- CreateRouteCallback callback) {
- DCHECK(!base::ContainsKey(presentations_, presentation_id));
-+#if defined(OS_BSD) // XXX
-+ std::move(callback).Run(base::nullopt, nullptr,
-+ std::string("Not implemented"),
-+ RouteRequestResult::UNKNOWN_ERROR);
-+ return;
-+#else
- base::Optional<Display> display = GetDisplayBySinkId(sink_id);
- if (!display) {
- std::move(callback).Run(base::nullopt, nullptr,
-@@ -137,6 +143,7 @@
- std::move(callback).Run(route, nullptr, base::nullopt,
- RouteRequestResult::OK);
- NotifyRouteObservers();
-+#endif
- }
-
- void WiredDisplayMediaRouteProvider::JoinRoute(
Property changes on: branches/2019Q2/www/chromium/files/patch-chrome_browser_media_router_providers_wired_display_wired_display_media_route_provider.cc
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: branches/2019Q2/www/chromium/files/patch-extensions_browser_api_messaging_message_service.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-extensions_browser_api_messaging_message_service.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-extensions_browser_api_messaging_message_service.cc (nonexistent)
@@ -1,20 +0,0 @@
---- extensions/browser/api/messaging/message_service.cc.orig 2017-12-24 16:01:52.241792000 +0100
-+++ extensions/browser/api/messaging/message_service.cc 2017-12-24 16:02:30.296242000 +0100
-@@ -59,7 +59,7 @@
-
- const char kReceivingEndDoesntExistError[] =
- "Could not establish connection. Receiving end does not exist.";
--#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)
-+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD)
- const char kMissingPermissionError[] =
- "Access to native messaging requires nativeMessaging permission.";
- const char kProhibitedByPoliciesError[] =
-@@ -330,7 +330,7 @@
- if (!source)
- return;
-
--#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)
-+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD)
- content::WebContents* web_contents =
- content::WebContents::FromRenderFrameHost(source);
- ExtensionWebContentsObserver* extension_web_contents_observer =
Property changes on: branches/2019Q2/www/chromium/files/patch-extensions_browser_api_messaging_message_service.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/2019Q2/www/chromium/files/patch-third__party_webrtc_rtc_base_platform_thread_types.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-third__party_webrtc_rtc_base_platform_thread_types.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-third__party_webrtc_rtc_base_platform_thread_types.cc (nonexistent)
@@ -1,40 +0,0 @@
---- third_party/webrtc/rtc_base/platform_thread_types.cc.orig 2018-07-19 22:28:12.880328000 +0200
-+++ third_party/webrtc/rtc_base/platform_thread_types.cc 2018-07-19 22:30:17.907866000 +0200
-@@ -11,7 +11,9 @@
- #include "rtc_base/platform_thread_types.h"
-
- #if defined(WEBRTC_LINUX)
-+#if !defined(__FreeBSD__)
- #include <sys/prctl.h>
-+#endif
- #include <sys/syscall.h>
- #endif
-
-@@ -27,8 +29,10 @@
- return gettid();
- #elif defined(WEBRTC_FUCHSIA)
- return zx_thread_self();
--#elif defined(WEBRTC_LINUX)
-+#elif defined(WEBRTC_LINUX) && !defined(__FreeBSD__)
- return syscall(__NR_gettid);
-+#elif defined(__FreeBSD__)
-+ return reinterpret_cast<uint64_t>(pthread_self());
- #else
- // Default implementation for nacl and solaris.
- return reinterpret_cast<pid_t>(pthread_self());
-@@ -55,6 +59,7 @@
- }
-
- void SetCurrentThreadName(const char* name) {
-+#if !defined(__FreeBSD__)
- #if defined(WEBRTC_WIN)
- struct {
- DWORD dwType;
-@@ -72,6 +77,7 @@
- prctl(PR_SET_NAME, reinterpret_cast<unsigned long>(name)); // NOLINT
- #elif defined(WEBRTC_MAC) || defined(WEBRTC_IOS)
- pthread_setname_np(name);
-+#endif
- #endif
- }
-
Property changes on: branches/2019Q2/www/chromium/files/patch-third__party_webrtc_rtc_base_platform_thread_types.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/2019Q2/www/chromium/files/patch-base_debug_elf_reader_linux.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-base_debug_elf_reader_linux.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-base_debug_elf_reader_linux.cc (nonexistent)
@@ -1,13 +0,0 @@
---- base/debug/elf_reader_linux.cc.orig 2018-08-04 13:15:46.374048000 +0200
-+++ base/debug/elf_reader_linux.cc 2018-08-04 13:16:14.292901000 +0200
-@@ -41,8 +41,10 @@
- const void* section_end = segment.data() + segment.size_bytes();
- const Nhdr* note_header = reinterpret_cast<const Nhdr*>(segment.data());
- while (note_header < section_end) {
-+#if !defined(OS_BSD)
- if (note_header->n_type == NT_GNU_BUILD_ID)
- break;
-+#endif
- note_header = reinterpret_cast<const Nhdr*>(
- reinterpret_cast<const char*>(note_header) + sizeof(Nhdr) +
- bits::Align(note_header->n_namesz, 4) +
Property changes on: branches/2019Q2/www/chromium/files/patch-base_debug_elf_reader_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/2019Q2/www/chromium/files/patch-base_allocator_partition_allocator_partition_alloc_unittest.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-base_allocator_partition_allocator_partition_alloc_unittest.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-base_allocator_partition_allocator_partition_alloc_unittest.cc (nonexistent)
@@ -1,11 +0,0 @@
---- base/allocator/partition_allocator/partition_alloc_unittest.cc.orig 2018-12-04 10:27:52.648233000 +0100
-+++ base/allocator/partition_allocator/partition_alloc_unittest.cc 2018-12-04 10:31:38.008927000 +0100
-@@ -1324,7 +1324,7 @@
- #if !defined(OS_WIN) && \
- (!defined(ARCH_CPU_64_BITS) || \
- (defined(OS_POSIX) && \
-- !(defined(OS_FUCHSIA) || defined(OS_MACOSX) || defined(OS_ANDROID))))
-+ !(defined(OS_FUCHSIA) || defined(OS_MACOSX) || defined(OS_ANDROID) || defined(OS_BSD))))
-
- // The following four tests wrap a called function in an expect death statement
- // to perform their test, because they are non-hermetic. Specifically they are
Property changes on: branches/2019Q2/www/chromium/files/patch-base_allocator_partition_allocator_partition_alloc_unittest.cc
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: branches/2019Q2/www/chromium/files/patch-ui_gfx_ipc_gfx_param_traits_macros.h
===================================================================
--- branches/2019Q2/www/chromium/files/patch-ui_gfx_ipc_gfx_param_traits_macros.h (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-ui_gfx_ipc_gfx_param_traits_macros.h (nonexistent)
@@ -1,29 +0,0 @@
---- ui/gfx/ipc/gfx_param_traits_macros.h.orig 2017-08-02 17:11:09.924017000 +0200
-+++ ui/gfx/ipc/gfx_param_traits_macros.h 2017-08-02 17:11:50.017756000 +0200
-@@ -15,7 +15,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
-
-@@ -39,7 +39,7 @@
- IPC_STRUCT_TRAITS_MEMBER(handle)
- IPC_STRUCT_TRAITS_MEMBER(offset)
- IPC_STRUCT_TRAITS_MEMBER(stride)
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
- IPC_STRUCT_TRAITS_MEMBER(native_pixmap_handle)
- #elif defined(OS_MACOSX)
- IPC_STRUCT_TRAITS_MEMBER(mach_port)
-@@ -50,7 +50,7 @@
- IPC_STRUCT_TRAITS_MEMBER(id)
- IPC_STRUCT_TRAITS_END()
-
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
- IPC_STRUCT_TRAITS_BEGIN(gfx::NativePixmapPlane)
- IPC_STRUCT_TRAITS_MEMBER(stride)
- IPC_STRUCT_TRAITS_MEMBER(offset)
Property changes on: branches/2019Q2/www/chromium/files/patch-ui_gfx_ipc_gfx_param_traits_macros.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/2019Q2/www/chromium/files/patch-third__party_webrtc_rtc_base_ipaddress.h
===================================================================
--- branches/2019Q2/www/chromium/files/patch-third__party_webrtc_rtc_base_ipaddress.h (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-third__party_webrtc_rtc_base_ipaddress.h (nonexistent)
@@ -1,13 +0,0 @@
---- third_party/webrtc/rtc_base/ipaddress.h.orig 2019-01-30 02:20:38.000000000 +0100
-+++ third_party/webrtc/rtc_base/ipaddress.h 2019-02-01 23:40:04.663435000 +0100
-@@ -17,6 +17,10 @@
- #include <netinet/in.h>
- #include <sys/socket.h>
- #endif
-+#if defined(WEBRTC_BSD)
-+#include <sys/types.h>
-+#include <sys/socket.h>
-+#endif
- #if defined(WEBRTC_WIN)
- #include <winsock2.h>
- #include <ws2tcpip.h>
Property changes on: branches/2019Q2/www/chromium/files/patch-third__party_webrtc_rtc_base_ipaddress.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/2019Q2/www/chromium/files/patch-components_storage__monitor_removable_device_constants.h
===================================================================
--- branches/2019Q2/www/chromium/files/patch-components_storage__monitor_removable_device_constants.h (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-components_storage__monitor_removable_device_constants.h (nonexistent)
@@ -1,11 +0,0 @@
---- components/storage_monitor/removable_device_constants.h.orig 2019-01-10 00:46:17.663204000 +0100
-+++ components/storage_monitor/removable_device_constants.h 2019-01-10 00:46:47.654124000 +0100
-@@ -15,7 +15,7 @@
- extern const char kFSUniqueIdPrefix[];
- extern const char kVendorModelSerialPrefix[];
-
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
- extern const char kVendorModelVolumeStoragePrefix[];
- #endif
-
Property changes on: branches/2019Q2/www/chromium/files/patch-components_storage__monitor_removable_device_constants.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/2019Q2/www/chromium/files/patch-ui_message_center_views_message_popup_view.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-ui_message_center_views_message_popup_view.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-ui_message_center_views_message_popup_view.cc (nonexistent)
@@ -1,11 +0,0 @@
---- ui/message_center/views/message_popup_view.cc.orig 2019-01-04 01:03:15.842319000 +0100
-+++ ui/message_center/views/message_popup_view.cc 2019-01-04 01:03:49.177126000 +0100
-@@ -112,7 +112,7 @@
- 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_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
- params.opacity = views::Widget::InitParams::OPAQUE_WINDOW;
- #else
- params.opacity = views::Widget::InitParams::TRANSLUCENT_WINDOW;
Property changes on: branches/2019Q2/www/chromium/files/patch-ui_message_center_views_message_popup_view.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/2019Q2/www/chromium/files/patch-third__party_breakpad_breakpad_src_common_simple_string_dictionary.h
===================================================================
--- branches/2019Q2/www/chromium/files/patch-third__party_breakpad_breakpad_src_common_simple_string_dictionary.h (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-third__party_breakpad_breakpad_src_common_simple_string_dictionary.h (nonexistent)
@@ -1,11 +0,0 @@
---- third_party/breakpad/breakpad/src/common/simple_string_dictionary.h.orig 2017-12-23 22:07:26.606040000 +0100
-+++ third_party/breakpad/breakpad/src/common/simple_string_dictionary.h 2017-12-23 22:08:01.480046000 +0100
-@@ -33,7 +33,7 @@
- #include <assert.h>
- #include <string.h>
-
--#include "common/basictypes.h"
-+#include "third_party/breakpad/breakpad/src/common/basictypes.h"
-
- namespace google_breakpad {
-
Property changes on: branches/2019Q2/www/chromium/files/patch-third__party_breakpad_breakpad_src_common_simple_string_dictionary.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/2019Q2/www/chromium/files/patch-third__party_angle_src_gpu_info_util_SystemInfo_libpci.cpp
===================================================================
--- branches/2019Q2/www/chromium/files/patch-third__party_angle_src_gpu_info_util_SystemInfo_libpci.cpp (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-third__party_angle_src_gpu_info_util_SystemInfo_libpci.cpp (nonexistent)
@@ -1,90 +0,0 @@
---- third_party/angle/src/gpu_info_util/SystemInfo_libpci.cpp.orig 2018-08-20 10:00:10.885543000 -0700
-+++ third_party/angle/src/gpu_info_util/SystemInfo_libpci.cpp 2018-08-20 09:50:32.387980000 -0700
-@@ -12,6 +12,11 @@
- #include <pci/pci.h>
- #include <unistd.h>
-
-+#if defined(__FreeBSD__)
-+#include <fcntl.h>
-+#include <sys/pciio.h>
-+#endif
-+
- #include "common/angleutils.h"
- #include "common/debug.h"
-
-@@ -82,6 +87,75 @@
- };
-
- } // anonymous namespace
-+
-+#if defined(__FreeBSD__)
-+// Adds an entry per PCI GPU found and fills the device and vendor ID.
-+bool GetPCIDevicesFreeBSD(std::vector<GPUDeviceInfo> *devices)
-+{
-+ int fd;
-+ struct pci_conf_io conf;
-+ struct pci_conf *matches;
-+ uint32_t offset = 0;
-+
-+ fd = open("/dev/pci", O_RDONLY);
-+ if (fd < 0)
-+ return false;
-+
-+ matches = new struct pci_conf[32];
-+ conf.generation = 0;
-+ do {
-+ conf.pat_buf_len = 0;
-+ conf.num_patterns = 0;
-+ conf.patterns = NULL;
-+ conf.match_buf_len = 32 * sizeof(struct pci_conf);
-+ conf.num_matches = 32;
-+ conf.matches = matches;
-+ conf.offset = offset;
-+ conf.status = PCI_GETCONF_ERROR;
-+ if (ioctl(fd, PCIOCGETCONF, &conf) < 0) {
-+ if (errno == ENODEV)
-+ break;
-+ }
-+ /* PCI_GETCONF_LIST_CHANGED would require us to start over. */
-+ if (conf.status == PCI_GETCONF_ERROR || conf.status == PCI_GETCONF_LIST_CHANGED) {
-+ break;
-+ }
-+
-+ for (unsigned int i = 0; i < conf.num_matches; i++) {
-+ uint16_t device_class = (matches[i].pc_class << 8) | matches[i].pc_subclass;
-+
-+ // Skip non-GPU devices
-+ switch (device_class)
-+ {
-+ case PCI_CLASS_DISPLAY_VGA:
-+ case PCI_CLASS_DISPLAY_XGA:
-+ case PCI_CLASS_DISPLAY_3D:
-+ break;
-+ default:
-+ continue;
-+ }
-+
-+ // Skip unknown devices
-+ if (matches[i].pc_vendor == 0 || matches[i].pc_device == 0) {
-+ continue;
-+ }
-+
-+ GPUDeviceInfo info;
-+ info.vendorId = matches[i].pc_vendor;
-+ info.deviceId = matches[i].pc_device;
-+
-+ devices->push_back(info);
-+ }
-+ offset += conf.num_matches;
-+ } while (conf.status == PCI_GETCONF_MORE_DEVS);
-+
-+ delete[] matches;
-+
-+ close(fd);
-+
-+ return true;
-+}
-+#endif
-
- // Adds an entry per PCI GPU found and fills the device and vendor ID.
- bool GetPCIDevicesWithLibPCI(std::vector<GPUDeviceInfo> *devices)
Property changes on: branches/2019Q2/www/chromium/files/patch-third__party_angle_src_gpu_info_util_SystemInfo_libpci.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/2019Q2/www/chromium/files/patch-third_party_blink_renderer_core_html_forms_internal_popup_menu.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-third_party_blink_renderer_core_html_forms_internal_popup_menu.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-third_party_blink_renderer_core_html_forms_internal_popup_menu.cc (nonexistent)
@@ -1,11 +0,0 @@
---- third_party/blink/renderer/core/html/forms/internal_popup_menu.cc.orig 2018-07-19 19:21:46.343805000 +0200
-+++ third_party/blink/renderer/core/html/forms/internal_popup_menu.cc 2018-07-19 19:22:00.957461000 +0200
-@@ -126,7 +126,7 @@
- is_in_group_(false),
- buffer_(buffer) {
- DCHECK(buffer_);
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
- // On other platforms, the <option> background color is the same as the
- // <select> background color. On Linux, that makes the <option>
- // background color very dark, so by default, try to use a lighter
Property changes on: branches/2019Q2/www/chromium/files/patch-third_party_blink_renderer_core_html_forms_internal_popup_menu.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/2019Q2/www/chromium/files/patch-remoting_client_display_sys_opengl.h
===================================================================
--- branches/2019Q2/www/chromium/files/patch-remoting_client_display_sys_opengl.h (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-remoting_client_display_sys_opengl.h (nonexistent)
@@ -1,11 +0,0 @@
---- remoting/client/display/sys_opengl.h.orig 2017-08-10 16:17:57.036915000 +0200
-+++ remoting/client/display/sys_opengl.h 2017-08-10 16:18:06.520753000 +0200
-@@ -9,7 +9,7 @@
-
- #if defined(OS_IOS)
- #include <OpenGLES/ES3/gl.h>
--#elif defined(OS_LINUX)
-+#elif defined(OS_LINUX) || defined(OS_BSD)
- #define GL_GLEXT_PROTOTYPES
- #include <GL/gl.h>
- #include <GL/glext.h>
Property changes on: branches/2019Q2/www/chromium/files/patch-remoting_client_display_sys_opengl.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/2019Q2/www/chromium/files/patch-third_party_crashpad_crashpad_util_posix_signals.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-third_party_crashpad_crashpad_util_posix_signals.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-third_party_crashpad_crashpad_util_posix_signals.cc (nonexistent)
@@ -1,33 +0,0 @@
---- third_party/crashpad/crashpad/util/posix/signals.cc.orig 2018-07-19 19:52:18.124704000 +0200
-+++ third_party/crashpad/crashpad/util/posix/signals.cc 2018-07-19 19:53:53.609005000 +0200
-@@ -44,7 +44,7 @@
- #if defined(SIGEMT)
- SIGEMT,
- #endif // defined(SIGEMT)
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
- SIGXCPU,
- SIGXFSZ,
- #endif // defined(OS_LINUX)
-@@ -84,7 +84,7 @@
- SIGXCPU,
- SIGXFSZ,
- #endif // defined(OS_MACOSX)
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
- SIGIO,
- #endif // defined(OS_LINUX)
- };
-@@ -214,8 +214,12 @@
- // remains. See 10.12.3 xnu-3789.41.3/bsd/kern/kern_sig.c
- // psignal_internal().
- (code > 0 &&
-+#if defined(SI_ASYNCIO)
- code != SI_ASYNCIO &&
-+#endif
-+#if defined(SI_MESGQ)
- code != SI_MESGQ &&
-+#endif
- code != SI_QUEUE &&
- code != SI_TIMER &&
- code != SI_USER &&
Property changes on: branches/2019Q2/www/chromium/files/patch-third_party_crashpad_crashpad_util_posix_signals.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/2019Q2/www/chromium/files/patch-content_browser_renderer__host_input_input_device_change_observer.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-content_browser_renderer__host_input_input_device_change_observer.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-content_browser_renderer__host_input_input_device_change_observer.cc (nonexistent)
@@ -1,29 +0,0 @@
---- content/browser/renderer_host/input/input_device_change_observer.cc.orig 2019-01-09 11:52:33.084857000 +0100
-+++ content/browser/renderer_host/input/input_device_change_observer.cc 2019-01-09 11:53:04.895039000 +0100
-@@ -9,7 +9,7 @@
-
- #if defined(OS_WIN)
- #include "ui/events/devices/input_device_observer_win.h"
--#elif defined(OS_LINUX)
-+#elif defined(OS_LINUX) || defined(OS_BSD)
- #include "ui/events/devices/input_device_manager.h"
- #elif defined(OS_ANDROID)
- #include "ui/events/devices/input_device_observer_android.h"
-@@ -21,7 +21,7 @@
- render_view_host_ = rvh;
- #if defined(OS_WIN)
- ui::InputDeviceObserverWin::GetInstance()->AddObserver(this);
--#elif defined(OS_LINUX)
-+#elif defined(OS_LINUX) || defined(OS_BSD)
- ui::InputDeviceManager::GetInstance()->AddObserver(this);
- #elif defined(OS_ANDROID)
- ui::InputDeviceObserverAndroid::GetInstance()->AddObserver(this);
-@@ -31,7 +31,7 @@
- InputDeviceChangeObserver::~InputDeviceChangeObserver() {
- #if defined(OS_WIN)
- ui::InputDeviceObserverWin::GetInstance()->RemoveObserver(this);
--#elif defined(OS_LINUX)
-+#elif defined(OS_LINUX) || defined(OS_BSD)
- ui::InputDeviceManager::GetInstance()->RemoveObserver(this);
- #elif defined(OS_ANDROID)
- ui::InputDeviceObserverAndroid::GetInstance()->RemoveObserver(this);
Property changes on: branches/2019Q2/www/chromium/files/patch-content_browser_renderer__host_input_input_device_change_observer.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/2019Q2/www/chromium/files/patch-build_gn_run_binary.py
===================================================================
--- branches/2019Q2/www/chromium/files/patch-build_gn_run_binary.py (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-build_gn_run_binary.py (nonexistent)
@@ -1,11 +0,0 @@
---- build/gn_run_binary.py.orig 2017-12-30 01:00:32.419195000 +0100
-+++ build/gn_run_binary.py 2017-12-30 01:01:14.497716000 +0100
-@@ -19,7 +19,7 @@
- # 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:
- print '%s failed with exit code %d' % (sys.argv[1], ret)
- sys.exit(ret)
Property changes on: branches/2019Q2/www/chromium/files/patch-build_gn_run_binary.py
___________________________________________________________________
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/2019Q2/www/chromium/files/patch-tools_gn_tools_gn_exec_process.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-tools_gn_tools_gn_exec_process.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-tools_gn_tools_gn_exec_process.cc (nonexistent)
@@ -1,13 +0,0 @@
---- tools/gn/tools/gn/exec_process.cc.orig 2018-12-12 23:06:54.000000000 +0100
-+++ tools/gn/tools/gn/exec_process.cc 2018-12-15 22:04:21.665099000 +0100
-@@ -28,6 +28,10 @@
- #include "base/posix/file_descriptor_shuffle.h"
- #endif
-
-+#if defined(OS_BSD)
-+#include <signal.h>
-+#endif
-+
- namespace internal {
-
- #if defined(OS_WIN)
Property changes on: branches/2019Q2/www/chromium/files/patch-tools_gn_tools_gn_exec_process.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/2019Q2/www/chromium/files/patch-chrome_browser_devtools_devtools_eye_dropper.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-chrome_browser_devtools_devtools_eye_dropper.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-chrome_browser_devtools_devtools_eye_dropper.cc (nonexistent)
@@ -1,11 +0,0 @@
---- chrome/browser/devtools/devtools_eye_dropper.cc.orig 2017-08-01 23:43:54.195876000 +0200
-+++ chrome/browser/devtools/devtools_eye_dropper.cc 2017-08-01 23:44:16.153565000 +0200
-@@ -149,7 +149,7 @@
- // magnified projection only with centered hotspot.
- // Mac Retina requires cursor to be > 120px in order to render smoothly.
-
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
- const float kCursorSize = 63;
- const float kDiameter = 63;
- const float kHotspotOffset = 32;
Property changes on: branches/2019Q2/www/chromium/files/patch-chrome_browser_devtools_devtools_eye_dropper.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/2019Q2/www/chromium/files/patch-components_download_internal_common_base_file.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-components_download_internal_common_base_file.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-components_download_internal_common_base_file.cc (nonexistent)
@@ -1,11 +0,0 @@
---- components/download/internal/common/base_file.cc.orig 2019-01-09 12:22:40.588572000 +0100
-+++ components/download/internal/common/base_file.cc 2019-01-09 12:23:00.218681000 +0100
-@@ -446,7 +446,7 @@
- return reason;
- }
-
--#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)
-+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD)
-
- namespace {
-
Property changes on: branches/2019Q2/www/chromium/files/patch-components_download_internal_common_base_file.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/2019Q2/www/chromium/files/patch-services_content_simple_browser_simple_browser_service.h
===================================================================
--- branches/2019Q2/www/chromium/files/patch-services_content_simple_browser_simple_browser_service.h (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-services_content_simple_browser_simple_browser_service.h (nonexistent)
@@ -1,20 +0,0 @@
---- services/content/simple_browser/simple_browser_service.h.orig 2019-01-09 13:09:39.690142000 +0100
-+++ services/content/simple_browser/simple_browser_service.h 2019-01-09 13:10:00.488808000 +0100
-@@ -14,7 +14,7 @@
- #include "services/content/public/cpp/buildflags.h"
- #include "services/service_manager/public/cpp/service.h"
-
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
- #include "components/services/font/public/cpp/font_loader.h" // nogncheck
- #endif
-
-@@ -47,7 +47,7 @@
- // service_manager::Service:
- void OnStart() override;
-
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
- sk_sp<font_service::FontLoader> font_loader_;
- #endif
-
Property changes on: branches/2019Q2/www/chromium/files/patch-services_content_simple_browser_simple_browser_service.h
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: branches/2019Q2/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance_browser_proxy.js
===================================================================
--- branches/2019Q2/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance_browser_proxy.js (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance_browser_proxy.js (nonexistent)
@@ -1,20 +0,0 @@
---- chrome/browser/resources/settings/appearance_page/appearance_browser_proxy.js.orig 2019-01-09 12:44:51.519192000 +0100
-+++ chrome/browser/resources/settings/appearance_page/appearance_browser_proxy.js 2019-01-09 12:45:25.405099000 +0100
-@@ -35,7 +35,7 @@
-
- useDefaultTheme() {}
-
-- // <if expr="is_linux and not chromeos">
-+ // <if expr="is_bsd and not chromeos">
- useSystemTheme() {}
-
- // </if>
-@@ -93,7 +93,7 @@
- chrome.send('useDefaultTheme');
- }
-
-- // <if expr="is_linux and not chromeos">
-+ // <if expr="is_bsd and not chromeos">
- /** @override */
- useSystemTheme() {
- chrome.send('useSystemTheme');
Property changes on: branches/2019Q2/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance_browser_proxy.js
___________________________________________________________________
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/2019Q2/www/chromium/files/patch-components_services_filesystem_file_system_app.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-components_services_filesystem_file_system_app.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-components_services_filesystem_file_system_app.cc (nonexistent)
@@ -1,20 +0,0 @@
---- components/services/filesystem/file_system_app.cc.orig 2018-08-01 00:08:40.000000000 +0200
-+++ components/services/filesystem/file_system_app.cc 2018-08-04 18:24:22.212419000 +0200
-@@ -20,7 +20,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)
-@@ -75,7 +75,7 @@
- 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<base::Environment> env(base::Environment::Create());
- path = base::nix::GetXDGDirectory(
- env.get(), base::nix::kXdgConfigHomeEnvVar, base::nix::kDotConfigDir);
Property changes on: branches/2019Q2/www/chromium/files/patch-components_services_filesystem_file_system_app.cc
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: branches/2019Q2/www/chromium/files/patch-chrome_browser_browser__process__impl.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-chrome_browser_browser__process__impl.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-chrome_browser_browser__process__impl.cc (nonexistent)
@@ -1,17 +0,0 @@
---- chrome/browser/browser_process_impl.cc.orig 2019-02-12 16:31:58.701630000 +0100
-+++ chrome/browser/browser_process_impl.cc 2019-02-12 16:32:33.417312000 +0100
-@@ -1485,7 +1485,7 @@
- }
-
- // Mac is currently not supported.
--#if (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
-+#if (defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
-
- bool BrowserProcessImpl::IsRunningInBackground() const {
- // Check if browser is in the background.
-@@ -1555,4 +1555,4 @@
- }
- }
-
--#endif // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
-+#endif // (defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
Property changes on: branches/2019Q2/www/chromium/files/patch-chrome_browser_browser__process__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/2019Q2/www/chromium/files/patch-services_tracing_tracing_service.h
===================================================================
--- branches/2019Q2/www/chromium/files/patch-services_tracing_tracing_service.h (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-services_tracing_tracing_service.h (nonexistent)
@@ -1,11 +0,0 @@
---- services/tracing/tracing_service.h.orig 2019-01-09 13:15:21.114712000 +0100
-+++ services/tracing/tracing_service.h 2019-01-09 13:15:33.753522000 +0100
-@@ -18,7 +18,7 @@
- #include "services/tracing/coordinator.h"
-
- #if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_MACOSX) || \
-- defined(OS_WIN)
-+ defined(OS_WIN) || defined(OS_BSD)
- #define PERFETTO_SERVICE_AVAILABLE
- #endif
-
Property changes on: branches/2019Q2/www/chromium/files/patch-services_tracing_tracing_service.h
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: branches/2019Q2/www/chromium/files/patch-third__party_webrtc_rtc_base_physicalsocketserver.h
===================================================================
--- branches/2019Q2/www/chromium/files/patch-third__party_webrtc_rtc_base_physicalsocketserver.h (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-third__party_webrtc_rtc_base_physicalsocketserver.h (nonexistent)
@@ -1,11 +0,0 @@
---- third_party/webrtc/rtc_base/physicalsocketserver.h.orig 2017-09-07 05:58:03.996342000 +0200
-+++ third_party/webrtc/rtc_base/physicalsocketserver.h 2017-09-07 05:58:28.882396000 +0200
-@@ -11,7 +11,7 @@
- #ifndef WEBRTC_RTC_BASE_PHYSICALSOCKETSERVER_H_
- #define WEBRTC_RTC_BASE_PHYSICALSOCKETSERVER_H_
-
--#if defined(WEBRTC_POSIX) && defined(WEBRTC_LINUX)
-+#if defined(WEBRTC_POSIX) && defined(WEBRTC_LINUX) && !defined(WEBRTC_BSD)
- #include <sys/epoll.h>
- #define WEBRTC_USE_EPOLL 1
- #endif
Property changes on: branches/2019Q2/www/chromium/files/patch-third__party_webrtc_rtc_base_physicalsocketserver.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/2019Q2/www/chromium/files/patch-third_party_blink_renderer_platform_wtf_BUILD.gn
===================================================================
--- branches/2019Q2/www/chromium/files/patch-third_party_blink_renderer_platform_wtf_BUILD.gn (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-third_party_blink_renderer_platform_wtf_BUILD.gn (nonexistent)
@@ -1,16 +0,0 @@
---- third_party/blink/renderer/platform/wtf/BUILD.gn.orig 2018-07-19 20:14:10.239594000 +0200
-+++ third_party/blink/renderer/platform/wtf/BUILD.gn 2018-07-19 20:15:01.317226000 +0200
-@@ -279,8 +279,12 @@
- if (is_android) {
- libs = [ "log" ]
- }
-- if (is_linux) {
-+ if (is_linux && !is_bsd) {
- libs = [ "dl" ]
-+ }
-+
-+ if (is_bsd) {
-+ libs = [ "execinfo" ]
- }
-
- if (is_mac) {
Property changes on: branches/2019Q2/www/chromium/files/patch-third_party_blink_renderer_platform_wtf_BUILD.gn
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: branches/2019Q2/www/chromium/files/patch-services_resource_coordinator_public_cpp_memory_instrumentation_os_metrics_linux.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-services_resource_coordinator_public_cpp_memory_instrumentation_os_metrics_linux.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-services_resource_coordinator_public_cpp_memory_instrumentation_os_metrics_linux.cc (nonexistent)
@@ -1,40 +0,0 @@
---- services/resource_coordinator/public/cpp/memory_instrumentation/os_metrics_linux.cc.orig 2018-08-01 00:08:55.000000000 +0200
-+++ services/resource_coordinator/public/cpp/memory_instrumentation/os_metrics_linux.cc 2018-08-04 21:00:31.567932000 +0200
-@@ -16,8 +16,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 {
-
-@@ -101,7 +103,7 @@
- // 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)
- uintptr_t addr = reinterpret_cast<uintptr_t>(&ParseSmapsHeader);
- if (addr >= region->start_address && addr < end_addr) {
- base::Optional<std::string> buildid =
-@@ -196,6 +198,9 @@
- // static
- bool OSMetrics::FillOSMemoryDump(base::ProcessId pid,
- mojom::RawOSMemDump* dump) {
-+#if defined(OS_BSD)
-+ return false;
-+#else
- base::ScopedFD autoclose = OpenStatm(pid);
- int statm_fd = autoclose.get();
-
-@@ -221,6 +226,7 @@
- dump->resident_set_kb = process_metrics->GetResidentSetSize() / 1024;
-
- return true;
-+#endif
- }
-
- // static
Property changes on: branches/2019Q2/www/chromium/files/patch-services_resource_coordinator_public_cpp_memory_instrumentation_os_metrics_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/2019Q2/www/chromium/files/patch-services_network_network_sandbox_hook_linux.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-services_network_network_sandbox_hook_linux.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-services_network_network_sandbox_hook_linux.cc (nonexistent)
@@ -1,18 +0,0 @@
---- services/network/network_sandbox_hook_linux.cc.orig 2018-12-03 21:17:09.000000000 +0100
-+++ services/network/network_sandbox_hook_linux.cc 2018-12-14 00:53:22.847706000 +0100
-@@ -14,6 +14,7 @@
- namespace network {
-
- bool NetworkPreSandboxHook(service_manager::SandboxLinux::Options options) {
-+#if !defined(OS_BSD)
- auto* instance = service_manager::SandboxLinux::GetInstance();
-
- // TODO(tsepez): remove universal permission under filesytem root.
-@@ -32,6 +33,7 @@
- service_manager::SandboxLinux::PreSandboxHook(), options);
-
- instance->EngageNamespaceSandboxIfPossible();
-+#endif // defined(OS_BSD)
- return true;
- }
-
Property changes on: branches/2019Q2/www/chromium/files/patch-services_network_network_sandbox_hook_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/2019Q2/www/chromium/files/patch-third__party_webrtc_rtc_base_byteorder.h
===================================================================
--- branches/2019Q2/www/chromium/files/patch-third__party_webrtc_rtc_base_byteorder.h (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-third__party_webrtc_rtc_base_byteorder.h (nonexistent)
@@ -1,11 +0,0 @@
---- third_party/webrtc/rtc_base/byteorder.h.orig 2017-09-07 00:29:50.482044000 +0200
-+++ third_party/webrtc/rtc_base/byteorder.h 2017-09-07 00:30:15.190287000 +0200
-@@ -77,7 +77,7 @@
- #error RTC_ARCH_CPU_BIG_ENDIAN or RTC_ARCH_CPU_LITTLE_ENDIAN must be defined.
- #endif // defined(RTC_ARCH_CPU_LITTLE_ENDIAN)
- #elif defined(WEBRTC_POSIX)
--#include <endian.h>
-+#include <sys/endian.h>
- #endif
-
- namespace rtc {
Property changes on: branches/2019Q2/www/chromium/files/patch-third__party_webrtc_rtc_base_byteorder.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/2019Q2/www/chromium/files/patch-services_service__manager_zygote_host_zygote_host_impl_linux.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-services_service__manager_zygote_host_zygote_host_impl_linux.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-services_service__manager_zygote_host_zygote_host_impl_linux.cc (nonexistent)
@@ -1,40 +0,0 @@
---- services/service_manager/zygote/host/zygote_host_impl_linux.cc.orig 2018-08-04 19:08:22.136631000 +0200
-+++ services/service_manager/zygote/host/zygote_host_impl_linux.cc 2018-08-04 19:11:54.463784000 +0200
-@@ -72,6 +72,7 @@
- }
-
- void ZygoteHostImpl::Init(const base::CommandLine& command_line) {
-+#if !defined(OS_BSD)
- if (command_line.HasSwitch(service_manager::switches::kNoSandbox)) {
- return;
- }
-@@ -133,6 +134,7 @@
- "you can try using --"
- << service_manager::switches::kNoSandbox << ".";
- }
-+#endif
- }
-
- void ZygoteHostImpl::AddZygotePid(pid_t pid) {
-@@ -157,6 +159,7 @@
- base::CommandLine* cmd_line,
- base::ScopedFD* control_fd,
- base::FileHandleMappingVector additional_remapped_fds) {
-+#if !defined(OS_BSD)
- int fds[2];
- CHECK_EQ(0, socketpair(AF_UNIX, SOCK_SEQPACKET, 0, fds));
- CHECK(base::UnixDomainSocket::EnableReceiveProcessId(fds[0]));
-@@ -221,9 +224,12 @@
-
- AddZygotePid(pid);
- return pid;
-+#else
-+ return 0;
-+#endif
- }
-
--#if !defined(OS_OPENBSD)
-+#if !defined(OS_BSD)
- void ZygoteHostImpl::AdjustRendererOOMScore(base::ProcessHandle pid,
- int score) {
- // 1) You can't change the oom_score_adj of a non-dumpable process
Property changes on: branches/2019Q2/www/chromium/files/patch-services_service__manager_zygote_host_zygote_host_impl_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/2019Q2/www/chromium/files/patch-net_tools_cert_verify_tool_cert_verify_tool.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-net_tools_cert_verify_tool_cert_verify_tool.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-net_tools_cert_verify_tool_cert_verify_tool.cc (nonexistent)
@@ -1,20 +0,0 @@
---- net/tools/cert_verify_tool/cert_verify_tool.cc.orig 2018-07-19 22:18:26.747684000 +0200
-+++ net/tools/cert_verify_tool/cert_verify_tool.cc 2018-07-19 22:18:48.374229000 +0200
-@@ -26,7 +26,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
-@@ -45,7 +45,7 @@
- base::WaitableEvent* initialization_complete_event) {
- net::URLRequestContextBuilder url_request_context_builder;
- url_request_context_builder.set_user_agent(GetUserAgent());
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
- // On Linux, use a fixed ProxyConfigService, since the default one
- // depends on glib.
- //
Property changes on: branches/2019Q2/www/chromium/files/patch-net_tools_cert_verify_tool_cert_verify_tool.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/2019Q2/www/chromium/files/patch-printing_backend_print_backend_cups.h
===================================================================
--- branches/2019Q2/www/chromium/files/patch-printing_backend_print_backend_cups.h (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-printing_backend_print_backend_cups.h (nonexistent)
@@ -1,11 +0,0 @@
---- printing/backend/print_backend_cups.h.orig 2017-09-07 12:48:26.701906000 +0200
-+++ printing/backend/print_backend_cups.h 2017-09-07 12:48:48.628278000 +0200
-@@ -5,6 +5,8 @@
- #ifndef PRINTING_BACKEND_PRINT_BACKEND_CUPS_H_
- #define PRINTING_BACKEND_PRINT_BACKEND_CUPS_H_
-
-+#include <cups/ppd.h>
-+
- #include <string>
-
- #include "base/files/file_util.h"
Property changes on: branches/2019Q2/www/chromium/files/patch-printing_backend_print_backend_cups.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/2019Q2/www/chromium/files/patch-third_party_blink_renderer_core_html_canvas_canvas_async_blob_creator.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-third_party_blink_renderer_core_html_canvas_canvas_async_blob_creator.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-third_party_blink_renderer_core_html_canvas_canvas_async_blob_creator.cc (nonexistent)
@@ -1,11 +0,0 @@
---- third_party/blink/renderer/core/html/canvas/canvas_async_blob_creator.cc.orig 2018-07-19 19:17:49.426163000 +0200
-+++ third_party/blink/renderer/core/html/canvas/canvas_async_blob_creator.cc 2018-07-19 19:19:17.512247000 +0200
-@@ -31,7 +31,7 @@
- 0.001; // a small slack period between deadline and current time for safety
-
- /* 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
Property changes on: branches/2019Q2/www/chromium/files/patch-third_party_blink_renderer_core_html_canvas_canvas_async_blob_creator.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/2019Q2/www/chromium/files/patch-chrome_browser_extensions_api_image_writer_private_removable_storage_provider.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-chrome_browser_extensions_api_image_writer_private_removable_storage_provider.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-chrome_browser_extensions_api_image_writer_private_removable_storage_provider.cc (nonexistent)
@@ -1,20 +0,0 @@
---- chrome/browser/extensions/api/image_writer_private/removable_storage_provider.cc.orig 2018-01-03 17:00:05.332673000 +0100
-+++ chrome/browser/extensions/api/image_writer_private/removable_storage_provider.cc 2018-01-03 17:01:00.459066000 +0100
-@@ -20,6 +20,7 @@
-
- void RemovableStorageProvider::GetAllDevices(DeviceListReadyCallback callback) {
- DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
-+#if !defined(OS_BSD)
- if (g_test_device_list.Get().get() != nullptr) {
- base::ThreadTaskRunnerHandle::Get()->PostTask(
- FROM_HERE,
-@@ -33,6 +34,9 @@
- base::TaskShutdownBehavior::SKIP_ON_SHUTDOWN},
- base::BindOnce(&RemovableStorageProvider::PopulateDeviceList),
- std::move(callback));
-+#else
-+ NOTIMPLEMENTED();
-+#endif
- }
-
- // static
Property changes on: branches/2019Q2/www/chromium/files/patch-chrome_browser_extensions_api_image_writer_private_removable_storage_provider.cc
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: branches/2019Q2/www/chromium/files/patch-ui_gl_gl_fence.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-ui_gl_gl_fence.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-ui_gl_gl_fence.cc (nonexistent)
@@ -1,11 +0,0 @@
---- ui/gl/gl_fence.cc.orig 2018-12-03 21:18:06.000000000 +0100
-+++ ui/gl/gl_fence.cc 2018-12-15 20:48:07.037480000 +0100
-@@ -18,7 +18,7 @@
- #include "ui/gl/gl_fence_apple.h"
- #endif
-
--#if defined(USE_EGL) && defined(OS_POSIX) && !defined(OS_MACOSX)
-+#if defined(USE_EGL) && defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_FREEBSD)
- #define USE_GL_FENCE_ANDROID_NATIVE_FENCE_SYNC
- #include "ui/gl/gl_fence_android_native_fence_sync.h"
- #include "ui/gl/gl_surface_egl.h"
Property changes on: branches/2019Q2/www/chromium/files/patch-ui_gl_gl_fence.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/2019Q2/www/chromium/files/patch-base_allocator_partition_allocator_page_allocator.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-base_allocator_partition_allocator_page_allocator.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-base_allocator_partition_allocator_page_allocator.cc (nonexistent)
@@ -1,11 +0,0 @@
---- base/allocator/partition_allocator/page_allocator.cc.orig 2019-02-06 21:56:56.953755000 +0100
-+++ base/allocator/partition_allocator/page_allocator.cc 2019-02-06 21:57:23.721544000 +0100
-@@ -114,7 +114,7 @@
- uintptr_t align_base_mask = ~align_offset_mask;
- DCHECK(!(reinterpret_cast<uintptr_t>(address) & align_offset_mask));
-
--#if defined(OS_LINUX) && defined(ARCH_CPU_64_BITS)
-+#if (defined(OS_BSD) || defined(OS_LINUX)) && defined(ARCH_CPU_64_BITS)
- // On 64 bit Linux, we may need to adjust the address space limit for
- // guarded allocations.
- if (length >= kMinimumGuardedMemorySize) {
Property changes on: branches/2019Q2/www/chromium/files/patch-base_allocator_partition_allocator_page_allocator.cc
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: branches/2019Q2/www/chromium/files/patch-chrome_app_theme_chrome_unscaled_resources.grd
===================================================================
--- branches/2019Q2/www/chromium/files/patch-chrome_app_theme_chrome_unscaled_resources.grd (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-chrome_app_theme_chrome_unscaled_resources.grd (nonexistent)
@@ -1,11 +0,0 @@
---- chrome/app/theme/chrome_unscaled_resources.grd.orig 2017-09-07 19:07:10.298267000 +0200
-+++ chrome/app/theme/chrome_unscaled_resources.grd 2017-09-07 19:07:26.024168000 +0200
-@@ -80,7 +80,7 @@
- <include name="IDR_PROFILE_AVATAR_2X_25" file="default_200_percent/common/profile_avatar_sun_cloud.png" type="BINDATA" />
- <include name="IDR_PROFILE_AVATAR_2X_26" file="default_200_percent/common/profile_avatar_placeholder.png" type="BINDATA" />
- </if>
-- <if expr="is_linux and enable_app_list">
-+ <if expr="is_posix and enable_app_list">
- <!-- App Launcher icons for desktop icon. -->
- <if expr="_google_chrome">
- <then>
Property changes on: branches/2019Q2/www/chromium/files/patch-chrome_app_theme_chrome_unscaled_resources.grd
___________________________________________________________________
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/2019Q2/www/chromium/files/patch-third_party_crashpad_crashpad_util_posix_symbolic_constants_posix.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-third_party_crashpad_crashpad_util_posix_symbolic_constants_posix.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-third_party_crashpad_crashpad_util_posix_symbolic_constants_posix.cc (nonexistent)
@@ -1,20 +0,0 @@
---- third_party/crashpad/crashpad/util/posix/symbolic_constants_posix.cc.orig 2018-12-03 21:17:55.000000000 +0100
-+++ third_party/crashpad/crashpad/util/posix/symbolic_constants_posix.cc 2018-12-15 18:47:11.409455000 +0100
-@@ -64,7 +64,7 @@
- "INFO",
- "USR1",
- "USR2",
--#elif defined(OS_LINUX) || defined(OS_ANDROID)
-+#elif defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD)
- #if defined(ARCH_CPU_MIPS_FAMILY)
- "HUP",
- "INT",
-@@ -135,7 +135,7 @@
- #endif // defined(ARCH_CPU_MIPS_FAMILY)
- #endif
- };
--#if defined(OS_LINUX) || defined(OS_ANDROID)
-+#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD)
- // NSIG is 64 to account for real-time signals.
- static_assert(arraysize(kSignalNames) == 32, "kSignalNames length");
- #else
Property changes on: branches/2019Q2/www/chromium/files/patch-third_party_crashpad_crashpad_util_posix_symbolic_constants_posix.cc
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: branches/2019Q2/www/chromium/files/patch-services_service__manager_public_cpp_standalone__service_standalone__service.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-services_service__manager_public_cpp_standalone__service_standalone__service.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-services_service__manager_public_cpp_standalone__service_standalone__service.cc (nonexistent)
@@ -1,11 +0,0 @@
---- services/service_manager/public/cpp/standalone_service/standalone_service.cc.orig 2018-02-24 16:25:18.000000000 +0100
-+++ services/service_manager/public/cpp/standalone_service/standalone_service.cc 2018-03-04 03:53:12.449254000 +0100
-@@ -59,6 +59,8 @@
- command_line.GetSwitchValueASCII(switches::kServiceSandboxType)),
- SandboxLinux::PreSandboxHook(), sandbox_options);
- }
-+#elif defined(OS_BSD)
-+ NOTIMPLEMENTED();
- #endif
-
- mojo::edk::Init();
Property changes on: branches/2019Q2/www/chromium/files/patch-services_service__manager_public_cpp_standalone__service_standalone__service.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/2019Q2/www/chromium/files/patch-base_debug_thread__heap__usage__tracker.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-base_debug_thread__heap__usage__tracker.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-base_debug_thread__heap__usage__tracker.cc (nonexistent)
@@ -1,15 +0,0 @@
---- base/debug/thread_heap_usage_tracker.cc.orig 2017-06-05 19:03:00 UTC
-+++ base/debug/thread_heap_usage_tracker.cc
-@@ -16,10 +16,12 @@
- #include "base/threading/thread_local_storage.h"
- #include "build/build_config.h"
-
-+#if !defined(OS_BSD)
- #if defined(OS_MACOSX) || defined(OS_IOS)
- #include <malloc/malloc.h>
- #else
- #include <malloc.h>
-+#endif
- #endif
-
- namespace base {
Property changes on: branches/2019Q2/www/chromium/files/patch-base_debug_thread__heap__usage__tracker.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/2019Q2/www/chromium/files/patch-ui_views_window_frame_background.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-ui_views_window_frame_background.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-ui_views_window_frame_background.cc (nonexistent)
@@ -1,11 +0,0 @@
---- ui/views/window/frame_background.cc.orig 2018-12-03 21:18:07.000000000 +0100
-+++ ui/views/window/frame_background.cc 2018-12-15 21:23:38.516468000 +0100
-@@ -122,7 +122,7 @@
- const View* view) const {
- // Fill the top with the frame color first so we have a constant background
- // for areas not covered by the theme image.
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
- auto* native_theme = view->GetNativeTheme();
- ui::NativeTheme::ExtraParams params;
- params.frame_top_area.use_custom_frame = use_custom_frame_;
Property changes on: branches/2019Q2/www/chromium/files/patch-ui_views_window_frame_background.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/2019Q2/www/chromium/files/patch-gpu_ipc_common_gpu_memory_buffer_support.h
===================================================================
--- branches/2019Q2/www/chromium/files/patch-gpu_ipc_common_gpu_memory_buffer_support.h (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-gpu_ipc_common_gpu_memory_buffer_support.h (nonexistent)
@@ -1,29 +0,0 @@
---- gpu/ipc/common/gpu_memory_buffer_support.h.orig 2019-01-30 02:18:02.000000000 +0100
-+++ gpu/ipc/common/gpu_memory_buffer_support.h 2019-02-01 09:40:47.746184000 +0100
-@@ -16,7 +16,7 @@
- #include "ui/gfx/geometry/size.h"
- #include "ui/gfx/gpu_memory_buffer.h"
-
--#if defined(OS_LINUX) || defined(USE_OZONE)
-+#if defined(OS_LINUX) || defined(OS_BSD) || defined(USE_OZONE)
- namespace gfx {
- class ClientNativePixmapFactory;
- }
-@@ -38,7 +38,7 @@
- bool IsNativeGpuMemoryBufferConfigurationSupported(gfx::BufferFormat format,
- gfx::BufferUsage usage);
-
--#if defined(OS_LINUX) || defined(USE_OZONE)
-+#if defined(OS_LINUX) || defined(OS_BSD) || defined(USE_OZONE)
- gfx::ClientNativePixmapFactory* client_native_pixmap_factory() {
- return client_native_pixmap_factory_.get();
- }
-@@ -61,7 +61,7 @@
- const GpuMemoryBufferImpl::DestructionCallback& callback);
-
- private:
--#if defined(OS_LINUX) || defined(USE_OZONE)
-+#if defined(OS_LINUX) || defined(OS_BSD) || defined(USE_OZONE)
- std::unique_ptr<gfx::ClientNativePixmapFactory> client_native_pixmap_factory_;
- #endif
-
Property changes on: branches/2019Q2/www/chromium/files/patch-gpu_ipc_common_gpu_memory_buffer_support.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/2019Q2/www/chromium/files/patch-content_browser_webui_web_ui_data_source_impl.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-content_browser_webui_web_ui_data_source_impl.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-content_browser_webui_web_ui_data_source_impl.cc (nonexistent)
@@ -1,69 +0,0 @@
---- content/browser/webui/web_ui_data_source_impl.cc.orig 2019-01-09 19:45:36.420732000 +0100
-+++ content/browser/webui/web_ui_data_source_impl.cc 2019-01-09 19:53:12.218574000 +0100
-@@ -123,24 +123,24 @@
- WebUIDataSourceImpl::~WebUIDataSourceImpl() {
- }
-
--void WebUIDataSourceImpl::AddString(base::StringPiece name,
-+void WebUIDataSourceImpl::AddString(const std::string& name,
- const base::string16& value) {
- // TODO(dschuyler): Share only one copy of these strings.
- localized_strings_.SetKey(name, base::Value(value));
-- replacements_[name.as_string()] = base::UTF16ToUTF8(value);
-+ replacements_[name] = base::UTF16ToUTF8(value);
- }
-
--void WebUIDataSourceImpl::AddString(base::StringPiece name,
-+void WebUIDataSourceImpl::AddString(const std::string& name,
- const std::string& value) {
- localized_strings_.SetKey(name, base::Value(value));
-- replacements_[name.as_string()] = value;
-+ replacements_[name] = value;
- }
-
--void WebUIDataSourceImpl::AddLocalizedString(base::StringPiece name, int ids) {
-+void WebUIDataSourceImpl::AddLocalizedString(const std::string& name, int ids) {
- std::string utf8_str =
- base::UTF16ToUTF8(GetContentClient()->GetLocalizedString(ids));
- localized_strings_.SetKey(name, base::Value(utf8_str));
-- replacements_[name.as_string()] = utf8_str;
-+ replacements_[name] = utf8_str;
- }
-
- void WebUIDataSourceImpl::AddLocalizedStrings(
-@@ -150,7 +150,7 @@
- &replacements_);
- }
-
--void WebUIDataSourceImpl::AddBoolean(base::StringPiece name, bool value) {
-+void WebUIDataSourceImpl::AddBoolean(const std::string& name, bool value) {
- localized_strings_.SetBoolean(name, value);
- // TODO(dschuyler): Change name of |localized_strings_| to |load_time_data_|
- // or similar. These values haven't been found as strings for
-@@ -159,21 +159,21 @@
- // replacements.
- }
-
--void WebUIDataSourceImpl::AddInteger(base::StringPiece name, int32_t value) {
-+void WebUIDataSourceImpl::AddInteger(const std::string& name, int32_t value) {
- localized_strings_.SetInteger(name, value);
- }
-
--void WebUIDataSourceImpl::SetJsonPath(base::StringPiece path) {
-+void WebUIDataSourceImpl::SetJsonPath(const std::string& path) {
- DCHECK(json_path_.empty());
- DCHECK(!path.empty());
-
-- json_path_ = path.as_string();
-+ json_path_ = path;
- excluded_paths_.insert(json_path_);
- }
-
--void WebUIDataSourceImpl::AddResourcePath(base::StringPiece path,
-+void WebUIDataSourceImpl::AddResourcePath(const std::string& path,
- int resource_id) {
-- path_to_idr_map_[path.as_string()] = resource_id;
-+ path_to_idr_map_[path] = resource_id;
- }
-
- void WebUIDataSourceImpl::SetDefaultResource(int resource_id) {
Property changes on: branches/2019Q2/www/chromium/files/patch-content_browser_webui_web_ui_data_source_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/2019Q2/www/chromium/files/patch-media_capture_video_shared_memory_handler_provider.h
===================================================================
--- branches/2019Q2/www/chromium/files/patch-media_capture_video_shared_memory_handler_provider.h (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-media_capture_video_shared_memory_handler_provider.h (nonexistent)
@@ -1,11 +0,0 @@
---- media/capture/video/shared_memory_handle_provider.h.orig 2019-01-12 22:31:28.927630000 +0100
-+++ media/capture/video/shared_memory_handle_provider.h 2019-01-12 22:32:13.374251000 +0100
-@@ -38,7 +38,7 @@
-
- // This requires platforms where base::SharedMemoryHandle is backed by a
- // file descriptor.
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
- bool InitAsReadOnlyFromRawFileDescriptor(mojo::ScopedHandle fd_handle,
- uint32_t memory_size_in_bytes);
- #endif // defined(OS_LINUX)
Property changes on: branches/2019Q2/www/chromium/files/patch-media_capture_video_shared_memory_handler_provider.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/2019Q2/www/chromium/files/patch-third_party_blink_renderer_core_editing_editing_behavior.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-third_party_blink_renderer_core_editing_editing_behavior.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-third_party_blink_renderer_core_editing_editing_behavior.cc (nonexistent)
@@ -1,11 +0,0 @@
---- third_party/blink/renderer/core/editing/editing_behavior.cc.orig 2018-07-19 16:36:31.131399000 +0200
-+++ third_party/blink/renderer/core/editing/editing_behavior.cc 2018-07-19 16:36:56.793922000 +0200
-@@ -270,7 +270,7 @@
- // unexpected behaviour
- if (ch < ' ')
- return false;
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
- // According to XKB map no keyboard combinations with ctrl key are mapped to
- // printable characters, however we need the filter as the DomKey/text could
- // contain printable characters.
Property changes on: branches/2019Q2/www/chromium/files/patch-third_party_blink_renderer_core_editing_editing_behavior.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/2019Q2/www/chromium/files/patch-chrome_browser_password__manager_password_store_factory.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-chrome_browser_password__manager_password_store_factory.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-chrome_browser_password__manager_password_store_factory.cc (nonexistent)
@@ -1,11 +0,0 @@
---- chrome/browser/password_manager/password_store_factory.cc.orig 2019-01-09 12:33:02.101317000 +0100
-+++ chrome/browser/password_manager/password_store_factory.cc 2019-01-09 12:33:45.948473000 +0100
-@@ -300,7 +300,7 @@
- password_manager_util::RemoveUselessCredentials(ps, profile->GetPrefs(), 60,
- network_context_getter);
-
--#if defined(OS_WIN) || defined(OS_MACOSX) || \
-+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_BSD) || \
- (defined(OS_LINUX) && !defined(OS_CHROMEOS))
- std::unique_ptr<password_manager::PasswordStoreSigninNotifier> notifier =
- std::make_unique<password_manager::PasswordStoreSigninNotifierImpl>(
Property changes on: branches/2019Q2/www/chromium/files/patch-chrome_browser_password__manager_password_store_factory.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/2019Q2/www/chromium/files/patch-third__party_webrtc_rtc_base_physicalsocketserver.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-third__party_webrtc_rtc_base_physicalsocketserver.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-third__party_webrtc_rtc_base_physicalsocketserver.cc (nonexistent)
@@ -1,56 +0,0 @@
---- third_party/webrtc/rtc_base/physicalsocketserver.cc.orig 2018-12-03 21:20:27.000000000 +0100
-+++ third_party/webrtc/rtc_base/physicalsocketserver.cc 2018-12-15 16:59:55.918713000 +0100
-@@ -66,7 +66,7 @@
-
- #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 @@
- 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 @@
- 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::Send(const void* pv, size_t cb) {
- int sent = DoSend(
- s_, reinterpret_cast<const char*>(pv), static_cast<int>(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 @@
- size_t len = addr.ToSockAddrStorage(&saddr);
- int sent =
- DoSendTo(s_, static_cast<const char*>(buffer), static_cast<int>(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 @@
- *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)
Property changes on: branches/2019Q2/www/chromium/files/patch-third__party_webrtc_rtc_base_physicalsocketserver.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/2019Q2/www/chromium/files/patch-content_common_user_agent.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-content_common_user_agent.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-content_common_user_agent.cc (nonexistent)
@@ -1,17 +0,0 @@
---- content/common/user_agent.cc.orig 2017-12-23 22:30:16.333353000 +0100
-+++ content/common/user_agent.cc 2017-12-23 22:32:27.429827000 +0100
-@@ -131,6 +131,14 @@
- #endif
- ); // NOLINT
-
-+#if defined(OS_BSD)
-+#if defined(__x86_64__)
-+ base::StringAppendF(&os_cpu, "; Linux x86_64");
-+#else
-+ base::StringAppendF(&os_cpu, "; Linux i686");
-+#endif
-+#endif
-+
- return os_cpu;
- }
-
Property changes on: branches/2019Q2/www/chromium/files/patch-content_common_user_agent.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/2019Q2/www/chromium/files/patch-third_party_protobuf_src_google_protobuf_stubs_platform_macros.h
===================================================================
--- branches/2019Q2/www/chromium/files/patch-third_party_protobuf_src_google_protobuf_stubs_platform_macros.h (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-third_party_protobuf_src_google_protobuf_stubs_platform_macros.h (nonexistent)
@@ -1,11 +0,0 @@
---- third_party/protobuf/src/google/protobuf/stubs/platform_macros.h.orig 2019-01-10 00:35:34.145545000 +0100
-+++ third_party/protobuf/src/google/protobuf/stubs/platform_macros.h 2019-01-10 00:35:53.135144000 +0100
-@@ -117,7 +117,7 @@
-
- #undef GOOGLE_PROTOBUF_PLATFORM_ERROR
-
--#if defined(GOOGLE_PROTOBUF_OS_ANDROID) || defined(GOOGLE_PROTOBUF_OS_IPHONE) || defined(__OpenBSD__)
-+#if defined(GOOGLE_PROTOBUF_OS_ANDROID) || defined(GOOGLE_PROTOBUF_OS_IPHONE) || defined(__FreeBSD__)
- // Android ndk does not support the __thread keyword very well yet. Here
- // we use pthread_key_create()/pthread_getspecific()/... methods for
- // TLS support on android.
Property changes on: branches/2019Q2/www/chromium/files/patch-third_party_protobuf_src_google_protobuf_stubs_platform_macros.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/2019Q2/www/chromium/files/patch-third_party_blink_renderer_platform_fonts_skia_font_cache_skia.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-third_party_blink_renderer_platform_fonts_skia_font_cache_skia.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-third_party_blink_renderer_platform_fonts_skia_font_cache_skia.cc (nonexistent)
@@ -1,38 +0,0 @@
---- third_party/blink/renderer/platform/fonts/skia/font_cache_skia.cc.orig 2019-01-30 02:18:16.000000000 +0100
-+++ third_party/blink/renderer/platform/fonts/skia/font_cache_skia.cc 2019-02-02 11:10:08.595129000 +0100
-@@ -57,7 +57,7 @@
-
- namespace blink {
-
--#if defined(OS_ANDROID) || defined(OS_LINUX)
-+#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD)
- namespace {
-
- static sk_sp<SkTypeface> CreateTypefaceFromUniqueName(
-@@ -80,7 +80,7 @@
- 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:
-@@ -269,7 +269,7 @@
- }
- #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
-@@ -296,7 +296,7 @@
- CString name;
-
- sk_sp<SkTypeface> 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);
Property changes on: branches/2019Q2/www/chromium/files/patch-third_party_blink_renderer_platform_fonts_skia_font_cache_skia.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/2019Q2/www/chromium/files/patch-ui_gfx_native_pixmap_handle.h
===================================================================
--- branches/2019Q2/www/chromium/files/patch-ui_gfx_native_pixmap_handle.h (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-ui_gfx_native_pixmap_handle.h (nonexistent)
@@ -1,28 +0,0 @@
---- ui/gfx/native_pixmap_handle.h.orig 2017-08-02 17:17:40.381296000 +0200
-+++ ui/gfx/native_pixmap_handle.h 2017-08-02 17:18:15.306967000 +0200
-@@ -13,7 +13,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/file_descriptor_posix.h"
- #endif
-
-@@ -46,14 +46,14 @@
-
- ~NativePixmapHandle();
-
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
- // File descriptors for the underlying memory objects (usually dmabufs).
- std::vector<base::FileDescriptor> fds;
- #endif
- std::vector<NativePixmapPlane> planes;
- };
-
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
- // Returns an instance of |handle| which can be sent over IPC. This duplicates
- // the file-handles, so that the IPC code take ownership of them, without
- // invalidating |handle|.
Property changes on: branches/2019Q2/www/chromium/files/patch-ui_gfx_native_pixmap_handle.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/2019Q2/www/chromium/files/patch-chrome_browser_ui_views_frame_browser_non_client_frame_view_factory_views.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-chrome_browser_ui_views_frame_browser_non_client_frame_view_factory_views.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-chrome_browser_ui_views_frame_browser_non_client_frame_view_factory_views.cc (nonexistent)
@@ -1,11 +0,0 @@
---- chrome/browser/ui/views/frame/browser_non_client_frame_view_factory_views.cc.orig 2018-03-03 21:07:27.595112000 +0100
-+++ chrome/browser/ui/views/frame/browser_non_client_frame_view_factory_views.cc 2018-03-03 21:07:57.689186000 +0100
-@@ -18,7 +18,7 @@
- #include "chrome/browser/ui/views/frame/glass_browser_frame_view.h"
- #endif
-
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
- #include "ui/views/linux_ui/linux_ui.h"
- #endif
-
Property changes on: branches/2019Q2/www/chromium/files/patch-chrome_browser_ui_views_frame_browser_non_client_frame_view_factory_views.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/2019Q2/www/chromium/files/patch-third_party_blink_renderer_platform_wtf_assertions.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-third_party_blink_renderer_platform_wtf_assertions.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-third_party_blink_renderer_platform_wtf_assertions.cc (nonexistent)
@@ -1,11 +0,0 @@
---- third_party/blink/renderer/platform/wtf/assertions.cc.orig 2018-07-19 20:11:56.254657000 +0200
-+++ third_party/blink/renderer/platform/wtf/assertions.cc 2018-07-19 20:13:24.142405000 +0200
-@@ -48,7 +48,7 @@
- #include <windows.h>
- #endif
-
--#if defined(OS_MACOSX) || (defined(OS_LINUX) && !defined(__UCLIBC__))
-+#if defined(OS_MACOSX) || ((defined(OS_LINUX) || defined(OS_BSD)) && !defined(__UCLIBC__))
- #include <cxxabi.h>
- #include <dlfcn.h>
- #include <execinfo.h>
Property changes on: branches/2019Q2/www/chromium/files/patch-third_party_blink_renderer_platform_wtf_assertions.cc
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: branches/2019Q2/www/chromium/files/patch-third__party_pdfium_core_fxge_fx_ge_linux.cpp
===================================================================
--- branches/2019Q2/www/chromium/files/patch-third__party_pdfium_core_fxge_fx_ge_linux.cpp (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-third__party_pdfium_core_fxge_fx_ge_linux.cpp (nonexistent)
@@ -1,14 +0,0 @@
---- third_party/pdfium/core/fxge/fx_ge_linux.cpp.orig 2017-09-10 01:29:26.531645000 +0200
-+++ third_party/pdfium/core/fxge/fx_ge_linux.cpp 2017-09-10 01:35:18.727698000 +0200
-@@ -149,9 +149,8 @@
- const char** pUserPaths) {
- auto pInfo = pdfium::MakeUnique<CFX_LinuxFontInfo>();
- if (!pInfo->ParseFontCfg(pUserPaths)) {
-- pInfo->AddPath("/usr/share/fonts");
-- pInfo->AddPath("/usr/share/X11/fonts/Type1");
-- pInfo->AddPath("/usr/share/X11/fonts/TTF");
-+ pInfo->AddPath("/usr/local/share/fonts/Type1");
-+ pInfo->AddPath("/usr/local/share/fonts/TTF");
- pInfo->AddPath("/usr/local/share/fonts");
- }
- return std::move(pInfo);
Property changes on: branches/2019Q2/www/chromium/files/patch-third__party_pdfium_core_fxge_fx_ge_linux.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/2019Q2/www/chromium/files/patch-third__party_googletest_src_googletest_test_googletest-port__test.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-third__party_googletest_src_googletest_test_googletest-port__test.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-third__party_googletest_src_googletest_test_googletest-port__test.cc (nonexistent)
@@ -1,11 +0,0 @@
---- third_party/googletest/src/googletest/test/googletest-port-test.cc.orig 2018-12-15 18:52:24.209622000 +0100
-+++ third_party/googletest/src/googletest/test/googletest-port-test.cc 2018-12-15 18:53:04.599624000 +0100
-@@ -293,7 +293,7 @@
- EXPECT_EQ("unknown file", FormatCompilerIndependentFileLocation(NULL, -1));
- }
-
--#if GTEST_OS_LINUX || GTEST_OS_MAC || GTEST_OS_QNX || GTEST_OS_FUCHSIA
-+#if GTEST_OS_LINUX || GTEST_OS_MAC || GTEST_OS_QNX || GTEST_OS_FUCHSIA || GTEST_OS_FREEBSD
- void* ThreadFunc(void* data) {
- internal::Mutex* mutex = static_cast<internal::Mutex*>(data);
- mutex->Lock();
Property changes on: branches/2019Q2/www/chromium/files/patch-third__party_googletest_src_googletest_test_googletest-port__test.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/2019Q2/www/chromium/files/patch-ui_native_theme_native_theme.h
===================================================================
--- branches/2019Q2/www/chromium/files/patch-ui_native_theme_native_theme.h (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-ui_native_theme_native_theme.h (nonexistent)
@@ -1,11 +0,0 @@
---- ui/native_theme/native_theme.h.orig 2017-09-07 02:03:42.878086000 +0200
-+++ ui/native_theme/native_theme.h 2017-09-07 02:04:02.716811000 +0200
-@@ -47,7 +47,7 @@
- // The part to be painted / sized.
- enum Part {
- kCheckbox,
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
- kFrameTopArea,
- #endif
- kInnerSpinButton,
Property changes on: branches/2019Q2/www/chromium/files/patch-ui_native_theme_native_theme.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/2019Q2/www/chromium/files/patch-net_proxy_resolution_proxy_config_service_linux.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-net_proxy_resolution_proxy_config_service_linux.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-net_proxy_resolution_proxy_config_service_linux.cc (nonexistent)
@@ -1,39 +0,0 @@
---- net/proxy_resolution/proxy_config_service_linux.cc.orig 2018-07-19 15:35:02.171066000 +0200
-+++ net/proxy_resolution/proxy_config_service_linux.cc 2018-07-19 15:37:12.958237000 +0200
-@@ -6,7 +6,9 @@
-
- #include <errno.h>
- #include <limits.h>
-+#if !defined(OS_BSD)
- #include <sys/inotify.h>
-+#endif
- #include <unistd.h>
-
- #include <map>
-@@ -495,6 +497,7 @@
- return default_value;
- }
-
-+#if !defined(OS_BSD)
- // This is the KDE version that reads kioslaverc and simulates gsettings.
- // Doing this allows the main Delegate code, as well as the unit tests
- // for it, to stay the same - and the settings map fairly well besides.
-@@ -984,6 +987,7 @@
-
- DISALLOW_COPY_AND_ASSIGN(SettingGetterImplKDE);
- };
-+#endif
-
- } // namespace
-
-@@ -1199,8 +1203,10 @@
- case base::nix::DESKTOP_ENVIRONMENT_KDE3:
- case base::nix::DESKTOP_ENVIRONMENT_KDE4:
- case base::nix::DESKTOP_ENVIRONMENT_KDE5:
-+#if !defined(OS_BSD)
- setting_getter_.reset(new SettingGetterImplKDE(env_var_getter_.get()));
- break;
-+#endif
- case base::nix::DESKTOP_ENVIRONMENT_XFCE:
- case base::nix::DESKTOP_ENVIRONMENT_OTHER:
- break;
Property changes on: branches/2019Q2/www/chromium/files/patch-net_proxy_resolution_proxy_config_service_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/2019Q2/www/chromium/files/patch-third_party_crashpad_crashpad_util_posix_close_multiple.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-third_party_crashpad_crashpad_util_posix_close_multiple.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-third_party_crashpad_crashpad_util_posix_close_multiple.cc (nonexistent)
@@ -1,11 +0,0 @@
---- third_party/crashpad/crashpad/util/posix/close_multiple.cc.orig 2018-07-19 19:49:00.959630000 +0200
-+++ third_party/crashpad/crashpad/util/posix/close_multiple.cc 2018-07-19 19:49:23.277639000 +0200
-@@ -71,7 +71,7 @@
- // This is an advantage over looping over all possible file descriptors, because
- // no attempt needs to be made to close file descriptors that are not open.
- bool CloseMultipleNowOrOnExecUsingFDDir(int min_fd, int preserve_fd) {
--#if defined(OS_MACOSX)
-+#if defined(OS_MACOSX) || defined(OS_BSD)
- static constexpr char kFDDir[] = "/dev/fd";
- #elif defined(OS_LINUX) || defined(OS_ANDROID)
- static constexpr char kFDDir[] = "/proc/self/fd";
Property changes on: branches/2019Q2/www/chromium/files/patch-third_party_crashpad_crashpad_util_posix_close_multiple.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/2019Q2/www/chromium/files/patch-third_party_googletest_src_googletest_include_gtest_internal_gtest-port.h
===================================================================
--- branches/2019Q2/www/chromium/files/patch-third_party_googletest_src_googletest_include_gtest_internal_gtest-port.h (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-third_party_googletest_src_googletest_include_gtest_internal_gtest-port.h (nonexistent)
@@ -1,11 +0,0 @@
---- third_party/googletest/src/googletest/include/gtest/internal/gtest-port.h.orig 2018-08-23 02:51:47.688298000 +0200
-+++ third_party/googletest/src/googletest/include/gtest/internal/gtest-port.h 2018-08-23 02:53:09.975152000 +0200
-@@ -841,7 +841,7 @@
- (GTEST_OS_WINDOWS || GTEST_OS_CYGWIN || GTEST_OS_SYMBIAN || GTEST_OS_AIX)
-
- // Determines whether test results can be streamed to a socket.
--#if GTEST_OS_LINUX
-+#if GTEST_OS_LINUX || GTEST_OS_FREEBSD
- # define GTEST_CAN_STREAM_RESULTS_ 1
- #endif
-
Property changes on: branches/2019Q2/www/chromium/files/patch-third_party_googletest_src_googletest_include_gtest_internal_gtest-port.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/2019Q2/www/chromium/files/patch-third__party_skia_src_opts_SkRasterPipeline_opts.h
===================================================================
--- branches/2019Q2/www/chromium/files/patch-third__party_skia_src_opts_SkRasterPipeline_opts.h (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-third__party_skia_src_opts_SkRasterPipeline_opts.h (nonexistent)
@@ -1,20 +0,0 @@
---- third_party/skia/src/opts/SkRasterPipeline_opts.h.orig 2018-12-03 21:20:28.000000000 +0100
-+++ third_party/skia/src/opts/SkRasterPipeline_opts.h 2018-12-15 16:12:21.651812000 +0100
-@@ -658,7 +658,7 @@
- }
-
- SI F from_half(U16 h) {
--#if defined(SK_CPU_ARM64) && !defined(SK_BUILD_FOR_GOOGLE3) // Temporary workaround for some Google3 builds.
-+#if defined(JUMPER_IS_NEON) && defined(SK_CPU_ARM64) && !defined(SK_BUILD_FOR_GOOGLE3) // Temporary workaround for some Google3 builds.
- return vcvt_f32_f16(h);
-
- #elif defined(JUMPER_IS_HSW) || defined(JUMPER_IS_AVX512)
-@@ -678,7 +678,7 @@
- }
-
- SI U16 to_half(F f) {
--#if defined(SK_CPU_ARM64) && !defined(SK_BUILD_FOR_GOOGLE3) // Temporary workaround for some Google3 builds.
-+#if defined(JUMPER_IS_NEON) && defined(SK_CPU_ARM64) && !defined(SK_BUILD_FOR_GOOGLE3) // Temporary workaround for some Google3 builds.
- return vcvt_f16_f32(f);
-
- #elif defined(JUMPER_IS_HSW) || defined(JUMPER_IS_AVX512)
Property changes on: branches/2019Q2/www/chromium/files/patch-third__party_skia_src_opts_SkRasterPipeline_opts.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/2019Q2/www/chromium/files/patch-third__party_angle_src_libANGLE_renderer_gl_renderergl_utils.cpp
===================================================================
--- branches/2019Q2/www/chromium/files/patch-third__party_angle_src_libANGLE_renderer_gl_renderergl_utils.cpp (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-third__party_angle_src_libANGLE_renderer_gl_renderergl_utils.cpp (nonexistent)
@@ -1,11 +0,0 @@
---- third_party/angle/src/libANGLE/renderer/gl/renderergl_utils.cpp.orig 2017-08-02 15:06:28.319994000 +0200
-+++ third_party/angle/src/libANGLE/renderer/gl/renderergl_utils.cpp 2017-08-02 15:06:50.485321000 +0200
-@@ -952,7 +952,7 @@
- workarounds->doesSRGBClearsOnLinearFramebufferAttachments =
- functions->standard == STANDARD_GL_DESKTOP && (IsIntel(vendor) || IsAMD(vendor));
-
--#if defined(ANGLE_PLATFORM_LINUX)
-+#if defined(ANGLE_PLATFORM_POSIX)
- workarounds->emulateMaxVertexAttribStride =
- functions->standard == STANDARD_GL_DESKTOP && IsAMD(vendor);
- workarounds->useUnusedBlocksWithStandardOrSharedLayout = IsAMD(vendor);
Property changes on: branches/2019Q2/www/chromium/files/patch-third__party_angle_src_libANGLE_renderer_gl_renderergl_utils.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/2019Q2/www/chromium/files/patch-base_process_kill_posix.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-base_process_kill_posix.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-base_process_kill_posix.cc (nonexistent)
@@ -1,11 +0,0 @@
---- base/process/kill_posix.cc.orig 2018-07-19 22:11:49.327358000 +0200
-+++ base/process/kill_posix.cc 2018-07-19 22:12:22.837132000 +0200
-@@ -167,7 +167,7 @@
- 0, new BackgroundReaper(std::move(process), TimeDelta::FromSeconds(2)));
- }
-
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
- void EnsureProcessGetsReaped(Process process) {
- DCHECK(!process.is_current());
-
Property changes on: branches/2019Q2/www/chromium/files/patch-base_process_kill_posix.cc
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: branches/2019Q2/www/chromium/files/patch-chromecast_browser_cast__browser_main_parts.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-chromecast_browser_cast__browser_main_parts.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-chromecast_browser_cast__browser_main_parts.cc (nonexistent)
@@ -1,29 +0,0 @@
---- chromecast/browser/cast_browser_main_parts.cc.orig 2019-01-10 01:22:24.493908000 +0100
-+++ chromecast/browser/cast_browser_main_parts.cc 2019-01-10 01:23:14.020775000 +0100
-@@ -73,7 +73,7 @@
- #include "ui/compositor/compositor_switches.h"
- #include "ui/gl/gl_switches.h"
-
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
- #include <fontconfig/fontconfig.h>
- #include <signal.h>
- #include <sys/prctl.h>
-@@ -246,7 +246,7 @@
- {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.
-@@ -393,7 +393,7 @@
- }
-
- 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
Property changes on: branches/2019Q2/www/chromium/files/patch-chromecast_browser_cast__browser_main_parts.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/2019Q2/www/chromium/files/patch-media_audio_alsa_audio_manager_alsa.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-media_audio_alsa_audio_manager_alsa.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-media_audio_alsa_audio_manager_alsa.cc (nonexistent)
@@ -1,54 +0,0 @@
---- media/audio/alsa/audio_manager_alsa.cc.orig 2017-12-15 02:04:21.000000000 +0100
-+++ media/audio/alsa/audio_manager_alsa.cc 2017-12-24 16:52:36.819099000 +0100
-@@ -93,7 +93,9 @@
- int card = -1;
-
- // Loop through the sound cards to get ALSA device hints.
-+#ifdef OS_LINUX
- while (!wrapper_->CardNext(&card) && card >= 0) {
-+#endif
- void** hints = NULL;
- int error = wrapper_->DeviceNameHint(card, kPcmInterfaceName, &hints);
- if (!error) {
-@@ -105,7 +107,9 @@
- DLOG(WARNING) << "GetAlsaAudioDevices: unable to get device hints: "
- << wrapper_->StrError(error);
- }
-+#ifdef OS_LINUX
- }
-+#endif
- }
-
- void AudioManagerAlsa::GetAlsaDevicesInfo(AudioManagerAlsa::StreamType type,
-@@ -188,7 +192,11 @@
- // goes through software conversion if needed (e.g. incompatible
- // sample rate).
- // TODO(joi): Should we prefer "hw" instead?
-+#ifdef OS_LINUX
- static const char kDeviceTypeDesired[] = "plughw";
-+#else
-+ static const char kDeviceTypeDesired[] = "plug";
-+#endif
- return strncmp(kDeviceTypeDesired, device_name,
- arraysize(kDeviceTypeDesired) - 1) == 0;
- }
-@@ -210,7 +218,9 @@
- // Loop through the sound cards.
- // Don't use snd_device_name_hint(-1,..) since there is a access violation
- // inside this ALSA API with libasound.so.2.0.0.
-+#ifdef OS_LINUX
- while (!wrapper_->CardNext(&card) && (card >= 0) && !has_device) {
-+#endif
- int error = wrapper_->DeviceNameHint(card, kPcmInterfaceName, &hints);
- if (!error) {
- for (void** hint_iter = hints; *hint_iter != NULL; hint_iter++) {
-@@ -234,7 +244,9 @@
- DLOG(WARNING) << "HasAnyAudioDevice: unable to get device hints: "
- << wrapper_->StrError(error);
- }
-+#ifdef OS_LINUX
- }
-+#endif
-
- return has_device;
- }
Property changes on: branches/2019Q2/www/chromium/files/patch-media_audio_alsa_audio_manager_alsa.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/2019Q2/www/chromium/files/patch-components_password__manager_core_browser_import_csv__reader.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-components_password__manager_core_browser_import_csv__reader.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-components_password__manager_core_browser_import_csv__reader.cc (nonexistent)
@@ -1,14 +0,0 @@
---- components/password_manager/core/browser/import/csv_reader.cc.orig 2017-04-19 19:06:32 UTC
-+++ components/password_manager/core/browser/import/csv_reader.cc
-@@ -9,7 +9,11 @@
- #include "base/logging.h"
- #include "base/macros.h"
- #include "base/strings/string_util.h"
-+#if defined(OS_BSD)
-+#include <re2/re2.h>
-+#else
- #include "third_party/re2/src/re2/re2.h"
-+#endif
-
- namespace {
-
Property changes on: branches/2019Q2/www/chromium/files/patch-components_password__manager_core_browser_import_csv__reader.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/2019Q2/www/chromium/files/patch-remoting_base_chromoting_event.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-remoting_base_chromoting_event.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-remoting_base_chromoting_event.cc (nonexistent)
@@ -1,11 +0,0 @@
---- remoting/base/chromoting_event.cc.orig 2017-08-10 16:16:33.217694000 +0200
-+++ remoting/base/chromoting_event.cc 2017-08-10 16:16:51.082041000 +0200
-@@ -103,7 +103,7 @@
- SetString(kCpuKey, base::SysInfo::OperatingSystemArchitecture());
- SetString(kOsVersionKey, base::SysInfo::OperatingSystemVersion());
- SetString(kWebAppVersionKey, STRINGIZE(VERSION));
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
- Os os = Os::CHROMOTING_LINUX;
- #elif defined(OS_CHROMEOS)
- Os os = Os::CHROMOTING_CHROMEOS;
Property changes on: branches/2019Q2/www/chromium/files/patch-remoting_base_chromoting_event.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/2019Q2/www/chromium/files/patch-media_video_gpu_memory_buffer_video_frame_pool.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-media_video_gpu_memory_buffer_video_frame_pool.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-media_video_gpu_memory_buffer_video_frame_pool.cc (nonexistent)
@@ -1,11 +0,0 @@
---- media/video/gpu_memory_buffer_video_frame_pool.cc.orig 2019-01-09 13:04:56.177184000 +0100
-+++ media/video/gpu_memory_buffer_video_frame_pool.cc 2019-01-09 13:05:16.072782000 +0100
-@@ -633,7 +633,7 @@
- }
-
- 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
-
Property changes on: branches/2019Q2/www/chromium/files/patch-media_video_gpu_memory_buffer_video_frame_pool.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/2019Q2/www/chromium/files/patch-remoting_host_evaluate_capability.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-remoting_host_evaluate_capability.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-remoting_host_evaluate_capability.cc (nonexistent)
@@ -1,11 +0,0 @@
---- remoting/host/evaluate_capability.cc.orig 2019-01-09 13:06:32.177219000 +0100
-+++ remoting/host/evaluate_capability.cc 2019-01-09 13:06:46.855681000 +0100
-@@ -50,7 +50,7 @@
- }
- #endif
-
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
- if (path.BaseName().value() ==
- FILE_PATH_LITERAL("chrome-remote-desktop-host")) {
- return path;
Property changes on: branches/2019Q2/www/chromium/files/patch-remoting_host_evaluate_capability.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/2019Q2/www/chromium/files/patch-services_service__manager_zygote_host_zygote_host_impl_linux.h
===================================================================
--- branches/2019Q2/www/chromium/files/patch-services_service__manager_zygote_host_zygote_host_impl_linux.h (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-services_service__manager_zygote_host_zygote_host_impl_linux.h (nonexistent)
@@ -1,13 +0,0 @@
---- services/service_manager/zygote/host/zygote_host_impl_linux.h.orig 2019-01-30 02:18:10.000000000 +0100
-+++ services/service_manager/zygote/host/zygote_host_impl_linux.h 2019-02-01 10:48:51.105096000 +0100
-@@ -44,8 +44,10 @@
- base::ScopedFD* control_fd,
- base::FileHandleMappingVector additional_remapped_fds);
-
-+#if !defined(OS_BSD)
- void AdjustRendererOOMScore(base::ProcessHandle process_handle,
- int score) override;
-+#endif
- bool HasZygote() { return !zygote_pids_.empty(); }
-
- private:
Property changes on: branches/2019Q2/www/chromium/files/patch-services_service__manager_zygote_host_zygote_host_impl_linux.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/2019Q2/www/chromium/files/patch-chrome_browser_web_applications_extensions_web_app_extension_shortcut.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-chrome_browser_web_applications_extensions_web_app_extension_shortcut.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-chrome_browser_web_applications_extensions_web_app_extension_shortcut.cc (nonexistent)
@@ -1,11 +0,0 @@
---- chrome/browser/web_applications/extensions/web_app_extension_shortcut.cc.orig 2018-12-04 19:15:58.107791000 +0100
-+++ chrome/browser/web_applications/extensions/web_app_extension_shortcut.cc 2018-12-04 19:16:47.545127000 +0100
-@@ -38,7 +38,7 @@
- #if defined(OS_MACOSX)
- const int kDesiredSizes[] = {16, 32, 128, 256, 512};
- const size_t kNumDesiredSizes = base::size(kDesiredSizes);
--#elif defined(OS_LINUX)
-+#elif defined(OS_LINUX) || defined(OS_BSD)
- // Linux supports icons of any size. FreeDesktop Icon Theme Specification states
- // that "Minimally you should install a 48x48 icon in the hicolor theme."
- const int kDesiredSizes[] = {16, 32, 48, 128, 256, 512};
Property changes on: branches/2019Q2/www/chromium/files/patch-chrome_browser_web_applications_extensions_web_app_extension_shortcut.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/2019Q2/www/chromium/files/patch-services_device_time__zone__monitor_time__zone__monitor_linux.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-services_device_time__zone__monitor_time__zone__monitor_linux.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-services_device_time__zone__monitor_time__zone__monitor_linux.cc (nonexistent)
@@ -1,14 +0,0 @@
---- services/device/time_zone_monitor/time_zone_monitor_linux.cc.orig 2019-01-10 00:39:59.319666000 +0100
-+++ services/device/time_zone_monitor/time_zone_monitor_linux.cc 2019-01-10 00:40:51.718178000 +0100
-@@ -99,7 +99,11 @@
- // false positives are harmless, assuming the false positive rate is
- // reasonable.
- const char* const kFilesToWatch[] = {
-+#if defined(OS_BSD)
-+ "/etc/localtime",
-+#else
- "/etc/localtime", "/etc/timezone", "/etc/TZ",
-+#endif
- };
-
- auto callback =
Property changes on: branches/2019Q2/www/chromium/files/patch-services_device_time__zone__monitor_time__zone__monitor_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/2019Q2/www/chromium/files/patch-chrome_common_webui_url_constants.h
===================================================================
--- branches/2019Q2/www/chromium/files/patch-chrome_common_webui_url_constants.h (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-chrome_common_webui_url_constants.h (nonexistent)
@@ -1,25 +0,0 @@
---- chrome/common/webui_url_constants.h.orig 2018-02-24 16:25:11.000000000 +0100
-+++ chrome/common/webui_url_constants.h 2018-03-03 22:40:56.113062000 +0100
-@@ -223,7 +223,7 @@
- extern const char kChromeUICastURL[];
- #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[];
- #endif
-@@ -232,11 +232,11 @@
- 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_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
-
Property changes on: branches/2019Q2/www/chromium/files/patch-chrome_common_webui_url_constants.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/2019Q2/www/chromium/files/patch-third_party_crashpad_crashpad_util_posix_drop_privileges.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-third_party_crashpad_crashpad_util_posix_drop_privileges.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-third_party_crashpad_crashpad_util_posix_drop_privileges.cc (nonexistent)
@@ -1,11 +0,0 @@
---- third_party/crashpad/crashpad/util/posix/drop_privileges.cc.orig 2018-07-19 19:50:51.829905000 +0200
-+++ third_party/crashpad/crashpad/util/posix/drop_privileges.cc 2018-07-19 19:51:04.660155000 +0200
-@@ -23,7 +23,7 @@
- gid_t gid = getgid();
- uid_t uid = getuid();
-
--#if defined(OS_MACOSX)
-+#if defined(OS_MACOSX) || defined(OS_BSD)
- // Based on the POSIX.1-2008 2013 edition documentation for setreuid() and
- // setregid(), setreuid() and setregid() alone should be sufficient to drop
- // privileges. The standard specifies that the saved ID should be set to the
Property changes on: branches/2019Q2/www/chromium/files/patch-third_party_crashpad_crashpad_util_posix_drop_privileges.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/2019Q2/www/chromium/files/patch-media_media_options.gni
===================================================================
--- branches/2019Q2/www/chromium/files/patch-media_media_options.gni (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-media_media_options.gni (nonexistent)
@@ -1,13 +0,0 @@
-$OpenBSD: patch-media_media_options_gni,v 1.3 2017/04/28 22:22:36 robert Exp $
---- media/media_options.gni.orig 2017-04-19 21:06:35.000000000 +0200
-+++ media/media_options.gni 2017-05-06 22:11:03.288488000 +0200
-@@ -73,6 +73,9 @@
- # 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 &&
Property changes on: branches/2019Q2/www/chromium/files/patch-media_media_options.gni
___________________________________________________________________
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/2019Q2/www/chromium/files/patch-third_party_crashpad_crashpad_client_BUILD.gn
===================================================================
--- branches/2019Q2/www/chromium/files/patch-third_party_crashpad_crashpad_client_BUILD.gn (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-third_party_crashpad_crashpad_client_BUILD.gn (nonexistent)
@@ -1,15 +0,0 @@
---- third_party/crashpad/crashpad/client/BUILD.gn.orig 2019-01-12 23:20:12.535371000 +0100
-+++ third_party/crashpad/crashpad/client/BUILD.gn 2019-01-12 23:21:47.786624000 +0100
-@@ -71,6 +71,12 @@
- sources += [ "crashpad_client_fuchsia.cc" ]
- }
-
-+ if (crashpad_is_posix) {
-+ sources += [
-+ "crashpad_client_posix.cc",
-+ ]
-+ }
-+
- if (crashpad_is_linux || crashpad_is_android || crashpad_is_fuchsia) {
- sources += [ "crash_report_database_generic.cc" ]
- }
Property changes on: branches/2019Q2/www/chromium/files/patch-third_party_crashpad_crashpad_client_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/2019Q2/www/chromium/files/patch-extensions_common_api__permission_features.json
===================================================================
--- branches/2019Q2/www/chromium/files/patch-extensions_common_api__permission_features.json (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-extensions_common_api__permission_features.json (nonexistent)
@@ -1,29 +0,0 @@
---- extensions/common/api/_permission_features.json.orig 2019-01-30 02:18:01.000000000 +0100
-+++ extensions/common/api/_permission_features.json 2019-02-06 23:58:00.090523000 +0100
-@@ -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
-@@ -475,7 +475,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
-@@ -506,7 +506,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.
Property changes on: branches/2019Q2/www/chromium/files/patch-extensions_common_api__permission_features.json
___________________________________________________________________
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/2019Q2/www/chromium/files/patch-third__party_webrtc_rtc_base_ipaddress.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-third__party_webrtc_rtc_base_ipaddress.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-third__party_webrtc_rtc_base_ipaddress.cc (nonexistent)
@@ -1,12 +0,0 @@
---- third_party/webrtc/rtc_base/ipaddress.cc.orig 2019-02-01 23:33:19.402949000 +0100
-+++ third_party/webrtc/rtc_base/ipaddress.cc 2019-02-01 23:42:10.940296000 +0100
-@@ -11,6 +11,9 @@
- #if defined(WEBRTC_POSIX)
- #include <netinet/in.h>
- #include <sys/socket.h>
-+#if defined(WEBRTC_BSD)
-+#include <sys/types.h>
-+#endif
- #ifdef OPENBSD
- #include <netinet/in_systm.h>
- #endif
Property changes on: branches/2019Q2/www/chromium/files/patch-third__party_webrtc_rtc_base_ipaddress.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/2019Q2/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc_event_log_uploader.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc_event_log_uploader.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc_event_log_uploader.cc (nonexistent)
@@ -1,11 +0,0 @@
---- chrome/browser/media/webrtc/webrtc_event_log_uploader.cc.orig 2018-07-19 22:14:21.658215000 +0200
-+++ chrome/browser/media/webrtc/webrtc_event_log_uploader.cc 2018-07-19 22:14:37.578585000 +0200
-@@ -51,7 +51,7 @@
- const char kProduct[] = "Chrome";
- #elif defined(OS_MACOSX)
- const char kProduct[] = "Chrome_Mac";
--#elif defined(OS_LINUX)
-+#elif defined(OS_LINUX) || defined(OS_BSD)
- const char kProduct[] = "Chrome_Linux";
- #elif defined(OS_ANDROID)
- const char kProduct[] = "Chrome_Android";
Property changes on: branches/2019Q2/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc_event_log_uploader.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/2019Q2/www/chromium/files/patch-content_browser_memory_swap_metrics_driver_impl_linux.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-content_browser_memory_swap_metrics_driver_impl_linux.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-content_browser_memory_swap_metrics_driver_impl_linux.cc (nonexistent)
@@ -1,16 +0,0 @@
---- content/browser/memory/swap_metrics_driver_impl_linux.cc.orig 2018-06-13 00:10:16.000000000 +0200
-+++ content/browser/memory/swap_metrics_driver_impl_linux.cc 2018-07-21 00:28:47.747286000 +0200
-@@ -44,9 +44,13 @@
- SwapMetricsDriver::SwapMetricsUpdateResult
- SwapMetricsDriverImplLinux::UpdateMetricsInternal(base::TimeDelta interval) {
- base::VmStatInfo vmstat;
-+#if !defined(OS_BSD)
- if (!base::GetVmStatInfo(&vmstat)) {
- return SwapMetricsDriver::SwapMetricsUpdateResult::kSwapMetricsUpdateFailed;
- }
-+#else
-+ return SwapMetricsDriver::SwapMetricsUpdateResult::kSwapMetricsUpdateFailed;
-+#endif
-
- uint64_t in_counts = vmstat.pswpin - last_pswpin_;
- uint64_t out_counts = vmstat.pswpout - last_pswpout_;
Property changes on: branches/2019Q2/www/chromium/files/patch-content_browser_memory_swap_metrics_driver_impl_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/2019Q2/www/chromium/files/patch-third_party_blink_renderer_platform_fonts_font_cache.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-third_party_blink_renderer_platform_fonts_font_cache.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-third_party_blink_renderer_platform_fonts_font_cache.cc (nonexistent)
@@ -1,20 +0,0 @@
---- third_party/blink/renderer/platform/fonts/font_cache.cc.orig 2019-01-30 02:18:16.000000000 +0100
-+++ third_party/blink/renderer/platform/fonts/font_cache.cc 2019-02-01 14:43:30.711803000 +0100
-@@ -65,7 +65,7 @@
-
- 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
-
-@@ -88,7 +88,7 @@
- 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
Property changes on: branches/2019Q2/www/chromium/files/patch-third_party_blink_renderer_platform_fonts_font_cache.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/2019Q2/www/chromium/files/patch-media_capture_video_mock_gpu_memory_buffer_manager.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-media_capture_video_mock_gpu_memory_buffer_manager.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-media_capture_video_mock_gpu_memory_buffer_manager.cc (nonexistent)
@@ -1,11 +0,0 @@
---- media/capture/video/mock_gpu_memory_buffer_manager.cc.orig 2019-01-09 13:03:04.440957000 +0100
-+++ media/capture/video/mock_gpu_memory_buffer_manager.cc 2019-01-09 13:03:18.319442000 +0100
-@@ -103,7 +103,7 @@
- gfx::GpuMemoryBufferHandle handle;
- handle.type = gfx::NATIVE_PIXMAP;
- handle.id = handle_.id;
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
- handle.native_pixmap_handle =
- gfx::CloneHandleForIPC(handle_.native_pixmap_handle);
- #endif
Property changes on: branches/2019Q2/www/chromium/files/patch-media_capture_video_mock_gpu_memory_buffer_manager.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/2019Q2/www/chromium/files/patch-third_party_blink_renderer_platform_wtf_container_annotations.h
===================================================================
--- branches/2019Q2/www/chromium/files/patch-third_party_blink_renderer_platform_wtf_container_annotations.h (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-third_party_blink_renderer_platform_wtf_container_annotations.h (nonexistent)
@@ -1,11 +0,0 @@
---- third_party/blink/renderer/platform/wtf/container_annotations.h.orig 2018-07-19 20:16:53.004477000 +0200
-+++ third_party/blink/renderer/platform/wtf/container_annotations.h 2018-07-19 20:17:16.730907000 +0200
-@@ -10,7 +10,7 @@
-
- // TODO(ochang): Remove the ARCH_CPU_X86_64 condition to enable this for X86
- // once the crashes there have been fixed: http://crbug.com/461406
--#if defined(ADDRESS_SANITIZER) && defined(OS_LINUX) && defined(ARCH_CPU_X86_64)
-+#if defined(ADDRESS_SANITIZER) && (defined(OS_LINUX) || defined(OS_BSD)) && defined(ARCH_CPU_X86_64)
- #define ANNOTATE_CONTIGUOUS_CONTAINER
- #define ANNOTATE_NEW_BUFFER(buffer, capacity, newSize) \
- if (buffer) { \
Property changes on: branches/2019Q2/www/chromium/files/patch-third_party_blink_renderer_platform_wtf_container_annotations.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/2019Q2/www/chromium/files/patch-components_network_session_configurator_browser_network_session_configurator.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-components_network_session_configurator_browser_network_session_configurator.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-components_network_session_configurator_browser_network_session_configurator.cc (nonexistent)
@@ -1,11 +0,0 @@
---- components/network_session_configurator/browser/network_session_configurator.cc.orig 2017-12-24 12:05:09.663658000 +0100
-+++ components/network_session_configurator/browser/network_session_configurator.cc 2017-12-24 12:05:50.949666000 +0100
-@@ -460,7 +460,7 @@
- }
- #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;
Property changes on: branches/2019Q2/www/chromium/files/patch-components_network_session_configurator_browser_network_session_configurator.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/2019Q2/www/chromium/files/patch-third__party_angle_src_gpu_info_util_SystemInfo_x11.cpp
===================================================================
--- branches/2019Q2/www/chromium/files/patch-third__party_angle_src_gpu_info_util_SystemInfo_x11.cpp (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-third__party_angle_src_gpu_info_util_SystemInfo_x11.cpp (nonexistent)
@@ -1,55 +0,0 @@
---- third_party/angle/src/gpu_info_util/SystemInfo_x11.cpp.orig 2018-08-08 12:13:09.000000000 -0700
-+++ third_party/angle/src/gpu_info_util/SystemInfo_x11.cpp 2018-08-20 09:34:48.052352000 -0700
-@@ -8,6 +8,8 @@
-
- #include "gpu_info_util/SystemInfo_internal.h"
-
-+#include <GL/glx.h>
-+#include <GL/glxext.h>
- #include <X11/Xlib.h>
-
- #include "common/debug.h"
-@@ -18,8 +20,43 @@
- #error SystemInfo_x11.cpp compiled without GPU_INFO_USE_X11
- #endif
-
-+#define GLX_RENDERER_VENDOR_ID_MESA 0x8183
-+#define GLX_RENDERER_DEVICE_ID_MESA 0x8184
-+
- namespace angle
- {
-+
-+bool CollectMesaCardInfo(std::vector<GPUDeviceInfo> *devices)
-+{
-+
-+ unsigned int vid[3], did[3];
-+
-+ Display *display = XOpenDisplay(NULL);
-+ if (!display) {
-+ return false;
-+ }
-+
-+ PFNGLXQUERYRENDERERINTEGERMESAPROC queryInteger =
-+ (PFNGLXQUERYRENDERERINTEGERMESAPROC) glXGetProcAddressARB((const GLubyte *)
-+ "glXQueryRendererIntegerMESA");
-+
-+ if (!queryInteger)
-+ return false;
-+
-+ bool vendor_ret =
-+ queryInteger(display, 0, 0, GLX_RENDERER_VENDOR_ID_MESA, vid);
-+ bool device_ret =
-+ queryInteger(display, 0, 0, GLX_RENDERER_DEVICE_ID_MESA, did);
-+
-+ if (vendor_ret && device_ret) {
-+ GPUDeviceInfo info;
-+ info.vendorId = vid[0];
-+ info.deviceId = did[0];
-+ devices->push_back(info);
-+ }
-+
-+ return true;
-+}
-
- bool GetNvidiaDriverVersionWithXNVCtrl(std::string *version)
- {
Property changes on: branches/2019Q2/www/chromium/files/patch-third__party_angle_src_gpu_info_util_SystemInfo_x11.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/2019Q2/www/chromium/files/patch-device_serial_BUILD.gn
===================================================================
--- branches/2019Q2/www/chromium/files/patch-device_serial_BUILD.gn (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-device_serial_BUILD.gn (nonexistent)
@@ -1,25 +0,0 @@
---- device/serial/BUILD.gn.orig 2017-12-15 02:04:18.000000000 +0100
-+++ device/serial/BUILD.gn 2017-12-25 06:34:10.834395000 +0100
-@@ -6,7 +6,7 @@
- import("//mojo/public/tools/bindings/mojom.gni")
-
- # Library works only on desktop platforms.
--if (is_win || is_linux || is_mac) {
-+if (is_win || is_linux || is_mac || is_bsd) {
- config("platform_support") {
- visibility = [ ":serial" ]
- if (is_win) {
-@@ -57,6 +57,13 @@
- "//net",
- "//third_party/re2",
- ]
-+
-+ if (is_bsd) {
-+ sources -= [
-+ "serial_device_enumerator_linux.cc",
-+ "serial_device_enumerator_linux.h",
-+ ]
-+ }
-
- if (use_udev) {
- deps += [ "//device/udev_linux" ]
Property changes on: branches/2019Q2/www/chromium/files/patch-device_serial_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/2019Q2/www/chromium/files/patch-components_download_quarantine_test_support_linux.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-components_download_quarantine_test_support_linux.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-components_download_quarantine_test_support_linux.cc (nonexistent)
@@ -1,20 +0,0 @@
---- components/download/quarantine/test_support_linux.cc.orig 2019-01-30 02:17:53.000000000 +0100
-+++ components/download/quarantine/test_support_linux.cc 2019-01-31 23:56:27.334442000 +0100
-@@ -21,6 +21,7 @@
- namespace {
-
- std::string GetExtendedFileAttribute(const char* path, const char* name) {
-+#if !defined(OS_BSD)
- base::ScopedBlockingCall scoped_blocking_call(base::BlockingType::MAY_BLOCK);
- ssize_t len = getxattr(path, name, nullptr, 0);
- if (len <= 0)
-@@ -31,6 +32,9 @@
- if (len < static_cast<ssize_t>(buffer.size()))
- return std::string();
- return std::string(buffer.begin(), buffer.end());
-+#else
-+ return std::string();
-+#endif // !defined(OS_BSD)
- }
-
- } // namespace
Property changes on: branches/2019Q2/www/chromium/files/patch-components_download_quarantine_test_support_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/2019Q2/www/chromium/files/patch-chrome_common_webui_url_constants.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-chrome_common_webui_url_constants.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-chrome_common_webui_url_constants.cc (nonexistent)
@@ -1,41 +0,0 @@
---- chrome/common/webui_url_constants.cc.orig 2018-02-24 16:25:11.000000000 +0100
-+++ chrome/common/webui_url_constants.cc 2018-03-03 22:39:51.818055000 +0100
-@@ -226,7 +226,7 @@
- const char kChromeUICastURL[] = "chrome://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/";
- #endif
-@@ -235,11 +235,11 @@
- 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_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
-
-@@ -380,13 +380,13 @@
- kChromeUIInternetConfigDialogHost,
- kChromeUIInternetDetailDialogHost,
- #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)
Property changes on: branches/2019Q2/www/chromium/files/patch-chrome_common_webui_url_constants.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/2019Q2/www/chromium/files/patch-ui_gl_generate_bindings.py
===================================================================
--- branches/2019Q2/www/chromium/files/patch-ui_gl_generate_bindings.py (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-ui_gl_generate_bindings.py (nonexistent)
@@ -1,12 +0,0 @@
---- ui/gl/generate_bindings.py.orig 2017-09-10 02:49:38.177014000 +0200
-+++ ui/gl/generate_bindings.py 2017-09-10 02:52:26.524647000 +0200
-@@ -2257,6 +2257,9 @@
- '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', },
Property changes on: branches/2019Q2/www/chromium/files/patch-ui_gl_generate_bindings.py
___________________________________________________________________
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/2019Q2/www/chromium/files/patch-ui_message_center_public_cpp_message_center_constants.h
===================================================================
--- branches/2019Q2/www/chromium/files/patch-ui_message_center_public_cpp_message_center_constants.h (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-ui_message_center_public_cpp_message_center_constants.h (nonexistent)
@@ -1,11 +0,0 @@
---- ui/message_center/public/cpp/message_center_constants.h.orig 2019-01-04 01:05:19.610265000 +0100
-+++ ui/message_center/public/cpp/message_center_constants.h 2019-01-04 01:05:58.617215000 +0100
-@@ -106,7 +106,7 @@
- const int kButtonIconTopPadding = 11; // In DIPs.
- const int kButtonIconToTitlePadding = 16; // In DIPs.
-
--#if !defined(OS_LINUX) || defined(USE_AURA)
-+#if (!defined(OS_LINUX) && !defined(OS_BSD)) || defined(USE_AURA)
- constexpr SkColor kButtonSeparatorColor = SkColorSetRGB(234, 234, 234);
- constexpr SkColor kHoveredButtonBackgroundColor = SkColorSetRGB(243, 243, 243);
- #endif
Property changes on: branches/2019Q2/www/chromium/files/patch-ui_message_center_public_cpp_message_center_constants.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/2019Q2/www/chromium/files/patch-third_party_googletest_src_googletest_src_gtest-port.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-third_party_googletest_src_googletest_src_gtest-port.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-third_party_googletest_src_googletest_src_gtest-port.cc (nonexistent)
@@ -1,43 +0,0 @@
---- third_party/googletest/src/googletest/src/gtest-port.cc.orig 2018-08-23 02:39:24.119551000 +0200
-+++ third_party/googletest/src/googletest/src/gtest-port.cc 2018-08-23 02:46:41.990204000 +0200
-@@ -52,6 +52,11 @@
- # include <mach/vm_map.h>
- #endif // GTEST_OS_MAC
-
-+#if GTEST_OS_FREEBSD
-+#include <sys/sysctl.h>
-+#include <sys/user.h>
-+#endif
-+
- #if GTEST_OS_QNX
- # include <devctl.h>
- # include <fcntl.h>
-@@ -126,6 +131,28 @@
- } else {
- return 0;
- }
-+}
-+
-+#elif GTEST_OS_FREEBSD
-+
-+#define KP_NLWP(kp) (kp.ki_numthreads)
-+
-+// Return the number of threads running in the process, or 0 to indicate that
-+// we cannot detect it.
-+size_t GetThreadCount() {
-+ int mib[] = {
-+ CTL_KERN,
-+ KERN_PROC,
-+ KERN_PROC_PID,
-+ getpid(),
-+ };
-+ u_int miblen = sizeof(mib) / sizeof(mib[0]);
-+ struct kinfo_proc(info);
-+ size_t size = sizeof(info);
-+ if (sysctl(mib, miblen, &info, &size, NULL, 0)) {
-+ return 0;
-+ }
-+ return KP_NLWP(info);
- }
-
- #elif GTEST_OS_QNX
Property changes on: branches/2019Q2/www/chromium/files/patch-third_party_googletest_src_googletest_src_gtest-port.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/2019Q2/www/chromium/files/patch-components_autofill_strings.grdp
===================================================================
--- branches/2019Q2/www/chromium/files/patch-components_autofill_strings.grdp (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-components_autofill_strings.grdp (nonexistent)
@@ -1,11 +0,0 @@
---- components/autofill_strings.grdp.orig 2018-12-03 21:16:48.000000000 +0100
-+++ components/autofill_strings.grdp 2018-12-13 18:27:15.969729000 +0100
-@@ -198,7 +198,7 @@
- <message name="IDS_AUTOFILL_SAVE_CARD_PROMPT_TITLE_LOCAL" desc="Title text for the Autofill save card prompt when the card is to be saved locally. The prompt can be either a bubble or an infobar.">
- Save card?
- </message>
-- <if expr="is_linux and not chromeos">
-+ <if expr="is_posix and not chromeos">
- <then>
- <message name="IDS_AUTOFILL_SAVE_CARD_PROMPT_TITLE_TO_CLOUD" desc="Title text for the Autofill save card prompt when the card is to be saved by uploading it to Google Payments and also saved locally. The prompt can be either a bubble or an infobar.">
- Do you want to save this card to your Google Account?
Property changes on: branches/2019Q2/www/chromium/files/patch-components_autofill_strings.grdp
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: branches/2019Q2/www/chromium/files/patch-base_allocator_partition_allocator_page_allocator_internals_posix.h
===================================================================
--- branches/2019Q2/www/chromium/files/patch-base_allocator_partition_allocator_page_allocator_internals_posix.h (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-base_allocator_partition_allocator_page_allocator_internals_posix.h (nonexistent)
@@ -1,38 +0,0 @@
---- base/allocator/partition_allocator/page_allocator_internals_posix.h.orig 2019-02-06 21:59:00.906521000 +0100
-+++ base/allocator/partition_allocator/page_allocator_internals_posix.h 2019-02-06 22:00:07.553831000 +0100
-@@ -14,7 +14,7 @@
- #if defined(OS_MACOSX)
- #include <mach/mach.h>
- #endif
--#if defined(OS_LINUX)
-+#if defined(OS_BSD) || defined(OS_LINUX)
- #include <sys/resource.h>
-
- #include <algorithm>
-@@ -48,7 +48,7 @@
- }
- }
-
--#if defined(OS_LINUX) && defined(ARCH_CPU_64_BITS)
-+#if (defined(OS_BSD) || defined(OS_LINUX)) && defined(ARCH_CPU_64_BITS)
-
- // Multiple guarded memory regions may exceed the process address space limit.
- // This function will raise or lower the limit by |amount|.
-@@ -68,7 +68,7 @@
- // schemes that reduce that to 4 GiB.
- constexpr size_t kMinimumGuardedMemorySize = 1ULL << 32; // 4 GiB
-
--#endif // defined(OS_LINUX) && defined(ARCH_CPU_64_BITS)
-+#endif // (defined(OS_BSD) || defined(OS_LINUX)) && defined(ARCH_CPU_64_BITS)
-
- void* SystemAllocPagesInternal(void* hint,
- size_t length,
-@@ -134,7 +134,7 @@
- void FreePagesInternal(void* address, size_t length) {
- CHECK(!munmap(address, length));
-
--#if defined(OS_LINUX) && defined(ARCH_CPU_64_BITS)
-+#if (defined(OS_BSD) || defined(OS_LINUX)) && defined(ARCH_CPU_64_BITS)
- // Restore the address space limit.
- if (length >= kMinimumGuardedMemorySize) {
- CHECK(AdjustAddressSpaceLimit(-base::checked_cast<int64_t>(length)));
Property changes on: branches/2019Q2/www/chromium/files/patch-base_allocator_partition_allocator_page_allocator_internals_posix.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/2019Q2/www/chromium/files/patch-third__party_blink_renderer_core_inspector_inspector_memory_agent.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-third__party_blink_renderer_core_inspector_inspector_memory_agent.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-third__party_blink_renderer_core_inspector_inspector_memory_agent.cc (nonexistent)
@@ -1,11 +0,0 @@
---- third_party/blink/renderer/core/inspector/inspector_memory_agent.cc.orig 2019-01-09 13:18:19.496883000 +0100
-+++ third_party/blink/renderer/core/inspector/inspector_memory_agent.cc 2019-01-09 13:18:36.729783000 +0100
-@@ -171,7 +171,7 @@
-
- std::vector<std::string> InspectorMemoryAgent::Symbolize(
- const std::vector<void*>& addresses) {
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
- // TODO(alph): Move symbolization to the client.
- std::vector<void*> addresses_to_symbolize;
- for (void* address : addresses) {
Property changes on: branches/2019Q2/www/chromium/files/patch-third__party_blink_renderer_core_inspector_inspector_memory_agent.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/2019Q2/www/chromium/files/patch-net_third_party_quic_platform_impl_quic_ip_address_impl.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-net_third_party_quic_platform_impl_quic_ip_address_impl.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-net_third_party_quic_platform_impl_quic_ip_address_impl.cc (nonexistent)
@@ -1,10 +0,0 @@
---- net/third_party/quic/platform/impl/quic_ip_address_impl.cc.orig 2018-08-04 20:21:44.470242000 +0200
-+++ net/third_party/quic/platform/impl/quic_ip_address_impl.cc 2018-08-04 20:22:01.700604000 +0200
-@@ -13,6 +13,7 @@
- #include <ws2bth.h>
- #elif defined(OS_POSIX) || defined(OS_FUCHSIA)
- #include <netinet/in.h>
-+#include <sys/socket.h>
- #endif
-
- using std::string;
Property changes on: branches/2019Q2/www/chromium/files/patch-net_third_party_quic_platform_impl_quic_ip_address_impl.cc
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: branches/2019Q2/www/chromium/files/patch-remoting_host_me2me_desktop_environment.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-remoting_host_me2me_desktop_environment.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-remoting_host_me2me_desktop_environment.cc (nonexistent)
@@ -1,11 +0,0 @@
---- remoting/host/me2me_desktop_environment.cc.orig 2017-08-10 16:28:52.379518000 +0200
-+++ remoting/host/me2me_desktop_environment.cc 2017-08-10 16:29:10.165289000 +0200
-@@ -99,7 +99,7 @@
-
- // Otherwise, if the session is shared with the local user start monitoring
- // the local input and create the in-session UI.
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
- bool want_user_interface = false;
- #elif defined(OS_MACOSX)
- // Don't try to display any UI on top of the system's login screen as this
Property changes on: branches/2019Q2/www/chromium/files/patch-remoting_host_me2me_desktop_environment.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/2019Q2/www/chromium/files/patch-content_app_content_main_runner_impl.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-content_app_content_main_runner_impl.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-content_app_content_main_runner_impl.cc (nonexistent)
@@ -1,46 +0,0 @@
---- content/app/content_main_runner_impl.cc.orig 2019-01-30 02:17:57.000000000 +0100
-+++ content/app/content_main_runner_impl.cc 2019-02-06 23:01:02.842834000 +0100
-@@ -91,17 +91,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"
-@@ -307,7 +307,7 @@
- }
- #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
-@@ -635,11 +635,11 @@
- 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
-
Property changes on: branches/2019Q2/www/chromium/files/patch-content_app_content_main_runner_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/2019Q2/www/chromium/files/patch-ui_gfx_mojo_buffer_types_struct_traits.h
===================================================================
--- branches/2019Q2/www/chromium/files/patch-ui_gfx_mojo_buffer_types_struct_traits.h (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-ui_gfx_mojo_buffer_types_struct_traits.h (nonexistent)
@@ -1,20 +0,0 @@
---- ui/gfx/mojo/buffer_types_struct_traits.h.orig 2019-01-30 02:18:54.000000000 +0100
-+++ ui/gfx/mojo/buffer_types_struct_traits.h 2019-02-01 15:19:04.908647000 +0100
-@@ -189,7 +189,7 @@
- }
- };
-
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
- template <>
- struct StructTraits<gfx::mojom::NativePixmapPlaneDataView,
- gfx::NativePixmapPlane> {
-@@ -229,7 +229,7 @@
- static bool Read(gfx::mojom::NativePixmapHandleDataView data,
- gfx::NativePixmapHandle* out);
- };
--#endif // defined(OS_LINUX)
-+#endif // defined(OS_LINUX) || defined(OS_BSD)
-
- template <>
- struct StructTraits<gfx::mojom::GpuMemoryBufferHandleDataView,
Property changes on: branches/2019Q2/www/chromium/files/patch-ui_gfx_mojo_buffer_types_struct_traits.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/2019Q2/www/chromium/files/patch-third__party_swiftshader_third_party_llvm-subzero_build_Linux_include_llvm_Config_config.h
===================================================================
--- branches/2019Q2/www/chromium/files/patch-third__party_swiftshader_third_party_llvm-subzero_build_Linux_include_llvm_Config_config.h (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-third__party_swiftshader_third_party_llvm-subzero_build_Linux_include_llvm_Config_config.h (nonexistent)
@@ -1,29 +0,0 @@
---- third_party/swiftshader/third_party/llvm-subzero/build/Linux/include/llvm/Config/config.h.orig 2017-06-26 22:28:18.140795000 +0200
-+++ third_party/swiftshader/third_party/llvm-subzero/build/Linux/include/llvm/Config/config.h 2017-06-26 22:30:40.465311000 +0200
-@@ -121,7 +121,7 @@
- #define HAVE_LINK_H 1
-
- /* Define to 1 if you have the `lseek64' function. */
--#define HAVE_LSEEK64 1
-+/* #undef HAVE_LSEEK64 */
-
- /* Define to 1 if you have the <mach/mach.h> header file. */
- /* #undef HAVE_MACH_MACH_H */
-@@ -130,7 +130,7 @@
- /* #undef HAVE_MALLCTL */
-
- /* Define to 1 if you have the `mallinfo' function. */
--#define HAVE_MALLINFO 1
-+/* #undef HAVE_MALLINFO */
-
- /* Define to 1 if you have the <malloc.h> header file. */
- #define HAVE_MALLOC_H 1
-@@ -154,7 +154,7 @@
- /* #undef HAVE_NDIR_H */
-
- /* Define to 1 if you have the `posix_fallocate' function. */
--#define HAVE_POSIX_FALLOCATE 1
-+/* #undef HAVE_POSIX_FALLOCATE */
-
- /* Define to 1 if you have the `posix_spawn' function. */
- #define HAVE_POSIX_SPAWN 1
Property changes on: branches/2019Q2/www/chromium/files/patch-third__party_swiftshader_third_party_llvm-subzero_build_Linux_include_llvm_Config_config.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/2019Q2/www/chromium/files/patch-gpu_ipc_common_gpu_memory_buffer_support.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-gpu_ipc_common_gpu_memory_buffer_support.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-gpu_ipc_common_gpu_memory_buffer_support.cc (nonexistent)
@@ -1,47 +0,0 @@
---- gpu/ipc/common/gpu_memory_buffer_support.cc.orig 2019-01-30 02:18:02.000000000 +0100
-+++ gpu/ipc/common/gpu_memory_buffer_support.cc 2019-02-01 09:37:09.520829000 +0100
-@@ -12,7 +12,7 @@
- #include "gpu/ipc/common/gpu_memory_buffer_impl_io_surface.h"
- #endif
-
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
- #include "gpu/ipc/common/gpu_memory_buffer_impl_native_pixmap.h"
- #include "ui/gfx/client_native_pixmap_factory.h"
- #include "ui/gfx/linux/client_native_pixmap_factory_dmabuf.h"
-@@ -37,7 +37,7 @@
- GpuMemoryBufferSupport::GpuMemoryBufferSupport() {
- #if defined(USE_OZONE)
- client_native_pixmap_factory_ = ui::CreateClientNativePixmapFactoryOzone();
--#elif defined(OS_LINUX)
-+#elif defined(OS_LINUX) || defined(OS_BSD)
- client_native_pixmap_factory_.reset(
- gfx::CreateClientNativePixmapFactoryDmabuf());
- #endif
-@@ -51,7 +51,7 @@
- return gfx::IO_SURFACE_BUFFER;
- #elif defined(OS_ANDROID)
- return gfx::ANDROID_HARDWARE_BUFFER;
--#elif defined(OS_LINUX)
-+#elif defined(OS_LINUX) || defined(OS_BSD)
- return gfx::NATIVE_PIXMAP;
- #elif defined(OS_WIN)
- return gfx::DXGI_SHARED_HANDLE;
-@@ -109,7 +109,7 @@
- #elif defined(USE_OZONE)
- return ui::OzonePlatform::EnsureInstance()->IsNativePixmapConfigSupported(
- format, usage);
--#elif defined(OS_LINUX)
-+#elif defined(OS_LINUX) || defined(OS_BSD)
- return false; // TODO(julian.isorce): Add linux support.
- #elif defined(OS_WIN)
- switch (usage) {
-@@ -166,7 +166,7 @@
- return GpuMemoryBufferImplIOSurface::CreateFromHandle(
- std::move(handle), size, format, usage, callback);
- #endif
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
- case gfx::NATIVE_PIXMAP:
- return GpuMemoryBufferImplNativePixmap::CreateFromHandle(
- client_native_pixmap_factory(), std::move(handle), size, format,
Property changes on: branches/2019Q2/www/chromium/files/patch-gpu_ipc_common_gpu_memory_buffer_support.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/2019Q2/www/chromium/files/patch-content_test_content_test_suite.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-content_test_content_test_suite.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-content_test_content_test_suite.cc (nonexistent)
@@ -1,18 +0,0 @@
---- content/test/content_test_suite.cc.orig 2017-12-15 02:04:18.000000000 +0100
-+++ content/test/content_test_suite.cc 2017-12-24 15:49:56.061177000 +0100
-@@ -87,6 +87,7 @@
- // to initialize GL, so don't do it here.
- base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
- bool is_child_process = command_line->HasSwitch(switches::kTestChildProcess);
-+#if !defined(OS_BSD)
- if (!is_child_process) {
- gpu::GPUInfo gpu_info;
- gpu::CollectBasicGraphicsInfo(&gpu_info);
-@@ -99,6 +100,7 @@
- gpu_feature_info.disabled_extensions);
- gl::init::InitializeExtensionSettingsOneOffPlatform();
- }
-+#endif
- testing::TestEventListeners& listeners =
- testing::UnitTest::GetInstance()->listeners();
- listeners.Append(new TestInitializationListener);
Property changes on: branches/2019Q2/www/chromium/files/patch-content_test_content_test_suite.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/2019Q2/www/chromium/files/patch-third__party_webrtc_rtc_base_stringutils.h
===================================================================
--- branches/2019Q2/www/chromium/files/patch-third__party_webrtc_rtc_base_stringutils.h (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-third__party_webrtc_rtc_base_stringutils.h (nonexistent)
@@ -1,17 +0,0 @@
---- third_party/webrtc/rtc_base/stringutils.h.orig 2019-01-30 02:20:38.000000000 +0100
-+++ third_party/webrtc/rtc_base/stringutils.h 2019-02-01 16:59:24.656841000 +0100
-@@ -25,11 +25,11 @@
- #endif // WEBRTC_WIN
-
- #if defined(WEBRTC_POSIX)
--#ifdef BSD
-+#if defined(WEBRTC_BSD) || defined(BSD)
- #include <stdlib.h>
--#else // BSD
-+#else // WEBRTC_BSD
- #include <alloca.h>
--#endif // !BSD
-+#endif // !WEBRTC_BSD
- #include <strings.h>
- #endif // WEBRTC_POSIX
-
Property changes on: branches/2019Q2/www/chromium/files/patch-third__party_webrtc_rtc_base_stringutils.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/2019Q2/www/chromium/files/patch-third_party_perfetto_include_perfetto_base_watchdog_posix.h
===================================================================
--- branches/2019Q2/www/chromium/files/patch-third_party_perfetto_include_perfetto_base_watchdog_posix.h (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-third_party_perfetto_include_perfetto_base_watchdog_posix.h (nonexistent)
@@ -1,11 +0,0 @@
---- third_party/perfetto/include/perfetto/base/watchdog_posix.h.orig 2018-08-04 21:15:43.145900000 +0200
-+++ third_party/perfetto/include/perfetto/base/watchdog_posix.h 2018-08-04 21:16:02.944049000 +0200
-@@ -45,7 +45,7 @@
- Timer(const Timer&) = delete;
- Timer& operator=(const Timer&) = delete;
-
-- timer_t timerid_ = nullptr;
-+ timer_t timerid_ = 0;
- };
- virtual ~Watchdog();
-
Property changes on: branches/2019Q2/www/chromium/files/patch-third_party_perfetto_include_perfetto_base_watchdog_posix.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/2019Q2/www/chromium/files/patch-third_party_crashpad_crashpad_client_crashpad_client_posix.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-third_party_crashpad_crashpad_client_crashpad_client_posix.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-third_party_crashpad_crashpad_client_crashpad_client_posix.cc (nonexistent)
@@ -1,41 +0,0 @@
---- third_party/crashpad/crashpad/client/crashpad_client_posix.cc.orig 2019-01-12 23:16:55.468608000 +0100
-+++ third_party/crashpad/crashpad/client/crashpad_client_posix.cc 2019-01-12 23:18:00.395212000 +0100
-@@ -0,0 +1,38 @@
-+// Copyright 2017 The Crashpad Authors. All rights reserved.
-+//
-+// Licensed under the Apache License, Version 2.0 (the "License");
-+// you may not use this file except in compliance with the License.
-+// You may obtain a copy of the License at
-+//
-+// http://www.apache.org/licenses/LICENSE-2.0
-+//
-+// Unless required by applicable law or agreed to in writing, software
-+// distributed under the License is distributed on an "AS IS" BASIS,
-+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-+// See the License for the specific language governing permissions and
-+// limitations under the License.
-+
-+#include "client/crashpad_client.h"
-+
-+#include "base/logging.h"
-+
-+namespace crashpad {
-+
-+CrashpadClient::CrashpadClient() {}
-+
-+CrashpadClient::~CrashpadClient() {}
-+
-+bool CrashpadClient::StartHandler(
-+ const base::FilePath& handler,
-+ const base::FilePath& database,
-+ const base::FilePath& metrics_dir,
-+ const std::string& url,
-+ const std::map<std::string, std::string>& annotations,
-+ const std::vector<std::string>& arguments,
-+ bool restartable,
-+ bool asynchronous_start) {
-+ NOTREACHED(); // TODO(scottmg): https://crashpad.chromium.org/bug/196
-+ return false;
-+}
-+
-+} // namespace crashpad
Property changes on: branches/2019Q2/www/chromium/files/patch-third_party_crashpad_crashpad_client_crashpad_client_posix.cc
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: branches/2019Q2/www/chromium/files/patch-content_browser_webui_web_ui_data_source_impl.h
===================================================================
--- branches/2019Q2/www/chromium/files/patch-content_browser_webui_web_ui_data_source_impl.h (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-content_browser_webui_web_ui_data_source_impl.h (nonexistent)
@@ -1,25 +0,0 @@
---- content/browser/webui/web_ui_data_source_impl.h.orig 2019-01-09 19:45:44.740357000 +0100
-+++ content/browser/webui/web_ui_data_source_impl.h 2019-01-09 19:48:21.066890000 +0100
-@@ -31,15 +31,15 @@
- public WebUIDataSource {
- public:
- // WebUIDataSource implementation:
-- void AddString(base::StringPiece name, const base::string16& value) override;
-- void AddString(base::StringPiece name, const std::string& value) override;
-- void AddLocalizedString(base::StringPiece name, int ids) override;
-+ void AddString(const std::string& name, const base::string16& value) override;
-+ void AddString(const std::string& name, const std::string& value) override;
-+ void AddLocalizedString(const std::string& name, int ids) override;
- void AddLocalizedStrings(
- const base::DictionaryValue& localized_strings) override;
-- void AddBoolean(base::StringPiece name, bool value) override;
-- void AddInteger(base::StringPiece name, int32_t value) override;
-- void SetJsonPath(base::StringPiece path) override;
-- void AddResourcePath(base::StringPiece path, int resource_id) override;
-+ void AddBoolean(const std::string& name, bool value) override;
-+ void AddInteger(const std::string& name, int32_t value) override;
-+ void SetJsonPath(const std::string& path) override;
-+ void AddResourcePath(const std::string& path, int resource_id) override;
- void SetDefaultResource(int resource_id) override;
- void SetRequestFilter(
- const WebUIDataSource::HandleRequestCallback& callback) override;
Property changes on: branches/2019Q2/www/chromium/files/patch-content_browser_webui_web_ui_data_source_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/2019Q2/www/chromium/files/patch-base_files_memory_mapped_file_posix.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-base_files_memory_mapped_file_posix.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-base_files_memory_mapped_file_posix.cc (nonexistent)
@@ -1,11 +0,0 @@
---- base/files/memory_mapped_file_posix.cc.orig 2018-02-24 16:25:08.000000000 +0100
-+++ base/files/memory_mapped_file_posix.cc 2018-03-03 19:01:12.448678000 +0100
-@@ -110,6 +110,8 @@
- // Only Android API>=21 supports the fallocate call. Older versions need
- // to manually extend the file by writing zeros at block intervals.
- do_manual_extension = true;
-+#elif defined(OS_BSD)
-+ do_manual_extension = true;
- #elif defined(OS_MACOSX)
- // MacOS doesn't support fallocate even though their new APFS filesystem
- // does support sparse files. It does, however, have the functionality
Property changes on: branches/2019Q2/www/chromium/files/patch-base_files_memory_mapped_file_posix.cc
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: branches/2019Q2/www/chromium/files/patch-ipc_ipc__channel_common.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-ipc_ipc__channel_common.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-ipc_ipc__channel_common.cc (nonexistent)
@@ -1,11 +0,0 @@
---- ipc/ipc_channel_common.cc.orig 2017-08-10 04:18:14.155067000 +0200
-+++ ipc/ipc_channel_common.cc 2017-08-10 04:18:32.944727000 +0200
-@@ -9,7 +9,7 @@
-
- namespace IPC {
-
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
-
- namespace {
- int g_global_pid = 0;
Property changes on: branches/2019Q2/www/chromium/files/patch-ipc_ipc__channel_common.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/2019Q2/www/chromium/files/patch-extensions_common_feature_switch.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-extensions_common_feature_switch.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-extensions_common_feature_switch.cc (nonexistent)
@@ -1,14 +0,0 @@
---- extensions/common/feature_switch.cc.orig 2018-03-20 23:05:25.000000000 +0100
-+++ extensions/common/feature_switch.cc 2018-03-24 17:46:50.886191000 +0100
-@@ -46,11 +46,7 @@
- FeatureSwitch::DEFAULT_ENABLED),
- load_media_router_component_extension(
- kLoadMediaRouterComponentExtensionFlag,
--#if defined(GOOGLE_CHROME_BUILD)
- FeatureSwitch::DEFAULT_ENABLED)
--#else
-- FeatureSwitch::DEFAULT_DISABLED)
--#endif // defined(GOOGLE_CHROME_BUILD)
- {
- }
-
Property changes on: branches/2019Q2/www/chromium/files/patch-extensions_common_feature_switch.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/2019Q2/www/chromium/files/patch-chrome_browser_background_background_mode_optimizer.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-chrome_browser_background_background_mode_optimizer.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-chrome_browser_background_background_mode_optimizer.cc (nonexistent)
@@ -1,15 +0,0 @@
---- chrome/browser/background/background_mode_optimizer.cc.orig 2017-09-07 23:33:41.430876000 +0200
-+++ chrome/browser/background/background_mode_optimizer.cc 2017-09-07 23:34:04.189439000 +0200
-@@ -30,10 +30,10 @@
- switches::kKeepAliveForTest))
- return nullptr;
-
--#if defined(OS_WIN) || defined(OS_LINUX)
-+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD)
- if (base::FeatureList::IsEnabled(features::kBackgroundModeAllowRestart))
- return base::WrapUnique(new BackgroundModeOptimizer());
--#endif // defined(OS_WIN) || defined(OS_LINUX)
-+#endif // defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD)
-
- return nullptr;
- }
Property changes on: branches/2019Q2/www/chromium/files/patch-chrome_browser_background_background_mode_optimizer.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/2019Q2/www/chromium/files/patch-chrome_browser_autocomplete_chrome_autocomplete_scheme_classifier.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-chrome_browser_autocomplete_chrome_autocomplete_scheme_classifier.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-chrome_browser_autocomplete_chrome_autocomplete_scheme_classifier.cc (nonexistent)
@@ -1,11 +0,0 @@
---- chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.cc.orig 2019-01-09 12:28:40.004958000 +0100
-+++ chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.cc 2019-01-09 12:28:54.516042000 +0100
-@@ -59,7 +59,7 @@
- return metrics::OmniboxInputType::QUERY;
-
- case ExternalProtocolHandler::UNKNOWN: {
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
- // Linux impl of GetApplicationNameForProtocol doesn't distinguish
- // between URL schemes with handers and those without. This will
- // make the default behaviour be search on Linux.
Property changes on: branches/2019Q2/www/chromium/files/patch-chrome_browser_autocomplete_chrome_autocomplete_scheme_classifier.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/2019Q2/www/chromium/files/patch-chrome_browser_profiles_chrome_browser_main_extra_parts_profiles.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-chrome_browser_profiles_chrome_browser_main_extra_parts_profiles.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-chrome_browser_profiles_chrome_browser_main_extra_parts_profiles.cc (nonexistent)
@@ -1,11 +0,0 @@
---- chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc.orig 2019-01-10 01:15:46.031074000 +0100
-+++ chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc 2019-01-10 01:16:16.877359000 +0100
-@@ -317,7 +317,7 @@
- #if !defined(OS_ANDROID)
- MediaGalleriesPreferencesFactory::GetInstance();
- #endif
--#if defined(OS_WIN) || defined(OS_MACOSX) || \
-+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_BSD) || \
- (defined(OS_LINUX) && !defined(OS_CHROMEOS))
- metrics::DesktopProfileSessionDurationsServiceFactory::GetInstance();
- #endif
Property changes on: branches/2019Q2/www/chromium/files/patch-chrome_browser_profiles_chrome_browser_main_extra_parts_profiles.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/2019Q2/www/chromium/files/patch-tools_json_schema_compiler_model.py
===================================================================
--- branches/2019Q2/www/chromium/files/patch-tools_json_schema_compiler_model.py (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-tools_json_schema_compiler_model.py (nonexistent)
@@ -1,11 +0,0 @@
---- tools/json_schema_compiler/model.py.orig 2017-12-30 06:35:55.601371000 +0100
-+++ tools/json_schema_compiler/model.py 2017-12-30 06:36:37.374966000 +0100
-@@ -599,7 +599,7 @@
- """
- CHROMEOS = _PlatformInfo("chromeos")
- CHROMEOS_TOUCH = _PlatformInfo("chromeos_touch")
-- LINUX = _PlatformInfo("linux")
-+ LINUX = _PlatformInfo("bsd")
- MAC = _PlatformInfo("mac")
- WIN = _PlatformInfo("win")
-
Property changes on: branches/2019Q2/www/chromium/files/patch-tools_json_schema_compiler_model.py
___________________________________________________________________
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/2019Q2/www/chromium/files/patch-services_tracing_public_cpp_trace_event_agent.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-services_tracing_public_cpp_trace_event_agent.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-services_tracing_public_cpp_trace_event_agent.cc (nonexistent)
@@ -1,11 +0,0 @@
---- services/tracing/public/cpp/trace_event_agent.cc.orig 2019-01-09 13:13:48.962628000 +0100
-+++ services/tracing/public/cpp/trace_event_agent.cc 2019-01-09 13:14:04.280587000 +0100
-@@ -23,7 +23,7 @@
- #include "services/tracing/public/mojom/constants.mojom.h"
-
- #if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_MACOSX) || \
-- defined(OS_WIN)
-+ defined(OS_WIN) || defined(OS_BSD)
- #define PERFETTO_AVAILABLE
- #include "services/tracing/public/cpp/perfetto/producer_client.h"
- #include "services/tracing/public/cpp/perfetto/trace_event_data_source.h"
Property changes on: branches/2019Q2/www/chromium/files/patch-services_tracing_public_cpp_trace_event_agent.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/2019Q2/www/chromium/files/patch-services_network_network_context.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-services_network_network_context.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-services_network_network_context.cc (nonexistent)
@@ -1,38 +0,0 @@
---- services/network/network_context.cc.orig 2019-01-09 11:56:44.681236000 +0100
-+++ services/network/network_context.cc 2019-01-09 12:00:05.840566000 +0100
-@@ -110,7 +110,7 @@
- #endif // defined(USE_NSS_CERTS)
-
- #if defined(OS_ANDROID) || defined(OS_FUCHSIA) || \
-- (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_MACOSX)
-+ ((defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)) || defined(OS_MACOSX)
- #include "net/cert/cert_net_fetcher.h"
- #include "net/cert_net/cert_net_fetcher_impl.h"
- #endif
-@@ -543,7 +543,7 @@
- #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
- }
-@@ -1367,7 +1367,7 @@
-
- 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.";
-@@ -1654,7 +1654,7 @@
- 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
Property changes on: branches/2019Q2/www/chromium/files/patch-services_network_network_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/2019Q2/www/chromium/files/patch-content_public_browser_web_ui_data_source.h
===================================================================
--- branches/2019Q2/www/chromium/files/patch-content_public_browser_web_ui_data_source.h (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-content_public_browser_web_ui_data_source.h (nonexistent)
@@ -1,51 +0,0 @@
---- content/public/browser/web_ui_data_source.h.orig 2019-01-09 12:09:09.754984000 +0100
-+++ content/public/browser/web_ui_data_source.h 2019-01-09 12:14:15.249680000 +0100
-@@ -13,7 +13,6 @@
-
- #include "base/callback.h"
- #include "base/strings/string16.h"
--#include "base/strings/string_piece.h"
- #include "content/common/content_export.h"
-
- namespace base {
-@@ -45,33 +44,33 @@
- std::unique_ptr<base::DictionaryValue> update);
-
- // Adds a string keyed to its name to our dictionary.
-- virtual void AddString(base::StringPiece name,
-+ virtual void AddString(const std::string& name,
- const base::string16& value) = 0;
-
- // Adds a string keyed to its name to our dictionary.
-- virtual void AddString(base::StringPiece name, const std::string& value) = 0;
-+ virtual void AddString(const std::string& name, const std::string& value) = 0;
-
- // Adds a localized string with resource |ids| keyed to its name to our
- // dictionary.
-- virtual void AddLocalizedString(base::StringPiece name, int ids) = 0;
-+ virtual void AddLocalizedString(const std::string& name, int ids) = 0;
-
- // Add strings from |localized_strings| to our dictionary.
- virtual void AddLocalizedStrings(
- const base::DictionaryValue& localized_strings) = 0;
-
- // Adds a boolean keyed to its name to our dictionary.
-- virtual void AddBoolean(base::StringPiece name, bool value) = 0;
-+ virtual void AddBoolean(const std::string& name, bool value) = 0;
-
- // Adds a signed 32-bit integer keyed to its name to our dictionary. Larger
- // integers may not be exactly representable in JavaScript. See
- // MAX_SAFE_INTEGER in /v8/src/globals.h.
-- virtual void AddInteger(base::StringPiece name, int32_t value) = 0;
-+ virtual void AddInteger(const std::string& name, int32_t value) = 0;
-
- // Sets the path which will return the JSON strings.
-- virtual void SetJsonPath(base::StringPiece path) = 0;
-+ virtual void SetJsonPath(const std::string& path) = 0;
-
- // Adds a mapping between a path name and a resource to return.
-- virtual void AddResourcePath(base::StringPiece path, int resource_id) = 0;
-+ virtual void AddResourcePath(const std::string& path, int resource_id) = 0;
-
- // Sets the resource to returned when no other paths match.
- virtual void SetDefaultResource(int resource_id) = 0;
Property changes on: branches/2019Q2/www/chromium/files/patch-content_public_browser_web_ui_data_source.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/2019Q2/www/chromium/files/patch-components_autofill_core_common_autofill_util.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-components_autofill_core_common_autofill_util.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-components_autofill_core_common_autofill_util.cc (nonexistent)
@@ -1,11 +0,0 @@
---- components/autofill/core/common/autofill_util.cc.orig 2019-01-09 12:24:12.925267000 +0100
-+++ components/autofill/core/common/autofill_util.cc 2019-01-09 12:24:28.939308000 +0100
-@@ -202,7 +202,7 @@
- }
-
- 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;
Property changes on: branches/2019Q2/www/chromium/files/patch-components_autofill_core_common_autofill_util.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/2019Q2/www/chromium/files/patch-chrome_browser_ssl_ssl_error_controller_client.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-chrome_browser_ssl_ssl_error_controller_client.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-chrome_browser_ssl_ssl_error_controller_client.cc (nonexistent)
@@ -1,20 +0,0 @@
---- chrome/browser/ssl/ssl_error_controller_client.cc.orig 2018-03-03 21:13:39.612526000 +0100
-+++ chrome/browser/ssl/ssl_error_controller_client.cc 2018-03-03 21:14:15.298290000 +0100
-@@ -55,7 +55,7 @@
- #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;
-@@ -185,7 +185,7 @@
-
- bool SSLErrorControllerClient::CanLaunchDateAndTimeSettings() {
- #if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_MACOSX) || \
-- defined(OS_WIN)
-+ defined(OS_WIN) || defined(OS_BSD)
- return true;
- #else
- return false;
Property changes on: branches/2019Q2/www/chromium/files/patch-chrome_browser_ssl_ssl_error_controller_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/2019Q2/www/chromium/files/patch-third_party_crashpad_crashpad_build_crashpad_buildconfig.gni
===================================================================
--- branches/2019Q2/www/chromium/files/patch-third_party_crashpad_crashpad_build_crashpad_buildconfig.gni (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-third_party_crashpad_crashpad_build_crashpad_buildconfig.gni (nonexistent)
@@ -1,11 +0,0 @@
---- third_party/crashpad/crashpad/build/crashpad_buildconfig.gni.orig 2018-07-19 19:41:47.198522000 +0200
-+++ third_party/crashpad/crashpad/build/crashpad_buildconfig.gni 2018-07-19 19:41:59.956618000 +0200
-@@ -38,7 +38,7 @@
- if (crashpad_is_in_chromium) {
- crashpad_is_mac = is_mac
- crashpad_is_win = is_win
-- crashpad_is_linux = is_linux
-+ crashpad_is_linux = is_linux && !is_bsd
- crashpad_is_android = is_android
- crashpad_is_fuchsia = is_fuchsia
-
Property changes on: branches/2019Q2/www/chromium/files/patch-third_party_crashpad_crashpad_build_crashpad_buildconfig.gni
___________________________________________________________________
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/2019Q2/www/chromium/files/patch-third_party_crc32c_src_src_crc32c__arm64__linux__check.h
===================================================================
--- branches/2019Q2/www/chromium/files/patch-third_party_crc32c_src_src_crc32c__arm64__linux__check.h (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-third_party_crc32c_src_src_crc32c__arm64__linux__check.h (nonexistent)
@@ -1,19 +0,0 @@
---- third_party/crc32c/src/src/crc32c_arm64_linux_check.h 2018-04-13 18:15:04 UTC
-+++ third_party/crc32c/src/src/crc32c_arm64_linux_check.h
-@@ -29,6 +29,8 @@ extern "C" unsigned long getauxval(unsigned long type)
- namespace crc32c {
-
- inline bool CanUseArm64Linux() {
-+return false;
-+#if 0
- #if HAVE_STRONG_GETAUXVAL || HAVE_WEAK_GETAUXVAL
- // From 'arch/arm64/include/uapi/asm/hwcap.h' in Linux kernel source code.
- constexpr unsigned long kHWCAP_PMULL = 1 << 4;
-@@ -39,6 +41,7 @@ inline bool CanUseArm64Linux() {
- #else
- return false;
- #endif // HAVE_STRONG_GETAUXVAL || HAVE_WEAK_GETAUXVAL
-+#endif
- }
-
- } // namespace crc32c
Property changes on: branches/2019Q2/www/chromium/files/patch-third_party_crc32c_src_src_crc32c__arm64__linux__check.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/2019Q2/www/chromium/files/patch-extensions_browser_browser_context_keyed_service_factories.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-extensions_browser_browser_context_keyed_service_factories.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-extensions_browser_browser_context_keyed_service_factories.cc (nonexistent)
@@ -1,11 +0,0 @@
---- extensions/browser/browser_context_keyed_service_factories.cc.orig 2019-01-11 19:03:59.864185000 +0100
-+++ extensions/browser/browser_context_keyed_service_factories.cc 2019-01-11 19:04:22.204588000 +0100
-@@ -85,7 +85,7 @@
- #if defined(OS_CHROMEOS)
- NetworkingConfigServiceFactory::GetInstance();
- #endif
--#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MACOSX)
-+#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_BSD)
- NetworkingPrivateEventRouterFactory::GetInstance();
- #endif
- PowerAPI::GetFactoryInstance();
Property changes on: branches/2019Q2/www/chromium/files/patch-extensions_browser_browser_context_keyed_service_factories.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/2019Q2/www/chromium/files/patch-sandbox_linux_services_libc_interceptor.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-sandbox_linux_services_libc_interceptor.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-sandbox_linux_services_libc_interceptor.cc (nonexistent)
@@ -1,21 +0,0 @@
---- sandbox/linux/services/libc_interceptor.cc.orig 2018-07-19 22:19:52.264027000 +0200
-+++ sandbox/linux/services/libc_interceptor.cc 2018-07-19 22:20:31.348730000 +0200
-@@ -11,7 +11,9 @@
- #include <stddef.h>
- #include <stdint.h>
- #include <string.h>
-+#if !defined(OS_BSD)
- #include <sys/prctl.h>
-+#endif
- #include <sys/socket.h>
- #include <sys/types.h>
- #include <time.h>
-@@ -94,7 +96,7 @@
- } else {
- base::AutoLock lock(g_timezones_lock.Get());
- auto ret_pair = g_timezones.Get().insert(timezone);
-- output->tm_zone = ret_pair.first->c_str();
-+ output->tm_zone = (char *)ret_pair.first->c_str();
- }
-
- return true;
Property changes on: branches/2019Q2/www/chromium/files/patch-sandbox_linux_services_libc_interceptor.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/2019Q2/www/chromium/files/patch-third_party_blink_renderer_platform_wtf_atomics.h
===================================================================
--- branches/2019Q2/www/chromium/files/patch-third_party_blink_renderer_platform_wtf_atomics.h (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-third_party_blink_renderer_platform_wtf_atomics.h (nonexistent)
@@ -1,11 +0,0 @@
---- third_party/blink/renderer/platform/wtf/atomics.h.orig 2018-07-19 20:13:40.615473000 +0200
-+++ third_party/blink/renderer/platform/wtf/atomics.h 2018-07-19 20:13:55.934336000 +0200
-@@ -176,7 +176,7 @@
- #if defined(THREAD_SANITIZER)
- // The definitions below assume an LP64 data model. This is fine because
- // TSan is only supported on x86_64 Linux.
--#if defined(ARCH_CPU_64_BITS) && defined(OS_LINUX)
-+#if defined(ARCH_CPU_64_BITS) && defined(OS_LINUX) || defined(OS_BSD)
- ALWAYS_INLINE void ReleaseStore(volatile int* ptr, int value) {
- __tsan_atomic32_store(ptr, value, __tsan_memory_order_release);
- }
Property changes on: branches/2019Q2/www/chromium/files/patch-third_party_blink_renderer_platform_wtf_atomics.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/2019Q2/www/chromium/files/patch-components_storage__monitor_removable_device_constants.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-components_storage__monitor_removable_device_constants.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-components_storage__monitor_removable_device_constants.cc (nonexistent)
@@ -1,11 +0,0 @@
---- components/storage_monitor/removable_device_constants.cc.orig 2019-01-10 00:46:08.199066000 +0100
-+++ components/storage_monitor/removable_device_constants.cc 2019-01-10 00:46:30.302527000 +0100
-@@ -10,7 +10,7 @@
- const char kFSUniqueIdPrefix[] = "UUID:";
- const char kVendorModelSerialPrefix[] = "VendorModelSerial:";
-
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
- const char kVendorModelVolumeStoragePrefix[] = "VendorModelVolumeStorage:";
- #endif
-
Property changes on: branches/2019Q2/www/chromium/files/patch-components_storage__monitor_removable_device_constants.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/2019Q2/www/chromium/files/patch-components_services_font_font_service_app.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-components_services_font_font_service_app.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-components_services_font_font_service_app.cc (nonexistent)
@@ -1,11 +0,0 @@
---- components/services/font/font_service_app.cc.orig 2019-01-09 12:18:51.659675000 +0100
-+++ components/services/font/font_service_app.cc 2019-01-09 12:19:08.146474000 +0100
-@@ -21,7 +21,7 @@
- #include "components/services/font/ppapi_fontconfig_matching.h" // nogncheck
- #endif
-
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
- #include "base/test/fontconfig_util_linux.h"
- #endif
-
Property changes on: branches/2019Q2/www/chromium/files/patch-components_services_font_font_service_app.cc
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: branches/2019Q2/www/chromium/files/patch-components_feature_engagement_public_event_constants.h
===================================================================
--- branches/2019Q2/www/chromium/files/patch-components_feature_engagement_public_event_constants.h (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-components_feature_engagement_public_event_constants.h (nonexistent)
@@ -1,20 +0,0 @@
---- components/feature_engagement/public/event_constants.h.orig 2017-12-24 11:50:25.527960000 +0100
-+++ components/feature_engagement/public/event_constants.h 2017-12-24 11:51:24.453190000 +0100
-@@ -42,7 +42,7 @@
- extern const char kIncognitoWindowSessionTimeMet[];
- #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.
-@@ -50,7 +50,7 @@
- // 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).
Property changes on: branches/2019Q2/www/chromium/files/patch-components_feature_engagement_public_event_constants.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/2019Q2/www/chromium/files/patch-ui_gfx_gpu_memory_buffer.h
===================================================================
--- branches/2019Q2/www/chromium/files/patch-ui_gfx_gpu_memory_buffer.h (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-ui_gfx_gpu_memory_buffer.h (nonexistent)
@@ -1,20 +0,0 @@
---- ui/gfx/gpu_memory_buffer.h.orig 2018-12-03 21:18:06.000000000 +0100
-+++ ui/gfx/gpu_memory_buffer.h 2018-12-15 20:30:42.393665000 +0100
-@@ -15,7 +15,7 @@
- #include "ui/gfx/geometry/rect.h"
- #include "ui/gfx/gfx_export.h"
-
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
- #include "ui/gfx/native_pixmap_handle.h"
- #elif defined(OS_MACOSX) && !defined(OS_IOS)
- #include "ui/gfx/mac/io_surface.h"
-@@ -65,7 +65,7 @@
- base::SharedMemoryHandle handle;
- uint32_t offset;
- int32_t stride;
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
- // TODO(crbug.com/863011): convert this to a scoped handle.
- NativePixmapHandle native_pixmap_handle;
- #elif defined(OS_MACOSX) && !defined(OS_IOS)
Property changes on: branches/2019Q2/www/chromium/files/patch-ui_gfx_gpu_memory_buffer.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/2019Q2/www/chromium/files/patch-build_linux_unbundle_replace_gn_files.py
===================================================================
--- branches/2019Q2/www/chromium/files/patch-build_linux_unbundle_replace_gn_files.py (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-build_linux_unbundle_replace_gn_files.py (nonexistent)
@@ -1,10 +0,0 @@
---- build/linux/unbundle/replace_gn_files.py.orig 2018-07-20 03:07:59.446131000 +0200
-+++ build/linux/unbundle/replace_gn_files.py 2018-07-20 03:08:31.519350000 +0200
-@@ -27,6 +27,7 @@
- 'libevent': 'base/third_party/libevent/BUILD.gn',
- 'libjpeg': 'third_party/libjpeg.gni',
- 'libpng': 'third_party/libpng/BUILD.gn',
-+ 'libusb': 'third_party/libusb/BUILD.gn',
- 'libvpx': 'third_party/libvpx/BUILD.gn',
- 'libwebp': 'third_party/libwebp/BUILD.gn',
- 'libxml': 'third_party/libxml/BUILD.gn',
Property changes on: branches/2019Q2/www/chromium/files/patch-build_linux_unbundle_replace_gn_files.py
___________________________________________________________________
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/2019Q2/www/chromium/files/patch-third__party_pdfium_fxjs_cjs_publicmethods.cpp
===================================================================
--- branches/2019Q2/www/chromium/files/patch-third__party_pdfium_fxjs_cjs_publicmethods.cpp (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-third__party_pdfium_fxjs_cjs_publicmethods.cpp (nonexistent)
@@ -1,106 +0,0 @@
---- third_party/pdfium/fxjs/cjs_publicmethods.cpp.orig 2018-03-04 04:22:35.417744000 +0100
-+++ third_party/pdfium/fxjs/cjs_publicmethods.cpp 2018-03-04 04:28:41.888908000 +0100
-@@ -70,6 +70,103 @@
- L"July", L"August", L"September",
- L"October", L"November", L"December"};
-
-+#if defined(__FreeBSD__)
-+/*
-+ * cvt.c - IEEE floating point formatting routines for FreeBSD
-+ * from GNU libc-4.6.27
-+ */
-+
-+/*
-+ * ap_ecvt converts to decimal
-+ * the number of digits is specified by ndigit
-+ * decpt is set to the position of the decimal point
-+ * sign is set to 0 for positive, 1 for negative
-+ */
-+
-+#define NDIG 80
-+
-+static char *
-+ ap_cvt(double arg, int ndigits, int *decpt, int *sign, int eflag)
-+{
-+ register int r2;
-+ double fi, fj;
-+ register char *p, *p1;
-+ static char buf[NDIG];
-+
-+ if (ndigits >= NDIG - 1)
-+ ndigits = NDIG - 2;
-+ r2 = 0;
-+ *sign = 0;
-+ p = &buf[0];
-+ if (arg < 0) {
-+ *sign = 1;
-+ arg = -arg;
-+ }
-+ arg = modf(arg, &fi);
-+ p1 = &buf[NDIG];
-+ /*
-+ * Do integer part
-+ */
-+ if (fi != 0) {
-+ p1 = &buf[NDIG];
-+ while (fi != 0) {
-+ fj = modf(fi / 10, &fi);
-+ *--p1 = (int) ((fj + .03) * 10) + '0';
-+ r2++;
-+ }
-+ while (p1 < &buf[NDIG])
-+ *p++ = *p1++;
-+ }
-+ else if (arg > 0) {
-+ while ((fj = arg * 10) < 1) {
-+ arg = fj;
-+ r2--;
-+ }
-+ }
-+ p1 = &buf[ndigits];
-+ if (eflag == 0)
-+ p1 += r2;
-+ *decpt = r2;
-+ if (p1 < &buf[0]) {
-+ buf[0] = '\0';
-+ return (buf);
-+ }
-+ while (p <= p1 && p < &buf[NDIG]) {
-+ arg *= 10;
-+ arg = modf(arg, &fj);
-+ *p++ = (int) fj + '0';
-+ }
-+ if (p1 >= &buf[NDIG]) {
-+ buf[NDIG - 1] = '\0';
-+ return (buf);
-+ }
-+ p = p1;
-+ *p1 += 5;
-+ while (*p1 > '9') {
-+ *p1 = '0';
-+ if (p1 > buf)
-+ ++ * --p1;
-+ else {
-+ *p1 = '1';
-+ (*decpt)++;
-+ if (eflag == 0) {
-+ if (p > buf)
-+ *p = '0';
-+ p++;
-+ }
-+ }
-+ }
-+ *p = '\0';
-+ return (buf);
-+}
-+
-+static char *
-+ fcvt(double arg, int ndigits, int *decpt, int *sign)
-+{
-+ return (ap_cvt(arg, ndigits, decpt, sign, 0));
-+}
-+#endif // defined(__FreeBSD__)
-+
- template <typename T>
- T StrTrim(const T& str) {
- T result = str;
Property changes on: branches/2019Q2/www/chromium/files/patch-third__party_pdfium_fxjs_cjs_publicmethods.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/2019Q2/www/chromium/files/patch-third_party_blink_renderer_platform_fonts_font_metrics.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-third_party_blink_renderer_platform_fonts_font_metrics.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-third_party_blink_renderer_platform_fonts_font_metrics.cc (nonexistent)
@@ -1,29 +0,0 @@
---- third_party/blink/renderer/platform/fonts/font_metrics.cc.orig 2018-07-19 19:27:56.537970000 +0200
-+++ third_party/blink/renderer/platform/fonts/font_metrics.cc 2018-07-19 19:28:32.800265000 +0200
-@@ -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
-@@ -60,7 +60,7 @@
- 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).
-@@ -106,7 +106,7 @@
- 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
Property changes on: branches/2019Q2/www/chromium/files/patch-third_party_blink_renderer_platform_fonts_font_metrics.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/2019Q2/www/chromium/files/patch-third_party_blink_renderer_platform_BUILD.gn
===================================================================
--- branches/2019Q2/www/chromium/files/patch-third_party_blink_renderer_platform_BUILD.gn (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-third_party_blink_renderer_platform_BUILD.gn (nonexistent)
@@ -1,10 +0,0 @@
---- third_party/blink/renderer/platform/BUILD.gn.orig 2018-07-19 20:33:30.438352000 +0200
-+++ third_party/blink/renderer/platform/BUILD.gn 2018-07-19 20:34:04.587283000 +0200
-@@ -146,6 +146,7 @@
- "//build/win:default_exe_manifest",
- "//third_party/icu",
- ]
-+ libs = [ "cxxrt" ]
- }
-
- # This isn't strictly necessary since we can just add the deps to "platform",
Property changes on: branches/2019Q2/www/chromium/files/patch-third_party_blink_renderer_platform_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/2019Q2/www/chromium/files/patch-remoting_host_remoting_me2me_host.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-remoting_host_remoting_me2me_host.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-remoting_host_remoting_me2me_host.cc (nonexistent)
@@ -1,108 +0,0 @@
---- remoting/host/remoting_me2me_host.cc.orig 2018-03-20 23:05:29.000000000 +0100
-+++ remoting/host/remoting_me2me_host.cc 2018-03-24 18:19:49.996963000 +0100
-@@ -115,13 +115,13 @@
- #include "base/mac/scoped_cftyperef.h"
- #endif // defined(OS_MACOSX)
-
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
- #include <gtk/gtk.h>
- #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 <commctrl.h>
-@@ -156,11 +156,11 @@
- 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
-@@ -351,7 +351,7 @@
-
- std::unique_ptr<ChromotingHostContext> 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<CertificateWatcher> cert_watcher_;
- #endif
-@@ -565,10 +565,10 @@
- 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;
-@@ -761,7 +761,7 @@
- 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),
-@@ -847,7 +847,7 @@
- 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()->
-@@ -856,7 +856,7 @@
- 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 =
-@@ -914,7 +914,7 @@
- // 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.
-@@ -1546,7 +1546,7 @@
- host_->AddExtension(std::make_unique<TestEchoExtension>());
-
- // TODO(simonmorris): Get the maximum session duration from a policy.
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
- host_->SetMaximumSessionDuration(base::TimeDelta::FromHours(20));
- #endif
-
-@@ -1705,7 +1705,7 @@
- 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.
Property changes on: branches/2019Q2/www/chromium/files/patch-remoting_host_remoting_me2me_host.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/2019Q2/www/chromium/files/patch-third_party_blink_renderer_platform_fonts_font_cache.h
===================================================================
--- branches/2019Q2/www/chromium/files/patch-third_party_blink_renderer_platform_fonts_font_cache.h (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-third_party_blink_renderer_platform_fonts_font_cache.h (nonexistent)
@@ -1,53 +0,0 @@
---- third_party/blink/renderer/platform/fonts/font_cache.h.orig 2019-01-30 02:18:16.000000000 +0100
-+++ third_party/blink/renderer/platform/fonts/font_cache.h 2019-02-02 11:22:47.863990000 +0100
-@@ -157,7 +157,7 @@
- sk_sp<SkFontMgr> FontManager() { return font_manager_; }
- static void SetFontManager(sk_sp<SkFontMgr>);
-
--#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_; }
-@@ -218,7 +218,7 @@
- const FontDescription&);
- #endif // defined(OS_ANDROID)
-
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
- struct PlatformFallbackFont {
- String name;
- CString filename;
-@@ -230,7 +230,7 @@
- static void GetFontForCharacter(UChar32,
- const char* preferred_locale,
- PlatformFallbackFont*);
--#endif // defined(OS_LINUX)
-+#endif // defined(OS_LINUX) || defined(OS_BSD)
-
- scoped_refptr<SimpleFontData> FontDataFromFontPlatformData(
- const FontPlatformData*,
-@@ -291,12 +291,12 @@
- 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)
- 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)
-
- scoped_refptr<SimpleFontData> FallbackOnStandardFontStyle(const FontDescription&,
- UChar32);
-@@ -327,7 +327,7 @@
- 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
-
Property changes on: branches/2019Q2/www/chromium/files/patch-third_party_blink_renderer_platform_fonts_font_cache.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/2019Q2/www/chromium/files/patch-ui_gl_gl_bindings_api_autogen_glx.h
===================================================================
--- branches/2019Q2/www/chromium/files/patch-ui_gl_gl_bindings_api_autogen_glx.h (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-ui_gl_gl_bindings_api_autogen_glx.h (nonexistent)
@@ -1,10 +0,0 @@
---- ui/gl/gl_bindings_api_autogen_glx.h.orig 2017-12-30 16:59:26.294402000 +0100
-+++ ui/gl/gl_bindings_api_autogen_glx.h 2017-12-30 17:01:57.250690000 +0100
-@@ -84,6 +84,7 @@
- GLXDrawable drawable,
- int32_t* numerator,
- int32_t* denominator) override;
-+__GLXextFuncPtr glXGetProcAddressARBFn(const GLubyte* procName) override;
- void glXGetSelectedEventFn(Display* dpy,
- GLXDrawable drawable,
- unsigned long* mask) override;
Property changes on: branches/2019Q2/www/chromium/files/patch-ui_gl_gl_bindings_api_autogen_glx.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/2019Q2/www/chromium/files/patch-services_resource_coordinator_public_cpp_memory_instrumentation_os_metrics.h
===================================================================
--- branches/2019Q2/www/chromium/files/patch-services_resource_coordinator_public_cpp_memory_instrumentation_os_metrics.h (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-services_resource_coordinator_public_cpp_memory_instrumentation_os_metrics.h (nonexistent)
@@ -1,11 +0,0 @@
---- services/resource_coordinator/public/cpp/memory_instrumentation/os_metrics.h.orig 2017-09-07 07:15:01.296724000 +0200
-+++ services/resource_coordinator/public/cpp/memory_instrumentation/os_metrics.h 2017-09-07 07:15:17.711160000 +0200
-@@ -21,7 +21,7 @@
- private:
- FRIEND_TEST_ALL_PREFIXES(OSMetricsTest, ParseProcSmaps);
-
--#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)
- };
Property changes on: branches/2019Q2/www/chromium/files/patch-services_resource_coordinator_public_cpp_memory_instrumentation_os_metrics.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/2019Q2/www/chromium/files/patch-third__party_angle_src_gpu_info_util_SystemInfo_internal.h
===================================================================
--- branches/2019Q2/www/chromium/files/patch-third__party_angle_src_gpu_info_util_SystemInfo_internal.h (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-third__party_angle_src_gpu_info_util_SystemInfo_internal.h (nonexistent)
@@ -1,16 +0,0 @@
---- third_party/angle/src/gpu_info_util/SystemInfo_internal.h.orig 2018-08-08 12:13:09.000000000 -0700
-+++ third_party/angle/src/gpu_info_util/SystemInfo_internal.h 2018-08-20 09:43:56.141492000 -0700
-@@ -14,8 +14,13 @@
- namespace angle
- {
-
-+bool CollectMesaCardInfo(std::vector<GPUDeviceInfo> *devices);
-+
- // Defined in SystemInfo_libpci when GPU_INFO_USE_LIBPCI is defined.
- bool GetPCIDevicesWithLibPCI(std::vector<GPUDeviceInfo> *devices);
-+#if defined(__FreeBSD__)
-+bool GetPCIDevicesFreeBSD(std::vector<GPUDeviceInfo> *devices);
-+#endif
- // Defined in SystemInfo_x11 when GPU_INFO_USE_X11 is defined.
- bool GetNvidiaDriverVersionWithXNVCtrl(std::string *version);
-
Property changes on: branches/2019Q2/www/chromium/files/patch-third__party_angle_src_gpu_info_util_SystemInfo_internal.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/2019Q2/www/chromium/files/patch-ui_gfx_mojo_buffer_types_struct_traits.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-ui_gfx_mojo_buffer_types_struct_traits.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-ui_gfx_mojo_buffer_types_struct_traits.cc (nonexistent)
@@ -1,38 +0,0 @@
---- ui/gfx/mojo/buffer_types_struct_traits.cc.orig 2019-01-30 02:18:54.000000000 +0100
-+++ ui/gfx/mojo/buffer_types_struct_traits.cc 2019-02-01 15:10:31.292361000 +0100
-@@ -28,7 +28,7 @@
- return data.ReadUsage(&out->usage) && data.ReadFormat(&out->format);
- }
-
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
- std::vector<mojo::ScopedHandle>
- StructTraits<gfx::mojom::NativePixmapHandleDataView, gfx::NativePixmapHandle>::
- fds(const gfx::NativePixmapHandle& pixmap_handle) {
-@@ -55,7 +55,7 @@
- }
- return data.ReadPlanes(&out->planes);
- }
--#endif // defined(OS_LINUX)
-+#endif // defined(OS_LINUX) || defined(OS_BSD)
-
- gfx::mojom::GpuMemoryBufferPlatformHandlePtr StructTraits<
- gfx::mojom::GpuMemoryBufferHandleDataView,
-@@ -68,7 +68,7 @@
- return gfx::mojom::GpuMemoryBufferPlatformHandle::NewSharedMemoryHandle(
- std::move(handle.region));
- case gfx::NATIVE_PIXMAP:
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
- return gfx::mojom::GpuMemoryBufferPlatformHandle::NewNativePixmapHandle(
- handle.native_pixmap_handle);
- #else
-@@ -144,7 +144,7 @@
- out->type = gfx::SHARED_MEMORY_BUFFER;
- out->region = std::move(platform_handle->get_shared_memory_handle());
- return true;
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
- case gfx::mojom::GpuMemoryBufferPlatformHandleDataView::Tag::
- NATIVE_PIXMAP_HANDLE:
- out->type = gfx::NATIVE_PIXMAP;
Property changes on: branches/2019Q2/www/chromium/files/patch-ui_gfx_mojo_buffer_types_struct_traits.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/2019Q2/www/chromium/files/patch-third__party_swiftshader_src_OpenGL_libGLES_CM_libGLES_CM.hpp
===================================================================
--- branches/2019Q2/www/chromium/files/patch-third__party_swiftshader_src_OpenGL_libGLES_CM_libGLES_CM.hpp (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-third__party_swiftshader_src_OpenGL_libGLES_CM_libGLES_CM.hpp (nonexistent)
@@ -1,11 +0,0 @@
---- third_party/swiftshader/src/OpenGL/libGLES_CM/libGLES_CM.hpp.orig 2018-12-03 21:20:24.000000000 +0100
-+++ third_party/swiftshader/src/OpenGL/libGLES_CM/libGLES_CM.hpp 2018-12-15 16:45:47.909334000 +0100
-@@ -261,7 +261,7 @@
- #endif
- #elif defined(__ANDROID__)
- const char *libGLES_CM_lib[] = {"libGLESv1_CM_swiftshader.so", "libGLESv1_CM_swiftshader.so"};
-- #elif defined(__linux__)
-+ #elif defined(__linux__) || defined(__FreeBSD__)
- #if defined(__LP64__)
- const char *libGLES_CM_lib[] = {"lib64GLES_CM_translator.so", "libGLES_CM.so.1", "libGLES_CM.so"};
- #else
Property changes on: branches/2019Q2/www/chromium/files/patch-third__party_swiftshader_src_OpenGL_libGLES_CM_libGLES_CM.hpp
___________________________________________________________________
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/2019Q2/www/chromium/files/patch-gpu_ipc_service_gpu_watchdog_thread.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-gpu_ipc_service_gpu_watchdog_thread.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-gpu_ipc_service_gpu_watchdog_thread.cc (nonexistent)
@@ -1,73 +0,0 @@
---- gpu/ipc/service/gpu_watchdog_thread.cc.orig 2019-01-12 22:38:32.375483000 +0100
-+++ gpu/ipc/service/gpu_watchdog_thread.cc 2019-01-12 22:42:03.901161000 +0100
-@@ -46,8 +46,10 @@
- #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
-
-@@ -70,8 +72,10 @@
- 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);
-
-@@ -86,7 +90,9 @@
- #endif
-
- #if defined(USE_X11)
-+#if !defined(OS_BSD)
- tty_file_ = base::OpenFile(base::FilePath(kTtyFilePath), "r");
-+#endif
- SetupXServer();
- #endif
- watched_message_loop_->AddTaskObserver(&task_observer_);
-@@ -231,8 +237,10 @@
- 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_);
-@@ -453,7 +461,7 @@
- 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) {
-@@ -516,7 +524,9 @@
- CopyFromParent, InputOutput, CopyFromParent, 0, nullptr);
- atom_ = XInternAtom(display_, "CHECK", x11::False);
- }
-+#if !defined(OS_BSD)
- host_tty_ = GetActiveTTY();
-+#endif
- }
-
- void GpuWatchdogThread::SetupXChangeProp() {
-@@ -617,7 +627,7 @@
- }
- #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) &&
Property changes on: branches/2019Q2/www/chromium/files/patch-gpu_ipc_service_gpu_watchdog_thread.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/2019Q2/www/chromium/files/patch-gpu_command_buffer_common_gpu_memory_buffer_support.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-gpu_command_buffer_common_gpu_memory_buffer_support.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-gpu_command_buffer_common_gpu_memory_buffer_support.cc (nonexistent)
@@ -1,11 +0,0 @@
---- gpu/command_buffer/common/gpu_memory_buffer_support.cc.orig 2019-01-30 02:18:02.000000000 +0100
-+++ gpu/command_buffer/common/gpu_memory_buffer_support.cc 2019-02-01 09:18:35.535261000 +0100
-@@ -89,7 +89,7 @@
- uint32_t GetPlatformSpecificTextureTarget() {
- #if defined(OS_MACOSX)
- return GL_TEXTURE_RECTANGLE_ARB;
--#elif defined(OS_ANDROID) || defined(OS_LINUX)
-+#elif defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD)
- return GL_TEXTURE_EXTERNAL_OES;
- #elif defined(OS_WIN)
- return GL_TEXTURE_2D;
Property changes on: branches/2019Q2/www/chromium/files/patch-gpu_command_buffer_common_gpu_memory_buffer_support.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/2019Q2/www/chromium/files/patch-net_proxy_resolution_proxy_resolution_service.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-net_proxy_resolution_proxy_resolution_service.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-net_proxy_resolution_proxy_resolution_service.cc (nonexistent)
@@ -1,29 +0,0 @@
---- net/proxy_resolution/proxy_resolution_service.cc.orig 2018-07-19 15:31:33.121813000 +0200
-+++ net/proxy_resolution/proxy_resolution_service.cc 2018-07-19 15:32:46.994020000 +0200
-@@ -47,7 +47,7 @@
- #elif defined(OS_MACOSX)
- #include "net/proxy_resolution/proxy_config_service_mac.h"
- #include "net/proxy_resolution/proxy_resolver_mac.h"
--#elif defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#elif (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
- #include "net/proxy_resolution/proxy_config_service_linux.h"
- #elif defined(OS_ANDROID)
- #include "net/proxy_resolution/proxy_config_service_android.h"
-@@ -61,7 +61,7 @@
- namespace {
-
- #if defined(OS_WIN) || defined(OS_IOS) || defined(OS_MACOSX) || \
-- (defined(OS_LINUX) && !defined(OS_CHROMEOS))
-+ ((defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS))
- constexpr net::NetworkTrafficAnnotationTag kSystemProxyConfigTrafficAnnotation =
- net::DefineNetworkTrafficAnnotation("proxy_config_system", R"(
- semantics {
-@@ -1507,7 +1507,7 @@
- << "profile_io_data.cc::CreateProxyConfigService and this should "
- << "be used only for examples.";
- return std::make_unique<UnsetProxyConfigService>();
--#elif defined(OS_LINUX)
-+#elif defined(OS_LINUX) || defined(OS_BSD)
- std::unique_ptr<ProxyConfigServiceLinux> linux_config_service(
- new ProxyConfigServiceLinux());
-
Property changes on: branches/2019Q2/www/chromium/files/patch-net_proxy_resolution_proxy_resolution_service.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/2019Q2/www/chromium/files/patch-services_service__manager_zygote_zygote_main_linux.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-services_service__manager_zygote_zygote_main_linux.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-services_service__manager_zygote_zygote_main_linux.cc (nonexistent)
@@ -1,48 +0,0 @@
---- services/service_manager/zygote/zygote_main_linux.cc.orig 2018-08-04 19:15:20.665086000 +0200
-+++ services/service_manager/zygote/zygote_main_linux.cc 2018-08-04 19:17:50.032823000 +0200
-@@ -11,7 +11,9 @@
- #include <stddef.h>
- #include <stdint.h>
- #include <string.h>
-+#if !defined(OS_BSD)
- #include <sys/prctl.h>
-+#endif
- #include <sys/socket.h>
- #include <sys/types.h>
- #include <unistd.h>
-@@ -101,6 +103,7 @@
- // created through the setuid sandbox.
- static bool EnterSuidSandbox(sandbox::SetuidSandboxClient* setuid_sandbox,
- base::OnceClosure post_fork_parent_callback) {
-+#if !defined(OS_BSD)
- DCHECK(setuid_sandbox);
- DCHECK(setuid_sandbox->IsSuidSandboxChild());
-
-@@ -133,6 +136,9 @@
-
- CHECK(service_manager::SandboxDebugHandling::SetDumpableStatusAndHandlers());
- return true;
-+#else
-+ return false;
-+#endif
- }
-
- static void DropAllCapabilities(int proc_fd) {
-@@ -178,6 +184,7 @@
-
- bool ZygoteMain(
- std::vector<std::unique_ptr<ZygoteForkDelegate>> fork_delegates) {
-+#if !defined(OS_BSD)
- sandbox::SetAmZygoteOrRenderer(true, GetSandboxFD());
-
- auto* linux_sandbox = service_manager::SandboxLinux::GetInstance();
-@@ -240,6 +247,9 @@
-
- // This function call can return multiple times, once per fork().
- return zygote.ProcessRequests();
-+#else
-+ return false;
-+#endif
- }
-
- } // namespace service_manager
Property changes on: branches/2019Q2/www/chromium/files/patch-services_service__manager_zygote_zygote_main_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/2019Q2/www/chromium/files/patch-third__party_yasm_BUILD.gn
===================================================================
--- branches/2019Q2/www/chromium/files/patch-third__party_yasm_BUILD.gn (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-third__party_yasm_BUILD.gn (nonexistent)
@@ -1,16 +0,0 @@
---- third_party/yasm/BUILD.gn.orig 2017-12-15 02:04:50.000000000 +0100
-+++ third_party/yasm/BUILD.gn 2017-12-24 19:31:25.638531000 +0100
-@@ -60,7 +60,12 @@
- # x86insn_nasm.c. These files were previously generated during the build but
- # are now shipped pre-generated by yasm.
- yasm_gen_include_dir = "$target_gen_dir/gen_include"
-- config_makefile = "source/config/Makefile"
-+ # Hack for all BSD derivatives use OpenBSD include directory
-+ if (is_bsd) {
-+ config_makefile = "source/config/openbsd/Makefile"
-+ } else {
-+ config_makefile = "source/config/$host_os/Makefile"
-+ }
- version_file = "version.mac"
-
- import("//build/compiled_action.gni")
Property changes on: branches/2019Q2/www/chromium/files/patch-third__party_yasm_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/2019Q2/www/chromium/files/patch-build_toolchain_gcc_toolchain.gni
===================================================================
--- branches/2019Q2/www/chromium/files/patch-build_toolchain_gcc_toolchain.gni (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-build_toolchain_gcc_toolchain.gni (nonexistent)
@@ -1,45 +0,0 @@
---- build/toolchain/gcc_toolchain.gni.orig 2018-03-20 23:05:14.000000000 +0100
-+++ build/toolchain/gcc_toolchain.gni 2018-06-18 20:55:17.080248000 +0200
-@@ -25,6 +25,11 @@
- rebase_path("//build/toolchain/clang_static_analyzer_wrapper.py",
- root_build_dir) + " --mode=clang"
-
-+declare_args() {
-+ extra_cxxflags = ""
-+ extra_ldflags = ""
-+}
-+
- # This template defines a toolchain for something that works like gcc
- # (including clang).
- #
-@@ -596,13 +601,23 @@
- }
-
- gcc_toolchain(target_name) {
-- prefix = rebase_path("$clang_base_path/bin", root_build_dir)
-- cc = "$prefix/clang"
-- cxx = "$prefix/clang++"
-- ld = cxx
-- readelf = "${toolprefix}readelf"
-- ar = "${prefix}/llvm-ar"
-- nm = "${toolprefix}nm"
-+ if (is_bsd) {
-+ prefix = "/usr/local/bin"
-+ cc = "cc"
-+ cxx = "c++"
-+ ld = cxx
-+ readelf = "readelf"
-+ ar = "${prefix}/ar"
-+ nm = "${toolprefix}nm"
-+ } else {
-+ prefix = rebase_path("$clang_base_path/bin", root_build_dir)
-+ cc = "$prefix/clang"
-+ cxx = "$prefix/clang++"
-+ ld = cxx
-+ readelf = "${toolprefix}readelf"
-+ ar = "${prefix}/llvm-ar"
-+ nm = "${toolprefix}nm"
-+ }
-
- forward_variables_from(invoker,
- [
Property changes on: branches/2019Q2/www/chromium/files/patch-build_toolchain_gcc_toolchain.gni
___________________________________________________________________
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/2019Q2/www/chromium/files/patch-chrome_browser_browser__process__impl.h
===================================================================
--- branches/2019Q2/www/chromium/files/patch-chrome_browser_browser__process__impl.h (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-chrome_browser_browser__process__impl.h (nonexistent)
@@ -1,20 +0,0 @@
---- chrome/browser/browser_process_impl.h.orig 2019-02-12 16:33:04.676012000 +0100
-+++ chrome/browser/browser_process_impl.h 2019-02-12 16:33:35.429453000 +0100
-@@ -367,7 +367,7 @@
- std::unique_ptr<ChromeResourceDispatcherHostDelegate>
- resource_dispatcher_host_delegate_;
-
--#if defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS))
-+#if defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
- base::RepeatingTimer autoupdate_timer_;
-
- // Gets called by autoupdate timer to see if browser needs restart and can be
-@@ -376,7 +376,7 @@
- bool IsRunningInBackground() const;
- void OnPendingRestartResult(bool is_update_pending_restart);
- void RestartBackgroundInstance();
--#endif // defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS))
-+#endif // defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
-
- // component updater is normally not used under ChromeOS due
- // to concerns over integrity of data shared between profiles,
Property changes on: branches/2019Q2/www/chromium/files/patch-chrome_browser_browser__process__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/2019Q2/www/chromium/files/patch-tools_json_schema_compiler_feature_compiler.py
===================================================================
--- branches/2019Q2/www/chromium/files/patch-tools_json_schema_compiler_feature_compiler.py (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-tools_json_schema_compiler_feature_compiler.py (nonexistent)
@@ -1,10 +0,0 @@
---- tools/json_schema_compiler/feature_compiler.py.orig 2017-12-30 06:35:45.162972000 +0100
-+++ tools/json_schema_compiler/feature_compiler.py 2017-12-30 06:37:35.101873000 +0100
-@@ -211,6 +211,7 @@
- 'enum_map': {
- 'chromeos': 'Feature::CHROMEOS_PLATFORM',
- 'linux': 'Feature::LINUX_PLATFORM',
-+ 'bsd': 'Feature::LINUX_PLATFORM',
- 'mac': 'Feature::MACOSX_PLATFORM',
- 'win': 'Feature::WIN_PLATFORM',
- }
Property changes on: branches/2019Q2/www/chromium/files/patch-tools_json_schema_compiler_feature_compiler.py
___________________________________________________________________
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/2019Q2/www/chromium/files/patch-extensions_shell_app_shell_main_delegate.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-extensions_shell_app_shell_main_delegate.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-extensions_shell_app_shell_main_delegate.cc (nonexistent)
@@ -1,29 +0,0 @@
---- extensions/shell/app/shell_main_delegate.cc.orig 2019-01-11 19:10:53.125547000 +0100
-+++ extensions/shell/app/shell_main_delegate.cc 2019-01-11 19:11:57.764029000 +0100
-@@ -38,7 +38,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"
-@@ -52,7 +52,7 @@
-
- namespace {
-
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
- extensions::ShellCrashReporterClient* GetCrashReporterClient() {
- static base::NoDestructor<extensions::ShellCrashReporterClient> instance;
- return instance.get();
-@@ -70,7 +70,7 @@
- return cmd_line->GetSwitchValuePath(switches::kContentShellDataPath);
-
- base::FilePath data_dir;
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
- std::unique_ptr<base::Environment> env(base::Environment::Create());
- data_dir = base::nix::GetXDGDirectory(
- env.get(), base::nix::kXdgConfigHomeEnvVar, base::nix::kDotConfigDir);
Property changes on: branches/2019Q2/www/chromium/files/patch-extensions_shell_app_shell_main_delegate.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/2019Q2/www/chromium/files/patch-third__party_skia_src_ports_SkFontHost_Freetype.cpp
===================================================================
--- branches/2019Q2/www/chromium/files/patch-third__party_skia_src_ports_SkFontHost_Freetype.cpp (revision 497958)
+++ branches/2019Q2/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-01-30 02:20:41.000000000 +0100
-+++ third_party/skia/src/ports/SkFontHost_FreeType.cpp 2019-02-01 13:08:18.165178000 +0100
-@@ -121,8 +121,6 @@
- : fGetVarDesignCoordinates(nullptr)
- , fGetVarAxisFlags(nullptr)
- , fLibrary(nullptr)
-- , fIsLCDSupported(false)
-- , fLCDExtra(0)
- {
- if (FT_New_Library(&gFTMemory, &fLibrary)) {
- return;
-@@ -182,12 +180,7 @@
- }
- #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) {
-@@ -196,8 +189,6 @@
- }
-
- 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.
-@@ -214,8 +205,6 @@
-
- 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.
-@@ -713,17 +702,6 @@
- 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
-@@ -1137,11 +1115,11 @@
- 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/2019Q2/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/2019Q2/www/chromium/files/patch-third__party_webrtc_rtc_base_network.h
===================================================================
--- branches/2019Q2/www/chromium/files/patch-third__party_webrtc_rtc_base_network.h (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-third__party_webrtc_rtc_base_network.h (nonexistent)
@@ -1,13 +0,0 @@
---- third_party/webrtc/rtc_base/network.h.orig 2017-09-07 00:56:08.460370000 +0200
-+++ third_party/webrtc/rtc_base/network.h 2017-09-07 01:05:58.608460000 +0200
-@@ -24,6 +24,10 @@
- #include "webrtc/rtc_base/networkmonitor.h"
- #include "webrtc/rtc_base/sigslot.h"
-
-+#if defined(WEBRTC_BSD)
-+#include <sys/types.h>
-+#endif
-+
- #if defined(WEBRTC_POSIX)
- struct ifaddrs;
- #endif // defined(WEBRTC_POSIX)
Property changes on: branches/2019Q2/www/chromium/files/patch-third__party_webrtc_rtc_base_network.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/2019Q2/www/chromium/files/patch-content_gpu_gpu_sandbox_hook_linux.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-content_gpu_gpu_sandbox_hook_linux.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-content_gpu_gpu_sandbox_hook_linux.cc (nonexistent)
@@ -1,58 +0,0 @@
---- content/gpu/gpu_sandbox_hook_linux.cc.orig 2018-12-12 22:56:07.000000000 +0100
-+++ content/gpu/gpu_sandbox_hook_linux.cc 2019-01-11 16:30:27.925996000 +0100
-@@ -95,8 +95,9 @@
- "/usr/lib/libv4l/plugins/libv4l-encplugin.so";
- #endif
-
--constexpr int dlopen_flag = RTLD_NOW | RTLD_GLOBAL | RTLD_NODELETE;
-+constexpr int dlopen_flag = RTLD_NOW | RTLD_GLOBAL;
-
-+#if !defined(OS_BSD)
- void AddV4L2GpuWhitelist(
- std::vector<BrokerFilePermission>* permissions,
- const service_manager::SandboxSeccompBPF::Options& options) {
-@@ -265,8 +266,10 @@
- AddStandardGpuWhiteList(&permissions);
- return permissions;
- }
-+#endif
-
- void LoadArmGpuLibraries() {
-+#if !defined(OS_BSD)
- // Preload the Mali library.
- if (UseChromecastSandboxWhitelist()) {
- for (const char* path : kWhitelistedChromecastPaths) {
-@@ -281,6 +284,7 @@
- // Preload the Tegra V4L2 (video decode acceleration) library.
- dlopen(kLibTegraPath, dlopen_flag);
- }
-+#endif
- }
-
- bool LoadAmdGpuLibraries() {
-@@ -336,6 +340,7 @@
- return true;
- }
-
-+#if !defined(OS_BSD)
- sandbox::syscall_broker::BrokerCommandSet CommandSetForGPU(
- const service_manager::SandboxLinux::Options& options) {
- sandbox::syscall_broker::BrokerCommandSet command_set;
-@@ -356,13 +361,17 @@
- 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;
Property changes on: branches/2019Q2/www/chromium/files/patch-content_gpu_gpu_sandbox_hook_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/2019Q2/www/chromium/files/patch-third__party_angle_src_gpu_info_util_SystemInfo_linux.cpp
===================================================================
--- branches/2019Q2/www/chromium/files/patch-third__party_angle_src_gpu_info_util_SystemInfo_linux.cpp (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-third__party_angle_src_gpu_info_util_SystemInfo_linux.cpp (nonexistent)
@@ -1,21 +0,0 @@
---- third_party/angle/src/gpu_info_util/SystemInfo_linux.cpp.orig 2018-08-08 12:13:09.000000000 -0700
-+++ third_party/angle/src/gpu_info_util/SystemInfo_linux.cpp 2018-08-20 09:50:36.331947000 -0700
-@@ -71,10 +71,18 @@
-
- bool GetSystemInfo(SystemInfo *info)
- {
-+#if defined(__FreeBSD__)
-+ if (!CollectMesaCardInfo(&(info->gpus)))
-+ {
-+ if (!GetPCIDevicesFreeBSD(&(info->gpus)))
-+ return false;
-+ }
-+#else
- if (!GetPCIDevicesWithLibPCI(&(info->gpus)))
- {
- return false;
- }
-+#endif
-
- if (info->gpus.size() == 0)
- {
Property changes on: branches/2019Q2/www/chromium/files/patch-third__party_angle_src_gpu_info_util_SystemInfo_linux.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/2019Q2/www/chromium/files/patch-third_party_blink_renderer_platform_wtf_threading_pthreads.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-third_party_blink_renderer_platform_wtf_threading_pthreads.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-third_party_blink_renderer_platform_wtf_threading_pthreads.cc (nonexistent)
@@ -1,22 +0,0 @@
---- third_party/blink/renderer/platform/wtf/threading_pthreads.cc.orig 2018-12-03 21:17:54.000000000 +0100
-+++ third_party/blink/renderer/platform/wtf/threading_pthreads.cc 2018-12-15 18:34:37.670619000 +0100
-@@ -52,12 +52,17 @@
- #include <objc/objc-auto.h>
- #endif
-
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
- #include <sys/syscall.h>
- #endif
-
--#if defined(OS_LINUX) || defined(OS_ANDROID)
-+#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD)
- #include <unistd.h>
-+#endif
-+
-+#if defined(OS_BSD)
-+#include <sys/signal.h>
-+#include <pthread_np.h>
- #endif
-
- namespace WTF {
Property changes on: branches/2019Q2/www/chromium/files/patch-third_party_blink_renderer_platform_wtf_threading_pthreads.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/2019Q2/www/chromium/files/patch-ui_gfx_codec_jpeg_codec.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-ui_gfx_codec_jpeg_codec.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-ui_gfx_codec_jpeg_codec.cc (nonexistent)
@@ -1,20 +0,0 @@
---- ui/gfx/codec/jpeg_codec.cc.orig 2017-10-14 03:14:08.077073000 +0200
-+++ ui/gfx/codec/jpeg_codec.cc 2017-10-14 03:25:59.561802000 +0200
-@@ -219,6 +219,7 @@
- case JCS_GRAYSCALE:
- case JCS_RGB:
- case JCS_YCbCr:
-+#ifdef JCS_EXTENSIONS
- // Choose an output colorspace and return if it is an unsupported one.
- // Same as JPEGCodec::Encode(), libjpeg-turbo supports all input formats
- // used by Chromium (i.e. RGBA and BGRA) and we just map the input
-@@ -237,6 +238,9 @@
- NOTREACHED() << "Invalid pixel format";
- return false;
- }
-+#else
-+ cinfo.out_color_space = JCS_RGB;
-+#endif
- break;
- case JCS_CMYK:
- case JCS_YCCK:
Property changes on: branches/2019Q2/www/chromium/files/patch-ui_gfx_codec_jpeg_codec.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/2019Q2/www/chromium/files/patch-third__party_webrtc_rtc_base_network.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-third__party_webrtc_rtc_base_network.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-third__party_webrtc_rtc_base_network.cc (nonexistent)
@@ -1,29 +0,0 @@
---- third_party/webrtc/rtc_base/network.cc.orig 2017-09-07 00:56:00.388312000 +0200
-+++ third_party/webrtc/rtc_base/network.cc 2017-09-07 01:03:02.971562000 +0200
-@@ -14,7 +14,7 @@
- // linux/if.h can't be included at the same time as the posix sys/if.h, and
- // it's transitively required by linux/route.h, so include that version on
- // linux instead of the standard posix one.
--#if defined(WEBRTC_LINUX)
-+#if defined(WEBRTC_LINUX) && !defined(WEBRTC_BSD)
- #include <linux/if.h>
- #include <linux/route.h>
- #elif !defined(__native_client__)
-@@ -658,7 +658,7 @@
- }
- #endif // WEBRTC_WIN
-
--#if defined(WEBRTC_LINUX)
-+#if defined(WEBRTC_LINUX) && !defined(WEBRTC_BSD)
- bool IsDefaultRoute(const std::string& network_name) {
- FileStream fs;
- if (!fs.Open("/proc/net/route", "r", nullptr)) {
-@@ -701,7 +701,7 @@
- strncmp(network.name().c_str(), "vboxnet", 7) == 0) {
- return true;
- }
--#if defined(WEBRTC_LINUX)
-+#if defined(WEBRTC_LINUX) && !defined(WEBRTC_BSD)
- // Make sure this is a default route, if we're ignoring non-defaults.
- if (ignore_non_default_routes_ && !IsDefaultRoute(network.name())) {
- return true;
Property changes on: branches/2019Q2/www/chromium/files/patch-third__party_webrtc_rtc_base_network.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/2019Q2/www/chromium/files/patch-third_party_googletest_src_googletest_src_gtest.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-third_party_googletest_src_googletest_src_gtest.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-third_party_googletest_src_googletest_src_gtest.cc (nonexistent)
@@ -1,10 +0,0 @@
---- third_party/googletest/src/googletest/src/gtest.cc.orig 2018-08-23 02:47:05.784079000 +0200
-+++ third_party/googletest/src/googletest/src/gtest.cc 2018-08-23 02:47:43.415365000 +0200
-@@ -128,6 +128,7 @@
-
- #if GTEST_CAN_STREAM_RESULTS_
- # include <arpa/inet.h> // NOLINT
-+# include <sys/socket.h> // NOLINT
- # include <netdb.h> // NOLINT
- # include <sys/socket.h> // NOLINT
- # include <sys/types.h> // NOLINT
Property changes on: branches/2019Q2/www/chromium/files/patch-third_party_googletest_src_googletest_src_gtest.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/2019Q2/www/chromium/files/patch-components_feature_engagement_public_event_constants.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-components_feature_engagement_public_event_constants.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-components_feature_engagement_public_event_constants.cc (nonexistent)
@@ -1,14 +0,0 @@
---- components/feature_engagement/public/event_constants.cc.orig 2017-12-24 11:50:13.400967000 +0100
-+++ components/feature_engagement/public/event_constants.cc 2017-12-24 11:50:56.302146000 +0100
-@@ -24,9 +24,9 @@
-
- #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";
Property changes on: branches/2019Q2/www/chromium/files/patch-components_feature_engagement_public_event_constants.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/2019Q2/www/chromium/files/patch-third__party_ffmpeg_BUILD.gn
===================================================================
--- branches/2019Q2/www/chromium/files/patch-third__party_ffmpeg_BUILD.gn (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-third__party_ffmpeg_BUILD.gn (nonexistent)
@@ -1,18 +0,0 @@
---- third_party/ffmpeg/BUILD.gn.orig 2017-04-19 19:07:44 UTC
-+++ third_party/ffmpeg/BUILD.gn
-@@ -6,8 +6,13 @@ import("ffmpeg_options.gni")
- import("ffmpeg_generated.gni")
-
- # Path to platform configuration files.
--platform_config_root =
-- "chromium/config/$ffmpeg_branding/$os_config/$ffmpeg_arch"
-+if (!is_bsd) {
-+ platform_config_root =
-+ "chromium/config/$ffmpeg_branding/$os_config/$ffmpeg_arch"
-+} else {
-+ platform_config_root =
-+ "chromium/config/$ffmpeg_branding/linux/$ffmpeg_arch"
-+}
-
- has_yasm_deps =
- ffmpeg_yasm_sources != [] &&
Property changes on: branches/2019Q2/www/chromium/files/patch-third__party_ffmpeg_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/2019Q2/www/chromium/files/patch-services_service__manager_zygote_zygote_linux.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-services_service__manager_zygote_zygote_linux.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-services_service__manager_zygote_zygote_linux.cc (nonexistent)
@@ -1,15 +0,0 @@
---- services/service_manager/zygote/zygote_linux.cc.orig 2018-08-04 19:15:10.269247000 +0200
-+++ services/service_manager/zygote/zygote_linux.cc 2018-08-04 19:16:18.712635000 +0200
-@@ -1,6 +1,7 @@
- // Copyright (c) 2012 The Chromium Authors. All rights reserved.
- // Use of this source code is governed by a BSD-style license that can be
- // found in the LICENSE file.
-+#if 0
-
- #include "services/service_manager/zygote/zygote_linux.h"
-
-@@ -664,3 +665,4 @@
- }
-
- } // namespace service_manager
-+#endif
Property changes on: branches/2019Q2/www/chromium/files/patch-services_service__manager_zygote_zygote_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/2019Q2/www/chromium/files/patch-third__party_webrtc_rtc_base_BUILD.gn
===================================================================
--- branches/2019Q2/www/chromium/files/patch-third__party_webrtc_rtc_base_BUILD.gn (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-third__party_webrtc_rtc_base_BUILD.gn (nonexistent)
@@ -1,20 +0,0 @@
---- third_party/webrtc/rtc_base/BUILD.gn.orig 2017-12-15 02:05:40.000000000 +0100
-+++ third_party/webrtc/rtc_base/BUILD.gn 2017-12-24 19:35:21.721858000 +0100
-@@ -649,8 +649,6 @@
-
- if (use_x11) {
- libs += [
-- "dl",
-- "rt",
- "Xext",
- "X11",
- "Xcomposite",
-@@ -658,7 +656,7 @@
- ]
- }
-
-- if (is_linux) {
-+ if (is_linux && !is_bsd) {
- libs += [
- "dl",
- "rt",
Property changes on: branches/2019Q2/www/chromium/files/patch-third__party_webrtc_rtc_base_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/2019Q2/www/chromium/files/patch-ui_gfx_linux_client_native_pixmap_dmabuf.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-ui_gfx_linux_client_native_pixmap_dmabuf.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-ui_gfx_linux_client_native_pixmap_dmabuf.cc (nonexistent)
@@ -1,25 +0,0 @@
---- ui/gfx/linux/client_native_pixmap_dmabuf.cc.orig 2017-08-02 16:54:46.101075000 +0200
-+++ ui/gfx/linux/client_native_pixmap_dmabuf.cc 2017-08-02 16:55:49.754442000 +0200
-@@ -5,7 +5,9 @@
- #include "ui/gfx/linux/client_native_pixmap_dmabuf.h"
-
- #include <fcntl.h>
-+#if !defined(__FreeBSD__)
- #include <linux/version.h>
-+#endif
- #include <stddef.h>
- #include <sys/ioctl.h>
- #include <sys/mman.h>
-@@ -19,11 +21,7 @@
- #include "base/strings/stringprintf.h"
- #include "base/trace_event/trace_event.h"
-
--#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0)
--#include <linux/dma-buf.h>
--#else
--#include <linux/types.h>
--
-+#if defined(__FreeBSD__)
- struct dma_buf_sync {
- __u64 flags;
- };
Property changes on: branches/2019Q2/www/chromium/files/patch-ui_gfx_linux_client_native_pixmap_dmabuf.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/2019Q2/www/chromium/files/patch-ipc_ipc__channel_mojo.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-ipc_ipc__channel_mojo.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-ipc_ipc__channel_mojo.cc (nonexistent)
@@ -1,11 +0,0 @@
---- ipc/ipc_channel_mojo.cc.orig 2017-08-10 04:18:45.930792000 +0200
-+++ ipc/ipc_channel_mojo.cc 2017-08-10 04:19:05.792138000 +0200
-@@ -228,7 +228,7 @@
- }
-
- base::ProcessId GetSelfPID() {
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
- if (int global_pid = Channel::GetGlobalPid())
- return global_pid;
- #endif // OS_LINUX
Property changes on: branches/2019Q2/www/chromium/files/patch-ipc_ipc__channel_mojo.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/2019Q2/www/chromium/files/patch-third_party_blink_renderer_platform_wtf_stack_util.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-third_party_blink_renderer_platform_wtf_stack_util.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-third_party_blink_renderer_platform_wtf_stack_util.cc (nonexistent)
@@ -1,14 +0,0 @@
---- third_party/blink/renderer/platform/wtf/stack_util.cc.orig 2018-07-19 20:18:16.483555000 +0200
-+++ third_party/blink/renderer/platform/wtf/stack_util.cc 2018-07-19 20:18:51.633152000 +0200
-@@ -16,6 +16,11 @@
- extern "C" void* __libc_stack_end; // NOLINT
- #endif
-
-+#if defined(OS_FREEBSD)
-+#include <sys/signal.h>
-+#include <pthread_np.h>
-+#endif
-+
- namespace WTF {
-
- size_t GetUnderestimatedStackSize() {
Property changes on: branches/2019Q2/www/chromium/files/patch-third_party_blink_renderer_platform_wtf_stack_util.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/2019Q2/www/chromium/files/patch-ui_gl_gl_bindings_autogen_glx.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-ui_gl_gl_bindings_autogen_glx.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-ui_gl_gl_bindings_autogen_glx.cc (nonexistent)
@@ -1,61 +0,0 @@
---- ui/gl/gl_bindings_autogen_glx.cc.orig 2018-12-03 21:18:06.000000000 +0100
-+++ ui/gl/gl_bindings_autogen_glx.cc 2018-12-15 20:44:07.948273000 +0100
-@@ -115,6 +115,8 @@
-
- ext.b_GLX_ARB_create_context =
- gfx::HasExtension(extensions, "GLX_ARB_create_context");
-+ ext.b_GLX_ARB_get_proc_address =
-+ gfx::HasExtension(extensions, "GLX_ARB_get_proc_address");
- ext.b_GLX_EXT_swap_control =
- gfx::HasExtension(extensions, "GLX_EXT_swap_control");
- ext.b_GLX_EXT_texture_from_pixmap =
-@@ -145,6 +147,11 @@
- GetGLProcAddress("glXCreateContextAttribsARB"));
- }
-
-+ if (ext.b_GLX_ARB_get_proc_address) {
-+ fn.glXGetProcAddressARBFn = reinterpret_cast<glXGetProcAddressARBProc>(
-+ GetGLProcAddress("glXGetProcAddressARB"));
-+ }
-+
- if (ext.b_GLX_SGIX_fbconfig) {
- fn.glXGetFBConfigFromVisualSGIXFn =
- reinterpret_cast<glXGetFBConfigFromVisualSGIXProc>(
-@@ -346,6 +353,10 @@
- return driver_->fn.glXGetMscRateOMLFn(dpy, drawable, numerator, denominator);
- }
-
-+__GLXextFuncPtr GLXApiBase::glXGetProcAddressARBFn(const GLubyte* procName) {
-+ return driver_->fn.glXGetProcAddressARBFn(procName);
-+}
-+
- void GLXApiBase::glXGetSelectedEventFn(Display* dpy,
- GLXDrawable drawable,
- unsigned long* mask) {
-@@ -646,6 +657,11 @@
- return glx_api_->glXGetMscRateOMLFn(dpy, drawable, numerator, denominator);
- }
-
-+__GLXextFuncPtr TraceGLXApi::glXGetProcAddressARBFn(const GLubyte* procName) {
-+ TRACE_EVENT_BINARY_EFFICIENT0("gpu", "TraceGLAPI::glXGetProcAddressARB")
-+ return glx_api_->glXGetProcAddressARBFn(procName);
-+}
-+
- void TraceGLXApi::glXGetSelectedEventFn(Display* dpy,
- GLXDrawable drawable,
- unsigned long* mask) {
-@@ -1068,6 +1084,14 @@
- << static_cast<const void*>(denominator) << ")");
- bool result =
- glx_api_->glXGetMscRateOMLFn(dpy, drawable, numerator, denominator);
-+ GL_SERVICE_LOG("GL_RESULT: " << result);
-+ return result;
-+}
-+
-+__GLXextFuncPtr DebugGLXApi::glXGetProcAddressARBFn(const GLubyte* procName) {
-+ GL_SERVICE_LOG("glXGetProcAddressARB"
-+ << "(" << static_cast<const void*>(procName) << ")");
-+ __GLXextFuncPtr result = glx_api_->glXGetProcAddressARBFn(procName);
- GL_SERVICE_LOG("GL_RESULT: " << result);
- return result;
- }
Property changes on: branches/2019Q2/www/chromium/files/patch-ui_gl_gl_bindings_autogen_glx.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/2019Q2/www/chromium/files/extra-patch-clang
===================================================================
--- branches/2019Q2/www/chromium/files/extra-patch-clang (revision 497958)
+++ branches/2019Q2/www/chromium/files/extra-patch-clang (revision 497959)
@@ -1,98 +1,98 @@
---- base/strings/safe_sprintf_unittest.cc.orig 2016-10-06 04:02:08.000000000 +0300
-+++ base/strings/safe_sprintf_unittest.cc 2016-10-25 21:42:28.951114000 +0300
-@@ -728,6 +728,7 @@
+--- base/strings/safe_sprintf_unittest.cc.orig 2019-03-11 22:00:51 UTC
++++ base/strings/safe_sprintf_unittest.cc
+@@ -730,6 +730,7 @@ TEST(SafeSPrintfTest, EmbeddedNul) {
}
-
+
TEST(SafeSPrintfTest, EmitNULL) {
+/* Avoid compiler error: http://pastebin.com/1edWUE84
char buf[40];
#if defined(__GNUC__)
#pragma GCC diagnostic push
-@@ -739,6 +740,7 @@
+@@ -741,6 +742,7 @@ TEST(SafeSPrintfTest, EmitNULL) {
EXPECT_EQ("0x0", std::string(buf));
EXPECT_EQ(6, SafeSPrintf(buf, "%s", NULL));
EXPECT_EQ("<NULL>", std::string(buf));
+*/
#if defined(__GCC__)
#pragma GCC diagnostic pop
#endif
---- base/threading/thread_local_storage_unittest.cc 2015-04-15 00:18:48.000000000 +0200
-+++ base/threading/thread_local_storage_unittest.cc 2015-04-18 21:45:40.000000000 +0200
-@@ -60,7 +60,7 @@
+--- base/threading/thread_local_storage_unittest.cc.orig 2019-03-11 22:00:51 UTC
++++ base/threading/thread_local_storage_unittest.cc
+@@ -86,7 +86,7 @@ class ThreadLocalStorageRunner : public DelegateSimple
void ThreadLocalStorageCleanup(void *value) {
int *ptr = reinterpret_cast<int*>(value);
// Destructors should never be called with a NULL.
- ASSERT_NE(reinterpret_cast<int*>(NULL), ptr);
+ ASSERT_NE(static_cast<int*>(NULL), ptr);
if (*ptr == kFinalTlsValue)
return; // We've been called enough times.
ASSERT_LT(kFinalTlsValue, *ptr);
---- media/audio/audio_output_proxy_unittest.cc 2015-04-15 00:18:55.000000000 +0200
-+++ media/audio/audio_output_proxy_unittest.cc 2015-04-18 22:02:38.000000000 +0200
-@@ -387,7 +387,7 @@
+--- media/audio/audio_output_proxy_unittest.cc.orig 2019-03-11 22:00:59 UTC
++++ media/audio/audio_output_proxy_unittest.cc
+@@ -410,7 +410,7 @@ class AudioOutputProxyTest : public testing::Test {
// |stream| is closed at this point. Start() should reopen it again.
- EXPECT_CALL(manager(), MakeAudioOutputStream(_, _))
+ EXPECT_CALL(manager(), MakeAudioOutputStream(_, _, _))
.Times(2)
- .WillRepeatedly(Return(reinterpret_cast<AudioOutputStream*>(NULL)));
+ .WillRepeatedly(Return(static_cast<AudioOutputStream*>(NULL)));
-
- EXPECT_CALL(callback_, OnError(_))
- .Times(2);
---- third_party/libjingle_xmpp/task_runner/taskrunner.cc.orig 2017-04-19 19:06:52 UTC
+
+ EXPECT_CALL(callback_, OnError()).Times(2);
+
+--- third_party/libjingle_xmpp/task_runner/taskrunner.cc.orig 2019-03-11 22:01:15 UTC
+++ third_party/libjingle_xmpp/task_runner/taskrunner.cc
-@@ -95,7 +95,7 @@ void TaskRunner::InternalRunTasks(bool i
+@@ -80,7 +80,7 @@ void TaskRunner::InternalRunTasks(bool in_destructor)
std::vector<Task *>::iterator it;
it = std::remove(tasks_.begin(),
tasks_.end(),
- reinterpret_cast<Task *>(NULL));
+ static_cast<Task *>(NULL));
tasks_.erase(it, tasks_.end());
-
---- third_party/sfntly/src/cpp/src/sfntly/table/core/cmap_table.cc 2015-04-15 00:31:48.000000000 +0200
-+++ third_party/sfntly/src/cpp/src/sfntly/table/core/cmap_table.cc 2015-04-18 22:05:41.000000000 +0200
-@@ -439,7 +439,7 @@
+ tasks_running_ = false;
+--- third_party/sfntly/src/cpp/src/sfntly/table/core/cmap_table.cc.orig 2019-03-11 22:08:03 UTC
++++ third_party/sfntly/src/cpp/src/sfntly/table/core/cmap_table.cc
+@@ -439,7 +439,7 @@ CMapTable::CMapFormat0::Builder::Builder(
}
-
+
CMapTable::CMapFormat0::Builder::Builder(const CMapId& cmap_id)
- : CMap::Builder(reinterpret_cast<ReadableFontData*>(NULL),
+ : CMap::Builder(static_cast<ReadableFontData*>(NULL),
CMapFormat::kFormat0,
cmap_id) {
}
-@@ -563,7 +563,7 @@
+@@ -563,7 +563,7 @@ CMapTable::CMapFormat2::Builder::Builder(WritableFontD
: CMapTable::CMap::Builder(data ? down_cast<WritableFontData*>(
data->Slice(offset, data->ReadUShort(
offset + Offset::kFormat0Length)))
- : reinterpret_cast<WritableFontData*>(NULL),
+ : static_cast<WritableFontData*>(NULL),
CMapFormat::kFormat2, cmap_id) {
// TODO(arthurhsu): FIXIT: heavy lifting and leak, need fix.
}
-@@ -574,7 +574,7 @@
+@@ -574,7 +574,7 @@ CMapTable::CMapFormat2::Builder::Builder(ReadableFontD
: CMapTable::CMap::Builder(data ? down_cast<ReadableFontData*>(
data->Slice(offset, data->ReadUShort(
offset + Offset::kFormat0Length)))
- : reinterpret_cast<ReadableFontData*>(NULL),
+ : static_cast<ReadableFontData*>(NULL),
CMapFormat::kFormat2, cmap_id) {
// TODO(arthurhsu): FIXIT: heavy lifting and leak, need fix.
}
-@@ -958,7 +958,7 @@
+@@ -958,7 +958,7 @@ CMapTable::CMapFormat4::Builder::Builder(WritableFontD
CMapTable::CMapFormat4::Builder::Builder(SegmentList* segments,
- IntegerList* glyph_id_array,
+ std::vector<int32_t>* glyph_id_array,
const CMapId& cmap_id)
- : CMap::Builder(reinterpret_cast<ReadableFontData*>(NULL),
+ : CMap::Builder(static_cast<ReadableFontData*>(NULL),
CMapFormat::kFormat4, cmap_id),
segments_(segments->begin(), segments->end()),
glyph_id_array_(glyph_id_array->begin(), glyph_id_array->end()) {
-@@ -966,7 +966,7 @@
+@@ -966,7 +966,7 @@ CMapTable::CMapFormat4::Builder::Builder(SegmentList*
}
-
+
CMapTable::CMapFormat4::Builder::Builder(const CMapId& cmap_id)
- : CMap::Builder(reinterpret_cast<ReadableFontData*>(NULL),
+ : CMap::Builder(static_cast<ReadableFontData*>(NULL),
CMapFormat::kFormat4, cmap_id) {
}
-
+
Index: branches/2019Q2/www/chromium/files/patch-BUILD.gn
===================================================================
--- branches/2019Q2/www/chromium/files/patch-BUILD.gn (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-BUILD.gn (revision 497959)
@@ -1,87 +1,87 @@
---- BUILD.gn.orig 2018-06-13 00:09:58.000000000 +0200
-+++ BUILD.gn 2018-07-14 12:26:56.482016000 +0200
-@@ -359,7 +359,7 @@
- }
+--- BUILD.gn.orig 2019-03-11 22:00:51 UTC
++++ BUILD.gn
+@@ -381,7 +381,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",
-@@ -401,8 +401,6 @@
+@@ -422,8 +422,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",
]
-@@ -460,10 +458,6 @@
+@@ -480,10 +478,6 @@ group("gn_all") {
"//chrome/test/chromedriver:chromedriver",
"//chrome/test/chromedriver:chromedriver_tests",
"//components/sync:run_sync_testserver",
- "//courgette:courgette",
- "//courgette:courgette_fuzz",
- "//courgette:courgette_minimal_tool",
- "//courgette:courgette_unittests",
"//media/cast:generate_barcode_video",
"//media/cast:generate_timecode_audio",
"//net:crash_cache",
-@@ -519,10 +513,6 @@
+@@ -538,10 +532,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) {
-@@ -598,7 +588,7 @@
+@@ -615,7 +605,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)" ]
}
-@@ -818,7 +808,6 @@
+@@ -873,7 +863,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",
-@@ -921,7 +910,7 @@
+@@ -1001,7 +990,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)" ]
}
-@@ -930,7 +919,7 @@
+@@ -1010,7 +999,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)" ]
}
-@@ -1055,9 +1044,6 @@
+@@ -1150,9 +1139,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/2019Q2/www/chromium/files/patch-apps_ui_views_app__window__frame__view.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-apps_ui_views_app__window__frame__view.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-apps_ui_views_app__window__frame__view.cc (revision 497959)
@@ -1,11 +1,11 @@
---- apps/ui/views/app_window_frame_view.cc.orig 2017-06-05 19:03:00 UTC
+--- apps/ui/views/app_window_frame_view.cc.orig 2019-03-11 22:00:51 UTC
+++ apps/ui/views/app_window_frame_view.cc
@@ -132,7 +132,7 @@ gfx::Rect AppWindowFrameView::GetBoundsForClientView()
gfx::Rect AppWindowFrameView::GetWindowBoundsForClientBounds(
const gfx::Rect& client_bounds) const {
gfx::Rect window_bounds = client_bounds;
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
// Get the difference between the widget's client area bounds and window
// bounds, and grow |window_bounds| by that amount.
gfx::Insets native_frame_insets =
Index: branches/2019Q2/www/chromium/files/patch-ash_display_mirror__window__controller.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-ash_display_mirror__window__controller.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-ash_display_mirror__window__controller.cc (revision 497959)
@@ -1,14 +1,14 @@
---- ash/display/mirror_window_controller.cc.orig 2017-06-05 19:03:00 UTC
+--- ash/display/mirror_window_controller.cc.orig 2019-03-11 22:00:51 UTC
+++ ash/display/mirror_window_controller.cc
-@@ -249,7 +249,11 @@ void MirrorWindowController::UpdateWindow(
+@@ -274,7 +274,11 @@ void MirrorWindowController::UpdateWindow(
return info.id() == iter->first;
}) == display_info_list.end()) {
CloseAndDeleteHost(iter->second, true);
+#if defined(__llvm__)
+ mirroring_host_info_map_.erase(iter++);
+#else
iter = mirroring_host_info_map_.erase(iter);
+#endif
} else {
++iter;
}
Index: branches/2019Q2/www/chromium/files/patch-base_BUILD.gn
===================================================================
--- branches/2019Q2/www/chromium/files/patch-base_BUILD.gn (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-base_BUILD.gn (revision 497959)
@@ -1,67 +1,67 @@
---- base/BUILD.gn.orig 2019-02-06 23:06:36.000000000 +0100
-+++ base/BUILD.gn 2019-02-08 20:14:26.420625000 +0100
-@@ -1176,7 +1176,7 @@
+--- base/BUILD.gn.orig 2019-03-11 22:00:51 UTC
++++ base/BUILD.gn
+@@ -1185,7 +1185,7 @@ jumbo_component("base") {
# Needed for <atomic> 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" ]
}
-@@ -1202,7 +1202,7 @@
+@@ -1211,7 +1211,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 += [
-@@ -1739,6 +1739,33 @@
+@@ -1751,6 +1751,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([])
-@@ -2761,6 +2788,12 @@
+@@ -2808,6 +2835,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/2019Q2/www/chromium/files/patch-base_allocator_allocator__shim.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-base_allocator_allocator__shim.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-base_allocator_allocator__shim.cc (revision 497959)
@@ -1,11 +1,11 @@
---- base/allocator/allocator_shim.cc.orig 2017-06-05 19:03:00 UTC
+--- base/allocator/allocator_shim.cc.orig 2019-03-11 22:00:51 UTC
+++ base/allocator/allocator_shim.cc
-@@ -83,7 +83,7 @@ inline const allocator::AllocatorDispatch* GetChainHea
+@@ -70,7 +70,7 @@ inline const allocator::AllocatorDispatch* GetChainHea
// Unfortunately due to that bug NoBarrier_Load() is mistakenly fully
// barriered on Linux+Clang, and that causes visible perf regressons.
return reinterpret_cast<const allocator::AllocatorDispatch*>(
-#if defined(OS_LINUX) && defined(__clang__)
+#if (defined(OS_BSD) || defined(OS_LINUX)) && defined(__clang__)
*static_cast<const volatile subtle::AtomicWord*>(&g_chain_head)
#else
subtle::NoBarrier_Load(&g_chain_head)
Index: branches/2019Q2/www/chromium/files/patch-base_allocator_allocator__shim__default__dispatch__to__glibc.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-base_allocator_allocator__shim__default__dispatch__to__glibc.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-base_allocator_allocator__shim__default__dispatch__to__glibc.cc (revision 497959)
@@ -1,77 +1,77 @@
---- base/allocator/allocator_shim_default_dispatch_to_glibc.cc.orig 2017-06-05 19:03:00 UTC
+--- 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
@@ -3,19 +3,28 @@
// found in the LICENSE file.
#include "base/allocator/allocator_shim.h"
+#include <stdio.h>
+#include <stdlib.h>
+#include <malloc_np.h>
-#include <malloc.h>
-
// 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* __memalign(size_t alignment, size_t size) {
+ void *ret;
+ if (__posix_memalign(&ret, alignment, size) != 0) {
+ return nullptr;
+ } else {
+ 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 {
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/2019Q2/www/chromium/files/patch-base_allocator_allocator__shim__override__libc__symbols.h
===================================================================
--- branches/2019Q2/www/chromium/files/patch-base_allocator_allocator__shim__override__libc__symbols.h (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-base_allocator_allocator__shim__override__libc__symbols.h (revision 497959)
@@ -1,11 +1,11 @@
---- base/allocator/allocator_shim_override_libc_symbols.h.orig 2017-04-19 19:06:28 UTC
+--- base/allocator/allocator_shim_override_libc_symbols.h.orig 2019-03-11 22:00:51 UTC
+++ base/allocator/allocator_shim_override_libc_symbols.h
@@ -10,7 +10,7 @@
#endif
#define BASE_ALLOCATOR_ALLOCATOR_SHIM_OVERRIDE_LIBC_SYMBOLS_H_
-#include <malloc.h>
+#include <stdlib.h>
#include "base/allocator/allocator_shim_internals.h"
Index: branches/2019Q2/www/chromium/files/patch-base_allocator_allocator__shim__unittest.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-base_allocator_allocator__shim__unittest.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-base_allocator_allocator__shim__unittest.cc (revision 497959)
@@ -1,36 +1,36 @@
---- base/allocator/allocator_shim_unittest.cc.orig 2017-06-05 19:03:00 UTC
+--- base/allocator/allocator_shim_unittest.cc.orig 2019-03-11 22:00:51 UTC
+++ base/allocator/allocator_shim_unittest.cc
-@@ -293,7 +293,7 @@ TEST_F(AllocatorShimTest, InterceptLibcSymbols) {
+@@ -348,7 +348,7 @@ TEST_F(AllocatorShimTest, InterceptLibcSymbols) {
ASSERT_GE(aligned_allocs_intercepted_by_size[61], 1u);
#endif // !OS_WIN
-#if !defined(OS_WIN) && !defined(OS_MACOSX)
+#if !defined(OS_WIN) && !defined(OS_MACOSX) && !defined(OS_BSD)
void* memalign_ptr = memalign(128, 53);
ASSERT_NE(nullptr, memalign_ptr);
ASSERT_EQ(0u, reinterpret_cast<uintptr_t>(memalign_ptr) % 128);
-@@ -306,7 +306,7 @@ TEST_F(AllocatorShimTest, InterceptLibcSymbols) {
+@@ -361,7 +361,7 @@ TEST_F(AllocatorShimTest, InterceptLibcSymbols) {
ASSERT_GE(aligned_allocs_intercepted_by_alignment[kPageSize], 1u);
// pvalloc rounds the size up to the next page.
ASSERT_GE(aligned_allocs_intercepted_by_size[kPageSize], 1u);
-#endif // !OS_WIN && !OS_MACOSX
+#endif // !OS_WIN && !OS_MACOSX && !OS_BSD
char* realloc_ptr = static_cast<char*>(malloc(10));
strcpy(realloc_ptr, "foobar");
-@@ -322,13 +322,13 @@ TEST_F(AllocatorShimTest, InterceptLibcSymbols) {
+@@ -377,13 +377,13 @@ TEST_F(AllocatorShimTest, InterceptLibcSymbols) {
free(zero_alloc_ptr);
ASSERT_GE(frees_intercepted_by_addr[Hash(zero_alloc_ptr)], 1u);
-#if !defined(OS_WIN) && !defined(OS_MACOSX)
+#if !defined(OS_WIN) && !defined(OS_MACOSX) && !defined(OS_BSD)
free(memalign_ptr);
ASSERT_GE(frees_intercepted_by_addr[Hash(memalign_ptr)], 1u);
free(pvalloc_ptr);
ASSERT_GE(frees_intercepted_by_addr[Hash(pvalloc_ptr)], 1u);
-#endif // !OS_WIN && !OS_MACOSX
+#endif // !OS_WIN && !OS_MACOSX && !OS_BSD
#if !defined(OS_WIN)
free(posix_memalign_ptr);
Index: branches/2019Q2/www/chromium/files/patch-base_allocator_partition__allocator_page__allocator.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-base_allocator_partition__allocator_page__allocator.cc (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-base_allocator_partition__allocator_page__allocator.cc (revision 497959)
@@ -0,0 +1,11 @@
+--- base/allocator/partition_allocator/page_allocator.cc.orig 2019-03-11 22:00:51 UTC
++++ base/allocator/partition_allocator/page_allocator.cc
+@@ -115,7 +115,7 @@ void* AllocPages(void* address,
+ uintptr_t align_base_mask = ~align_offset_mask;
+ DCHECK(!(reinterpret_cast<uintptr_t>(address) & align_offset_mask));
+
+-#if defined(OS_LINUX) && defined(ARCH_CPU_64_BITS)
++#if (defined(OS_BSD) || defined(OS_LINUX)) && defined(ARCH_CPU_64_BITS)
+ // On 64 bit Linux, we may need to adjust the address space limit for
+ // guarded allocations.
+ if (length >= kMinimumGuardedMemorySize) {
Property changes on: branches/2019Q2/www/chromium/files/patch-base_allocator_partition__allocator_page__allocator.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/2019Q2/www/chromium/files/patch-base_allocator_partition__allocator_page__allocator__internals__posix.h
===================================================================
--- branches/2019Q2/www/chromium/files/patch-base_allocator_partition__allocator_page__allocator__internals__posix.h (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-base_allocator_partition__allocator_page__allocator__internals__posix.h (revision 497959)
@@ -0,0 +1,38 @@
+--- base/allocator/partition_allocator/page_allocator_internals_posix.h.orig 2019-03-11 22:00:51 UTC
++++ base/allocator/partition_allocator/page_allocator_internals_posix.h
+@@ -14,7 +14,7 @@
+ #if defined(OS_MACOSX)
+ #include <mach/mach.h>
+ #endif
+-#if defined(OS_LINUX)
++#if defined(OS_BSD) || defined(OS_LINUX)
+ #include <sys/resource.h>
+
+ #include <algorithm>
+@@ -48,7 +48,7 @@ int GetAccessFlags(PageAccessibilityConfiguration acce
+ }
+ }
+
+-#if defined(OS_LINUX) && defined(ARCH_CPU_64_BITS)
++#if (defined(OS_BSD) || defined(OS_LINUX)) && defined(ARCH_CPU_64_BITS)
+
+ // Multiple guarded memory regions may exceed the process address space limit.
+ // This function will raise or lower the limit by |amount|.
+@@ -68,7 +68,7 @@ bool AdjustAddressSpaceLimit(int64_t amount) {
+ // schemes that reduce that to 4 GiB.
+ constexpr size_t kMinimumGuardedMemorySize = 1ULL << 32; // 4 GiB
+
+-#endif // defined(OS_LINUX) && defined(ARCH_CPU_64_BITS)
++#endif // (defined(OS_BSD) || defined(OS_LINUX)) && defined(ARCH_CPU_64_BITS)
+
+ void* SystemAllocPagesInternal(void* hint,
+ size_t length,
+@@ -134,7 +134,7 @@ void SetSystemPagesAccessInternal(
+ void FreePagesInternal(void* address, size_t length) {
+ CHECK(!munmap(address, length));
+
+-#if defined(OS_LINUX) && defined(ARCH_CPU_64_BITS)
++#if (defined(OS_BSD) || defined(OS_LINUX)) && defined(ARCH_CPU_64_BITS)
+ // Restore the address space limit.
+ if (length >= kMinimumGuardedMemorySize) {
+ CHECK(AdjustAddressSpaceLimit(-base::checked_cast<int64_t>(length)));
Property changes on: branches/2019Q2/www/chromium/files/patch-base_allocator_partition__allocator_page__allocator__internals__posix.h
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: branches/2019Q2/www/chromium/files/patch-base_debug_debugger__posix.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-base_debug_debugger__posix.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-base_debug_debugger__posix.cc (revision 497959)
@@ -1,57 +1,56 @@
---- base/debug/debugger_posix.cc.orig 2017-06-18 01:23:49.065175000 +0200
-+++ base/debug/debugger_posix.cc 2017-06-18 01:58:29.603481000 +0200
-@@ -84,7 +84,7 @@
+--- base/debug/debugger_posix.cc.orig 2019-03-11 22:00:51 UTC
++++ base/debug/debugger_posix.cc
+@@ -86,7 +86,7 @@ bool BeingDebugged() {
KERN_PROC,
KERN_PROC_PID,
getpid()
-#if defined(OS_OPENBSD)
+#if defined(OS_BSD)
, sizeof(struct kinfo_proc),
0
#endif
-@@ -92,33 +92,36 @@
+@@ -94,33 +94,35 @@ bool BeingDebugged() {
// Caution: struct kinfo_proc is marked __APPLE_API_UNSTABLE. The source and
// binary interfaces may change.
- struct kinfo_proc info;
- size_t info_size = sizeof(info);
+ struct kinfo_proc *info;
+ size_t info_size;
-#if defined(OS_OPENBSD)
- if (sysctl(mib, arraysize(mib), NULL, &info_size, NULL, 0) < 0)
+ if (sysctl(mib, base::size(mib), NULL, &info_size, NULL, 0) < 0)
return -1;
+ info = (struct kinfo_proc *)malloc(info_size);
-+
mib[5] = (info_size / sizeof(struct kinfo_proc));
-#endif
-- int sysctl_result = sysctl(mib, arraysize(mib), &info, &info_size, NULL, 0);
-+ int sysctl_result = sysctl(mib, arraysize(mib), info, &info_size, NULL, 0);
+- int sysctl_result = sysctl(mib, base::size(mib), &info, &info_size, NULL, 0);
++ int sysctl_result = sysctl(mib, base::size(mib), info, &info_size, NULL, 0);
DCHECK_EQ(sysctl_result, 0);
if (sysctl_result != 0) {
is_set = true;
being_debugged = false;
- return being_debugged;
+ goto out;
}
// This process is being debugged if the P_TRACED flag is set.
is_set = true;
#if defined(OS_FREEBSD)
- being_debugged = (info.ki_flag & P_TRACED) != 0;
+ being_debugged = (info->ki_flag & P_TRACED) != 0;
#elif defined(OS_BSD)
- being_debugged = (info.p_flag & P_TRACED) != 0;
+ being_debugged = (info->p_flag & P_TRACED) != 0;
#else
- being_debugged = (info.kp_proc.p_flag & P_TRACED) != 0;
+ being_debugged = (info->kp_proc.p_flag & P_TRACED) != 0;
#endif
+
+out:
+ free(info);
return being_debugged;
}
Index: branches/2019Q2/www/chromium/files/patch-base_debug_elf__reader__linux.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-base_debug_elf__reader__linux.cc (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-base_debug_elf__reader__linux.cc (revision 497959)
@@ -0,0 +1,13 @@
+--- base/debug/elf_reader_linux.cc.orig 2019-03-11 22:00:51 UTC
++++ base/debug/elf_reader_linux.cc
+@@ -41,8 +41,10 @@ Optional<std::string> ElfSegmentBuildIDNoteAsString(co
+ const void* section_end = segment.data() + segment.size_bytes();
+ const Nhdr* note_header = reinterpret_cast<const Nhdr*>(segment.data());
+ while (note_header < section_end) {
++#if !defined(OS_BSD)
+ if (note_header->n_type == NT_GNU_BUILD_ID)
+ break;
++#endif
+ note_header = reinterpret_cast<const Nhdr*>(
+ reinterpret_cast<const char*>(note_header) + sizeof(Nhdr) +
+ bits::Align(note_header->n_namesz, 4) +
Property changes on: branches/2019Q2/www/chromium/files/patch-base_debug_elf__reader__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/2019Q2/www/chromium/files/patch-base_debug_proc__maps__linux.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-base_debug_proc__maps__linux.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-base_debug_proc__maps__linux.cc (revision 497959)
@@ -1,11 +1,11 @@
---- base/debug/proc_maps_linux.cc.orig 2017-04-19 19:06:28 UTC
+--- base/debug/proc_maps_linux.cc.orig 2019-03-11 22:00:51 UTC
+++ base/debug/proc_maps_linux.cc
@@ -12,7 +12,7 @@
#include "base/strings/string_split.h"
#include "build/build_config.h"
-#if defined(OS_LINUX) || defined(OS_ANDROID)
+#if defined(OS_LINUX) || defined(OS_BSD) || defined(OS_ANDROID)
#include <inttypes.h>
#endif
Index: branches/2019Q2/www/chromium/files/patch-base_debug_stack__trace.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-base_debug_stack__trace.cc (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-base_debug_stack__trace.cc (revision 497959)
@@ -0,0 +1,11 @@
+--- base/debug/stack_trace.cc.orig 2019-03-17 21:37:51 UTC
++++ base/debug/stack_trace.cc
+@@ -14,7 +14,7 @@
+
+ #if BUILDFLAG(CAN_UNWIND_WITH_FRAME_POINTERS)
+
+-#if defined(OS_LINUX) || defined(OS_ANDROID)
++#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD)
+ #include <pthread.h>
+ #include "base/process/process_handle.h"
+ #include "base/threading/platform_thread.h"
Property changes on: branches/2019Q2/www/chromium/files/patch-base_debug_stack__trace.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/2019Q2/www/chromium/files/patch-base_debug_stack__trace.h
===================================================================
--- branches/2019Q2/www/chromium/files/patch-base_debug_stack__trace.h (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-base_debug_stack__trace.h (revision 497959)
@@ -1,10 +1,10 @@
---- base/debug/stack_trace.h.orig 2017-08-02 19:09:58.400190000 +0200
-+++ base/debug/stack_trace.h 2017-08-02 19:10:33.950334000 +0200
+--- base/debug/stack_trace.h.orig 2019-03-11 22:00:51 UTC
++++ base/debug/stack_trace.h
@@ -16,6 +16,7 @@
#include "build/build_config.h"
#if defined(OS_POSIX)
+#include <sys/stdint.h>
#include <unistd.h>
#endif
Index: branches/2019Q2/www/chromium/files/patch-base_debug_stack__trace__posix.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-base_debug_stack__trace__posix.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-base_debug_stack__trace__posix.cc (revision 497959)
@@ -1,40 +1,31 @@
---- base/debug/stack_trace_posix.cc.orig 2017-07-25 21:04:48.000000000 +0200
-+++ base/debug/stack_trace_posix.cc 2017-08-02 18:45:42.071358000 +0200
-@@ -34,7 +34,7 @@
+--- base/debug/stack_trace_posix.cc.orig 2019-03-11 22:00:51 UTC
++++ base/debug/stack_trace_posix.cc
+@@ -35,7 +35,7 @@
#include <AvailabilityMacros.h>
#endif
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
#include "base/debug/proc_maps_linux.h"
#endif
-@@ -574,6 +574,11 @@
+@@ -653,6 +653,11 @@ class SandboxSymbolizeHelper {
// for the modules that are loaded in the current process.
// Returns true on success.
bool CacheMemoryRegions() {
+#if defined(OS_BSD)
+ // TODO (rene) avoid link error, implement something?
+ NOTIMPLEMENTED();
+ return false;
+#else
// Reads /proc/self/maps.
std::string contents;
if (!ReadProcMaps(&contents)) {
-@@ -589,6 +594,7 @@
+@@ -670,6 +675,7 @@ class SandboxSymbolizeHelper {
is_initialized_ = true;
return true;
+#endif
}
// Opens all object files and caches their file descriptors.
-@@ -721,7 +727,7 @@
- // NOTE: This code MUST be async-signal safe (it's used by in-process
- // stack dumping signal handler). NO malloc or stdio is allowed here.
-
--#if !defined(__UCLIBC__) && !defined(_AIX)
-+#if !defined(__UCLIBC__) && !defined(_AIX) && !defined(OS_BSD)
- count = std::min(arraysize(trace_), count);
-
- // Though the backtrace API man page does not list any possible negative
Index: branches/2019Q2/www/chromium/files/patch-base_files_file__path__unittest.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-base_files_file__path__unittest.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-base_files_file__path__unittest.cc (revision 497959)
@@ -1,11 +1,11 @@
---- base/files/file_path_unittest.cc.orig 2017-06-05 19:03:00 UTC
+--- base/files/file_path_unittest.cc.orig 2019-03-11 22:00:51 UTC
+++ base/files/file_path_unittest.cc
-@@ -1133,7 +1133,7 @@ TEST_F(FilePathTest, FromUTF8Unsafe_And_AsUTF8Unsafe)
+@@ -1138,7 +1138,7 @@ TEST_F(FilePathTest, FromUTF8Unsafe_And_AsUTF8Unsafe)
"\xEF\xBC\xA1\xEF\xBC\xA2\xEF\xBC\xA3.txt" },
};
-#if !defined(SYSTEM_NATIVE_UTF8) && defined(OS_LINUX)
+#if !defined(SYSTEM_NATIVE_UTF8) && (defined(OS_LINUX) || defined(OS_BSD))
ScopedLocale locale("en_US.UTF-8");
#endif
Index: branches/2019Q2/www/chromium/files/patch-base_files_file__path__watcher__kqueue.h
===================================================================
--- branches/2019Q2/www/chromium/files/patch-base_files_file__path__watcher__kqueue.h (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-base_files_file__path__watcher__kqueue.h (revision 497959)
@@ -1,13 +1,13 @@
---- base/files/file_path_watcher_kqueue.h.orig 2017-06-05 19:03:00 UTC
+--- base/files/file_path_watcher_kqueue.h.orig 2019-03-11 22:00:51 UTC
+++ base/files/file_path_watcher_kqueue.h
@@ -5,6 +5,10 @@
#ifndef BASE_FILES_FILE_PATH_WATCHER_KQUEUE_H_
#define BASE_FILES_FILE_PATH_WATCHER_KQUEUE_H_
+#ifdef __FreeBSD__
+#include <sys/stdint.h>
+#include <sys/types.h>
+#endif
#include <sys/event.h>
#include <memory>
Index: branches/2019Q2/www/chromium/files/patch-base_files_file__path__watcher__stub.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-base_files_file__path__watcher__stub.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-base_files_file__path__watcher__stub.cc (revision 497959)
@@ -1,51 +1,51 @@
---- base/files/file_path_watcher_stub.cc.orig 2018-07-19 23:00:07.807326000 +0200
-+++ base/files/file_path_watcher_stub.cc 2018-07-19 23:05:24.785603000 +0200
+--- base/files/file_path_watcher_stub.cc.orig 2019-03-11 22:00:51 UTC
++++ base/files/file_path_watcher_stub.cc
@@ -1,14 +1,15 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2014 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-// This file exists for Unix systems which don't have the inotify headers, and
-// thus cannot build file_watcher_inotify.cc
-#include "base/files/file_path_watcher.h"
+#include <memory>
+#include "base/files/file_path_watcher.h"
+#include "base/files/file_path_watcher_kqueue.h"
#include "base/macros.h"
#include "base/memory/ptr_util.h"
+#include "build/build_config.h"
namespace base {
-@@ -22,12 +23,26 @@
+@@ -22,12 +23,26 @@ class FilePathWatcherImpl : public FilePathWatcher::Pl
bool Watch(const FilePath& path,
bool recursive,
const FilePathWatcher::Callback& callback) override {
- return false;
+ DCHECK(!impl_.get());
+ if (recursive) {
+ if (!FilePathWatcher::RecursiveWatchAvailable())
+ return false;
+ } else {
+ impl_ = std::make_unique<FilePathWatcherKQueue>();
+ }
+ DCHECK(impl_.get());
+ return impl_->Watch(path, recursive, callback);
}
- void Cancel() override {}
+ void Cancel() override {
+ if (impl_.get())
+ impl_->Cancel();
+ set_cancelled();
+ }
private:
+ std::unique_ptr<PlatformDelegate> impl_;
+
DISALLOW_COPY_AND_ASSIGN(FilePathWatcherImpl);
};
Index: branches/2019Q2/www/chromium/files/patch-base_files_file__path__watcher__unittest.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-base_files_file__path__watcher__unittest.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-base_files_file__path__watcher__unittest.cc (revision 497959)
@@ -1,11 +1,11 @@
---- base/files/file_path_watcher_unittest.cc.orig 2018-08-08 21:10:31.000000000 +0200
-+++ base/files/file_path_watcher_unittest.cc 2018-08-29 20:20:06.152675000 +0200
-@@ -435,7 +435,7 @@
+--- base/files/file_path_watcher_unittest.cc.orig 2019-03-11 22:00:51 UTC
++++ base/files/file_path_watcher_unittest.cc
+@@ -436,7 +436,7 @@ TEST_F(FilePathWatcherTest, WatchDirectory) {
VLOG(1) << "Waiting for file1 creation";
ASSERT_TRUE(WaitForEvents());
-#if !defined(OS_MACOSX)
+#if !defined(OS_MACOSX) && !defined(OS_BSD)
// Mac implementation does not detect files modified in a directory.
ASSERT_TRUE(WriteFile(file1, "content v2"));
VLOG(1) << "Waiting for file1 modification";
Index: branches/2019Q2/www/chromium/files/patch-base_files_file__util.h
===================================================================
--- branches/2019Q2/www/chromium/files/patch-base_files_file__util.h (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-base_files_file__util.h (revision 497959)
@@ -1,11 +1,11 @@
---- base/files/file_util.h.orig 2017-07-25 21:04:48.000000000 +0200
-+++ base/files/file_util.h 2017-07-29 00:57:11.269678000 +0200
-@@ -406,7 +406,7 @@
+--- base/files/file_util.h.orig 2019-03-11 22:00:51 UTC
++++ base/files/file_util.h
+@@ -445,7 +445,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/2019Q2/www/chromium/files/patch-base_files_file__util__posix.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-base_files_file__util__posix.cc (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-base_files_file__util__posix.cc (revision 497959)
@@ -0,0 +1,11 @@
+--- base/files/file_util_posix.cc.orig 2019-03-17 21:31:57 UTC
++++ base/files/file_util_posix.cc
+@@ -407,7 +407,7 @@ bool CopyDirectoryExcl(const FilePath& from_path,
+ #endif // !defined(OS_NACL_NONSFI)
+
+ bool CreateLocalNonBlockingPipe(int fds[2]) {
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+ return pipe2(fds, O_CLOEXEC | O_NONBLOCK) == 0;
+ #else
+ int raw_fds[2];
Property changes on: branches/2019Q2/www/chromium/files/patch-base_files_file__util__posix.cc
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: branches/2019Q2/www/chromium/files/patch-base_files_memory__mapped__file__posix.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-base_files_memory__mapped__file__posix.cc (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-base_files_memory__mapped__file__posix.cc (revision 497959)
@@ -0,0 +1,11 @@
+--- base/files/memory_mapped_file_posix.cc.orig 2019-03-11 22:00:51 UTC
++++ base/files/memory_mapped_file_posix.cc
+@@ -110,6 +110,8 @@ bool MemoryMappedFile::MapFileRegionToMemory(
+ // Only Android API>=21 supports the fallocate call. Older versions need
+ // to manually extend the file by writing zeros at block intervals.
+ do_manual_extension = true;
++#elif defined(OS_BSD)
++ do_manual_extension = true;
+ #elif defined(OS_MACOSX)
+ // MacOS doesn't support fallocate even though their new APFS filesystem
+ // does support sparse files. It does, however, have the functionality
Property changes on: branches/2019Q2/www/chromium/files/patch-base_files_memory__mapped__file__posix.cc
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: branches/2019Q2/www/chromium/files/patch-base_i18n_icu__util.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-base_i18n_icu__util.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-base_i18n_icu__util.cc (revision 497959)
@@ -1,20 +1,20 @@
---- base/i18n/icu_util.cc.orig 2017-09-05 21:05:11.000000000 +0200
-+++ base/i18n/icu_util.cc 2017-09-06 16:47:26.158180000 +0200
+--- base/i18n/icu_util.cc.orig 2019-03-11 22:00:51 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
-@@ -312,7 +312,7 @@
+@@ -315,7 +315,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<icu::TimeZone> zone(icu::TimeZone::createDefault());
#endif
Index: branches/2019Q2/www/chromium/files/patch-base_linux__util.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-base_linux__util.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-base_linux__util.cc (revision 497959)
@@ -1,18 +1,18 @@
---- base/linux_util.cc.orig 2017-04-19 19:06:28 UTC
+--- base/linux_util.cc.orig 2019-03-11 22:00:51 UTC
+++ base/linux_util.cc
-@@ -110,12 +110,14 @@ char g_linux_distro[kDistroSize] =
+@@ -90,12 +90,14 @@ char g_linux_distro[kDistroSize] =
"CrOS";
#elif defined(OS_ANDROID)
"Android";
+#elif defined(OS_BSD)
+ "BSD";
#else // if defined(OS_LINUX)
"Unknown";
#endif
std::string GetLinuxDistro() {
-#if defined(OS_CHROMEOS) || defined(OS_ANDROID)
+#if defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD)
return g_linux_distro;
#elif defined(OS_LINUX)
LinuxDistroHelper* distro_state_singleton = LinuxDistroHelper::GetInstance();
Index: branches/2019Q2/www/chromium/files/patch-base_logging__unittest.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-base_logging__unittest.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-base_logging__unittest.cc (revision 497959)
@@ -1,11 +1,11 @@
---- base/logging_unittest.cc.orig 2017-06-21 19:47:24.089128000 +0200
-+++ base/logging_unittest.cc 2017-06-21 20:02:08.177123000 +0200
-@@ -272,7 +272,7 @@
+--- base/logging_unittest.cc.orig 2019-03-11 22:00:51 UTC
++++ base/logging_unittest.cc
+@@ -420,7 +420,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<uintptr_t>(info->si_addr);
#else // OS_POSIX && !OS_MACOSX
- struct ucontext* context = reinterpret_cast<struct ucontext*>(context_ptr);
+ ucontext_t* context = reinterpret_cast<ucontext_t*>(context_ptr);
Index: branches/2019Q2/www/chromium/files/patch-base_native__library__posix.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-base_native__library__posix.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-base_native__library__posix.cc (revision 497959)
@@ -1,11 +1,11 @@
---- base/native_library_posix.cc.orig 2017-07-25 21:04:48.000000000 +0200
-+++ base/native_library_posix.cc 2017-08-02 21:02:05.991380000 +0200
-@@ -30,7 +30,7 @@
+--- base/native_library_posix.cc.orig 2019-03-11 22:00:51 UTC
++++ base/native_library_posix.cc
+@@ -29,7 +29,7 @@ NativeLibrary LoadNativeLibraryWithOptions(const FileP
// http://crbug.com/17943, http://crbug.com/17557, http://crbug.com/36892,
// and http://crbug.com/40794.
int flags = RTLD_LAZY;
-#if defined(OS_ANDROID) || !defined(RTLD_DEEPBIND)
+#if defined(OS_ANDROID) || !defined(RTLD_DEEPBIND) || defined(OS_BSD)
// Certain platforms don't define RTLD_DEEPBIND. Android dlopen() requires
// further investigation, as it might vary across versions. Crash here to
// warn developers that they're trying to rely on uncertain behavior.
Index: branches/2019Q2/www/chromium/files/patch-base_native__library__unittest.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-base_native__library__unittest.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-base_native__library__unittest.cc (revision 497959)
@@ -1,11 +1,11 @@
---- base/native_library_unittest.cc.orig 2018-08-23 19:08:51.430697000 +0200
-+++ base/native_library_unittest.cc 2018-08-23 19:09:42.937027000 +0200
-@@ -120,7 +120,7 @@
+--- base/native_library_unittest.cc.orig 2019-03-11 22:00:51 UTC
++++ base/native_library_unittest.cc
+@@ -120,7 +120,7 @@ TEST(NativeLibraryTest, LoadLibrary) {
// Android dlopen() requires further investigation, as it might vary across
// versions with respect to symbol resolution scope.
// TSan and MSan error out on RTLD_DEEPBIND, https://crbug.com/705255
-#if !defined(OS_ANDROID) && !defined(THREAD_SANITIZER) && \
+#if !defined(OS_ANDROID) && !defined(OS_BSD) && !defined(THREAD_SANITIZER) && \
!defined(MEMORY_SANITIZER)
// Verifies that the |prefer_own_symbols| option satisfies its guarantee that
Index: branches/2019Q2/www/chromium/files/patch-base_numerics_safe__math__shared__impl.h
===================================================================
--- branches/2019Q2/www/chromium/files/patch-base_numerics_safe__math__shared__impl.h (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-base_numerics_safe__math__shared__impl.h (revision 497959)
@@ -0,0 +1,13 @@
+--- base/numerics/safe_math_shared_impl.h.orig 2019-03-11 22:00:51 UTC
++++ base/numerics/safe_math_shared_impl.h
+@@ -19,9 +19,7 @@
+
+ // Where available use builtin math overflow support on Clang and GCC.
+ #if !defined(__native_client__) && \
+- ((defined(__clang__) && \
+- ((__clang_major__ > 3) || \
+- (__clang_major__ == 3 && __clang_minor__ >= 4))) || \
++ ((defined(__clang__) && (__clang_major__ > 6)) || \
+ (defined(__GNUC__) && __GNUC__ >= 5))
+ #include "base/numerics/safe_math_clang_gcc_impl.h"
+ #define BASE_HAS_OPTIMIZED_SAFE_MATH (1)
Property changes on: branches/2019Q2/www/chromium/files/patch-base_numerics_safe__math__shared__impl.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/2019Q2/www/chromium/files/patch-base_posix_can__lower__nice__to.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-base_posix_can__lower__nice__to.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-base_posix_can__lower__nice__to.cc (revision 497959)
@@ -1,20 +1,20 @@
---- base/posix/can_lower_nice_to.cc.orig 2018-12-12 22:56:01.000000000 +0100
-+++ base/posix/can_lower_nice_to.cc 2018-12-16 00:34:34.602103000 +0100
-@@ -31,6 +31,9 @@
+--- base/posix/can_lower_nice_to.cc.orig 2019-03-11 22:00:51 UTC
++++ base/posix/can_lower_nice_to.cc
+@@ -31,6 +31,9 @@ bool CanLowerNiceTo(int nice_value) {
if (geteuid() == 0)
return true;
+#if defined(OS_BSD)
+ return false;
+#else
// 2. Skip checking the CAP_SYS_NICE permission because it would require
// libcap.so.
-@@ -54,6 +57,7 @@
+@@ -54,6 +57,7 @@ bool CanLowerNiceTo(int nice_value) {
// And lowering niceness to |nice_value| is allowed if it is greater than or
// equal to the limit:
return nice_value >= lowest_nice_allowed;
+#endif
}
} // namespace internal
Index: branches/2019Q2/www/chromium/files/patch-base_posix_unix__domain__socket.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-base_posix_unix__domain__socket.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-base_posix_unix__domain__socket.cc (revision 497959)
@@ -1,49 +1,49 @@
---- base/posix/unix_domain_socket.cc.orig 2018-01-04 21:05:38.000000000 +0100
-+++ base/posix/unix_domain_socket.cc 2018-01-06 12:44:56.681201000 +0100
+--- base/posix/unix_domain_socket.cc.orig 2019-03-11 22:00:51 UTC
++++ base/posix/unix_domain_socket.cc
@@ -5,7 +5,10 @@
#include "base/posix/unix_domain_socket.h"
#include <errno.h>
+#include <sys/param.h>
#include <sys/socket.h>
+#include <sys/types.h>
+#include <sys/ucred.h>
#if !defined(OS_NACL_NONSFI)
#include <sys/un.h>
#endif
-@@ -28,6 +31,14 @@
+@@ -28,6 +31,14 @@ namespace base {
const size_t UnixDomainSocket::kMaxFileDescriptors = 16;
+#ifndef SCM_CREDENTIALS
+# define SCM_CREDENTIALS 0x9001
+#endif
+
+#ifndef SO_PASSCRED
+# define SO_PASSCRED 0x9002
+#endif
+
#if !defined(OS_NACL_NONSFI)
bool CreateSocketPair(ScopedFD* one, ScopedFD* two) {
int raw_socks[2];
-@@ -150,7 +161,7 @@
+@@ -150,7 +161,7 @@ ssize_t UnixDomainSocket::RecvMsgWithFlags(int fd,
#if !defined(OS_NACL_NONSFI) && !defined(OS_MACOSX)
// The PNaCl toolchain for Non-SFI binary build and macOS do not support
// ucred. macOS supports xucred, but this structure is insufficient.
- + CMSG_SPACE(sizeof(struct ucred))
+ + CMSG_SPACE(sizeof(struct cmsgcred))
#endif // OS_NACL_NONSFI or OS_MACOSX
;
char control_buffer[kControlBufferSize];
-@@ -180,9 +191,9 @@
+@@ -180,9 +191,9 @@ ssize_t UnixDomainSocket::RecvMsgWithFlags(int fd,
// SCM_CREDENTIALS.
if (cmsg->cmsg_level == SOL_SOCKET &&
cmsg->cmsg_type == SCM_CREDENTIALS) {
- DCHECK_EQ(payload_len, sizeof(struct ucred));
+ DCHECK_EQ(payload_len, sizeof(struct cmsgcred));
DCHECK_EQ(pid, -1);
- pid = reinterpret_cast<struct ucred*>(CMSG_DATA(cmsg))->pid;
+ pid = getpid();
}
#endif // !defined(OS_NACL_NONSFI) && !defined(OS_MACOSX)
}
Index: branches/2019Q2/www/chromium/files/patch-base_posix_unix__domain__socket__unittest.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-base_posix_unix__domain__socket__unittest.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-base_posix_unix__domain__socket__unittest.cc (revision 497959)
@@ -1,12 +1,12 @@
---- base/posix/unix_domain_socket_unittest.cc.orig 2017-12-23 20:50:07.237565000 +0100
-+++ base/posix/unix_domain_socket_unittest.cc 2017-12-23 20:51:05.651558000 +0100
+--- base/posix/unix_domain_socket_unittest.cc.orig 2019-03-11 22:00:51 UTC
++++ base/posix/unix_domain_socket_unittest.cc
@@ -8,6 +8,9 @@
#include <stdint.h>
#include <sys/socket.h>
#include <sys/types.h>
+#if defined(OS_BSD)
+#include <signal.h>
+#endif
#include <unistd.h>
#include "base/bind.h"
Index: branches/2019Q2/www/chromium/files/patch-base_process_internal__linux.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-base_process_internal__linux.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-base_process_internal__linux.cc (revision 497959)
@@ -1,16 +1,16 @@
---- base/process/internal_linux.cc.orig 2017-08-10 00:00:17.842158000 +0200
-+++ base/process/internal_linux.cc 2017-08-10 00:02:37.838081000 +0200
-@@ -60,10 +60,13 @@
+--- base/process/internal_linux.cc.orig 2019-03-11 22:00:51 UTC
++++ base/process/internal_linux.cc
+@@ -60,10 +60,13 @@ bool ReadProcFile(const FilePath& file, std::string* b
// Synchronously reading files in /proc is safe.
ThreadRestrictions::ScopedAllowIO allow_io;
+#if !defined(OS_BSD)
if (!ReadFileToString(file, buffer)) {
DLOG(WARNING) << "Failed to read " << file.MaybeAsASCII();
return false;
}
+#endif
+
return !buffer->empty();
}
Index: branches/2019Q2/www/chromium/files/patch-base_process_internal__linux.h
===================================================================
--- branches/2019Q2/www/chromium/files/patch-base_process_internal__linux.h (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-base_process_internal__linux.h (revision 497959)
@@ -1,11 +1,11 @@
---- base/process/internal_linux.h.orig 2017-04-19 19:06:28 UTC
+--- base/process/internal_linux.h.orig 2019-03-11 22:00:51 UTC
+++ base/process/internal_linux.h
@@ -14,6 +14,8 @@
#include "base/files/file_path.h"
+#include <unistd.h> /* pid_t */
+
namespace base {
class Time;
Index: branches/2019Q2/www/chromium/files/patch-base_process_kill.h
===================================================================
--- branches/2019Q2/www/chromium/files/patch-base_process_kill.h (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-base_process_kill.h (revision 497959)
@@ -1,11 +1,11 @@
---- base/process/kill.h.orig 2018-07-19 22:11:43.638992000 +0200
-+++ base/process/kill.h 2018-07-19 22:12:06.613065000 +0200
-@@ -111,7 +111,7 @@
+--- base/process/kill.h.orig 2019-03-11 22:00:51 UTC
++++ base/process/kill.h
+@@ -111,7 +111,7 @@ BASE_EXPORT TerminationStatus GetTerminationStatus(Pro
BASE_EXPORT TerminationStatus GetKnownDeadTerminationStatus(
ProcessHandle handle, int* exit_code);
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
// Spawns a thread to wait asynchronously for the child |process| to exit
// and then reaps it.
BASE_EXPORT void EnsureProcessGetsReaped(Process process);
Index: branches/2019Q2/www/chromium/files/patch-base_process_kill__posix.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-base_process_kill__posix.cc (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-base_process_kill__posix.cc (revision 497959)
@@ -0,0 +1,11 @@
+--- base/process/kill_posix.cc.orig 2019-03-11 22:00:51 UTC
++++ base/process/kill_posix.cc
+@@ -168,7 +168,7 @@ void EnsureProcessTerminated(Process process) {
+ 0, new BackgroundReaper(std::move(process), TimeDelta::FromSeconds(2)));
+ }
+
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+ void EnsureProcessGetsReaped(Process process) {
+ DCHECK(!process.is_current());
+
Property changes on: branches/2019Q2/www/chromium/files/patch-base_process_kill__posix.cc
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: branches/2019Q2/www/chromium/files/patch-base_process_launch.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-base_process_launch.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-base_process_launch.cc (revision 497959)
@@ -1,11 +1,11 @@
---- base/process/launch.cc.orig 2017-06-05 19:03:00 UTC
+--- base/process/launch.cc.orig 2019-03-11 22:00:51 UTC
+++ base/process/launch.cc
@@ -15,7 +15,7 @@ LaunchOptions::~LaunchOptions() = default;
LaunchOptions LaunchOptionsForTest() {
LaunchOptions options;
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
// To prevent accidental privilege sharing to an untrusted child, processes
// are started with PR_SET_NO_NEW_PRIVS. Do not set that here, since this
// new child will be used for testing only.
Index: branches/2019Q2/www/chromium/files/patch-base_process_launch.h
===================================================================
--- branches/2019Q2/www/chromium/files/patch-base_process_launch.h (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-base_process_launch.h (revision 497959)
@@ -1,20 +1,20 @@
---- base/process/launch.h.orig 2017-04-19 19:06:28 UTC
+--- base/process/launch.h.orig 2019-03-11 22:00:51 UTC
+++ base/process/launch.h
-@@ -138,7 +138,7 @@ struct BASE_EXPORT LaunchOptions {
- // will be the same as its pid.
- bool new_process_group = false;
+@@ -175,7 +175,7 @@ struct BASE_EXPORT LaunchOptions {
+ FileHandleMappingVector fds_to_remap;
+ #endif // defined(OS_WIN)
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
// If non-zero, start the process using clone(), using flags as provided.
// Unlike in clone, clone_flags may not contain a custom termination signal
// that is sent to the parent when the child dies. The termination signal will
-@@ -151,7 +151,7 @@ struct BASE_EXPORT LaunchOptions {
+@@ -188,7 +188,7 @@ struct BASE_EXPORT LaunchOptions {
// Sets parent process death signal to SIGKILL.
bool kill_on_parent_death = false;
-#endif // defined(OS_LINUX)
+#endif // defined(OS_LINUX) || defined(OS_BSD)
- #if defined(OS_POSIX)
- // If not empty, launch the specified executable instead of
+ #if defined(OS_FUCHSIA)
+ // If valid, launches the application in that job object.
Index: branches/2019Q2/www/chromium/files/patch-base_process_launch__posix.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-base_process_launch__posix.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-base_process_launch__posix.cc (revision 497959)
@@ -1,10 +1,10 @@
---- base/process/launch_posix.cc.orig 2019-01-30 02:17:39.000000000 +0100
-+++ base/process/launch_posix.cc 2019-01-31 20:45:00.397199000 +0100
-@@ -63,6 +63,7 @@
+--- base/process/launch_posix.cc.orig 2019-03-11 22:00:51 UTC
++++ base/process/launch_posix.cc
+@@ -64,6 +64,7 @@
#error "macOS should use launch_mac.cc"
#endif
+#pragma weak environ
extern char** environ;
namespace base {
Index: branches/2019Q2/www/chromium/files/patch-base_process_memory.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-base_process_memory.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-base_process_memory.cc (revision 497959)
@@ -1,20 +1,20 @@
---- base/process/memory.cc.orig 2017-12-15 02:04:05.000000000 +0100
-+++ base/process/memory.cc 2017-12-31 09:49:46.308931000 +0100
+--- base/process/memory.cc.orig 2019-03-11 22:00:51 UTC
++++ base/process/memory.cc
@@ -10,7 +10,7 @@
namespace base {
// Defined in memory_win.cc for Windows.
-#if !defined(OS_WIN)
+#if !defined(OS_WIN) && !defined(OS_BSD)
namespace {
-@@ -31,7 +31,7 @@
+@@ -31,7 +31,7 @@ void TerminateBecauseOutOfMemory(size_t size) {
#endif
// Defined in memory_mac.mm for Mac.
-#if !defined(OS_MACOSX)
+#if !defined(OS_MACOSX) && !defined(OS_BSD)
bool UncheckedCalloc(size_t num_items, size_t size, void** result) {
const size_t alloc_size = num_items * size;
Index: branches/2019Q2/www/chromium/files/patch-base_process_memory.h
===================================================================
--- branches/2019Q2/www/chromium/files/patch-base_process_memory.h (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-base_process_memory.h (revision 497959)
@@ -1,11 +1,11 @@
---- base/process/memory.h.orig 2017-07-25 21:04:48.000000000 +0200
-+++ base/process/memory.h 2017-07-29 01:01:15.601297000 +0200
-@@ -32,7 +32,7 @@
+--- base/process/memory.h.orig 2019-03-11 22:00:51 UTC
++++ base/process/memory.h
+@@ -32,7 +32,7 @@ BASE_EXPORT void EnableTerminationOnOutOfMemory();
// Crash reporting classifies such crashes as OOM.
BASE_EXPORT void TerminateBecauseOutOfMemory(size_t size);
-#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_AIX)
+#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_AIX) || defined(OS_BSD)
BASE_EXPORT extern size_t g_oom_size;
// The maximum allowed value for the OOM score.
Index: branches/2019Q2/www/chromium/files/patch-base_process_memory__unittest.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-base_process_memory__unittest.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-base_process_memory__unittest.cc (revision 497959)
@@ -1,18 +1,18 @@
---- base/process/memory_unittest.cc.orig 2018-08-08 21:10:31.000000000 +0200
-+++ base/process/memory_unittest.cc 2018-08-20 13:06:25.303428000 +0200
-@@ -104,7 +104,7 @@
+--- base/process/memory_unittest.cc.orig 2019-03-11 22:00:51 UTC
++++ base/process/memory_unittest.cc
+@@ -104,7 +104,7 @@ TEST(MemoryTest, AllocatorShimWorking) {
// OpenBSD does not support these tests. Don't test these on ASan/TSan/MSan
// configurations: only test the real allocator.
// Windows only supports these tests with the allocator shim in place.
-#if !defined(OS_OPENBSD) && BUILDFLAG(USE_ALLOCATOR_SHIM) && \
+#if !defined(OS_BSD) && BUILDFLAG(USE_ALLOCATOR_SHIM) && \
!defined(MEMORY_TOOL_REPLACES_ALLOCATOR)
namespace {
-@@ -529,5 +529,5 @@
+@@ -529,5 +529,5 @@ TEST_F(OutOfMemoryHandledTest, UncheckedCalloc) {
EXPECT_FALSE(base::UncheckedCalloc(1, test_size_, &value_));
EXPECT_TRUE(value_ == nullptr);
}
-#endif // !defined(OS_OPENBSD) && BUILDFLAG(ENABLE_WIN_ALLOCATOR_SHIM_TESTS) &&
+#endif // !defined(OS_BSD) && BUILDFLAG(ENABLE_WIN_ALLOCATOR_SHIM_TESTS) &&
// !defined(MEMORY_TOOL_REPLACES_ALLOCATOR)
Index: branches/2019Q2/www/chromium/files/patch-base_process_process__handle.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-base_process_process__handle.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-base_process_process__handle.cc (revision 497959)
@@ -1,11 +1,11 @@
---- base/process/process_handle.cc.orig 2018-07-19 22:31:30.212555000 +0200
-+++ base/process/process_handle.cc 2018-07-19 22:32:27.185612000 +0200
-@@ -39,7 +39,7 @@
+--- base/process/process_handle.cc.orig 2019-03-11 22:00:51 UTC
++++ base/process/process_handle.cc
+@@ -39,7 +39,7 @@ uint32_t GetUniqueIdForProcess() {
return g_unique_id;
}
-#if defined(OS_LINUX) || defined(OS_AIX)
+#if defined(OS_LINUX) || defined(OS_AIX) || defined(OS_BSD)
void InitUniqueIdForProcessInPidNamespace(ProcessId pid_outside_of_namespace) {
g_unique_id = MangleProcessId(pid_outside_of_namespace);
Index: branches/2019Q2/www/chromium/files/patch-base_process_process__handle.h
===================================================================
--- branches/2019Q2/www/chromium/files/patch-base_process_process__handle.h (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-base_process_process__handle.h (revision 497959)
@@ -1,11 +1,11 @@
---- base/process/process_handle.h.orig 2018-07-19 22:31:39.988330000 +0200
-+++ base/process/process_handle.h 2018-07-19 22:32:06.977544000 +0200
-@@ -64,7 +64,7 @@
+--- base/process/process_handle.h.orig 2019-03-11 22:00:51 UTC
++++ base/process/process_handle.h
+@@ -64,7 +64,7 @@ BASE_EXPORT ProcessId GetCurrentProcId();
// a process's PID.
BASE_EXPORT uint32_t GetUniqueIdForProcess();
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
// When a process is started in a different PID namespace from the browser
// process, this function must be called with the process's PID in the browser's
// PID namespace in order to initialize its unique ID. Not thread safe.
Index: branches/2019Q2/www/chromium/files/patch-base_process_process__handle__freebsd.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-base_process_process__handle__freebsd.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-base_process_process__handle__freebsd.cc (revision 497959)
@@ -1,17 +1,17 @@
---- base/process/process_handle_freebsd.cc.orig 2018-01-04 21:05:38.000000000 +0100
-+++ base/process/process_handle_freebsd.cc 2018-01-27 02:11:02.948007000 +0100
-@@ -16,10 +16,13 @@
+--- base/process/process_handle_freebsd.cc.orig 2019-03-11 22:00:51 UTC
++++ base/process/process_handle_freebsd.cc
+@@ -16,10 +16,13 @@ namespace base {
ProcessId GetParentProcessId(ProcessHandle process) {
struct kinfo_proc info;
- size_t length;
+ size_t length = sizeof(struct kinfo_proc);
int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, process };
- if (sysctl(mib, arraysize(mib), &info, &length, NULL, 0) < 0)
+ if (sysctl(mib, base::size(mib), &info, &length, NULL, 0) < 0)
+ return -1;
+
+ if (length < sizeof(struct kinfo_proc))
return -1;
return info.ki_ppid;
Index: branches/2019Q2/www/chromium/files/patch-base_process_process__iterator__freebsd.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-base_process_process__iterator__freebsd.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-base_process_process__iterator__freebsd.cc (revision 497959)
@@ -1,45 +1,44 @@
---- base/process/process_iterator_freebsd.cc.orig 2018-01-04 21:05:38.000000000 +0100
-+++ base/process/process_iterator_freebsd.cc 2018-01-27 17:58:40.475292000 +0100
+--- base/process/process_iterator_freebsd.cc.orig 2019-03-11 22:00:51 UTC
++++ base/process/process_iterator_freebsd.cc
@@ -10,6 +10,10 @@
#include <sys/sysctl.h>
#include <unistd.h>
+/* getuid() */
+#include <unistd.h>
+#include <sys/types.h>
+
#include "base/logging.h"
- #include "base/macros.h"
+ #include "base/stl_util.h"
#include "base/strings/string_split.h"
-@@ -40,7 +44,7 @@
+@@ -40,7 +44,7 @@ ProcessIterator::ProcessIterator(const ProcessFilter*
num_of_kinfo_proc += 16;
kinfo_procs_.resize(num_of_kinfo_proc);
len = num_of_kinfo_proc * sizeof(struct kinfo_proc);
-- if (sysctl(mib, arraysize(mib), &kinfo_procs_[0], &len, NULL, 0) <0) {
-+ if (sysctl(mib, arraysize(mib), kinfo_procs_.data(), &len, NULL, 0) <0) {
+- if (sysctl(mib, base::size(mib), &kinfo_procs_[0], &len, NULL, 0) < 0) {
++ if (sysctl(mib, base::size(mib), kinfo_procs_.data(), &len, NULL, 0) < 0) {
// If we get a mem error, it just means we need a bigger buffer, so
// loop around again. Anything else is a real error and give up.
if (errno != ENOMEM) {
-@@ -72,19 +76,13 @@
+@@ -72,18 +76,13 @@ bool ProcessIterator::CheckForNextProcess() {
for (; index_of_kinfo_proc_ < kinfo_procs_.size(); ++index_of_kinfo_proc_) {
size_t length;
struct kinfo_proc kinfo = kinfo_procs_[index_of_kinfo_proc_];
- int mib[] = { CTL_KERN, KERN_PROC_ARGS, kinfo.ki_pid };
+ int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_ARGS, kinfo.ki_pid };
if ((kinfo.ki_pid > 0) && (kinfo.ki_stat == SZOMB))
continue;
- length = 0;
-- if (sysctl(mib, arraysize(mib), NULL, &length, NULL, 0) < 0) {
+- if (sysctl(mib, base::size(mib), NULL, &length, NULL, 0) < 0) {
- LOG(ERROR) << "failed to figure out the buffer size for a command line";
- continue;
- }
-
- data.resize(length);
--
+ data.resize(ARG_MAX);
+ length = ARG_MAX;
- if (sysctl(mib, arraysize(mib), &data[0], &length, NULL, 0) < 0) {
+
+ if (sysctl(mib, base::size(mib), &data[0], &length, NULL, 0) < 0) {
LOG(ERROR) << "failed to fetch a commandline";
- continue;
Index: branches/2019Q2/www/chromium/files/patch-base_process_process__linux.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-base_process_process__linux.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-base_process_process__linux.cc (revision 497959)
@@ -1,18 +1,18 @@
---- base/process/process_linux.cc.orig 2019-02-01 23:15:53.491332000 +0100
-+++ base/process/process_linux.cc 2019-02-01 23:16:56.937810000 +0100
-@@ -88,6 +88,7 @@
+--- base/process/process_linux.cc.orig 2019-03-11 22:00:51 UTC
++++ base/process/process_linux.cc
+@@ -88,6 +88,7 @@ Time Process::CreationTime() const {
return Time(boot_time + start_offset);
}
+#if !defined(OS_BSD)
// static
bool Process::CanBackgroundProcesses() {
#if defined(OS_CHROMEOS)
-@@ -139,6 +140,7 @@
+@@ -139,6 +140,7 @@ bool Process::SetProcessBackgrounded(bool background)
DPCHECK(result == 0);
return result == 0;
}
+#endif // !defined(OS_BSD)
#if defined(OS_CHROMEOS)
bool IsProcessBackgroundedCGroup(const StringPiece& cgroup_contents) {
Index: branches/2019Q2/www/chromium/files/patch-base_process_process__metrics.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-base_process_process__metrics.cc (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-base_process_process__metrics.cc (revision 497959)
@@ -0,0 +1,20 @@
+--- base/process/process_metrics.cc.orig 2019-03-21 01:36:27.000000000 +0100
++++ base/process/process_metrics.cc 2019-03-24 19:52:47.516944000 +0100
+@@ -126,7 +126,7 @@
+ }
+ #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 @@
+ 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(
Property changes on: branches/2019Q2/www/chromium/files/patch-base_process_process__metrics.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/2019Q2/www/chromium/files/patch-base_process_process__metrics.h
===================================================================
--- branches/2019Q2/www/chromium/files/patch-base_process_process__metrics.h (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-base_process_process__metrics.h (revision 497959)
@@ -1,112 +1,112 @@
---- base/process/process_metrics.h.orig 2018-03-20 23:05:14.000000000 +0100
-+++ base/process/process_metrics.h 2018-03-24 12:20:53.523721000 +0100
-@@ -110,7 +110,7 @@
- size_t image;
- };
+--- base/process/process_metrics.h.orig 2019-03-21 01:36:27.000000000 +0100
++++ base/process/process_metrics.h 2019-03-24 19:51:50.158637000 +0100
+@@ -41,7 +41,7 @@
+ // 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.
//
-@@ -120,7 +120,7 @@
+@@ -51,7 +51,7 @@
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);
-@@ -252,7 +252,7 @@
- // otherwise.
- bool GetIOCounters(IoCounters* io_counters) const;
+@@ -92,7 +92,7 @@
+ // convenience wrapper for CreateProcessMetrics().
+ static std::unique_ptr<ProcessMetrics> CreateCurrentProcessMetrics();
--#if defined(OS_LINUX) || defined(OS_AIX) || defined(OS_ANDROID)
-+#if defined(OS_LINUX) || defined(OS_AIX) || defined(OS_ANDROID) || defined(OS_BSD)
- // Returns the number of file descriptors currently open by the process, or
- // -1 on error.
- int GetOpenFdCount() const;
-@@ -260,16 +260,16 @@
- // Returns the soft limit of file descriptors that can be opened by the
- // process, or -1 on error.
+-#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 @@
int GetOpenFdSoftLimit() const;
--#endif // defined(OS_LINUX) || defined(OS_AIX) || defined(OS_ANDROID)
-+#endif // defined(OS_LINUX) || defined(OS_AIX) || defined(OS_ANDROID) || defined(OS_BSD)
+ #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();
-@@ -289,7 +289,7 @@
- bool GetWorkingSetKBytesTotmaps(WorkingSetKBytes *ws_usage) const;
- #endif
+@@ -218,7 +218,7 @@
+ 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)
-@@ -310,7 +310,7 @@
- TimeTicks last_cpu_time_;
- int64_t last_system_time_;
+@@ -247,7 +247,7 @@
+ // 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_;
-@@ -358,7 +358,7 @@
+@@ -293,7 +293,7 @@
#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)
// Data about system-wide memory consumption. Values are in KB. Available on
// Windows, Mac, Linux, Android and Chrome OS.
//
-@@ -391,7 +391,7 @@
+@@ -326,7 +326,7 @@
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
-@@ -406,7 +406,7 @@
+@@ -341,7 +341,7 @@
#endif
#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_AIX) || \
- defined(OS_FUCHSIA)
+ defined(OS_FUCHSIA) || defined(OS_BSD)
int buffers = 0;
int cached = 0;
int active_anon = 0;
-@@ -416,7 +416,7 @@
+@@ -351,7 +351,7 @@
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)
#if defined(OS_CHROMEOS)
int shmem = 0;
-@@ -444,7 +444,7 @@
+@@ -377,9 +377,9 @@
+ 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_ANDROID) || defined(OS_AIX) || defined(OS_FUCHSIA) || defined(OS_BSD)
-#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/<pid>/stat and return the sum of the
// CPU-related ticks. Returns -1 on parse error.
// Exposed for testing.
Index: branches/2019Q2/www/chromium/files/patch-base_process_process__metrics__freebsd.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-base_process_process__metrics__freebsd.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-base_process_process__metrics__freebsd.cc (revision 497959)
@@ -1,124 +1,122 @@
---- base/process/process_metrics_freebsd.cc.orig 2019-02-06 23:06:36.000000000 +0100
-+++ base/process/process_metrics_freebsd.cc 2019-02-08 19:11:07.753223000 +0100
+--- base/process/process_metrics_freebsd.cc.orig 2019-03-21 01:36:27.000000000 +0100
++++ base/process/process_metrics_freebsd.cc 2019-03-24 22:18:22.764297000 +0100
@@ -5,6 +5,7 @@
#include "base/process/process_metrics.h"
#include <stddef.h>
+#include <sys/types.h>
#include <sys/sysctl.h>
#include <sys/user.h>
#include <unistd.h>
@@ -14,11 +15,15 @@
#include "base/process/process_metrics_iocounters.h"
#include "base/stl_util.h"
+#include <unistd.h> /* getpagesize() */
+#include <fcntl.h> /* O_RDONLY */
+#include <kvm.h>
+#include <libutil.h>
+
namespace base {
ProcessMetrics::ProcessMetrics(ProcessHandle process)
- : process_(process),
- last_cpu_(0) {}
+ : process_(process) {}
// static
std::unique_ptr<ProcessMetrics> ProcessMetrics::CreateProcessMetrics(
-@@ -67,6 +72,95 @@
- pagesize = getpagesize();
-
+@@ -69,4 +74,93 @@
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 {
-+ struct kinfo_proc *info;
+ size_t length;
+ int total_count = 0;
+ int mib[] = { CTL_KERN, KERN_MAXFILESPERPROC };
+
+ length = sizeof(total_count);
+
-+ if (sysctl(mib, arraysize(mib), &total_count, &length, NULL, 0) < 0) {
++ if (sysctl(mib, base::size(mib), &total_count, &length, NULL, 0) < 0) {
+ total_count = -1;
-+ goto out;
+ }
+
-+out:
-+ free(info);
+ return total_count;
+}
+
+uint64_t ProcessMetrics::GetVmSwapBytes() const {
+ NOTIMPLEMENTED();
+ return 0;
- }
-
++}
++
++int ProcessMetrics::GetIdleWakeupsPerSecond() {
++ NOTIMPLEMENTED();
++ return 0;
++}
} // namespace base
Index: branches/2019Q2/www/chromium/files/patch-base_process_process__metrics__posix.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-base_process_process__metrics__posix.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-base_process_process__metrics__posix.cc (revision 497959)
@@ -1,20 +1,20 @@
---- base/process/process_metrics_posix.cc.orig 2018-08-01 00:08:25.000000000 +0200
-+++ base/process/process_metrics_posix.cc 2018-08-05 00:53:58.559513000 +0200
+--- base/process/process_metrics_posix.cc.orig 2019-03-11 22:00:51 UTC
++++ base/process/process_metrics_posix.cc
@@ -19,6 +19,8 @@
#if defined(OS_MACOSX)
#include <malloc/malloc.h>
+#elif defined(OS_FREEBSD)
+#include <stdlib.h>
#else
#include <malloc.h>
#endif
-@@ -107,7 +109,7 @@
+@@ -107,7 +109,7 @@ size_t ProcessMetrics::GetMallocUsage() {
#else
return minfo.hblkhd + minfo.arena;
#endif
-#elif defined(OS_FUCHSIA)
+#elif defined(OS_FUCHSIA) || defined(OS_BSD)
// TODO(fuchsia): Not currently exposed. https://crbug.com/735087.
return 0;
#endif
Index: branches/2019Q2/www/chromium/files/patch-base_process_process__unittest.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-base_process_process__unittest.cc (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-base_process_process__unittest.cc (revision 497959)
@@ -0,0 +1,11 @@
+--- base/process/process_unittest.cc.orig 2019-03-18 19:16:37 UTC
++++ base/process/process_unittest.cc
+@@ -148,7 +148,7 @@ TEST_F(ProcessTest, CreationTimeOtherProcess) {
+ // was spawned and a time recorded after it was spawned. However, since the
+ // base::Time and process creation clocks don't match, tolerate some error.
+ constexpr base::TimeDelta kTolerance =
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+ // On Linux, process creation time is relative to boot time which has a
+ // 1-second resolution. Tolerate 1 second for the imprecise boot time and
+ // 100 ms for the imprecise clock.
Property changes on: branches/2019Q2/www/chromium/files/patch-base_process_process__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/2019Q2/www/chromium/files/patch-base_profiler_stack__sampling__profiler__unittest.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-base_profiler_stack__sampling__profiler__unittest.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-base_profiler_stack__sampling__profiler__unittest.cc (revision 497959)
@@ -1,11 +1,11 @@
---- base/profiler/stack_sampling_profiler_unittest.cc.orig 2017-04-19 19:06:28 UTC
+--- base/profiler/stack_sampling_profiler_unittest.cc.orig 2019-03-11 22:00:51 UTC
+++ base/profiler/stack_sampling_profiler_unittest.cc
-@@ -33,7 +33,7 @@
+@@ -39,7 +39,7 @@
#include <intrin.h>
#include <malloc.h>
#include <windows.h>
-#else
+#elif !defined(OS_BSD)
#include <alloca.h>
#endif
Index: branches/2019Q2/www/chromium/files/patch-base_security__unittest.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-base_security__unittest.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-base_security__unittest.cc (revision 497959)
@@ -1,11 +1,11 @@
---- base/security_unittest.cc.orig 2017-04-19 19:06:28 UTC
+--- base/security_unittest.cc.orig 2019-03-11 22:00:51 UTC
+++ base/security_unittest.cc
-@@ -74,7 +74,7 @@ bool IsTcMallocBypassed() {
+@@ -59,7 +59,7 @@ NOINLINE Type HideValueFromCompiler(volatile Type valu
// FAILS_ is too clunky.
void OverflowTestsSoftExpectTrue(bool overflow_detected) {
if (!overflow_detected) {
-#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_MACOSX)
+#if defined(OS_POSIX) && !defined(OS_NACL)
// Sadly, on Linux, Android, and OSX we don't have a good story yet. Don't
// fail the test, but report.
printf("Platform has overflow: %s\n",
Index: branches/2019Q2/www/chromium/files/patch-base_system_sys__info__freebsd.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-base_system_sys__info__freebsd.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-base_system_sys__info__freebsd.cc (revision 497959)
@@ -1,71 +1,71 @@
---- base/system/sys_info_freebsd.cc.orig 2017-12-15 02:04:05.000000000 +0100
-+++ base/system/sys_info_freebsd.cc 2017-12-23 21:51:22.626194000 +0100
+--- base/system/sys_info_freebsd.cc.orig 2019-03-11 22:00:51 UTC
++++ base/system/sys_info_freebsd.cc
@@ -13,26 +13,58 @@
namespace base {
int64_t SysInfo::AmountOfPhysicalMemoryImpl() {
- int pages, page_size;
+ int pages, page_size, r = 0;
size_t size = sizeof(pages);
- sysctlbyname("vm.stats.vm.v_page_count", &pages, &size, NULL, 0);
- sysctlbyname("vm.stats.vm.v_page_size", &page_size, &size, NULL, 0);
- if (pages == -1 || page_size == -1) {
+ if(r == 0)
+ r = sysctlbyname("vm.stats.vm.v_page_count", &pages, &size, NULL, 0);
+ if(r == 0)
+ r =sysctlbyname("vm.stats.vm.v_page_size", &page_size, &size, NULL, 0);
+ if(r == -1) {
NOTREACHED();
return 0;
}
return static_cast<int64_t>(pages) * page_size;
}
-// static
-uint64_t SysInfo::MaxSharedMemorySize() {
- size_t limit;
- size_t size = sizeof(limit);
- if (sysctlbyname("kern.ipc.shmmax", &limit, &size, NULL, 0) < 0) {
+int64_t SysInfo::AmountOfAvailablePhysicalMemoryImpl() {
+ int page_size, r = 0;
+ unsigned pgfree, pginact, pgcache;
+ size_t size = sizeof(page_size);
+ size_t szpg = sizeof(pgfree);
+ if(r == 0)
+ r = sysctlbyname("vm.stats.vm.v_page_size", &page_size, &size, NULL, 0);
+ if(r == 0)
+ r = sysctlbyname("vm.stats.vm.v_free_count", &pgfree, &szpg, NULL, 0);
+ if(r == 0)
+ r = sysctlbyname("vm.stats.vm.v_inactive_count", &pginact, &szpg, NULL, 0);
+ if(r == 0)
+ r = sysctlbyname("vm.stats.vm.v_cache_count", &pgcache, &szpg, NULL, 0);
+ if(r == -1) {
NOTREACHED();
return 0;
}
- return static_cast<uint64_t>(limit);
+ return static_cast<int64_t>((pgfree + pginact + pgcache) * page_size);
+}
+
+// static
+std::string SysInfo::CPUModelName() {
+ int mib[] = { CTL_HW, HW_MODEL };
+ char name[256];
-+ size_t size = arraysize(name);
-+ if (sysctl(mib, arraysize(mib), &name, &size, NULL, 0) == 0)
++ size_t size = base::size(name);
++ if (sysctl(mib, base::size(mib), &name, &size, NULL, 0) == 0)
+ return name;
+ return std::string();
+}
+
+int SysInfo::NumberOfProcessors() {
+ int mib[] = { CTL_HW, HW_NCPU };
+ int ncpu;
+ size_t size = sizeof(ncpu);
-+ if (sysctl(mib, arraysize(mib), &ncpu, &size, NULL, 0) == -1) {
++ if (sysctl(mib, base::size(mib), &ncpu, &size, NULL, 0) == -1) {
+ NOTREACHED();
+ return 1;
+ }
+ return ncpu;
}
} // namespace base
Index: branches/2019Q2/www/chromium/files/patch-base_system_sys__info__posix.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-base_system_sys__info__posix.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-base_system_sys__info__posix.cc (revision 497959)
@@ -1,38 +1,38 @@
---- base/system/sys_info_posix.cc.orig 2019-01-31 21:22:45.968524000 +0100
-+++ base/system/sys_info_posix.cc 2019-01-31 21:25:09.041659000 +0100
+--- base/system/sys_info_posix.cc.orig 2019-03-11 22:00:51 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)
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 @@
+@@ -64,7 +64,7 @@ int NumberOfProcessors() {
base::LazyInstance<base::internal::LazySysInfoValue<int, NumberOfProcessors>>::
Leaky g_lazy_number_of_processors = LAZY_INSTANCE_INITIALIZER;
-#endif // !defined(OS_OPENBSD) && !defined(OS_FUCHSIA)
+#endif // !defined(OS_BSD) && !defined(OS_FUCHSIA)
#if !defined(OS_FUCHSIA)
int64_t AmountOfVirtualMemory() {
-@@ -132,7 +132,7 @@
+@@ -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)
int SysInfo::NumberOfProcessors() {
return g_lazy_number_of_processors.Get().value();
}
-@@ -225,6 +225,8 @@
+@@ -225,6 +225,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/2019Q2/www/chromium/files/patch-base_task_task__scheduler_scheduler__single__thread__task__runner__manager__unittest.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-base_task_task__scheduler_scheduler__single__thread__task__runner__manager__unittest.cc (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-base_task_task__scheduler_scheduler__single__thread__task__runner__manager__unittest.cc (revision 497959)
@@ -0,0 +1,12 @@
+--- base/task/task_scheduler/scheduler_single_thread_task_runner_manager_unittest.cc.orig 2019-03-11 22:00:51 UTC
++++ base/task/task_scheduler/scheduler_single_thread_task_runner_manager_unittest.cc
+@@ -295,6 +295,9 @@ TEST_P(TaskSchedulerSingleThreadTaskRunnerManagerCommo
+ EXPECT_EQ(ThreadPriority::NORMAL, thread_priority_normal);
+ }
+
++#if defined(OS_BSD)
++#define ThreadNamesSet DISABLED_ThreadNamesSet
++#endif
+ TEST_P(TaskSchedulerSingleThreadTaskRunnerManagerCommonTest, ThreadNamesSet) {
+ constexpr TaskTraits foo_traits = {TaskPriority::BEST_EFFORT,
+ TaskShutdownBehavior::BLOCK_SHUTDOWN};
Property changes on: branches/2019Q2/www/chromium/files/patch-base_task_task__scheduler_scheduler__single__thread__task__runner__manager__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/2019Q2/www/chromium/files/patch-base_test_generate__fontconfig__caches.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-base_test_generate__fontconfig__caches.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-base_test_generate__fontconfig__caches.cc (revision 497959)
@@ -1,17 +1,17 @@
---- base/test/generate_fontconfig_caches.cc.orig 2018-12-16 02:19:42.000000000 +0100
-+++ base/test/generate_fontconfig_caches.cc 2018-12-16 02:19:45.432130000 +0100
-@@ -57,7 +57,14 @@
+--- base/test/generate_fontconfig_caches.cc.orig 2019-03-11 22:00:51 UTC
++++ base/test/generate_fontconfig_caches.cc
+@@ -57,7 +57,14 @@ int main() {
base::TearDownFontconfig();
// Check existence of intended fontconfig cache file.
+#if defined(OS_BSD)
+ // Our version of fontconfig is too old to respect .uuid files in font directories,
+ // so we check for the CACHEDIR.TAG file instead
CHECK(base::PathExists(
+ fontconfig_caches.Append("CACHEDIR.TAG")));
+#else
+ CHECK(base::PathExists(
fontconfig_caches.Append(base::StrCat({uuid, "-le64.cache-7"}))));
+#endif
return 0;
}
Index: branches/2019Q2/www/chromium/files/patch-base_test_launcher_test__launcher.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-base_test_launcher_test__launcher.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-base_test_launcher_test__launcher.cc (revision 497959)
@@ -1,10 +1,10 @@
---- base/test/launcher/test_launcher.cc.orig 2017-12-15 02:04:05.000000000 +0100
-+++ base/test/launcher/test_launcher.cc 2017-12-30 02:02:22.630578000 +0100
-@@ -51,6 +51,7 @@
+--- base/test/launcher/test_launcher.cc.orig 2019-03-11 22:00:51 UTC
++++ base/test/launcher/test_launcher.cc
+@@ -53,6 +53,7 @@
#include "testing/gtest/include/gtest/gtest.h"
#if defined(OS_POSIX)
+#include <signal.h>
#include <fcntl.h>
#include "base/files/file_descriptor_watcher_posix.h"
Index: branches/2019Q2/www/chromium/files/patch-base_test_test__file__util__linux.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-base_test_test__file__util__linux.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-base_test_test__file__util__linux.cc (revision 497959)
@@ -1,13 +1,13 @@
---- base/test/test_file_util_linux.cc.orig 2017-08-10 16:14:03.505570000 +0200
-+++ base/test/test_file_util_linux.cc 2017-08-10 16:14:43.299690000 +0200
-@@ -20,8 +20,10 @@
+--- base/test/test_file_util_linux.cc.orig 2019-03-11 22:00:51 UTC
++++ base/test/test_file_util_linux.cc
+@@ -51,8 +51,10 @@ bool EvictFileFromSystemCache(const FilePath& file) {
return false;
if (fdatasync(fd.get()) != 0)
return false;
+#if !defined(OS_BSD)
if (posix_fadvise(fd.get(), 0, 0, POSIX_FADV_DONTNEED) != 0)
return false;
+#endif
return true;
}
Index: branches/2019Q2/www/chromium/files/patch-base_test_test__file__util__posix.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-base_test_test__file__util__posix.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-base_test_test__file__util__posix.cc (revision 497959)
@@ -1,11 +1,11 @@
---- base/test/test_file_util_posix.cc.orig 2017-09-05 21:05:11.000000000 +0200
-+++ base/test/test_file_util_posix.cc 2017-09-06 16:59:12.993711000 +0200
-@@ -79,7 +79,7 @@
- return DeleteFile(file, recurse);
+--- base/test/test_file_util_posix.cc.orig 2019-03-11 22:00:51 UTC
++++ base/test/test_file_util_posix.cc
+@@ -85,7 +85,7 @@ void SyncPageCacheToDisk() {
+ sync();
}
-#if !defined(OS_LINUX) && !defined(OS_MACOSX) && !defined(OS_ANDROID)
+#if !defined(OS_LINUX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD)
bool EvictFileFromSystemCache(const FilePath& file) {
// There doesn't seem to be a POSIX way to cool the disk cache.
NOTIMPLEMENTED();
Index: branches/2019Q2/www/chromium/files/patch-base_third__party_libevent_BUILD.gn
===================================================================
--- branches/2019Q2/www/chromium/files/patch-base_third__party_libevent_BUILD.gn (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-base_third__party_libevent_BUILD.gn (revision 497959)
@@ -1,24 +1,24 @@
---- base/third_party/libevent/BUILD.gn.orig 2018-01-04 21:05:38.000000000 +0100
-+++ base/third_party/libevent/BUILD.gn 2018-01-06 01:02:53.058845000 +0100
-@@ -43,13 +43,20 @@
+--- base/third_party/libevent/BUILD.gn.orig 2019-03-11 22:00:51 UTC
++++ base/third_party/libevent/BUILD.gn
+@@ -43,13 +43,20 @@ static_library("libevent") {
"mac/event-config.h",
]
include_dirs = [ "mac" ]
- } else if (is_linux) {
+ } else if (is_linux && !is_bsd) {
sources += [
"epoll.c",
"linux/config.h",
"linux/event-config.h",
]
include_dirs = [ "linux" ]
+ } else if (is_bsd) {
+ sources += [
+ "kqueue.c",
+ "freebsd/config.h",
+ "freebsd/event-config.h",
+ ]
+ include_dirs = [ "freebsd" ]
} else if (is_android) {
sources += [
"android/config.h",
Index: branches/2019Q2/www/chromium/files/patch-base_threading_platform__thread.h
===================================================================
--- branches/2019Q2/www/chromium/files/patch-base_threading_platform__thread.h (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-base_threading_platform__thread.h (revision 497959)
@@ -1,11 +1,11 @@
---- base/threading/platform_thread.h.orig 2017-04-19 19:06:28 UTC
+--- base/threading/platform_thread.h.orig 2019-03-11 22:00:51 UTC
+++ base/threading/platform_thread.h
-@@ -211,7 +211,7 @@ class BASE_EXPORT PlatformThread {
+@@ -220,7 +220,7 @@ class BASE_EXPORT PlatformThread {
static ThreadPriority GetCurrentThreadPriority();
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
// Toggles a specific thread's priority at runtime. This can be used to
// change the priority of a thread in a different process and will fail
// if the calling process does not have proper permissions. The
Index: branches/2019Q2/www/chromium/files/patch-base_threading_platform__thread__linux.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-base_threading_platform__thread__linux.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-base_threading_platform__thread__linux.cc (revision 497959)
@@ -1,30 +1,30 @@
---- base/threading/platform_thread_linux.cc.orig 2019-01-30 02:17:39.000000000 +0100
-+++ base/threading/platform_thread_linux.cc 2019-02-01 16:31:27.360883000 +0100
+--- base/threading/platform_thread_linux.cc.orig 2019-03-11 22:00:51 UTC
++++ base/threading/platform_thread_linux.cc
@@ -18,7 +18,9 @@
#if !defined(OS_NACL) && !defined(OS_AIX)
#include <pthread.h>
+#if !defined(OS_BSD)
#include <sys/prctl.h>
+#endif
#include <sys/resource.h>
#include <sys/time.h>
#include <sys/types.h>
-@@ -99,7 +101,7 @@
+@@ -99,7 +101,7 @@ const ThreadPriorityToNiceValuePair kThreadPriorityToN
Optional<bool> CanIncreaseCurrentThreadPriorityForPlatform(
ThreadPriority priority) {
-#if !defined(OS_NACL)
+#if !defined(OS_NACL) && !defined(OS_BSD)
// A non-zero soft-limit on RLIMIT_RTPRIO is required to be allowed to invoke
// pthread_setschedparam in SetCurrentThreadPriorityForPlatform().
struct rlimit rlim;
-@@ -141,7 +143,7 @@
+@@ -141,7 +143,7 @@ Optional<ThreadPriority> GetCurrentThreadPriorityForPl
void PlatformThread::SetName(const std::string& name) {
ThreadIdNameManager::GetInstance()->SetName(name);
-#if !defined(OS_NACL) && !defined(OS_AIX)
+#if !defined(OS_NACL) && !defined(OS_AIX) && !defined(OS_BSD)
// On linux we can get the thread names to show up in the debugger by setting
// the process name for the LWP. We don't want to do this for the main
// thread because that would rename the process, causing tools like killall
Index: branches/2019Q2/www/chromium/files/patch-base_threading_platform__thread__posix.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-base_threading_platform__thread__posix.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-base_threading_platform__thread__posix.cc (revision 497959)
@@ -1,11 +1,11 @@
---- base/threading/platform_thread_posix.cc.orig 2017-04-19 19:06:28 UTC
+--- base/threading/platform_thread_posix.cc.orig 2019-03-11 22:00:51 UTC
+++ base/threading/platform_thread_posix.cc
-@@ -56,7 +56,7 @@ void* ThreadFunc(void* params) {
+@@ -66,7 +66,7 @@ void* ThreadFunc(void* params) {
if (!thread_params->joinable)
base::ThreadRestrictions::SetSingletonAllowed(false);
-#if !defined(OS_NACL)
+#if !defined(OS_NACL) && !defined(OS_BSD)
// Threads on linux/android may inherit their priority from the thread
// where they were created. This explicitly sets the priority of all new
// threads.
Index: branches/2019Q2/www/chromium/files/patch-base_threading_thread__task__runner__handle.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-base_threading_thread__task__runner__handle.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-base_threading_thread__task__runner__handle.cc (revision 497959)
@@ -1,26 +1,26 @@
---- base/threading/thread_task_runner_handle.cc.orig 2017-06-05 19:03:01 UTC
+--- base/threading/thread_task_runner_handle.cc.orig 2019-03-11 22:00:51 UTC
+++ base/threading/thread_task_runner_handle.cc
@@ -7,6 +7,7 @@
#include <utility>
#include "base/bind.h"
+#include "base/callback_helpers.h"
#include "base/lazy_instance.h"
#include "base/logging.h"
#include "base/memory/ptr_util.h"
-@@ -34,6 +35,7 @@ bool ThreadTaskRunnerHandle::IsSet() {
- return !!lazy_tls_ptr.Pointer()->Get();
+@@ -37,6 +38,7 @@ bool ThreadTaskRunnerHandle::IsSet() {
+ return !!thread_task_runner_tls.Pointer()->Get();
}
+#if defined(OS_BSD)
// static
ScopedClosureRunner ThreadTaskRunnerHandle::OverrideForTesting(
scoped_refptr<SingleThreadTaskRunner> overriding_task_runner) {
-@@ -77,6 +79,7 @@ ScopedClosureRunner ThreadTaskRunnerHandle::OverrideFo
- base::Passed(&overriding_task_runner),
- base::Unretained(ttrh->task_runner_.get())));
+@@ -86,6 +88,7 @@ ScopedClosureRunner ThreadTaskRunnerHandle::OverrideFo
+ base::Unretained(ttrh->task_runner_.get()),
+ std::move(no_running_during_override)));
}
+#endif
ThreadTaskRunnerHandle::ThreadTaskRunnerHandle(
scoped_refptr<SingleThreadTaskRunner> task_runner)
Index: branches/2019Q2/www/chromium/files/patch-base_trace__event_malloc__dump__provider.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-base_trace__event_malloc__dump__provider.cc (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-base_trace__event_malloc__dump__provider.cc (revision 497959)
@@ -0,0 +1,21 @@
+--- base/trace_event/malloc_dump_provider.cc.orig 2019-03-11 22:00:51 UTC
++++ base/trace_event/malloc_dump_provider.cc
+@@ -17,6 +17,8 @@
+
+ #if defined(OS_MACOSX)
+ #include <malloc/malloc.h>
++#elif defined(OS_BSD)
++#include "stdlib.h"
+ #else
+ #include <malloc.h>
+ #endif
+@@ -132,6 +134,9 @@ bool MallocDumpProvider::OnMemoryDump(const MemoryDump
+ }
+ #elif defined(OS_FUCHSIA)
+ // TODO(fuchsia): Port, see https://crbug.com/706592.
++#elif defined(OS_BSD)
++ total_virtual_size = 0;
++ allocated_objects_size = 0;
+ #else
+ struct mallinfo info = mallinfo();
+ DCHECK_GE(info.arena + info.hblkhd, info.uordblks);
Property changes on: branches/2019Q2/www/chromium/files/patch-base_trace__event_malloc__dump__provider.cc
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: branches/2019Q2/www/chromium/files/patch-base_trace__event_process__memory__dump.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-base_trace__event_process__memory__dump.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-base_trace__event_process__memory__dump.cc (revision 497959)
@@ -1,11 +1,11 @@
---- base/trace_event/process_memory_dump.cc.orig 2018-08-01 00:08:26.000000000 +0200
-+++ base/trace_event/process_memory_dump.cc 2018-08-04 13:42:42.870211000 +0200
-@@ -95,7 +95,7 @@
+--- base/trace_event/process_memory_dump.cc.orig 2019-03-11 22:00:51 UTC
++++ base/trace_event/process_memory_dump.cc
+@@ -94,7 +94,7 @@ size_t ProcessMemoryDump::CountResidentBytes(void* sta
#if defined(OS_WIN)
std::unique_ptr<PSAPI_WORKING_SET_EX_INFORMATION[]> vec(
new PSAPI_WORKING_SET_EX_INFORMATION[max_vec_size]);
-#elif defined(OS_MACOSX)
+#elif defined(OS_MACOSX) || defined(OS_BSD)
std::unique_ptr<char[]> vec(new char[max_vec_size]);
#elif defined(OS_POSIX) || defined(OS_FUCHSIA)
std::unique_ptr<unsigned char[]> vec(new unsigned char[max_vec_size]);
Index: branches/2019Q2/www/chromium/files/patch-base_trace__event_process__memory__dump.h
===================================================================
--- branches/2019Q2/www/chromium/files/patch-base_trace__event_process__memory__dump.h (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-base_trace__event_process__memory__dump.h (revision 497959)
@@ -1,11 +1,11 @@
---- base/trace_event/process_memory_dump.h.orig 2018-08-01 00:08:26.000000000 +0200
-+++ base/trace_event/process_memory_dump.h 2018-08-04 13:49:22.487126000 +0200
+--- base/trace_event/process_memory_dump.h.orig 2019-03-11 22:00:51 UTC
++++ base/trace_event/process_memory_dump.h
@@ -22,7 +22,7 @@
// Define COUNT_RESIDENT_BYTES_SUPPORTED if platform supports counting of the
// resident memory.
-#if !defined(OS_NACL)
+#if !defined(OS_NACL) && !defined(OS_BSD)
#define COUNT_RESIDENT_BYTES_SUPPORTED
#endif
Index: branches/2019Q2/www/chromium/files/patch-build_config_BUILD.gn
===================================================================
--- branches/2019Q2/www/chromium/files/patch-build_config_BUILD.gn (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-build_config_BUILD.gn (revision 497959)
@@ -1,30 +1,30 @@
---- build/config/BUILD.gn.orig 2019-01-30 02:17:39.000000000 +0100
-+++ build/config/BUILD.gn 2019-01-31 21:42:37.569620000 +0100
-@@ -170,7 +170,7 @@
+--- build/config/BUILD.gn.orig 2019-03-11 22:00:52 UTC
++++ build/config/BUILD.gn
+@@ -162,7 +162,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?
-@@ -272,9 +272,7 @@
+@@ -263,9 +263,7 @@ config("default_libs") {
]
} else if (is_linux) {
libs = [
- "dl",
"pthread",
- "rt",
]
}
}
-@@ -351,7 +349,7 @@
+@@ -342,7 +340,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/2019Q2/www/chromium/files/patch-build_config_BUILDCONFIG.gn
===================================================================
--- branches/2019Q2/www/chromium/files/patch-build_config_BUILDCONFIG.gn (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-build_config_BUILDCONFIG.gn (revision 497959)
@@ -1,119 +1,48 @@
---- build/config/BUILDCONFIG.gn.orig 2019-02-06 23:06:36.000000000 +0100
-+++ build/config/BUILDCONFIG.gn 2019-02-08 19:05:14.524345000 +0100
-@@ -131,10 +131,10 @@
+--- build/config/BUILDCONFIG.gn.orig 2019-03-11 22:00:52 UTC
++++ build/config/BUILDCONFIG.gn
+@@ -131,10 +131,10 @@ declare_args() {
is_official_build = false
# Whether we're a traditional desktop unix.
- is_desktop_linux = current_os == "linux"
+ is_desktop_linux = current_os == "linux" || current_os == "freebsd"
# Set to true when compiling with the Clang compiler.
- is_clang = current_os != "linux" ||
+ is_clang = current_os != "linux" || current_os == "freebsd" ||
(current_cpu != "s390x" && current_cpu != "s390" &&
current_cpu != "ppc64" && current_cpu != "ppc" &&
current_cpu != "mips" && current_cpu != "mips64")
-@@ -186,8 +186,8 @@
+@@ -186,8 +186,8 @@ if (host_toolchain == "") {
# TODO(dpranke): Add some sort of assert here that verifies that
# no toolchain omitted host_toolchain from its toolchain_args().
- if (host_os == "linux") {
- if (target_os != "linux") {
+ if (host_os == "linux" || host_os == "freebsd") {
-+ if (target_os != "linux" || target_os != "freebsd") {
- # TODO(dpranke) - is_clang normally applies only to the target
- # build, and there is no way to indicate that you want to override
- # it for both the target build *and* the host build. Do we need to
-@@ -228,7 +228,7 @@
++ if (target_os != "linux" && target_os != "freebsd") {
+ host_toolchain = "//build/toolchain/linux:clang_$host_cpu"
+ } else if (is_clang) {
+ host_toolchain = "//build/toolchain/linux:clang_$host_cpu"
+@@ -224,7 +224,7 @@ if (target_os == "android") {
assert(host_os == "linux" || host_os == "mac",
"Android builds are only supported on Linux and Mac hosts.")
_default_toolchain = "//build/toolchain/android:android_clang_$target_cpu"
-} else if (target_os == "chromeos" || target_os == "linux") {
+} else if (target_os == "chromeos" || target_os == "linux" || target_os == "freebsd") {
# See comments in build/toolchain/cros/BUILD.gn about board compiles.
if (is_clang) {
_default_toolchain = "//build/toolchain/linux:clang_$target_cpu"
-@@ -302,6 +302,7 @@
- is_nacl = false
- is_posix = false
- is_win = true
-+ is_bsd = false
- } else if (current_os == "mac") {
- is_aix = false
- is_android = false
-@@ -313,6 +314,7 @@
- is_nacl = false
- is_posix = true
- is_win = false
-+ is_bsd = false
- } else if (current_os == "android") {
- is_aix = false
- is_android = true
-@@ -324,6 +326,7 @@
- is_nacl = false
- is_posix = true
- is_win = false
-+ is_bsd = false
- } else if (current_os == "chromeos") {
- is_aix = false
- is_android = false
-@@ -335,6 +338,7 @@
- is_nacl = false
- is_posix = true
- is_win = false
-+ is_bsd = false
- } else if (current_os == "nacl") {
- # current_os == "nacl" will be passed by the nacl toolchain definition.
- # It is not set by default or on the command line. We treat is as a
-@@ -349,6 +353,7 @@
- is_nacl = true
- is_posix = true
- is_win = false
-+ is_bsd = false
- } else if (current_os == "fuchsia") {
- is_aix = false
- is_android = false
-@@ -360,6 +365,7 @@
- is_nacl = false
- is_posix = false
- is_win = false
-+ is_bsd = false
- } else if (current_os == "ios") {
- is_aix = false
- is_android = false
-@@ -371,6 +377,7 @@
- is_nacl = false
- is_posix = true
- is_win = false
-+ is_bsd = false
- } else if (current_os == "linux") {
- is_aix = false
- is_android = false
-@@ -382,6 +389,7 @@
- is_nacl = false
- is_posix = true
- is_win = false
-+ is_bsd = false
- } else if (current_os == "aix") {
- is_aix = true
- is_android = false
-@@ -393,6 +401,19 @@
- is_nacl = false
- is_posix = true
- is_win = false
-+ is_bsd = false
-+} else if (current_os == "freebsd") {
-+ is_aix = false
-+ is_android = false
-+ is_chromeos = false
-+ is_fuchsia = false
-+ is_ios = false
-+ is_linux = true
-+ is_mac = false
-+ is_nacl = false
-+ is_posix = true
-+ is_win = false
-+ is_bsd = true
- }
+@@ -291,10 +291,11 @@ is_android = current_os == "android"
+ is_chromeos = current_os == "chromeos"
+ is_fuchsia = current_os == "fuchsia"
+ is_ios = current_os == "ios"
+-is_linux = current_os == "chromeos" || current_os == "linux"
++is_linux = current_os == "chromeos" || current_os == "linux" || current_os == "freebsd"
+ is_mac = current_os == "mac"
+ is_nacl = current_os == "nacl"
+ is_win = current_os == "win" || current_os == "winuwp"
++is_bsd = current_os == "freebsd"
- # =============================================================================
+ is_posix = !is_win && !is_fuchsia
+
Index: branches/2019Q2/www/chromium/files/patch-build_config_allocator.gni
===================================================================
--- branches/2019Q2/www/chromium/files/patch-build_config_allocator.gni (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-build_config_allocator.gni (revision 497959)
@@ -1,20 +1,20 @@
---- build/config/allocator.gni.orig 2018-06-13 00:10:02.000000000 +0200
-+++ build/config/allocator.gni 2018-07-14 13:12:35.947359000 +0200
-@@ -6,7 +6,7 @@
+--- build/config/allocator.gni.orig 2019-03-11 22:00:52 UTC
++++ build/config/allocator.gni
+@@ -6,7 +6,7 @@ import("//build/config/sanitizers/sanitizers.gni")
# Temporarily disable tcmalloc on arm64 linux to get rid of compilation errors.
if (is_android || is_mac || is_ios || is_asan || is_lsan || is_tsan ||
- is_msan || is_win || is_fuchsia || (is_linux && target_cpu == "arm64")) {
+ is_msan || is_win || is_fuchsia || (is_linux && target_cpu == "arm64") || is_bsd) {
_default_allocator = "none"
} else {
_default_allocator = "tcmalloc"
-@@ -17,7 +17,7 @@
+@@ -17,7 +17,7 @@ if (is_android || is_mac || is_ios || is_asan || is_ls
# against the debug CRT with "is_nacl=false".
if ((is_linux || is_android || is_mac ||
(is_win && !is_component_build && !is_debug)) && !is_asan && !is_lsan &&
- !is_tsan && !is_msan) {
+ !is_tsan && !is_msan && !is_bsd) {
_default_use_allocator_shim = true
} else {
_default_use_allocator_shim = false
Index: branches/2019Q2/www/chromium/files/patch-build_config_compiler_BUILD.gn
===================================================================
--- branches/2019Q2/www/chromium/files/patch-build_config_compiler_BUILD.gn (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-build_config_compiler_BUILD.gn (revision 497959)
@@ -1,93 +1,83 @@
---- build/config/compiler/BUILD.gn.orig 2019-01-30 02:17:39.000000000 +0100
-+++ build/config/compiler/BUILD.gn 2019-01-31 21:56:18.122280000 +0100
-@@ -53,7 +53,7 @@
+--- build/config/compiler/BUILD.gn.orig 2019-03-11 22:00:52 UTC
++++ build/config/compiler/BUILD.gn
+@@ -53,7 +53,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)
-@@ -274,7 +274,7 @@
+@@ -275,7 +275,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
-@@ -393,7 +393,7 @@
+@@ -394,7 +394,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",
-@@ -501,7 +501,7 @@
+@@ -502,7 +502,7 @@ config("compiler") {
}
}
- if (is_clang && !is_nacl && !use_xcode_clang) {
+ if (is_clang && !is_nacl && !use_xcode_clang && !is_bsd) {
cflags += [
# TODO(hans): Remove this once Clang generates better optimized debug info
# by default. https://crbug.com/765793
-@@ -808,7 +808,7 @@
+@@ -809,7 +809,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" ]
}
-@@ -1488,11 +1488,13 @@
- if (current_toolchain == host_toolchain || !use_xcode_clang) {
+@@ -1494,7 +1494,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 += [
-- # Ignore warnings about MSVC optimization pragmas.
-- # TODO(thakis): Only for no_chromium_code? http://crbug.com/505314
-- "-Wno-ignored-pragma-optimize",
-- ]
-+ if (!is_bsd) {
-+ cflags += [
-+ # Ignore warnings about MSVC optimization pragmas.
-+ # TODO(thakis): Only for no_chromium_code? http://crbug.com/505314
-+ "-Wno-ignored-pragma-optimize",
-+ ]
-+ }
- if (is_fuchsia) {
- cflags += [
- # TODO(hans): https://crbug.com/890307
-@@ -1684,7 +1686,7 @@
+ cflags += [
+@@ -1694,7 +1694,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" ]
- }
- }
-@@ -2269,7 +2271,7 @@
+ } else if (is_win && use_lld) {
+ arflags = [ "/llvmlibthin" ]
+@@ -2278,7 +2278,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) {
-@@ -2290,7 +2292,7 @@
+@@ -2299,7 +2299,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/2019Q2/www/chromium/files/patch-build_config_compiler_compiler.gni
===================================================================
--- branches/2019Q2/www/chromium/files/patch-build_config_compiler_compiler.gni (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-build_config_compiler_compiler.gni (revision 497959)
@@ -1,11 +1,11 @@
---- build/config/compiler/compiler.gni.orig 2018-08-01 00:08:26.000000000 +0200
-+++ build/config/compiler/compiler.gni 2018-08-04 14:04:44.799794000 +0200
-@@ -172,7 +172,7 @@
-
+--- build/config/compiler/compiler.gni.orig 2019-03-11 22:00:52 UTC
++++ build/config/compiler/compiler.gni
+@@ -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 &&
-+ use_gold = !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 == "mipsel" ||
+ 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/2019Q2/www/chromium/files/patch-build_config_features.gni
===================================================================
--- branches/2019Q2/www/chromium/files/patch-build_config_features.gni (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-build_config_features.gni (revision 497959)
@@ -1,11 +1,11 @@
---- build/config/features.gni.orig 2017-12-15 02:04:05.000000000 +0100
-+++ build/config/features.gni 2017-12-23 23:30:21.417932000 +0100
-@@ -46,7 +46,7 @@
- fieldtrial_testing_like_official_build = is_chrome_branded
+--- build/config/features.gni.orig 2019-03-11 22:00:52 UTC
++++ build/config/features.gni
+@@ -41,7 +41,7 @@ declare_args() {
+ }
# libudev usage. This currently only affects the content layer.
- use_udev = is_linux && !is_chromecast
+ use_udev = is_linux && !is_chromecast && !is_bsd
use_dbus = is_linux && !is_chromecast
Index: branches/2019Q2/www/chromium/files/patch-build_config_freetype_freetype.gni
===================================================================
--- branches/2019Q2/www/chromium/files/patch-build_config_freetype_freetype.gni (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-build_config_freetype_freetype.gni (revision 497959)
@@ -0,0 +1,9 @@
+--- build/config/freetype/freetype.gni.orig 2019-03-18 08:59:45 UTC
++++ build/config/freetype/freetype.gni
+@@ -10,5 +10,5 @@ declare_args() {
+ # than version 2.7.1 and have color bitmap support compiled in. WARNING:
+ # System FreeType configurations other than as described WILL INTRODUCE TEXT
+ # RENDERING AND SECURITY REGRESSIONS.
+- use_system_freetype = false
++ use_system_freetype = true
+ }
Property changes on: branches/2019Q2/www/chromium/files/patch-build_config_freetype_freetype.gni
___________________________________________________________________
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/2019Q2/www/chromium/files/patch-build_config_linux_BUILD.gn
===================================================================
--- branches/2019Q2/www/chromium/files/patch-build_config_linux_BUILD.gn (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-build_config_linux_BUILD.gn (revision 497959)
@@ -1,11 +1,11 @@
---- build/config/linux/BUILD.gn.orig 2018-07-19 22:09:59.968726000 +0200
-+++ build/config/linux/BUILD.gn 2018-07-19 22:10:16.334896000 +0200
-@@ -28,7 +28,7 @@
+--- build/config/linux/BUILD.gn.orig 2019-03-11 22:00:52 UTC
++++ build/config/linux/BUILD.gn
+@@ -28,7 +28,7 @@ config("runtime_library") {
}
if ((!is_chromeos || default_toolchain != "//build/toolchain/cros:target") &&
- (!use_custom_libcxx || current_cpu == "mipsel")) {
+ (!use_custom_libcxx || current_cpu == "mipsel") && !is_bsd) {
libs = [ "atomic" ]
}
}
Index: branches/2019Q2/www/chromium/files/patch-build_config_linux_pkg-config.py
===================================================================
--- branches/2019Q2/www/chromium/files/patch-build_config_linux_pkg-config.py (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-build_config_linux_pkg-config.py (revision 497959)
@@ -1,26 +1,26 @@
---- build/config/linux/pkg-config.py.orig 2017-04-19 19:06:28 UTC
+--- build/config/linux/pkg-config.py.orig 2019-03-11 22:00:52 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."
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():
# 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 "[[],[],[],[],[]]"
return 0
Index: branches/2019Q2/www/chromium/files/patch-build_config_sysroot.gni
===================================================================
--- branches/2019Q2/www/chromium/files/patch-build_config_sysroot.gni (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-build_config_sysroot.gni (revision 497959)
@@ -1,15 +1,15 @@
---- build/config/sysroot.gni.orig 2018-12-12 22:56:02.000000000 +0100
-+++ build/config/sysroot.gni 2018-12-15 22:15:59.771804000 +0100
-@@ -15,9 +15,10 @@
+--- build/config/sysroot.gni.orig 2019-03-11 22:00:52 UTC
++++ build/config/sysroot.gni
+@@ -15,9 +15,10 @@ declare_args() {
# The absolute path to directory containing linux sysroot images
target_sysroot_dir = "//build/linux"
- use_sysroot = current_cpu == "x86" || current_cpu == "x64" ||
+ use_sysroot = !is_bsd && (
+ current_cpu == "x86" || current_cpu == "x64" ||
current_cpu == "arm" || current_cpu == "arm64" ||
- current_cpu == "mipsel" || current_cpu == "mips64el"
+ current_cpu == "mipsel" || current_cpu == "mips64el")
}
if (current_os == target_os && current_cpu == target_cpu &&
Index: branches/2019Q2/www/chromium/files/patch-build_gn__run__binary.py
===================================================================
--- branches/2019Q2/www/chromium/files/patch-build_gn__run__binary.py (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-build_gn__run__binary.py (revision 497959)
@@ -0,0 +1,11 @@
+--- build/gn_run_binary.py.orig 2019-03-11 22:00:52 UTC
++++ build/gn_run_binary.py
+@@ -22,7 +22,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
Property changes on: branches/2019Q2/www/chromium/files/patch-build_gn__run__binary.py
___________________________________________________________________
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/2019Q2/www/chromium/files/patch-build_linux_chrome.map
===================================================================
--- branches/2019Q2/www/chromium/files/patch-build_linux_chrome.map (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-build_linux_chrome.map (revision 497959)
@@ -1,29 +1,29 @@
---- build/linux/chrome.map.orig 2018-08-08 19:10:32 UTC
+--- build/linux/chrome.map.orig 2019-03-11 22:00:52 UTC
+++ build/linux/chrome.map
@@ -1,4 +1,7 @@
{
+local:
+ *;
+
global:
__bss_start;
__data_start;
@@ -20,6 +23,10 @@ global:
# Program entry point.
_start;
+ # FreeBSD specific variables.
+ __progname;
+ environ;
+
# Memory allocation symbols. We want chrome and any libraries to
# share the same heap, so it is correct to export these symbols.
calloc;
@@ -81,7 +88,4 @@ global:
localtime64;
localtime64_r;
localtime_r;
-
-local:
- *;
};
Index: branches/2019Q2/www/chromium/files/patch-build_linux_libpci_BUILD.gn
===================================================================
--- branches/2019Q2/www/chromium/files/patch-build_linux_libpci_BUILD.gn (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-build_linux_libpci_BUILD.gn (revision 497959)
@@ -1,53 +1,53 @@
---- build/linux/libpci/BUILD.gn.orig 2017-04-19 19:06:28 UTC
+--- build/linux/libpci/BUILD.gn.orig 2019-03-11 22:00:52 UTC
+++ build/linux/libpci/BUILD.gn
@@ -3,20 +3,36 @@
# found in the LICENSE file.
import("//tools/generate_library_loader/generate_library_loader.gni")
+import("//build/config/linux/pkg_config.gni")
-# This generates a target named "libpci".
-generate_library_loader("libpci") {
- name = "LibPciLoader"
- output_h = "libpci.h"
- output_cc = "libpci_loader.cc"
- header = "<pci/pci.h>"
+declare_args() {
+ use_system_libpci = is_bsd
+}
- functions = [
- "pci_alloc",
- "pci_init",
- "pci_cleanup",
- "pci_scan_bus",
- "pci_fill_info",
- "pci_lookup_name",
- ]
+if (use_system_libpci) {
+ pkg_config("system_libpci") {
+ packages = [ "libpci" ]
+ }
+
+ source_set("libpci") {
+ public_configs = [ ":system_libpci" ]
+ }
+
+} else {
+ # This generates a target named "libpci".
+ generate_library_loader("libpci") {
+ name = "LibPciLoader"
+ output_h = "libpci.h"
+ output_cc = "libpci_loader.cc"
+ header = "<pci/pci.h>"
+
+ functions = [
+ "pci_alloc",
+ "pci_init",
+ "pci_cleanup",
+ "pci_scan_bus",
+ "pci_fill_info",
+ "pci_lookup_name",
+ ]
+ }
}
Index: branches/2019Q2/www/chromium/files/patch-build_linux_unbundle_libusb.gn
===================================================================
--- branches/2019Q2/www/chromium/files/patch-build_linux_unbundle_libusb.gn (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-build_linux_unbundle_libusb.gn (revision 497959)
@@ -1,27 +1,27 @@
---- build/linux/unbundle/libusb.gn.orig 2018-07-20 03:07:05.793992000 +0200
-+++ build/linux/unbundle/libusb.gn 2018-07-20 03:07:35.792417000 +0200
+--- build/linux/unbundle/libusb.gn.orig 2019-03-17 01:47:13 UTC
++++ build/linux/unbundle/libusb.gn
@@ -0,0 +1,24 @@
+# Copyright 2016 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.
+
+import("//build/config/linux/pkg_config.gni")
+import("//build/shim_headers.gni")
+
+pkg_config("system_libusb") {
+ packages = [ "libusb-1.0" ]
+}
+
+shim_headers("libusb_shim") {
+ root_path = "src/libusb"
+ headers = [
+ "libusb.h",
+ ]
+}
+
+source_set("libusb") {
+ deps = [
+ ":libusb_shim",
+ ]
+ public_configs = [ ":system_libusb" ]
+}
Index: branches/2019Q2/www/chromium/files/patch-build_linux_unbundle_replace__gn__files.py
===================================================================
--- branches/2019Q2/www/chromium/files/patch-build_linux_unbundle_replace__gn__files.py (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-build_linux_unbundle_replace__gn__files.py (revision 497959)
@@ -0,0 +1,10 @@
+--- build/linux/unbundle/replace_gn_files.py.orig 2019-03-11 22:00:52 UTC
++++ build/linux/unbundle/replace_gn_files.py
+@@ -27,6 +27,7 @@ REPLACEMENTS = {
+ 'libevent': 'base/third_party/libevent/BUILD.gn',
+ 'libjpeg': 'third_party/libjpeg.gni',
+ 'libpng': 'third_party/libpng/BUILD.gn',
++ 'libusb': 'third_party/libusb/BUILD.gn',
+ 'libvpx': 'third_party/libvpx/BUILD.gn',
+ 'libwebp': 'third_party/libwebp/BUILD.gn',
+ 'libxml': 'third_party/libxml/BUILD.gn',
Property changes on: branches/2019Q2/www/chromium/files/patch-build_linux_unbundle_replace__gn__files.py
___________________________________________________________________
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/2019Q2/www/chromium/files/patch-build_toolchain_gcc__toolchain.gni
===================================================================
--- branches/2019Q2/www/chromium/files/patch-build_toolchain_gcc__toolchain.gni (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-build_toolchain_gcc__toolchain.gni (revision 497959)
@@ -0,0 +1,45 @@
+--- build/toolchain/gcc_toolchain.gni.orig 2019-03-11 22:00:52 UTC
++++ build/toolchain/gcc_toolchain.gni
+@@ -47,6 +47,11 @@ analyzer_wrapper =
+ rebase_path("//build/toolchain/clang_static_analyzer_wrapper.py",
+ root_build_dir) + " --mode=clang"
+
++declare_args() {
++ extra_cxxflags = ""
++ extra_ldflags = ""
++}
++
+ # This template defines a toolchain for something that works like gcc
+ # (including clang).
+ #
+@@ -610,13 +615,23 @@ template("clang_toolchain") {
+ }
+
+ gcc_toolchain(target_name) {
+- prefix = rebase_path("$clang_base_path/bin", root_build_dir)
+- cc = "$prefix/clang"
+- cxx = "$prefix/clang++"
+- ld = cxx
+- readelf = "${toolprefix}readelf"
+- ar = "${prefix}/llvm-ar"
+- nm = "${toolprefix}nm"
++ if (is_bsd) {
++ prefix = "/usr/local/bin"
++ cc = "cc"
++ cxx = "c++"
++ ld = cxx
++ readelf = "readelf"
++ ar = "${prefix}/ar"
++ nm = "${toolprefix}nm"
++ } else {
++ prefix = rebase_path("$clang_base_path/bin", root_build_dir)
++ cc = "$prefix/clang"
++ cxx = "$prefix/clang++"
++ ld = cxx
++ readelf = "${toolprefix}readelf"
++ ar = "${prefix}/llvm-ar"
++ nm = "${toolprefix}nm"
++ }
+
+ forward_variables_from(invoker,
+ [
Property changes on: branches/2019Q2/www/chromium/files/patch-build_toolchain_gcc__toolchain.gni
___________________________________________________________________
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/2019Q2/www/chromium/files/patch-build_toolchain_get__concurrent__links.py
===================================================================
--- branches/2019Q2/www/chromium/files/patch-build_toolchain_get__concurrent__links.py (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-build_toolchain_get__concurrent__links.py (revision 497959)
@@ -1,17 +1,17 @@
---- build/toolchain/get_concurrent_links.py.orig 2017-04-19 19:06:28 UTC
+--- build/toolchain/get_concurrent_links.py.orig 2019-03-11 22:00:52 UTC
+++ build/toolchain/get_concurrent_links.py
-@@ -45,6 +45,14 @@ def _GetTotalMemoryInBytes():
+@@ -46,6 +46,14 @@ def _GetTotalMemoryInBytes():
return int(subprocess.check_output(['sysctl', '-n', 'hw.memsize']))
except Exception:
return 0
+ elif sys.platform.startswith('freebsd'):
+ try:
+ avail_bytes = int(subprocess.check_output(['sysctl', '-n', 'hw.physmem']))
+ # With -fuse-lld it doesn't take a lot of ram, feel free to change that
+ # 1 * ... to needed amount
+ return max(1, avail_bytes / (1 * (2 ** 30))) # total / 4GB
+ except Exception:
+ return 1
# TODO(scottmg): Implement this for other platforms.
return 0
Index: branches/2019Q2/www/chromium/files/patch-build_toolchain_linux_BUILD.gn
===================================================================
--- branches/2019Q2/www/chromium/files/patch-build_toolchain_linux_BUILD.gn (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-build_toolchain_linux_BUILD.gn (revision 497959)
@@ -1,10 +1,10 @@
---- build/toolchain/linux/BUILD.gn.orig 2017-09-11 02:58:56.145741000 +0200
-+++ build/toolchain/linux/BUILD.gn 2017-09-11 02:59:18.322655000 +0200
-@@ -14,7 +14,6 @@
+--- build/toolchain/linux/BUILD.gn.orig 2019-03-11 22:00:52 UTC
++++ build/toolchain/linux/BUILD.gn
+@@ -14,7 +14,6 @@ clang_toolchain("clang_arm") {
}
clang_toolchain("clang_arm64") {
- toolprefix = "aarch64-linux-gnu-"
toolchain_args = {
current_cpu = "arm64"
current_os = "linux"
Index: branches/2019Q2/www/chromium/files/patch-cc_BUILD.gn
===================================================================
--- branches/2019Q2/www/chromium/files/patch-cc_BUILD.gn (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-cc_BUILD.gn (revision 497959)
@@ -1,21 +1,21 @@
---- cc/BUILD.gn.orig 2018-11-19 19:55:02.000000000 +0100
-+++ cc/BUILD.gn 2018-12-04 13:07:27.981323000 +0100
-@@ -551,7 +551,7 @@
+--- cc/BUILD.gn.orig 2019-03-11 22:00:52 UTC
++++ cc/BUILD.gn
+@@ -548,7 +548,7 @@ cc_test_static_library("test_support") {
"//ui/gl:test_support",
"//ui/latency",
]
- if (!is_android) {
+ if (!is_android && !is_bsd) {
data_deps = [
"//third_party/mesa_headers",
]
-@@ -751,9 +751,6 @@
+@@ -746,9 +746,6 @@ cc_test("cc_unittests") {
"//ui/gfx/geometry",
"//ui/gl",
"//ui/gl:test_support",
- ]
- data_deps = [
- "//third_party/mesa_headers",
]
}
Index: branches/2019Q2/www/chromium/files/patch-cc_layers_scrollbar__layer__impl__base.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-cc_layers_scrollbar__layer__impl__base.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-cc_layers_scrollbar__layer__impl__base.cc (revision 497959)
@@ -1,13 +1,13 @@
---- cc/layers/scrollbar_layer_impl_base.cc.orig 2017-06-05 19:03:01 UTC
+--- cc/layers/scrollbar_layer_impl_base.cc.orig 2019-03-11 22:00:52 UTC
+++ cc/layers/scrollbar_layer_impl_base.cc
-@@ -175,8 +175,8 @@ gfx::Rect ScrollbarLayerImplBase::ComputeThumbQuadRect
+@@ -218,8 +218,8 @@ gfx::Rect ScrollbarLayerImplBase::ComputeThumbQuadRect
int thumb_offset = TrackStart();
if (maximum > 0) {
float ratio = clamped_current_pos / maximum;
- float max_offset = track_length - thumb_length;
- thumb_offset += static_cast<int>(ratio * max_offset);
+ float _max_offset = track_length - thumb_length;
+ thumb_offset += static_cast<int>(ratio * _max_offset);
}
float thumb_thickness_adjustment =
Index: branches/2019Q2/www/chromium/files/patch-cc_trees_property__tree.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-cc_trees_property__tree.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-cc_trees_property__tree.cc (revision 497959)
@@ -1,20 +1,20 @@
---- cc/trees/property_tree.cc.orig 2017-06-05 19:03:01 UTC
+--- cc/trees/property_tree.cc.orig 2019-03-11 22:00:52 UTC
+++ cc/trees/property_tree.cc
-@@ -1256,13 +1256,13 @@ gfx::ScrollOffset ScrollTree::MaxScrollOffset(int scro
+@@ -1325,13 +1325,13 @@ gfx::ScrollOffset ScrollTree::MaxScrollOffset(int scro
- gfx::Size clip_layer_bounds = scroll_clip_layer_bounds(scroll_node->id);
+ 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;
}
- void ScrollTree::OnScrollOffsetAnimated(int layer_id,
+ gfx::SizeF ScrollTree::scroll_bounds(int scroll_node_id) const {
Index: branches/2019Q2/www/chromium/files/patch-chrome_app_chrome__command__ids.h
===================================================================
--- branches/2019Q2/www/chromium/files/patch-chrome_app_chrome__command__ids.h (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-chrome_app_chrome__command__ids.h (revision 497959)
@@ -1,11 +1,11 @@
---- chrome/app/chrome_command_ids.h.orig 2017-06-05 19:03:01 UTC
+--- chrome/app/chrome_command_ids.h.orig 2019-03-11 22:00:52 UTC
+++ chrome/app/chrome_command_ids.h
-@@ -67,7 +67,7 @@
+@@ -63,7 +63,7 @@
#define IDC_VISIT_DESKTOP_OF_LRU_USER_2 34049
#define IDC_VISIT_DESKTOP_OF_LRU_USER_3 34050
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
#define IDC_USE_SYSTEM_TITLE_BAR 34051
+ #define IDC_RESTORE_WINDOW 34052
#endif
-
Index: branches/2019Q2/www/chromium/files/patch-chrome_app_chrome__main.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-chrome_app_chrome__main.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-chrome_app_chrome__main.cc (revision 497959)
@@ -1,16 +1,16 @@
---- chrome/app/chrome_main.cc.orig 2018-12-03 21:16:35.000000000 +0100
-+++ chrome/app/chrome_main.cc 2018-12-05 14:12:24.772160000 +0100
-@@ -93,11 +93,11 @@
+--- chrome/app/chrome_main.cc.orig 2019-03-11 22:00:52 UTC
++++ chrome/app/chrome_main.cc
+@@ -93,11 +93,11 @@ int ChromeMain(int argc, const char** argv) {
#endif
// Chrome-specific process modes.
-#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN)
+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD)
if (command_line->HasSwitch(switches::kHeadless)) {
return headless::HeadlessShellMain(params);
}
-#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN)
+#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD)
int rv = content::ContentMain(params);
Index: branches/2019Q2/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc (revision 497959)
@@ -1,101 +1,128 @@
---- chrome/app/chrome_main_delegate.cc.orig 2019-01-30 02:17:41.000000000 +0100
-+++ chrome/app/chrome_main_delegate.cc 2019-02-06 19:21:07.067687000 +0100
+--- chrome/app/chrome_main_delegate.cc.orig 2019-03-11 22:00:52 UTC
++++ chrome/app/chrome_main_delegate.cc
@@ -101,7 +101,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
@@ -135,7 +135,7 @@
#include "v8/include/v8.h"
#endif
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
#include "base/environment.h"
#endif
-@@ -235,7 +235,7 @@
+@@ -232,7 +232,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;
-@@ -339,7 +339,7 @@
+@@ -291,7 +291,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.
+@@ -336,7 +336,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) ||
-@@ -349,7 +349,7 @@
+@@ -346,7 +346,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) {
-@@ -403,7 +403,7 @@
+@@ -400,7 +400,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.
-@@ -585,7 +585,7 @@
+@@ -412,7 +412,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
+@@ -469,7 +469,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());
+@@ -596,7 +596,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
-@@ -609,7 +609,7 @@
+@@ -620,7 +620,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
-@@ -925,7 +925,7 @@
+@@ -936,7 +936,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)
-@@ -941,7 +941,7 @@
+@@ -951,7 +951,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.
-@@ -951,7 +951,7 @@
+@@ -961,7 +961,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/2019Q2/www/chromium/files/patch-chrome_app_chromium__strings.grd
===================================================================
--- branches/2019Q2/www/chromium/files/patch-chrome_app_chromium__strings.grd (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-chrome_app_chromium__strings.grd (revision 497959)
@@ -1,20 +1,20 @@
---- chrome/app/chromium_strings.grd.orig 2019-02-06 23:06:37.000000000 +0100
-+++ chrome/app/chromium_strings.grd 2019-02-12 16:28:22.555513000 +0100
-@@ -797,7 +797,7 @@
+--- chrome/app/chromium_strings.grd.orig 2019-03-11 22:00:52 UTC
++++ chrome/app/chromium_strings.grd
+@@ -809,7 +809,7 @@ Signing in anyway will merge Chromium information like
</message>
<!-- ProcessSingleton -->
- <if expr="is_linux or is_macosx">
+ <if expr="is_linux or is_macosx or is_posix">
<message name="IDS_PROFILE_IN_USE_POSIX" desc="Message shown when the browser cannot start because the profile is in use on a different host.">
The profile appears to be in use by another Chromium process (<ph name="PROCESS_ID">$1<ex>12345</ex></ph>) on another computer (<ph name="HOST_NAME">$2<ex>example.com</ex></ph>). Chromium has locked the profile so that it doesn't get corrupted. If you are sure no other processes are using this profile, you can unlock the profile and relaunch Chromium.
</message>
-@@ -1042,7 +1042,7 @@
+@@ -1057,7 +1057,7 @@ Please check your email at <ph name="ACCOUNT_EMAIL">$2
</message>
<!-- Plugin Placeholders -->
- <if expr="is_linux">
+ <if expr="is_posix">
<message name="IDS_PLUGIN_RESTART_REQUIRED" desc="The placeholder text for a plugin that can't be loaded until the browser is restarted.">
Restart Chromium to enable <ph name="PLUGIN_NAME">$1<ex>Flash</ex></ph>
</message>
Index: branches/2019Q2/www/chromium/files/patch-chrome_app_generated__resources.grd
===================================================================
--- branches/2019Q2/www/chromium/files/patch-chrome_app_generated__resources.grd (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-chrome_app_generated__resources.grd (revision 497959)
@@ -1,29 +1,29 @@
---- chrome/app/generated_resources.grd.orig 2018-11-19 19:55:02.000000000 +0100
-+++ chrome/app/generated_resources.grd 2018-12-04 14:09:27.327735000 +0100
-@@ -5265,7 +5265,7 @@
+--- chrome/app/generated_resources.grd.orig 2019-03-11 22:00:52 UTC
++++ chrome/app/generated_resources.grd
+@@ -5339,7 +5339,7 @@ the Bookmarks menu.">
</message>
</if>
- <if expr="is_win or (is_linux and not chromeos)">
+ <if expr="is_win or (is_posix and not chromeos)">
<message name="IDS_QUIT_ACCELERATOR_TUTORIAL" desc="Instructions for how the user should quit using keyboard shortcuts.">
Press |<ph name="ACCELERATOR1">$1<ex>Ctrl</ex></ph>|+|<ph name="ACCELERATOR2">$2<ex>Shift</ex></ph>| followed by |<ph name="ACCELERATOR3">$3<ex>Q</ex></ph>| to exit
</message>
-@@ -6117,7 +6117,7 @@
+@@ -6160,7 +6160,7 @@ the Bookmarks menu.">
Google Pay
</message>
- <if expr="is_linux and not chromeos">
+ <if expr="is_posix and not chromeos">
<message name="IDS_SHOW_WINDOW_DECORATIONS" desc="The label of a radio button in the options dialog for using the system title bar and borders.">
Use system title bar and borders
</message>
-@@ -6942,7 +6942,7 @@
+@@ -6946,7 +6946,7 @@ Please help our engineers fix this problem. Tell us wh
Set as default
</message>
- <if expr="is_linux and not chromeos">
+ <if expr="is_posix and not chromeos">
<message name="IDS_MINIMIZE_WINDOW_MENU" desc="The Linux browser window menu item text for minimizing the window.">
Minimize
</message>
Index: branches/2019Q2/www/chromium/files/patch-chrome_app_google__chrome__strings.grd
===================================================================
--- branches/2019Q2/www/chromium/files/patch-chrome_app_google__chrome__strings.grd (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-chrome_app_google__chrome__strings.grd (revision 497959)
@@ -1,20 +1,20 @@
---- chrome/app/google_chrome_strings.grd.orig 2019-02-06 23:06:37.000000000 +0100
-+++ chrome/app/google_chrome_strings.grd 2019-02-12 16:29:36.841110000 +0100
-@@ -808,7 +808,7 @@
+--- chrome/app/google_chrome_strings.grd.orig 2019-03-11 22:00:52 UTC
++++ chrome/app/google_chrome_strings.grd
+@@ -820,7 +820,7 @@ Signing in anyway will merge Chrome information like b
</message>
<!-- ProcessSingleton -->
- <if expr="is_linux or is_macosx">
+ <if expr="is_linux or is_macosx or is_posix">
<message name="IDS_PROFILE_IN_USE_POSIX" desc="Message shown when the browser cannot start because the profile is in use on a different host.">
The profile appears to be in use by another Google Chrome process (<ph name="PROCESS_ID">$1<ex>12345</ex></ph>) on another computer (<ph name="HOST_NAME">$2<ex>example.com</ex></ph>). Chrome has locked the profile so that it doesn't get corrupted. If you are sure no other processes are using this profile, you can unlock the profile and relaunch Chrome.
</message>
-@@ -1060,7 +1060,7 @@
+@@ -1075,7 +1075,7 @@ Please check your email at <ph name="ACCOUNT_EMAIL">$2
</message>
<!-- Plugin Placeholders -->
- <if expr="is_linux">
+ <if expr="is_posix">
<message name="IDS_PLUGIN_RESTART_REQUIRED" desc="The placeholder text for a plugin that can't be loaded until the browser is restarted.">
Restart Chrome to enable <ph name="PLUGIN_NAME">$1<ex>Flash</ex></ph>
</message>
Index: branches/2019Q2/www/chromium/files/patch-chrome_app_settings__strings.grdp
===================================================================
--- branches/2019Q2/www/chromium/files/patch-chrome_app_settings__strings.grdp (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-chrome_app_settings__strings.grdp (revision 497959)
@@ -1,20 +1,20 @@
---- chrome/app/settings_strings.grdp.orig 2017-12-15 02:04:07.000000000 +0100
-+++ chrome/app/settings_strings.grdp 2017-12-24 00:15:33.402792000 +0100
-@@ -363,7 +363,7 @@
+--- chrome/app/settings_strings.grdp.orig 2019-03-11 22:00:52 UTC
++++ chrome/app/settings_strings.grdp
+@@ -580,7 +580,7 @@
Themes
</message>
</if>
- <if expr="is_linux and not chromeos">
+ <if expr="is_posix and not chromeos">
<message name="IDS_SETTINGS_SYSTEM_THEME" desc="Text of the label describing the system (GTK+) browser theme on Linux">
GTK+
</message>
-@@ -377,7 +377,7 @@
+@@ -594,7 +594,7 @@
Use Classic
</message>
</if>
- <if expr="not is_linux or chromeos">
+ <if expr="not is_posix or chromeos">
<message name="IDS_SETTINGS_RESET_TO_DEFAULT_THEME" desc="Name of the control which resets the browser theme back to the default theme.">
Reset to default
</message>
Index: branches/2019Q2/www/chromium/files/patch-chrome_app_shutdown__signal__handlers__posix.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-chrome_app_shutdown__signal__handlers__posix.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-chrome_app_shutdown__signal__handlers__posix.cc (revision 497959)
@@ -1,21 +1,21 @@
---- chrome/app/shutdown_signal_handlers_posix.cc.orig 2018-12-12 22:56:02.000000000 +0100
-+++ chrome/app/shutdown_signal_handlers_posix.cc 2019-01-13 01:50:13.594124000 +0100
-@@ -183,12 +183,18 @@
+--- chrome/app/shutdown_signal_handlers_posix.cc.orig 2019-03-11 22:00:52 UTC
++++ chrome/app/shutdown_signal_handlers_posix.cc
+@@ -183,12 +183,18 @@ void InstallShutdownSignalHandlers(
g_pipe_pid = getpid();
g_shutdown_pipe_read_fd = pipefd[0];
g_shutdown_pipe_write_fd = pipefd[1];
+#if defined(OS_BSD)
+ // PTHREAD_STACK_MIN causes chromium to crash under FreeBSD,
+ // we request the default pthread stack size by specifying 0 here.
+ const size_t kShutdownDetectorThreadStackSize = 0;
+#else
#if !defined(ADDRESS_SANITIZER)
const size_t kShutdownDetectorThreadStackSize = PTHREAD_STACK_MIN * 2;
#else
// ASan instrumentation bloats the stack frames, so we need to increase the
// stack size to avoid hitting the guard page.
const size_t kShutdownDetectorThreadStackSize = PTHREAD_STACK_MIN * 4;
+#endif
#endif
ShutdownDetector* detector = new ShutdownDetector(
g_shutdown_pipe_read_fd, shutdown_callback, task_runner);
Index: branches/2019Q2/www/chromium/files/patch-chrome_app_theme_chrome__unscaled__resources.grd
===================================================================
--- branches/2019Q2/www/chromium/files/patch-chrome_app_theme_chrome__unscaled__resources.grd (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-chrome_app_theme_chrome__unscaled__resources.grd (revision 497959)
@@ -0,0 +1,11 @@
+--- chrome/app/theme/chrome_unscaled_resources.grd.orig 2019-03-11 22:00:52 UTC
++++ chrome/app/theme/chrome_unscaled_resources.grd
+@@ -100,7 +100,7 @@
+ <include name="IDR_PROFILE_AVATAR_2X_25" file="default_200_percent/common/profile_avatar_sun_cloud.png" type="BINDATA" />
+ <include name="IDR_PROFILE_AVATAR_2X_26" file="default_200_percent/common/profile_avatar_placeholder.png" type="BINDATA" />
+ </if>
+- <if expr="is_linux and enable_app_list">
++ <if expr="is_posix and enable_app_list">
+ <!-- App Launcher icons for desktop icon. -->
+ <if expr="_google_chrome">
+ <then>
Property changes on: branches/2019Q2/www/chromium/files/patch-chrome_app_theme_chrome__unscaled__resources.grd
___________________________________________________________________
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/2019Q2/www/chromium/files/patch-chrome_browser_about__flags.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-chrome_browser_about__flags.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-chrome_browser_about__flags.cc (revision 497959)
@@ -1,140 +1,120 @@
---- chrome/browser/about_flags.cc.orig 2019-01-30 02:17:44.000000000 +0100
-+++ chrome/browser/about_flags.cc 2019-01-31 22:07:28.598255000 +0100
-@@ -832,7 +832,7 @@
+--- chrome/browser/about_flags.cc.orig 2019-03-11 22:00:53 UTC
++++ chrome/browser/about_flags.cc
+@@ -749,7 +749,7 @@ const FeatureEntry::FeatureVariation kAutofillPreviewS
{"(Black on GoogleYellow050)", kAutofillPreviewStyleBlackOnYellow050,
base::size(kAutofillPreviewStyleBlackOnYellow050), nullptr}};
-#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN)
+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD)
- const FeatureEntry::FeatureParam kAutofillPrimaryInfoStyleMedium[] = {
- {autofill::kAutofillForcedFontWeightParameterName,
- autofill::kAutofillForcedFontWeightParameterMedium},
-@@ -859,7 +859,7 @@
+ const FeatureEntry::FeatureParam kPedalSuggestionInSuggestion[] = {
+ {OmniboxFieldTrial::kPedalSuggestionModeParam, "in_suggestion"}};
+ const FeatureEntry::FeatureParam kPedalSuggestionDedicated[] = {
+@@ -760,7 +760,7 @@ const FeatureEntry::FeatureVariation kPedalSuggestionV
{"Dedicated Suggestion Line", kPedalSuggestionDedicated,
base::size(kPedalSuggestionDedicated), nullptr},
};
-#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN)
+#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD)
const FeatureEntry::Choice kAutoplayPolicyChoices[] = {
{flags_ui::kGenericExperimentChoiceDefault, "", ""},
-@@ -2497,12 +2497,12 @@
+@@ -2362,12 +2362,12 @@ const FeatureEntry kFeatureEntries[] = {
{"force-text-direction", flag_descriptions::kForceTextDirectionName,
flag_descriptions::kForceTextDirectionDescription, kOsAll,
MULTI_VALUE_TYPE(kForceTextDirectionChoices)},
-#if defined(OS_WIN) || defined(OS_LINUX)
+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD)
{"enable-input-ime-api", flag_descriptions::kEnableInputImeApiName,
flag_descriptions::kEnableInputImeApiDescription, kOsWin | kOsLinux,
ENABLE_DISABLE_VALUE_TYPE(switches::kEnableInputImeAPI,
switches::kDisableInputImeAPI)},
-#endif // OS_WIN || OS_LINUX
+#endif // OS_WIN || OS_LINUX || OS_BSD
{"enable-origin-trials", flag_descriptions::kOriginTrialsName,
flag_descriptions::kOriginTrialsDescription, kOsAll,
FEATURE_VALUE_TYPE(features::kOriginTrials)},
-@@ -2696,12 +2696,12 @@
- FEATURE_VALUE_TYPE(
- password_manager::features::kPasswordsKeyboardAccessory)},
+@@ -2562,12 +2562,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,
-@@ -3127,7 +3127,7 @@
- flag_descriptions::kLeftToRightUrlsDescription, kOsDesktop,
- FEATURE_VALUE_TYPE(features::kLeftToRightUrls)},
+@@ -3001,7 +3001,7 @@ const FeatureEntry kFeatureEntries[] = {
+ FEATURE_VALUE_TYPE(omnibox::kOmniboxNewAnswerLayout)},
+ #endif // defined(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)
- {"omnibox-new-answer-layout",
- flag_descriptions::kOmniboxNewAnswerLayoutName,
- flag_descriptions::kOmniboxNewAnswerLayoutDescription, kOsDesktop,
-@@ -3156,7 +3156,7 @@
+ {"omnibox-reverse-answers", flag_descriptions::kOmniboxReverseAnswersName,
+ flag_descriptions::kOmniboxReverseAnswersDescription, kOsDesktop,
+ FEATURE_VALUE_TYPE(omnibox::kOmniboxReverseAnswers)},
+@@ -3026,7 +3026,7 @@ const FeatureEntry kFeatureEntries[] = {
flag_descriptions::kOmniboxDriveSuggestionsName,
flag_descriptions::kOmniboxDriveSuggestionsDescriptions, kOsDesktop,
FEATURE_VALUE_TYPE(omnibox::kDocumentProvider)},
-#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN)
+#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD)
- #if defined(OS_ANDROID)
- {"enable-custom-feedback-ui",
-@@ -3449,7 +3449,7 @@
+ {"enable-speculative-service-worker-start-on-query-input",
+ flag_descriptions::kSpeculativeServiceWorkerStartOnQueryInputName,
+@@ -3342,7 +3342,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,
-@@ -3460,7 +3460,7 @@
+@@ -3353,7 +3353,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)
{"third-party-doodles", flag_descriptions::kThirdPartyDoodlesName,
-@@ -3897,7 +3897,7 @@
- flag_descriptions::kAutofillCacheQueryResponsesDescription, kOsAll,
- FEATURE_VALUE_TYPE(autofill::features::kAutofillCacheQueryResponses)},
-
--#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN)
-+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD)
- {"autofill-primary-info-style",
- flag_descriptions::kAutofillPrimaryInfoStyleExperimentName,
- flag_descriptions::kAutofillPrimaryInfoStyleExperimentDescription,
-@@ -3906,7 +3906,7 @@
- autofill::kAutofillPrimaryInfoStyleExperiment,
- kAutofillPrimaryInfoStyleVariations,
- "AutofillPrimaryInfoStyleExperiment")},
--#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN)
-+#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD)
-
- {"autofill-enable-company-name",
- flag_descriptions::kAutofillEnableCompanyNameName,
-@@ -4001,7 +4001,7 @@
- flag_descriptions::kExperimentalProductivityFeaturesDescription, kOsAll,
- FEATURE_VALUE_TYPE(features::kExperimentalProductivityFeatures)},
-
--#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)
-+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD)
- {"ntp-backgrounds", flag_descriptions::kNtpBackgroundsName,
- flag_descriptions::kNtpBackgroundsDescription, kOsDesktop,
- FEATURE_VALUE_TYPE(features::kNtpBackgrounds)},
-@@ -4017,7 +4017,7 @@
- {"ntp-ui-md", flag_descriptions::kNtpUIMdName,
- flag_descriptions::kNtpUIMdDescription, kOsDesktop,
- FEATURE_VALUE_TYPE(features::kNtpUIMd)},
--#endif // OS_WIN || OS_MACOSX || OS_LINUX
-+#endif // OS_WIN || OS_MACOSX || OS_LINUX || defined(OS_BSD)
-
- #if defined(OS_ANDROID)
- {"enable-display-cutout-api", flag_descriptions::kDisplayCutoutAPIName,
-@@ -4468,7 +4468,7 @@
+@@ -4280,7 +4280,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::
-@@ -4476,7 +4476,7 @@
+@@ -4288,7 +4288,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)
- };
- class FlagsStateSingleton {
+ #if BUILDFLAG(ENABLE_PRINT_PREVIEW) && defined(OS_MACOSX)
+ {"enable-custom-mac-paper-sizes",
+@@ -4333,13 +4333,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_WIN) || defined(OS_MACOSX) || defined(OS_CHROMEOS)
+ {"hardware-media-key-handling",
Index: branches/2019Q2/www/chromium/files/patch-chrome_browser_after__startup__task__utils.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-chrome_browser_after__startup__task__utils.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-chrome_browser_after__startup__task__utils.cc (revision 497959)
@@ -1,20 +1,38 @@
---- chrome/browser/after_startup_task_utils.cc.orig 2019-01-30 02:17:44.000000000 +0100
-+++ chrome/browser/after_startup_task_utils.cc 2019-01-31 22:15:46.765158000 +0100
-@@ -110,7 +110,7 @@
+--- chrome/browser/after_startup_task_utils.cc.orig 2019-03-11 22:00:53 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"
+-#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<AfterStartupTask> queue
+
void SetBrowserStartupIsComplete() {
DCHECK_CURRENTLY_ON(BrowserThread::UI);
-#if defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_LINUX)
+#if defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD)
// Process::Current().CreationTime() is not available on all platforms.
const base::Time process_creation_time =
base::Process::Current().CreationTime();
-@@ -118,7 +118,7 @@
+@@ -123,7 +123,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() {
+ 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/2019Q2/www/chromium/files/patch-chrome_browser_apps_platform__apps_api_music__manager__private_device__id__linux.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-chrome_browser_apps_platform__apps_api_music__manager__private_device__id__linux.cc (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-chrome_browser_apps_platform__apps_api_music__manager__private_device__id__linux.cc (revision 497959)
@@ -0,0 +1,70 @@
+--- chrome/browser/apps/platform_apps/api/music_manager_private/device_id_linux.cc.orig 2019-03-11 22:00:53 UTC
++++ chrome/browser/apps/platform_apps/api/music_manager_private/device_id_linux.cc
+@@ -4,6 +4,11 @@
+
+ #include "chrome/browser/apps/platform_apps/api/music_manager_private/device_id.h"
+
++#if defined(OS_FREEBSD)
++#include <sys/types.h>
++#include <net/if_dl.h>
++#endif
++
+ #include <ifaddrs.h>
+ #include <net/if.h>
+ #include <stddef.h>
+@@ -105,9 +110,36 @@ class MacAddressProcessor {
+ const char* const prefixes[],
+ size_t prefixes_count) {
+ const int MAC_LENGTH = 6;
++#if defined(OS_FREEBSD)
++ struct ifaddrs *ifap, *ifinfo;
++#else
+ struct ifreq ifinfo;
++#endif
+
+ memset(&ifinfo, 0, sizeof(ifinfo));
++
++#if defined(OS_FREEBSD)
++ int result = getifaddrs(&ifap);
++
++ if (result != 0)
++ return true;
++
++ result = 1; // no MAC found yet
++
++ for (ifinfo = ifap; ifinfo != NULL; ifinfo = ifinfo->ifa_next) {
++ struct sockaddr* sa = ifinfo->ifa_addr;
++ if (sa->sa_family == AF_LINK &&
++ !strncmp(ifinfo->ifa_name, ifaddr->ifa_name,
++ sizeof(ifinfo->ifa_name) - 1)) {
++ result = 0;
++ break;
++ }
++ }
++
++ char mac_address[6];
++
++ strncpy(mac_address, (const char*)LLADDR((struct sockaddr_dl*)ifinfo->ifa_addr), sizeof(mac_address));
++#else
+ strncpy(ifinfo.ifr_name, ifaddr->ifa_name, sizeof(ifinfo.ifr_name) - 1);
+
+ int sd = socket(AF_INET, SOCK_DGRAM, 0);
+@@ -119,11 +151,18 @@ class MacAddressProcessor {
+
+ const char* mac_address =
+ static_cast<const char*>(ifinfo.ifr_hwaddr.sa_data);
++#endif
++
+ if (!is_valid_mac_address_.Run(mac_address, MAC_LENGTH))
+ return true;
+
++#if defined(OS_FREEBSD)
++ if (!IsValidPrefix(ifinfo->ifa_name, prefixes, prefixes_count))
++ return true;
++#else
+ if (!IsValidPrefix(ifinfo.ifr_name, prefixes, prefixes_count))
+ return true;
++#endif
+
+ // Got one!
+ found_mac_address_ =
Property changes on: branches/2019Q2/www/chromium/files/patch-chrome_browser_apps_platform__apps_api_music__manager__private_device__id__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/2019Q2/www/chromium/files/patch-chrome_browser_autocomplete_chrome__autocomplete__scheme__classifier.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-chrome_browser_autocomplete_chrome__autocomplete__scheme__classifier.cc (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-chrome_browser_autocomplete_chrome__autocomplete__scheme__classifier.cc (revision 497959)
@@ -0,0 +1,11 @@
+--- chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.cc.orig 2019-03-11 22:00:53 UTC
++++ chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.cc
+@@ -59,7 +59,7 @@ ChromeAutocompleteSchemeClassifier::GetInputTypeForSch
+ return metrics::OmniboxInputType::QUERY;
+
+ case ExternalProtocolHandler::UNKNOWN: {
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+ // Linux impl of GetApplicationNameForProtocol doesn't distinguish
+ // between URL schemes with handers and those without. This will
+ // make the default behaviour be search on Linux.
Property changes on: branches/2019Q2/www/chromium/files/patch-chrome_browser_autocomplete_chrome__autocomplete__scheme__classifier.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/2019Q2/www/chromium/files/patch-chrome_browser_background_background__mode__optimizer.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-chrome_browser_background_background__mode__optimizer.cc (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-chrome_browser_background_background__mode__optimizer.cc (revision 497959)
@@ -0,0 +1,15 @@
+--- chrome/browser/background/background_mode_optimizer.cc.orig 2019-03-11 22:00:53 UTC
++++ chrome/browser/background/background_mode_optimizer.cc
+@@ -30,10 +30,10 @@ std::unique_ptr<BackgroundModeOptimizer> BackgroundMod
+ switches::kKeepAliveForTest))
+ return nullptr;
+
+-#if defined(OS_WIN) || defined(OS_LINUX)
++#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD)
+ if (base::FeatureList::IsEnabled(features::kBackgroundModeAllowRestart))
+ return base::WrapUnique(new BackgroundModeOptimizer());
+-#endif // defined(OS_WIN) || defined(OS_LINUX)
++#endif // defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD)
+
+ return nullptr;
+ }
Property changes on: branches/2019Q2/www/chromium/files/patch-chrome_browser_background_background__mode__optimizer.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/2019Q2/www/chromium/files/patch-chrome_browser_browser__resources.grd
===================================================================
--- branches/2019Q2/www/chromium/files/patch-chrome_browser_browser__resources.grd (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-chrome_browser_browser__resources.grd (revision 497959)
@@ -1,11 +1,11 @@
---- chrome/browser/browser_resources.grd.orig 2018-06-13 00:10:04.000000000 +0200
-+++ chrome/browser/browser_resources.grd 2018-07-14 13:48:09.392254000 +0200
-@@ -634,7 +634,7 @@
+--- chrome/browser/browser_resources.grd.orig 2019-03-11 22:00:53 UTC
++++ chrome/browser/browser_resources.grd
+@@ -679,7 +679,7 @@
<include name="IDR_WELCOME_WIN10_PIN_WEBP" file="resources\welcome\pin.webp" type="BINDATA" />
</if>
<include name="IDR_SSL_ERROR_ASSISTANT_PB" file="${root_gen_dir}/chrome/browser/resources/ssl/ssl_error_assistant/ssl_error_assistant.pb" use_base_dir="false" type="BINDATA" />
- <if expr="is_android or is_linux">
+ <if expr="is_android or is_posix">
<include name="IDR_SANDBOX_INTERNALS_HTML" file="resources\sandbox_internals\sandbox_internals.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" compress="gzip" />
<include name="IDR_SANDBOX_INTERNALS_JS" file="resources\sandbox_internals\sandbox_internals.js" type="BINDATA" compress="gzip" />
</if>
Index: branches/2019Q2/www/chromium/files/patch-chrome_browser_chrome__browser__main.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-chrome_browser_chrome__browser__main.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-chrome_browser_chrome__browser__main.cc (revision 497959)
@@ -1,72 +1,72 @@
---- chrome/browser/chrome_browser_main.cc.orig 2019-02-06 23:06:37.000000000 +0100
-+++ chrome/browser/chrome_browser_main.cc 2019-02-12 20:03:14.042579000 +0100
-@@ -216,7 +216,7 @@
+--- chrome/browser/chrome_browser_main.cc.orig 2019-03-11 22:00:53 UTC
++++ chrome/browser/chrome_browser_main.cc
+@@ -217,7 +217,7 @@
#include "chromeos/settings/cros_settings_names.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)
-@@ -256,7 +256,7 @@
+@@ -257,7 +257,7 @@
#endif // defined(OS_WIN)
#if defined(OS_WIN) || defined(OS_MACOSX) || \
- (defined(OS_LINUX) && !defined(OS_CHROMEOS))
+ (defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_BSD))
#include "chrome/browser/metrics/desktop_session_duration/desktop_session_duration_tracker.h"
#endif
-@@ -1059,7 +1059,7 @@
+@@ -1043,7 +1043,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 .
-@@ -1068,14 +1068,14 @@
+@@ -1052,14 +1052,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
-@@ -1099,7 +1099,7 @@
+@@ -1087,7 +1087,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
}
#if defined(OS_WIN) || defined(OS_MACOSX) || \
- (defined(OS_LINUX) && !defined(OS_CHROMEOS))
+ (defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_BSD))
metrics::DesktopSessionDurationTracker::Initialize();
#endif
metrics::RendererUptimeTracker::Initialize();
-@@ -1279,6 +1279,7 @@
+@@ -1267,6 +1267,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(
-@@ -1287,6 +1288,7 @@
+@@ -1275,6 +1276,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/2019Q2/www/chromium/files/patch-chrome_browser_chrome__browser__main__linux.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-chrome_browser_chrome__browser__main__linux.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-chrome_browser_chrome__browser__main__linux.cc (revision 497959)
@@ -1,27 +1,27 @@
---- chrome/browser/chrome_browser_main_linux.cc.orig 2018-12-03 21:16:38.000000000 +0100
-+++ chrome/browser/chrome_browser_main_linux.cc 2018-12-05 14:26:26.555958000 +0100
-@@ -90,12 +90,14 @@
+--- chrome/browser/chrome_browser_main_linux.cc.orig 2019-03-11 22:00:53 UTC
++++ chrome/browser/chrome_browser_main_linux.cc
+@@ -90,12 +90,14 @@ void ChromeBrowserMainPartsLinux::PreProfileInit() {
void ChromeBrowserMainPartsLinux::PostProfileInit() {
ChromeBrowserMainPartsPosix::PostProfileInit();
+#if !defined(OS_BSD)
g_browser_process->metrics_service()->RecordBreakpadRegistration(
breakpad::IsCrashReporterEnabled());
+#endif
}
void ChromeBrowserMainPartsLinux::PostMainMessageLoopStart() {
-#if !defined(OS_CHROMEOS)
+#if !defined(OS_CHROMEOS) && !defined(OS_BSD)
bluez::BluezDBusThreadManager::Initialize();
bluez::BluezDBusManager::Initialize();
#endif
-@@ -104,7 +106,7 @@
+@@ -104,7 +106,7 @@ void ChromeBrowserMainPartsLinux::PostMainMessageLoopS
}
void ChromeBrowserMainPartsLinux::PostDestroyThreads() {
-#if !defined(OS_CHROMEOS)
+#if !defined(OS_CHROMEOS) && !defined(OS_BSD)
bluez::BluezDBusManager::Shutdown();
bluez::BluezDBusThreadManager::Shutdown();
#endif
Index: branches/2019Q2/www/chromium/files/patch-chrome_browser_chrome__browser__main__posix.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-chrome_browser_chrome__browser__main__posix.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-chrome_browser_chrome__browser__main__posix.cc (revision 497959)
@@ -1,11 +1,11 @@
---- chrome/browser/chrome_browser_main_posix.cc.orig 2017-06-05 19:03:02 UTC
+--- chrome/browser/chrome_browser_main_posix.cc.orig 2019-03-11 22:00:53 UTC
+++ chrome/browser/chrome_browser_main_posix.cc
-@@ -134,7 +134,7 @@ void ChromeBrowserMainPartsPosix::PostMainMessageLoopS
+@@ -142,7 +142,7 @@ void ChromeBrowserMainPartsPosix::PostMainMessageLoopS
void ChromeBrowserMainPartsPosix::ShowMissingLocaleMessageBox() {
#if defined(OS_CHROMEOS)
NOTREACHED(); // Should not ever happen on ChromeOS.
-#elif defined(OS_MACOSX)
+#elif defined(OS_MACOSX) || defined(OS_BSD)
// Not called on Mac because we load the locale files differently.
NOTREACHED();
#elif defined(USE_AURA)
Index: branches/2019Q2/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.cc (revision 497959)
@@ -1,88 +1,97 @@
---- chrome/browser/chrome_content_browser_client.cc.orig 2019-01-30 02:17:44.000000000 +0100
-+++ chrome/browser/chrome_content_browser_client.cc 2019-02-06 22:10:31.368688000 +0100
-@@ -367,7 +367,7 @@
- #include "chromeos/services/secure_channel/secure_channel_service.h"
+--- chrome/browser/chrome_content_browser_client.cc.orig 2019-03-11 22:00:53 UTC
++++ chrome/browser/chrome_content_browser_client.cc
+@@ -395,7 +395,7 @@
#include "components/user_manager/user_manager.h"
#include "services/service_manager/public/mojom/interface_provider_spec.mojom.h"
+ #include "services/ws/common/switches.h"
-#elif defined(OS_LINUX)
+#elif defined(OS_LINUX) || defined(OS_BSD)
#include "chrome/browser/chrome_browser_main_linux.h"
#elif defined(OS_ANDROID)
#include "base/android/application_status_listener.h"
-@@ -412,11 +412,11 @@
+@@ -441,11 +441,11 @@
#include "components/services/patch/public/interfaces/constants.mojom.h"
#endif
-#if defined(OS_LINUX) || defined(OS_WIN)
+#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_BSD)
#include "chrome/browser/webshare/share_service_impl.h"
#endif
-#if defined(OS_WIN) || defined(OS_MACOSX) || \
+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_BSD) || \
(defined(OS_LINUX) && !defined(OS_CHROMEOS))
#include "chrome/browser/browser_switcher/browser_switcher_navigation_throttle.h"
#endif
-@@ -431,7 +431,7 @@
+@@ -462,7 +462,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
-@@ -1101,7 +1101,7 @@
+@@ -1144,7 +1144,7 @@ content::BrowserMainParts* ChromeContentBrowserClient:
#elif defined(OS_CHROMEOS)
main_parts = new chromeos::ChromeBrowserMainPartsChromeos(
parameters, chrome_feature_list_creator_);
-#elif defined(OS_LINUX)
+#elif defined(OS_LINUX) || defined(OS_BSD)
main_parts =
new ChromeBrowserMainPartsLinux(parameters, chrome_feature_list_creator_);
#elif defined(OS_ANDROID)
-@@ -1121,7 +1121,7 @@
+@@ -1164,7 +1164,7 @@ content::BrowserMainParts* ChromeContentBrowserClient:
// Construct additional browser parts. Stages are called in the order in
// which they are added.
#if defined(TOOLKIT_VIEWS)
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(USE_OZONE)
+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) && !defined(USE_OZONE)
main_parts->AddParts(new ChromeBrowserMainExtraPartsViewsLinux());
#else
main_parts->AddParts(new ChromeBrowserMainExtraPartsViews());
-@@ -1913,7 +1913,7 @@
+@@ -1956,7 +1956,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 (breakpad::IsCrashReporterEnabled()) {
- std::string switch_value;
- std::unique_ptr<metrics::ClientInfo> client_info =
-@@ -3474,7 +3474,7 @@
+ #if defined(OS_ANDROID)
+ bool enable_crash_reporter = true;
+ #else
+@@ -3550,7 +3550,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,
-@@ -4207,7 +4207,7 @@
- if (previews_lite_page_throttle)
- throttles.push_back(std::move(previews_lite_page_throttle));
+@@ -4288,7 +4288,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
+ handle));
+ }
-#if defined(OS_WIN) || defined(OS_MACOSX) || \
+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_BSD) || \
(defined(OS_LINUX) && !defined(OS_CHROMEOS))
std::unique_ptr<content::NavigationThrottle> browser_switcher_throttle =
browser_switcher::BrowserSwitcherNavigationThrottle ::
-@@ -4328,7 +4328,7 @@
+@@ -4409,7 +4409,7 @@ void ChromeContentBrowserClient::InitWebContextInterfa
#if defined(OS_ANDROID)
frame_interfaces_parameterized_->AddInterface(base::Bind(
&ForwardToJavaWebContentsRegistry<blink::mojom::ShareService>));
-#elif defined(OS_LINUX) || defined(OS_WIN)
+#elif defined(OS_LINUX) || defined(OS_WIN) || defined(OS_BSD)
frame_interfaces_->AddInterface(base::Bind(&ShareServiceImpl::Create));
#endif
+@@ -5047,7 +5047,7 @@ std::unique_ptr<content::OverlayWindow>
+ ChromeContentBrowserClient::CreateWindowForPictureInPicture(
+ content::PictureInPictureWindowController* controller) {
+ #if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \
+- defined(OS_CHROMEOS)
++ defined(OS_CHROMEOS) || defined(OS_BSD)
+ // Note: content::OverlayWindow::Create() is defined by platform-specific
+ // implementation in chrome/browser/ui/views. This layering hack, which goes
+ // through //content and ContentBrowserClient, allows us to work around the
Index: branches/2019Q2/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.h
===================================================================
--- branches/2019Q2/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.h (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.h (revision 497959)
@@ -1,17 +1,17 @@
---- chrome/browser/chrome_content_browser_client.h.orig 2018-06-13 00:10:04.000000000 +0200
-+++ chrome/browser/chrome_content_browser_client.h 2018-07-14 14:13:02.407023000 +0200
-@@ -299,12 +299,12 @@
+--- chrome/browser/chrome_content_browser_client.h.orig 2019-03-11 22:00:53 UTC
++++ chrome/browser/chrome_content_browser_client.h
+@@ -363,12 +363,12 @@ class ChromeContentBrowserClient : public content::Con
void OverridePageVisibilityState(
content::RenderFrameHost* render_frame_host,
- blink::mojom::PageVisibilityState* visibility_state) override;
+ 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/2019Q2/www/chromium/files/patch-chrome_browser_custom__handlers_protocol__handler__registry.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-chrome_browser_custom__handlers_protocol__handler__registry.cc (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-chrome_browser_custom__handlers_protocol__handler__registry.cc (revision 497959)
@@ -0,0 +1,11 @@
+--- chrome/browser/custom_handlers/protocol_handler_registry.cc.orig 2019-03-17 19:35:08 UTC
++++ chrome/browser/custom_handlers/protocol_handler_registry.cc
+@@ -48,7 +48,7 @@ const ProtocolHandler& LookupHandler(
+ // If true default protocol handlers will be removed if the OS level
+ // registration for a protocol is no longer Chrome.
+ bool ShouldRemoveHandlersNotInOS() {
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+ // We don't do this on Linux as the OS registration there is not reliable,
+ // and Chrome OS doesn't have any notion of OS registration.
+ // TODO(benwells): When Linux support is more reliable remove this
Property changes on: branches/2019Q2/www/chromium/files/patch-chrome_browser_custom__handlers_protocol__handler__registry.cc
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: branches/2019Q2/www/chromium/files/patch-chrome_browser_defaults.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-chrome_browser_defaults.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-chrome_browser_defaults.cc (revision 497959)
@@ -1,11 +1,11 @@
---- chrome/browser/defaults.cc.orig 2017-04-19 19:06:29 UTC
+--- chrome/browser/defaults.cc.orig 2019-03-11 22:00:53 UTC
+++ chrome/browser/defaults.cc
-@@ -44,7 +44,7 @@ const bool kSyncAutoStarts = true;
+@@ -43,7 +43,7 @@ const bool kSyncAutoStarts = true;
const bool kSyncAutoStarts = false;
#endif
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
const bool kScrollEventChangesTab = true;
#else
const bool kScrollEventChangesTab = false;
Index: branches/2019Q2/www/chromium/files/patch-chrome_browser_devtools_devtools__eye__dropper.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-chrome_browser_devtools_devtools__eye__dropper.cc (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-chrome_browser_devtools_devtools__eye__dropper.cc (revision 497959)
@@ -0,0 +1,11 @@
+--- chrome/browser/devtools/devtools_eye_dropper.cc.orig 2019-03-11 22:00:53 UTC
++++ chrome/browser/devtools/devtools_eye_dropper.cc
+@@ -163,7 +163,7 @@ void DevToolsEyeDropper::UpdateCursor() {
+ // magnified projection only with centered hotspot.
+ // Mac Retina requires cursor to be > 120px in order to render smoothly.
+
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+ const float kCursorSize = 63;
+ const float kDiameter = 63;
+ const float kHotspotOffset = 32;
Property changes on: branches/2019Q2/www/chromium/files/patch-chrome_browser_devtools_devtools__eye__dropper.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/2019Q2/www/chromium/files/patch-chrome_browser_diagnostics_diagnostics__writer.h
===================================================================
--- branches/2019Q2/www/chromium/files/patch-chrome_browser_diagnostics_diagnostics__writer.h (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-chrome_browser_diagnostics_diagnostics__writer.h (revision 497959)
@@ -1,11 +1,11 @@
---- chrome/browser/diagnostics/diagnostics_writer.h.orig 2019-01-03 21:12:30.399407000 +0100
-+++ chrome/browser/diagnostics/diagnostics_writer.h 2019-01-03 21:12:49.905049000 +0100
-@@ -15,6 +15,8 @@
+--- chrome/browser/diagnostics/diagnostics_writer.h.orig 2019-03-11 22:00:53 UTC
++++ chrome/browser/diagnostics/diagnostics_writer.h
+@@ -15,6 +15,8 @@ namespace diagnostics {
// Console base class used internally.
class SimpleConsole;
+#undef MACHINE
+
class DiagnosticsWriter : public DiagnosticsModel::Observer {
public:
// The type of formatting done by this writer.
Index: branches/2019Q2/www/chromium/files/patch-chrome_browser_download_chrome__download__manager__delegate.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-chrome_browser_download_chrome__download__manager__delegate.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-chrome_browser_download_chrome__download__manager__delegate.cc (revision 497959)
@@ -1,20 +1,20 @@
---- chrome/browser/download/chrome_download_manager_delegate.cc.orig 2017-12-15 02:04:08.000000000 +0100
-+++ chrome/browser/download/chrome_download_manager_delegate.cc 2017-12-24 00:58:48.284663000 +0100
-@@ -882,7 +882,7 @@
+--- chrome/browser/download/chrome_download_manager_delegate.cc.orig 2019-03-11 22:00:53 UTC
++++ chrome/browser/download/chrome_download_manager_delegate.cc
+@@ -1231,7 +1231,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
-@@ -902,7 +902,7 @@
+@@ -1251,7 +1251,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/2019Q2/www/chromium/files/patch-chrome_browser_download_download__commands.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-chrome_browser_download_download__commands.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-chrome_browser_download_download__commands.cc (revision 497959)
@@ -1,20 +1,20 @@
---- chrome/browser/download/download_commands.cc.orig 2018-12-03 21:16:39.000000000 +0100
-+++ chrome/browser/download/download_commands.cc 2018-12-05 14:35:24.756358000 +0100
-@@ -220,7 +220,7 @@
+--- chrome/browser/download/download_commands.cc.orig 2019-03-11 22:00:53 UTC
++++ chrome/browser/download/download_commands.cc
+@@ -158,7 +158,7 @@ Browser* DownloadCommands::GetBrowser() const {
return browser_displayer.browser();
}
-#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"));
-@@ -237,7 +237,7 @@
+@@ -175,7 +175,7 @@ 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
}
Index: branches/2019Q2/www/chromium/files/patch-chrome_browser_download_download__commands.h
===================================================================
--- branches/2019Q2/www/chromium/files/patch-chrome_browser_download_download__commands.h (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-chrome_browser_download_download__commands.h (revision 497959)
@@ -1,11 +1,11 @@
---- chrome/browser/download/download_commands.h.orig 2017-09-05 21:05:12.000000000 +0200
-+++ chrome/browser/download/download_commands.h 2017-09-06 18:02:40.537871000 +0200
-@@ -42,7 +42,7 @@
+--- chrome/browser/download/download_commands.h.orig 2019-03-11 22:00:53 UTC
++++ chrome/browser/download/download_commands.h
+@@ -42,7 +42,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
Index: branches/2019Q2/www/chromium/files/patch-chrome_browser_download_download__item__model.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-chrome_browser_download_download__item__model.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-chrome_browser_download_download__item__model.cc (revision 497959)
@@ -1,20 +1,20 @@
---- chrome/browser/download/download_item_model.cc.orig 2019-02-06 22:12:34.810575000 +0100
-+++ chrome/browser/download/download_item_model.cc 2019-02-06 22:13:05.192798000 +0100
-@@ -555,7 +555,7 @@
+--- chrome/browser/download/download_item_model.cc.orig 2019-03-11 22:00:53 UTC
++++ chrome/browser/download/download_item_model.cc
+@@ -555,7 +555,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 @@
+@@ -592,7 +592,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/2019Q2/www/chromium/files/patch-chrome_browser_download_download__prefs.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-chrome_browser_download_download__prefs.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-chrome_browser_download_download__prefs.cc (revision 497959)
@@ -1,65 +1,65 @@
---- chrome/browser/download/download_prefs.cc.orig 2017-12-15 02:04:08.000000000 +0100
-+++ chrome/browser/download/download_prefs.cc 2017-12-24 01:04:45.230590000 +0100
-@@ -56,7 +56,7 @@
+--- chrome/browser/download/download_prefs.cc.orig 2019-03-11 22:00:53 UTC
++++ chrome/browser/download/download_prefs.cc
+@@ -62,7 +62,7 @@ namespace {
// Consider downloads 'dangerous' if they go to the home directory on Linux and
// to the desktop on any platform.
bool DownloadPathIsDangerous(const base::FilePath& download_path) {
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
base::FilePath home_dir = base::GetHomeDir();
if (download_path == home_dir) {
return true;
-@@ -135,7 +135,7 @@
+@@ -155,7 +155,7 @@ DownloadPrefs::DownloadPrefs(Profile* profile) : profi
GetDefaultDownloadDirectoryForProfile()));
#endif // defined(OS_CHROMEOS)
-#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX)
+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD)
should_open_pdf_in_system_reader_ =
prefs->GetBoolean(prefs::kOpenPdfDownloadInSystemReader);
#endif
-@@ -219,7 +219,7 @@
+@@ -252,7 +252,7 @@ void DownloadPrefs::RegisterProfilePrefs(
default_download_path);
registry->RegisterFilePathPref(prefs::kSaveFileDefaultDirectory,
default_download_path);
-#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX)
+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD)
registry->RegisterBooleanPref(prefs::kOpenPdfDownloadInSystemReader, false);
#endif
+ #if defined(OS_ANDROID)
+@@ -354,7 +354,7 @@ bool DownloadPrefs::IsDownloadPathManaged() const {
}
-@@ -302,7 +302,7 @@
- }
bool DownloadPrefs::IsAutoOpenUsed() const {
-#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX)
+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD)
if (ShouldOpenPdfInSystemReader())
return true;
#endif
-@@ -316,7 +316,7 @@
+@@ -368,7 +368,7 @@ bool DownloadPrefs::IsAutoOpenEnabledBasedOnExtension(
return false;
DCHECK(extension[0] == base::FilePath::kExtensionSeparator);
extension.erase(0, 1);
-#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX)
+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD)
if (base::FilePath::CompareEqualIgnoreCase(extension,
FILE_PATH_LITERAL("pdf")) &&
ShouldOpenPdfInSystemReader())
-@@ -353,7 +353,7 @@
+@@ -405,7 +405,7 @@ void DownloadPrefs::DisableAutoOpenBasedOnExtension(
SaveAutoOpenState();
}
-#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX)
+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD)
void DownloadPrefs::SetShouldOpenPdfInSystemReader(bool should_open) {
if (should_open_pdf_in_system_reader_ == should_open)
return;
-@@ -374,7 +374,7 @@
+@@ -426,7 +426,7 @@ bool DownloadPrefs::ShouldOpenPdfInSystemReader() cons
#endif
void DownloadPrefs::ResetAutoOpen() {
-#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX)
+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD)
SetShouldOpenPdfInSystemReader(false);
#endif
auto_open_.clear();
Index: branches/2019Q2/www/chromium/files/patch-chrome_browser_download_download__prefs.h
===================================================================
--- branches/2019Q2/www/chromium/files/patch-chrome_browser_download_download__prefs.h (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-chrome_browser_download_download__prefs.h (revision 497959)
@@ -1,20 +1,20 @@
---- chrome/browser/download/download_prefs.h.orig 2017-04-19 19:06:29 UTC
+--- chrome/browser/download/download_prefs.h.orig 2019-03-11 22:00:53 UTC
+++ chrome/browser/download/download_prefs.h
-@@ -78,7 +78,7 @@ class DownloadPrefs {
+@@ -101,7 +101,7 @@ class DownloadPrefs {
// Disables auto-open based on file extension.
void DisableAutoOpenBasedOnExtension(const base::FilePath& file_name);
-#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX)
+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD)
// Store the user preference to disk. If |should_open| is true, also disable
// the built-in PDF plugin. If |should_open| is false, enable the PDF plugin.
void SetShouldOpenPdfInSystemReader(bool should_open);
-@@ -109,7 +109,7 @@ class DownloadPrefs {
+@@ -145,7 +145,7 @@ class DownloadPrefs {
AutoOpenCompareFunctor> AutoOpenSet;
AutoOpenSet auto_open_;
-#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX)
+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD)
bool should_open_pdf_in_system_reader_;
#endif
Index: branches/2019Q2/www/chromium/files/patch-chrome_browser_download_download__query.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-chrome_browser_download_download__query.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-chrome_browser_download_download__query.cc (revision 497959)
@@ -1,14 +1,14 @@
---- chrome/browser/download/download_query.cc.orig 2018-06-13 00:10:05.000000000 +0200
-+++ chrome/browser/download/download_query.cc 2018-07-15 13:01:15.987418000 +0200
+--- chrome/browser/download/download_query.cc.orig 2019-03-11 22:00:53 UTC
++++ chrome/browser/download/download_query.cc
@@ -27,7 +27,11 @@
#include "components/download/public/common/download_item.h"
#include "components/url_formatter/url_formatter.h"
#include "content/public/browser/content_browser_client.h"
+#if defined(OS_BSD)
+#include <re2/re2.h>
+#else
#include "third_party/re2/src/re2/re2.h"
+#endif
#include "url/gurl.h"
using download::DownloadDangerType;
Index: branches/2019Q2/www/chromium/files/patch-chrome_browser_download_download__shelf__context__menu.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-chrome_browser_download_download__shelf__context__menu.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-chrome_browser_download_download__shelf__context__menu.cc (revision 497959)
@@ -1,11 +1,11 @@
---- chrome/browser/download/download_shelf_context_menu.cc.orig 2017-06-05 19:03:02 UTC
+--- chrome/browser/download/download_shelf_context_menu.cc.orig 2019-03-11 22:00:53 UTC
+++ chrome/browser/download/download_shelf_context_menu.cc
@@ -127,7 +127,7 @@ base::string16 DownloadShelfContextMenu::GetLabelForCo
: IDS_DOWNLOAD_MENU_PLATFORM_OPEN_ALWAYS;
break;
}
-#elif defined(OS_MACOSX) || defined(OS_LINUX)
+#elif defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD)
if (can_open_pdf_in_system_viewer) {
id = IDS_DOWNLOAD_MENU_PLATFORM_OPEN_ALWAYS;
break;
Index: branches/2019Q2/www/chromium/files/patch-chrome_browser_download_download__status__updater.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-chrome_browser_download_download__status__updater.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-chrome_browser_download_download__status__updater.cc (revision 497959)
@@ -1,20 +1,20 @@
---- chrome/browser/download/download_status_updater.cc.orig 2018-06-13 00:10:05.000000000 +0200
-+++ chrome/browser/download/download_status_updater.cc 2018-07-15 13:07:15.012034000 +0200
+--- chrome/browser/download/download_status_updater.cc.orig 2019-03-11 22:00:53 UTC
++++ chrome/browser/download/download_status_updater.cc
@@ -13,7 +13,7 @@
#include "base/memory/ptr_util.h"
#include "build/build_config.h"
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
#include "ui/views/linux_ui/linux_ui.h"
#endif
-@@ -136,7 +136,7 @@
+@@ -136,7 +136,7 @@ void DownloadStatusUpdater::OnDownloadUpdated(content:
#if defined(OS_ANDROID) || (defined(USE_AURA) && !defined(OS_WIN))
void DownloadStatusUpdater::UpdateAppIconDownloadProgress(
download::DownloadItem* download) {
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
const views::LinuxUI* linux_ui = views::LinuxUI::instance();
if (linux_ui) {
float progress = 0;
Index: branches/2019Q2/www/chromium/files/patch-chrome_browser_extensions_BUILD.gn
===================================================================
--- branches/2019Q2/www/chromium/files/patch-chrome_browser_extensions_BUILD.gn (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-chrome_browser_extensions_BUILD.gn (revision 497959)
@@ -1,15 +1,15 @@
---- chrome/browser/extensions/BUILD.gn.orig 2017-12-15 02:04:08.000000000 +0100
-+++ chrome/browser/extensions/BUILD.gn 2017-12-30 01:58:47.411895000 +0100
-@@ -1117,6 +1117,12 @@
- defines += [ "ENABLE_HOTWORDING" ]
+--- chrome/browser/extensions/BUILD.gn.orig 2019-03-11 22:00:53 UTC
++++ chrome/browser/extensions/BUILD.gn
+@@ -1104,6 +1104,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/2019Q2/www/chromium/files/patch-chrome_browser_extensions_activity__log_activity__log.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-chrome_browser_extensions_activity__log_activity__log.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-chrome_browser_extensions_activity__log_activity__log.cc (revision 497959)
@@ -1,14 +1,14 @@
---- chrome/browser/extensions/activity_log/activity_log.cc.orig 2017-06-05 19:03:02 UTC
+--- chrome/browser/extensions/activity_log/activity_log.cc.orig 2019-03-11 22:00:53 UTC
+++ chrome/browser/extensions/activity_log/activity_log.cc
-@@ -50,7 +50,11 @@
+@@ -52,7 +52,11 @@
#include "extensions/common/extension.h"
#include "extensions/common/extension_messages.h"
#include "extensions/common/one_shot_event.h"
+#if defined(OS_BSD)
+#include <re2/re2.h>
+#else
#include "third_party/re2/src/re2/re2.h"
+#endif
#include "url/gurl.h"
namespace constants = activity_log_constants;
Index: branches/2019Q2/www/chromium/files/patch-chrome_browser_extensions_api_image__writer__private_removable__storage__provider.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-chrome_browser_extensions_api_image__writer__private_removable__storage__provider.cc (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-chrome_browser_extensions_api_image__writer__private_removable__storage__provider.cc (revision 497959)
@@ -0,0 +1,20 @@
+--- chrome/browser/extensions/api/image_writer_private/removable_storage_provider.cc.orig 2019-03-11 22:00:53 UTC
++++ chrome/browser/extensions/api/image_writer_private/removable_storage_provider.cc
+@@ -20,6 +20,7 @@ static base::LazyInstance<scoped_refptr<StorageDeviceL
+
+ void RemovableStorageProvider::GetAllDevices(DeviceListReadyCallback callback) {
+ DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
++#if !defined(OS_BSD)
+ if (g_test_device_list.Get().get() != nullptr) {
+ base::ThreadTaskRunnerHandle::Get()->PostTask(
+ FROM_HERE,
+@@ -33,6 +34,9 @@ void RemovableStorageProvider::GetAllDevices(DeviceLis
+ base::TaskShutdownBehavior::SKIP_ON_SHUTDOWN},
+ base::BindOnce(&RemovableStorageProvider::PopulateDeviceList),
+ std::move(callback));
++#else
++ NOTIMPLEMENTED();
++#endif
+ }
+
+ // static
Property changes on: branches/2019Q2/www/chromium/files/patch-chrome_browser_extensions_api_image__writer__private_removable__storage__provider.cc
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: branches/2019Q2/www/chromium/files/patch-chrome_browser_extensions_api_input__ime_input__ime__api.h
===================================================================
--- branches/2019Q2/www/chromium/files/patch-chrome_browser_extensions_api_input__ime_input__ime__api.h (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-chrome_browser_extensions_api_input__ime_input__ime__api.h (revision 497959)
@@ -1,11 +1,11 @@
---- chrome/browser/extensions/api/input_ime/input_ime_api.h.orig 2017-04-19 19:06:29 UTC
+--- chrome/browser/extensions/api/input_ime/input_ime_api.h.orig 2019-03-11 22:00:53 UTC
+++ chrome/browser/extensions/api/input_ime/input_ime_api.h
-@@ -28,7 +28,7 @@
+@@ -31,7 +31,7 @@
#if defined(OS_CHROMEOS)
#include "chrome/browser/extensions/api/input_ime/input_ime_api_chromeos.h"
-#elif defined(OS_LINUX) || defined(OS_WIN)
+#elif defined(OS_LINUX) || defined(OS_WIN) || defined(OS_BSD)
#include "chrome/browser/extensions/api/input_ime/input_ime_api_nonchromeos.h"
#endif // defined(OS_CHROMEOS)
Index: branches/2019Q2/www/chromium/files/patch-chrome_browser_extensions_api_runtime_chrome__runtime__api__delegate.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-chrome_browser_extensions_api_runtime_chrome__runtime__api__delegate.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-chrome_browser_extensions_api_runtime_chrome__runtime__api__delegate.cc (revision 497959)
@@ -1,11 +1,11 @@
---- chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate.cc.orig 2017-06-05 19:03:02 UTC
+--- chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate.cc.orig 2019-03-11 22:00:53 UTC
+++ chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate.cc
-@@ -278,6 +278,8 @@ bool ChromeRuntimeAPIDelegate::GetPlatformInfo(Platfor
+@@ -296,6 +296,8 @@ bool ChromeRuntimeAPIDelegate::GetPlatformInfo(Platfor
info->os = extensions::api::runtime::PLATFORM_OS_CROS;
} else if (strcmp(os, "linux") == 0) {
info->os = extensions::api::runtime::PLATFORM_OS_LINUX;
+ } else if (strcmp(os, "freebsd") == 0) {
+ info->os = extensions::api::runtime::PLATFORM_OS_FREEBSD;
} else if (strcmp(os, "openbsd") == 0) {
info->os = extensions::api::runtime::PLATFORM_OS_OPENBSD;
} else {
Index: branches/2019Q2/www/chromium/files/patch-chrome_browser_extensions_api_settings__private_prefs__util.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-chrome_browser_extensions_api_settings__private_prefs__util.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-chrome_browser_extensions_api_settings__private_prefs__util.cc (revision 497959)
@@ -1,20 +1,20 @@
---- chrome/browser/extensions/api/settings_private/prefs_util.cc.orig 2018-03-20 23:05:17.000000000 +0100
-+++ chrome/browser/extensions/api/settings_private/prefs_util.cc 2018-03-24 13:17:26.753666000 +0100
-@@ -102,7 +102,7 @@
+--- chrome/browser/extensions/api/settings_private/prefs_util.cc.orig 2019-03-11 22:00:53 UTC
++++ chrome/browser/extensions/api/settings_private/prefs_util.cc
+@@ -127,7 +127,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetWhitelist
settings_api::PrefType::PREF_TYPE_BOOLEAN;
(*s_whitelist)[bookmarks::prefs::kShowBookmarkBar] =
settings_api::PrefType::PREF_TYPE_BOOLEAN;
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
+#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
(*s_whitelist)[::prefs::kUseCustomChromeFrame] =
settings_api::PrefType::PREF_TYPE_BOOLEAN;
#endif
-@@ -112,7 +112,7 @@
+@@ -137,7 +137,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetWhitelist
// Appearance settings.
(*s_whitelist)[::prefs::kCurrentThemeID] =
settings_api::PrefType::PREF_TYPE_STRING;
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
+#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
(*s_whitelist)[::prefs::kUsesSystemTheme] =
settings_api::PrefType::PREF_TYPE_BOOLEAN;
#endif
Index: branches/2019Q2/www/chromium/files/patch-chrome_browser_extensions_bookmark__app__helper.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-chrome_browser_extensions_bookmark__app__helper.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-chrome_browser_extensions_bookmark__app__helper.cc (revision 497959)
@@ -1,11 +1,11 @@
---- chrome/browser/extensions/bookmark_app_helper.cc.orig 2019-01-30 02:17:45.000000000 +0100
-+++ chrome/browser/extensions/bookmark_app_helper.cc 2019-01-31 22:27:52.602150000 +0100
-@@ -497,7 +497,7 @@
+--- chrome/browser/extensions/bookmark_app_helper.cc.orig 2019-03-11 22:00:53 UTC
++++ chrome/browser/extensions/bookmark_app_helper.cc
+@@ -503,7 +503,7 @@ void BookmarkAppHelper::FinishInstallation(const Exten
if (create_shortcuts_) {
#if !defined(OS_CHROMEOS)
web_app::ShortcutLocations creation_locations;
-#if defined(OS_LINUX) || defined(OS_WIN)
+#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_BSD)
creation_locations.on_desktop = true;
#else
creation_locations.on_desktop = false;
Index: branches/2019Q2/www/chromium/files/patch-chrome_browser_extensions_browser__context__keyed__service__factories.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-chrome_browser_extensions_browser__context__keyed__service__factories.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-chrome_browser_extensions_browser__context__keyed__service__factories.cc (revision 497959)
@@ -1,20 +1,20 @@
---- chrome/browser/extensions/browser_context_keyed_service_factories.cc.orig 2019-01-30 02:17:45.000000000 +0100
-+++ chrome/browser/extensions/browser_context_keyed_service_factories.cc 2019-01-31 22:23:23.442216000 +0100
-@@ -55,7 +55,7 @@
+--- 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
+@@ -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
-@@ -97,7 +97,7 @@
+@@ -93,7 +93,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/2019Q2/www/chromium/files/patch-chrome_browser_extensions_external__provider__impl.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-chrome_browser_extensions_external__provider__impl.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-chrome_browser_extensions_external__provider__impl.cc (revision 497959)
@@ -1,20 +1,20 @@
---- chrome/browser/extensions/external_provider_impl.cc.orig 2018-11-19 19:55:03.000000000 +0100
-+++ chrome/browser/extensions/external_provider_impl.cc 2018-12-04 15:09:57.567637000 +0100
-@@ -711,7 +711,7 @@
+--- chrome/browser/extensions/external_provider_impl.cc.orig 2019-03-11 22:00:53 UTC
++++ chrome/browser/extensions/external_provider_impl.cc
+@@ -747,7 +747,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)
- if (!profile->IsLegacySupervised()) {
- provider_list->push_back(std::make_unique<ExternalProviderImpl>(
- service,
-@@ -739,7 +739,7 @@
+ provider_list->push_back(std::make_unique<ExternalProviderImpl>(
+ service,
+ new ExternalPrefLoader(chrome::DIR_STANDALONE_EXTERNAL_EXTENSIONS,
+@@ -774,7 +774,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<ExternalProviderImpl>(
service,
new ExternalPrefLoader(chrome::DIR_USER_EXTERNAL_EXTENSIONS,
Index: branches/2019Q2/www/chromium/files/patch-chrome_browser_extensions_install__signer.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-chrome_browser_extensions_install__signer.cc (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-chrome_browser_extensions_install__signer.cc (revision 497959)
@@ -0,0 +1,18 @@
+--- chrome/browser/extensions/install_signer.cc.orig 2019-03-17 20:14:24 UTC
++++ chrome/browser/extensions/install_signer.cc
+@@ -293,13 +293,13 @@ void LogRequestStartHistograms() {
+ DCHECK(g_single_thread_checker.Get().CalledOnValidThread());
+
+ // Process::Current().CreationTime is only defined on some platforms.
+-#if defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_LINUX)
++#if defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD)
+ const base::Time process_creation_time =
+ base::Process::Current().CreationTime();
+ UMA_HISTOGRAM_COUNTS_1M(
+ "ExtensionInstallSigner.UptimeAtTimeOfRequest",
+ (base::Time::Now() - process_creation_time).InSeconds());
+-#endif // defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_LINUX)
++#endif // defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD)
+
+ base::TimeDelta delta;
+ base::TimeTicks now = base::TimeTicks::Now();
Property changes on: branches/2019Q2/www/chromium/files/patch-chrome_browser_extensions_install__signer.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/2019Q2/www/chromium/files/patch-chrome_browser_first__run_first__run__internal__posix.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-chrome_browser_first__run_first__run__internal__posix.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-chrome_browser_first__run_first__run__internal__posix.cc (revision 497959)
@@ -1,20 +1,20 @@
---- chrome/browser/first_run/first_run_internal_posix.cc.orig 2018-02-24 16:25:09.000000000 +0100
-+++ chrome/browser/first_run/first_run_internal_posix.cc 2018-03-03 21:26:08.717035000 +0100
-@@ -34,7 +34,7 @@
- namespace internal {
- namespace {
+--- chrome/browser/first_run/first_run_internal_posix.cc.orig 2019-03-11 22:00:53 UTC
++++ chrome/browser/first_run/first_run_internal_posix.cc
+@@ -44,7 +44,7 @@ enum class ForcedShowDialogState {
+ ForcedShowDialogState g_forced_show_dialog_state =
+ ForcedShowDialogState::kNotForced;
-#if !defined(OS_CHROMEOS)
+#if !defined(OS_CHROMEOS) && !defined(OS_BSD)
// Returns whether the first run dialog should be shown. This is only true for
// certain builds, and only if the user has not already set preferences. In a
// real, official-build first run, initializes the default metrics reporting if
-@@ -80,7 +80,7 @@
- } // namespace
+@@ -95,7 +95,7 @@ void ForceFirstRunDialogShownForTesting(bool shown) {
+ }
void DoPostImportPlatformSpecificTasks(Profile* profile) {
-#if !defined(OS_CHROMEOS)
+#if !defined(OS_CHROMEOS) && !defined(OS_BSD)
if (!ShouldShowFirstRunDialog())
return;
Index: branches/2019Q2/www/chromium/files/patch-chrome_browser_flag__descriptions.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-chrome_browser_flag__descriptions.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-chrome_browser_flag__descriptions.cc (revision 497959)
@@ -1,34 +1,34 @@
---- chrome/browser/flag_descriptions.cc.orig 2018-12-12 22:56:03.000000000 +0100
-+++ chrome/browser/flag_descriptions.cc 2018-12-28 16:55:56.434650000 +0100
-@@ -3555,13 +3555,13 @@
+--- chrome/browser/flag_descriptions.cc.orig 2019-03-11 22:00:53 UTC
++++ chrome/browser/flag_descriptions.cc
+@@ -3656,13 +3656,13 @@ const char kWakeOnPacketsDescription[] =
// 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_MACOSX)
-@@ -3574,13 +3574,13 @@
+@@ -3675,13 +3675,13 @@ const char kAutomaticTabDiscardingDescription[] =
#endif // defined(OS_WIN) || defined(OS_MACOSX)
-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)
+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD)
const char kDirectManipulationStylusName[] = "Direct Manipulation Stylus";
const char kDirectManipulationStylusDescription[] =
"If enabled, Chrome will scroll web pages on stylus drag.";
-#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)
+#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD)
- const char kExperimentalUiName[] = "Use all upcoming UI features";
- const char kExperimentalUiDescription[] = "Use all upcoming UI features.";
+ #if defined(OS_MACOSX) || defined(OS_CHROMEOS)
+
Index: branches/2019Q2/www/chromium/files/patch-chrome_browser_flag__descriptions.h
===================================================================
--- branches/2019Q2/www/chromium/files/patch-chrome_browser_flag__descriptions.h (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-chrome_browser_flag__descriptions.h (revision 497959)
@@ -1,32 +1,32 @@
---- chrome/browser/flag_descriptions.h.orig 2018-12-12 22:56:03.000000000 +0100
-+++ chrome/browser/flag_descriptions.h 2018-12-28 16:55:56.425688000 +0100
-@@ -2167,12 +2167,12 @@
+--- chrome/browser/flag_descriptions.h.orig 2019-03-11 22:00:53 UTC
++++ chrome/browser/flag_descriptions.h
+@@ -2192,12 +2192,12 @@ extern const char kWakeOnPacketsDescription[];
// 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)
extern const char kExperimentalUiName[];
extern const char kExperimentalUiDescription[];
-@@ -2184,12 +2184,12 @@
+@@ -2209,12 +2209,12 @@ extern const char kAutomaticTabDiscardingDescription[]
#endif // defined(OS_WIN) || defined(OS_MACOSX)
-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)
+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD)
extern const char kDirectManipulationStylusName[];
extern const char kDirectManipulationStylusDescription[];
-#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)
+#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD)
- // Feature flags --------------------------------------------------------------
+ #if defined(OS_MACOSX) || defined(OS_CHROMEOS)
Index: branches/2019Q2/www/chromium/files/patch-chrome_browser_media__galleries_fileapi_mtp__device__map__service.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-chrome_browser_media__galleries_fileapi_mtp__device__map__service.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-chrome_browser_media__galleries_fileapi_mtp__device__map__service.cc (revision 497959)
@@ -1,15 +1,15 @@
---- chrome/browser/media_galleries/fileapi/mtp_device_map_service.cc.orig 2017-06-05 19:03:02 UTC
+--- chrome/browser/media_galleries/fileapi/mtp_device_map_service.cc.orig 2019-03-11 22:00:53 UTC
+++ chrome/browser/media_galleries/fileapi/mtp_device_map_service.cc
-@@ -37,10 +37,12 @@ void MTPDeviceMapService::RegisterMTPFileSystem(
+@@ -38,10 +38,12 @@ void MTPDeviceMapService::RegisterMTPFileSystem(
// Note that this initializes the delegate asynchronously, but since
// the delegate will only be used from the IO thread, it is guaranteed
// to be created before use of it expects it to be there.
+#if !defined(OS_FREEBSD)
CreateMTPDeviceAsyncDelegate(
device_location, read_only,
base::Bind(&MTPDeviceMapService::AddAsyncDelegate,
base::Unretained(this), device_location, read_only));
+#endif
mtp_device_usage_map_[key] = 0;
}
Index: branches/2019Q2/www/chromium/files/patch-chrome_browser_media__galleries_media__file__system__registry.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-chrome_browser_media__galleries_media__file__system__registry.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-chrome_browser_media__galleries_media__file__system__registry.cc (revision 497959)
@@ -1,14 +1,14 @@
---- chrome/browser/media_galleries/media_file_system_registry.cc.orig 2017-06-05 19:03:02 UTC
+--- chrome/browser/media_galleries/media_file_system_registry.cc.orig 2019-03-11 22:00:53 UTC
+++ chrome/browser/media_galleries/media_file_system_registry.cc
-@@ -758,7 +758,10 @@ class MediaFileSystemRegistry::MediaFileSystemContextI
+@@ -734,7 +734,10 @@ class MediaFileSystemRegistry::MediaFileSystemContextI
// Constructor in 'private' section because depends on private class definition.
MediaFileSystemRegistry::MediaFileSystemRegistry()
: file_system_context_(new MediaFileSystemContextImpl) {
- StorageMonitor::GetInstance()->AddObserver(this);
+ // This conditional is needed for shutdown. Destructors
+ // try to get the media file system registry.
+ if (StorageMonitor::GetInstance())
+ StorageMonitor::GetInstance()->AddObserver(this);
}
MediaFileSystemRegistry::~MediaFileSystemRegistry() {
Index: branches/2019Q2/www/chromium/files/patch-chrome_browser_media_router_discovery_discovery__network__list__posix.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-chrome_browser_media_router_discovery_discovery__network__list__posix.cc (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-chrome_browser_media_router_discovery_discovery__network__list__posix.cc (revision 497959)
@@ -0,0 +1,28 @@
+--- chrome/browser/media/router/discovery/discovery_network_list_posix.cc.orig 2019-03-11 22:00:53 UTC
++++ chrome/browser/media/router/discovery/discovery_network_list_posix.cc
+@@ -10,6 +10,7 @@
+ #include <netinet/in.h>
+ #include <sys/socket.h>
+ #include <sys/types.h>
++#include <sys/time.h>
+
+ #include <algorithm>
+
+@@ -19,7 +20,7 @@
+ #include "chrome/browser/media/router/discovery/discovery_network_list_wifi.h"
+ #include "net/base/net_errors.h"
+
+-#if !defined(OS_MACOSX)
++#if !defined(OS_MACOSX) && !defined(OS_BSD)
+ #include <netpacket/packet.h>
+ #else
+ #include <net/if_dl.h>
+@@ -28,7 +29,7 @@
+ namespace media_router {
+ namespace {
+
+-#if !defined(OS_MACOSX)
++#if !defined(OS_MACOSX) && !defined(OS_BSD)
+ using sll = struct sockaddr_ll;
+ #define SOCKET_ARP_TYPE(s) ((s)->sll_hatype)
+ #define SOCKET_ADDRESS_LEN(s) ((s)->sll_halen)
Property changes on: branches/2019Q2/www/chromium/files/patch-chrome_browser_media_router_discovery_discovery__network__list__posix.cc
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: branches/2019Q2/www/chromium/files/patch-chrome_browser_media_router_discovery_discovery__network__list__wifi__linux.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-chrome_browser_media_router_discovery_discovery__network__list__wifi__linux.cc (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-chrome_browser_media_router_discovery_discovery__network__list__wifi__linux.cc (revision 497959)
@@ -0,0 +1,27 @@
+--- chrome/browser/media/router/discovery/discovery_network_list_wifi_linux.cc.orig 2019-03-11 22:00:53 UTC
++++ chrome/browser/media/router/discovery/discovery_network_list_wifi_linux.cc
+@@ -9,8 +9,6 @@
+ #include <sys/socket.h>
+ #include <sys/types.h>
+
+-#include <linux/wireless.h>
+-
+ #include "base/files/scoped_file.h"
+ #include "base/logging.h"
+ #include "net/base/network_interfaces_linux.h"
+@@ -20,6 +18,7 @@ namespace media_router {
+ bool MaybeGetWifiSSID(const std::string& if_name, std::string* ssid_out) {
+ DCHECK(ssid_out);
+
++#if !defined(OS_BSD)
+ base::ScopedFD ioctl_socket(socket(AF_INET, SOCK_DGRAM, 0));
+ if (!ioctl_socket.is_valid()) {
+ // AF_INET is for IPv4, so it may fail for IPv6-only hosts even when there
+@@ -41,6 +40,7 @@ bool MaybeGetWifiSSID(const std::string& if_name, std:
+ ssid_out->assign(ssid);
+ return true;
+ }
++#endif
+ return false;
+ }
+
Property changes on: branches/2019Q2/www/chromium/files/patch-chrome_browser_media_router_discovery_discovery__network__list__wifi__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/2019Q2/www/chromium/files/patch-chrome_browser_media_router_providers_wired__display_wired__display__media__route__provider.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-chrome_browser_media_router_providers_wired__display_wired__display__media__route__provider.cc (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-chrome_browser_media_router_providers_wired__display_wired__display__media__route__provider.cc (revision 497959)
@@ -0,0 +1,23 @@
+--- chrome/browser/media/router/providers/wired_display/wired_display_media_route_provider.cc.orig 2019-03-11 22:00:53 UTC
++++ chrome/browser/media/router/providers/wired_display/wired_display_media_route_provider.cc
+@@ -111,6 +111,12 @@ void WiredDisplayMediaRouteProvider::CreateRoute(
+ bool incognito,
+ CreateRouteCallback callback) {
+ DCHECK(!base::ContainsKey(presentations_, presentation_id));
++#if defined(OS_BSD) // XXX
++ std::move(callback).Run(base::nullopt, nullptr,
++ std::string("Not implemented"),
++ RouteRequestResult::UNKNOWN_ERROR);
++ return;
++#else
+ base::Optional<Display> display = GetDisplayBySinkId(sink_id);
+ if (!display) {
+ std::move(callback).Run(base::nullopt, nullptr,
+@@ -137,6 +143,7 @@ void WiredDisplayMediaRouteProvider::CreateRoute(
+ std::move(callback).Run(route, nullptr, base::nullopt,
+ RouteRequestResult::OK);
+ NotifyRouteObservers();
++#endif
+ }
+
+ void WiredDisplayMediaRouteProvider::JoinRoute(
Property changes on: branches/2019Q2/www/chromium/files/patch-chrome_browser_media_router_providers_wired__display_wired__display__media__route__provider.cc
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: branches/2019Q2/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__event__log__uploader.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__event__log__uploader.cc (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__event__log__uploader.cc (revision 497959)
@@ -0,0 +1,11 @@
+--- chrome/browser/media/webrtc/webrtc_event_log_uploader.cc.orig 2019-03-11 22:00:53 UTC
++++ chrome/browser/media/webrtc/webrtc_event_log_uploader.cc
+@@ -36,7 +36,7 @@ constexpr size_t kExpectedMimeOverheadBytes = 1000; /
+ const char kProduct[] = "Chrome";
+ #elif defined(OS_MACOSX)
+ const char kProduct[] = "Chrome_Mac";
+-#elif defined(OS_LINUX)
++#elif defined(OS_LINUX) || defined(OS_BSD)
+ const char kProduct[] = "Chrome_Linux";
+ #elif defined(OS_ANDROID)
+ const char kProduct[] = "Chrome_Android";
Property changes on: branches/2019Q2/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__event__log__uploader.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/2019Q2/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__log__uploader.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__log__uploader.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__log__uploader.cc (revision 497959)
@@ -1,11 +1,11 @@
---- chrome/browser/media/webrtc/webrtc_log_uploader.cc.orig 2017-04-19 19:06:29 UTC
+--- chrome/browser/media/webrtc/webrtc_log_uploader.cc.orig 2019-03-11 22:00:53 UTC
+++ chrome/browser/media/webrtc/webrtc_log_uploader.cc
-@@ -343,6 +343,8 @@ void WebRtcLogUploader::SetupMultipart(
+@@ -391,6 +391,8 @@ void WebRtcLogUploader::SetupMultipart(
const char product[] = "Chrome_Android";
#elif defined(OS_CHROMEOS)
const char product[] = "Chrome_ChromeOS";
+#elif defined(OS_FREEBSD)
+ const char product[] = "Chrome_FreeBSD";
#else
#error Platform not supported.
#endif
Index: branches/2019Q2/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__logging__handler__host.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__logging__handler__host.cc (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__logging__handler__host.cc (revision 497959)
@@ -0,0 +1,33 @@
+--- chrome/browser/media/webrtc/webrtc_logging_handler_host.cc.orig 2019-03-17 20:01:28 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(
+ output_period_ms, 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
+ FROM_HERE, {BrowserThread::UI},
+ base::BindOnce(callback, filesystem_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<uint8_t[]> packet_header,
Property changes on: branches/2019Q2/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__logging__handler__host.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/2019Q2/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__logging__handler__host.h
===================================================================
--- branches/2019Q2/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__logging__handler__host.h (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__logging__handler__host.h (revision 497959)
@@ -0,0 +1,36 @@
+--- chrome/browser/media/webrtc/webrtc_logging_handler_host.h.orig 2019-03-17 20:00:30 UTC
++++ chrome/browser/media/webrtc/webrtc_logging_handler_host.h
+@@ -154,13 +154,13 @@ class WebRtcLoggingHandlerHost : public content::Brows
+ size_t web_app_id,
+ const StartEventLoggingCallback& callback);
+
+-#if defined(OS_LINUX) || defined(OS_CHROMEOS)
++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
+ // Ensures that the WebRTC Logs directory exists and then grants render
+ // process access to the 'WebRTC Logs' directory, and invokes |callback| with
+ // the ids necessary to create a DirectoryEntry object.
+ void GetLogsDirectory(const LogsDirectoryCallback& callback,
+ const LogsDirectoryErrorCallback& error_callback);
+-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS)
++#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
+
+ private:
+ friend class content::BrowserThread;
+@@ -227,7 +227,7 @@ class WebRtcLoggingHandlerHost : public content::Brows
+ bool success,
+ const std::string& error_message);
+
+-#if defined(OS_LINUX) || defined(OS_CHROMEOS)
++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
+ // Grants the render process access to the 'WebRTC Logs' directory, and
+ // invokes |callback| with the ids necessary to create a DirectoryEntry
+ // object. If the |logs_path| couldn't be created or found, |error_callback|
+@@ -236,7 +236,7 @@ class WebRtcLoggingHandlerHost : public content::Brows
+ const LogsDirectoryCallback& callback,
+ const LogsDirectoryErrorCallback& error_callback,
+ const base::FilePath& logs_path);
+-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS)
++#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
+
+ // The render process ID this object belongs to.
+ const int render_process_id_;
Property changes on: branches/2019Q2/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__logging__handler__host.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/2019Q2/www/chromium/files/patch-chrome_browser_memory__details.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-chrome_browser_memory__details.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-chrome_browser_memory__details.cc (revision 497959)
@@ -1,20 +1,20 @@
---- chrome/browser/memory_details.cc.orig 2018-08-01 00:08:30.000000000 +0200
-+++ chrome/browser/memory_details.cc 2018-08-04 14:30:27.145764000 +0200
-@@ -36,7 +36,7 @@
+--- chrome/browser/memory_details.cc.orig 2019-03-11 22:00:53 UTC
++++ chrome/browser/memory_details.cc
+@@ -38,7 +38,7 @@
#include "services/resource_coordinator/public/cpp/memory_instrumentation/memory_instrumentation.h"
#include "ui/base/l10n/l10n_util.h"
-#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID)
+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD)
#include "services/service_manager/zygote/zygote_host_linux.h"
#endif
-@@ -341,7 +341,7 @@
+@@ -336,7 +336,7 @@ void MemoryDetails::CollectChildInfoOnUIThread() {
process.titles.push_back(title);
}
-#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID)
+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD)
if (service_manager::ZygoteHost::GetInstance()->IsZygotePid(process.pid)) {
process.process_type = content::PROCESS_TYPE_ZYGOTE;
}
Index: branches/2019Q2/www/chromium/files/patch-chrome_browser_memory__details__linux.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-chrome_browser_memory__details__linux.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-chrome_browser_memory__details__linux.cc (revision 497959)
@@ -1,13 +1,13 @@
---- chrome/browser/memory_details_linux.cc.orig 2018-06-13 00:10:06.000000000 +0200
-+++ chrome/browser/memory_details_linux.cc 2018-07-20 00:12:53.799188000 +0200
-@@ -70,8 +70,10 @@
+--- chrome/browser/memory_details_linux.cc.orig 2019-03-11 22:00:53 UTC
++++ chrome/browser/memory_details_linux.cc
+@@ -72,8 +72,10 @@ ProcessData GetProcessDataMemoryInformation(
std::unique_ptr<base::ProcessMetrics> metrics(
base::ProcessMetrics::CreateProcessMetrics(pid));
+#if !defined(OS_BSD)
pmi.num_open_fds = metrics->GetOpenFdCount();
pmi.open_fds_soft_limit = metrics->GetOpenFdSoftLimit();
+#endif
process_data.processes.push_back(pmi);
}
Index: branches/2019Q2/www/chromium/files/patch-chrome_browser_metrics_bluetooth__available__utility.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-chrome_browser_metrics_bluetooth__available__utility.cc (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-chrome_browser_metrics_bluetooth__available__utility.cc (revision 497959)
@@ -0,0 +1,13 @@
+--- chrome/browser/metrics/bluetooth_available_utility.cc.orig 2019-03-11 22:00:53 UTC
++++ chrome/browser/metrics/bluetooth_available_utility.cc
+@@ -72,8 +72,10 @@ void ReportBluetoothAvailability() {
+ if (!device::BluetoothAdapterFactory::Get().IsBluetoothSupported())
+ ReportAvailability(BLUETOOTH_NOT_SUPPORTED);
+
++#if !defined(OS_BSD)
+ device::BluetoothAdapterFactory::Get().GetAdapter(
+ base::BindOnce(&OnGetAdapter));
++#endif
+ }
+
+ } // namespace bluetooth_utility
Property changes on: branches/2019Q2/www/chromium/files/patch-chrome_browser_metrics_bluetooth__available__utility.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/2019Q2/www/chromium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.cc (revision 497959)
@@ -1,21 +1,21 @@
---- chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc.orig 2017-09-05 21:05:13.000000000 +0200
-+++ chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc 2017-09-06 18:21:57.565534000 +0200
-@@ -40,7 +40,9 @@
+--- chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc.orig 2019-03-11 22:00:53 UTC
++++ chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc
+@@ -44,7 +44,9 @@
#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
#include <gnu/libc-version.h>
+#endif
+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
#include "base/linux_util.h"
#include "base/strings/string_split.h"
#include "base/strings/string_util.h"
-@@ -48,7 +50,7 @@
+@@ -52,7 +54,7 @@
#if defined(USE_X11)
#include "ui/base/x/x11_util.h"
#endif
-#endif // defined(OS_LINUX) && !defined(OS_CHROMEOS)
+#endif // defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
#if defined(USE_OZONE) || defined(USE_X11)
#include "ui/events/devices/input_device_event_observer.h"
Index: branches/2019Q2/www/chromium/files/patch-chrome_browser_net_system__network__context__manager.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-chrome_browser_net_system__network__context__manager.cc (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-chrome_browser_net_system__network__context__manager.cc (revision 497959)
@@ -0,0 +1,26 @@
+--- chrome/browser/net/system_network_context_manager.cc.orig 2019-03-11 22:00:53 UTC
++++ chrome/browser/net/system_network_context_manager.cc
+@@ -69,12 +69,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 {
+
+@@ -519,7 +519,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();
+
Property changes on: branches/2019Q2/www/chromium/files/patch-chrome_browser_net_system__network__context__manager.cc
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: branches/2019Q2/www/chromium/files/patch-chrome_browser_password__manager_chrome__password__manager__client.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-chrome_browser_password__manager_chrome__password__manager__client.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-chrome_browser_password__manager_chrome__password__manager__client.cc (revision 497959)
@@ -1,14 +1,14 @@
---- chrome/browser/password_manager/chrome_password_manager_client.cc.orig 2017-12-15 02:04:09.000000000 +0100
-+++ chrome/browser/password_manager/chrome_password_manager_client.cc 2017-12-24 01:39:48.763209000 +0100
-@@ -67,7 +67,11 @@
- #include "google_apis/gaia/gaia_urls.h"
- #include "net/base/url_util.h"
+--- chrome/browser/password_manager/chrome_password_manager_client.cc.orig 2019-03-11 22:00:53 UTC
++++ chrome/browser/password_manager/chrome_password_manager_client.cc
+@@ -80,7 +80,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 <re2/re2.h>
+#else
#include "third_party/re2/src/re2/re2.h"
+#endif
#include "url/url_constants.h"
#if defined(SAFE_BROWSING_DB_LOCAL)
Index: branches/2019Q2/www/chromium/files/patch-chrome_browser_password__manager_password__store__factory.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-chrome_browser_password__manager_password__store__factory.cc (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-chrome_browser_password__manager_password__store__factory.cc (revision 497959)
@@ -0,0 +1,11 @@
+--- chrome/browser/password_manager/password_store_factory.cc.orig 2019-03-11 22:00:53 UTC
++++ chrome/browser/password_manager/password_store_factory.cc
+@@ -300,7 +300,7 @@ PasswordStoreFactory::BuildServiceInstanceFor(
+ password_manager_util::RemoveUselessCredentials(ps, profile->GetPrefs(), 60,
+ network_context_getter);
+
+-#if defined(OS_WIN) || defined(OS_MACOSX) || \
++#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_BSD) || \
+ (defined(OS_LINUX) && !defined(OS_CHROMEOS))
+ std::unique_ptr<password_manager::PasswordStoreSigninNotifier> notifier =
+ std::make_unique<password_manager::PasswordStoreSigninNotifierImpl>(
Property changes on: branches/2019Q2/www/chromium/files/patch-chrome_browser_password__manager_password__store__factory.cc
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: branches/2019Q2/www/chromium/files/patch-chrome_browser_platform__util.h
===================================================================
--- branches/2019Q2/www/chromium/files/patch-chrome_browser_platform__util.h (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-chrome_browser_platform__util.h (revision 497959)
@@ -1,11 +1,11 @@
---- chrome/browser/platform_util.h.orig 2017-04-19 19:06:29 UTC
+--- chrome/browser/platform_util.h.orig 2019-03-11 22:00:53 UTC
+++ chrome/browser/platform_util.h
@@ -40,7 +40,7 @@ enum OpenOperationResult {
enum OpenItemType {
OPEN_FILE,
OPEN_FOLDER,
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
SHOW_ITEM_IN_FOLDER
#endif
};
Index: branches/2019Q2/www/chromium/files/patch-chrome_browser_plugins_plugins__resource__service.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-chrome_browser_plugins_plugins__resource__service.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-chrome_browser_plugins_plugins__resource__service.cc (revision 497959)
@@ -1,11 +1,11 @@
---- chrome/browser/plugins/plugins_resource_service.cc.orig 2017-06-05 19:03:02 UTC
+--- chrome/browser/plugins/plugins_resource_service.cc.orig 2019-03-11 22:00:53 UTC
+++ chrome/browser/plugins/plugins_resource_service.cc
-@@ -59,7 +59,7 @@ GURL GetPluginsServerURL() {
+@@ -63,7 +63,7 @@ GURL GetPluginsServerURL() {
filename = "plugins_win.json";
#elif defined(OS_CHROMEOS)
filename = "plugins_chromeos.json";
-#elif defined(OS_LINUX)
+#elif defined(OS_LINUX) || defined(OS_BSD)
filename = "plugins_linux.json";
#elif defined(OS_MACOSX)
filename = "plugins_mac.json";
Index: branches/2019Q2/www/chromium/files/patch-chrome_browser_policy_configuration__policy__handler__list__factory.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-chrome_browser_policy_configuration__policy__handler__list__factory.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-chrome_browser_policy_configuration__policy__handler__list__factory.cc (revision 497959)
@@ -1,20 +1,20 @@
---- chrome/browser/policy/configuration_policy_handler_list_factory.cc.orig 2019-02-06 22:23:27.096383000 +0100
-+++ chrome/browser/policy/configuration_policy_handler_list_factory.cc 2019-02-07 00:04:06.202061000 +0100
-@@ -104,7 +104,7 @@
+--- chrome/browser/policy/configuration_policy_handler_list_factory.cc.orig 2019-03-11 22:00:53 UTC
++++ chrome/browser/policy/configuration_policy_handler_list_factory.cc
+@@ -107,7 +107,7 @@
#include "chrome/browser/policy/browser_signin_policy_handler.h"
#endif
-#if defined(OS_WIN) || defined(OS_MACOSX) || \
+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_BSD) || \
(defined(OS_LINUX) && !defined(OS_CHROMEOS))
#include "chrome/browser/browser_switcher/browser_switcher_prefs.h"
#endif
-@@ -928,7 +928,7 @@
+@@ -939,7 +939,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
prefs::kEnterpriseHardwarePlatformAPIEnabled,
base::Value::Type::BOOLEAN },
-#if defined(OS_WIN) || defined(OS_MACOSX) || \
+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_BSD) || \
(defined(OS_LINUX) && !defined(OS_CHROMEOS))
{ key::kAlternativeBrowserPath,
browser_switcher::prefs::kAlternativeBrowserPath,
Index: branches/2019Q2/www/chromium/files/patch-chrome_browser_policy_machine__level__user__cloud__policy__controller.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-chrome_browser_policy_machine__level__user__cloud__policy__controller.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-chrome_browser_policy_machine__level__user__cloud__policy__controller.cc (revision 497959)
@@ -1,20 +1,20 @@
---- chrome/browser/policy/machine_level_user_cloud_policy_controller.cc.orig 2019-02-06 22:26:05.674129000 +0100
-+++ chrome/browser/policy/machine_level_user_cloud_policy_controller.cc 2019-02-06 22:26:54.109036000 +0100
-@@ -65,7 +65,7 @@
+--- chrome/browser/policy/machine_level_user_cloud_policy_controller.cc.orig 2019-03-11 22:00:53 UTC
++++ chrome/browser/policy/machine_level_user_cloud_policy_controller.cc
+@@ -65,7 +65,7 @@ bool IsMachineLevelUserCloudPolicyEnabled() {
#endif
}
-#if defined(OS_LINUX) || defined(OS_MACOSX)
+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD)
void CleanupUnusedPolicyDirectory() {
std::string enrollment_token =
BrowserDMTokenStorage::Get()->RetrieveEnrollmentToken();
-@@ -124,7 +124,7 @@
+@@ -124,7 +124,7 @@ MachineLevelUserCloudPolicyController::CreatePolicyMan
void MachineLevelUserCloudPolicyController::Init(
PrefService* local_state,
scoped_refptr<network::SharedURLLoaderFactory> url_loader_factory) {
-#if defined(OS_LINUX) || defined(OS_MACOSX)
+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD)
// This is a function that removes the directory we accidentally create due to
// crbug.com/880870. The directory is only removed when it's empty and
// enrollment token doesn't exist. This function is expected to be removed
Index: branches/2019Q2/www/chromium/files/patch-chrome_browser_policy_policy__prefs__browsertest.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-chrome_browser_policy_policy__prefs__browsertest.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-chrome_browser_policy_policy__prefs__browsertest.cc (revision 497959)
@@ -1,11 +1,11 @@
---- chrome/browser/policy/policy_prefs_browsertest.cc.orig 2017-06-05 19:03:02 UTC
+--- chrome/browser/policy/policy_prefs_browsertest.cc.orig 2019-03-11 22:00:53 UTC
+++ chrome/browser/policy/policy_prefs_browsertest.cc
-@@ -181,6 +181,8 @@ class PolicyTestCase {
+@@ -185,6 +185,8 @@ class PolicyTestCase {
const std::string os("chromeos");
#elif defined(OS_LINUX)
const std::string os("linux");
+#elif defined(OS_FREEBSD)
+ const std::string os("freebsd");
#else
#error "Unknown platform"
#endif
Index: branches/2019Q2/www/chromium/files/patch-chrome_browser_prefs_browser__prefs.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-chrome_browser_prefs_browser__prefs.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-chrome_browser_prefs_browser__prefs.cc (revision 497959)
@@ -1,20 +1,20 @@
---- chrome/browser/prefs/browser_prefs.cc.orig 2019-02-06 22:29:40.393569000 +0100
-+++ chrome/browser/prefs/browser_prefs.cc 2019-02-06 22:30:41.131808000 +0100
-@@ -313,7 +313,7 @@
+--- chrome/browser/prefs/browser_prefs.cc.orig 2019-03-11 22:00:53 UTC
++++ chrome/browser/prefs/browser_prefs.cc
+@@ -319,7 +319,7 @@
#include "chrome/browser/safe_browsing/settings_reset_prompt/settings_reset_prompt_prefs_manager.h"
#endif
-#if defined(OS_WIN) || defined(OS_MACOSX) || \
+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_BSD) || \
(defined(OS_LINUX) && !defined(OS_CHROMEOS))
#include "chrome/browser/browser_switcher/browser_switcher_prefs.h"
#endif
-@@ -764,7 +764,7 @@
+@@ -771,7 +771,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync
safe_browsing::PostCleanupSettingsResetter::RegisterProfilePrefs(registry);
#endif
-#if defined(OS_WIN) || defined(OS_MACOSX) || \
+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_BSD) || \
(defined(OS_LINUX) && !defined(OS_CHROMEOS))
- browser_switcher::prefs::RegisterProfilePrefs(registry);
+ browser_switcher::BrowserSwitcherPrefs::RegisterProfilePrefs(registry);
#endif
Index: branches/2019Q2/www/chromium/files/patch-chrome_browser_prefs_pref__service__incognito__whitelist.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-chrome_browser_prefs_pref__service__incognito__whitelist.cc (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-chrome_browser_prefs_pref__service__incognito__whitelist.cc (revision 497959)
@@ -0,0 +1,11 @@
+--- chrome/browser/prefs/pref_service_incognito_whitelist.cc.orig 2019-03-11 22:00:53 UTC
++++ chrome/browser/prefs/pref_service_incognito_whitelist.cc
+@@ -164,7 +164,7 @@ const char* const kPersistentPrefNames[] = {
+ prefs::kShowFullscreenToolbar,
+ #endif
+
+-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
++#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
+ // Toggleing custom frames affects all open windows in the profile, hence
+ // should be written to the regular profile when changed in incognito mode.
+ prefs::kUseCustomChromeFrame,
Property changes on: branches/2019Q2/www/chromium/files/patch-chrome_browser_prefs_pref__service__incognito__whitelist.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/2019Q2/www/chromium/files/patch-chrome_browser_process__singleton__posix.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-chrome_browser_process__singleton__posix.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-chrome_browser_process__singleton__posix.cc (revision 497959)
@@ -1,34 +1,34 @@
---- chrome/browser/process_singleton_posix.cc.orig 2017-06-05 19:03:02 UTC
+--- chrome/browser/process_singleton_posix.cc.orig 2019-03-11 22:00:53 UTC
+++ chrome/browser/process_singleton_posix.cc
@@ -93,11 +93,11 @@
#include "net/base/network_interfaces.h"
#include "ui/base/l10n/l10n_util.h"
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
#include "chrome/browser/ui/process_singleton_dialog_linux.h"
#endif
-#if defined(TOOLKIT_VIEWS) && defined(OS_LINUX) && !defined(OS_CHROMEOS)
+#if defined(TOOLKIT_VIEWS) && (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
#include "ui/views/linux_ui/linux_ui.h"
#endif
-@@ -322,7 +322,7 @@ bool DisplayProfileInUseError(const base::FilePath& lo
+@@ -325,7 +325,7 @@ bool DisplayProfileInUseError(const base::FilePath& lo
if (g_disable_prompt)
- return false;
+ return g_user_opted_unlock_in_use_profile;
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
base::string16 relaunch_button_text = l10n_util::GetStringUTF16(
IDS_PROFILE_IN_USE_LINUX_RELAUNCH);
return ShowProcessSingletonDialog(error, relaunch_button_text);
-@@ -866,7 +866,7 @@ ProcessSingleton::NotifyResult ProcessSingleton::Notif
- // The other process is shutting down, it's safe to start a new process.
+@@ -904,7 +904,7 @@ ProcessSingleton::NotifyResult ProcessSingleton::Notif
+ SendRemoteProcessInteractionResultHistogram(REMOTE_PROCESS_SHUTTING_DOWN);
return PROCESS_NONE;
- } else if (strncmp(buf, kACKToken, arraysize(kACKToken) - 1) == 0) {
+ } else if (strncmp(buf, kACKToken, base::size(kACKToken) - 1) == 0) {
-#if defined(TOOLKIT_VIEWS) && defined(OS_LINUX) && !defined(OS_CHROMEOS)
+#if defined(TOOLKIT_VIEWS) && (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
// Likely NULL in unit tests.
views::LinuxUI* linux_ui = views::LinuxUI::instance();
if (linux_ui)
Index: branches/2019Q2/www/chromium/files/patch-chrome_browser_profiles_chrome__browser__main__extra__parts__profiles.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-chrome_browser_profiles_chrome__browser__main__extra__parts__profiles.cc (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-chrome_browser_profiles_chrome__browser__main__extra__parts__profiles.cc (revision 497959)
@@ -0,0 +1,11 @@
+--- chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc.orig 2019-03-11 22:00:53 UTC
++++ chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
+@@ -326,7 +326,7 @@ void ChromeBrowserMainExtraPartsProfiles::
+ #if !defined(OS_ANDROID)
+ MediaGalleriesPreferencesFactory::GetInstance();
+ #endif
+-#if defined(OS_WIN) || defined(OS_MACOSX) || \
++#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_BSD) || \
+ (defined(OS_LINUX) && !defined(OS_CHROMEOS))
+ metrics::DesktopProfileSessionDurationsServiceFactory::GetInstance();
+ #endif
Property changes on: branches/2019Q2/www/chromium/files/patch-chrome_browser_profiles_chrome__browser__main__extra__parts__profiles.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/2019Q2/www/chromium/files/patch-chrome_browser_profiles_profile__attributes__entry.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-chrome_browser_profiles_profile__attributes__entry.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-chrome_browser_profiles_profile__attributes__entry.cc (revision 497959)
@@ -1,11 +1,11 @@
---- chrome/browser/profiles/profile_attributes_entry.cc.orig 2019-02-06 22:32:27.013965000 +0100
-+++ chrome/browser/profiles/profile_attributes_entry.cc 2019-02-06 22:32:49.969336000 +0100
-@@ -57,7 +57,7 @@
+--- chrome/browser/profiles/profile_attributes_entry.cc.orig 2019-03-11 22:00:53 UTC
++++ chrome/browser/profiles/profile_attributes_entry.cc
+@@ -57,7 +57,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/2019Q2/www/chromium/files/patch-chrome_browser_renderer__context__menu_render__view__context__menu.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-chrome_browser_renderer__context__menu_render__view__context__menu.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-chrome_browser_renderer__context__menu_render__view__context__menu.cc (revision 497959)
@@ -1,29 +1,29 @@
---- chrome/browser/renderer_context_menu/render_view_context_menu.cc.orig 2017-06-05 19:03:02 UTC
+--- chrome/browser/renderer_context_menu/render_view_context_menu.cc.orig 2019-03-11 22:00:53 UTC
+++ chrome/browser/renderer_context_menu/render_view_context_menu.cc
-@@ -1376,7 +1376,7 @@ void RenderViewContextMenu::AppendEditableItems() {
+@@ -1507,7 +1507,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,
-@@ -1414,7 +1414,7 @@ void RenderViewContextMenu::AppendLanguageSettings() {
+@@ -1549,7 +1549,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
-@@ -1648,7 +1648,7 @@ bool RenderViewContextMenu::IsCommandIdEnabled(int id)
+@@ -1823,7 +1823,7 @@ bool RenderViewContextMenu::IsCommandIdEnabled(int id)
case IDC_CHECK_SPELLING_WHILE_TYPING:
- return prefs->GetBoolean(spellcheck::prefs::kEnableSpellcheck);
+ 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/2019Q2/www/chromium/files/patch-chrome_browser_renderer__preferences__util.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-chrome_browser_renderer__preferences__util.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-chrome_browser_renderer__preferences__util.cc (revision 497959)
@@ -1,38 +1,29 @@
---- chrome/browser/renderer_preferences_util.cc.orig 2018-12-03 21:16:40.000000000 +0100
-+++ chrome/browser/renderer_preferences_util.cc 2018-12-05 15:36:58.307704000 +0100
-@@ -20,7 +20,7 @@
- #include "third_party/blink/public/public_buildflags.h"
- #include "third_party/skia/include/core/SkColor.h"
-
--#if defined(OS_LINUX) || defined(OS_ANDROID)
-+#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD)
- #include "ui/gfx/font_render_params.h"
- #endif
-
-@@ -32,7 +32,7 @@
+--- chrome/browser/renderer_preferences_util.cc.orig 2019-03-11 22:00:53 UTC
++++ chrome/browser/renderer_preferences_util.cc
+@@ -28,7 +28,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"
-@@ -131,7 +131,7 @@
+@@ -127,7 +127,7 @@ void UpdateFromSystemSettings(content::RendererPrefere
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()) {
-@@ -150,7 +150,7 @@
+@@ -146,7 +146,7 @@ void UpdateFromSystemSettings(content::RendererPrefere
}
#endif
-#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_WIN)
+#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_WIN) || defined(OS_BSD)
- static const base::NoDestructor<gfx::FontRenderParams> params(
- gfx::GetFontRenderParams(gfx::FontRenderParamsQuery(), nullptr));
- prefs->should_antialias_text = params->antialiasing;
+ content::UpdateFontRendererPreferencesFromSystemSettings(prefs);
+ #endif
+
Index: branches/2019Q2/www/chromium/files/patch-chrome_browser_resources_safe__browsing_gen__file__type__proto.py
===================================================================
--- branches/2019Q2/www/chromium/files/patch-chrome_browser_resources_safe__browsing_gen__file__type__proto.py (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-chrome_browser_resources_safe__browsing_gen__file__type__proto.py (revision 497959)
@@ -1,19 +1,19 @@
---- chrome/browser/resources/safe_browsing/gen_file_type_proto.py.orig 2017-06-05 19:03:02 UTC
+--- chrome/browser/resources/safe_browsing/gen_file_type_proto.py.orig 2019-03-11 22:00:54 UTC
+++ chrome/browser/resources/safe_browsing/gen_file_type_proto.py
@@ -31,6 +31,7 @@ def PlatformTypes():
"android": download_file_types_pb2.DownloadFileType.PLATFORM_ANDROID,
"chromeos": download_file_types_pb2.DownloadFileType.PLATFORM_CHROME_OS,
"linux": download_file_types_pb2.DownloadFileType.PLATFORM_LINUX,
+ "bsd": download_file_types_pb2.DownloadFileType.PLATFORM_LINUX,
"mac": download_file_types_pb2.DownloadFileType.PLATFORM_MAC,
"win": download_file_types_pb2.DownloadFileType.PLATFORM_WINDOWS,
}
@@ -169,7 +170,7 @@ class DownloadFileTypeProtoGenerator(BinaryProtoGenera
'Outfile must have a %d for version and %s for platform.')
parser.add_option('-t', '--type',
help='The platform type. One of android, chromeos, ' +
- 'linux, mac, win')
+ 'linux, bsd, mac, win')
def AddExtraCommandLineArgsForVirtualEnvRun(self, opts, command):
if opts.type is not None:
Index: branches/2019Q2/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__browser__proxy.js
===================================================================
--- branches/2019Q2/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__browser__proxy.js (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__browser__proxy.js (revision 497959)
@@ -0,0 +1,20 @@
+--- chrome/browser/resources/settings/appearance_page/appearance_browser_proxy.js.orig 2019-03-11 22:00:54 UTC
++++ chrome/browser/resources/settings/appearance_page/appearance_browser_proxy.js
+@@ -35,7 +35,7 @@ cr.define('settings', function() {
+
+ useDefaultTheme() {}
+
+- // <if expr="is_linux and not chromeos">
++ // <if expr="is_bsd and not chromeos">
+ useSystemTheme() {}
+
+ // </if>
+@@ -93,7 +93,7 @@ cr.define('settings', function() {
+ chrome.send('useDefaultTheme');
+ }
+
+- // <if expr="is_linux and not chromeos">
++ // <if expr="is_bsd and not chromeos">
+ /** @override */
+ useSystemTheme() {
+ chrome.send('useSystemTheme');
Property changes on: branches/2019Q2/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__browser__proxy.js
___________________________________________________________________
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/2019Q2/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.html
===================================================================
--- branches/2019Q2/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.html (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.html (revision 497959)
@@ -1,29 +1,29 @@
---- chrome/browser/resources/settings/appearance_page/appearance_page.html.orig 2018-06-13 00:10:07.000000000 +0200
-+++ chrome/browser/resources/settings/appearance_page/appearance_page.html 2018-07-15 13:34:27.093948000 +0200
-@@ -75,7 +75,7 @@
+--- chrome/browser/resources/settings/appearance_page/appearance_page.html.orig 2019-03-11 22:00:54 UTC
++++ chrome/browser/resources/settings/appearance_page/appearance_page.html
+@@ -65,7 +65,7 @@
hidden="[[!pageVisibility.setTheme]]"
label="$i18n{themes}" sub-label="[[themeSublabel_]]"
on-click="openThemeUrl_"></cr-link-row>
-<if expr="not is_linux or chromeos">
+<if expr="not is_posix or chromeos">
<template is="dom-if" if="[[prefs.extensions.theme.id.value]]">
<div class="separator"></div>
<paper-button id="useDefault" on-click="onUseDefaultTap_"
-@@ -84,7 +84,7 @@
+@@ -74,7 +74,7 @@
</paper-button>
</template>
</if>
-<if expr="is_linux and not chromeos">
+<if expr="is_posix and not chromeos">
<div class="settings-row continuation"
hidden="[[!showThemesSecondary_(
prefs.extensions.theme.id.value, useSystemTheme_)]]"
-@@ -149,7 +149,7 @@
+@@ -139,7 +139,7 @@
pref="{{prefs.bookmark_bar.show_on_all_tabs}}"
label="$i18n{showBookmarksBar}">
</settings-toggle-button>
-<if expr="is_linux and not chromeos">
+<if expr="is_posix and not chromeos">
<settings-toggle-button
class$="[[getFirst_(pageVisibility.bookmarksBar)]]"
pref="{{prefs.browser.custom_chrome_frame}}"
Index: branches/2019Q2/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.js
===================================================================
--- branches/2019Q2/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.js (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.js (revision 497959)
@@ -0,0 +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
+@@ -120,7 +120,7 @@ Polymer({
+ 'defaultFontSizeChanged_(prefs.webkit.webprefs.default_font_size.value)',
+ 'themeChanged_(prefs.extensions.theme.id.value, useSystemTheme_)',
+
+- // <if expr="is_linux and not chromeos">
++ // <if expr="is_bsd and not chromeos">
+ // NOTE: this pref only exists on Linux.
+ 'useSystemThemePrefChanged_(prefs.extensions.theme.use_system.value)',
+ // </if>
+@@ -223,7 +223,7 @@ Polymer({
+ this.browserProxy_.useDefaultTheme();
+ },
+
+- // <if expr="is_linux and not chromeos">
++ // <if expr="is_bsd and not chromeos">
+ /**
+ * @param {boolean} useSystemTheme
+ * @private
+@@ -292,10 +292,10 @@ Polymer({
+ }
+
+ let i18nId;
+- // <if expr="is_linux and not chromeos">
++ // <if expr="is_bsd and not chromeos">
+ i18nId = useSystemTheme ? 'systemTheme' : 'classicTheme';
+ // </if>
+- // <if expr="not is_linux or chromeos">
++ // <if expr="not is_bsd or chromeos">
+ i18nId = 'chooseFromWebStore';
+ // </if>
+ this.themeSublabel_ = this.i18n(i18nId);
Property changes on: branches/2019Q2/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.js
___________________________________________________________________
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/2019Q2/www/chromium/files/patch-chrome_browser_safe__browsing_incident__reporting_incident__handler__util.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-chrome_browser_safe__browsing_incident__reporting_incident__handler__util.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-chrome_browser_safe__browsing_incident__reporting_incident__handler__util.cc (revision 497959)
@@ -1,15 +1,15 @@
---- chrome/browser/safe_browsing/incident_reporting/incident_handler_util.cc.orig 2017-04-19 19:06:30 UTC
+--- chrome/browser/safe_browsing/incident_reporting/incident_handler_util.cc.orig 2019-03-11 22:00:54 UTC
+++ chrome/browser/safe_browsing/incident_reporting/incident_handler_util.cc
@@ -8,7 +8,12 @@
#include "base/hash.h"
#include "base/logging.h"
+//XXX(rene) needs shim headers?
+#if defined(USE_SYSTEM_PROTOBUF)
+#include <google/protobuf/message_lite.h>
+#else
#include "third_party/protobuf/src/google/protobuf/message_lite.h"
+#endif
namespace safe_browsing {
Index: branches/2019Q2/www/chromium/files/patch-chrome_browser_safe__browsing_incident__reporting_incident__reporting__service.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-chrome_browser_safe__browsing_incident__reporting_incident__reporting__service.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-chrome_browser_safe__browsing_incident__reporting_incident__reporting__service.cc (revision 497959)
@@ -1,11 +1,11 @@
---- chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc.orig 2019-01-30 02:17:47.000000000 +0100
-+++ chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc 2019-01-31 22:32:06.707636000 +0100
-@@ -715,7 +715,7 @@
+--- chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc.orig 2019-03-11 22:00:54 UTC
++++ chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc
+@@ -715,7 +715,7 @@ void IncidentReportingService::OnEnvironmentDataCollec
environment_collection_pending_ = false;
// Process::Current().CreationTime() is missing on some platforms.
-#if defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_LINUX)
+#if defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD)
base::TimeDelta uptime =
first_incident_time_ - base::Process::Current().CreationTime();
environment_data->mutable_process()->set_uptime_msec(uptime.InMilliseconds());
Index: branches/2019Q2/www/chromium/files/patch-chrome_browser_search_local__files__ntp__source.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-chrome_browser_search_local__files__ntp__source.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-chrome_browser_search_local__files__ntp__source.cc (revision 497959)
@@ -1,16 +1,16 @@
---- chrome/browser/search/local_files_ntp_source.cc.orig 2017-04-19 19:06:30 UTC
+--- chrome/browser/search/local_files_ntp_source.cc.orig 2019-03-11 22:00:54 UTC
+++ chrome/browser/search/local_files_ntp_source.cc
@@ -20,8 +20,13 @@
#include "build/build_config.h"
#include "chrome/common/url_constants.h"
#include "content/public/browser/url_data_source.h"
+#if defined(OS_BSD)
+#include <re2/re2.h>
+#include <re2/stringpiece.h>
+#else
#include "third_party/re2/src/re2/re2.h"
#include "third_party/re2/src/re2/stringpiece.h"
+#endif
namespace {
Index: branches/2019Q2/www/chromium/files/patch-chrome_browser_signin_signin__util.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-chrome_browser_signin_signin__util.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-chrome_browser_signin_signin__util.cc (revision 497959)
@@ -1,11 +1,11 @@
---- chrome/browser/signin/signin_util.cc.orig 2019-02-06 22:35:27.697597000 +0100
-+++ chrome/browser/signin/signin_util.cc 2019-02-06 22:35:53.931412000 +0100
-@@ -40,7 +40,7 @@
+--- chrome/browser/signin/signin_util.cc.orig 2019-03-11 22:00:54 UTC
++++ chrome/browser/signin/signin_util.cc
+@@ -42,7 +42,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/2019Q2/www/chromium/files/patch-chrome_browser_ssl_ssl__error__controller__client.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-chrome_browser_ssl_ssl__error__controller__client.cc (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-chrome_browser_ssl_ssl__error__controller__client.cc (revision 497959)
@@ -0,0 +1,20 @@
+--- chrome/browser/ssl/ssl_error_controller_client.cc.orig 2019-03-11 22:00:54 UTC
++++ chrome/browser/ssl/ssl_error_controller_client.cc
+@@ -78,7 +78,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;
+@@ -219,7 +219,7 @@ void SSLErrorControllerClient::Proceed() {
+
+ bool SSLErrorControllerClient::CanLaunchDateAndTimeSettings() {
+ #if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_MACOSX) || \
+- defined(OS_WIN)
++ defined(OS_WIN) || defined(OS_BSD)
+ return true;
+ #else
+ return false;
Property changes on: branches/2019Q2/www/chromium/files/patch-chrome_browser_ssl_ssl__error__controller__client.cc
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: branches/2019Q2/www/chromium/files/patch-chrome_browser_sync_chrome__sync__client.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-chrome_browser_sync_chrome__sync__client.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-chrome_browser_sync_chrome__sync__client.cc (revision 497959)
@@ -1,20 +1,20 @@
---- chrome/browser/sync/chrome_sync_client.cc.orig 2017-12-15 02:04:10.000000000 +0100
-+++ chrome/browser/sync/chrome_sync_client.cc 2017-12-24 02:09:05.300500000 +0100
-@@ -668,7 +668,7 @@
+--- chrome/browser/sync/chrome_sync_client.cc.orig 2019-03-11 22:00:54 UTC
++++ chrome/browser/sync/chrome_sync_client.cc
+@@ -428,7 +428,7 @@ ChromeSyncClient::CreateDataTypeControllers(syncer::Sy
}
#endif // BUILDFLAG(ENABLE_APP_LIST)
-#if defined(OS_LINUX) || defined(OS_WIN)
+#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_BSD)
// Dictionary sync is enabled by default.
if (!disabled_types.Has(syncer::DICTIONARY)) {
- sync_service->RegisterDataTypeController(
-@@ -676,7 +676,7 @@
- syncer::DICTIONARY, error_callback, this, syncer::GROUP_UI,
- BrowserThread::GetTaskRunnerForThread(BrowserThread::UI)));
+ if (base::FeatureList::IsEnabled(switches::kSyncPseudoUSSDictionary)) {
+@@ -444,7 +444,7 @@ ChromeSyncClient::CreateDataTypeControllers(syncer::Sy
+ base::CreateSingleThreadTaskRunnerWithTraits({BrowserThread::UI})));
+ }
}
-#endif // defined(OS_LINUX) || defined(OS_WIN)
+#endif // defined(OS_LINUX) || defined(OS_WIN) || defined(OS_BSD)
- #if BUILDFLAG(ENABLE_SUPERVISED_USERS)
- sync_service->RegisterDataTypeController(
+ #if defined(OS_CHROMEOS)
+ if (arc::IsArcAllowedForProfile(profile_) &&
Index: branches/2019Q2/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group.cc (revision 497959)
@@ -1,56 +1,56 @@
---- chrome/browser/task_manager/sampling/task_group.cc.orig 2018-02-24 16:25:10.000000000 +0100
-+++ chrome/browser/task_manager/sampling/task_group.cc 2018-03-03 21:46:29.318291000 +0100
-@@ -29,9 +29,9 @@
+--- chrome/browser/task_manager/sampling/task_group.cc.orig 2019-03-11 22:00:54 UTC
++++ chrome/browser/task_manager/sampling/task_group.cc
+@@ -33,9 +33,9 @@ const int kBackgroundRefreshTypesMask =
#if defined(OS_WIN)
REFRESH_TYPE_START_TIME | REFRESH_TYPE_CPU_TIME |
#endif // defined(OS_WIN)
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
+-#if defined(OS_LINUX) || defined(OS_MACOSX)
++#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD)
REFRESH_TYPE_FD_COUNT |
--#endif // defined(OS_LINUX)
-+#endif // defined(OS_LINUX) || defined(OS_BSD)
+-#endif // defined(OS_LINUX) || defined(OS_MACOSX)
++#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD)
#if BUILDFLAG(ENABLE_NACL)
REFRESH_TYPE_NACL |
#endif // BUILDFLAG(ENABLE_NACL)
-@@ -105,9 +105,9 @@
+@@ -112,9 +112,9 @@ TaskGroup::TaskGroup(
#if BUILDFLAG(ENABLE_NACL)
nacl_debug_stub_port_(nacl::kGdbDebugStubPortUnknown),
#endif // BUILDFLAG(ENABLE_NACL)
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
+-#if defined(OS_LINUX) || defined(OS_MACOSX)
++#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD)
open_fd_count_(-1),
--#endif // defined(OS_LINUX)
-+#endif // defined(OS_LINUX) || defined(OS_BSD)
+-#endif // defined(OS_LINUX) || defined(OS_MACOSX)
++#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD)
idle_wakeups_per_second_(-1),
gpu_memory_has_duplicates_(false),
is_backgrounded_(false),
-@@ -121,10 +121,10 @@
+@@ -128,10 +128,10 @@ TaskGroup::TaskGroup(
weak_ptr_factory_.GetWeakPtr()),
base::Bind(&TaskGroup::OnIdleWakeupsRefreshDone,
weak_ptr_factory_.GetWeakPtr()),
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
+-#if defined(OS_LINUX) || defined(OS_MACOSX)
++#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD)
base::Bind(&TaskGroup::OnOpenFdCountRefreshDone,
weak_ptr_factory_.GetWeakPtr()),
--#endif // defined(OS_LINUX)
-+#endif // defined(OS_LINUX) || defined(OS_BSD)
+-#endif // defined(OS_LINUX) || defined(OS_MACOSX)
++#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD)
base::Bind(&TaskGroup::OnProcessPriorityDone,
weak_ptr_factory_.GetWeakPtr()));
-@@ -284,14 +284,14 @@
+@@ -296,14 +296,14 @@ void TaskGroup::OnRefreshNaClDebugStubPortDone(int nac
}
#endif // BUILDFLAG(ENABLE_NACL)
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
+-#if defined(OS_LINUX) || defined(OS_MACOSX)
++#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD)
void TaskGroup::OnOpenFdCountRefreshDone(int open_fd_count) {
DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
open_fd_count_ = open_fd_count;
OnBackgroundRefreshTypeFinished(REFRESH_TYPE_FD_COUNT);
}
--#endif // defined(OS_LINUX)
-+#endif // defined(OS_LINUX) || defined(OS_BSD)
+-#endif // defined(OS_LINUX) || defined(OS_MACOSX)
++#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD)
void TaskGroup::OnCpuRefreshDone(double cpu_usage) {
DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
Index: branches/2019Q2/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group.h
===================================================================
--- branches/2019Q2/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group.h (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group.h (revision 497959)
@@ -1,39 +1,39 @@
---- chrome/browser/task_manager/sampling/task_group.h.orig 2018-02-24 16:25:10.000000000 +0100
-+++ chrome/browser/task_manager/sampling/task_group.h 2018-03-03 21:51:35.928601000 +0100
-@@ -106,9 +106,9 @@
+--- chrome/browser/task_manager/sampling/task_group.h.orig 2019-03-11 22:00:54 UTC
++++ chrome/browser/task_manager/sampling/task_group.h
+@@ -106,9 +106,9 @@ class TaskGroup {
int nacl_debug_stub_port() const { return nacl_debug_stub_port_; }
#endif // BUILDFLAG(ENABLE_NACL)
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
+-#if defined(OS_LINUX) || defined(OS_MACOSX)
++#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD)
int open_fd_count() const { return open_fd_count_; }
--#endif // defined(OS_LINUX)
-+#endif // defined(OS_LINUX) || defined(OS_BSD)
+-#endif // defined(OS_LINUX) || defined(OS_MACOSX)
++#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD)
int idle_wakeups_per_second() const { return idle_wakeups_per_second_; }
-
-@@ -122,9 +122,9 @@
+ private:
+@@ -121,9 +121,9 @@ class TaskGroup {
void RefreshNaClDebugStubPort(int child_process_unique_id);
void OnRefreshNaClDebugStubPortDone(int port);
#endif
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
+-#if defined(OS_LINUX) || defined(OS_MACOSX)
++#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD)
void OnOpenFdCountRefreshDone(int open_fd_count);
--#endif // defined(OS_LINUX)
-+#endif // defined(OS_LINUX) || defined(OS_BSD)
+-#endif // defined(OS_LINUX) || defined(OS_MACOSX)
++#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD)
void OnCpuRefreshDone(double cpu_usage);
- void OnMemoryUsageRefreshDone(MemoryUsageStats memory_usage);
-@@ -184,10 +184,10 @@
+ void OnSwappedMemRefreshDone(int64_t swapped_mem_bytes);
+@@ -191,10 +191,10 @@ class TaskGroup {
#if BUILDFLAG(ENABLE_NACL)
int nacl_debug_stub_port_;
#endif // BUILDFLAG(ENABLE_NACL)
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
+-#if defined(OS_LINUX) || defined(OS_MACOSX)
++#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD)
// The number of file descriptors currently open by the process.
int open_fd_count_;
--#endif // defined(OS_LINUX)
-+#endif // defined(OS_LINUX) || defined(OS_BSD)
+-#endif // defined(OS_LINUX) || defined(OS_MACOSX)
++#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD)
int idle_wakeups_per_second_;
bool gpu_memory_has_duplicates_;
bool is_backgrounded_;
Index: branches/2019Q2/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group__sampler.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group__sampler.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group__sampler.cc (revision 497959)
@@ -1,72 +1,72 @@
---- chrome/browser/task_manager/sampling/task_group_sampler.cc.orig 2019-01-30 02:17:47.000000000 +0100
-+++ chrome/browser/task_manager/sampling/task_group_sampler.cc 2019-02-06 22:39:09.250640000 +0100
-@@ -42,9 +42,9 @@
+--- chrome/browser/task_manager/sampling/task_group_sampler.cc.orig 2019-03-11 22:00:54 UTC
++++ chrome/browser/task_manager/sampling/task_group_sampler.cc
+@@ -42,9 +42,9 @@ TaskGroupSampler::TaskGroupSampler(
const OnCpuRefreshCallback& on_cpu_refresh,
const OnSwappedMemRefreshCallback& on_swapped_mem_refresh,
const OnIdleWakeupsCallback& on_idle_wakeups,
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
+-#if defined(OS_LINUX) || defined(OS_MACOSX)
++#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD)
const OnOpenFdCountCallback& on_open_fd_count,
--#endif // defined(OS_LINUX)
-+#endif // defined(OS_LINUX) || defined(OS_BSD)
+-#endif // defined(OS_LINUX) || defined(OS_MACOSX)
++#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD)
const OnProcessPriorityCallback& on_process_priority)
: process_(std::move(process)),
process_metrics_(CreateProcessMetrics(process_.Handle())),
-@@ -52,9 +52,9 @@
+@@ -52,9 +52,9 @@ TaskGroupSampler::TaskGroupSampler(
on_cpu_refresh_callback_(on_cpu_refresh),
on_swapped_mem_refresh_callback_(on_swapped_mem_refresh),
on_idle_wakeups_callback_(on_idle_wakeups),
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
+-#if defined(OS_LINUX) || defined(OS_MACOSX)
++#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD)
on_open_fd_count_callback_(on_open_fd_count),
--#endif // defined(OS_LINUX)
-+#endif // defined(OS_LINUX) || defined(OS_BSD)
+-#endif // defined(OS_LINUX) || defined(OS_MACOSX)
++#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD)
on_process_priority_callback_(on_process_priority) {
DCHECK(blocking_pool_runner.get());
-@@ -85,7 +85,7 @@
+@@ -85,7 +85,7 @@ void TaskGroupSampler::Refresh(int64_t refresh_flags)
on_swapped_mem_refresh_callback_);
}
-#if defined(OS_MACOSX) || defined(OS_LINUX)
+#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD)
if (TaskManagerObserver::IsResourceRefreshEnabled(REFRESH_TYPE_IDLE_WAKEUPS,
refresh_flags)) {
base::PostTaskAndReplyWithResult(
-@@ -94,9 +94,9 @@
+@@ -94,9 +94,9 @@ void TaskGroupSampler::Refresh(int64_t refresh_flags)
base::Bind(&TaskGroupSampler::RefreshIdleWakeupsPerSecond, this),
on_idle_wakeups_callback_);
}
-#endif // defined(OS_MACOSX) || defined(OS_LINUX)
+#endif // defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD)
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
+-#if defined(OS_LINUX) || defined(OS_MACOSX)
++#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD)
if (TaskManagerObserver::IsResourceRefreshEnabled(REFRESH_TYPE_FD_COUNT,
refresh_flags)) {
base::PostTaskAndReplyWithResult(
-@@ -105,7 +105,7 @@
+@@ -105,7 +105,7 @@ void TaskGroupSampler::Refresh(int64_t refresh_flags)
base::Bind(&TaskGroupSampler::RefreshOpenFdCount, this),
on_open_fd_count_callback_);
}
--#endif // defined(OS_LINUX)
-+#endif // defined(OS_LINUX) || defined(OS_BSD)
+-#endif // defined(OS_LINUX) || defined(OS_MACOSX)
++#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD)
if (TaskManagerObserver::IsResourceRefreshEnabled(REFRESH_TYPE_PRIORITY,
refresh_flags)) {
-@@ -144,13 +144,13 @@
+@@ -144,13 +144,13 @@ int TaskGroupSampler::RefreshIdleWakeupsPerSecond() {
return process_metrics_->GetIdleWakeupsPerSecond();
}
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
+-#if defined(OS_LINUX) || defined(OS_MACOSX)
++#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD)
int TaskGroupSampler::RefreshOpenFdCount() {
DCHECK(worker_pool_sequenced_checker_.CalledOnValidSequence());
return process_metrics_->GetOpenFdCount();
}
--#endif // defined(OS_LINUX)
-+#endif // defined(OS_LINUX) || defined(OS_BSD)
+-#endif // defined(OS_LINUX) || defined(OS_MACOSX)
++#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD)
bool TaskGroupSampler::RefreshProcessPriority() {
DCHECK(worker_pool_sequenced_checker_.CalledOnValidSequence());
Index: branches/2019Q2/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group__sampler.h
===================================================================
--- branches/2019Q2/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group__sampler.h (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group__sampler.h (revision 497959)
@@ -1,50 +1,50 @@
---- chrome/browser/task_manager/sampling/task_group_sampler.h.orig 2017-06-05 19:03:03 UTC
+--- chrome/browser/task_manager/sampling/task_group_sampler.h.orig 2019-03-11 22:00:54 UTC
+++ chrome/browser/task_manager/sampling/task_group_sampler.h
-@@ -45,9 +45,9 @@ class TaskGroupSampler : public base::RefCountedThread
+@@ -32,9 +32,9 @@ class TaskGroupSampler : public base::RefCountedThread
using OnCpuRefreshCallback = base::Callback<void(double)>;
- using OnMemoryRefreshCallback = base::Callback<void(MemoryUsageStats)>;
+ using OnSwappedMemRefreshCallback = base::Callback<void(int64_t)>;
using OnIdleWakeupsCallback = base::Callback<void(int)>;
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
+-#if defined(OS_LINUX) || defined(OS_MACOSX)
++#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD)
using OnOpenFdCountCallback = base::Callback<void(int)>;
--#endif // defined(OS_LINUX)
-+#endif // defined(OS_LINUX) || defined(OS_BSD)
+-#endif // defined(OS_LINUX) || defined(OS_MACOSX)
++#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD)
using OnProcessPriorityCallback = base::Callback<void(bool)>;
TaskGroupSampler(
-@@ -56,9 +56,9 @@ class TaskGroupSampler : public base::RefCountedThread
+@@ -43,9 +43,9 @@ class TaskGroupSampler : public base::RefCountedThread
const OnCpuRefreshCallback& on_cpu_refresh,
- const OnMemoryRefreshCallback& on_memory_refresh,
+ const OnSwappedMemRefreshCallback& on_memory_refresh,
const OnIdleWakeupsCallback& on_idle_wakeups,
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
+-#if defined(OS_LINUX) || defined(OS_MACOSX)
++#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD)
const OnOpenFdCountCallback& on_open_fd_count,
--#endif // defined(OS_LINUX)
-+#endif // defined(OS_LINUX) || defined(OS_BSD)
+-#endif // defined(OS_LINUX) || defined(OS_MACOSX)
++#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD)
const OnProcessPriorityCallback& on_process_priority);
// Refreshes the expensive process' stats (CPU usage, memory usage, and idle
-@@ -73,9 +73,9 @@ class TaskGroupSampler : public base::RefCountedThread
+@@ -60,9 +60,9 @@ class TaskGroupSampler : public base::RefCountedThread
double RefreshCpuUsage();
- MemoryUsageStats RefreshMemoryUsage();
+ int64_t RefreshSwappedMem();
int RefreshIdleWakeupsPerSecond();
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
+-#if defined(OS_LINUX) || defined(OS_MACOSX)
++#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD)
int RefreshOpenFdCount();
--#endif // defined(OS_LINUX)
-+#endif // defined(OS_LINUX) || defined(OS_BSD)
+-#endif // defined(OS_LINUX) || defined(OS_MACOSX)
++#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD)
bool RefreshProcessPriority();
// The process that holds the handle that we own so that we can use it for
-@@ -93,9 +93,9 @@ class TaskGroupSampler : public base::RefCountedThread
+@@ -80,9 +80,9 @@ class TaskGroupSampler : public base::RefCountedThread
const OnCpuRefreshCallback on_cpu_refresh_callback_;
- const OnMemoryRefreshCallback on_memory_refresh_callback_;
+ const OnSwappedMemRefreshCallback on_swapped_mem_refresh_callback_;
const OnIdleWakeupsCallback on_idle_wakeups_callback_;
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
+-#if defined(OS_LINUX) || defined(OS_MACOSX)
++#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD)
const OnOpenFdCountCallback on_open_fd_count_callback_;
--#endif // defined(OS_LINUX)
-+#endif // defined(OS_LINUX) || defined(OS_BSD)
+-#endif // defined(OS_LINUX) || defined(OS_MACOSX)
++#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD)
const OnProcessPriorityCallback on_process_priority_callback_;
// To assert we're running on the correct thread.
Index: branches/2019Q2/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__manager__impl.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__manager__impl.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__manager__impl.cc (revision 497959)
@@ -1,16 +1,16 @@
---- chrome/browser/task_manager/sampling/task_manager_impl.cc.orig 2017-06-05 19:03:03 UTC
+--- chrome/browser/task_manager/sampling/task_manager_impl.cc.orig 2019-03-11 22:00:54 UTC
+++ chrome/browser/task_manager/sampling/task_manager_impl.cc
-@@ -180,11 +180,11 @@ void TaskManagerImpl::GetUSERHandles(TaskId task_id,
+@@ -207,11 +207,11 @@ void TaskManagerImpl::GetUSERHandles(TaskId task_id,
}
int TaskManagerImpl::GetOpenFdCount(TaskId task_id) const {
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
+-#if defined(OS_LINUX) || defined(OS_MACOSX)
++#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD)
return GetTaskGroupByTaskId(task_id)->open_fd_count();
#else
return -1;
--#endif // defined(OS_LINUX)
-+#endif // defined(OS_LINUX) || defined(OS_BSD)
+-#endif // defined(OS_LINUX) || defined(OS_MACOSX)
++#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD)
}
bool TaskManagerImpl::IsTaskOnBackgroundedProcess(TaskId task_id) const {
Index: branches/2019Q2/www/chromium/files/patch-chrome_browser_task__manager_task__manager__observer.h
===================================================================
--- branches/2019Q2/www/chromium/files/patch-chrome_browser_task__manager_task__manager__observer.h (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-chrome_browser_task__manager_task__manager__observer.h (revision 497959)
@@ -1,16 +1,16 @@
---- chrome/browser/task_manager/task_manager_observer.h.orig 2017-04-19 19:06:30 UTC
+--- chrome/browser/task_manager/task_manager_observer.h.orig 2019-03-11 22:00:54 UTC
+++ chrome/browser/task_manager/task_manager_observer.h
-@@ -42,11 +42,11 @@ enum RefreshType {
+@@ -43,11 +43,11 @@ enum RefreshType {
// or backgrounded.
REFRESH_TYPE_PRIORITY = 1 << 13,
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
+-#if defined(OS_LINUX) || defined(OS_MACOSX)
++#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD)
// For observers interested in getting the number of open file descriptors of
// processes.
REFRESH_TYPE_FD_COUNT = 1 << 14,
--#endif // defined(OS_LINUX)
-+#endif // defined(OS_LINUX) || defined(OS_BSD)
+-#endif // defined(OS_LINUX) || defined(OS_MACOSX)
++#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD)
- REFRESH_TYPE_MEMORY_STATE = 1 << 15,
- REFRESH_TYPE_KEEPALIVE_COUNT = 1 << 16,
+ REFRESH_TYPE_KEEPALIVE_COUNT = 1 << 15,
+ REFRESH_TYPE_MEMORY_FOOTPRINT = 1 << 16,
Index: branches/2019Q2/www/chromium/files/patch-chrome_browser_tracing_crash__service__uploader.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-chrome_browser_tracing_crash__service__uploader.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-chrome_browser_tracing_crash__service__uploader.cc (revision 497959)
@@ -1,11 +1,11 @@
---- chrome/browser/tracing/crash_service_uploader.cc.orig 2018-08-01 00:08:32.000000000 +0200
-+++ chrome/browser/tracing/crash_service_uploader.cc 2018-08-04 14:37:55.834228000 +0200
-@@ -158,6 +158,8 @@
+--- chrome/browser/tracing/crash_service_uploader.cc.orig 2019-03-11 22:00:54 UTC
++++ chrome/browser/tracing/crash_service_uploader.cc
+@@ -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/2019Q2/www/chromium/files/patch-chrome_browser_ui_browser__command__controller.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-chrome_browser_ui_browser__command__controller.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-chrome_browser_ui_browser__command__controller.cc (revision 497959)
@@ -1,38 +1,38 @@
---- chrome/browser/ui/browser_command_controller.cc.orig 2018-02-24 16:25:10.000000000 +0100
-+++ chrome/browser/ui/browser_command_controller.cc 2018-03-03 21:58:39.480640000 +0100
-@@ -83,7 +83,7 @@
- #include "ui/base/clipboard/clipboard_types.h"
+--- chrome/browser/ui/browser_command_controller.cc.orig 2019-03-11 22:00:54 UTC
++++ chrome/browser/ui/browser_command_controller.cc
+@@ -79,7 +79,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 @@
+@@ -216,7 +216,7 @@ bool BrowserCommandController::IsReservedCommandOrKey(
#endif
}
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
// If this key was registered by the user as a content editing hotkey, then
// it is not reserved.
ui::TextEditKeyBindingsDelegateAuraLinux* delegate =
-@@ -425,7 +425,7 @@
+@@ -421,7 +421,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;
-@@ -853,7 +853,7 @@
+@@ -860,7 +860,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/2019Q2/www/chromium/files/patch-chrome_browser_ui_browser__view__prefs.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-chrome_browser_ui_browser__view__prefs.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-chrome_browser_ui_browser__view__prefs.cc (revision 497959)
@@ -1,20 +1,20 @@
---- chrome/browser/ui/browser_view_prefs.cc.orig 2018-12-30 03:14:18.095305000 +0100
-+++ chrome/browser/ui/browser_view_prefs.cc 2018-12-30 03:14:37.732345000 +0100
-@@ -34,7 +34,7 @@
+--- chrome/browser/ui/browser_view_prefs.cc.orig 2019-03-11 22:00:54 UTC
++++ chrome/browser/ui/browser_view_prefs.cc
+@@ -34,7 +34,7 @@ void RegisterBrowserViewLocalPrefs(PrefRegistrySimple*
void RegisterBrowserViewProfilePrefs(
user_prefs::PrefRegistrySyncable* registry) {
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
bool custom_frame_pref_default = false;
#if defined(USE_X11)
custom_frame_pref_default = ui::GetCustomFramePrefDefault();
-@@ -45,7 +45,7 @@
+@@ -45,7 +45,7 @@ void RegisterBrowserViewProfilePrefs(
#endif
registry->RegisterBooleanPref(prefs::kUseCustomChromeFrame,
custom_frame_pref_default);
-#endif // OS_LINUX && !OS_CHROMEOS
+#endif // (OS_LINUX && !OS_CHROMEOS) || defined(OS_BSD)
}
void MigrateBrowserTabStripPrefs(PrefService* prefs) {
Index: branches/2019Q2/www/chromium/files/patch-chrome_browser_ui_browser__window.h
===================================================================
--- branches/2019Q2/www/chromium/files/patch-chrome_browser_ui_browser__window.h (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-chrome_browser_ui_browser__window.h (revision 497959)
@@ -1,11 +1,11 @@
---- chrome/browser/ui/browser_window.h.orig 2018-12-12 22:56:03.000000000 +0100
-+++ chrome/browser/ui/browser_window.h 2018-12-16 14:18:41.738945000 +0100
-@@ -405,7 +405,7 @@
+--- chrome/browser/ui/browser_window.h.orig 2019-03-11 22:00:54 UTC
++++ chrome/browser/ui/browser_window.h
+@@ -423,7 +423,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/2019Q2/www/chromium/files/patch-chrome_browser_ui_exclusive__access_exclusive__access__bubble.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-chrome_browser_ui_exclusive__access_exclusive__access__bubble.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-chrome_browser_ui_exclusive__access_exclusive__access__bubble.cc (revision 497959)
@@ -1,11 +1,11 @@
---- chrome/browser/ui/exclusive_access/exclusive_access_bubble.cc.orig 2017-04-19 19:06:30 UTC
+--- chrome/browser/ui/exclusive_access/exclusive_access_bubble.cc.orig 2019-03-11 22:00:54 UTC
+++ chrome/browser/ui/exclusive_access/exclusive_access_bubble.cc
@@ -16,7 +16,7 @@
// NOTE(koz): Linux doesn't use the thick shadowed border, so we add padding
// here.
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
const int ExclusiveAccessBubble::kPaddingPx = 8;
#else
const int ExclusiveAccessBubble::kPaddingPx = 15;
Index: branches/2019Q2/www/chromium/files/patch-chrome_browser_ui_input__method_input__method__engine.h
===================================================================
--- branches/2019Q2/www/chromium/files/patch-chrome_browser_ui_input__method_input__method__engine.h (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-chrome_browser_ui_input__method_input__method__engine.h (revision 497959)
@@ -1,11 +1,11 @@
---- chrome/browser/ui/input_method/input_method_engine.h.orig 2017-06-05 19:03:03 UTC
+--- chrome/browser/ui/input_method/input_method_engine.h.orig 2019-03-11 22:00:54 UTC
+++ chrome/browser/ui/input_method/input_method_engine.h
@@ -27,7 +27,7 @@ class InputMethodEngine : public InputMethodEngineBase
// ui::IMEEngineHandlerInterface:
bool IsActive() const override;
- std::string GetExtensionId() const override;
+ std::string GetExtensionId() const;
// Creates and shows the IME window.
// Returns 0 for errors and |error| will contains the error message.
Index: branches/2019Q2/www/chromium/files/patch-chrome_browser_ui_input__method_input__method__engine__base.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-chrome_browser_ui_input__method_input__method__engine__base.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-chrome_browser_ui_input__method_input__method__engine__base.cc (revision 497959)
@@ -1,11 +1,11 @@
---- chrome/browser/ui/input_method/input_method_engine_base.cc.orig 2017-04-19 19:06:30 UTC
+--- chrome/browser/ui/input_method/input_method_engine_base.cc.orig 2019-03-11 22:00:54 UTC
+++ chrome/browser/ui/input_method/input_method_engine_base.cc
-@@ -35,7 +35,7 @@
+@@ -29,7 +29,7 @@
#include "ui/base/ime/chromeos/ime_keymap.h"
#elif defined(OS_WIN)
#include "ui/events/keycodes/keyboard_codes_win.h"
-#elif defined(OS_LINUX)
+#elif defined(OS_LINUX) || defined(OS_BSD)
#include "ui/events/keycodes/keyboard_codes_posix.h"
#endif
Index: branches/2019Q2/www/chromium/files/patch-chrome_browser_ui_libgtkui_print__dialog__gtk.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-chrome_browser_ui_libgtkui_print__dialog__gtk.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-chrome_browser_ui_libgtkui_print__dialog__gtk.cc (revision 497959)
@@ -1,10 +1,10 @@
---- chrome/browser/ui/libgtkui/print_dialog_gtk.cc.orig 2017-04-19 19:06:30 UTC
+--- chrome/browser/ui/libgtkui/print_dialog_gtk.cc.orig 2019-03-11 22:00:54 UTC
+++ chrome/browser/ui/libgtkui/print_dialog_gtk.cc
-@@ -347,6 +347,7 @@ void PrintDialogGtk2::ShowDialog(
+@@ -333,6 +333,7 @@ void PrintDialogGtk::ShowDialog(
// Since we only generate PDF, only show printers that support PDF.
// TODO(thestig) Add more capabilities to support?
GtkPrintCapabilities cap = static_cast<GtkPrintCapabilities>(
+ GTK_PRINT_CAPABILITY_GENERATE_PS |
GTK_PRINT_CAPABILITY_GENERATE_PDF |
GTK_PRINT_CAPABILITY_PAGE_SET |
GTK_PRINT_CAPABILITY_COPIES |
Index: branches/2019Q2/www/chromium/files/patch-chrome_browser_ui_sad__tab.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-chrome_browser_ui_sad__tab.cc (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-chrome_browser_ui_sad__tab.cc (revision 497959)
@@ -0,0 +1,11 @@
+--- chrome/browser/ui/sad_tab.cc.orig 2019-03-11 22:00:54 UTC
++++ chrome/browser/ui/sad_tab.cc
+@@ -180,7 +180,7 @@ std::vector<int> SadTab::GetSubMessages() {
+ // Only show incognito suggestion if not already in Incognito mode.
+ if (!web_contents_->GetBrowserContext()->IsOffTheRecord())
+ message_ids.insert(message_ids.begin(), IDS_SAD_TAB_RELOAD_INCOGNITO);
+-#if defined(OS_MACOSX) || defined(OS_LINUX)
++#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD)
+ // Note: on macOS, Linux and ChromeOS, the first bullet is either one of
+ // IDS_SAD_TAB_RELOAD_CLOSE_TABS or IDS_SAD_TAB_RELOAD_CLOSE_NOTABS
+ // followed by one of the above suggestions.
Property changes on: branches/2019Q2/www/chromium/files/patch-chrome_browser_ui_sad__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/2019Q2/www/chromium/files/patch-chrome_browser_ui_startup_bad__flags__prompt.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-chrome_browser_ui_startup_bad__flags__prompt.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-chrome_browser_ui_startup_bad__flags__prompt.cc (revision 497959)
@@ -1,11 +1,11 @@
---- chrome/browser/ui/startup/bad_flags_prompt.cc.orig 2017-06-05 19:03:03 UTC
+--- chrome/browser/ui/startup/bad_flags_prompt.cc.orig 2019-03-11 22:00:54 UTC
+++ chrome/browser/ui/startup/bad_flags_prompt.cc
-@@ -72,7 +72,7 @@ void ShowBadFlagsPrompt(Browser* browser) {
- // This flag gives extensions more powers.
+@@ -84,7 +84,7 @@ static const char* kBadFlags[] = {
extensions::switches::kExtensionsOnChromeURLs,
+ #endif
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
// Speech dispatcher is buggy, it can crash and it can make Chrome freeze.
// http://crbug.com/327295
switches::kEnableSpeechDispatcher,
Index: branches/2019Q2/www/chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator.cc (revision 497959)
@@ -1,22 +1,22 @@
---- chrome/browser/ui/startup/startup_browser_creator.cc.orig 2017-06-05 19:03:03 UTC
+--- chrome/browser/ui/startup/startup_browser_creator.cc.orig 2019-03-11 22:00:54 UTC
+++ chrome/browser/ui/startup/startup_browser_creator.cc
-@@ -94,7 +94,7 @@
- #include "components/user_manager/user_manager.h"
+@@ -79,7 +79,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
-@@ -666,8 +666,10 @@ bool StartupBrowserCreator::ProcessCmdLineImpl(
+@@ -633,8 +633,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/2019Q2/www/chromium/files/patch-chrome_browser_ui_tab__helpers.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-chrome_browser_ui_tab__helpers.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-chrome_browser_ui_tab__helpers.cc (revision 497959)
@@ -1,25 +1,25 @@
---- chrome/browser/ui/tab_helpers.cc.orig 2019-01-30 02:17:48.000000000 +0100
-+++ chrome/browser/ui/tab_helpers.cc 2019-02-02 00:32:46.587950000 +0100
-@@ -117,7 +117,7 @@
+--- chrome/browser/ui/tab_helpers.cc.orig 2019-03-11 22:00:54 UTC
++++ chrome/browser/ui/tab_helpers.cc
+@@ -116,7 +116,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
-@@ -311,11 +311,11 @@
+@@ -309,11 +309,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/2019Q2/www/chromium/files/patch-chrome_browser_ui_task__manager_task__manager__columns.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-chrome_browser_ui_task__manager_task__manager__columns.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-chrome_browser_ui_task__manager_task__manager__columns.cc (revision 497959)
@@ -1,15 +1,15 @@
---- chrome/browser/ui/task_manager/task_manager_columns.cc.orig 2017-04-19 19:06:30 UTC
+--- chrome/browser/ui/task_manager/task_manager_columns.cc.orig 2019-03-11 22:00:54 UTC
+++ chrome/browser/ui/task_manager/task_manager_columns.cc
-@@ -80,10 +80,10 @@ const TableColumnData kColumns[] = {
- {IDS_TASK_MANAGER_IDLE_WAKEUPS_COLUMN, ui::TableColumn::RIGHT, -1, 0,
- arraysize("idlewakeups") * kCharWidth, -1, true, false, false},
+@@ -93,10 +93,10 @@ const TableColumnData kColumns[] = {
+ base::size("100000") * kCharWidth, -1, true, false, false},
+ #endif
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
+-#if defined(OS_LINUX) || defined(OS_MACOSX)
++#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD)
{IDS_TASK_MANAGER_OPEN_FD_COUNT_COLUMN, ui::TableColumn::RIGHT, -1, 0,
- arraysize("999") * kCharWidth, -1, true, false, false},
--#endif // defined(OS_LINUX)
-+#endif // defined(OS_LINUX) || defined(OS_BSD)
+ base::size("999") * kCharWidth, -1, true, false, false},
+-#endif // defined(OS_LINUX) || defined(OS_MACOSX)
++#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD)
{IDS_TASK_MANAGER_PROCESS_PRIORITY_COLUMN, ui::TableColumn::LEFT, -1, 0,
- arraysize("background") * kCharWidth, -1, true, true, false},
- {IDS_TASK_MANAGER_MEMORY_STATE_COLUMN, ui::TableColumn::LEFT, -1, 0,
+ base::size("background") * kCharWidth, -1, true, true, false},
+ {IDS_TASK_MANAGER_KEEPALIVE_COUNT_COLUMN, ui::TableColumn::RIGHT, -1, 0,
Index: branches/2019Q2/www/chromium/files/patch-chrome_browser_ui_task__manager_task__manager__table__model.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-chrome_browser_ui_task__manager_task__manager__table__model.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-chrome_browser_ui_task__manager_task__manager__table__model.cc (revision 497959)
@@ -1,50 +1,50 @@
---- chrome/browser/ui/task_manager/task_manager_table_model.cc.orig 2017-06-05 19:03:03 UTC
+--- chrome/browser/ui/task_manager/task_manager_table_model.cc.orig 2019-03-11 22:00:54 UTC
+++ chrome/browser/ui/task_manager/task_manager_table_model.cc
-@@ -454,13 +454,13 @@ base::string16 TaskManagerTableModel::GetText(int row,
+@@ -430,13 +430,13 @@ base::string16 TaskManagerTableModel::GetText(int row,
? stringifier_->backgrounded_string()
: stringifier_->foregrounded_string();
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
+-#if defined(OS_LINUX) || defined(OS_MACOSX)
++#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD)
case IDS_TASK_MANAGER_OPEN_FD_COUNT_COLUMN: {
const int fd_count = observed_task_manager()->GetOpenFdCount(tasks_[row]);
return fd_count >= 0 ? base::FormatNumber(fd_count)
: stringifier_->n_a_string();
}
--#endif // defined(OS_LINUX)
-+#endif // defined(OS_LINUX) || defined(OS_BSD)
+-#endif // defined(OS_LINUX) || defined(OS_MACOSX)
++#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD)
- case IDS_TASK_MANAGER_MEMORY_STATE_COLUMN: {
- return stringifier_->GetMemoryStateText(
-@@ -623,7 +623,7 @@ int TaskManagerTableModel::CompareValues(int row1,
+ case IDS_TASK_MANAGER_KEEPALIVE_COUNT_COLUMN: {
+ return stringifier_->GetKeepaliveCountText(
+@@ -590,7 +590,7 @@ int TaskManagerTableModel::CompareValues(int row1,
return BooleanCompare(is_proc1_bg, is_proc2_bg);
}
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
+-#if defined(OS_LINUX) || defined(OS_MACOSX)
++#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD)
case IDS_TASK_MANAGER_OPEN_FD_COUNT_COLUMN: {
const int proc1_fd_count =
observed_task_manager()->GetOpenFdCount(tasks_[row1]);
-@@ -631,7 +631,7 @@ int TaskManagerTableModel::CompareValues(int row1,
+@@ -598,7 +598,7 @@ int TaskManagerTableModel::CompareValues(int row1,
observed_task_manager()->GetOpenFdCount(tasks_[row2]);
return ValueCompare(proc1_fd_count, proc2_fd_count);
}
--#endif // defined(OS_LINUX)
-+#endif // defined(OS_LINUX) || defined(OS_BSD)
+-#endif // defined(OS_LINUX) || defined(OS_MACOSX)
++#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD)
default:
NOTREACHED();
-@@ -799,11 +799,11 @@ void TaskManagerTableModel::UpdateRefreshTypes(int col
+@@ -760,11 +760,11 @@ void TaskManagerTableModel::UpdateRefreshTypes(int col
type = REFRESH_TYPE_KEEPALIVE_COUNT;
break;
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
+-#if defined(OS_LINUX) || defined(OS_MACOSX)
++#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD)
case IDS_TASK_MANAGER_OPEN_FD_COUNT_COLUMN:
type = REFRESH_TYPE_FD_COUNT;
break;
--#endif // defined(OS_LINUX)
-+#endif // defined(OS_LINUX) || defined(OS_BSD)
+-#endif // defined(OS_LINUX) || defined(OS_MACOSX)
++#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD)
default:
NOTREACHED();
Index: branches/2019Q2/www/chromium/files/patch-chrome_browser_ui_toolbar_app__menu__model.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-chrome_browser_ui_toolbar_app__menu__model.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-chrome_browser_ui_toolbar_app__menu__model.cc (revision 497959)
@@ -1,11 +1,11 @@
---- chrome/browser/ui/toolbar/app_menu_model.cc.orig 2019-01-30 02:17:48.000000000 +0100
-+++ chrome/browser/ui/toolbar/app_menu_model.cc 2019-01-31 23:16:29.559467000 +0100
-@@ -664,7 +664,7 @@
+--- chrome/browser/ui/toolbar/app_menu_model.cc.orig 2019-03-11 22:00:54 UTC
++++ chrome/browser/ui/toolbar/app_menu_model.cc
+@@ -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/2019Q2/www/chromium/files/patch-chrome_browser_ui_views_accelerator__table.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-chrome_browser_ui_views_accelerator__table.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-chrome_browser_ui_views_accelerator__table.cc (revision 497959)
@@ -1,29 +1,46 @@
---- chrome/browser/ui/views/accelerator_table.cc.orig 2018-08-01 00:08:32.000000000 +0200
-+++ chrome/browser/ui/views/accelerator_table.cc 2018-08-04 17:21:33.552862000 +0200
-@@ -44,7 +44,7 @@
+--- chrome/browser/ui/views/accelerator_table.cc.orig 2019-03-11 22:00:54 UTC
++++ chrome/browser/ui/views/accelerator_table.cc
+@@ -50,7 +50,7 @@ const AcceleratorMapping kAcceleratorMap[] = {
{ui::VKEY_S, ui::EF_PLATFORM_ACCELERATOR, IDC_SAVE_PAGE},
{ui::VKEY_9, ui::EF_PLATFORM_ACCELERATOR, IDC_SELECT_LAST_TAB},
{ui::VKEY_NUMPAD9, ui::EF_PLATFORM_ACCELERATOR, IDC_SELECT_LAST_TAB},
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
{ui::VKEY_9, ui::EF_ALT_DOWN, IDC_SELECT_LAST_TAB},
{ui::VKEY_NUMPAD9, ui::EF_ALT_DOWN, IDC_SELECT_LAST_TAB},
{ui::VKEY_NEXT, ui::EF_CONTROL_DOWN | ui::EF_SHIFT_DOWN, IDC_MOVE_TAB_NEXT},
-@@ -74,7 +74,7 @@
+@@ -80,7 +80,7 @@ const AcceleratorMapping kAcceleratorMap[] = {
{ui::VKEY_NUMPAD7, ui::EF_PLATFORM_ACCELERATOR, IDC_SELECT_TAB_6},
{ui::VKEY_8, ui::EF_PLATFORM_ACCELERATOR, IDC_SELECT_TAB_7},
{ui::VKEY_NUMPAD8, ui::EF_PLATFORM_ACCELERATOR, IDC_SELECT_TAB_7},
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
{ui::VKEY_1, ui::EF_ALT_DOWN, IDC_SELECT_TAB_0},
{ui::VKEY_NUMPAD1, ui::EF_ALT_DOWN, IDC_SELECT_TAB_0},
{ui::VKEY_2, ui::EF_ALT_DOWN, IDC_SELECT_TAB_1},
-@@ -119,7 +119,7 @@
- #endif // !OS_MACOSX
+@@ -98,7 +98,7 @@ const AcceleratorMapping kAcceleratorMap[] = {
+ {ui::VKEY_8, ui::EF_ALT_DOWN, IDC_SELECT_TAB_7},
+ {ui::VKEY_NUMPAD8, ui::EF_ALT_DOWN, IDC_SELECT_TAB_7},
+ {ui::VKEY_BROWSER_FAVORITES, ui::EF_NONE, IDC_SHOW_BOOKMARK_BAR},
+-#endif // OS_LINUX && !OS_CHROMEOS
++#endif // (OS_LINUX || OS_BSD) && !OS_CHROMEOS
+ {ui::VKEY_B, ui::EF_SHIFT_DOWN | ui::EF_PLATFORM_ACCELERATOR,
+ IDC_SHOW_BOOKMARK_BAR},
+ {ui::VKEY_OEM_MINUS, ui::EF_PLATFORM_ACCELERATOR, IDC_ZOOM_MINUS},
+@@ -122,14 +122,14 @@ const AcceleratorMapping kAcceleratorMap[] = {
+ {ui::VKEY_F11, ui::EF_NONE, IDC_FULLSCREEN},
// Platform-specific key maps.
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
{ui::VKEY_BROWSER_BACK, ui::EF_NONE, IDC_BACK},
{ui::VKEY_BROWSER_FORWARD, ui::EF_NONE, IDC_FORWARD},
{ui::VKEY_BROWSER_HOME, ui::EF_NONE, IDC_HOME},
+ {ui::VKEY_BROWSER_REFRESH, ui::EF_NONE, IDC_RELOAD},
+ {ui::VKEY_BROWSER_REFRESH, ui::EF_CONTROL_DOWN, IDC_RELOAD_BYPASSING_CACHE},
+ {ui::VKEY_BROWSER_REFRESH, ui::EF_SHIFT_DOWN, IDC_RELOAD_BYPASSING_CACHE},
+-#endif // defined(OS_LINUX)
++#endif // defined(OS_LINUX) || defined(OS_BSD)
+
+ #if defined(OS_CHROMEOS)
+ // On Chrome OS, VKEY_BROWSER_SEARCH is handled in Ash.
Index: branches/2019Q2/www/chromium/files/patch-chrome_browser_ui_views_chrome__browser__main__extra__parts__views.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-chrome_browser_ui_views_chrome__browser__main__extra__parts__views.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-chrome_browser_ui_views_chrome__browser__main__extra__parts__views.cc (revision 497959)
@@ -1,38 +1,38 @@
---- chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc.orig 2017-06-05 19:03:03 UTC
+--- chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc.orig 2019-03-11 22:00:54 UTC
+++ chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc
-@@ -29,7 +29,7 @@
+@@ -35,7 +35,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 <sys/stat.h>
#include <sys/types.h>
#include <unistd.h>
-@@ -40,7 +40,7 @@
+@@ -45,7 +45,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)
- #if defined(OS_CHROMEOS)
- #include "chrome/browser/chromeos/ash_config.h"
-@@ -99,7 +99,7 @@ void ChromeBrowserMainExtraPartsViews::PreProfileInit(
- IMEDriver::Register();
+ ChromeBrowserMainExtraPartsViews::ChromeBrowserMainExtraPartsViews() {}
+
+@@ -93,7 +93,7 @@ void ChromeBrowserMainExtraPartsViews::PreProfileInit(
+ }
#endif
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
+#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
// On the Linux desktop, we want to prevent the user from logging in as root,
// so that we don't destroy the profile. Now that we have some minimal ui
// initialized, check to see if we're running as root and bail if we are.
-@@ -130,7 +130,7 @@ void ChromeBrowserMainExtraPartsViews::PreProfileInit(
+@@ -124,7 +124,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::ServiceManagerConnectionStarted(
+ void ChromeBrowserMainExtraPartsViews::PostBrowserStart() {
Index: branches/2019Q2/www/chromium/files/patch-chrome_browser_ui_views_chrome__views__delegate.h
===================================================================
--- branches/2019Q2/www/chromium/files/patch-chrome_browser_ui_views_chrome__views__delegate.h (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-chrome_browser_ui_views_chrome__views__delegate.h (revision 497959)
@@ -1,11 +1,11 @@
---- chrome/browser/ui/views/chrome_views_delegate.h.orig 2017-06-05 19:03:03 UTC
+--- chrome/browser/ui/views/chrome_views_delegate.h.orig 2019-03-11 22:00:54 UTC
+++ chrome/browser/ui/views/chrome_views_delegate.h
-@@ -43,7 +43,7 @@ class ChromeViewsDelegate : public views::ViewsDelegat
+@@ -44,7 +44,7 @@ class ChromeViewsDelegate : public views::ViewsDelegat
HICON GetSmallWindowIcon() const override;
int GetAppbarAutohideEdges(HMONITOR monitor,
const base::Closure& callback) override;
-#elif defined(OS_LINUX) && !defined(OS_CHROMEOS)
+#elif (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
gfx::ImageSkia* GetDefaultWindowIcon() const override;
bool WindowManagerProvidesTitleBar(bool maximized) override;
#endif
Index: branches/2019Q2/www/chromium/files/patch-chrome_browser_ui_views_first__run__dialog.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-chrome_browser_ui_views_first__run__dialog.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-chrome_browser_ui_views_first__run__dialog.cc (revision 497959)
@@ -1,24 +1,24 @@
---- chrome/browser/ui/views/first_run_dialog.cc.orig 2017-06-05 19:03:03 UTC
+--- chrome/browser/ui/views/first_run_dialog.cc.orig 2019-03-11 22:00:54 UTC
+++ chrome/browser/ui/views/first_run_dialog.cc
-@@ -40,8 +40,10 @@ using views::GridLayout;
+@@ -37,8 +37,10 @@
namespace {
void InitCrashReporterIfEnabled(bool enabled) {
+#if !defined(OS_BSD)
if (enabled)
breakpad::InitCrashReporter(std::string());
+#endif
}
} // namespace
-@@ -120,8 +122,10 @@ views::View* FirstRunDialog::CreateExtraView() {
+@@ -111,8 +113,10 @@ views::View* FirstRunDialog::CreateExtraView() {
bool FirstRunDialog::Accept() {
GetWidget()->Hide();
+#if !defined(OS_BSD)
ChangeMetricsReportingStateWithReply(report_crashes_->checked(),
base::Bind(&InitCrashReporterIfEnabled));
+#endif
if (make_default_->checked())
shell_integration::SetAsDefaultBrowser();
Index: branches/2019Q2/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__frame.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__frame.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__frame.cc (revision 497959)
@@ -1,20 +1,29 @@
---- chrome/browser/ui/views/frame/browser_frame.cc.orig 2017-07-25 21:04:51.000000000 +0200
-+++ chrome/browser/ui/views/frame/browser_frame.cc 2017-08-02 00:17:41.951632000 +0200
-@@ -36,7 +36,7 @@
+--- chrome/browser/ui/views/frame/browser_frame.cc.orig 2019-03-11 22:00:54 UTC
++++ chrome/browser/ui/views/frame/browser_frame.cc
+@@ -37,7 +37,7 @@
#include "components/user_manager/user_manager.h"
#endif
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
#include "chrome/browser/ui/views/frame/browser_command_handler_linux.h"
#endif
-@@ -97,7 +97,7 @@
+@@ -48,7 +48,7 @@
+ namespace {
+
+ bool IsUsingGtkTheme(Profile* profile) {
+-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
+ return ThemeServiceFactory::GetForProfile(profile)->UsingSystemTheme();
+ #else
+ return false;
+@@ -104,7 +104,7 @@ void BrowserFrame::InitBrowserFrame() {
non_client_view()->set_context_menu_controller(this);
}
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
browser_command_handler_.reset(new BrowserCommandHandlerLinux(browser_view_));
#endif
}
Index: branches/2019Q2/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__non__client__frame__view__factory__views.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__non__client__frame__view__factory__views.cc (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__non__client__frame__view__factory__views.cc (revision 497959)
@@ -0,0 +1,20 @@
+--- chrome/browser/ui/views/frame/browser_non_client_frame_view_factory_views.cc.orig 2019-03-11 22:00:54 UTC
++++ chrome/browser/ui/views/frame/browser_non_client_frame_view_factory_views.cc
+@@ -13,7 +13,7 @@
+ #include "chrome/browser/ui/views/frame/glass_browser_frame_view.h"
+ #endif
+
+-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
++#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
+ #include "ui/views/linux_ui/linux_ui.h"
+ #endif
+
+@@ -32,7 +32,7 @@ OpaqueBrowserFrameView* CreateOpaqueBrowserFrameView(
+ BrowserView* browser_view) {
+ #if BUILDFLAG(ENABLE_NATIVE_WINDOW_NAV_BUTTONS)
+ std::unique_ptr<views::NavButtonProvider> nav_button_provider;
+-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
+ if (ThemeServiceFactory::GetForProfile(browser_view->browser()->profile())
+ ->UsingSystemTheme() &&
+ views::LinuxUI::instance()) {
Property changes on: branches/2019Q2/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__non__client__frame__view__factory__views.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/2019Q2/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__view.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__view.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__view.cc (revision 497959)
@@ -1,29 +1,29 @@
---- chrome/browser/ui/views/frame/browser_view.cc.orig 2019-02-06 22:42:13.515085000 +0100
-+++ chrome/browser/ui/views/frame/browser_view.cc 2019-02-06 22:43:58.340147000 +0100
-@@ -1255,7 +1255,7 @@
+--- chrome/browser/ui/views/frame/browser_view.cc.orig 2019-03-11 22:00:54 UTC
++++ chrome/browser/ui/views/frame/browser_view.cc
+@@ -1269,7 +1269,7 @@ void BrowserView::RotatePaneFocus(bool forwards) {
}
void BrowserView::DestroyBrowser() {
-#if defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS))
+#if defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
if (quit_instruction_bubble_controller_) {
GetWidget()->GetNativeView()->RemovePreTargetHandler(
quit_instruction_bubble_controller_.get());
-@@ -2089,7 +2089,7 @@
+@@ -2130,7 +2130,7 @@ views::View* BrowserView::CreateOverlayView() {
}
void BrowserView::OnWidgetDestroying(views::Widget* widget) {
-#if defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS))
+#if defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
if (quit_instruction_bubble_controller_) {
GetWidget()->GetNativeView()->RemovePreTargetHandler(
quit_instruction_bubble_controller_.get());
-@@ -2435,7 +2435,7 @@
+@@ -2474,7 +2474,7 @@ void BrowserView::InitViews() {
GetWidget()->SetNativeWindowProperty(Profile::kProfileKey,
browser_->profile());
-#if defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS))
+#if defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
if (browser_->SupportsWindowFeature(Browser::FEATURE_TOOLBAR)) {
quit_instruction_bubble_controller_ =
QuitInstructionBubbleController::GetInstance();
Index: branches/2019Q2/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__view.h
===================================================================
--- branches/2019Q2/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__view.h (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__view.h (revision 497959)
@@ -1,20 +1,20 @@
---- chrome/browser/ui/views/frame/browser_view.h.orig 2019-02-06 22:45:00.117437000 +0100
-+++ chrome/browser/ui/views/frame/browser_view.h 2019-02-06 22:46:12.076822000 +0100
-@@ -49,7 +49,7 @@
+--- chrome/browser/ui/views/frame/browser_view.h.orig 2019-03-11 22:00:54 UTC
++++ chrome/browser/ui/views/frame/browser_view.h
+@@ -50,7 +50,7 @@
#include "chrome/browser/ui/views/intent_picker_bubble_view.h"
#endif // defined(OS_CHROMEOS)
-#if defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS))
+#if defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
#include "chrome/browser/ui/views/quit_instruction_bubble_controller.h"
#endif
-@@ -833,7 +833,7 @@
+@@ -850,7 +850,7 @@ class BrowserView : public BrowserWindow,
};
base::Optional<ResizeSession> interactive_resize_;
-#if defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS))
+#if defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
scoped_refptr<QuitInstructionBubbleController>
quit_instruction_bubble_controller_;
#endif
Index: branches/2019Q2/www/chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.cc (revision 497959)
@@ -1,20 +1,29 @@
---- chrome/browser/ui/views/frame/opaque_browser_frame_view.cc.orig 2017-06-05 19:03:03 UTC
+--- chrome/browser/ui/views/frame/opaque_browser_frame_view.cc.orig 2019-03-11 22:00:54 UTC
+++ chrome/browser/ui/views/frame/opaque_browser_frame_view.cc
-@@ -38,7 +38,7 @@
- #include "ui/views/window/frame_background.h"
+@@ -49,7 +49,7 @@
+ #include "ui/views/window/vector_icons/vector_icons.h"
#include "ui/views/window/window_shape.h"
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
#include "ui/views/controls/menu/menu_runner.h"
#endif
-@@ -292,7 +292,7 @@ void OpaqueBrowserFrameView::ButtonPressed(views::Butt
+@@ -356,7 +356,7 @@ void OpaqueBrowserFrameView::ButtonPressed(views::Butt
void OpaqueBrowserFrameView::OnMenuButtonClicked(views::MenuButton* 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);
- ignore_result(menu_runner.RunMenuAt(browser_view()->GetWidget(),
+ menu_runner.RunMenuAt(browser_view()->GetWidget(), window_icon_,
+@@ -480,7 +480,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/2019Q2/www/chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view__platform__specific.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view__platform__specific.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view__platform__specific.cc (revision 497959)
@@ -1,11 +1,11 @@
---- chrome/browser/ui/views/frame/opaque_browser_frame_view_platform_specific.cc.orig 2017-06-05 19:03:03 UTC
+--- chrome/browser/ui/views/frame/opaque_browser_frame_view_platform_specific.cc.orig 2019-03-11 22:00:54 UTC
+++ chrome/browser/ui/views/frame/opaque_browser_frame_view_platform_specific.cc
@@ -10,7 +10,7 @@ bool OpaqueBrowserFrameViewPlatformSpecific::IsUsingSy
return false;
}
-#if !defined(OS_LINUX)
+#if !defined(OS_LINUX) && !defined(OS_FREEBSD)
// static
OpaqueBrowserFrameViewPlatformSpecific*
Index: branches/2019Q2/www/chromium/files/patch-chrome_browser_ui_views_frame_system__menu__model__builder.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-chrome_browser_ui_views_frame_system__menu__model__builder.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-chrome_browser_ui_views_frame_system__menu__model__builder.cc (revision 497959)
@@ -1,20 +1,29 @@
---- chrome/browser/ui/views/frame/system_menu_model_builder.cc.orig 2017-06-05 19:03:03 UTC
+--- 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
-@@ -84,7 +84,7 @@ void SystemMenuModelBuilder::BuildSystemMenuForBrowser
+@@ -78,7 +78,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
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);
-@@ -118,7 +118,7 @@ void SystemMenuModelBuilder::BuildSystemMenuForAppOrPo
+@@ -126,7 +126,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/2019Q2/www/chromium/files/patch-chrome_browser_ui_views_frame_system__menu__model__delegate.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-chrome_browser_ui_views_frame_system__menu__model__delegate.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-chrome_browser_ui_views_frame_system__menu__model__delegate.cc (revision 497959)
@@ -1,20 +1,20 @@
---- chrome/browser/ui/views/frame/system_menu_model_delegate.cc.orig 2017-06-05 19:03:03 UTC
+--- chrome/browser/ui/views/frame/system_menu_model_delegate.cc.orig 2019-03-11 22:00:54 UTC
+++ chrome/browser/ui/views/frame/system_menu_model_delegate.cc
-@@ -13,7 +13,7 @@
+@@ -15,7 +15,7 @@
#include "components/sessions/core/tab_restore_service.h"
#include "ui/base/l10n/l10n_util.h"
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
#include "chrome/common/pref_names.h"
#include "components/prefs/pref_service.h"
#endif
-@@ -29,7 +29,7 @@ SystemMenuModelDelegate::~SystemMenuModelDelegate() {
- }
+@@ -30,7 +30,7 @@ SystemMenuModelDelegate::SystemMenuModelDelegate(
+ SystemMenuModelDelegate::~SystemMenuModelDelegate() {}
bool SystemMenuModelDelegate::IsCommandIdChecked(int command_id) const {
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
if (command_id == IDC_USE_SYSTEM_TITLE_BAR) {
PrefService* prefs = browser_->profile()->GetPrefs();
return !prefs->GetBoolean(prefs::kUseCustomChromeFrame);
Index: branches/2019Q2/www/chromium/files/patch-chrome_browser_ui_views_hung__renderer__view.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-chrome_browser_ui_views_hung__renderer__view.cc (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-chrome_browser_ui_views_hung__renderer__view.cc (revision 497959)
@@ -0,0 +1,11 @@
+--- chrome/browser/ui/views/hung_renderer_view.cc.orig 2019-03-17 19:17:01 UTC
++++ chrome/browser/ui/views/hung_renderer_view.cc
+@@ -389,7 +389,7 @@ bool HungRendererDialogView::Cancel() {
+ content::RenderProcessHost* rph =
+ hung_pages_table_model_->GetRenderWidgetHost()->GetProcess();
+ if (rph) {
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+ // A generic |CrashDumpHungChildProcess()| is not implemented for Linux.
+ // Instead we send an explicit IPC to crash on the renderer's IO thread.
+ rph->ForceCrash();
Property changes on: branches/2019Q2/www/chromium/files/patch-chrome_browser_ui_views_hung__renderer__view.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/2019Q2/www/chromium/files/patch-chrome_browser_ui_views_tabs_new__tab__button.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-chrome_browser_ui_views_tabs_new__tab__button.cc (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-chrome_browser_ui_views_tabs_new__tab__button.cc (revision 497959)
@@ -0,0 +1,11 @@
+--- chrome/browser/ui/views/tabs/new_tab_button.cc.orig 2019-03-11 22:00:54 UTC
++++ chrome/browser/ui/views/tabs/new_tab_button.cc
+@@ -63,7 +63,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
Property changes on: branches/2019Q2/www/chromium/files/patch-chrome_browser_ui_views_tabs_new__tab__button.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/2019Q2/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__drag__controller.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__drag__controller.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__drag__controller.cc (revision 497959)
@@ -1,29 +1,29 @@
---- chrome/browser/ui/views/tabs/tab_drag_controller.cc.orig 2017-12-15 02:04:11.000000000 +0100
-+++ chrome/browser/ui/views/tabs/tab_drag_controller.cc 2017-12-24 02:45:43.317955000 +0100
-@@ -261,7 +261,7 @@
+--- chrome/browser/ui/views/tabs/tab_drag_controller.cc.orig 2019-03-11 22:00:54 UTC
++++ chrome/browser/ui/views/tabs/tab_drag_controller.cc
+@@ -390,7 +390,7 @@ void TabDragController::Init(TabStrip* source_tabstrip
// synchronous on desktop Linux, so use that.
// - Chrome OS
// Releasing capture on Ash cancels gestures so avoid it.
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
can_release_capture_ = false;
#endif
start_point_in_screen_ = gfx::Point(source_tab_offset, mouse_offset.y());
-@@ -599,7 +599,7 @@
+@@ -814,7 +814,7 @@ TabDragController::DragBrowserToNewTabStrip(TabStrip*
else
target_tabstrip->GetWidget()->SetCapture(attached_tabstrip_);
-#if !defined(OS_LINUX)
+#if !defined(OS_LINUX) || 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.
-@@ -1792,7 +1792,7 @@
+@@ -1953,7 +1953,7 @@ TabDragController::Liveness TabDragController::GetLoca
if (dragged_window)
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/2019Q2/www/chromium/files/patch-chrome_browser_ui_webui_about__ui.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-chrome_browser_ui_webui_about__ui.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-chrome_browser_ui_webui_about__ui.cc (revision 497959)
@@ -1,20 +1,20 @@
---- chrome/browser/ui/webui/about_ui.cc.orig 2018-11-19 19:55:04.000000000 +0100
-+++ chrome/browser/ui/webui/about_ui.cc 2018-12-04 17:47:53.178444000 +0100
-@@ -393,7 +393,7 @@
+--- chrome/browser/ui/webui/about_ui.cc.orig 2019-03-11 22:00:54 UTC
++++ chrome/browser/ui/webui/about_ui.cc
+@@ -552,7 +552,7 @@ std::string ChromeURLs() {
return html;
}
-#if defined(OS_LINUX) || defined(OS_OPENBSD)
+#if defined(OS_LINUX) || defined(OS_BSD)
std::string AboutLinuxProxyConfig() {
std::string data;
AppendHeader(&data, 0,
-@@ -448,7 +448,7 @@
+@@ -607,7 +607,7 @@ void AboutUIHTMLSource::StartDataRequest(
.GetRawDataResource(idr)
.as_string();
}
-#if defined(OS_LINUX) || defined(OS_OPENBSD)
+#if defined(OS_LINUX) || defined(OS_BSD)
} else if (source_name_ == chrome::kChromeUILinuxProxyConfigHost) {
response = AboutLinuxProxyConfig();
#endif
Index: branches/2019Q2/www/chromium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc (revision 497959)
@@ -1,49 +1,49 @@
---- chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig 2018-02-24 16:25:10.000000000 +0100
-+++ chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc 2018-03-03 22:18:39.234352000 +0100
-@@ -176,11 +176,11 @@
- #include "chrome/browser/ui/webui/welcome_win10_ui.h"
+--- chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig 2019-03-11 22:00:54 UTC
++++ chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
+@@ -192,11 +192,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
-@@ -285,7 +285,7 @@
+@@ -314,7 +314,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)
-@@ -524,7 +524,7 @@
+@@ -588,7 +588,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we
if (url.host_piece() == chrome::kChromeUINaClHost)
return &NewWebUI<NaClUI>;
#endif
-#if (defined(OS_LINUX) && defined(TOOLKIT_VIEWS)) || defined(USE_AURA)
+#if (defined(OS_LINUX) && defined(TOOLKIT_VIEWS)) || defined(USE_AURA) || defined(OS_BSD)
if (url.host_piece() == chrome::kChromeUITabModalConfirmDialogHost)
return &NewWebUI<ConstrainedWebDialogUI>;
#endif
-@@ -585,12 +585,12 @@
+@@ -641,12 +641,12 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we
return &NewWebUI<CastUI>;
}
#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<SandboxInternalsUI>;
}
#endif
-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)
+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD)
if (url.host_piece() == chrome::kChromeUIDiscardsHost)
return &NewWebUI<DiscardsUI>;
#endif
Index: branches/2019Q2/www/chromium/files/patch-chrome_browser_ui_webui_settings_appearance__handler.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-chrome_browser_ui_webui_settings_appearance__handler.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-chrome_browser_ui_webui_settings_appearance__handler.cc (revision 497959)
@@ -1,20 +1,20 @@
---- chrome/browser/ui/webui/settings/appearance_handler.cc.orig 2018-06-13 00:10:09.000000000 +0200
-+++ chrome/browser/ui/webui/settings/appearance_handler.cc 2018-07-18 23:00:36.362422000 +0200
-@@ -31,7 +31,7 @@
+--- chrome/browser/ui/webui/settings/appearance_handler.cc.orig 2019-03-11 22:00:54 UTC
++++ chrome/browser/ui/webui/settings/appearance_handler.cc
+@@ -31,7 +31,7 @@ void AppearanceHandler::RegisterMessages() {
"useDefaultTheme",
base::BindRepeating(&AppearanceHandler::HandleUseDefaultTheme,
base::Unretained(this)));
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
+#if defined(OS_LINUX) || defined(OS_BSD) && !defined(OS_CHROMEOS)
web_ui()->RegisterMessageCallback(
"useSystemTheme",
base::BindRepeating(&AppearanceHandler::HandleUseSystemTheme,
-@@ -59,7 +59,7 @@
+@@ -59,7 +59,7 @@ void AppearanceHandler::HandleUseDefaultTheme(const ba
ThemeServiceFactory::GetForProfile(profile_)->UseDefaultTheme();
}
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
+#if defined(OS_LINUX) || defined(OS_BSD) && !defined(OS_CHROMEOS)
void AppearanceHandler::HandleUseSystemTheme(const base::ListValue* args) {
if (profile_->IsSupervised())
NOTREACHED();
Index: branches/2019Q2/www/chromium/files/patch-chrome_browser_ui_webui_settings_appearance__handler.h
===================================================================
--- branches/2019Q2/www/chromium/files/patch-chrome_browser_ui_webui_settings_appearance__handler.h (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-chrome_browser_ui_webui_settings_appearance__handler.h (revision 497959)
@@ -1,11 +1,11 @@
---- chrome/browser/ui/webui/settings/appearance_handler.h.orig 2017-06-05 19:03:03 UTC
+--- chrome/browser/ui/webui/settings/appearance_handler.h.orig 2019-03-11 22:00:54 UTC
+++ chrome/browser/ui/webui/settings/appearance_handler.h
-@@ -35,7 +35,7 @@ class AppearanceHandler : public SettingsPageUIHandler
+@@ -36,7 +36,7 @@ class AppearanceHandler : public SettingsPageUIHandler
// Changes the UI theme of the browser to the default theme.
void HandleUseDefaultTheme(const base::ListValue* args);
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
+#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
// Changes the UI theme of the browser to the system (GTK+) theme.
void HandleUseSystemTheme(const base::ListValue* args);
#endif
Index: branches/2019Q2/www/chromium/files/patch-chrome_browser_ui_webui_settings_md__settings__localized__strings__provider.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-chrome_browser_ui_webui_settings_md__settings__localized__strings__provider.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-chrome_browser_ui_webui_settings_md__settings__localized__strings__provider.cc (revision 497959)
@@ -1,20 +1,20 @@
---- chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc.orig 2017-06-05 19:03:03 UTC
+--- chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc.orig 2019-03-11 22:00:54 UTC
+++ chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc
-@@ -332,7 +332,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht
+@@ -513,7 +513,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht
{"enterCustomWebAddress", IDS_SETTINGS_ENTER_CUSTOM_WEB_ADDRESS},
{"homeButtonDisabled", IDS_SETTINGS_HOME_BUTTON_DISABLED},
{"themes", IDS_SETTINGS_THEMES},
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
+#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
{"systemTheme", IDS_SETTINGS_SYSTEM_THEME},
{"useSystemTheme", IDS_SETTINGS_USE_SYSTEM_THEME},
{"classicTheme", IDS_SETTINGS_CLASSIC_THEME},
-@@ -350,7 +350,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht
+@@ -531,7 +531,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht
{"openWallpaperApp", IDS_SETTINGS_OPEN_WALLPAPER_APP},
{"setWallpaper", IDS_SETTINGS_SET_WALLPAPER},
#endif
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
+#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
{"showWindowDecorations", IDS_SHOW_WINDOW_DECORATIONS},
#endif
#if defined(OS_MACOSX)
Index: branches/2019Q2/www/chromium/files/patch-chrome_browser_web__applications_extensions_web__app__extension__shortcut.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-chrome_browser_web__applications_extensions_web__app__extension__shortcut.cc (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-chrome_browser_web__applications_extensions_web__app__extension__shortcut.cc (revision 497959)
@@ -0,0 +1,11 @@
+--- chrome/browser/web_applications/extensions/web_app_extension_shortcut.cc.orig 2019-03-11 22:00:54 UTC
++++ chrome/browser/web_applications/extensions/web_app_extension_shortcut.cc
+@@ -46,7 +46,7 @@ namespace {
+ #if defined(OS_MACOSX)
+ const int kDesiredSizes[] = {16, 32, 128, 256, 512};
+ const size_t kNumDesiredSizes = base::size(kDesiredSizes);
+-#elif defined(OS_LINUX)
++#elif defined(OS_LINUX) || defined(OS_BSD)
+ // Linux supports icons of any size. FreeDesktop Icon Theme Specification states
+ // that "Minimally you should install a 48x48 icon in the hicolor theme."
+ const int kDesiredSizes[] = {16, 32, 48, 128, 256, 512};
Property changes on: branches/2019Q2/www/chromium/files/patch-chrome_browser_web__applications_extensions_web__app__extension__shortcut.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/2019Q2/www/chromium/files/patch-chrome_common_BUILD.gn
===================================================================
--- branches/2019Q2/www/chromium/files/patch-chrome_common_BUILD.gn (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-chrome_common_BUILD.gn (revision 497959)
@@ -1,13 +1,13 @@
---- chrome/common/BUILD.gn.orig 2017-12-15 02:04:11.000000000 +0100
-+++ chrome/common/BUILD.gn 2017-12-30 02:27:17.872477000 +0100
-@@ -287,6 +287,10 @@
+--- chrome/common/BUILD.gn.orig 2019-03-11 22:00:54 UTC
++++ chrome/common/BUILD.gn
+@@ -300,6 +300,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/2019Q2/www/chromium/files/patch-chrome_common_chrome__features.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-chrome_common_chrome__features.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-chrome_common_chrome__features.cc (revision 497959)
@@ -1,36 +1,36 @@
---- chrome/common/chrome_features.cc.orig 2018-12-03 21:16:43.000000000 +0100
-+++ chrome/common/chrome_features.cc 2018-12-05 16:12:25.391529000 +0100
-@@ -91,13 +91,13 @@
+--- chrome/common/chrome_features.cc.orig 2019-03-11 22:00:54 UTC
++++ chrome/common/chrome_features.cc
+@@ -82,13 +82,13 @@ const base::Feature kAutomaticTabDiscarding{"Automatic
base::FEATURE_ENABLED_BY_DEFAULT};
#endif // defined(OS_WIN) || defined(OS_MACOSX)
-#if defined(OS_WIN) || defined(OS_LINUX)
+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD)
// Enables the Restart background mode optimization. When all Chrome UI is
// closed and it goes in the background, allows to restart the browser to
// discard memory.
const base::Feature kBackgroundModeAllowRestart{
"BackgroundModeAllowRestart", base::FEATURE_DISABLED_BY_DEFAULT};
-#endif // defined(OS_WIN) || defined(OS_LINUX)
+#endif // defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD)
// Enables or disables whether permission prompts are automatically blocked
// after the user has explicitly dismissed them too many times.
-@@ -152,7 +152,7 @@
+@@ -131,7 +131,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{
-@@ -201,7 +201,7 @@
- // Enables or disables windowing related features for desktop PWAs.
+@@ -195,7 +195,7 @@ const base::Feature kUsageTimeLimitPolicy{"UsageTimeLi
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)
+ #if defined(OS_CHROMEOS) || defined(OS_WIN) || defined(OS_LINUX) || \
+- defined(OS_MACOSX)
++ defined(OS_MACOSX) || defined(OS_BSD)
base::FEATURE_ENABLED_BY_DEFAULT
#else
base::FEATURE_DISABLED_BY_DEFAULT
Index: branches/2019Q2/www/chromium/files/patch-chrome_common_chrome__features.h
===================================================================
--- branches/2019Q2/www/chromium/files/patch-chrome_common_chrome__features.h (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-chrome_common_chrome__features.h (revision 497959)
@@ -1,24 +1,24 @@
---- chrome/common/chrome_features.h.orig 2018-12-03 21:16:43.000000000 +0100
-+++ chrome/common/chrome_features.h 2018-12-05 16:20:22.595072000 +0100
-@@ -65,10 +65,10 @@
+--- chrome/common/chrome_features.h.orig 2019-03-11 22:00:54 UTC
++++ chrome/common/chrome_features.h
+@@ -61,10 +61,10 @@ COMPONENT_EXPORT(CHROME_FEATURES)
extern const base::Feature kAutomaticTabDiscarding;
#endif // defined(OS_WIN) || defined(OS_MACOSX)
-#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;
-@@ -90,7 +90,7 @@
- extern const base::Feature kTabStripKeyboardFocus;
- #endif // defined(OS_MACOSX)
+@@ -81,7 +81,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/2019Q2/www/chromium/files/patch-chrome_common_chrome__paths.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-chrome_common_chrome__paths.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-chrome_common_chrome__paths.cc (revision 497959)
@@ -1,97 +1,114 @@
---- chrome/common/chrome_paths.cc.orig 2017-06-15 21:03:02.000000000 +0200
-+++ chrome/common/chrome_paths.cc 2017-06-18 01:09:20.663411000 +0200
-@@ -51,14 +51,14 @@
- const base::FilePath::CharType kInternalNaClPluginFileName[] =
- FILE_PATH_LITERAL("internal-nacl-plugin");
+--- chrome/common/chrome_paths.cc.orig 2019-03-21 01:36:35.000000000 +0100
++++ chrome/common/chrome_paths.cc 2019-03-24 18:44:09.907854000 +0100
+@@ -52,21 +52,21 @@
+ FILE_PATH_LITERAL("Internet Plug-Ins/PepperFlashPlayer");
+ #endif
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
// The path to the external extension <id>.json files.
// /usr/share seems like a good choice, see: http://www.pathname.com/fhs/
const base::FilePath::CharType kFilepathSinglePrefExtensions[] =
#if defined(GOOGLE_CHROME_BUILD)
FILE_PATH_LITERAL("/usr/share/google-chrome/extensions");
#else
- FILE_PATH_LITERAL("/usr/share/chromium/extensions");
+ FILE_PATH_LITERAL("/usr/local/share/chromium/extensions");
#endif // defined(GOOGLE_CHROME_BUILD)
// The path to the hint file that tells the pepper plugin loader
-@@ -190,7 +190,7 @@
+ // where it can find the latest component updated flash.
+ const base::FilePath::CharType kComponentUpdatedFlashHint[] =
+ FILE_PATH_LITERAL("latest-component-updated-flash");
+-#endif // defined(OS_LINUX)
++#endif // defined(OS_LINUX) || defined(OS_BSD)
+
+ #if defined(OS_CHROMEOS)
+ const base::FilePath::CharType kChromeOSComponentFlash[] = FILE_PATH_LITERAL(
+@@ -197,7 +197,7 @@
return false;
break;
case chrome::DIR_DEFAULT_DOWNLOADS_SAFE:
-#if defined(OS_WIN) || defined(OS_LINUX)
+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD)
if (!GetUserDownloadsDirectorySafe(&cur))
return false;
break;
-@@ -426,7 +426,7 @@
- break;
- #endif
- #if BUILDFLAG(ENABLE_SUPERVISED_USERS)
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
- case chrome::DIR_SUPERVISED_USERS_DEFAULT_APPS:
- if (!PathService::Get(chrome::DIR_STANDALONE_EXTERNAL_EXTENSIONS, &cur))
- return false;
-@@ -474,10 +474,12 @@
+@@ -459,10 +459,12 @@
if (!base::PathExists(cur)) // We don't want to create this
return false;
break;
-#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_OPENBSD)
+#if defined(OS_POSIX) && !defined(OS_MACOSX)
case chrome::DIR_POLICY_FILES: {
#if defined(GOOGLE_CHROME_BUILD)
cur = base::FilePath(FILE_PATH_LITERAL("/etc/opt/chrome/policies"));
+#elif defined(OS_BSD)
+ cur = base::FilePath(FILE_PATH_LITERAL("/usr/local/etc/chrome/policies"));
#else
cur = base::FilePath(FILE_PATH_LITERAL("/etc/chromium/policies"));
#endif
-@@ -485,7 +487,7 @@
+@@ -470,7 +472,7 @@
}
#endif
#if defined(OS_CHROMEOS) || (defined(OS_LINUX) && defined(CHROMIUM_BUILD)) || \
- defined(OS_MACOSX)
+ defined(OS_MACOSX) || defined(OS_BSD)
case chrome::DIR_USER_EXTERNAL_EXTENSIONS: {
- if (!PathService::Get(chrome::DIR_USER_DATA, &cur))
+ if (!base::PathService::Get(chrome::DIR_USER_DATA, &cur))
return false;
-@@ -493,7 +495,7 @@
+@@ -478,7 +480,7 @@
break;
}
#endif
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
case chrome::DIR_STANDALONE_EXTERNAL_EXTENSIONS: {
cur = base::FilePath(kFilepathSinglePrefExtensions);
break;
-@@ -528,7 +530,7 @@
+@@ -513,7 +515,7 @@
#endif
break;
-#if defined(OS_LINUX) || defined(OS_MACOSX)
+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD)
case chrome::DIR_NATIVE_MESSAGING:
#if defined(OS_MACOSX)
#if defined(GOOGLE_CHROME_BUILD)
-@@ -542,6 +544,9 @@
+@@ -527,6 +529,9 @@
#if defined(GOOGLE_CHROME_BUILD)
cur = base::FilePath(FILE_PATH_LITERAL(
"/etc/opt/chrome/native-messaging-hosts"));
+#elif defined(OS_BSD)
+ cur = base::FilePath(FILE_PATH_LITERAL(
+ "/usr/local/etc/chrome/native-messaging-hosts"));
#else
cur = base::FilePath(FILE_PATH_LITERAL(
"/etc/chromium/native-messaging-hosts"));
-@@ -554,7 +559,7 @@
+@@ -539,7 +544,7 @@
return false;
cur = cur.Append(FILE_PATH_LITERAL("NativeMessagingHosts"));
break;
-#endif // defined(OS_LINUX) || defined(OS_MACOSX)
+#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD)
#if !defined(OS_ANDROID)
case chrome::DIR_GLOBAL_GCM_STORE:
- if (!PathService::Get(chrome::DIR_USER_DATA, &cur))
+ if (!base::PathService::Get(chrome::DIR_USER_DATA, &cur))
+@@ -547,7 +552,7 @@
+ cur = cur.Append(kGCMStoreDirname);
+ break;
+ #endif // !defined(OS_ANDROID)
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+ case chrome::FILE_COMPONENT_FLASH_HINT:
+ if (!base::PathService::Get(
+ chrome::DIR_COMPONENT_UPDATED_PEPPER_FLASH_PLUGIN, &cur)) {
+@@ -555,7 +560,7 @@
+ }
+ cur = cur.Append(kComponentUpdatedFlashHint);
+ break;
+-#endif // defined(OS_LINUX)
++#endif // defined(OS_LINUX) || defined(OS_BSD)
+ #if defined(OS_CHROMEOS)
+ case chrome::FILE_CHROME_OS_COMPONENT_FLASH:
+ cur = base::FilePath(kChromeOSComponentFlash);
Index: branches/2019Q2/www/chromium/files/patch-chrome_common_chrome__paths.h
===================================================================
--- branches/2019Q2/www/chromium/files/patch-chrome_common_chrome__paths.h (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-chrome_common_chrome__paths.h (revision 497959)
@@ -1,29 +1,42 @@
---- chrome/common/chrome_paths.h.orig 2017-04-19 19:06:30 UTC
-+++ chrome/common/chrome_paths.h
-@@ -51,7 +51,7 @@ enum {
+--- chrome/common/chrome_paths.h.orig 2019-03-21 01:36:35.000000000 +0100
++++ chrome/common/chrome_paths.h 2019-03-24 18:44:50.266637000 +0100
+@@ -51,7 +51,7 @@
// to set policies for chrome. This directory
// contains subdirectories.
#endif
-#if defined(OS_CHROMEOS) || (defined(OS_LINUX) && defined(CHROMIUM_BUILD)) || \
+#if defined(OS_CHROMEOS) || ((defined(OS_LINUX) || defined(OS_BSD)) && defined(CHROMIUM_BUILD)) || \
defined(OS_MACOSX)
DIR_USER_EXTERNAL_EXTENSIONS, // Directory for per-user external extensions
// on Chrome Mac and Chromium Linux.
-@@ -60,7 +60,7 @@ enum {
+@@ -60,7 +60,7 @@
// create it.
#endif
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
DIR_STANDALONE_EXTERNAL_EXTENSIONS, // Directory for 'per-extension'
// definition manifest files that
// describe extensions which are to be
-@@ -113,7 +113,7 @@ enum {
+@@ -107,7 +107,7 @@
DIR_SUPERVISED_USER_INSTALLED_WHITELISTS, // Directory where sanitized
// supervised user whitelists are
// installed.
-#if defined(OS_LINUX) || defined(OS_MACOSX)
+#if defined(OS_LINUX) || defined(OS_BSD) || defined(OS_MACOSX)
DIR_NATIVE_MESSAGING, // System directory where native messaging host
// manifest files are stored.
DIR_USER_NATIVE_MESSAGING, // Directory with Native Messaging Hosts
+@@ -122,10 +122,10 @@
+ DIR_GEN_TEST_DATA, // Directory where generated test data resides.
+ DIR_TEST_DATA, // Directory where unit test data resides.
+ DIR_TEST_TOOLS, // Directory where unit test tools reside.
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+ FILE_COMPONENT_FLASH_HINT, // A file in a known location that points to
+ // the component updated flash plugin.
+-#endif // defined(OS_LINUX)
++#endif // defined(OS_LINUX) || defined(OS_BSD)
+ #if defined(OS_CHROMEOS)
+ FILE_CHROME_OS_COMPONENT_FLASH, // The location of component updated Flash on
+ // Chrome OS.
Index: branches/2019Q2/www/chromium/files/patch-chrome_common_chrome__paths__internal.h
===================================================================
--- branches/2019Q2/www/chromium/files/patch-chrome_common_chrome__paths__internal.h (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-chrome_common_chrome__paths__internal.h (revision 497959)
@@ -1,11 +1,11 @@
---- chrome/common/chrome_paths_internal.h.orig 2017-06-05 19:03:03 UTC
+--- chrome/common/chrome_paths_internal.h.orig 2019-03-11 22:00:54 UTC
+++ chrome/common/chrome_paths_internal.h
@@ -45,7 +45,7 @@ void GetUserCacheDirectory(const base::FilePath& profi
// Get the path to the user's documents directory.
bool GetUserDocumentsDirectory(base::FilePath* result);
-#if defined(OS_WIN) || defined(OS_LINUX)
+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD)
// Gets the path to a safe default download directory for a user.
bool GetUserDownloadsDirectorySafe(base::FilePath* result);
#endif
Index: branches/2019Q2/www/chromium/files/patch-chrome_common_chrome__switches.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-chrome_common_chrome__switches.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-chrome_common_chrome__switches.cc (revision 497959)
@@ -1,17 +1,17 @@
---- chrome/common/chrome_switches.cc.orig 2019-01-30 02:17:48.000000000 +0100
-+++ chrome/common/chrome_switches.cc 2019-01-31 23:25:33.468702000 +0100
-@@ -940,12 +940,12 @@
+--- chrome/common/chrome_switches.cc.orig 2019-03-11 22:00:54 UTC
++++ chrome/common/chrome_switches.cc
+@@ -914,12 +914,12 @@ const char kAllowNaClFileHandleAPI[] = "allow-n
const char kAllowNaClSocketAPI[] = "allow-nacl-socket-api";
#endif
-#if defined(OS_WIN) || defined(OS_LINUX)
+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD)
const char kDisableInputImeAPI[] = "disable-input-ime-api";
const char kEnableInputImeAPI[] = "enable-input-ime-api";
#endif
-#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN)
+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD)
const char kEnableNewAppMenuIcon[] = "enable-new-app-menu-icon";
#endif
Index: branches/2019Q2/www/chromium/files/patch-chrome_common_chrome__switches.h
===================================================================
--- branches/2019Q2/www/chromium/files/patch-chrome_common_chrome__switches.h (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-chrome_common_chrome__switches.h (revision 497959)
@@ -1,17 +1,17 @@
---- chrome/common/chrome_switches.h.orig 2017-12-24 03:11:35.192869000 +0100
-+++ chrome/common/chrome_switches.h 2017-12-24 03:12:02.641567000 +0100
-@@ -313,12 +313,12 @@
- extern const char kEnableWaylandServer[];
+--- chrome/common/chrome_switches.h.orig 2019-03-11 22:00:54 UTC
++++ chrome/common/chrome_switches.h
+@@ -282,12 +282,12 @@ extern const char kAllowNaClFileHandleAPI[];
+ extern const char kAllowNaClSocketAPI[];
#endif
-#if defined(OS_WIN) || defined(OS_LINUX)
+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD)
extern const char kDisableInputImeAPI[];
extern const char kEnableInputImeAPI[];
#endif
-#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN)
+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD)
extern const char kEnableNewAppMenuIcon[];
#endif
Index: branches/2019Q2/www/chromium/files/patch-chrome_common_extensions_api_api__sources.gni
===================================================================
--- branches/2019Q2/www/chromium/files/patch-chrome_common_extensions_api_api__sources.gni (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-chrome_common_extensions_api_api__sources.gni (revision 497959)
@@ -1,11 +1,11 @@
---- chrome/common/extensions/api/api_sources.gni.orig 2018-12-05 16:27:03.671155000 +0100
-+++ chrome/common/extensions/api/api_sources.gni 2018-12-05 16:27:49.125255000 +0100
-@@ -113,7 +113,7 @@
+--- chrome/common/extensions/api/api_sources.gni.orig 2019-03-11 22:00:54 UTC
++++ chrome/common/extensions/api/api_sources.gni
+@@ -109,7 +109,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/2019Q2/www/chromium/files/patch-chrome_common_extensions_command.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-chrome_common_extensions_command.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-chrome_common_extensions_command.cc (revision 497959)
@@ -1,11 +1,11 @@
---- chrome/common/extensions/command.cc.orig 2017-06-05 19:03:03 UTC
+--- chrome/common/extensions/command.cc.orig 2019-03-11 22:00:54 UTC
+++ chrome/common/extensions/command.cc
-@@ -303,7 +303,7 @@ std::string Command::CommandPlatform() {
+@@ -309,7 +309,7 @@ std::string Command::CommandPlatform() {
return values::kKeybindingPlatformMac;
#elif defined(OS_CHROMEOS)
return values::kKeybindingPlatformChromeOs;
-#elif defined(OS_LINUX)
+#elif defined(OS_LINUX) || defined(OS_BSD)
return values::kKeybindingPlatformLinux;
#else
return "";
Index: branches/2019Q2/www/chromium/files/patch-chrome_common_features.gni
===================================================================
--- branches/2019Q2/www/chromium/files/patch-chrome_common_features.gni (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-chrome_common_features.gni (revision 497959)
@@ -1,14 +1,14 @@
---- chrome/common/features.gni.orig 2019-01-30 02:17:49.000000000 +0100
-+++ chrome/common/features.gni 2019-01-31 23:22:21.293971000 +0100
-@@ -41,9 +41,9 @@
+--- chrome/common/features.gni.orig 2019-03-11 22:00:54 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
# Enables use of the session service, which is enabled by default.
# Android stores them separately on the Java side.
Index: branches/2019Q2/www/chromium/files/patch-chrome_common_pref__names.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-chrome_common_pref__names.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-chrome_common_pref__names.cc (revision 497959)
@@ -1,29 +1,29 @@
---- chrome/common/pref_names.cc.orig 2017-06-05 19:03:03 UTC
+--- chrome/common/pref_names.cc.orig 2019-03-11 22:00:54 UTC
+++ chrome/common/pref_names.cc
-@@ -1009,7 +1009,7 @@ const char kForceSessionSync[] = "settings.history_rec
+@@ -946,7 +946,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
-@@ -1096,7 +1096,7 @@ const char kShowUpdatePromotionInfoBar[] =
+@@ -1038,7 +1038,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";
-@@ -1475,7 +1475,7 @@ const char kDownloadDefaultDirectory[] = "download.def
+@@ -1419,7 +1419,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
Index: branches/2019Q2/www/chromium/files/patch-chrome_common_pref__names.h
===================================================================
--- branches/2019Q2/www/chromium/files/patch-chrome_common_pref__names.h (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-chrome_common_pref__names.h (revision 497959)
@@ -1,29 +1,29 @@
---- chrome/common/pref_names.h.orig 2017-06-05 19:03:03 UTC
+--- chrome/common/pref_names.h.orig 2019-03-11 22:00:54 UTC
+++ chrome/common/pref_names.h
-@@ -337,7 +337,7 @@ extern const char kForceGoogleSafeSearch[];
+@@ -300,7 +300,7 @@ extern const char kMdHistoryMenuPromoShown[];
+ extern const char kForceGoogleSafeSearch[];
extern const char kForceYouTubeRestrict[];
- extern const char kForceSessionSync[];
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[];
-@@ -370,7 +370,7 @@ extern const char kDefaultBrowserSettingEnabled[];
+@@ -333,7 +333,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
- extern const char kBackShortcutBubbleShownCount[];
-@@ -529,7 +529,7 @@ extern const char kAppWindowPlacement[];
+ #if BUILDFLAG(ENABLE_PLUGINS)
+@@ -487,7 +487,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)
Index: branches/2019Q2/www/chromium/files/patch-chrome_common_webui__url__constants.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-chrome_common_webui__url__constants.cc (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-chrome_common_webui__url__constants.cc (revision 497959)
@@ -0,0 +1,41 @@
+--- chrome/common/webui_url_constants.cc.orig 2019-03-11 22:00:54 UTC
++++ chrome/common/webui_url_constants.cc
+@@ -246,7 +246,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";
+@@ -257,11 +257,11 @@ 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_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
+
+@@ -415,13 +415,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)
Property changes on: branches/2019Q2/www/chromium/files/patch-chrome_common_webui__url__constants.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/2019Q2/www/chromium/files/patch-chrome_common_webui__url__constants.h
===================================================================
--- branches/2019Q2/www/chromium/files/patch-chrome_common_webui__url__constants.h (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-chrome_common_webui__url__constants.h (revision 497959)
@@ -0,0 +1,25 @@
+--- chrome/common/webui_url_constants.h.orig 2019-03-11 22:00:54 UTC
++++ chrome/common/webui_url_constants.h
+@@ -241,7 +241,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[];
+@@ -253,11 +253,11 @@ 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_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
+
Property changes on: branches/2019Q2/www/chromium/files/patch-chrome_common_webui__url__constants.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/2019Q2/www/chromium/files/patch-chrome_renderer_chrome__content__renderer__client.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-chrome_renderer_chrome__content__renderer__client.cc (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-chrome_renderer_chrome__content__renderer__client.cc (revision 497959)
@@ -0,0 +1,11 @@
+--- chrome/renderer/chrome_content_renderer_client.cc.orig 2019-03-17 20:22:37 UTC
++++ chrome/renderer/chrome_content_renderer_client.cc
+@@ -1012,7 +1012,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,
Property changes on: branches/2019Q2/www/chromium/files/patch-chrome_renderer_chrome__content__renderer__client.cc
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: branches/2019Q2/www/chromium/files/patch-chrome_renderer_pepper_pepper__flash__font__file__host.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-chrome_renderer_pepper_pepper__flash__font__file__host.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-chrome_renderer_pepper_pepper__flash__font__file__host.cc (revision 497959)
@@ -1,29 +1,29 @@
---- chrome/renderer/pepper/pepper_flash_font_file_host.cc.orig 2018-12-03 21:16:44.000000000 +0100
-+++ chrome/renderer/pepper/pepper_flash_font_file_host.cc 2018-12-13 18:20:56.573572000 +0100
+--- chrome/renderer/pepper/pepper_flash_font_file_host.cc.orig 2019-03-11 22:00:54 UTC
++++ chrome/renderer/pepper/pepper_flash_font_file_host.cc
@@ -15,7 +15,7 @@
#include "ppapi/proxy/ppapi_messages.h"
#include "ppapi/proxy/serialized_structs.h"
-#if defined(OS_LINUX) || defined(OS_OPENBSD)
+#if defined(OS_LINUX) || defined(OS_BSD)
#include "components/services/font/public/cpp/font_loader.h"
#include "content/public/common/common_sandbox_support_linux.h"
#elif defined(OS_WIN)
-@@ -29,7 +29,7 @@
+@@ -29,7 +29,7 @@ PepperFlashFontFileHost::PepperFlashFontFileHost(
const ppapi::proxy::SerializedFontDescription& description,
PP_PrivateFontCharset charset)
: ResourceHost(host->GetPpapiHost(), instance, resource) {
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
// The global SkFontConfigInterface is configured and initialized with a
// SkFontconfigInterface compatible font_service::FontLoader in
// RendererBlinkPlatformImpl (called from RenderThreadImpl::Init) at startup
-@@ -74,7 +74,7 @@
+@@ -74,7 +74,7 @@ bool PepperFlashFontFileHost::GetFontData(uint32_t tab
void* buffer,
size_t* length) {
bool result = false;
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
if (font_file_.IsValid()) {
result = content::GetFontTable(font_file_.GetPlatformFile(), table,
0 /* offset */,
Index: branches/2019Q2/www/chromium/files/patch-chrome_renderer_pepper_pepper__flash__font__file__host.h
===================================================================
--- branches/2019Q2/www/chromium/files/patch-chrome_renderer_pepper_pepper__flash__font__file__host.h (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-chrome_renderer_pepper_pepper__flash__font__file__host.h (revision 497959)
@@ -1,20 +1,20 @@
---- chrome/renderer/pepper/pepper_flash_font_file_host.h.orig 2018-12-13 18:23:18.267950000 +0100
-+++ chrome/renderer/pepper/pepper_flash_font_file_host.h 2018-12-13 18:24:04.656797000 +0100
+--- chrome/renderer/pepper/pepper_flash_font_file_host.h.orig 2019-03-11 22:00:54 UTC
++++ chrome/renderer/pepper/pepper_flash_font_file_host.h
@@ -14,7 +14,7 @@
#include "ppapi/c/private/pp_private_font_charset.h"
#include "ppapi/host/resource_host.h"
-#if defined(OS_LINUX) || defined(OS_OPENBSD)
+#if defined(OS_LINUX) || defined(OS_BSD)
#include "base/files/file.h"
#elif defined(OS_WIN)
#include "third_party/skia/include/core/SkRefCnt.h"
-@@ -50,7 +50,7 @@
+@@ -50,7 +50,7 @@ class PepperFlashFontFileHost : public ppapi::host::Re
uint32_t table);
bool GetFontData(uint32_t table, void* buffer, size_t* length);
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
base::File font_file_;
#elif defined(OS_WIN)
sk_sp<SkTypeface> typeface_;
Index: branches/2019Q2/www/chromium/files/patch-chrome_service_cloud__print_print__system.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-chrome_service_cloud__print_print__system.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-chrome_service_cloud__print_print__system.cc (revision 497959)
@@ -1,11 +1,11 @@
---- chrome/service/cloud_print/print_system.cc.orig 2018-03-24 13:33:28.414570000 +0100
-+++ chrome/service/cloud_print/print_system.cc 2018-03-24 13:31:35.144592000 +0100
-@@ -36,7 +36,7 @@
+--- chrome/service/cloud_print/print_system.cc.orig 2019-03-11 22:00:54 UTC
++++ chrome/service/cloud_print/print_system.cc
+@@ -36,7 +36,7 @@ std::string PrintSystem::GenerateProxyId() {
return base::GenerateGUID();
}
-#if defined(OS_LINUX) && !defined(USE_CUPS)
+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(USE_CUPS)
scoped_refptr<PrintSystem> PrintSystem::CreateInstance(
const base::DictionaryValue*) {
return nullptr;
Index: branches/2019Q2/www/chromium/files/patch-chrome_test_BUILD.gn
===================================================================
--- branches/2019Q2/www/chromium/files/patch-chrome_test_BUILD.gn (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-chrome_test_BUILD.gn (revision 497959)
@@ -0,0 +1,11 @@
+--- chrome/test/BUILD.gn.orig 2019-03-24 18:46:05.402110000 +0100
++++ chrome/test/BUILD.gn 2019-03-24 18:46:25.234572000 +0100
+@@ -5232,7 +5232,7 @@
+ "//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" ]
+ }
Property changes on: branches/2019Q2/www/chromium/files/patch-chrome_test_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/2019Q2/www/chromium/files/patch-chrome_test_base_in__process__browser__test.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-chrome_test_base_in__process__browser__test.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-chrome_test_base_in__process__browser__test.cc (revision 497959)
@@ -1,22 +1,22 @@
---- chrome/test/base/in_process_browser_test.cc.orig 2018-08-08 21:10:43.000000000 +0200
-+++ chrome/test/base/in_process_browser_test.cc 2018-08-21 00:58:24.257483000 +0200
-@@ -69,6 +69,10 @@
+--- chrome/test/base/in_process_browser_test.cc.orig 2019-03-11 22:00:54 UTC
++++ chrome/test/base/in_process_browser_test.cc
+@@ -74,6 +74,10 @@
#include "chrome/test/base/scoped_bundle_swizzler_mac.h"
#endif
+#if defined(OS_FREEBSD)
+#include <signal.h>
+#endif
+
#if defined(OS_WIN)
#include "base/win/scoped_com_initializer.h"
#include "base/win/windows_version.h"
-@@ -88,7 +92,7 @@
- #include "chrome/test/base/default_ash_event_generator_delegate.h"
+@@ -102,7 +106,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/2019Q2/www/chromium/files/patch-chrome_test_base_testing__browser__process.h
===================================================================
--- branches/2019Q2/www/chromium/files/patch-chrome_test_base_testing__browser__process.h (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-chrome_test_base_testing__browser__process.h (revision 497959)
@@ -1,13 +1,13 @@
---- chrome/test/base/testing_browser_process.h.orig 2017-06-05 19:03:04 UTC
+--- chrome/test/base/testing_browser_process.h.orig 2019-03-11 22:00:54 UTC
+++ chrome/test/base/testing_browser_process.h
-@@ -108,8 +108,8 @@ class TestingBrowserProcess : public BrowserProcess {
+@@ -119,8 +119,8 @@ class TestingBrowserProcess : public BrowserProcess {
DownloadStatusUpdater* download_status_updater() override;
DownloadRequestLimiter* download_request_limiter() 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/2019Q2/www/chromium/files/patch-chrome_test_chromedriver_chrome_chrome__finder.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-chrome_test_chromedriver_chrome_chrome__finder.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-chrome_test_chromedriver_chrome_chrome__finder.cc (revision 497959)
@@ -1,20 +1,20 @@
---- chrome/test/chromedriver/chrome/chrome_finder.cc.orig 2017-06-05 19:03:04 UTC
+--- chrome/test/chromedriver/chrome/chrome_finder.cc.orig 2019-03-11 22:00:54 UTC
+++ chrome/test/chromedriver/chrome/chrome_finder.cc
-@@ -45,7 +45,7 @@ void GetApplicationDirs(std::vector<base::FilePath>* l
+@@ -48,7 +48,7 @@ void GetApplicationDirs(std::vector<base::FilePath>* l
installation_locations[i].Append(L"Chromium\\Application"));
}
}
-#elif defined(OS_LINUX)
+#elif defined(OS_LINUX) || defined(OS_BSD)
void GetApplicationDirs(std::vector<base::FilePath>* locations) {
- locations->push_back(base::FilePath("/opt/google/chrome"));
- locations->push_back(base::FilePath("/usr/local/bin"));
-@@ -95,7 +95,7 @@ bool FindChrome(base::FilePath* browser_exe) {
+ // TODO: Respect users' PATH variables.
+ // Until then, we use an approximation of the most common defaults.
+@@ -135,7 +135,7 @@ bool FindChrome(base::FilePath* browser_exe) {
#elif defined(OS_MACOSX)
base::FilePath("Google Chrome.app/Contents/MacOS/Google Chrome"),
base::FilePath("Chromium.app/Contents/MacOS/Chromium")
-#elif defined(OS_LINUX)
+#elif defined(OS_LINUX) || defined(OS_BSD)
base::FilePath("google-chrome"),
base::FilePath("chrome"),
base::FilePath("chromium"),
Index: branches/2019Q2/www/chromium/files/patch-chromecast_browser_cast__browser__main__parts.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-chromecast_browser_cast__browser__main__parts.cc (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-chromecast_browser_cast__browser__main__parts.cc (revision 497959)
@@ -0,0 +1,29 @@
+--- chromecast/browser/cast_browser_main_parts.cc.orig 2019-03-11 22:00:56 UTC
++++ chromecast/browser/cast_browser_main_parts.cc
+@@ -66,7 +66,7 @@
+ #include "ui/compositor/compositor_switches.h"
+ #include "ui/gl/gl_switches.h"
+
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+ #include <fontconfig/fontconfig.h>
+ #include <signal.h>
+ #include <sys/prctl.h>
+@@ -244,7 +244,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.
+@@ -393,7 +393,7 @@ void CastBrowserMainParts::PostMainMessageLoopStart()
+ }
+
+ void CastBrowserMainParts::ToolkitInitialized() {
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+ // Without this call, the FontConfig library gets implicitly initialized
+ // on the first call to FontConfig. Since it's not safe to initialize it
+ // concurrently from multiple threads, we explicitly initialize it here
Property changes on: branches/2019Q2/www/chromium/files/patch-chromecast_browser_cast__browser__main__parts.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/2019Q2/www/chromium/files/patch-chromecast_browser_cast__content__browser__client.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-chromecast_browser_cast__content__browser__client.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-chromecast_browser_cast__content__browser__client.cc (revision 497959)
@@ -1,11 +1,11 @@
---- chromecast/browser/cast_content_browser_client.cc.orig 2018-06-13 00:10:12.000000000 +0200
-+++ chromecast/browser/cast_content_browser_client.cc 2018-07-18 23:13:48.741141000 +0200
-@@ -416,7 +416,7 @@
+--- chromecast/browser/cast_content_browser_client.cc.orig 2019-03-11 22:00:56 UTC
++++ chromecast/browser/cast_content_browser_client.cc
+@@ -524,7 +524,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/2019Q2/www/chromium/files/patch-chromecast_browser_tts_tts__controller__impl.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-chromecast_browser_tts_tts__controller__impl.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-chromecast_browser_tts_tts__controller__impl.cc (revision 497959)
@@ -1,14 +1,14 @@
---- chromecast/browser/tts/tts_controller_impl.cc.orig 2019-01-31 23:07:11.992155000 +0100
-+++ chromecast/browser/tts/tts_controller_impl.cc 2019-01-31 23:08:40.991798000 +0100
-@@ -390,7 +390,11 @@
+--- chromecast/browser/tts/tts_controller_impl.cc.orig 2019-03-11 22:00:56 UTC
++++ chromecast/browser/tts/tts_controller_impl.cc
+@@ -390,7 +390,11 @@ int TtsControllerImpl::QueueSize() {
}
TtsPlatformImpl* TtsControllerImpl::GetPlatformImpl() {
+#if defined(OS_BSD)
+ return NULL;
+#else
return platform_impl_.get();
+#endif // defined(OS_BSD)
}
std::string TtsControllerImpl::GetApplicationLocale() const {
Index: branches/2019Q2/www/chromium/files/patch-chromecast_media_cma_backend_media__pipeline__backend__for__mixer.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-chromecast_media_cma_backend_media__pipeline__backend__for__mixer.cc (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-chromecast_media_cma_backend_media__pipeline__backend__for__mixer.cc (revision 497959)
@@ -0,0 +1,23 @@
+--- chromecast/media/cma/backend/media_pipeline_backend_for_mixer.cc.orig 2019-03-17 18:44:55 UTC
++++ chromecast/media/cma/backend/media_pipeline_backend_for_mixer.cc
+@@ -14,9 +14,9 @@
+ #include "chromecast/media/cma/backend/av_sync.h"
+ #include "chromecast/media/cma/backend/video_decoder_for_mixer.h"
+
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+ #include "chromecast/media/cma/backend/audio_buildflags.h"
+-#endif // defined(OS_LINUX)
++#endif // defined(OS_LINUX) || defined(OS_BSD)
+
+ #if defined(OS_FUCHSIA)
+ #include <zircon/syscalls.h>
+@@ -226,7 +226,7 @@ MediaPipelineBackendForMixer::GetTaskRunner() const {
+ return static_cast<TaskRunnerImpl*>(params_.task_runner)->runner();
+ }
+
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+ int64_t MediaPipelineBackendForMixer::MonotonicClockNow() const {
+ timespec now = {0, 0};
+ #if BUILDFLAG(MEDIA_CLOCK_MONOTONIC_RAW)
Property changes on: branches/2019Q2/www/chromium/files/patch-chromecast_media_cma_backend_media__pipeline__backend__for__mixer.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/2019Q2/www/chromium/files/patch-components_autofill__strings.grdp
===================================================================
--- branches/2019Q2/www/chromium/files/patch-components_autofill__strings.grdp (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-components_autofill__strings.grdp (revision 497959)
@@ -0,0 +1,11 @@
+--- components/autofill_strings.grdp.orig 2019-03-11 22:00:56 UTC
++++ components/autofill_strings.grdp
+@@ -217,7 +217,7 @@
+ <message name="IDS_AUTOFILL_NAME_FIX_FLOW_PROMPT_SAVE_CARD" desc="Text to show for the Autofill save credit card prompt card holder name fix flow button." formatter_data="android_java">
+ Save card
+ </message>
+- <if expr="is_linux and not chromeos">
++ <if expr="is_posix and not chromeos">
+ <then>
+ <message name="IDS_AUTOFILL_SAVE_CARD_PROMPT_TITLE_TO_CLOUD" desc="Title text for the Autofill save card prompt when the card is to be saved by uploading it to Google Payments and also saved locally. The prompt can be either a bubble or an infobar.">
+ Do you want to save this card to your Google Account?
Property changes on: branches/2019Q2/www/chromium/files/patch-components_autofill__strings.grdp
___________________________________________________________________
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/2019Q2/www/chromium/files/patch-components_autofill_content_renderer_password__form__conversion__utils.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-components_autofill_content_renderer_password__form__conversion__utils.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-components_autofill_content_renderer_password__form__conversion__utils.cc (revision 497959)
@@ -1,14 +1,14 @@
---- components/autofill/content/renderer/password_form_conversion_utils.cc.orig 2018-08-01 00:08:37.000000000 +0200
-+++ components/autofill/content/renderer/password_form_conversion_utils.cc 2018-08-04 17:44:14.098469000 +0200
-@@ -38,7 +38,11 @@
+--- components/autofill/content/renderer/password_form_conversion_utils.cc.orig 2019-03-11 22:00:56 UTC
++++ components/autofill/content/renderer/password_form_conversion_utils.cc
+@@ -37,7 +37,11 @@
#include "third_party/blink/public/web/web_form_control_element.h"
#include "third_party/blink/public/web/web_input_element.h"
#include "third_party/blink/public/web/web_local_frame.h"
+#if defined(OS_BSD)
+#include <re2/re2.h>
+#else
#include "third_party/re2/src/re2/re2.h"
+#endif
#include "url/gurl.h"
using blink::WebFormControlElement;
Index: branches/2019Q2/www/chromium/files/patch-components_autofill_core_browser_autofill__experiments.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-components_autofill_core_browser_autofill__experiments.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-components_autofill_core_browser_autofill__experiments.cc (revision 497959)
@@ -1,80 +1,46 @@
---- components/autofill/core/browser/autofill_experiments.cc.orig 2018-12-12 22:56:05.000000000 +0100
-+++ components/autofill/core/browser/autofill_experiments.cc 2018-12-28 16:48:40.407244000 +0100
-@@ -27,7 +27,7 @@
+--- components/autofill/core/browser/autofill_experiments.cc.orig 2019-03-11 22:00:56 UTC
++++ components/autofill/core/browser/autofill_experiments.cc
+@@ -28,7 +28,7 @@
namespace autofill {
-#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN)
+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD)
- namespace {
- // Returns the font weight corresponding to the value of param
- // kAutofillForcedFontWeightParameterName, or kDefault if the param is not
-@@ -45,9 +45,9 @@
- return ForcedFontWeight::kDefault;
- }
- } // namespace
--#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN)
-+#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD)
-
--#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN)
-+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD)
const base::Feature kAutofillDropdownLayoutExperiment{
"AutofillDropdownLayout", base::FEATURE_DISABLED_BY_DEFAULT};
const char kAutofillDropdownLayoutParameterName[] = "variant";
-@@ -55,15 +55,15 @@
+@@ -36,7 +36,7 @@ const char kAutofillDropdownLayoutParameterLeadingIcon
const char kAutofillDropdownLayoutParameterTrailingIcon[] = "trailing-icon";
const char kAutofillDropdownLayoutParameterTwoLinesLeadingIcon[] =
"two-lines-leading-icon";
-#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN)
+#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD)
--#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN)
-+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD)
- const base::Feature kAutofillPrimaryInfoStyleExperiment{
- "AutofillPrimaryInfoStyleExperiment", base::FEATURE_DISABLED_BY_DEFAULT};
- const char kAutofillForcedFontWeightParameterName[] = "font_weight";
- const char kAutofillForcedFontWeightParameterMedium[] = "medium";
- const char kAutofillForcedFontWeightParameterBold[] = "bold";
--#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN)
-+#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD)
-
bool IsCreditCardUploadEnabled(const PrefService* pref_service,
const syncer::SyncService* sync_service,
-@@ -152,7 +152,7 @@
+@@ -143,7 +143,7 @@ bool IsAutofillNoLocalSaveOnUploadSuccessExperimentEna
}
- bool OfferStoreUnmaskedCards() {
+ bool OfferStoreUnmaskedCards(bool is_off_the_record) {
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_BSD) || 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(
-@@ -185,7 +185,7 @@
+@@ -181,7 +181,7 @@ bool ShouldUseActiveSignedInAccount() {
features::kAutofillGetPaymentsIdentityFromSync);
}
-#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN)
+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD)
- ForcedFontWeight GetForcedFontWeight() {
- if (!base::FeatureList::IsEnabled(kAutofillPrimaryInfoStyleExperiment))
- return ForcedFontWeight::kDefault;
-@@ -194,9 +194,9 @@
- static ForcedFontWeight font_weight_from_param = GetFontWeightFromParam();
- return font_weight_from_param;
- }
--#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN)
-+#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD)
-
--#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN)
-+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD)
ForcedPopupLayoutState GetForcedPopupLayoutState() {
if (!base::FeatureList::IsEnabled(
autofill::kAutofillDropdownLayoutExperiment))
-@@ -220,6 +220,6 @@
+@@ -205,6 +205,6 @@ ForcedPopupLayoutState GetForcedPopupLayoutState() {
NOTREACHED();
return ForcedPopupLayoutState::kDefault;
}
-#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN)
+#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD)
} // namespace autofill
Index: branches/2019Q2/www/chromium/files/patch-components_autofill_core_browser_autofill__experiments.h
===================================================================
--- branches/2019Q2/www/chromium/files/patch-components_autofill_core_browser_autofill__experiments.h (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-components_autofill_core_browser_autofill__experiments.h (revision 497959)
@@ -1,57 +1,36 @@
---- components/autofill/core/browser/autofill_experiments.h.orig 2018-12-28 16:46:01.899706000 +0100
-+++ components/autofill/core/browser/autofill_experiments.h 2018-12-28 16:46:45.873415000 +0100
-@@ -23,20 +23,20 @@
+--- components/autofill/core/browser/autofill_experiments.h.orig 2019-03-11 22:00:56 UTC
++++ components/autofill/core/browser/autofill_experiments.h
+@@ -23,13 +23,13 @@ class SyncService;
namespace autofill {
// Parameterized Features (grouped with parameter name and options)
-#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN)
+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD)
extern const base::Feature kAutofillDropdownLayoutExperiment;
extern const char kAutofillDropdownLayoutParameterName[];
extern const char kAutofillDropdownLayoutParameterLeadingIcon[];
extern const char kAutofillDropdownLayoutParameterTrailingIcon[];
extern const char kAutofillDropdownLayoutParameterTwoLinesLeadingIcon[];
-#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN)
+#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD)
--#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN)
-+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD)
- extern const base::Feature kAutofillPrimaryInfoStyleExperiment;
- extern const char kAutofillForcedFontWeightParameterName[];
- extern const char kAutofillForcedFontWeightParameterMedium[];
- extern const char kAutofillForcedFontWeightParameterBold[];
--#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN)
-+#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD)
-
// Returns true if uploading credit cards to Wallet servers is enabled. This
// requires the appropriate flags and user settings to be true and the user to
-@@ -66,7 +66,7 @@
+@@ -59,7 +59,7 @@ bool OfferStoreUnmaskedCards(bool is_off_the_record);
// Returns whether the account of the active signed-in user should be used.
bool ShouldUseActiveSignedInAccount();
-#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN)
+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD)
- enum class ForcedFontWeight {
- kDefault, // No change to the font weight.
- kMedium,
-@@ -78,9 +78,9 @@
- // kAutofillPrimaryInfoStyleExperiment is disabled or if the corresponding
- // feature param is invalid.
- ForcedFontWeight GetForcedFontWeight();
--#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN)
-+#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD)
-
--#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN)
-+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD)
enum class ForcedPopupLayoutState {
kDefault, // No popup layout forced by experiment.
kLeadingIcon, // Experiment forces leading (left in LTR) icon layout.
-@@ -94,7 +94,7 @@
+@@ -73,7 +73,7 @@ enum class ForcedPopupLayoutState {
// if the experiment param matches kAutofillDropdownLayoutParameterLeadingIcon
// or kAutofillDropdownLayoutParameterTrailingIcon, respectively.
ForcedPopupLayoutState GetForcedPopupLayoutState();
-#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN)
+#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD)
} // namespace autofill
Index: branches/2019Q2/www/chromium/files/patch-components_autofill_core_common_autofill__util.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-components_autofill_core_common_autofill__util.cc (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-components_autofill_core_common_autofill__util.cc (revision 497959)
@@ -0,0 +1,11 @@
+--- components/autofill/core/common/autofill_util.cc.orig 2019-03-11 22:00:56 UTC
++++ components/autofill/core/common/autofill_util.cc
+@@ -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;
Property changes on: branches/2019Q2/www/chromium/files/patch-components_autofill_core_common_autofill__util.cc
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: branches/2019Q2/www/chromium/files/patch-components_content__settings_core_browser_website__settings__registry.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-components_content__settings_core_browser_website__settings__registry.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-components_content__settings_core_browser_website__settings__registry.cc (revision 497959)
@@ -1,11 +1,11 @@
---- components/content_settings/core/browser/website_settings_registry.cc.orig 2017-09-05 21:05:17.000000000 +0200
-+++ components/content_settings/core/browser/website_settings_registry.cc 2017-09-10 01:16:20.683275000 +0200
-@@ -70,7 +70,7 @@
+--- components/content_settings/core/browser/website_settings_registry.cc.orig 2019-03-11 22:00:56 UTC
++++ components/content_settings/core/browser/website_settings_registry.cc
+@@ -66,7 +66,7 @@ const WebsiteSettingsInfo* WebsiteSettingsRegistry::Re
#if defined(OS_WIN)
if (!(platform & PLATFORM_WINDOWS))
return nullptr;
-#elif defined(OS_LINUX) && !defined(OS_CHROMEOS)
+#elif (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
if (!(platform & PLATFORM_LINUX))
return nullptr;
#elif defined(OS_MACOSX) && !defined(OS_IOS)
Index: branches/2019Q2/www/chromium/files/patch-components_cookie__config_cookie__store__util.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-components_cookie__config_cookie__store__util.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-components_cookie__config_cookie__store__util.cc (revision 497959)
@@ -1,24 +1,24 @@
---- components/cookie_config/cookie_store_util.cc.orig 2017-06-05 19:03:05 UTC
+--- components/cookie_config/cookie_store_util.cc.orig 2019-03-11 22:00:56 UTC
+++ components/cookie_config/cookie_store_util.cc
@@ -11,7 +11,7 @@
namespace cookie_config {
-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)
+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD)
namespace {
// Use the operating system's mechanisms to encrypt cookies before writing
@@ -63,10 +63,10 @@ base::LazyInstance<CookieOSCryptoDelegate>::Destructor
net::CookieCryptoDelegate* GetCookieCryptoDelegate() {
return g_cookie_crypto_delegate.Pointer();
}
-#else // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)
+#else // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD)
net::CookieCryptoDelegate* GetCookieCryptoDelegate() {
return NULL;
}
-#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)
+#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD)
} // namespace cookie_config
Index: branches/2019Q2/www/chromium/files/patch-components_crash_content_app_BUILD.gn
===================================================================
--- branches/2019Q2/www/chromium/files/patch-components_crash_content_app_BUILD.gn (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-components_crash_content_app_BUILD.gn (revision 497959)
@@ -1,20 +1,29 @@
---- components/crash/content/app/BUILD.gn.orig 2018-12-03 21:16:48.000000000 +0100
-+++ components/crash/content/app/BUILD.gn 2018-12-13 18:52:20.920947000 +0100
-@@ -36,7 +36,7 @@
+--- components/crash/content/app/BUILD.gn.orig 2019-03-11 22:00:56 UTC
++++ components/crash/content/app/BUILD.gn
+@@ -36,12 +36,12 @@ static_library("app") {
sources += [ "crashpad.cc" ]
}
-- if (is_android || is_linux) {
-+ if (is_android || is_linux && !is_bsd) {
- # Want these files on both Linux and Android.
+- 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 += [
-@@ -73,8 +73,6 @@
- "//content/public/common:content_descriptors",
- "//content/public/common:result_codes",
- "//sandbox",
-- "//third_party/breakpad:client",
-- "//third_party/crashpad/crashpad/snapshot",
+ "breakpad_linux.cc",
+ "breakpad_linux.h",
+@@ -79,7 +79,10 @@ static_library("app") {
+ "//third_party/crashpad/crashpad/snapshot",
]
- }
+- if (is_linux) {
++ if (is_bsd) {
++ deps -= [ "//third_party/crashpad/crashpad/snapshot" ]
++ }
++ if (is_linux && !is_bsd) {
+ deps += [ "//third_party/breakpad:client" ]
+ }
+ }
Index: branches/2019Q2/www/chromium/files/patch-components_crash_content_app_crashpad.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-components_crash_content_app_crashpad.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-components_crash_content_app_crashpad.cc (revision 497959)
@@ -1,43 +1,43 @@
---- components/crash/content/app/crashpad.cc.orig 2019-01-30 02:17:53.000000000 +0100
-+++ components/crash/content/app/crashpad.cc 2019-01-31 23:31:14.742328000 +0100
-@@ -102,6 +102,12 @@
+--- components/crash/content/app/crashpad.cc.orig 2019-03-11 22:00:56 UTC
++++ components/crash/content/app/crashpad.cc
+@@ -102,6 +102,12 @@ void InitializeCrashpadImpl(bool initial_client,
const base::FilePath& exe_path,
const std::vector<std::string>& initial_arguments,
bool embedded_handler) {
+
+#if defined(OS_BSD)
+ NOTIMPLEMENTED();
+ return;
+#endif
+
static bool initialized = false;
DCHECK(!initialized);
initialized = true;
-@@ -121,7 +127,7 @@
+@@ -122,7 +128,7 @@ void InitializeCrashpadImpl(bool initial_client,
DCHECK(browser_process || process_type == "Chrome Installer" ||
process_type == "notification-helper" ||
process_type == "GCPW Installer" || process_type == "GCPW DLL");
-#elif defined(OS_LINUX) || defined(OS_ANDROID)
+#elif defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD)
DCHECK(browser_process);
#else
#error Port.
-@@ -186,7 +192,7 @@
+@@ -187,7 +193,7 @@ void InitializeCrashpadImpl(bool initial_client,
// other "main, first process" to initialize things. There is no "relauncher"
// on Windows, so this is synonymous with initial_client.
const bool should_initialize_database_and_set_upload_policy = initial_client;
-#elif defined(OS_LINUX) || defined(OS_ANDROID)
+#elif defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD)
const bool should_initialize_database_and_set_upload_policy = browser_process;
#endif
if (should_initialize_database_and_set_upload_policy) {
-@@ -265,7 +271,9 @@
- }
+@@ -267,7 +273,9 @@ bool GetUploadsEnabled() {
+ #if !defined(OS_ANDROID)
void DumpWithoutCrashing() {
+#if !defined(OS_BSD)
CRASHPAD_SIMULATE_CRASH();
+#endif
}
+ #endif
- void GetReports(std::vector<Report>* reports) {
Index: branches/2019Q2/www/chromium/files/patch-components_crash_content_browser_BUILD.gn
===================================================================
--- branches/2019Q2/www/chromium/files/patch-components_crash_content_browser_BUILD.gn (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-components_crash_content_browser_BUILD.gn (revision 497959)
@@ -1,23 +1,27 @@
---- components/crash/content/browser/BUILD.gn.orig 2018-06-13 00:10:13.000000000 +0200
-+++ components/crash/content/browser/BUILD.gn 2018-07-18 23:37:00.046473000 +0200
-@@ -24,10 +24,9 @@
- "//components/crash/content/app",
- "//content/public/browser",
+--- components/crash/content/browser/BUILD.gn.orig 2019-03-11 22:00:56 UTC
++++ components/crash/content/browser/BUILD.gn
+@@ -28,7 +28,7 @@ source_set("browser") {
"//content/public/common",
-- "//third_party/breakpad:client",
]
- if (is_linux || is_android) {
+ if ((is_linux && !is_bsd) || is_android) {
set_sources_assignment_filter([])
# Want this file on both Linux and Android.
-@@ -43,7 +42,7 @@
+@@ -42,13 +42,13 @@ source_set("browser") {
+ deps += [ "//third_party/crashpad/crashpad/client" ]
+ }
+
+- if (!is_android) {
++ if (!is_android && !is_bsd) {
+ deps += [ "//third_party/breakpad:client" ]
+ }
# This is not in the GYP build but this target includes breakpad client
# headers, so add the dependency here.
- if ((is_posix && !is_ios) || is_fuchsia) {
+ if ((is_posix && !is_ios && !is_bsd) || is_fuchsia) {
configs += [ "//third_party/breakpad:client_config" ]
public_configs = [ "//third_party/breakpad:client_config" ]
}
Index: branches/2019Q2/www/chromium/files/patch-components_crash_core_common_BUILD.gn
===================================================================
--- branches/2019Q2/www/chromium/files/patch-components_crash_core_common_BUILD.gn (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-components_crash_core_common_BUILD.gn (revision 497959)
@@ -1,28 +1,28 @@
---- components/crash/core/common/BUILD.gn.orig 2018-08-01 00:08:38.000000000 +0200
-+++ components/crash/core/common/BUILD.gn 2018-08-05 12:52:29.173813000 +0200
-@@ -6,7 +6,7 @@
+--- components/crash/core/common/BUILD.gn.orig 2019-03-11 22:00:56 UTC
++++ components/crash/core/common/BUILD.gn
+@@ -6,7 +6,7 @@ import("//build/buildflag_header.gni")
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") {
-@@ -88,7 +88,6 @@
+@@ -89,7 +89,6 @@ target(crash_key_target_type, "crash_key") {
]
}
- deps += [ "//third_party/breakpad:client" ]
}
}
-@@ -143,7 +142,7 @@
+@@ -144,7 +143,7 @@ source_set("unit_tests") {
sources += [ "objc_zombie_unittest.mm" ]
}
-- if (!is_mac && !is_win && !is_fuchsia) {
-+ if (!is_mac && !is_win && !is_fuchsia && !is_bsd) {
+- 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/2019Q2/www/chromium/files/patch-components_download_internal_common_base__file.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-components_download_internal_common_base__file.cc (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-components_download_internal_common_base__file.cc (revision 497959)
@@ -0,0 +1,11 @@
+--- components/download/internal/common/base_file.cc.orig 2019-03-11 22:00:56 UTC
++++ components/download/internal/common/base_file.cc
+@@ -446,7 +446,7 @@ DownloadInterruptReason BaseFile::LogInterruptReason(
+ return reason;
+ }
+
+-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)
++#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD)
+
+ namespace {
+
Property changes on: branches/2019Q2/www/chromium/files/patch-components_download_internal_common_base__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/2019Q2/www/chromium/files/patch-components_download_quarantine_quarantine__linux.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-components_download_quarantine_quarantine__linux.cc (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-components_download_quarantine_quarantine__linux.cc (revision 497959)
@@ -0,0 +1,36 @@
+--- components/download/quarantine/quarantine_linux.cc.orig 2019-03-11 22:00:56 UTC
++++ components/download/quarantine/quarantine_linux.cc
+@@ -2,11 +2,15 @@
+ // Use of this source code is governed by a BSD-style license that can be
+ // found in the LICENSE file.
+
++#include "build/build_config.h"
++
+ #include "components/download/quarantine/quarantine.h"
+
+ #include <stddef.h>
+ #include <sys/types.h>
++#if !defined(OS_BSD)
+ #include <sys/xattr.h>
++#endif
+
+ #include "base/files/file_path.h"
+ #include "base/logging.h"
+@@ -25,7 +29,7 @@ bool SetExtendedFileAttribute(const char* path,
+ int flags) {
+ // On Chrome OS, there is no component that can validate these extended
+ // attributes so there is no need to set them.
+-#if !defined(OS_CHROMEOS)
++#if !defined(OS_CHROMEOS) && !defined(OS_BSD)
+ base::ScopedBlockingCall scoped_blocking_call(base::BlockingType::MAY_BLOCK);
+ int result = setxattr(path, name, value, value_size, flags);
+ if (result) {
+@@ -33,7 +37,7 @@ bool SetExtendedFileAttribute(const char* path,
+ << path;
+ return false;
+ }
+-#endif // !defined(OS_CHROMEOS)
++#endif // !defined(OS_CHROMEOS) && !defined(OS_BSD)
+ return true;
+ }
+
Property changes on: branches/2019Q2/www/chromium/files/patch-components_download_quarantine_quarantine__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/2019Q2/www/chromium/files/patch-components_download_quarantine_test__support__linux.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-components_download_quarantine_test__support__linux.cc (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-components_download_quarantine_test__support__linux.cc (revision 497959)
@@ -0,0 +1,20 @@
+--- components/download/quarantine/test_support_linux.cc.orig 2019-03-11 22:00:56 UTC
++++ components/download/quarantine/test_support_linux.cc
+@@ -21,6 +21,7 @@ namespace download {
+ namespace {
+
+ std::string GetExtendedFileAttribute(const char* path, const char* name) {
++#if !defined(OS_BSD)
+ base::ScopedBlockingCall scoped_blocking_call(base::BlockingType::MAY_BLOCK);
+ ssize_t len = getxattr(path, name, nullptr, 0);
+ if (len <= 0)
+@@ -31,6 +32,9 @@ std::string GetExtendedFileAttribute(const char* path,
+ if (len < static_cast<ssize_t>(buffer.size()))
+ return std::string();
+ return std::string(buffer.begin(), buffer.end());
++#else
++ return std::string();
++#endif // !defined(OS_BSD)
+ }
+
+ } // namespace
Property changes on: branches/2019Q2/www/chromium/files/patch-components_download_quarantine_test__support__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/2019Q2/www/chromium/files/patch-components_feature__engagement_public_event__constants.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-components_feature__engagement_public_event__constants.cc (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-components_feature__engagement_public_event__constants.cc (revision 497959)
@@ -0,0 +1,14 @@
+--- components/feature_engagement/public/event_constants.cc.orig 2019-03-11 22:00:56 UTC
++++ components/feature_engagement/public/event_constants.cc
+@@ -26,9 +26,9 @@ const char kReopenTabConditionsMet[] = "reopen_tab_con
+ const char kTabReopened[] = "tab_reopened";
+ #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";
Property changes on: branches/2019Q2/www/chromium/files/patch-components_feature__engagement_public_event__constants.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/2019Q2/www/chromium/files/patch-components_feature__engagement_public_event__constants.h
===================================================================
--- branches/2019Q2/www/chromium/files/patch-components_feature__engagement_public_event__constants.h (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-components_feature__engagement_public_event__constants.h (revision 497959)
@@ -0,0 +1,20 @@
+--- components/feature_engagement/public/event_constants.h.orig 2019-03-11 22:00:56 UTC
++++ components/feature_engagement/public/event_constants.h
+@@ -49,7 +49,7 @@ extern const char kReopenTabConditionsMet[];
+ extern const char kTabReopened[];
+ #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[];
+ // 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).
Property changes on: branches/2019Q2/www/chromium/files/patch-components_feature__engagement_public_event__constants.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/2019Q2/www/chromium/files/patch-components_feedback_anonymizer__tool.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-components_feedback_anonymizer__tool.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-components_feedback_anonymizer__tool.cc (revision 497959)
@@ -1,14 +1,14 @@
---- components/feedback/anonymizer_tool.cc.orig 2018-03-20 23:05:22.000000000 +0100
-+++ components/feedback/anonymizer_tool.cc 2018-03-24 13:39:35.199314000 +0100
-@@ -11,7 +11,11 @@
- #include "base/strings/string_util.h"
+--- components/feedback/anonymizer_tool.cc.orig 2019-03-11 22:00:56 UTC
++++ components/feedback/anonymizer_tool.cc
+@@ -13,7 +13,11 @@
#include "base/strings/stringprintf.h"
#include "content/public/browser/browser_thread.h"
+ #include "net/base/ip_address.h"
+#if defined(OS_BSD)
+#include <re2/re2.h>
+#else
#include "third_party/re2/src/re2/re2.h"
+#endif
using re2::RE2;
Index: branches/2019Q2/www/chromium/files/patch-components_flags__ui_flags__state.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-components_flags__ui_flags__state.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-components_flags__ui_flags__state.cc (revision 497959)
@@ -1,11 +1,11 @@
---- components/flags_ui/flags_state.cc.orig 2017-06-05 19:03:05 UTC
+--- components/flags_ui/flags_state.cc.orig 2019-03-11 22:00:56 UTC
+++ components/flags_ui/flags_state.cc
-@@ -567,7 +567,7 @@ int FlagsState::GetCurrentPlatform() {
+@@ -618,7 +618,7 @@ int FlagsState::GetCurrentPlatform() {
return kOsWin;
#elif defined(OS_CHROMEOS) // Needs to be before the OS_LINUX check.
return kOsCrOS;
-#elif defined(OS_LINUX) || defined(OS_OPENBSD)
+#elif defined(OS_LINUX) || defined(OS_OPENBSD) || defined(OS_FREEBSD)
return kOsLinux;
#elif defined(OS_ANDROID)
return kOsAndroid;
Index: branches/2019Q2/www/chromium/files/patch-components_gcm__driver_gcm__client.h
===================================================================
--- branches/2019Q2/www/chromium/files/patch-components_gcm__driver_gcm__client.h (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-components_gcm__driver_gcm__client.h (revision 497959)
@@ -1,10 +1,10 @@
---- components/gcm_driver/gcm_client.h.orig 2018-06-13 00:10:13.000000000 +0200
-+++ components/gcm_driver/gcm_client.h 2018-07-18 23:49:52.697459000 +0200
-@@ -82,6 +82,7 @@
+--- components/gcm_driver/gcm_client.h.orig 2019-03-11 22:00:56 UTC
++++ components/gcm_driver/gcm_client.h
+@@ -85,6 +85,7 @@ class GCMClient {
PLATFORM_CROS,
PLATFORM_IOS,
PLATFORM_ANDROID,
+ PLATFORM_BSD,
PLATFORM_UNSPECIFIED
};
Index: branches/2019Q2/www/chromium/files/patch-components_gcm__driver_gcm__client__impl.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-components_gcm__driver_gcm__client__impl.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-components_gcm__driver_gcm__client__impl.cc (revision 497959)
@@ -1,12 +1,12 @@
---- components/gcm_driver/gcm_client_impl.cc.orig 2018-06-13 00:10:13.000000000 +0200
-+++ components/gcm_driver/gcm_client_impl.cc 2018-07-18 23:56:44.202609000 +0200
-@@ -152,6 +152,9 @@
+--- components/gcm_driver/gcm_client_impl.cc.orig 2019-03-11 22:00:56 UTC
++++ components/gcm_driver/gcm_client_impl.cc
+@@ -150,6 +150,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/2019Q2/www/chromium/files/patch-components_keyed__service_core_dependency__graph__unittest.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-components_keyed__service_core_dependency__graph__unittest.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-components_keyed__service_core_dependency__graph__unittest.cc (revision 497959)
@@ -1,14 +1,14 @@
---- components/keyed_service/core/dependency_graph_unittest.cc.orig 2017-04-19 19:06:32 UTC
+--- components/keyed_service/core/dependency_graph_unittest.cc.orig 2019-03-11 22:00:56 UTC
+++ components/keyed_service/core/dependency_graph_unittest.cc
@@ -9,7 +9,11 @@
#include "components/keyed_service/core/dependency_graph.h"
#include "components/keyed_service/core/dependency_node.h"
#include "testing/gtest/include/gtest/gtest.h"
+#if defined(OS_BSD)
+#include <re2/re2.h>
+#else
#include "third_party/re2/src/re2/re2.h"
+#endif
namespace {
Index: branches/2019Q2/www/chromium/files/patch-components_metrics_BUILD.gn
===================================================================
--- branches/2019Q2/www/chromium/files/patch-components_metrics_BUILD.gn (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-components_metrics_BUILD.gn (revision 497959)
@@ -1,14 +1,14 @@
---- components/metrics/BUILD.gn.orig 2017-12-15 02:04:14.000000000 +0100
-+++ components/metrics/BUILD.gn 2017-12-30 02:31:51.554746000 +0100
-@@ -137,6 +137,11 @@
+--- components/metrics/BUILD.gn.orig 2019-03-11 22:00:56 UTC
++++ components/metrics/BUILD.gn
+@@ -143,6 +143,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/2019Q2/www/chromium/files/patch-components_metrics_drive__metrics__provider__linux.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-components_metrics_drive__metrics__provider__linux.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-components_metrics_drive__metrics__provider__linux.cc (revision 497959)
@@ -1,16 +1,16 @@
---- components/metrics/drive_metrics_provider_linux.cc.orig 2017-04-19 19:06:32 UTC
+--- components/metrics/drive_metrics_provider_linux.cc.orig 2019-03-11 22:00:56 UTC
+++ components/metrics/drive_metrics_provider_linux.cc
@@ -4,7 +4,13 @@
#include "components/metrics/drive_metrics_provider.h"
+#if defined(OS_BSD)
+#include <sys/types.h>
+#define MAJOR(dev) major(dev)
+#define MINOR(dev) minor(dev)
+#else
#include <linux/kdev_t.h> // For MAJOR()/MINOR().
+#endif
#include <sys/stat.h>
#include <string>
Index: branches/2019Q2/www/chromium/files/patch-components_metrics_metrics__log.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-components_metrics_metrics__log.cc (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-components_metrics_metrics__log.cc (revision 497959)
@@ -0,0 +1,11 @@
+--- components/metrics/metrics_log.cc.orig 2019-03-17 18:40:58 UTC
++++ components/metrics/metrics_log.cc
+@@ -198,7 +198,7 @@ void MetricsLog::RecordCoreSystemProfile(MetricsServic
+ // OperatingSystemVersion refers to the ChromeOS release version.
+ #if defined(OS_CHROMEOS)
+ os->set_kernel_version(base::SysInfo::KernelVersion());
+-#elif defined(OS_LINUX)
++#elif defined(OS_LINUX) || defined(OS_BSD)
+ // Linux operating system version is copied over into kernel version to be
+ // consistent.
+ os->set_kernel_version(base::SysInfo::OperatingSystemVersion());
Property changes on: branches/2019Q2/www/chromium/files/patch-components_metrics_metrics__log.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/2019Q2/www/chromium/files/patch-components_metrics_system__memory__stats__recorder__linux.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-components_metrics_system__memory__stats__recorder__linux.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-components_metrics_system__memory__stats__recorder__linux.cc (revision 497959)
@@ -1,18 +1,18 @@
---- components/metrics/system_memory_stats_recorder_linux.cc.orig 2017-06-05 19:03:05 UTC
+--- components/metrics/system_memory_stats_recorder_linux.cc.orig 2019-03-11 22:00:56 UTC
+++ components/metrics/system_memory_stats_recorder_linux.cc
@@ -30,6 +30,7 @@ namespace metrics {
UMA_HISTOGRAM_LINEAR(name, sample, 2500, 50)
void RecordMemoryStats(RecordMemoryStatsType type) {
+#if !defined(OS_FREEBSD)
base::SystemMemoryInfoKB memory;
if (!base::GetSystemMemoryInfo(&memory))
return;
@@ -93,6 +94,7 @@ void RecordMemoryStats(RecordMemoryStatsType type) {
break;
}
}
+#endif // !defined(OS_FREEBSD)
}
} // namespace metrics
Index: branches/2019Q2/www/chromium/files/patch-components_neterror_resources_neterror.js
===================================================================
--- branches/2019Q2/www/chromium/files/patch-components_neterror_resources_neterror.js (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-components_neterror_resources_neterror.js (revision 497959)
@@ -1,11 +1,11 @@
---- components/neterror/resources/neterror.js.orig 2017-06-05 19:03:06 UTC
+--- components/neterror/resources/neterror.js.orig 2019-03-11 22:00:56 UTC
+++ components/neterror/resources/neterror.js
-@@ -150,7 +150,7 @@ function setUpCachedButton(buttonStrings) {
+@@ -166,7 +166,7 @@ function setUpCachedButton(buttonStrings) {
}
var primaryControlOnLeft = true;
-// <if expr="is_macosx or is_ios or is_linux or is_android">
+// <if expr="is_macosx or is_ios or is_linux or is_android or is_bsd">
primaryControlOnLeft = false;
// </if>
Index: branches/2019Q2/www/chromium/files/patch-components_network__session__configurator_browser_network__session__configurator.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-components_network__session__configurator_browser_network__session__configurator.cc (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-components_network__session__configurator_browser_network__session__configurator.cc (revision 497959)
@@ -0,0 +1,11 @@
+--- components/network_session_configurator/browser/network_session_configurator.cc.orig 2019-03-11 22:00:56 UTC
++++ components/network_session_configurator/browser/network_session_configurator.cc
+@@ -662,7 +662,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;
Property changes on: branches/2019Q2/www/chromium/files/patch-components_network__session__configurator_browser_network__session__configurator.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/2019Q2/www/chromium/files/patch-components_new__or__sad__tab__strings.grdp
===================================================================
--- branches/2019Q2/www/chromium/files/patch-components_new__or__sad__tab__strings.grdp (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-components_new__or__sad__tab__strings.grdp (revision 497959)
@@ -0,0 +1,38 @@
+--- components/new_or_sad_tab_strings.grdp.orig 2019-03-11 22:00:56 UTC
++++ components/new_or_sad_tab_strings.grdp
+@@ -51,7 +51,7 @@
+ Open page in a new Incognito window (⇧⌘N)
+ </message>
+ </if>
+- <if expr="is_win or is_linux or chromeos">
++ <if expr="is_win or is_posix or chromeos">
+ <message name="IDS_SAD_TAB_RELOAD_INCOGNITO" desc="One of the bullet points displayed on the web page if a reload failed to fix the issue, advising the user to open the web page in Chrome's Incognito mode.">
+ Open page in a new Incognito window (Ctrl-Shift-N)
+ </message>
+@@ -69,7 +69,7 @@
+ Close other tabs or apps
+ </message>
+ </if>
+- <if expr="is_linux and not chromeos">
++ <if expr="is_posix and not chromeos">
+ <message name="IDS_SAD_TAB_RELOAD_CLOSE_TABS" desc="One of the bullet points displayed on the web page if a reload failed to fix the issue, advising the user to close other Chrome tabs or programs running on their computer.">
+ Close other tabs or programs
+ </message>
+@@ -79,7 +79,7 @@
+ Close other apps
+ </message>
+ </if>
+- <if expr="is_linux and not chromeos">
++ <if expr="is_posix and not chromeos">
+ <message name="IDS_SAD_TAB_RELOAD_CLOSE_NOTABS" desc="One of the bullet points displayed on the web page if a reload failed to fix the issue, advising the user to close other programs running on their computer (Linux).">
+ Close other programs
+ </message>
+@@ -94,7 +94,7 @@
+ Restart Chromium
+ </message>
+ </if>
+- <if expr="is_win or is_linux or is_macosx or chromeos">
++ <if expr="is_win or is_posix or is_macosx or chromeos">
+ <message name="IDS_SAD_TAB_RELOAD_RESTART_DEVICE" desc="One of the bullet points displayed on the web page if a reload failed to fix the issue, advising the user to restart their computer.">
+ Restart your computer
+ </message>
Property changes on: branches/2019Q2/www/chromium/files/patch-components_new__or__sad__tab__strings.grdp
___________________________________________________________________
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/2019Q2/www/chromium/files/patch-components_os__crypt_os__crypt.h
===================================================================
--- branches/2019Q2/www/chromium/files/patch-components_os__crypt_os__crypt.h (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-components_os__crypt_os__crypt.h (revision 497959)
@@ -1,48 +1,48 @@
---- components/os_crypt/os_crypt.h.orig 2018-12-03 21:16:50.000000000 +0100
-+++ components/os_crypt/os_crypt.h 2018-12-13 20:06:45.446679000 +0100
+--- components/os_crypt/os_crypt.h.orig 2019-03-11 22:00:56 UTC
++++ components/os_crypt/os_crypt.h
@@ -15,9 +15,9 @@
#include "base/strings/string16.h"
#include "build/build_config.h"
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
class KeyStorageLinux;
-#endif // defined(OS_LINUX) && !defined(OS_CHROMEOS)
+#endif // (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
#if defined(OS_MACOSX) && !defined(OS_IOS)
class PrefRegistrySimple;
-@@ -34,13 +34,13 @@
+@@ -34,13 +34,13 @@ struct Config;
// true for Linux, if a password management tool is available.
class OSCrypt {
public:
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
// Set the configuration of OSCrypt.
static COMPONENT_EXPORT(OS_CRYPT) void SetConfig(
std::unique_ptr<os_crypt::Config> config);
-#endif // defined(OS_LINUX) && !defined(OS_CHROMEOS)
+#endif // (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
-#if defined(OS_MACOSX) || (defined(OS_LINUX) && !defined(OS_CHROMEOS))
+#if defined(OS_MACOSX) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
// On Linux returns true iff the real secret key (not hardcoded one) is
// available. On MacOS returns true if Keychain is available (for mock
// Keychain it returns true if not using locked Keychain, false if using
-@@ -112,7 +112,7 @@
+@@ -112,7 +112,7 @@ class OSCrypt {
DISALLOW_IMPLICIT_CONSTRUCTORS(OSCrypt);
};
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
// For unit testing purposes, inject methods to be used.
// |get_key_storage_mock| provides the desired |KeyStorage| implementation.
// If the provider returns |nullptr|, a hardcoded password will be used.
-@@ -127,6 +127,6 @@
+@@ -127,6 +127,6 @@ void UseMockKeyStorageForTesting(
// Clears any caching and most lazy initialisations performed by the production
// code. Should be used after any test which required a password.
COMPONENT_EXPORT(OS_CRYPT) void ClearCacheForTesting();
-#endif // defined(OS_LINUX) && !defined(OS_CHROMEOS)
+#endif // (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
#endif // COMPONENTS_OS_CRYPT_OS_CRYPT_H_
Index: branches/2019Q2/www/chromium/files/patch-components_os__crypt_os__crypt__unittest.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-components_os__crypt_os__crypt__unittest.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-components_os__crypt_os__crypt__unittest.cc (revision 497959)
@@ -1,11 +1,11 @@
---- components/os_crypt/os_crypt_unittest.cc.orig 2017-12-15 02:04:15.000000000 +0100
-+++ components/os_crypt/os_crypt_unittest.cc 2017-12-24 11:56:52.206820000 +0100
+--- components/os_crypt/os_crypt_unittest.cc.orig 2019-03-11 22:00:56 UTC
++++ components/os_crypt/os_crypt_unittest.cc
@@ -18,7 +18,7 @@
#include "components/os_crypt/os_crypt_mocker.h"
#include "testing/gtest/include/gtest/gtest.h"
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
#include "components/os_crypt/os_crypt_mocker_linux.h"
#endif
Index: branches/2019Q2/www/chromium/files/patch-components_plugins_renderer_plugin__placeholder.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-components_plugins_renderer_plugin__placeholder.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-components_plugins_renderer_plugin__placeholder.cc (revision 497959)
@@ -1,14 +1,14 @@
---- components/plugins/renderer/plugin_placeholder.cc.orig 2019-01-30 02:17:54.000000000 +0100
-+++ components/plugins/renderer/plugin_placeholder.cc 2019-02-01 00:04:53.895073000 +0100
+--- components/plugins/renderer/plugin_placeholder.cc.orig 2019-03-11 22:00:56 UTC
++++ components/plugins/renderer/plugin_placeholder.cc
@@ -17,7 +17,11 @@
#include "third_party/blink/public/web/web_plugin_container.h"
#include "third_party/blink/public/web/web_script_source.h"
#include "third_party/blink/public/web/web_serialized_script_value.h"
+#if defined(OS_BSD)
+#include <re2/re2.h>
+#else
#include "third_party/re2/src/re2/re2.h"
+#endif // defined(OS_BSD)
namespace plugins {
Index: branches/2019Q2/www/chromium/files/patch-components_policy_core_common_cloud_cloud__policy__util.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-components_policy_core_common_cloud_cloud__policy__util.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-components_policy_core_common_cloud_cloud__policy__util.cc (revision 497959)
@@ -1,73 +1,73 @@
---- components/policy/core/common/cloud/cloud_policy_util.cc.orig 2019-02-06 22:50:06.437715000 +0100
-+++ components/policy/core/common/cloud/cloud_policy_util.cc 2019-02-07 01:42:29.673954000 +0100
+--- components/policy/core/common/cloud/cloud_policy_util.cc.orig 2019-03-11 22:00:56 UTC
++++ components/policy/core/common/cloud/cloud_policy_util.cc
@@ -16,7 +16,7 @@
#include <wincred.h>
#endif
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_MACOSX)
+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_MACOSX) || defined(OS_BSD)
#include <pwd.h>
#include <sys/types.h>
#include <unistd.h>
@@ -28,7 +28,7 @@
#include <sys/sysctl.h>
#endif
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
#include <limits.h> // For HOST_NAME_MAX
#endif
-@@ -51,7 +51,7 @@
+@@ -52,7 +52,7 @@
#include "base/system/sys_info.h"
#endif
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
#include "base/system/sys_info.h"
#endif
-@@ -60,11 +60,24 @@
+@@ -61,11 +61,24 @@ namespace policy {
namespace em = enterprise_management;
std::string GetMachineName() {
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS))
char hostname[HOST_NAME_MAX];
if (gethostname(hostname, HOST_NAME_MAX) == 0) // Success.
return hostname;
return std::string();
+#elif defined(OS_BSD)
+ long host_name_max = sysconf(_SC_HOST_NAME_MAX);
+ if (host_name_max != -1) {
+ char *hostname = new char[host_name_max + 1]();
+ std::string hostname_r;
+
+ if (gethostname(hostname, host_name_max) == 0)
+ hostname_r = hostname;
+
+ delete[] hostname;
+ return hostname_r;
+ }
+ return std::string();
#elif defined(OS_MACOSX)
// Do not use NSHost currentHost, as it's very slow. http://crbug.com/138570
SCDynamicStoreContext context = {0, NULL, NULL, NULL};
-@@ -110,7 +123,7 @@
+@@ -111,7 +124,7 @@ std::string GetMachineName() {
}
std::string GetOSVersion() {
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_MACOSX)
+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_MACOSX) || defined(OS_BSD)
return base::SysInfo::OperatingSystemVersion();
#elif defined(OS_WIN)
base::win::OSInfo::VersionNumber version_number =
-@@ -133,7 +146,7 @@
+@@ -134,7 +147,7 @@ std::string GetOSArchitecture() {
}
std::string GetOSUsername() {
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_MACOSX)
+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_MACOSX) || defined(OS_BSD)
struct passwd* creds = getpwuid(getuid());
if (!creds || !creds->pw_name)
return std::string();
Index: branches/2019Q2/www/chromium/files/patch-components_policy_core_common_schema.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-components_policy_core_common_schema.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-components_policy_core_common_schema.cc (revision 497959)
@@ -1,14 +1,14 @@
---- components/policy/core/common/schema.cc.orig 2017-04-19 19:06:33 UTC
+--- components/policy/core/common/schema.cc.orig 2019-03-11 22:00:56 UTC
+++ components/policy/core/common/schema.cc
-@@ -21,7 +21,11 @@
- #include "components/json_schema/json_schema_constants.h"
- #include "components/json_schema/json_schema_validator.h"
+@@ -23,7 +23,11 @@
+ #include "base/strings/stringprintf.h"
+ #include "components/policy/core/common/json_schema_constants.h"
#include "components/policy/core/common/schema_internal.h"
+#if defined(OS_FREEBSD)
+#include <re2/re2.h>
+#else
#include "third_party/re2/src/re2/re2.h"
+#endif
namespace schema = json_schema_constants;
Index: branches/2019Q2/www/chromium/files/patch-components_policy_resources_policy__templates.json
===================================================================
--- branches/2019Q2/www/chromium/files/patch-components_policy_resources_policy__templates.json (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-components_policy_resources_policy__templates.json (revision 497959)
@@ -1,83 +1,83 @@
---- components/policy/resources/policy_templates.json.orig 2019-02-06 23:06:41.000000000 +0100
-+++ components/policy/resources/policy_templates.json 2019-02-08 20:46:39.627324000 +0100
-@@ -723,7 +723,7 @@
+--- components/policy/resources/policy_templates.json.orig 2019-03-11 22:00:56 UTC
++++ components/policy/resources/policy_templates.json
+@@ -956,7 +956,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,
-@@ -751,7 +751,7 @@
+@@ -983,7 +983,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,
-@@ -778,7 +778,7 @@
+@@ -1009,7 +1009,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,
-@@ -1471,7 +1471,7 @@
+@@ -1702,7 +1702,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,
-@@ -2946,7 +2946,7 @@
+@@ -3192,7 +3192,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,
-@@ -2998,7 +2998,7 @@
+@@ -3244,7 +3244,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,
-@@ -5989,7 +5989,7 @@
+@@ -6303,7 +6303,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,
-@@ -7058,7 +7058,7 @@
+@@ -7433,7 +7433,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,
-@@ -7573,7 +7573,7 @@
+@@ -7948,7 +7948,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/2019Q2/www/chromium/files/patch-components_policy_tools_generate__policy__source.py
===================================================================
--- branches/2019Q2/www/chromium/files/patch-components_policy_tools_generate__policy__source.py (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-components_policy_tools_generate__policy__source.py (revision 497959)
@@ -1,20 +1,20 @@
---- components/policy/tools/generate_policy_source.py.orig 2019-02-06 23:06:41.000000000 +0100
-+++ components/policy/tools/generate_policy_source.py 2019-02-08 20:44:33.267121000 +0100
-@@ -85,7 +85,7 @@
+--- components/policy/tools/generate_policy_source.py.orig 2019-03-11 22:00:57 UTC
++++ components/policy/tools/generate_policy_source.py
+@@ -86,7 +86,7 @@ class PolicyDetails:
if platform not in [
'chrome_frame', 'chrome_os', 'android', 'webview_android',
'chrome.win', 'chrome.linux', 'chrome.mac', 'chrome.fuchsia',
- 'chrome.*'
+ 'chrome.freebsd', 'chrome.*'
]:
raise RuntimeError('Platform "%s" is not supported' % platform)
-@@ -104,7 +104,7 @@
+@@ -105,7 +105,7 @@ class PolicyDetails:
if platform.startswith('chrome.'):
platform_sub = platform[7:]
if platform_sub == '*':
- self.platforms.extend(['win', 'mac', 'linux', 'fuchsia'])
+ self.platforms.extend(['win', 'mac', 'linux', 'fuchsia', 'freebsd'])
else:
self.platforms.append(platform_sub)
else:
Index: branches/2019Q2/www/chromium/files/patch-components_previews_core_previews__features.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-components_previews_core_previews__features.cc (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-components_previews_core_previews__features.cc (revision 497959)
@@ -0,0 +1,18 @@
+--- components/previews/core/previews_features.cc.orig 2019-03-11 22:00:57 UTC
++++ components/previews/core/previews_features.cc
+@@ -14,12 +14,12 @@ namespace features {
+ // are enabled are controlled by other features.
+ const base::Feature kPreviews {
+ "Previews",
+-#if defined(OS_ANDROID) || defined(OS_LINUX)
++#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD)
+ // Previews allowed for Android (but also allow on Linux for dev/debug).
+ base::FEATURE_ENABLED_BY_DEFAULT
+-#else // !defined(OS_ANDROID) || defined(OS_LINUX)
++#else // !defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD)
+ base::FEATURE_DISABLED_BY_DEFAULT
+-#endif // defined(OS_ANDROID) || defined(OS_LINUX)
++#endif // defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD)
+ };
+
+ // Enables the Offline previews on android slow connections.
Property changes on: branches/2019Q2/www/chromium/files/patch-components_previews_core_previews__features.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/2019Q2/www/chromium/files/patch-components_services_filesystem_file__system__app.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-components_services_filesystem_file__system__app.cc (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-components_services_filesystem_file__system__app.cc (revision 497959)
@@ -0,0 +1,20 @@
+--- components/services/filesystem/file_system_app.cc.orig 2019-03-11 22:00:57 UTC
++++ components/services/filesystem/file_system_app.cc
+@@ -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)
+@@ -73,7 +73,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<base::Environment> env(base::Environment::Create());
+ path = base::nix::GetXDGDirectory(
+ env.get(), base::nix::kXdgConfigHomeEnvVar, base::nix::kDotConfigDir);
Property changes on: branches/2019Q2/www/chromium/files/patch-components_services_filesystem_file__system__app.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/2019Q2/www/chromium/files/patch-components_services_font_font__service__app.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-components_services_font_font__service__app.cc (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-components_services_font_font__service__app.cc (revision 497959)
@@ -0,0 +1,11 @@
+--- components/services/font/font_service_app.cc.orig 2019-03-11 22:00:57 UTC
++++ components/services/font/font_service_app.cc
+@@ -20,7 +20,7 @@
+ #include "components/services/font/ppapi_fontconfig_matching.h" // nogncheck
+ #endif
+
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+ #include "base/test/fontconfig_util_linux.h"
+ #endif
+
Property changes on: branches/2019Q2/www/chromium/files/patch-components_services_font_font__service__app.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/2019Q2/www/chromium/files/patch-components_startup__metric__utils_browser_startup__metric__utils.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-components_startup__metric__utils_browser_startup__metric__utils.cc (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-components_startup__metric__utils_browser_startup__metric__utils.cc (revision 497959)
@@ -0,0 +1,20 @@
+--- components/startup_metric_utils/browser/startup_metric_utils.cc.orig 2019-03-17 18:33:50 UTC
++++ components/startup_metric_utils/browser/startup_metric_utils.cc
+@@ -456,7 +456,7 @@ void AddStartupEventsForTelemetry()
+ // RecordBrowserMainMessageLoopStart, the time since last startup is also logged
+ // to a histogram suffixed with the startup temperature.
+ void RecordTimeSinceLastStartup(PrefService* pref_service) {
+-#if defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_LINUX)
++#if defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD)
+ DCHECK(pref_service);
+
+ // Get the timestamp of the current startup.
+@@ -485,7 +485,7 @@ void RecordTimeSinceLastStartup(PrefService* pref_serv
+ // Write the timestamp of the current startup in |pref_service|.
+ pref_service->SetInt64(prefs::kLastStartupTimestamp,
+ process_start_time.ToInternalValue());
+-#endif // defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_LINUX)
++#endif // defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD)
+ }
+
+ // Logs the Startup.SameVersionStartupCount histogram. Relies on |pref_service|
Property changes on: branches/2019Q2/www/chromium/files/patch-components_startup__metric__utils_browser_startup__metric__utils.cc
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: branches/2019Q2/www/chromium/files/patch-components_storage__monitor_BUILD.gn
===================================================================
--- branches/2019Q2/www/chromium/files/patch-components_storage__monitor_BUILD.gn (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-components_storage__monitor_BUILD.gn (revision 497959)
@@ -1,20 +1,20 @@
---- components/storage_monitor/BUILD.gn.orig 2017-12-15 02:04:15.000000000 +0100
-+++ components/storage_monitor/BUILD.gn 2017-12-30 01:29:29.688538000 +0100
-@@ -65,6 +65,17 @@
+--- components/storage_monitor/BUILD.gn.orig 2019-03-11 22:00:57 UTC
++++ components/storage_monitor/BUILD.gn
+@@ -65,6 +65,17 @@ static_library("storage_monitor") {
]
}
+ if (is_bsd) {
+ sources -= [
+ "mtab_watcher_linux.cc",
+ "mtab_watcher_linux.h",
+ ]
+ sources += [
+ "storage_monitor_freebsd.cc",
+ "storage_monitor_freebsd.h",
+ ]
+ }
+
if (use_udev) {
deps += [ "//device/udev_linux" ]
} else if (is_linux) {
Index: branches/2019Q2/www/chromium/files/patch-components_storage__monitor_removable__device__constants.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-components_storage__monitor_removable__device__constants.cc (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-components_storage__monitor_removable__device__constants.cc (revision 497959)
@@ -0,0 +1,11 @@
+--- components/storage_monitor/removable_device_constants.cc.orig 2019-03-11 22:00:57 UTC
++++ components/storage_monitor/removable_device_constants.cc
+@@ -10,7 +10,7 @@ namespace storage_monitor {
+ const char kFSUniqueIdPrefix[] = "UUID:";
+ const char kVendorModelSerialPrefix[] = "VendorModelSerial:";
+
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+ const char kVendorModelVolumeStoragePrefix[] = "VendorModelVolumeStorage:";
+ #endif
+
Property changes on: branches/2019Q2/www/chromium/files/patch-components_storage__monitor_removable__device__constants.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/2019Q2/www/chromium/files/patch-components_storage__monitor_removable__device__constants.h
===================================================================
--- branches/2019Q2/www/chromium/files/patch-components_storage__monitor_removable__device__constants.h (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-components_storage__monitor_removable__device__constants.h (revision 497959)
@@ -0,0 +1,11 @@
+--- components/storage_monitor/removable_device_constants.h.orig 2019-03-11 22:00:57 UTC
++++ components/storage_monitor/removable_device_constants.h
+@@ -15,7 +15,7 @@ namespace storage_monitor {
+ extern const char kFSUniqueIdPrefix[];
+ extern const char kVendorModelSerialPrefix[];
+
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+ extern const char kVendorModelVolumeStoragePrefix[];
+ #endif
+
Property changes on: branches/2019Q2/www/chromium/files/patch-components_storage__monitor_removable__device__constants.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/2019Q2/www/chromium/files/patch-components_storage__monitor_storage__monitor__freebsd.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-components_storage__monitor_storage__monitor__freebsd.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-components_storage__monitor_storage__monitor__freebsd.cc (revision 497959)
@@ -1,57 +1,57 @@
---- components/storage_monitor/storage_monitor_freebsd.cc.orig 2017-06-11 01:51:38 UTC
+--- components/storage_monitor/storage_monitor_freebsd.cc.orig 2019-03-17 01:47:13 UTC
+++ components/storage_monitor/storage_monitor_freebsd.cc
@@ -0,0 +1,54 @@
+// Copyright 2014 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// StorageMonitorFreeBSD implementation.
+
+#include "components/storage_monitor/storage_monitor_freebsd.h"
+
+#include <stdio.h>
+
+#include <list>
+
+#include "base/bind.h"
+#include "base/metrics/histogram.h"
+#include "base/process/kill.h"
+#include "base/process/launch.h"
+#include "base/stl_util.h"
+#include "base/strings/string_number_conversions.h"
+#include "base/strings/string_util.h"
+#include "base/strings/utf_string_conversions.h"
+#include "components/storage_monitor/media_storage_util.h"
+#include "components/storage_monitor/removable_device_constants.h"
+#include "components/storage_monitor/storage_info.h"
+
+using content::BrowserThread;
+
+namespace storage_monitor {
+
+namespace {
+
+} // namespace
+
+StorageMonitorFreeBSD::StorageMonitorFreeBSD() {
+ DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+}
+
+StorageMonitorFreeBSD::~StorageMonitorFreeBSD() {
+ DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+}
+
+void StorageMonitorFreeBSD::Init() {
+}
+
+bool StorageMonitorFreeBSD::GetStorageInfoForPath(
+ const base::FilePath& path,
+ StorageInfo* device_info) const {
+ return false; // TODO
+}
+
+StorageMonitor* StorageMonitor::CreateInternal() {
+ return new StorageMonitorFreeBSD();
+}
+
+} // namespace storage_monitor
Index: branches/2019Q2/www/chromium/files/patch-components_storage__monitor_storage__monitor__freebsd.h
===================================================================
--- branches/2019Q2/www/chromium/files/patch-components_storage__monitor_storage__monitor__freebsd.h (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-components_storage__monitor_storage__monitor__freebsd.h (revision 497959)
@@ -1,48 +1,48 @@
---- components/storage_monitor/storage_monitor_freebsd.h.orig 2017-04-22 13:58:19 UTC
+--- components/storage_monitor/storage_monitor_freebsd.h.orig 2019-03-17 01:47:13 UTC
+++ components/storage_monitor/storage_monitor_freebsd.h
@@ -0,0 +1,45 @@
+// Copyright 2014 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// StorageMonitorFreeBSD processes mount point change events, notifies listeners
+// about the addition and deletion of media devices, and answers queries about
+// mounted devices.
+// StorageMonitorFreeBSD lives on the UI thread, and uses ???
+// the FILE thread to get mount point change events.
+
+#ifndef COMPONENTS_STORAGE_MONITOR_STORAGE_MONITOR_FREEBSD_H_
+#define COMPONENTS_STORAGE_MONITOR_STORAGE_MONITOR_FREEBSD_H_
+
+#include <map>
+#include <string>
+
+#include "base/compiler_specific.h"
+#include "base/files/file_path.h"
+#include "base/files/file_path_watcher.h"
+#include "base/memory/weak_ptr.h"
+#include "components/storage_monitor/storage_monitor.h"
+#include "content/public/browser/browser_thread.h"
+
+namespace storage_monitor {
+
+class StorageMonitorFreeBSD : public StorageMonitor {
+ public:
+ // Should only be called by browser start up code.
+ // Use StorageMonitor::GetInstance() instead.
+ explicit StorageMonitorFreeBSD();
+ virtual ~StorageMonitorFreeBSD();
+
+ // Must be called for StorageMonitorFreeBSD to work.
+ virtual void Init() override;
+ private:
+ // StorageMonitor implementation.
+ virtual bool GetStorageInfoForPath(const base::FilePath& path,
+ StorageInfo* device_info) const override;
+
+ DISALLOW_COPY_AND_ASSIGN(StorageMonitorFreeBSD);
+};
+
+} // namespace storage_monitor
+
+#endif // COMPONENTS_STORAGE_MONITOR_STORAGE_MONITOR_FREEBSD_H_
Index: branches/2019Q2/www/chromium/files/patch-components_sync_base_get__session__name.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-components_sync_base_get__session__name.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-components_sync_base_get__session__name.cc (revision 497959)
@@ -1,20 +1,20 @@
---- components/sync/base/get_session_name.cc.orig 2017-06-05 19:03:06 UTC
+--- components/sync/base/get_session_name.cc.orig 2019-03-11 22:00:57 UTC
+++ components/sync/base/get_session_name.cc
-@@ -15,7 +15,7 @@
+@@ -17,7 +17,7 @@
#if defined(OS_CHROMEOS)
- #include "chromeos/system/devicetype.h"
+ #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"
-@@ -51,7 +51,7 @@ std::string GetSessionNameSynchronously() {
+@@ -52,7 +52,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();
Index: branches/2019Q2/www/chromium/files/patch-components_sync_base_get__session__name__linux.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-components_sync_base_get__session__name__linux.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-components_sync_base_get__session__name__linux.cc (revision 497959)
@@ -1,14 +1,14 @@
---- components/sync/base/get_session_name_linux.cc.orig 2017-04-19 19:06:33 UTC
+--- 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();
}
Index: branches/2019Q2/www/chromium/files/patch-components_sync_device__info_local__device__info__provider__impl.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-components_sync_device__info_local__device__info__provider__impl.cc (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-components_sync_device__info_local__device__info__provider__impl.cc (revision 497959)
@@ -0,0 +1,11 @@
+--- components/sync/device_info/local_device_info_provider_impl.cc.orig 2019-03-17 18:30:00 UTC
++++ components/sync/device_info/local_device_info_provider_impl.cc
+@@ -15,7 +15,7 @@ namespace {
+ sync_pb::SyncEnums::DeviceType GetLocalDeviceType(bool is_tablet) {
+ #if defined(OS_CHROMEOS)
+ return sync_pb::SyncEnums_DeviceType_TYPE_CROS;
+-#elif defined(OS_LINUX)
++#elif defined(OS_LINUX) || defined(OS_BSD)
+ return sync_pb::SyncEnums_DeviceType_TYPE_LINUX;
+ #elif defined(OS_ANDROID) || defined(OS_IOS)
+ return is_tablet ? sync_pb::SyncEnums_DeviceType_TYPE_TABLET
Property changes on: branches/2019Q2/www/chromium/files/patch-components_sync_device__info_local__device__info__provider__impl.cc
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: branches/2019Q2/www/chromium/files/patch-components_update__client_update__query__params.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-components_update__client_update__query__params.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-components_update__client_update__query__params.cc (revision 497959)
@@ -1,11 +1,11 @@
---- components/update_client/update_query_params.cc.orig 2017-06-05 19:03:06 UTC
+--- components/update_client/update_query_params.cc.orig 2019-03-11 22:00:57 UTC
+++ components/update_client/update_query_params.cc
-@@ -35,6 +35,8 @@ const char kOs[] =
- "linux";
+@@ -38,6 +38,8 @@ const char kOs[] =
+ "fuchsia";
#elif defined(OS_OPENBSD)
"openbsd";
+#elif defined(OS_FREEBSD)
+ "freebsd";
#else
#error "unknown os"
#endif
Index: branches/2019Q2/www/chromium/files/patch-components_url__matcher_regex__set__matcher.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-components_url__matcher_regex__set__matcher.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-components_url__matcher_regex__set__matcher.cc (revision 497959)
@@ -1,16 +1,16 @@
---- components/url_matcher/regex_set_matcher.cc.orig 2017-04-19 19:06:33 UTC
+--- components/url_matcher/regex_set_matcher.cc.orig 2019-03-11 22:00:57 UTC
+++ components/url_matcher/regex_set_matcher.cc
-@@ -10,8 +10,13 @@
- #include "base/memory/ptr_util.h"
+@@ -11,8 +11,13 @@
+ #include "base/logging.h"
#include "base/strings/string_util.h"
#include "components/url_matcher/substring_set_matcher.h"
+#if defined(OS_BSD)
+#include <re2/filtered_re2.h>
+#include <re2/re2.h>
+#else
#include "third_party/re2/src/re2/filtered_re2.h"
#include "third_party/re2/src/re2/re2.h"
+#endif
namespace url_matcher {
Index: branches/2019Q2/www/chromium/files/patch-components_url__matcher_url__matcher__factory.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-components_url__matcher_url__matcher__factory.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-components_url__matcher_url__matcher__factory.cc (revision 497959)
@@ -1,14 +1,14 @@
---- components/url_matcher/url_matcher_factory.cc.orig 2017-04-19 19:06:33 UTC
+--- components/url_matcher/url_matcher_factory.cc.orig 2019-03-11 22:00:57 UTC
+++ components/url_matcher/url_matcher_factory.cc
@@ -16,7 +16,11 @@
#include "base/values.h"
#include "components/url_matcher/url_matcher_constants.h"
#include "components/url_matcher/url_matcher_helpers.h"
+#if defined(OS_BSD)
+#include <re2/re2.h>
+#else
#include "third_party/re2/src/re2/re2.h"
+#endif
namespace url_matcher {
Index: branches/2019Q2/www/chromium/files/patch-components_webcrypto_algorithms_test__helpers.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-components_webcrypto_algorithms_test__helpers.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-components_webcrypto_algorithms_test__helpers.cc (revision 497959)
@@ -1,14 +1,14 @@
---- components/webcrypto/algorithms/test_helpers.cc.orig 2018-06-13 00:10:16.000000000 +0200
-+++ components/webcrypto/algorithms/test_helpers.cc 2018-07-19 00:07:52.270703000 +0200
+--- components/webcrypto/algorithms/test_helpers.cc.orig 2019-03-11 22:00:57 UTC
++++ components/webcrypto/algorithms/test_helpers.cc
@@ -25,7 +25,11 @@
#include "components/webcrypto/status.h"
#include "third_party/blink/public/platform/web_crypto_algorithm_params.h"
#include "third_party/blink/public/platform/web_crypto_key_algorithm.h"
+#if defined(OS_BSD)
+#include <re2/re2.h>
+#else
#include "third_party/re2/src/re2/re2.h"
+#endif
namespace webcrypto {
Index: branches/2019Q2/www/chromium/files/patch-content_app_content__main__runner__impl.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-content_app_content__main__runner__impl.cc (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-content_app_content__main__runner__impl.cc (revision 497959)
@@ -0,0 +1,73 @@
+--- content/app/content_main_runner_impl.cc.orig 2019-03-11 22:00:57 UTC
++++ content/app/content_main_runner_impl.cc
+@@ -93,17 +93,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"
+@@ -124,7 +124,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"
+@@ -309,7 +309,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
+@@ -406,7 +406,7 @@ void PreSandboxInit() {
+ }
+ #endif // BUILDFLAG(USE_ZYGOTE_HANDLE)
+
+-#endif // OS_LINUX
++#endif // OS_LINUX || OS_BSD
+
+ } // namespace
+
+@@ -464,7 +464,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
+
+@@ -637,11 +637,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
+
Property changes on: branches/2019Q2/www/chromium/files/patch-content_app_content__main__runner__impl.cc
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: branches/2019Q2/www/chromium/files/patch-content_browser_BUILD.gn
===================================================================
--- branches/2019Q2/www/chromium/files/patch-content_browser_BUILD.gn (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-content_browser_BUILD.gn (revision 497959)
@@ -1,14 +1,14 @@
---- content/browser/BUILD.gn.orig 2018-12-13 20:37:36.820277000 +0100
-+++ content/browser/BUILD.gn 2018-12-13 20:38:05.546755000 +0100
-@@ -1889,11 +1889,6 @@
+--- content/browser/BUILD.gn.orig 2019-03-11 22:00:57 UTC
++++ content/browser/BUILD.gn
+@@ -1939,11 +1939,6 @@ jumbo_source_set("browser") {
"tracing/cros_tracing_agent.h",
]
deps += [ "//chromeos/resources" ]
- } else {
- sources += [
- "memory/memory_monitor_linux.cc",
- "memory/memory_monitor_linux.h",
- ]
}
if (is_chromeos || is_android || is_chromecast) {
Index: branches/2019Q2/www/chromium/files/patch-content_browser_browser__main__loop.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-content_browser_browser__main__loop.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-content_browser_browser__main__loop.cc (revision 497959)
@@ -1,28 +1,46 @@
---- content/browser/browser_main_loop.cc.orig 2018-08-01 00:08:43.000000000 +0200
-+++ content/browser/browser_main_loop.cc 2018-08-05 15:40:45.172441000 +0200
-@@ -234,6 +234,13 @@
- #include "services/ui/common/image_cursors_set.h"
+--- content/browser/browser_main_loop.cc.orig 2019-03-11 22:00:57 UTC
++++ content/browser/browser_main_loop.cc
+@@ -250,6 +250,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
-@@ -546,6 +553,11 @@
+@@ -585,6 +592,11 @@ int BrowserMainLoop::EarlyInitialization() {
// by now since a thread to start the ServiceManager has been created
// before the browser main loop starts.
DCHECK(SandboxHostLinux::GetInstance()->IsInitialized());
+#elif defined(OS_BSD)
+ SandboxHostLinux::GetInstance()->Init();
+ base::FileHandleMappingVector fds_to_map;
+ const int sfd = SandboxHostLinux::GetInstance()->GetChildSocket();
+ fds_to_map.push_back(std::make_pair(sfd, service_manager::GetSandboxFD()));
#endif
#if defined(USE_X11)
+@@ -629,7 +641,7 @@ int BrowserMainLoop::EarlyInitialization() {
+ #endif // defined(OS_ANDROID) || defined(OS_CHROMEOS)
+
+ #if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \
+- defined(OS_ANDROID)
++ defined(OS_ANDROID) || defined(OS_BSD)
+ // We use quite a few file descriptors for our IPC as well as disk the disk
+ // cache,and the default limit on the Mac is low (256), so bump it up.
+
+@@ -639,7 +651,7 @@ int BrowserMainLoop::EarlyInitialization() {
+ // an arbitrarily high number. See https://crbug.com/539567
+ base::IncreaseFdLimitTo(8192);
+ #endif // defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_CHROMEOS) ||
+- // defined(OS_ANDROID)
++ // defined(OS_ANDROID) || defined(OS_BSD)
+
+ #if defined(OS_WIN)
+ net::EnsureWinsockInit();
Index: branches/2019Q2/www/chromium/files/patch-content_browser_child__process__launcher__helper__linux.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-content_browser_child__process__launcher__helper__linux.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-content_browser_child__process__launcher__helper__linux.cc (revision 497959)
@@ -1,76 +1,76 @@
---- content/browser/child_process_launcher_helper_linux.cc.orig 2018-08-01 00:08:43.000000000 +0200
-+++ content/browser/child_process_launcher_helper_linux.cc 2018-08-04 18:57:46.407465000 +0200
-@@ -18,7 +18,9 @@
- #include "gpu/config/gpu_switches.h"
+--- content/browser/child_process_launcher_helper_linux.cc.orig 2019-03-11 22:00:57 UTC
++++ content/browser/child_process_launcher_helper_linux.cc
+@@ -17,7 +17,9 @@
+ #include "content/public/common/sandboxed_process_launcher_delegate.h"
#include "services/service_manager/sandbox/linux/sandbox_linux.h"
#include "services/service_manager/zygote/common/common_sandbox_support_linux.h"
+#if !defined(OS_BSD)
#include "services/service_manager/zygote/common/zygote_handle.h"
+#endif
#include "services/service_manager/zygote/host/zygote_communication_linux.h"
#include "services/service_manager/zygote/host/zygote_host_impl_linux.h"
-@@ -72,6 +74,7 @@
+@@ -69,6 +71,7 @@ ChildProcessLauncherHelper::LaunchProcessOnLauncherThr
int* launch_result) {
*is_synchronous_launch = true;
+#if !defined(OS_BSD)
service_manager::ZygoteHandle zygote_handle =
base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kNoZygote)
? nullptr
-@@ -85,7 +88,6 @@
+@@ -82,7 +85,6 @@ ChildProcessLauncherHelper::LaunchProcessOnLauncherThr
GetProcessType());
*launch_result = LAUNCH_RESULT_SUCCESS;
-#if !defined(OS_OPENBSD)
if (handle) {
// This is just a starting score for a renderer or extension (the
// only types of processes that will be started this way). It will
-@@ -96,13 +98,13 @@
+@@ -93,13 +95,13 @@ ChildProcessLauncherHelper::LaunchProcessOnLauncherThr
service_manager::ZygoteHostImpl::GetInstance()->AdjustRendererOOMScore(
handle, kLowestRendererOomScore);
}
-#endif
Process process;
process.process = base::Process(handle);
process.zygote = zygote_handle;
return process;
}
+#endif
Process process;
process.process = base::LaunchProcess(*command_line(), options);
-@@ -120,10 +122,14 @@
+@@ -117,10 +119,14 @@ ChildProcessTerminationInfo ChildProcessLauncherHelper
const ChildProcessLauncherHelper::Process& process,
bool known_dead) {
ChildProcessTerminationInfo info;
+#if !defined(OS_BSD)
if (process.zygote) {
info.status = process.zygote->GetTerminationStatus(
process.process.Handle(), known_dead, &info.exit_code);
} else if (known_dead) {
+#else
+ if (known_dead) {
+#endif
info.status = base::GetKnownDeadTerminationStatus(process.process.Handle(),
&info.exit_code);
} else {
-@@ -147,13 +153,17 @@
+@@ -144,13 +150,17 @@ void ChildProcessLauncherHelper::ForceNormalProcessTer
DCHECK(CurrentlyOnProcessLauncherTaskRunner());
process.process.Terminate(service_manager::RESULT_CODE_NORMAL_EXIT, false);
// On POSIX, we must additionally reap the child.
+#if !defined(OS_BSD)
if (process.zygote) {
// If the renderer was created via a zygote, we have to proxy the reaping
// through the zygote process.
process.zygote->EnsureProcessTerminated(process.process.Handle());
} else {
+#endif
base::EnsureProcessTerminated(std::move(process.process));
+#if !defined(OS_BSD)
}
+#endif
}
void ChildProcessLauncherHelper::SetProcessPriorityOnLauncherThread(
Index: branches/2019Q2/www/chromium/files/patch-content_browser_media_media__internals.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-content_browser_media_media__internals.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-content_browser_media_media__internals.cc (revision 497959)
@@ -1,11 +1,11 @@
---- content/browser/media/media_internals.cc.orig 2017-06-05 19:03:07 UTC
+--- content/browser/media/media_internals.cc.orig 2019-03-11 22:00:57 UTC
+++ content/browser/media/media_internals.cc
-@@ -776,7 +776,7 @@ void MediaInternals::UpdateVideoCaptureDeviceCapabilit
+@@ -763,7 +763,7 @@ void MediaInternals::UpdateVideoCaptureDeviceCapabilit
device_dict->SetString("name", descriptor.GetNameAndModel());
- device_dict->Set("formats", format_list);
+ device_dict->Set("formats", std::move(format_list));
#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \
- defined(OS_ANDROID)
+ defined(OS_ANDROID) || defined(OS_BSD)
device_dict->SetString("captureApi", descriptor.GetCaptureApiTypeString());
#endif
video_capture_capabilities_cached_data_.Append(std::move(device_dict));
Index: branches/2019Q2/www/chromium/files/patch-content_browser_memory_memory__monitor.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-content_browser_memory_memory__monitor.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-content_browser_memory_memory__monitor.cc (revision 497959)
@@ -1,11 +1,11 @@
---- content/browser/memory/memory_monitor.cc.orig 2018-01-04 21:05:50.000000000 +0100
-+++ content/browser/memory/memory_monitor.cc 2018-01-27 19:06:05.251190000 +0100
-@@ -22,7 +22,7 @@
+--- content/browser/memory/memory_monitor.cc.orig 2019-03-11 22:00:57 UTC
++++ content/browser/memory/memory_monitor.cc
+@@ -22,7 +22,7 @@ void MemoryMonitorDelegate::GetSystemMemoryInfo(
base::GetSystemMemoryInfo(mem_info);
}
-#if defined(OS_MACOSX)
+#if defined(OS_MACOSX) || defined(OS_BSD)
// TODO(bashi,bcwhite): Remove when memory monitor for mac is available.
std::unique_ptr<MemoryMonitor> CreateMemoryMonitor() {
NOTREACHED();
Index: branches/2019Q2/www/chromium/files/patch-content_browser_memory_swap__metrics__driver__impl__linux.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-content_browser_memory_swap__metrics__driver__impl__linux.cc (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-content_browser_memory_swap__metrics__driver__impl__linux.cc (revision 497959)
@@ -0,0 +1,27 @@
+--- content/browser/memory/swap_metrics_driver_impl_linux.cc.orig 2019-03-11 22:00:57 UTC
++++ content/browser/memory/swap_metrics_driver_impl_linux.cc
+@@ -43,6 +43,7 @@ SwapMetricsDriverImplLinux::~SwapMetricsDriverImplLinu
+
+ SwapMetricsDriver::SwapMetricsUpdateResult
+ SwapMetricsDriverImplLinux::UpdateMetricsInternal(base::TimeDelta interval) {
++#if !defined(OS_BSD)
+ base::VmStatInfo vmstat;
+ if (!base::GetVmStatInfo(&vmstat)) {
+ return SwapMetricsDriver::SwapMetricsUpdateResult::kSwapMetricsUpdateFailed;
+@@ -55,12 +56,15 @@ SwapMetricsDriverImplLinux::UpdateMetricsInternal(base
+
+ if (interval.is_zero())
+ return SwapMetricsDriver::SwapMetricsUpdateResult::
+- kSwapMetricsUpdateSuccess;
++ kSwapMetricsUpdateSuccess;
+
+ delegate_->OnSwapInCount(in_counts, interval);
+ delegate_->OnSwapOutCount(out_counts, interval);
+
+ return SwapMetricsDriver::SwapMetricsUpdateResult::kSwapMetricsUpdateSuccess;
++#else
++ return SwapMetricsDriver::SwapMetricsUpdateResult::kSwapMetricsUpdateFailed;
++#endif
+ }
+
+ } // namespace content
Property changes on: branches/2019Q2/www/chromium/files/patch-content_browser_memory_swap__metrics__driver__impl__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/2019Q2/www/chromium/files/patch-content_browser_renderer__host_input_input__device__change__observer.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-content_browser_renderer__host_input_input__device__change__observer.cc (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-content_browser_renderer__host_input_input__device__change__observer.cc (revision 497959)
@@ -0,0 +1,29 @@
+--- content/browser/renderer_host/input/input_device_change_observer.cc.orig 2019-03-11 22:00:58 UTC
++++ content/browser/renderer_host/input/input_device_change_observer.cc
+@@ -10,7 +10,7 @@
+
+ #if defined(OS_WIN)
+ #include "ui/events/devices/input_device_observer_win.h"
+-#elif defined(OS_LINUX)
++#elif defined(OS_LINUX) || defined(OS_BSD)
+ #include "ui/events/devices/input_device_manager.h"
+ #elif defined(OS_ANDROID)
+ #include "ui/events/devices/input_device_observer_android.h"
+@@ -22,7 +22,7 @@ InputDeviceChangeObserver::InputDeviceChangeObserver(R
+ render_view_host_impl_ = rvhi;
+ #if defined(OS_WIN)
+ ui::InputDeviceObserverWin::GetInstance()->AddObserver(this);
+-#elif defined(OS_LINUX)
++#elif defined(OS_LINUX) || defined(OS_BSD)
+ ui::InputDeviceManager::GetInstance()->AddObserver(this);
+ #elif defined(OS_ANDROID)
+ ui::InputDeviceObserverAndroid::GetInstance()->AddObserver(this);
+@@ -32,7 +32,7 @@ InputDeviceChangeObserver::InputDeviceChangeObserver(R
+ InputDeviceChangeObserver::~InputDeviceChangeObserver() {
+ #if defined(OS_WIN)
+ ui::InputDeviceObserverWin::GetInstance()->RemoveObserver(this);
+-#elif defined(OS_LINUX)
++#elif defined(OS_LINUX) || defined(OS_BSD)
+ ui::InputDeviceManager::GetInstance()->RemoveObserver(this);
+ #elif defined(OS_ANDROID)
+ ui::InputDeviceObserverAndroid::GetInstance()->RemoveObserver(this);
Property changes on: branches/2019Q2/www/chromium/files/patch-content_browser_renderer__host_input_input__device__change__observer.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/2019Q2/www/chromium/files/patch-content_browser_renderer__host_render__message__filter.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-content_browser_renderer__host_render__message__filter.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-content_browser_renderer__host_render__message__filter.cc (revision 497959)
@@ -1,29 +1,29 @@
---- content/browser/renderer_host/render_message_filter.cc.orig 2018-06-13 00:10:17.000000000 +0200
-+++ content/browser/renderer_host/render_message_filter.cc 2018-07-19 11:46:53.426069000 +0200
-@@ -76,7 +76,7 @@
+--- content/browser/renderer_host/render_message_filter.cc.orig 2019-03-11 22:00:58 UTC
++++ content/browser/renderer_host/render_message_filter.cc
+@@ -71,7 +71,7 @@
#if defined(OS_MACOSX)
#include "ui/accelerated_widget_mac/window_resize_helper_mac.h"
#endif
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
#include "base/linux_util.h"
#include "base/threading/platform_thread.h"
#endif
-@@ -194,7 +194,7 @@
+@@ -151,7 +151,7 @@ void RenderMessageFilter::CreateFullscreenWidget(
std::move(callback).Run(route_id);
}
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
void RenderMessageFilter::SetThreadPriorityOnFileThread(
base::PlatformThreadId ns_tid,
base::ThreadPriority priority) {
-@@ -215,7 +215,7 @@
+@@ -172,7 +172,7 @@ void RenderMessageFilter::SetThreadPriorityOnFileThrea
}
#endif
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
void RenderMessageFilter::SetThreadPriority(int32_t ns_tid,
base::ThreadPriority priority) {
constexpr base::TaskTraits kTraits = {
Index: branches/2019Q2/www/chromium/files/patch-content_browser_renderer__host_render__message__filter.h
===================================================================
--- branches/2019Q2/www/chromium/files/patch-content_browser_renderer__host_render__message__filter.h (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-content_browser_renderer__host_render__message__filter.h (revision 497959)
@@ -1,19 +1,19 @@
---- content/browser/renderer_host/render_message_filter.h.orig 2018-06-13 00:10:17.000000000 +0200
-+++ content/browser/renderer_host/render_message_filter.h 2018-07-20 17:25:54.254096000 +0200
-@@ -114,14 +114,14 @@
- const url::Origin& cache_storage_origin,
- const std::string& cache_storage_cache_name) override;
+--- content/browser/renderer_host/render_message_filter.h.orig 2019-03-11 22:00:58 UTC
++++ content/browser/renderer_host/render_message_filter.h
+@@ -87,14 +87,14 @@ class CONTENT_EXPORT RenderMessageFilter
+ mojom::WidgetPtr widget,
+ CreateFullscreenWidgetCallback callback) override;
void HasGpuProcess(HasGpuProcessCallback callback) override;
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
void SetThreadPriority(int32_t ns_tid,
base::ThreadPriority priority) override;
#endif
void OnResolveProxy(const GURL& url, IPC::Message* reply_msg);
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
void SetThreadPriorityOnFileThread(base::PlatformThreadId ns_tid,
base::ThreadPriority priority);
#endif
Index: branches/2019Q2/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.h
===================================================================
--- branches/2019Q2/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.h (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.h (revision 497959)
@@ -1,15 +1,15 @@
---- content/browser/renderer_host/render_process_host_impl.h.orig 2017-08-02 01:07:45.102330000 +0200
-+++ content/browser/renderer_host/render_process_host_impl.h 2017-08-02 01:09:10.056596000 +0200
-@@ -290,10 +290,10 @@
+--- content/browser/renderer_host/render_process_host_impl.h.orig 2019-03-11 22:00:58 UTC
++++ content/browser/renderer_host/render_process_host_impl.h
+@@ -407,10 +407,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)
- void RecomputeAndUpdateWebKitPreferences();
-
+ RendererAudioOutputStreamFactoryContext*
+ GetRendererAudioOutputStreamFactoryContext() override;
Index: branches/2019Q2/www/chromium/files/patch-content_browser_renderer__host_render__view__host__impl.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-content_browser_renderer__host_render__view__host__impl.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-content_browser_renderer__host_render__view__host__impl.cc (revision 497959)
@@ -1,11 +1,11 @@
---- content/browser/renderer_host/render_view_host_impl.cc.orig 2017-06-05 19:03:07 UTC
+--- content/browser/renderer_host/render_view_host_impl.cc.orig 2019-03-11 22:00:58 UTC
+++ content/browser/renderer_host/render_view_host_impl.cc
-@@ -142,7 +142,7 @@ void GetPlatformSpecificPrefs(RendererPreferences* pre
+@@ -161,7 +161,7 @@ void GetPlatformSpecificPrefs(RendererPreferences* pre
display::win::ScreenWin::GetSystemMetricsInDIP(SM_CYVSCROLL);
prefs->arrow_bitmap_width_horizontal_scroll_bar_in_dips =
display::win::ScreenWin::GetSystemMetricsInDIP(SM_CXHSCROLL);
-#elif defined(OS_LINUX)
+#elif defined(OS_LINUX) || defined(OS_BSD)
prefs->system_font_family_name = gfx::Font().GetFontName();
#endif
}
Index: branches/2019Q2/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc (revision 497959)
@@ -1,29 +1,29 @@
---- content/browser/renderer_host/render_widget_host_view_aura.cc.orig 2017-06-05 19:03:07 UTC
+--- content/browser/renderer_host/render_widget_host_view_aura.cc.orig 2019-03-11 22:00:58 UTC
+++ content/browser/renderer_host/render_widget_host_view_aura.cc
-@@ -114,7 +114,7 @@
+@@ -121,7 +121,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
-@@ -2040,7 +2040,7 @@ bool RenderWidgetHostViewAura::NeedsInputGrab() {
+@@ -2192,7 +2192,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;
-@@ -2241,7 +2241,7 @@ void RenderWidgetHostViewAura::ForwardKeyboardEvent(
+@@ -2390,7 +2390,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<ui::TextEditCommandAuraLinux> commands;
Index: branches/2019Q2/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__event__handler.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__event__handler.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__event__handler.cc (revision 497959)
@@ -1,11 +1,11 @@
---- content/browser/renderer_host/render_widget_host_view_event_handler.cc.orig 2017-06-05 19:03:07 UTC
+--- content/browser/renderer_host/render_widget_host_view_event_handler.cc.orig 2019-03-11 22:00:58 UTC
+++ content/browser/renderer_host/render_widget_host_view_event_handler.cc
-@@ -548,7 +548,7 @@ bool RenderWidgetHostViewEventHandler::CanRendererHand
+@@ -608,7 +608,7 @@ bool RenderWidgetHostViewEventHandler::CanRendererHand
if (event->type() == ui::ET_MOUSE_EXITED) {
if (mouse_locked || selection_popup)
return false;
-#if defined(OS_WIN) || defined(OS_LINUX)
+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD)
// Don't forward the mouse leave message which is received when the context
// menu is displayed by the page. This confuses the page and causes state
// changes.
Index: branches/2019Q2/www/chromium/files/patch-content_browser_scheduler_responsiveness_native__event__observer.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-content_browser_scheduler_responsiveness_native__event__observer.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-content_browser_scheduler_responsiveness_native__event__observer.cc (revision 497959)
@@ -1,29 +1,29 @@
---- content/browser/scheduler/responsiveness/native_event_observer.cc.orig 2019-01-30 02:17:59.000000000 +0100
-+++ content/browser/scheduler/responsiveness/native_event_observer.cc 2019-02-01 00:19:02.237926000 +0100
+--- content/browser/scheduler/responsiveness/native_event_observer.cc.orig 2019-03-11 22:00:58 UTC
++++ content/browser/scheduler/responsiveness/native_event_observer.cc
@@ -15,7 +15,7 @@
#include "ui/events/platform/platform_event_source.h"
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
#include "ui/aura/env.h"
#include "ui/events/event.h"
#endif
-@@ -39,7 +39,7 @@
+@@ -39,7 +39,7 @@ NativeEventObserver::~NativeEventObserver() {
DeregisterObserver();
}
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
void NativeEventObserver::RegisterObserver() {
aura::Env::GetInstance()->AddWindowEventDispatcherObserver(this);
}
-@@ -61,7 +61,7 @@
+@@ -61,7 +61,7 @@ void NativeEventObserver::OnWindowEventDispatcherFinis
did_run_event_callback_.Run(info.unique_id);
events_being_processed_.pop_back();
}
-#endif // defined(OS_LINUX)
+#endif // defined(OS_LINUX) || defined(OS_BSD)
#if defined(OS_WIN)
void NativeEventObserver::RegisterObserver() {
Index: branches/2019Q2/www/chromium/files/patch-content_browser_scheduler_responsiveness_native__event__observer.h
===================================================================
--- branches/2019Q2/www/chromium/files/patch-content_browser_scheduler_responsiveness_native__event__observer.h (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-content_browser_scheduler_responsiveness_native__event__observer.h (revision 497959)
@@ -1,47 +1,47 @@
---- content/browser/scheduler/responsiveness/native_event_observer.h.orig 2019-01-30 02:17:59.000000000 +0100
-+++ content/browser/scheduler/responsiveness/native_event_observer.h 2019-02-01 00:24:39.349687000 +0100
+--- content/browser/scheduler/responsiveness/native_event_observer.h.orig 2019-03-11 22:00:58 UTC
++++ content/browser/scheduler/responsiveness/native_event_observer.h
@@ -14,7 +14,7 @@
#include "content/public/browser/native_event_processor_observer_mac.h"
#endif
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
#include "ui/aura/window_event_dispatcher_observer.h"
#endif
-@@ -39,7 +39,7 @@
+@@ -39,7 +39,7 @@ namespace responsiveness {
class CONTENT_EXPORT NativeEventObserver
#if defined(OS_MACOSX)
: public NativeEventProcessorObserver
-#elif defined(OS_LINUX)
+#elif defined(OS_LINUX) || defined(OS_BSD)
: public aura::WindowEventDispatcherObserver
#elif defined(OS_WIN)
: public base::MessagePumpForUI::Observer
-@@ -56,7 +56,7 @@
+@@ -56,7 +56,7 @@ class CONTENT_EXPORT NativeEventObserver
NativeEventObserver(WillRunEventCallback will_run_event_callback,
DidRunEventCallback did_run_event_callback);
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
~NativeEventObserver() override;
#else
virtual ~NativeEventObserver();
-@@ -68,7 +68,7 @@
+@@ -68,7 +68,7 @@ class CONTENT_EXPORT NativeEventObserver
// Exposed for tests.
void WillRunNativeEvent(const void* opaque_identifier) override;
void DidRunNativeEvent(const void* opaque_identifier) override;
-#elif defined(OS_LINUX)
+#elif defined(OS_LINUX) || defined(OS_BSD)
// aura::WindowEventDispatcherObserver overrides:
void OnWindowEventDispatcherStartedProcessing(
aura::WindowEventDispatcher* dispatcher,
-@@ -85,7 +85,7 @@
+@@ -85,7 +85,7 @@ class CONTENT_EXPORT NativeEventObserver
void RegisterObserver();
void DeregisterObserver();
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
struct EventInfo {
const void* unique_id;
};
Index: branches/2019Q2/www/chromium/files/patch-content_browser_service__manager_service__manager__context.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-content_browser_service__manager_service__manager__context.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-content_browser_service__manager_service__manager__context.cc (revision 497959)
@@ -1,29 +1,35 @@
---- content/browser/service_manager/service_manager_context.cc.orig 2019-02-06 19:17:17.245963000 +0100
-+++ content/browser/service_manager/service_manager_context.cc 2019-02-06 19:18:30.535127000 +0100
-@@ -100,7 +100,7 @@
- #include "ui/aura/env.h"
+--- content/browser/service_manager/service_manager_context.cc.orig 2019-03-11 22:00:58 UTC
++++ content/browser/service_manager/service_manager_context.cc
+@@ -99,7 +99,7 @@
+ #include "jni/ContentNfcDelegate_jni.h"
#endif
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
#include "components/services/font/font_service_app.h"
#include "components/services/font/public/interfaces/constants.mojom.h"
#endif
-@@ -436,7 +436,7 @@
+@@ -378,12 +378,12 @@ void CreateInProcessAudioService(
BrowserMainLoop::GetAudioManager(), std::move(request)));
}
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
- void CreateFontService(service_manager::mojom::ServiceRequest request) {
- // The font service owns itself here, deleting on self-termination.
- auto service =
-@@ -700,7 +700,7 @@
- out_of_process_services[data_decoder::mojom::kServiceName] =
- base::BindRepeating(&base::ASCIIToUTF16, "Data Decoder Service");
+ std::unique_ptr<service_manager::Service> CreateFontService(
+ service_manager::mojom::ServiceRequest request) {
+ return std::make_unique<font_service::FontServiceApp>(std::move(request));
+ }
+-#endif // defined(OS_LINUX)
++#endif // defined(OS_LINUX) || defined(OS_BSD)
+ std::unique_ptr<service_manager::Service> CreateResourceCoordinatorService(
+ service_manager::mojom::ServiceRequest request) {
+@@ -618,7 +618,7 @@ ServiceManagerContext::ServiceManagerContext(
+ base::BindRepeating(&CreateVideoCaptureService));
+ }
+
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
- packaged_services_connection_->AddServiceRequestHandler(
- font_service::mojom::kServiceName,
- base::BindRepeating([](service_manager::mojom::ServiceRequest request) {
+ RegisterInProcessService(
+ packaged_services_connection_.get(), font_service::mojom::kServiceName,
+ base::CreateSequencedTaskRunnerWithTraits(
Index: branches/2019Q2/www/chromium/files/patch-content_browser_storage__partition__impl.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-content_browser_storage__partition__impl.cc (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-content_browser_storage__partition__impl.cc (revision 497959)
@@ -0,0 +1,11 @@
+--- content/browser/storage_partition_impl.cc.orig 2019-03-17 17:48:03 UTC
++++ content/browser/storage_partition_impl.cc
+@@ -768,7 +768,7 @@ net::URLRequestContextGetter* StoragePartitionImpl::Ge
+ // TODO(jam): enable for all, still used on WebView.
+ // See copy of this ifdef in:
+ // StoragePartitionImplMap::Get
+-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)
++#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD)
+ if (base::FeatureList::IsEnabled(network::features::kNetworkService))
+ NOTREACHED();
+ #endif
Property changes on: branches/2019Q2/www/chromium/files/patch-content_browser_storage__partition__impl.cc
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: branches/2019Q2/www/chromium/files/patch-content_browser_storage__partition__impl__map.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-content_browser_storage__partition__impl__map.cc (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-content_browser_storage__partition__impl__map.cc (revision 497959)
@@ -0,0 +1,11 @@
+--- content/browser/storage_partition_impl_map.cc.orig 2019-03-17 17:40:34 UTC
++++ content/browser/storage_partition_impl_map.cc
+@@ -425,7 +425,7 @@ StoragePartitionImpl* StoragePartitionImplMap::Get(
+ bool create_request_context = true;
+ if (base::FeatureList::IsEnabled(network::features::kNetworkService)) {
+ // These ifdefs should match StoragePartitionImpl::GetURLRequestContext.
+-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)
++#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD)
+ create_request_context = false;
+ #elif defined(OS_ANDROID)
+ create_request_context =
Property changes on: branches/2019Q2/www/chromium/files/patch-content_browser_storage__partition__impl__map.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/2019Q2/www/chromium/files/patch-content_browser_webui_shared__resources__data__source.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-content_browser_webui_shared__resources__data__source.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-content_browser_webui_shared__resources__data__source.cc (revision 497959)
@@ -1,14 +1,14 @@
---- content/browser/webui/shared_resources_data_source.cc.orig 2019-02-06 23:05:16.881256000 +0100
-+++ content/browser/webui/shared_resources_data_source.cc 2019-02-06 23:05:49.834217000 +0100
-@@ -73,9 +73,9 @@
+--- content/browser/webui/shared_resources_data_source.cc.orig 2019-03-11 22:00:58 UTC
++++ content/browser/webui/shared_resources_data_source.cc
+@@ -72,9 +72,9 @@ const std::map<int, std::string> CreateMojoResourceIdT
return std::map<int, std::string> {
{IDR_MOJO_MOJO_BINDINGS_JS, "js/mojo_bindings.js"},
{IDR_MOJO_MOJO_BINDINGS_LITE_JS, "js/mojo_bindings_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_JS, "js/time.mojom.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/2019Q2/www/chromium/files/patch-content_common_BUILD.gn
===================================================================
--- branches/2019Q2/www/chromium/files/patch-content_common_BUILD.gn (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-content_common_BUILD.gn (revision 497959)
@@ -1,15 +1,15 @@
---- content/common/BUILD.gn.orig 2018-06-13 00:10:17.000000000 +0200
-+++ content/common/BUILD.gn 2018-07-20 00:38:14.267181000 +0200
-@@ -430,6 +430,12 @@
+--- content/common/BUILD.gn.orig 2019-03-11 22:00:58 UTC
++++ content/common/BUILD.gn
+@@ -382,6 +382,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/2019Q2/www/chromium/files/patch-content_common_common__sandbox__support__linux.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-content_common_common__sandbox__support__linux.cc (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-content_common_common__sandbox__support__linux.cc (revision 497959)
@@ -0,0 +1,10 @@
+--- content/common/common_sandbox_support_linux.cc.orig 2019-03-11 22:00:58 UTC
++++ content/common/common_sandbox_support_linux.cc
+@@ -5,6 +5,7 @@
+ #include "content/public/common/common_sandbox_support_linux.h"
+
+ #include <sys/stat.h>
++#include <unistd.h>
+
+ #include <limits>
+ #include <memory>
Property changes on: branches/2019Q2/www/chromium/files/patch-content_common_common__sandbox__support__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/2019Q2/www/chromium/files/patch-content_common_user__agent.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-content_common_user__agent.cc (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-content_common_user__agent.cc (revision 497959)
@@ -0,0 +1,17 @@
+--- content/common/user_agent.cc.orig 2019-03-11 22:00:58 UTC
++++ content/common/user_agent.cc
+@@ -131,6 +131,14 @@ std::string BuildOSCpuInfo(bool include_android_build_
+ #endif
+ ); // NOLINT
+
++#if defined(OS_BSD)
++#if defined(__x86_64__)
++ base::StringAppendF(&os_cpu, "; Linux x86_64");
++#else
++ base::StringAppendF(&os_cpu, "; Linux i686");
++#endif
++#endif
++
+ return os_cpu;
+ }
+
Property changes on: branches/2019Q2/www/chromium/files/patch-content_common_user__agent.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/2019Q2/www/chromium/files/patch-content_gpu_BUILD.gn
===================================================================
--- branches/2019Q2/www/chromium/files/patch-content_gpu_BUILD.gn (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-content_gpu_BUILD.gn (revision 497959)
@@ -1,11 +1,11 @@
---- content/gpu/BUILD.gn.orig 2019-01-04 22:49:40.191544000 +0100
-+++ content/gpu/BUILD.gn 2019-01-04 22:50:06.857572000 +0100
-@@ -131,7 +131,7 @@
+--- content/gpu/BUILD.gn.orig 2019-03-11 22:00:58 UTC
++++ content/gpu/BUILD.gn
+@@ -133,7 +133,7 @@ target(link_target_type, "gpu_sources") {
# Use DRI on desktop Linux builds.
if (current_cpu != "s390x" && current_cpu != "ppc64" && is_desktop_linux &&
- (!is_chromecast || is_cast_desktop_build)) {
+ (!is_chromecast || is_cast_desktop_build) && !is_bsd) {
configs += [ "//build/config/linux/dri" ]
}
}
Index: branches/2019Q2/www/chromium/files/patch-content_gpu_gpu__main.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-content_gpu_gpu__main.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-content_gpu_gpu__main.cc (revision 497959)
@@ -1,47 +1,47 @@
---- content/gpu/gpu_main.cc.orig 2018-12-03 21:16:56.000000000 +0100
-+++ content/gpu/gpu_main.cc 2018-12-13 21:10:56.227630000 +0100
-@@ -77,7 +77,7 @@
+--- content/gpu/gpu_main.cc.orig 2019-03-11 22:00:58 UTC
++++ content/gpu/gpu_main.cc
+@@ -78,7 +78,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"
-@@ -110,7 +110,7 @@
+@@ -111,7 +111,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&);
-@@ -171,7 +171,7 @@
+@@ -172,7 +172,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_);
-@@ -361,7 +361,7 @@
+@@ -365,7 +365,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) {
-@@ -396,7 +396,7 @@
+@@ -400,7 +400,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/2019Q2/www/chromium/files/patch-content_gpu_gpu__sandbox__hook__linux.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-content_gpu_gpu__sandbox__hook__linux.cc (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-content_gpu_gpu__sandbox__hook__linux.cc (revision 497959)
@@ -0,0 +1,58 @@
+--- content/gpu/gpu_sandbox_hook_linux.cc.orig 2019-03-11 22:00:58 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<BrokerFilePermission>* permissions,
+ const service_manager::SandboxSeccompBPF::Options& options) {
+@@ -277,8 +278,10 @@ std::vector<BrokerFilePermission> 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() {
+ // Preload the Tegra V4L2 (video decode acceleration) library.
+ dlopen(kLibTegraPath, dlopen_flag);
+ }
++#endif
+ }
+
+ bool LoadAmdGpuLibraries() {
+@@ -348,6 +352,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(
+ 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;
Property changes on: branches/2019Q2/www/chromium/files/patch-content_gpu_gpu__sandbox__hook__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/2019Q2/www/chromium/files/patch-content_ppapi__plugin_ppapi__blink__platform__impl.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-content_ppapi__plugin_ppapi__blink__platform__impl.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-content_ppapi__plugin_ppapi__blink__platform__impl.cc (revision 497959)
@@ -1,38 +1,38 @@
---- content/ppapi_plugin/ppapi_blink_platform_impl.cc.orig 2019-01-30 02:17:59.000000000 +0100
-+++ content/ppapi_plugin/ppapi_blink_platform_impl.cc 2019-02-01 00:41:49.296005000 +0100
-@@ -36,7 +36,7 @@
+--- content/ppapi_plugin/ppapi_blink_platform_impl.cc.orig 2019-03-11 22:00:58 UTC
++++ content/ppapi_plugin/ppapi_blink_platform_impl.cc
+@@ -20,7 +20,7 @@
- namespace content {
-
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
-
- class PpapiBlinkPlatformImpl::SandboxSupport : public WebSandboxSupport {
- public:
-@@ -118,7 +118,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
+@@ -34,7 +34,7 @@ typedef struct CGFont* CGFontRef;
+ namespace content {
+
PpapiBlinkPlatformImpl::PpapiBlinkPlatformImpl() {
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
font_loader_ =
sk_make_sp<font_service::FontLoader>(ChildThread::Get()->GetConnector());
SkFontConfigInterface::SetGlobal(font_loader_);
-@@ -134,7 +134,7 @@
+@@ -49,7 +49,7 @@ PpapiBlinkPlatformImpl::~PpapiBlinkPlatformImpl() {
}
void PpapiBlinkPlatformImpl::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()
-@@ -144,7 +144,7 @@
+@@ -59,7 +59,7 @@ void PpapiBlinkPlatformImpl::Shutdown() {
}
blink::WebSandboxSupport* PpapiBlinkPlatformImpl::GetSandboxSupport() {
-#if defined(OS_LINUX) || defined(OS_MACOSX)
+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD)
return sandbox_support_.get();
#else
return nullptr;
Index: branches/2019Q2/www/chromium/files/patch-content_ppapi__plugin_ppapi__blink__platform__impl.h
===================================================================
--- branches/2019Q2/www/chromium/files/patch-content_ppapi__plugin_ppapi__blink__platform__impl.h (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-content_ppapi__plugin_ppapi__blink__platform__impl.h (revision 497959)
@@ -1,25 +1,25 @@
---- content/ppapi_plugin/ppapi_blink_platform_impl.h.orig 2019-01-30 02:17:59.000000000 +0100
-+++ content/ppapi_plugin/ppapi_blink_platform_impl.h 2019-02-01 00:52:30.911304000 +0100
+--- content/ppapi_plugin/ppapi_blink_platform_impl.h.orig 2019-03-11 22:00:58 UTC
++++ content/ppapi_plugin/ppapi_blink_platform_impl.h
@@ -13,7 +13,7 @@
#include "build/build_config.h"
#include "content/child/blink_platform_impl.h"
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
#include "components/services/font/public/cpp/font_loader.h"
#include "third_party/skia/include/core/SkRefCnt.h"
#endif
-@@ -42,11 +42,11 @@
+@@ -42,11 +42,11 @@ class PpapiBlinkPlatformImpl : public BlinkPlatformImp
bool sync_dir) override;
private:
-#if defined(OS_LINUX) || defined(OS_MACOSX)
+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD)
std::unique_ptr<blink::WebSandboxSupport> sandbox_support_;
#endif
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
- class SandboxSupport;
sk_sp<font_service::FontLoader> font_loader_;
#endif
+
Index: branches/2019Q2/www/chromium/files/patch-content_public_app_content__packaged__services__manifest.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-content_public_app_content__packaged__services__manifest.cc (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-content_public_app_content__packaged__services__manifest.cc (revision 497959)
@@ -0,0 +1,20 @@
+--- content/public/app/content_packaged_services_manifest.cc.orig 2019-03-11 22:00:58 UTC
++++ content/public/app/content_packaged_services_manifest.cc
+@@ -23,7 +23,7 @@
+ #include "services/video_capture/manifest.h"
+ #include "services/viz/manifest.h"
+
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+ #include "components/services/font/manifest.h"
+ #endif
+
+@@ -67,7 +67,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/2019Q2/www/chromium/files/patch-content_public_app_content__packaged__services__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/2019Q2/www/chromium/files/patch-content_public_app_v8__snapshot__overlay__manifest.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-content_public_app_v8__snapshot__overlay__manifest.cc (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-content_public_app_v8__snapshot__overlay__manifest.cc (revision 497959)
@@ -0,0 +1,11 @@
+--- content/public/app/v8_snapshot_overlay_manifest.cc.orig 2019-03-24 18:50:53.929211000 +0100
++++ content/public/app/v8_snapshot_overlay_manifest.cc 2019-03-24 18:51:09.015465000 +0100
+@@ -15,7 +15,7 @@
+ const service_manager::Manifest& GetV8SnapshotOverlayManifest() {
+ static base::NoDestructor<service_manager::Manifest> manifest {
+ service_manager::ManifestBuilder()
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+ .PreloadFile(kV8NativesDataDescriptor,
+ base::FilePath(FILE_PATH_LITERAL("natives_blob.bin")))
+ #if defined(USE_V8_CONTEXT_SNAPSHOT)
Property changes on: branches/2019Q2/www/chromium/files/patch-content_public_app_v8__snapshot__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/2019Q2/www/chromium/files/patch-content_public_common_child__process__host.h
===================================================================
--- branches/2019Q2/www/chromium/files/patch-content_public_common_child__process__host.h (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-content_public_common_child__process__host.h (revision 497959)
@@ -1,20 +1,20 @@
---- content/public/common/child_process_host.h.orig 2017-06-05 19:03:07 UTC
+--- content/public/common/child_process_host.h.orig 2019-03-11 22:00:58 UTC
+++ content/public/common/child_process_host.h
-@@ -46,7 +46,7 @@ class CONTENT_EXPORT ChildProcessHost : public IPC::Se
+@@ -47,7 +47,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.
-@@ -55,7 +55,7 @@ class CONTENT_EXPORT ChildProcessHost : public IPC::Se
+@@ -56,7 +56,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/2019Q2/www/chromium/files/patch-content_public_common_common__param__traits__macros.h
===================================================================
--- branches/2019Q2/www/chromium/files/patch-content_public_common_common__param__traits__macros.h (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-content_public_common_common__param__traits__macros.h (revision 497959)
@@ -1,11 +1,11 @@
---- content/public/common/common_param_traits_macros.h.orig 2018-12-13 21:04:53.822520000 +0100
-+++ content/public/common/common_param_traits_macros.h 2018-12-13 21:05:25.292903000 +0100
-@@ -321,7 +321,7 @@
+--- content/public/common/common_param_traits_macros.h.orig 2019-03-11 22:00:58 UTC
++++ content/public/common/common_param_traits_macros.h
+@@ -325,7 +325,7 @@ IPC_STRUCT_TRAITS_BEGIN(content::RendererPreferences)
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/2019Q2/www/chromium/files/patch-content_public_common_content__features.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-content_public_common_content__features.cc (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-content_public_common_content__features.cc (revision 497959)
@@ -0,0 +1,11 @@
+--- content/public/common/content_features.cc.orig 2019-03-24 18:52:00.447438000 +0100
++++ content/public/common/content_features.cc 2019-03-24 18:52:16.870073000 +0100
+@@ -493,7 +493,7 @@
+ base::FEATURE_DISABLED_BY_DEFAULT};
+
+ // Enable WebAssembly trap handler.
+-#if defined(OS_LINUX) && defined(ARCH_CPU_X86_64)
++#if (defined(OS_BSD) || defined(OS_LINUX)) && defined(ARCH_CPU_X86_64)
+ const base::Feature kWebAssemblyTrapHandler{"WebAssemblyTrapHandler",
+ base::FEATURE_ENABLED_BY_DEFAULT};
+ #else
Property changes on: branches/2019Q2/www/chromium/files/patch-content_public_common_content__features.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/2019Q2/www/chromium/files/patch-content_public_common_content__switches.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-content_public_common_content__switches.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-content_public_common_content__switches.cc (revision 497959)
@@ -1,11 +1,11 @@
---- content/public/common/content_switches.cc.orig 2017-06-05 19:03:07 UTC
+--- content/public/common/content_switches.cc.orig 2019-03-11 22:00:58 UTC
+++ content/public/common/content_switches.cc
-@@ -1006,7 +1006,7 @@ const char kDisableVaapiAcceleratedVideoEncode[] =
- "disable-vaapi-accelerated-video-encode";
+@@ -968,7 +968,7 @@ const char kDisableAudioSupportForDesktopShare[] =
+ 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/2019Q2/www/chromium/files/patch-content_public_common_content__switches.h
===================================================================
--- branches/2019Q2/www/chromium/files/patch-content_public_common_content__switches.h (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-content_public_common_content__switches.h (revision 497959)
@@ -1,11 +1,11 @@
---- content/public/common/content_switches.h.orig 2017-06-05 19:03:07 UTC
+--- content/public/common/content_switches.h.orig 2019-03-11 22:00:58 UTC
+++ content/public/common/content_switches.h
-@@ -294,7 +294,7 @@ CONTENT_EXPORT extern const char kDisablePanelFitting[
- CONTENT_EXPORT extern const char kDisableVaapiAcceleratedVideoEncode[];
+@@ -270,7 +270,7 @@ CONTENT_EXPORT extern const char kEnableOSKOverscroll[
+ CONTENT_EXPORT extern const char kDisablePanelFitting[];
#endif
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_FREEBSD)
CONTENT_EXPORT extern const char kEnableSpeechDispatcher[];
#endif
Index: branches/2019Q2/www/chromium/files/patch-content_public_common_renderer__preferences.h
===================================================================
--- branches/2019Q2/www/chromium/files/patch-content_public_common_renderer__preferences.h (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-content_public_common_renderer__preferences.h (revision 497959)
@@ -1,11 +1,11 @@
---- content/public/common/renderer_preferences.h.orig 2017-06-05 19:03:07 UTC
+--- content/public/common/renderer_preferences.h.orig 2019-03-11 22:00:58 UTC
+++ content/public/common/renderer_preferences.h
-@@ -131,7 +131,7 @@ struct CONTENT_EXPORT RendererPreferences {
+@@ -120,7 +120,7 @@ struct CONTENT_EXPORT RendererPreferences {
// Country iso of the mobile network for content detection purpose.
std::string network_contry_iso;
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
std::string system_font_family_name;
#endif
Index: branches/2019Q2/www/chromium/files/patch-content_public_common_use__zoom__for__dsf__policy.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-content_public_common_use__zoom__for__dsf__policy.cc (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-content_public_common_use__zoom__for__dsf__policy.cc (revision 497959)
@@ -0,0 +1,11 @@
+--- content/public/common/use_zoom_for_dsf_policy.cc.orig 2019-03-11 22:00:58 UTC
++++ content/public/common/use_zoom_for_dsf_policy.cc
+@@ -25,7 +25,7 @@ const base::Feature kUseZoomForDsfEnabledByDefault{
+ #endif
+
+ bool IsUseZoomForDSFEnabledByDefault() {
+-#if defined(OS_LINUX) || defined(OS_FUCHSIA)
++#if defined(OS_LINUX) || defined(OS_FUCHSIA) || defined(OS_BSD)
+ return true;
+ #elif defined(OS_WIN) || defined(OS_ANDROID)
+ return base::FeatureList::IsEnabled(kUseZoomForDsfEnabledByDefault);
Property changes on: branches/2019Q2/www/chromium/files/patch-content_public_common_use__zoom__for__dsf__policy.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/2019Q2/www/chromium/files/patch-content_public_test_browser__test__base.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-content_public_test_browser__test__base.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-content_public_test_browser__test__base.cc (revision 497959)
@@ -1,13 +1,13 @@
---- content/public/test/browser_test_base.cc.orig 2018-02-24 16:25:14.000000000 +0100
-+++ content/public/test/browser_test_base.cc 2018-03-04 01:33:57.278528000 +0100
-@@ -49,6 +49,10 @@
- #include "ui/gl/gl_implementation.h"
- #include "ui/gl/gl_switches.h"
+--- content/public/test/browser_test_base.cc.orig 2019-03-11 22:00:58 UTC
++++ content/public/test/browser_test_base.cc
+@@ -62,6 +62,10 @@
+ #include "ui/views/test/event_generator_delegate_mac.h"
+ #endif
+#if defined(OS_FREEBSD)
+#include <sys/signal.h>
+#endif
+
#if defined(OS_POSIX)
#include "base/process/process_handle.h"
#endif
Index: branches/2019Q2/www/chromium/files/patch-content_public_test_mock__render__thread.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-content_public_test_mock__render__thread.cc (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-content_public_test_mock__render__thread.cc (revision 497959)
@@ -0,0 +1,11 @@
+--- content/public/test/mock_render_thread.cc.orig 2019-03-17 17:24:56 UTC
++++ content/public/test/mock_render_thread.cc
+@@ -69,7 +69,7 @@ class MockRenderMessageFilterImpl : public mojom::Rend
+ std::move(callback).Run(false);
+ }
+
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+ void SetThreadPriority(int32_t platform_thread_id,
+ base::ThreadPriority thread_priority) override {}
+ #endif
Property changes on: branches/2019Q2/www/chromium/files/patch-content_public_test_mock__render__thread.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/2019Q2/www/chromium/files/patch-content_renderer_media_audio_audio__device__factory.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-content_renderer_media_audio_audio__device__factory.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-content_renderer_media_audio_audio__device__factory.cc (revision 497959)
@@ -1,11 +1,11 @@
---- content/renderer/media/audio/audio_device_factory.cc.orig 2019-02-06 23:09:19.538251000 +0100
-+++ content/renderer/media/audio/audio_device_factory.cc 2019-02-06 23:09:35.343662000 +0100
-@@ -33,7 +33,7 @@
+--- content/renderer/media/audio/audio_device_factory.cc.orig 2019-03-11 22:00:58 UTC
++++ content/renderer/media/audio/audio_device_factory.cc
+@@ -33,7 +33,7 @@ AudioDeviceFactory* AudioDeviceFactory::factory_ = nul
namespace {
-#if defined(OS_WIN) || defined(OS_MACOSX) || \
+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_BSD) || \
(defined(OS_LINUX) && !defined(OS_CHROMEOS))
// Due to driver deadlock issues on Windows (http://crbug/422522) there is a
// chance device authorization response is never received from the browser side.
Index: branches/2019Q2/www/chromium/files/patch-content_renderer_media_stream_processed__local__audio__source.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-content_renderer_media_stream_processed__local__audio__source.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-content_renderer_media_stream_processed__local__audio__source.cc (revision 497959)
@@ -1,20 +1,20 @@
---- content/renderer/media/stream/processed_local_audio_source.cc.orig 2018-12-12 22:56:07.000000000 +0100
-+++ content/renderer/media/stream/processed_local_audio_source.cc 2019-01-09 12:08:00.136944000 +0100
-@@ -35,7 +35,7 @@
+--- content/renderer/media/stream/processed_local_audio_source.cc.orig 2019-03-11 22:00:58 UTC
++++ content/renderer/media/stream/processed_local_audio_source.cc
+@@ -35,7 +35,7 @@ void* const kProcessedLocalAudioSourceIdentifier =
const_cast<void**>(&kProcessedLocalAudioSourceIdentifier);
-
+
bool ApmInAudioServiceEnabled() {
-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)
+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD)
return base::FeatureList::IsEnabled(features::kWebRtcApmInAudioService);
#else
return false;
-@@ -341,7 +341,7 @@
+@@ -355,7 +355,7 @@ void ProcessedLocalAudioSource::CaptureUsingProcessor(
bool key_pressed) {
#if defined(OS_WIN) || defined(OS_MACOSX)
DCHECK_LE(volume, 1.0);
-#elif (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_OPENBSD)
+#elif (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
// We have a special situation on Linux where the microphone volume can be
// "higher than maximum". The input volume slider in the sound preference
// allows the user to set a scaling that is higher than 100%. It means that
Index: branches/2019Q2/www/chromium/files/patch-content_renderer_media_webrtc_webrtc__audio__renderer__unittest.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-content_renderer_media_webrtc_webrtc__audio__renderer__unittest.cc (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-content_renderer_media_webrtc_webrtc__audio__renderer__unittest.cc (revision 497959)
@@ -0,0 +1,11 @@
+--- content/renderer/media/webrtc/webrtc_audio_renderer_unittest.cc.orig 2019-03-17 17:29:28 UTC
++++ content/renderer/media/webrtc/webrtc_audio_renderer_unittest.cc
+@@ -203,7 +203,7 @@ TEST_F(WebRtcAudioRendererTest, MultipleRenderers) {
+ TEST_F(WebRtcAudioRendererTest, VerifySinkParameters) {
+ SetupRenderer(kDefaultOutputDeviceId);
+ renderer_proxy_->Start();
+-#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_FUCHSIA)
++#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_FUCHSIA) || defined(OS_BSD)
+ static const int kExpectedBufferSize = kHardwareSampleRate / 100;
+ #elif defined(OS_ANDROID)
+ static const int kExpectedBufferSize = 2 * kHardwareSampleRate / 100;
Property changes on: branches/2019Q2/www/chromium/files/patch-content_renderer_media_webrtc_webrtc__audio__renderer__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/2019Q2/www/chromium/files/patch-content_renderer_render__thread__impl.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-content_renderer_render__thread__impl.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-content_renderer_render__thread__impl.cc (revision 497959)
@@ -1,56 +1,56 @@
---- content/renderer/render_thread_impl.cc.orig 2018-12-03 21:16:57.000000000 +0100
-+++ content/renderer/render_thread_impl.cc 2018-12-13 21:23:23.111245000 +0100
-@@ -192,12 +192,21 @@
+--- content/renderer/render_thread_impl.cc.orig 2019-03-11 22:00:58 UTC
++++ content/renderer/render_thread_impl.cc
+@@ -191,12 +191,21 @@
#include "mojo/public/cpp/bindings/message_dumper.h"
#endif
+#if !defined(OS_BSD)
#if defined(OS_MACOSX)
#include <malloc/malloc.h>
#else
#include <malloc.h>
#endif
+#endif
+#if defined(OS_BSD)
+#include <stddef.h>
+#include <stdint.h>
+#include <sys/param.h>
+#include <sys/sysctl.h>
+#endif
+
using base::ThreadRestrictions;
using blink::WebDocument;
using blink::WebFrame;
-@@ -932,7 +941,7 @@
+@@ -926,7 +935,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(
-@@ -973,7 +982,7 @@
+@@ -967,7 +976,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
-@@ -1331,11 +1340,11 @@
+@@ -1337,11 +1346,11 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl:
gpu::kGpuFeatureStatusEnabled);
const bool enable_gpu_memory_buffers =
!is_gpu_compositing_disabled_ &&
-#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_WIN)
+#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_WIN) || defined(OS_BSD)
!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/2019Q2/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.cc (revision 497959)
@@ -1,74 +1,56 @@
---- content/renderer/renderer_blink_platform_impl.cc.orig 2019-01-30 02:18:00.000000000 +0100
-+++ content/renderer/renderer_blink_platform_impl.cc 2019-02-07 00:24:24.998896000 +0100
-@@ -193,7 +193,7 @@
+--- content/renderer/renderer_blink_platform_impl.cc.orig 2019-03-11 22:00:58 UTC
++++ content/renderer/renderer_blink_platform_impl.cc
+@@ -109,7 +109,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
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
- class RendererBlinkPlatformImpl::SandboxSupport
- : public blink::WebSandboxSupport {
- public:
-@@ -223,7 +223,7 @@
- std::map<int32_t, blink::OutOfProcessFont> unicode_font_families_;
- sk_sp<font_service::FontLoader> font_loader_;
- };
--#endif // defined(OS_LINUX)
-+#endif // defined(OS_LINUX) || defined(OS_BSD)
-
- //------------------------------------------------------------------------------
-
-@@ -247,7 +247,7 @@
+@@ -202,7 +202,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<font_service::FontLoader>(connector_.get());
SkFontConfigInterface::SetGlobal(font_loader_);
#endif
-@@ -256,7 +256,7 @@
+@@ -211,7 +211,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()));
-@@ -285,7 +285,7 @@
+@@ -239,7 +239,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()
-@@ -366,7 +366,7 @@
+@@ -320,7 +320,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);
-@@ -379,7 +379,7 @@
+@@ -333,7 +333,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.
-@@ -560,7 +560,7 @@
-
- //------------------------------------------------------------------------------
-
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
-
- void RendererBlinkPlatformImpl::SandboxSupport::GetFallbackFontForCharacter(
- blink::WebUChar32 character,
Index: branches/2019Q2/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.h
===================================================================
--- branches/2019Q2/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.h (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.h (revision 497959)
@@ -1,29 +1,29 @@
---- content/renderer/renderer_blink_platform_impl.h.orig 2019-01-30 02:18:00.000000000 +0100
-+++ content/renderer/renderer_blink_platform_impl.h 2019-02-06 23:14:36.979983000 +0100
+--- content/renderer/renderer_blink_platform_impl.h.orig 2019-03-11 22:00:58 UTC
++++ content/renderer/renderer_blink_platform_impl.h
@@ -29,7 +29,7 @@
- #include "third_party/blink/public/platform/modules/cache_storage/cache_storage.mojom.h"
+ #include "third_party/blink/public/mojom/loader/code_cache.mojom.h"
#include "third_party/blink/public/platform/modules/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
-@@ -264,7 +264,7 @@
+@@ -263,7 +263,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi
std::unique_ptr<service_manager::Connector> connector_;
scoped_refptr<base::SingleThreadTaskRunner> io_runner_;
-#if defined(OS_LINUX) || defined(OS_MACOSX)
+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD)
std::unique_ptr<blink::WebSandboxSupport> sandbox_support_;
#endif
-@@ -299,7 +299,7 @@
+@@ -298,7 +298,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi
blink::mojom::CodeCacheHostPtrInfo code_cache_host_info_;
scoped_refptr<blink::mojom::ThreadSafeCodeCacheHostPtr> code_cache_host_;
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
- class SandboxSupport;
sk_sp<font_service::FontLoader> font_loader_;
#endif
+
Index: branches/2019Q2/www/chromium/files/patch-content_renderer_renderer__main__platform__delegate__linux.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-content_renderer_renderer__main__platform__delegate__linux.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-content_renderer_renderer__main__platform__delegate__linux.cc (revision 497959)
@@ -1,19 +1,19 @@
---- content/renderer/renderer_main_platform_delegate_linux.cc.orig 2017-06-05 19:03:07 UTC
+--- content/renderer/renderer_main_platform_delegate_linux.cc.orig 2019-03-11 22:00:58 UTC
+++ content/renderer/renderer_main_platform_delegate_linux.cc
-@@ -29,6 +29,7 @@ void RendererMainPlatformDelegate::PlatformUninitializ
+@@ -30,6 +30,7 @@ void RendererMainPlatformDelegate::PlatformUninitializ
}
bool RendererMainPlatformDelegate::EnableSandbox() {
+#if !defined(OS_BSD)
// The setuid sandbox is started in the zygote process: zygote_main_linux.cc
// https://chromium.googlesource.com/chromium/src/+/master/docs/linux_suid_sandbox.md
//
-@@ -59,7 +60,7 @@ bool RendererMainPlatformDelegate::EnableSandbox() {
+@@ -65,7 +66,7 @@ bool RendererMainPlatformDelegate::EnableSandbox() {
CHECK_EQ(errno, EPERM);
}
#endif // __x86_64__
-
+#endif // ! OS_BSD
return true;
}
Index: branches/2019Q2/www/chromium/files/patch-content_shell_BUILD.gn
===================================================================
--- branches/2019Q2/www/chromium/files/patch-content_shell_BUILD.gn (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-content_shell_BUILD.gn (revision 497959)
@@ -0,0 +1,11 @@
+--- content/shell/BUILD.gn.orig 2019-03-24 18:54:11.955928000 +0100
++++ content/shell/BUILD.gn 2019-03-24 18:54:21.602776000 +0100
+@@ -942,7 +942,7 @@
+ if (is_win) {
+ data_deps += [ "//build/win:copy_cdb_to_output" ]
+ }
+- if (is_posix && !is_android) {
++ if (is_posix && !is_android && !is_bsd) {
+ data_deps += [
+ "//third_party/breakpad:dump_syms($host_toolchain)",
+ "//third_party/breakpad:minidump_stackwalk($host_toolchain)",
Property changes on: branches/2019Q2/www/chromium/files/patch-content_shell_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/2019Q2/www/chromium/files/patch-content_shell_browser_shell__browser__context.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-content_shell_browser_shell__browser__context.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-content_shell_browser_shell__browser__context.cc (revision 497959)
@@ -1,20 +1,20 @@
---- content/shell/browser/shell_browser_context.cc.orig 2017-06-05 19:03:07 UTC
+--- content/shell/browser/shell_browser_context.cc.orig 2019-03-11 22:00:58 UTC
+++ content/shell/browser/shell_browser_context.cc
-@@ -25,7 +25,7 @@
+@@ -28,7 +28,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"
-@@ -101,7 +101,7 @@ void ShellBrowserContext::InitWhileIOAllowed() {
+@@ -103,7 +103,7 @@ void ShellBrowserContext::InitWhileIOAllowed() {
#if defined(OS_WIN)
- CHECK(PathService::Get(base::DIR_LOCAL_APP_DATA, &path_));
+ 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<base::Environment> env(base::Environment::Create());
base::FilePath config_dir(
base::nix::GetXDGDirectory(env.get(),
Index: branches/2019Q2/www/chromium/files/patch-content_shell_browser_shell__browser__main__parts.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-content_shell_browser_shell__browser__main__parts.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-content_shell_browser_shell__browser__main__parts.cc (revision 497959)
@@ -1,20 +1,20 @@
---- content/shell/browser/shell_browser_main_parts.cc.orig 2017-12-15 02:04:18.000000000 +0100
-+++ content/shell/browser/shell_browser_main_parts.cc 2017-12-24 15:15:04.473424000 +0100
-@@ -49,7 +49,7 @@
+--- content/shell/browser/shell_browser_main_parts.cc.orig 2019-03-11 22:00:58 UTC
++++ content/shell/browser/shell_browser_main_parts.cc
+@@ -48,7 +48,7 @@
#if defined(USE_AURA) && defined(USE_X11)
#include "ui/events/devices/x11/touch_factory_x11.h" // nogncheck
#endif
-#if !defined(OS_CHROMEOS) && defined(USE_AURA) && defined(OS_LINUX)
+#if !defined(OS_CHROMEOS) && defined(USE_AURA) && (defined(OS_BSD) || defined(OS_LINUX))
#include "ui/base/ime/input_method_initializer.h"
#endif
#if defined(OS_CHROMEOS)
-@@ -133,7 +133,7 @@
+@@ -126,7 +126,7 @@ int ShellBrowserMainParts::PreEarlyInitialization() {
#if defined(USE_X11)
ui::SetDefaultX11ErrorHandlers();
#endif
-#if !defined(OS_CHROMEOS) && defined(USE_AURA) && defined(OS_LINUX)
+#if !defined(OS_CHROMEOS) && defined(USE_AURA) && (defined(OS_BSD) || defined(OS_LINUX))
ui::InitializeInputMethodForTesting();
#endif
#if defined(OS_ANDROID)
Index: branches/2019Q2/www/chromium/files/patch-content_shell_test__runner_test__runner.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-content_shell_test__runner_test__runner.cc (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-content_shell_test__runner_test__runner.cc (revision 497959)
@@ -0,0 +1,29 @@
+--- content/shell/test_runner/test_runner.cc.orig 2019-03-17 17:19:52 UTC
++++ content/shell/test_runner/test_runner.cc
+@@ -64,7 +64,7 @@
+ #include "ui/gfx/geometry/size.h"
+ #include "ui/gfx/skia_util.h"
+
+-#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FUCHSIA)
++#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FUCHSIA) || defined(OS_BSD)
+ #include "third_party/blink/public/platform/web_font_render_style.h"
+ #endif
+
+@@ -1542,7 +1542,7 @@ void TestRunner::Reset() {
+ drag_image_.reset();
+
+ blink::WebSecurityPolicy::ClearOriginAccessList();
+-#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FUCHSIA)
++#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FUCHSIA) || defined(OS_BSD)
+ blink::WebFontRenderStyle::SetSubpixelPositioning(false);
+ #endif
+
+@@ -2091,7 +2091,7 @@ void TestRunner::AddOriginAccessAllowListEntry(
+ }
+
+ void TestRunner::SetTextSubpixelPositioning(bool value) {
+-#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FUCHSIA)
++#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FUCHSIA) || defined(OS_BSD)
+ // Since FontConfig doesn't provide a variable to control subpixel
+ // positioning, we'll fall back to setting it globally for all fonts.
+ blink::WebFontRenderStyle::SetSubpixelPositioning(value);
Property changes on: branches/2019Q2/www/chromium/files/patch-content_shell_test__runner_test__runner.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/2019Q2/www/chromium/files/patch-content_test_content__test__suite.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-content_test_content__test__suite.cc (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-content_test_content__test__suite.cc (revision 497959)
@@ -0,0 +1,18 @@
+--- content/test/content_test_suite.cc.orig 2019-03-11 22:00:58 UTC
++++ content/test/content_test_suite.cc
+@@ -85,6 +85,7 @@ void ContentTestSuite::Initialize() {
+ // to initialize GL, so don't do it here.
+ base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
+ bool is_child_process = command_line->HasSwitch(switches::kTestChildProcess);
++#if !defined(OS_BSD)
+ if (!is_child_process) {
+ gl::GLSurfaceTestSupport::InitializeNoExtensionsOneOff();
+ auto* gpu_feature_info = gpu::GetTestGpuThreadHolder()->GetGpuFeatureInfo();
+@@ -92,6 +93,7 @@ void ContentTestSuite::Initialize() {
+ gpu_feature_info->disabled_extensions);
+ gl::init::InitializeExtensionSettingsOneOffPlatform();
+ }
++#endif
+ testing::TestEventListeners& listeners =
+ testing::UnitTest::GetInstance()->listeners();
+ listeners.Append(new TestInitializationListener);
Property changes on: branches/2019Q2/www/chromium/files/patch-content_test_content__test__suite.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/2019Q2/www/chromium/files/patch-content_utility_utility__blink__platform__with__sandbox__support__impl.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-content_utility_utility__blink__platform__with__sandbox__support__impl.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-content_utility_utility__blink__platform__with__sandbox__support__impl.cc (revision 497959)
@@ -1,52 +1,29 @@
---- content/utility/utility_blink_platform_with_sandbox_support_impl.cc.orig 2019-02-06 23:15:41.158565000 +0100
-+++ content/utility/utility_blink_platform_with_sandbox_support_impl.cc 2019-02-06 23:16:32.076308000 +0100
-@@ -9,7 +9,7 @@
+--- content/utility/utility_blink_platform_with_sandbox_support_impl.cc.orig 2019-03-11 22:00:58 UTC
++++ content/utility/utility_blink_platform_with_sandbox_support_impl.cc
+@@ -8,7 +8,7 @@
+
#if defined(OS_MACOSX)
- #include "base/mac/foundation_util.h"
#include "content/child/child_process_sandbox_support_impl_mac.h"
-#elif defined(OS_LINUX)
+#elif defined(OS_LINUX) || defined(OS_BSD)
- #include "base/synchronization/lock.h"
#include "content/child/child_process_sandbox_support_impl_linux.h"
- #include "content/child/child_thread_impl.h"
-@@ -26,7 +26,7 @@
+ #endif
- namespace content {
-
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
-
- class UtilityBlinkPlatformWithSandboxSupportImpl::SandboxSupport
- : public blink::WebSandboxSupport {
-@@ -59,12 +59,12 @@
- sk_sp<font_service::FontLoader> font_loader_;
- };
-
--#endif // defined(OS_LINUX)
-+#endif // defined(OS_LINUX) || defined(OS_BSD)
-
+@@ -17,7 +17,7 @@ namespace content {
UtilityBlinkPlatformWithSandboxSupportImpl::
UtilityBlinkPlatformWithSandboxSupportImpl(
service_manager::Connector* connector) {
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
font_loader_ = sk_make_sp<font_service::FontLoader>(connector);
SkFontConfigInterface::SetGlobal(font_loader_);
- sandbox_support_ = std::make_unique<SandboxSupport>(font_loader_);
-@@ -78,14 +78,14 @@
+ sandbox_support_ = std::make_unique<WebSandboxSupportLinux>(font_loader_);
+@@ -31,7 +31,7 @@ UtilityBlinkPlatformWithSandboxSupportImpl::
blink::WebSandboxSupport*
UtilityBlinkPlatformWithSandboxSupportImpl::GetSandboxSupport() {
-#if defined(OS_LINUX) || defined(OS_MACOSX)
+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD)
return sandbox_support_.get();
#else
return nullptr;
- #endif
- }
-
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
-
- void UtilityBlinkPlatformWithSandboxSupportImpl::SandboxSupport::
- GetFallbackFontForCharacter(blink::WebUChar32 character,
Index: branches/2019Q2/www/chromium/files/patch-content_utility_utility__blink__platform__with__sandbox__support__impl.h
===================================================================
--- branches/2019Q2/www/chromium/files/patch-content_utility_utility__blink__platform__with__sandbox__support__impl.h (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-content_utility_utility__blink__platform__with__sandbox__support__impl.h (revision 497959)
@@ -1,24 +1,24 @@
---- content/utility/utility_blink_platform_with_sandbox_support_impl.h.orig 2019-02-06 23:17:20.242437000 +0100
-+++ content/utility/utility_blink_platform_with_sandbox_support_impl.h 2019-02-06 23:17:37.808893000 +0100
+--- content/utility/utility_blink_platform_with_sandbox_support_impl.h.orig 2019-03-11 22:00:58 UTC
++++ content/utility/utility_blink_platform_with_sandbox_support_impl.h
@@ -11,7 +11,7 @@
#include "build/build_config.h"
#include "third_party/blink/public/platform/platform.h"
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
#include "components/services/font/public/cpp/font_loader.h" // nogncheck
#include "third_party/skia/include/core/SkRefCnt.h" // nogncheck
#endif
-@@ -39,10 +39,10 @@
+@@ -39,10 +39,10 @@ class UtilityBlinkPlatformWithSandboxSupportImpl : pub
blink::WebSandboxSupport* GetSandboxSupport() override;
private:
-#if defined(OS_LINUX) || defined(OS_MACOSX)
+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD)
std::unique_ptr<blink::WebSandboxSupport> sandbox_support_;
#endif
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
- class SandboxSupport;
sk_sp<font_service::FontLoader> font_loader_;
#endif
+
Index: branches/2019Q2/www/chromium/files/patch-device_bluetooth_BUILD.gn
===================================================================
--- branches/2019Q2/www/chromium/files/patch-device_bluetooth_BUILD.gn (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-device_bluetooth_BUILD.gn (revision 497959)
@@ -1,11 +1,11 @@
---- device/bluetooth/BUILD.gn.orig 2017-06-05 19:03:07 UTC
+--- device/bluetooth/BUILD.gn.orig 2019-03-11 22:00:58 UTC
+++ device/bluetooth/BUILD.gn
-@@ -202,7 +202,7 @@ component("bluetooth") {
+@@ -277,7 +277,7 @@ component("bluetooth") {
]
}
- if (is_chromeos || is_linux) {
+ if (is_chromeos || (is_linux && !is_bsd)) {
if (use_dbus) {
sources += [
"bluez/bluetooth_adapter_bluez.cc",
Index: branches/2019Q2/www/chromium/files/patch-device_gamepad_gamepad__provider.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-device_gamepad_gamepad__provider.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-device_gamepad_gamepad__provider.cc (revision 497959)
@@ -1,11 +1,11 @@
---- device/gamepad/gamepad_provider.cc.orig 2017-06-05 19:03:07 UTC
+--- device/gamepad/gamepad_provider.cc.orig 2019-03-11 22:00:58 UTC
+++ device/gamepad/gamepad_provider.cc
-@@ -153,7 +153,7 @@ void GamepadProvider::Initialize(std::unique_ptr<Gamep
+@@ -164,7 +164,7 @@ void GamepadProvider::Initialize(std::unique_ptr<Gamep
monitor->AddDevicesChangedObserver(this);
polling_thread_.reset(new base::Thread("Gamepad polling thread"));
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
// On Linux, the data fetcher needs to watch file descriptors, so the message
// loop needs to be a libevent loop.
const base::MessageLoop::Type kMessageLoopType = base::MessageLoop::TYPE_IO;
Index: branches/2019Q2/www/chromium/files/patch-device_usb_BUILD.gn
===================================================================
--- branches/2019Q2/www/chromium/files/patch-device_usb_BUILD.gn (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-device_usb_BUILD.gn (revision 497959)
@@ -1,21 +1,21 @@
---- device/usb/BUILD.gn.orig 2017-06-16 17:45:56.630063000 +0200
-+++ device/usb/BUILD.gn 2017-06-16 17:59:22.070474000 +0200
-@@ -97,10 +97,17 @@
- libs = [ "setupapi.lib" ]
+--- 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",
]
}
Index: branches/2019Q2/www/chromium/files/patch-device_usb_usb__context.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-device_usb_usb__context.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-device_usb_usb__context.cc (revision 497959)
@@ -1,12 +1,12 @@
---- device/usb/usb_context.cc.orig 2018-06-13 00:10:18.000000000 +0200
-+++ device/usb/usb_context.cc 2018-07-20 12:52:29.240720000 +0200
-@@ -58,7 +58,9 @@
+--- 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) {
Index: branches/2019Q2/www/chromium/files/patch-device_usb_usb__error.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-device_usb_usb__error.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-device_usb_usb__error.cc (revision 497959)
@@ -1,11 +1,11 @@
---- device/usb/usb_error.cc.orig 2018-06-13 00:10:18.000000000 +0200
-+++ device/usb/usb_error.cc 2018-07-20 12:55:34.901660000 +0200
+--- 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<libusb_error>(errcode));
+ return "";
}
} // namespace device
Index: branches/2019Q2/www/chromium/files/patch-device_usb_usb__service__impl.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-device_usb_usb__service__impl.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-device_usb_usb__service__impl.cc (revision 497959)
@@ -1,45 +1,45 @@
---- device/usb/usb_service_impl.cc.orig 2018-06-13 00:10:18.000000000 +0200
-+++ device/usb/usb_service_impl.cc 2018-07-20 12:49:59.699912000 +0200
-@@ -239,8 +239,10 @@
+--- device/usb/usb_service_impl.cc.orig 2019-03-11 22:00:58 UTC
++++ device/usb/usb_service_impl.cc
+@@ -231,8 +231,10 @@ UsbServiceImpl::UsbServiceImpl()
}
UsbServiceImpl::~UsbServiceImpl() {
+#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) {
-@@ -295,6 +297,7 @@
+@@ -287,6 +289,7 @@ void UsbServiceImpl::OnUsbContext(scoped_refptr<UsbCon
context_ = std::move(context);
+#if !defined(OS_FREEBSD)
int rv = libusb_hotplug_register_callback(
context_->context(),
static_cast<libusb_hotplug_event>(LIBUSB_HOTPLUG_EVENT_DEVICE_ARRIVED |
-@@ -307,6 +310,7 @@
+@@ -299,6 +302,7 @@ void UsbServiceImpl::OnUsbContext(scoped_refptr<UsbCon
// This will call any enumeration callbacks queued while initializing.
RefreshDevices();
+#endif // !defined(OS_FREEBSD)
#if defined(OS_WIN)
DeviceMonitorWin* device_monitor = DeviceMonitorWin::GetForAllInterfaces();
-@@ -503,6 +507,7 @@
+@@ -495,6 +499,7 @@ void UsbServiceImpl::RemoveDevice(scoped_refptr<UsbDev
device->OnDisconnect();
}
+#if !defined(OS_FREEBSD)
// static
int LIBUSB_CALL UsbServiceImpl::HotplugCallback(libusb_context* context,
libusb_device* device_raw,
-@@ -537,6 +542,7 @@
+@@ -528,6 +533,7 @@ int LIBUSB_CALL UsbServiceImpl::HotplugCallback(libusb
return 0;
}
+#endif // !defined(OS_FREEBSD)
void UsbServiceImpl::OnPlatformDeviceAdded(
ScopedLibusbDeviceRef platform_device) {
Index: branches/2019Q2/www/chromium/files/patch-device_usb_usb__service__impl.h
===================================================================
--- branches/2019Q2/www/chromium/files/patch-device_usb_usb__service__impl.h (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-device_usb_usb__service__impl.h (revision 497959)
@@ -1,26 +1,26 @@
---- device/usb/usb_service_impl.h.orig 2018-06-13 00:10:18.000000000 +0200
-+++ device/usb/usb_service_impl.h 2018-07-20 12:47:42.413625000 +0200
-@@ -73,11 +73,13 @@
+--- 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<UsbDeviceImpl> device);
void RemoveDevice(scoped_refptr<UsbDeviceImpl> 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);
-@@ -95,7 +97,9 @@
+@@ -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;
Index: branches/2019Q2/www/chromium/files/patch-extensions_browser_api_declarative__webrequest_webrequest__action.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-extensions_browser_api_declarative__webrequest_webrequest__action.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-extensions_browser_api_declarative__webrequest_webrequest__action.cc (revision 497959)
@@ -1,14 +1,14 @@
---- extensions/browser/api/declarative_webrequest/webrequest_action.cc.orig 2018-03-20 23:05:25.000000000 +0100
-+++ extensions/browser/api/declarative_webrequest/webrequest_action.cc 2018-03-24 17:41:04.749250000 +0100
+--- extensions/browser/api/declarative_webrequest/webrequest_action.cc.orig 2019-03-11 22:00:58 UTC
++++ extensions/browser/api/declarative_webrequest/webrequest_action.cc
@@ -28,7 +28,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 <re2/re2.h>
+#else
#include "third_party/re2/src/re2/re2.h"
+#endif
using content::ResourceRequestInfo;
-
+ using extension_web_request_api_helpers::EventResponseDelta;
Index: branches/2019Q2/www/chromium/files/patch-extensions_browser_api_messaging_message__service.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-extensions_browser_api_messaging_message__service.cc (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-extensions_browser_api_messaging_message__service.cc (revision 497959)
@@ -0,0 +1,35 @@
+--- extensions/browser/api/messaging/message_service.cc.orig 2019-03-11 22:00:58 UTC
++++ extensions/browser/api/messaging/message_service.cc
+@@ -58,7 +58,7 @@ namespace {
+
+ const char kReceivingEndDoesntExistError[] =
+ "Could not establish connection. Receiving end does not exist.";
+-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)
++#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD)
+ const char kMissingPermissionError[] =
+ "Access to native messaging requires nativeMessaging permission.";
+ const char kProhibitedByPoliciesError[] =
+@@ -318,7 +318,7 @@ void MessageService::OpenChannelToNativeApp(
+ if (!source)
+ return;
+
+-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)
++#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD)
+ content::WebContents* web_contents =
+ content::WebContents::FromRenderFrameHost(source);
+ ExtensionWebContentsObserver* extension_web_contents_observer =
+@@ -378,12 +378,12 @@ void MessageService::OpenChannelToNativeApp(
+ channel->opener->IncrementLazyKeepaliveCount();
+
+ AddChannel(std::move(channel), receiver_port_id);
+-#else // !(defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX))
++#else // !(defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD))
+ const char kNativeMessagingNotSupportedError[] =
+ "Native Messaging is not supported on this platform.";
+ DispatchOnDisconnect(
+ source, receiver_port_id, kNativeMessagingNotSupportedError);
+-#endif // !(defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX))
++#endif // !(defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD))
+ }
+
+ void MessageService::OpenChannelToTab(int source_process_id,
Property changes on: branches/2019Q2/www/chromium/files/patch-extensions_browser_api_messaging_message__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/2019Q2/www/chromium/files/patch-extensions_browser_api_networking__private_networking__private__delegate__factory.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-extensions_browser_api_networking__private_networking__private__delegate__factory.cc (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-extensions_browser_api_networking__private_networking__private__delegate__factory.cc (revision 497959)
@@ -0,0 +1,20 @@
+--- extensions/browser/api/networking_private/networking_private_delegate_factory.cc.orig 2019-03-11 22:00:58 UTC
++++ extensions/browser/api/networking_private/networking_private_delegate_factory.cc
+@@ -11,7 +11,7 @@
+
+ #if defined(OS_CHROMEOS)
+ #include "extensions/browser/api/networking_private/networking_private_chromeos.h"
+-#elif defined(OS_LINUX)
++#elif defined(OS_LINUX) || defined(OS_BSD)
+ #include "extensions/browser/api/networking_private/networking_private_linux.h"
+ #elif defined(OS_WIN) || defined(OS_MACOSX)
+ #include "components/wifi/wifi_service.h"
+@@ -61,7 +61,7 @@ KeyedService* NetworkingPrivateDelegateFactory::BuildS
+ NetworkingPrivateDelegate* delegate;
+ #if defined(OS_CHROMEOS)
+ delegate = new NetworkingPrivateChromeOS(browser_context);
+-#elif defined(OS_LINUX)
++#elif defined(OS_LINUX) || defined(OS_BSD)
+ delegate = new NetworkingPrivateLinux();
+ #elif defined(OS_WIN) || defined(OS_MACOSX)
+ std::unique_ptr<wifi::WiFiService> wifi_service(wifi::WiFiService::Create());
Property changes on: branches/2019Q2/www/chromium/files/patch-extensions_browser_api_networking__private_networking__private__delegate__factory.cc
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: branches/2019Q2/www/chromium/files/patch-extensions_browser_api_web__request_form__data__parser.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-extensions_browser_api_web__request_form__data__parser.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-extensions_browser_api_web__request_form__data__parser.cc (revision 497959)
@@ -1,14 +1,14 @@
---- extensions/browser/api/web_request/form_data_parser.cc.orig 2018-06-13 00:10:18.000000000 +0200
-+++ extensions/browser/api/web_request/form_data_parser.cc 2018-07-19 13:36:19.375722000 +0200
+--- extensions/browser/api/web_request/form_data_parser.cc.orig 2019-03-11 22:00:58 UTC
++++ extensions/browser/api/web_request/form_data_parser.cc
@@ -15,7 +15,11 @@
#include "base/values.h"
#include "net/base/escape.h"
#include "net/http/http_request_headers.h"
+#if defined(OS_BSD)
+#include <re2/re2.h>
+#else
#include "third_party/re2/src/re2/re2.h"
+#endif
using base::DictionaryValue;
using base::ListValue;
Index: branches/2019Q2/www/chromium/files/patch-extensions_browser_browser__context__keyed__service__factories.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-extensions_browser_browser__context__keyed__service__factories.cc (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-extensions_browser_browser__context__keyed__service__factories.cc (revision 497959)
@@ -0,0 +1,11 @@
+--- extensions/browser/browser_context_keyed_service_factories.cc.orig 2019-03-11 22:00:58 UTC
++++ extensions/browser/browser_context_keyed_service_factories.cc
+@@ -85,7 +85,7 @@ void EnsureBrowserContextKeyedServiceFactoriesBuilt()
+ #if defined(OS_CHROMEOS)
+ NetworkingConfigServiceFactory::GetInstance();
+ #endif
+-#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MACOSX)
++#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_BSD)
+ NetworkingPrivateEventRouterFactory::GetInstance();
+ #endif
+ PowerAPI::GetFactoryInstance();
Property changes on: branches/2019Q2/www/chromium/files/patch-extensions_browser_browser__context__keyed__service__factories.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/2019Q2/www/chromium/files/patch-extensions_common_api___permission__features.json
===================================================================
--- branches/2019Q2/www/chromium/files/patch-extensions_common_api___permission__features.json (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-extensions_common_api___permission__features.json (revision 497959)
@@ -0,0 +1,29 @@
+--- extensions/common/api/_permission_features.json.orig 2019-03-11 22:00:58 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
+@@ -470,7 +470,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
+@@ -501,7 +501,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.
Property changes on: branches/2019Q2/www/chromium/files/patch-extensions_common_api___permission__features.json
___________________________________________________________________
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/2019Q2/www/chromium/files/patch-extensions_common_api_runtime.json
===================================================================
--- branches/2019Q2/www/chromium/files/patch-extensions_common_api_runtime.json (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-extensions_common_api_runtime.json (revision 497959)
@@ -1,11 +1,11 @@
---- extensions/common/api/runtime.json.orig 2017-05-09 19:02:47 UTC
+--- extensions/common/api/runtime.json.orig 2019-03-11 22:00:58 UTC
+++ extensions/common/api/runtime.json
@@ -66,7 +66,7 @@
"id": "PlatformOs",
"type": "string",
"description": "The operating system chrome is running on.",
- "enum": ["mac", "win", "android", "cros", "linux", "openbsd"]
+ "enum": ["mac", "win", "android", "cros", "linux", "freebsd", "openbsd"]
},
{
"id": "PlatformArch",
Index: branches/2019Q2/www/chromium/files/patch-extensions_common_feature__switch.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-extensions_common_feature__switch.cc (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-extensions_common_feature__switch.cc (revision 497959)
@@ -0,0 +1,14 @@
+--- extensions/common/feature_switch.cc.orig 2019-03-11 22:00:58 UTC
++++ extensions/common/feature_switch.cc
+@@ -44,11 +44,7 @@ class CommonSwitches {
+ FeatureSwitch::DEFAULT_ENABLED),
+ load_media_router_component_extension(
+ kLoadMediaRouterComponentExtensionFlag,
+-#if defined(GOOGLE_CHROME_BUILD)
+ FeatureSwitch::DEFAULT_ENABLED)
+-#else
+- FeatureSwitch::DEFAULT_DISABLED)
+-#endif // defined(GOOGLE_CHROME_BUILD)
+ {
+ }
+
Property changes on: branches/2019Q2/www/chromium/files/patch-extensions_common_feature__switch.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/2019Q2/www/chromium/files/patch-extensions_common_features_feature.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-extensions_common_features_feature.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-extensions_common_features_feature.cc (revision 497959)
@@ -1,11 +1,11 @@
---- extensions/common/features/feature.cc.orig 2018-01-21 13:38:52.998785000 +0100
-+++ extensions/common/features/feature.cc 2018-01-21 13:39:29.946264000 +0100
-@@ -26,6 +26,8 @@
+--- extensions/common/features/feature.cc.orig 2019-03-11 22:00:58 UTC
++++ extensions/common/features/feature.cc
+@@ -26,6 +26,8 @@ Feature::Platform Feature::GetCurrentPlatform() {
return MACOSX_PLATFORM;
#elif defined(OS_WIN)
return WIN_PLATFORM;
+#elif defined(OS_BSD)
+ return LINUX_PLATFORM;
#else
return UNSPECIFIED_PLATFORM;
#endif
Index: branches/2019Q2/www/chromium/files/patch-extensions_common_image__util.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-extensions_common_image__util.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-extensions_common_image__util.cc (revision 497959)
@@ -1,14 +1,14 @@
---- extensions/common/image_util.cc.orig 2019-01-30 02:18:01.000000000 +0100
-+++ extensions/common/image_util.cc 2019-02-01 09:15:02.563494000 +0100
+--- extensions/common/image_util.cc.orig 2019-03-11 22:00:58 UTC
++++ extensions/common/image_util.cc
@@ -18,7 +18,11 @@
#include "base/strings/stringprintf.h"
#include "base/time/time.h"
#include "base/timer/elapsed_timer.h"
+#if defined(OS_BSD)
+#include <re2/re2.h>
+#else
#include "third_party/re2/src/re2/re2.h"
+#endif // defined(OS_BSD)
#include "third_party/skia/include/core/SkBitmap.h"
#include "third_party/skia/include/core/SkCanvas.h"
#include "third_party/skia/include/core/SkColor.h"
Index: branches/2019Q2/www/chromium/files/patch-extensions_common_stack__frame.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-extensions_common_stack__frame.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-extensions_common_stack__frame.cc (revision 497959)
@@ -1,14 +1,14 @@
---- extensions/common/stack_frame.cc.orig 2017-04-19 19:06:34 UTC
+--- extensions/common/stack_frame.cc.orig 2019-03-11 22:00:58 UTC
+++ extensions/common/stack_frame.cc
@@ -7,7 +7,11 @@
#include <string>
#include "base/strings/utf_string_conversions.h"
+#if defined(OS_BSD)
+#include <re2/re2.h>
+#else
#include "third_party/re2/src/re2/re2.h"
+#endif
namespace extensions {
Index: branches/2019Q2/www/chromium/files/patch-extensions_renderer_bindings_api__binding__util.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-extensions_renderer_bindings_api__binding__util.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-extensions_renderer_bindings_api__binding__util.cc (revision 497959)
@@ -1,11 +1,11 @@
---- extensions/renderer/bindings/api_binding_util.cc.orig 2018-12-12 22:56:08.000000000 +0100
-+++ extensions/renderer/bindings/api_binding_util.cc 2018-12-30 03:38:04.191665000 +0100
-@@ -129,6 +129,8 @@
+--- extensions/renderer/bindings/api_binding_util.cc.orig 2019-03-11 22:00:58 UTC
++++ extensions/renderer/bindings/api_binding_util.cc
+@@ -129,6 +129,8 @@ std::string GetPlatformString() {
return "mac";
#elif defined(OS_WIN)
return "win";
+#elif defined(OS_BSD)
+ return "bsd";
#else
NOTREACHED();
return std::string();
Index: branches/2019Q2/www/chromium/files/patch-extensions_shell_app_shell__main__delegate.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-extensions_shell_app_shell__main__delegate.cc (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-extensions_shell_app_shell__main__delegate.cc (revision 497959)
@@ -0,0 +1,29 @@
+--- extensions/shell/app/shell_main_delegate.cc.orig 2019-03-11 22:00:58 UTC
++++ extensions/shell/app/shell_main_delegate.cc
+@@ -38,7 +38,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"
+@@ -52,7 +52,7 @@
+
+ namespace {
+
+-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
++#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
+ extensions::ShellCrashReporterClient* GetCrashReporterClient() {
+ static base::NoDestructor<extensions::ShellCrashReporterClient> instance;
+ return instance.get();
+@@ -70,7 +70,7 @@ base::FilePath GetDataPath() {
+ return cmd_line->GetSwitchValuePath(switches::kContentShellDataPath);
+
+ base::FilePath data_dir;
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+ std::unique_ptr<base::Environment> env(base::Environment::Create());
+ data_dir = base::nix::GetXDGDirectory(
+ env.get(), base::nix::kXdgConfigHomeEnvVar, base::nix::kDotConfigDir);
Property changes on: branches/2019Q2/www/chromium/files/patch-extensions_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/2019Q2/www/chromium/files/patch-gpu_command__buffer_common_gpu__memory__buffer__support.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-gpu_command__buffer_common_gpu__memory__buffer__support.cc (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-gpu_command__buffer_common_gpu__memory__buffer__support.cc (revision 497959)
@@ -0,0 +1,11 @@
+--- gpu/command_buffer/common/gpu_memory_buffer_support.cc.orig 2019-03-11 22:00:59 UTC
++++ gpu/command_buffer/common/gpu_memory_buffer_support.cc
+@@ -89,7 +89,7 @@ bool IsImageSizeValidForGpuMemoryBufferFormat(const gf
+ uint32_t GetPlatformSpecificTextureTarget() {
+ #if defined(OS_MACOSX)
+ return GL_TEXTURE_RECTANGLE_ARB;
+-#elif defined(OS_ANDROID) || defined(OS_LINUX)
++#elif defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD)
+ return GL_TEXTURE_EXTERNAL_OES;
+ #elif defined(OS_WIN)
+ return GL_TEXTURE_2D;
Property changes on: branches/2019Q2/www/chromium/files/patch-gpu_command__buffer_common_gpu__memory__buffer__support.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/2019Q2/www/chromium/files/patch-gpu_command__buffer_service_program__manager.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-gpu_command__buffer_service_program__manager.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-gpu_command__buffer_service_program__manager.cc (revision 497959)
@@ -1,14 +1,14 @@
---- gpu/command_buffer/service/program_manager.cc.orig 2018-12-03 21:16:59.000000000 +0100
-+++ gpu/command_buffer/service/program_manager.cc 2018-12-13 23:16:40.689817000 +0100
+--- gpu/command_buffer/service/program_manager.cc.orig 2019-03-11 22:00:59 UTC
++++ gpu/command_buffer/service/program_manager.cc
@@ -30,7 +30,11 @@
#include "gpu/command_buffer/service/program_cache.h"
#include "gpu/command_buffer/service/shader_manager.h"
#include "gpu/config/gpu_preferences.h"
+#if defined(OS_BSD)
+#include <re2/re2.h>
+#else
#include "third_party/re2/src/re2/re2.h"
+#endif
#include "ui/gl/gl_version_info.h"
#include "ui/gl/progress_reporter.h"
Index: branches/2019Q2/www/chromium/files/patch-gpu_command__buffer_tests_gl__copy__texture__CHROMIUM__unittest.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-gpu_command__buffer_tests_gl__copy__texture__CHROMIUM__unittest.cc (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-gpu_command__buffer_tests_gl__copy__texture__CHROMIUM__unittest.cc (revision 497959)
@@ -0,0 +1,11 @@
+--- gpu/command_buffer/tests/gl_copy_texture_CHROMIUM_unittest.cc.orig 2019-03-17 17:07:44 UTC
++++ gpu/command_buffer/tests/gl_copy_texture_CHROMIUM_unittest.cc
+@@ -562,7 +562,7 @@ class GLCopyTextureCHROMIUMES3Test : public GLCopyText
+
+ bool ShouldSkipNorm16() const {
+ DCHECK(!ShouldSkipTest());
+-#if (defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_LINUX)) && \
++#if (defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD)) && \
+ (defined(ARCH_CPU_X86) || defined(ARCH_CPU_X86_64))
+ // Make sure it's tested; it is safe to assume that the flag is always true
+ // on desktop.
Property changes on: branches/2019Q2/www/chromium/files/patch-gpu_command__buffer_tests_gl__copy__texture__CHROMIUM__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/2019Q2/www/chromium/files/patch-gpu_command__buffer_tests_gl__test__utils.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-gpu_command__buffer_tests_gl__test__utils.cc (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-gpu_command__buffer_tests_gl__test__utils.cc (revision 497959)
@@ -0,0 +1,20 @@
+--- gpu/command_buffer/tests/gl_test_utils.cc.orig 2019-03-17 17:06:00 UTC
++++ gpu/command_buffer/tests/gl_test_utils.cc
+@@ -22,7 +22,7 @@
+ #include "ui/gfx/geometry/size.h"
+ #include "ui/gl/init/gl_factory.h"
+
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+ #include "ui/gl/gl_image_native_pixmap.h"
+ #endif
+
+@@ -425,7 +425,7 @@ void GpuCommandBufferTestEGL::RestoreGLDefault() {
+ window_system_binding_info_ = gl::GLWindowSystemBindingInfo();
+ }
+
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+ scoped_refptr<gl::GLImageNativePixmap>
+ GpuCommandBufferTestEGL::CreateGLImageNativePixmap(gfx::BufferFormat format,
+ gfx::Size size,
Property changes on: branches/2019Q2/www/chromium/files/patch-gpu_command__buffer_tests_gl__test__utils.cc
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: branches/2019Q2/www/chromium/files/patch-gpu_command__buffer_tests_gl__test__utils.h
===================================================================
--- branches/2019Q2/www/chromium/files/patch-gpu_command__buffer_tests_gl__test__utils.h (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-gpu_command__buffer_tests_gl__test__utils.h (revision 497959)
@@ -0,0 +1,11 @@
+--- gpu/command_buffer/tests/gl_test_utils.h.orig 2019-03-17 17:06:38 UTC
++++ gpu/command_buffer/tests/gl_test_utils.h
+@@ -112,7 +112,7 @@ class GpuCommandBufferTestEGL {
+ return gfx::HasExtension(gl_extensions_, extension);
+ }
+
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+ // Create GLImageNativePixmap filled in with the given pixels.
+ scoped_refptr<gl::GLImageNativePixmap> CreateGLImageNativePixmap(
+ gfx::BufferFormat format,
Property changes on: branches/2019Q2/www/chromium/files/patch-gpu_command__buffer_tests_gl__test__utils.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/2019Q2/www/chromium/files/patch-gpu_config_gpu__control__list.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-gpu_config_gpu__control__list.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-gpu_config_gpu__control__list.cc (revision 497959)
@@ -1,32 +1,32 @@
---- gpu/config/gpu_control_list.cc.orig 2019-01-30 02:18:02.000000000 +0100
-+++ gpu/config/gpu_control_list.cc 2019-02-01 09:25:50.964382000 +0100
+--- gpu/config/gpu_control_list.cc.orig 2019-03-11 22:00:59 UTC
++++ gpu/config/gpu_control_list.cc
@@ -16,7 +16,11 @@
#include "base/values.h"
#include "build/build_config.h"
#include "gpu/config/gpu_util.h"
+#if defined(OS_BSD)
+#include <re2/re2.h>
+#else
#include "third_party/re2/src/re2/re2.h"
+#endif // defined(OS_BSD)
namespace gpu {
namespace {
-@@ -213,7 +217,7 @@
+@@ -213,7 +217,7 @@ bool GpuControlList::More::GLVersionInfoMismatch(
GpuControlList::GLType GpuControlList::More::GetDefaultGLType() {
#if defined(OS_CHROMEOS)
return kGLTypeGL;
-#elif defined(OS_LINUX) || defined(OS_OPENBSD)
+#elif defined(OS_LINUX) || defined(OS_BSD)
return kGLTypeGL;
#elif defined(OS_MACOSX)
return kGLTypeGL;
-@@ -683,7 +687,7 @@
+@@ -699,7 +703,7 @@ GpuControlList::OsType GpuControlList::GetOsType() {
return kOsAndroid;
#elif defined(OS_FUCHSIA)
return kOsFuchsia;
-#elif defined(OS_LINUX) || defined(OS_OPENBSD)
+#elif defined(OS_LINUX) || defined(OS_BSD)
return kOsLinux;
#elif defined(OS_MACOSX)
return kOsMacosx;
Index: branches/2019Q2/www/chromium/files/patch-gpu_config_gpu__test__config.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-gpu_config_gpu__test__config.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-gpu_config_gpu__test__config.cc (revision 497959)
@@ -1,11 +1,11 @@
---- gpu/config/gpu_test_config.cc.orig 2018-03-20 23:05:26.000000000 +0100
-+++ gpu/config/gpu_test_config.cc 2018-03-26 13:47:37.264475000 +0200
-@@ -24,7 +24,7 @@
+--- gpu/config/gpu_test_config.cc.orig 2019-03-11 22:00:59 UTC
++++ gpu/config/gpu_test_config.cc
+@@ -25,7 +25,7 @@ namespace {
GPUTestConfig::OS GetCurrentOS() {
#if defined(OS_CHROMEOS)
return GPUTestConfig::kOsChromeOS;
-#elif defined(OS_LINUX) || defined(OS_OPENBSD)
+#elif defined(OS_LINUX) || defined(OS_BSD)
return GPUTestConfig::kOsLinux;
#elif defined(OS_WIN)
int32_t major_version = 0;
Index: branches/2019Q2/www/chromium/files/patch-gpu_ipc_common_gpu__memory__buffer__support.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-gpu_ipc_common_gpu__memory__buffer__support.cc (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-gpu_ipc_common_gpu__memory__buffer__support.cc (revision 497959)
@@ -0,0 +1,47 @@
+--- gpu/ipc/common/gpu_memory_buffer_support.cc.orig 2019-03-11 22:00:59 UTC
++++ gpu/ipc/common/gpu_memory_buffer_support.cc
+@@ -12,7 +12,7 @@
+ #include "gpu/ipc/common/gpu_memory_buffer_impl_io_surface.h"
+ #endif
+
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+ #include "gpu/ipc/common/gpu_memory_buffer_impl_native_pixmap.h"
+ #include "ui/gfx/client_native_pixmap_factory.h"
+ #include "ui/gfx/linux/client_native_pixmap_factory_dmabuf.h"
+@@ -37,7 +37,7 @@ namespace gpu {
+ GpuMemoryBufferSupport::GpuMemoryBufferSupport() {
+ #if defined(USE_OZONE)
+ client_native_pixmap_factory_ = ui::CreateClientNativePixmapFactoryOzone();
+-#elif defined(OS_LINUX)
++#elif defined(OS_LINUX) || defined(OS_BSD)
+ client_native_pixmap_factory_.reset(
+ gfx::CreateClientNativePixmapFactoryDmabuf());
+ #endif
+@@ -51,7 +51,7 @@ GpuMemoryBufferSupport::GetNativeGpuMemoryBufferType()
+ return gfx::IO_SURFACE_BUFFER;
+ #elif defined(OS_ANDROID)
+ return gfx::ANDROID_HARDWARE_BUFFER;
+-#elif defined(OS_LINUX)
++#elif defined(OS_LINUX) || defined(OS_BSD)
+ return gfx::NATIVE_PIXMAP;
+ #elif defined(OS_WIN)
+ return gfx::DXGI_SHARED_HANDLE;
+@@ -109,7 +109,7 @@ bool GpuMemoryBufferSupport::IsNativeGpuMemoryBufferCo
+ #elif defined(USE_OZONE)
+ return ui::OzonePlatform::EnsureInstance()->IsNativePixmapConfigSupported(
+ format, usage);
+-#elif defined(OS_LINUX)
++#elif defined(OS_LINUX) || defined(OS_BSD)
+ return false; // TODO(julian.isorce): Add linux support.
+ #elif defined(OS_WIN)
+ switch (usage) {
+@@ -166,7 +166,7 @@ GpuMemoryBufferSupport::CreateGpuMemoryBufferImplFromH
+ return GpuMemoryBufferImplIOSurface::CreateFromHandle(
+ std::move(handle), size, format, usage, std::move(callback));
+ #endif
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+ case gfx::NATIVE_PIXMAP:
+ return GpuMemoryBufferImplNativePixmap::CreateFromHandle(
+ client_native_pixmap_factory(), std::move(handle), size, format,
Property changes on: branches/2019Q2/www/chromium/files/patch-gpu_ipc_common_gpu__memory__buffer__support.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/2019Q2/www/chromium/files/patch-gpu_ipc_common_gpu__memory__buffer__support.h
===================================================================
--- branches/2019Q2/www/chromium/files/patch-gpu_ipc_common_gpu__memory__buffer__support.h (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-gpu_ipc_common_gpu__memory__buffer__support.h (revision 497959)
@@ -0,0 +1,29 @@
+--- gpu/ipc/common/gpu_memory_buffer_support.h.orig 2019-03-11 22:00:59 UTC
++++ gpu/ipc/common/gpu_memory_buffer_support.h
+@@ -16,7 +16,7 @@
+ #include "ui/gfx/geometry/size.h"
+ #include "ui/gfx/gpu_memory_buffer.h"
+
+-#if defined(OS_LINUX) || defined(USE_OZONE)
++#if defined(OS_LINUX) || defined(OS_BSD) || defined(USE_OZONE)
+ namespace gfx {
+ class ClientNativePixmapFactory;
+ }
+@@ -38,7 +38,7 @@ class GPU_EXPORT GpuMemoryBufferSupport {
+ bool IsNativeGpuMemoryBufferConfigurationSupported(gfx::BufferFormat format,
+ gfx::BufferUsage usage);
+
+-#if defined(OS_LINUX) || defined(USE_OZONE)
++#if defined(OS_LINUX) || defined(OS_BSD) || defined(USE_OZONE)
+ gfx::ClientNativePixmapFactory* client_native_pixmap_factory() {
+ return client_native_pixmap_factory_.get();
+ }
+@@ -61,7 +61,7 @@ class GPU_EXPORT GpuMemoryBufferSupport {
+ GpuMemoryBufferImpl::DestructionCallback callback);
+
+ private:
+-#if defined(OS_LINUX) || defined(USE_OZONE)
++#if defined(OS_LINUX) || defined(OS_BSD) || defined(USE_OZONE)
+ std::unique_ptr<gfx::ClientNativePixmapFactory> client_native_pixmap_factory_;
+ #endif
+
Property changes on: branches/2019Q2/www/chromium/files/patch-gpu_ipc_common_gpu__memory__buffer__support.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/2019Q2/www/chromium/files/patch-gpu_ipc_service_gpu__init.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-gpu_ipc_service_gpu__init.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-gpu_ipc_service_gpu__init.cc (revision 497959)
@@ -1,29 +1,29 @@
---- gpu/ipc/service/gpu_init.cc.orig 2018-06-13 00:10:19.000000000 +0200
-+++ gpu/ipc/service/gpu_init.cc 2018-07-19 14:45:14.322631000 +0200
-@@ -70,7 +70,7 @@
+--- gpu/ipc/service/gpu_init.cc.orig 2019-03-11 22:00:59 UTC
++++ gpu/ipc/service/gpu_init.cc
+@@ -87,7 +87,7 @@ void InitializeDirectCompositionOverlaySupport(GPUInfo
}
- #endif // defined(OS_MACOSX)
+ #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)
++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(IS_CHROMECAST)) || defined(OS_BSD)
bool CanAccessNvidiaDeviceFile() {
bool res = true;
- base::AssertBlockingAllowed();
-@@ -106,7 +106,7 @@
+ base::ScopedBlockingCall scoped_blocking_call(base::BlockingType::WILL_BLOCK);
+@@ -129,7 +129,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 (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
if (gpu_info_.gpu.vendor_id == 0x10de && // NVIDIA
- gpu_info_.driver_vendor == "NVIDIA" && !CanAccessNvidiaDeviceFile())
+ gpu_info_.gpu.driver_vendor == "NVIDIA" && !CanAccessNvidiaDeviceFile())
return false;
-@@ -172,7 +172,7 @@
+@@ -199,7 +199,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.
Index: branches/2019Q2/www/chromium/files/patch-gpu_ipc_service_gpu__memory__buffer__factory.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-gpu_ipc_service_gpu__memory__buffer__factory.cc (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-gpu_ipc_service_gpu__memory__buffer__factory.cc (revision 497959)
@@ -0,0 +1,20 @@
+--- gpu/ipc/service/gpu_memory_buffer_factory.cc.orig 2019-03-11 22:00:59 UTC
++++ gpu/ipc/service/gpu_memory_buffer_factory.cc
+@@ -12,7 +12,7 @@
+ #include "gpu/ipc/service/gpu_memory_buffer_factory_io_surface.h"
+ #endif
+
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+ #include "gpu/ipc/service/gpu_memory_buffer_factory_native_pixmap.h"
+ #endif
+
+@@ -33,7 +33,7 @@ GpuMemoryBufferFactory::CreateNativeType() {
+ return base::WrapUnique(new GpuMemoryBufferFactoryIOSurface);
+ #elif defined(OS_ANDROID)
+ return base::WrapUnique(new GpuMemoryBufferFactoryAndroidHardwareBuffer);
+-#elif defined(OS_LINUX)
++#elif defined(OS_LINUX) || defined(OS_BSD)
+ return base::WrapUnique(new GpuMemoryBufferFactoryNativePixmap);
+ #elif defined(OS_WIN)
+ return base::WrapUnique(new GpuMemoryBufferFactoryDXGI);
Property changes on: branches/2019Q2/www/chromium/files/patch-gpu_ipc_service_gpu__memory__buffer__factory.cc
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: branches/2019Q2/www/chromium/files/patch-gpu_ipc_service_gpu__watchdog__thread.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-gpu_ipc_service_gpu__watchdog__thread.cc (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-gpu_ipc_service_gpu__watchdog__thread.cc (revision 497959)
@@ -0,0 +1,73 @@
+--- gpu/ipc/service/gpu_watchdog_thread.cc.orig 2019-03-11 22:00:59 UTC
++++ gpu/ipc/service/gpu_watchdog_thread.cc
+@@ -51,8 +51,10 @@ const int kGpuTimeout = 10000;
+ #endif
+
+ #if defined(USE_X11)
++#if !defined(OS_BSD)
+ const base::FilePath::CharType kTtyFilePath[] =
+ FILE_PATH_LITERAL("/sys/class/tty/tty0/active");
++#endif
+ const unsigned char text[20] = "check";
+ #endif
+
+@@ -75,8 +77,10 @@ GpuWatchdogThread::GpuWatchdogThread()
+ display_(nullptr),
+ window_(0),
+ atom_(x11::None),
++#if !defined(OS_BSD)
+ host_tty_(-1),
+ #endif
++#endif
+ weak_factory_(this) {
+ base::subtle::NoBarrier_Store(&awaiting_acknowledge_, false);
+
+@@ -91,7 +95,9 @@ GpuWatchdogThread::GpuWatchdogThread()
+ #endif
+
+ #if defined(USE_X11)
++#if !defined(OS_BSD)
+ tty_file_ = base::OpenFile(base::FilePath(kTtyFilePath), "r");
++#endif
+ SetupXServer();
+ #endif
+ base::MessageLoopCurrent::Get()->AddTaskObserver(&task_observer_);
+@@ -238,8 +244,10 @@ GpuWatchdogThread::~GpuWatchdogThread() {
+ power_monitor->RemoveObserver(this);
+
+ #if defined(USE_X11)
++#if !defined(OS_BSD)
+ if (tty_file_)
+ fclose(tty_file_);
++#endif
+ if (display_) {
+ DCHECK(window_);
+ XDestroyWindow(display_, window_);
+@@ -463,7 +471,7 @@ void GpuWatchdogThread::DeliberatelyTerminateToRecover
+ return;
+ #endif
+
+-#if defined(USE_X11)
++#if defined(USE_X11) && !defined(OS_BSD)
+ // Don't crash if we're not on the TTY of our host X11 server.
+ int active_tty = GetActiveTTY();
+ if (host_tty_ != -1 && active_tty != -1 && host_tty_ != active_tty) {
+@@ -526,7 +534,9 @@ void GpuWatchdogThread::SetupXServer() {
+ CopyFromParent, InputOutput, CopyFromParent, 0, nullptr);
+ atom_ = XInternAtom(display_, "CHECK", x11::False);
+ }
++#if !defined(OS_BSD)
+ host_tty_ = GetActiveTTY();
++#endif
+ }
+
+ void GpuWatchdogThread::SetupXChangeProp() {
+@@ -627,7 +637,7 @@ base::ThreadTicks GpuWatchdogThread::GetWatchedThreadT
+ }
+ #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) &&
Property changes on: branches/2019Q2/www/chromium/files/patch-gpu_ipc_service_gpu__watchdog__thread.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/2019Q2/www/chromium/files/patch-gpu_ipc_service_gpu__watchdog__thread.h
===================================================================
--- branches/2019Q2/www/chromium/files/patch-gpu_ipc_service_gpu__watchdog__thread.h (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-gpu_ipc_service_gpu__watchdog__thread.h (revision 497959)
@@ -0,0 +1,13 @@
+--- gpu/ipc/service/gpu_watchdog_thread.h.orig 2019-03-11 22:00:59 UTC
++++ gpu/ipc/service/gpu_watchdog_thread.h
+@@ -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_;
Property changes on: branches/2019Q2/www/chromium/files/patch-gpu_ipc_service_gpu__watchdog__thread.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/2019Q2/www/chromium/files/patch-headless_lib_browser_headless__content__browser__client.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-headless_lib_browser_headless__content__browser__client.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-headless_lib_browser_headless__content__browser__client.cc (revision 497959)
@@ -1,20 +1,20 @@
---- headless/lib/browser/headless_content_browser_client.cc.orig 2017-06-05 19:03:08 UTC
+--- headless/lib/browser/headless_content_browser_client.cc.orig 2019-03-11 22:00:59 UTC
+++ headless/lib/browser/headless_content_browser_client.cc
-@@ -172,7 +172,7 @@ void HeadlessContentBrowserClient::GetQuotaSettings(
- callback);
+@@ -187,7 +187,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,
-@@ -183,7 +183,7 @@ void HeadlessContentBrowserClient::GetAdditionalMapped
- mappings->Share(kCrashDumpSignal, crash_signal_fd);
+@@ -198,7 +198,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/2019Q2/www/chromium/files/patch-headless_lib_browser_headless__content__browser__client.h
===================================================================
--- branches/2019Q2/www/chromium/files/patch-headless_lib_browser_headless__content__browser__client.h (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-headless_lib_browser_headless__content__browser__client.h (revision 497959)
@@ -1,11 +1,11 @@
---- headless/lib/browser/headless_content_browser_client.h.orig 2019-01-30 02:18:02.000000000 +0100
-+++ headless/lib/browser/headless_content_browser_client.h 2019-02-01 09:56:18.585343000 +0100
-@@ -34,7 +34,7 @@
+--- headless/lib/browser/headless_content_browser_client.h.orig 2019-03-11 22:00:59 UTC
++++ headless/lib/browser/headless_content_browser_client.h
+@@ -34,7 +34,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/2019Q2/www/chromium/files/patch-headless_lib_browser_headless__request__context__manager.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-headless_lib_browser_headless__request__context__manager.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-headless_lib_browser_headless__request__context__manager.cc (revision 497959)
@@ -1,20 +1,38 @@
---- headless/lib/browser/headless_request_context_manager.cc.orig 2019-01-30 02:18:02.000000000 +0100
-+++ headless/lib/browser/headless_request_context_manager.cc 2019-02-01 10:01:59.179234000 +0100
-@@ -35,7 +35,7 @@
+--- headless/lib/browser/headless_request_context_manager.cc.orig 2019-03-11 22:00:59 UTC
++++ headless/lib/browser/headless_request_context_manager.cc
+@@ -35,7 +35,7 @@ namespace headless {
namespace {
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
static char kProductName[] = "HeadlessChrome";
#endif
-@@ -367,7 +367,7 @@
- return;
- if (user_data_path_.empty())
- return;
+@@ -81,7 +81,7 @@ net::NetworkTrafficAnnotationTag GetProxyConfigTraffic
+ return traffic_annotation;
+ }
+
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
- ::network::mojom::CryptConfigPtr config =
- ::network::mojom::CryptConfig::New();
- config->store = base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
+ ::network::mojom::CryptConfigPtr BuildCryptConfigOnce(
+ const base::FilePath& user_data_path) {
+ static bool done_once = false;
+@@ -290,7 +290,7 @@ HeadlessRequestContextManager::HeadlessRequestContextM
+ proxy_config_monitor_ =
+ std::make_unique<HeadlessProxyConfigMonitor>(proxy_monitor_task_runner);
+ }
+-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
+ crypt_config_ = BuildCryptConfigOnce(user_data_path_);
+ if (network_service_enabled_ && crypt_config_)
+ content::GetNetworkService()->SetCryptConfig(std::move(crypt_config_));
+@@ -366,7 +366,7 @@ void HeadlessRequestContextManager::InitializeOnIO() {
+ std::move(protocol_handler.second));
+ }
+ protocol_handlers_.clear();
+-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
+ if (crypt_config_) {
+ content::GetNetworkServiceImpl()->SetCryptConfig(
+ std::move(crypt_config_));
Index: branches/2019Q2/www/chromium/files/patch-headless_lib_browser_headless__request__context__manager.h
===================================================================
--- branches/2019Q2/www/chromium/files/patch-headless_lib_browser_headless__request__context__manager.h (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-headless_lib_browser_headless__request__context__manager.h (revision 497959)
@@ -0,0 +1,11 @@
+--- headless/lib/browser/headless_request_context_manager.h.orig 2019-03-17 18:56:16 UTC
++++ headless/lib/browser/headless_request_context_manager.h
+@@ -69,7 +69,7 @@ class HeadlessRequestContextManager {
+ std::unique_ptr<HeadlessProxyConfigMonitor> proxy_config_monitor_;
+ bool is_system_context_;
+
+-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
+ ::network::mojom::CryptConfigPtr crypt_config_;
+ #endif
+
Property changes on: branches/2019Q2/www/chromium/files/patch-headless_lib_browser_headless__request__context__manager.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/2019Q2/www/chromium/files/patch-headless_lib_headless__macros.h
===================================================================
--- branches/2019Q2/www/chromium/files/patch-headless_lib_headless__macros.h (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-headless_lib_headless__macros.h (revision 497959)
@@ -1,13 +1,13 @@
---- headless/lib/headless_macros.h.orig 2018-12-03 21:16:59.000000000 +0100
-+++ headless/lib/headless_macros.h 2018-12-13 23:26:22.473345000 +0100
+--- headless/lib/headless_macros.h.orig 2019-03-11 22:00:59 UTC
++++ headless/lib/headless_macros.h
@@ -7,8 +7,8 @@
#include "build/build_config.h"
-#if defined(OS_POSIX) && !defined(OS_MACOSX)
+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD)
#define HEADLESS_USE_BREAKPAD
-#endif // defined(OS_POSIX) && !defined(OS_MACOSX)
+#endif // defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD)
#endif // HEADLESS_LIB_HEADLESS_MACROS_H_
Index: branches/2019Q2/www/chromium/files/patch-ipc_ipc__channel.h
===================================================================
--- branches/2019Q2/www/chromium/files/patch-ipc_ipc__channel.h (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-ipc_ipc__channel.h (revision 497959)
@@ -1,11 +1,11 @@
---- ipc/ipc_channel.h.orig 2017-06-05 19:03:08 UTC
+--- ipc/ipc_channel.h.orig 2019-03-11 22:00:59 UTC
+++ ipc/ipc_channel.h
-@@ -246,7 +246,7 @@ class IPC_EXPORT Channel : public Sender {
+@@ -244,7 +244,7 @@ class COMPONENT_EXPORT(IPC) Channel : public Sender {
static std::string GenerateUniqueRandomChannelID();
#endif
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
// Sandboxed processes live in a PID namespace, so when sending the IPC hello
// message from client to server we need to send the PID from the global
// PID namespace.
Index: branches/2019Q2/www/chromium/files/patch-ipc_ipc__channel__common.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-ipc_ipc__channel__common.cc (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-ipc_ipc__channel__common.cc (revision 497959)
@@ -0,0 +1,11 @@
+--- ipc/ipc_channel_common.cc.orig 2019-03-11 22:00:59 UTC
++++ ipc/ipc_channel_common.cc
+@@ -9,7 +9,7 @@
+
+ namespace IPC {
+
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+
+ namespace {
+ int g_global_pid = 0;
Property changes on: branches/2019Q2/www/chromium/files/patch-ipc_ipc__channel__common.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/2019Q2/www/chromium/files/patch-ipc_ipc__channel__mojo.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-ipc_ipc__channel__mojo.cc (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-ipc_ipc__channel__mojo.cc (revision 497959)
@@ -0,0 +1,11 @@
+--- ipc/ipc_channel_mojo.cc.orig 2019-03-11 22:00:59 UTC
++++ ipc/ipc_channel_mojo.cc
+@@ -64,7 +64,7 @@ class MojoChannelFactory : public ChannelFactory {
+ };
+
+ base::ProcessId GetSelfPID() {
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+ if (int global_pid = Channel::GetGlobalPid())
+ return global_pid;
+ #endif // OS_LINUX
Property changes on: branches/2019Q2/www/chromium/files/patch-ipc_ipc__channel__mojo.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/2019Q2/www/chromium/files/patch-ipc_ipc__message__utils.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-ipc_ipc__message__utils.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-ipc_ipc__message__utils.cc (revision 497959)
@@ -1,11 +1,11 @@
---- ipc/ipc_message_utils.cc.orig 2017-09-05 21:05:21.000000000 +0200
-+++ ipc/ipc_message_utils.cc 2017-09-06 20:38:34.375119000 +0200
-@@ -424,7 +424,7 @@
+--- ipc/ipc_message_utils.cc.orig 2019-03-11 22:00:59 UTC
++++ ipc/ipc_message_utils.cc
+@@ -349,7 +349,7 @@ void ParamTraits<unsigned int>::Log(const param_type&
}
#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_FUCHSIA) || \
- (defined(OS_ANDROID) && defined(ARCH_CPU_64_BITS))
+ defined(OS_BSD) || (defined(OS_ANDROID) && defined(ARCH_CPU_64_BITS))
void ParamTraits<long>::Log(const param_type& p, std::string* l) {
- l->append(base::Int64ToString(static_cast<int64_t>(p)));
+ l->append(base::NumberToString(p));
}
Index: branches/2019Q2/www/chromium/files/patch-ipc_ipc__message__utils.h
===================================================================
--- branches/2019Q2/www/chromium/files/patch-ipc_ipc__message__utils.h (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-ipc_ipc__message__utils.h (revision 497959)
@@ -1,11 +1,11 @@
---- ipc/ipc_message_utils.h.orig 2017-09-05 21:05:21.000000000 +0200
-+++ ipc/ipc_message_utils.h 2017-09-06 20:44:35.248663000 +0200
-@@ -212,7 +212,7 @@
+--- ipc/ipc_message_utils.h.orig 2019-03-11 22:00:59 UTC
++++ ipc/ipc_message_utils.h
+@@ -204,7 +204,7 @@ struct ParamTraits<unsigned int> {
// Since we want to support Android 32<>64 bit IPC, as long as we don't have
// these traits for 32 bit ARM then that'll catch any errors.
#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_FUCHSIA) || \
- (defined(OS_ANDROID) && defined(ARCH_CPU_64_BITS))
+ defined(OS_BSD) || (defined(OS_ANDROID) && defined(ARCH_CPU_64_BITS))
template <>
struct ParamTraits<long> {
typedef long param_type;
Index: branches/2019Q2/www/chromium/files/patch-media_BUILD.gn
===================================================================
--- branches/2019Q2/www/chromium/files/patch-media_BUILD.gn (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-media_BUILD.gn (revision 497959)
@@ -1,13 +1,12 @@
-$OpenBSD: patch-media_BUILD_gn,v 1.2 2017/04/28 22:22:36 robert Exp $
---- media/BUILD.gn.orig.port Wed Apr 19 21:06:35 2017
-+++ media/BUILD.gn Thu Apr 27 19:56:02 2017
-@@ -56,6 +56,9 @@ config("media_config") {
+--- media/BUILD.gn.orig 2019-03-11 22:00:59 UTC
++++ media/BUILD.gn
+@@ -59,6 +59,9 @@ config("media_config") {
defines += [ "DLOPEN_PULSEAUDIO" ]
}
}
+ if (use_sndio) {
+ defines += [ "USE_SNDIO" ]
+ }
if (use_cras) {
defines += [ "USE_CRAS" ]
}
Index: branches/2019Q2/www/chromium/files/patch-media_audio_BUILD.gn
===================================================================
--- branches/2019Q2/www/chromium/files/patch-media_audio_BUILD.gn (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-media_audio_BUILD.gn (revision 497959)
@@ -1,31 +1,22 @@
---- media/audio/BUILD.gn.orig 2018-01-04 21:05:54.000000000 +0100
-+++ media/audio/BUILD.gn 2018-01-27 12:34:55.048961000 +0100
-@@ -237,9 +237,19 @@
+--- media/audio/BUILD.gn.orig 2019-03-11 22:00:59 UTC
++++ media/audio/BUILD.gn
+@@ -242,8 +242,18 @@ source_set("audio") {
deps += [ "//media/base/android:media_jni_headers" ]
}
- if (is_linux) {
+ if (is_linux && !use_sndio) {
sources += [ "linux/audio_manager_linux.cc" ]
- }
++ }
+ if (use_sndio) {
+ libs += [ "sndio" ]
+ sources += [
+ "openbsd/audio_manager_openbsd.cc",
+ "sndio/sndio_input.cc",
+ "sndio/sndio_input.h",
+ "sndio/sndio_output.cc",
+ "sndio/sndio_output.h"
+ ]
-+ }
+ }
if (use_alsa) {
- libs += [ "asound" ]
-@@ -285,7 +295,6 @@
- if (link_pulseaudio) {
- configs += [ ":libpulse" ]
- } else {
-- libs += [ "dl" ]
- deps += [ ":pulse_generate_stubs" ]
- sources += get_target_outputs(":pulse_generate_stubs")
- }
Index: branches/2019Q2/www/chromium/files/patch-media_audio_alsa_audio__manager__alsa.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-media_audio_alsa_audio__manager__alsa.cc (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-media_audio_alsa_audio__manager__alsa.cc (revision 497959)
@@ -0,0 +1,54 @@
+--- media/audio/alsa/audio_manager_alsa.cc.orig 2019-03-21 01:36:54.000000000 +0100
++++ media/audio/alsa/audio_manager_alsa.cc 2019-03-25 22:31:49.328029000 +0100
+@@ -92,7 +92,9 @@
+ int card = -1;
+
+ // Loop through the sound cards to get ALSA device hints.
++#if defined(OS_LINUX)
+ while (!wrapper_->CardNext(&card) && card >= 0) {
++#endif
+ void** hints = NULL;
+ int error = wrapper_->DeviceNameHint(card, kPcmInterfaceName, &hints);
+ if (!error) {
+@@ -104,7 +106,9 @@
+ DLOG(WARNING) << "GetAlsaAudioDevices: unable to get device hints: "
+ << wrapper_->StrError(error);
+ }
++#if defined(OS_LINUX)
+ }
++#endif
+ }
+
+ void AudioManagerAlsa::GetAlsaDevicesInfo(AudioManagerAlsa::StreamType type,
+@@ -187,7 +191,11 @@
+ // goes through software conversion if needed (e.g. incompatible
+ // sample rate).
+ // TODO(joi): Should we prefer "hw" instead?
++#ifdef OS_LINUX
+ static const char kDeviceTypeDesired[] = "plughw";
++#else
++ static const char kDeviceTypeDesired[] = "plug";
++#endif
+ return strncmp(kDeviceTypeDesired, device_name,
+ base::size(kDeviceTypeDesired) - 1) == 0;
+ }
+@@ -209,7 +217,9 @@
+ // Loop through the sound cards.
+ // Don't use snd_device_name_hint(-1,..) since there is a access violation
+ // inside this ALSA API with libasound.so.2.0.0.
++#if defined(OS_LINUX)
+ while (!wrapper_->CardNext(&card) && (card >= 0) && !has_device) {
++#endif
+ int error = wrapper_->DeviceNameHint(card, kPcmInterfaceName, &hints);
+ if (!error) {
+ for (void** hint_iter = hints; *hint_iter != NULL; hint_iter++) {
+@@ -233,7 +243,9 @@
+ DLOG(WARNING) << "HasAnyAudioDevice: unable to get device hints: "
+ << wrapper_->StrError(error);
+ }
++#if defined(OS_LINUX)
+ }
++#endif
+
+ return has_device;
+ }
Property changes on: branches/2019Q2/www/chromium/files/patch-media_audio_alsa_audio__manager__alsa.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/2019Q2/www/chromium/files/patch-media_audio_audio__input__device.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-media_audio_audio__input__device.cc (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-media_audio_audio__input__device.cc (revision 497959)
@@ -0,0 +1,11 @@
+--- media/audio/audio_input_device.cc.orig 2019-03-17 21:43:40 UTC
++++ media/audio/audio_input_device.cc
+@@ -248,7 +248,7 @@ void AudioInputDevice::OnStreamCreated(
+ // also a risk of false positives if we are suspending when starting the stream
+ // here. See comments in AliveChecker and PowerObserverHelper for details and
+ // todos.
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+ const bool stop_at_first_alive_notification = true;
+ const bool pause_check_during_suspend = false;
+ #else
Property changes on: branches/2019Q2/www/chromium/files/patch-media_audio_audio__input__device.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/2019Q2/www/chromium/files/patch-media_audio_audio__manager.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-media_audio_audio__manager.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-media_audio_audio__manager.cc (revision 497959)
@@ -1,29 +1,29 @@
---- media/audio/audio_manager.cc.orig 2019-01-30 02:18:05.000000000 +0100
-+++ media/audio/audio_manager.cc 2019-02-01 10:05:43.833445000 +0100
-@@ -48,7 +48,7 @@
+--- media/audio/audio_manager.cc.orig 2019-03-11 22:00:59 UTC
++++ media/audio/audio_manager.cc
+@@ -48,7 +48,7 @@ class AudioManagerHelper {
}
#endif
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
void set_app_name(const std::string& app_name) { app_name_ = app_name; }
const std::string& app_name() const { return app_name_; }
#endif
-@@ -59,7 +59,7 @@
+@@ -59,7 +59,7 @@ class AudioManagerHelper {
std::unique_ptr<base::win::ScopedCOMInitializer> com_initializer_for_testing_;
#endif
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
std::string app_name_;
#endif
-@@ -128,7 +128,7 @@
+@@ -128,7 +128,7 @@ std::unique_ptr<AudioManager> AudioManager::CreateForT
return Create(std::move(audio_thread), GetHelper()->fake_log_factory());
}
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
// static
void AudioManager::SetGlobalAppName(const std::string& app_name) {
GetHelper()->set_app_name(app_name);
Index: branches/2019Q2/www/chromium/files/patch-media_audio_audio__manager.h
===================================================================
--- branches/2019Q2/www/chromium/files/patch-media_audio_audio__manager.h (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-media_audio_audio__manager.h (revision 497959)
@@ -1,11 +1,11 @@
---- media/audio/audio_manager.h.orig 2017-12-15 02:04:21.000000000 +0100
-+++ media/audio/audio_manager.h 2017-12-24 17:11:05.999543000 +0100
-@@ -68,7 +68,7 @@
- static void StartHangMonitorIfNeeded(
- scoped_refptr<base::SingleThreadTaskRunner> task_runner);
+--- media/audio/audio_manager.h.orig 2019-03-11 22:00:59 UTC
++++ media/audio/audio_manager.h
+@@ -60,7 +60,7 @@ class MEDIA_EXPORT AudioManager {
+ static std::unique_ptr<AudioManager> CreateForTesting(
+ std::unique_ptr<AudioThread> audio_thread);
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
// Sets the name of the audio source as seen by external apps. Only actually
// used with PulseAudio as of this writing.
static void SetGlobalAppName(const std::string& app_name);
Index: branches/2019Q2/www/chromium/files/patch-media_base_audio__latency.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-media_base_audio__latency.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-media_base_audio__latency.cc (revision 497959)
@@ -1,11 +1,11 @@
---- media/base/audio_latency.cc.orig 2017-12-15 02:04:21.000000000 +0100
-+++ media/base/audio_latency.cc 2017-12-24 17:08:13.779303000 +0100
-@@ -106,7 +106,7 @@
+--- media/base/audio_latency.cc.orig 2019-03-11 22:00:59 UTC
++++ media/base/audio_latency.cc
+@@ -106,7 +106,7 @@ int AudioLatency::GetRtcBufferSize(int sample_rate, in
return frames_per_buffer;
}
-#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_FUCHSIA)
+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_FUCHSIA) || defined(OS_BSD)
// On Linux, MacOS and Fuchsia, the low level IO implementations on the
// browser side supports all buffer size the clients want. We use the native
// peer connection buffer size (10ms) to achieve best possible performance.
Index: branches/2019Q2/www/chromium/files/patch-media_base_scopedfd__helper.h
===================================================================
--- branches/2019Q2/www/chromium/files/patch-media_base_scopedfd__helper.h (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-media_base_scopedfd__helper.h (revision 497959)
@@ -1,19 +1,19 @@
---- media/base/scopedfd_helper.h.orig 2018-12-12 22:56:08.000000000 +0100
-+++ media/base/scopedfd_helper.h 2018-12-16 13:21:03.268137000 +0100
-@@ -14,14 +14,14 @@
+--- media/base/scopedfd_helper.h.orig 2019-03-11 22:00:59 UTC
++++ media/base/scopedfd_helper.h
+@@ -14,14 +14,14 @@ namespace media {
// since the only current user is V4L2 we are limiting the scope to OS_LINUX so
// the binary size does not inflate on non-using systems. Feel free to adapt
// this and BUILD.gn as our needs evolve.
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
// Return a new vector containing duplicates of |fds|, or an empty vector in
// case of error.
MEDIA_EXPORT std::vector<base::ScopedFD> DuplicateFDs(
const std::vector<base::ScopedFD>& fds);
-#endif // OS_LINUX
+#endif // OS_LINUX || OS_BSD
} // namespace media
Index: branches/2019Q2/www/chromium/files/patch-media_base_video__frame.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-media_base_video__frame.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-media_base_video__frame.cc (revision 497959)
@@ -1,47 +1,47 @@
---- media/base/video_frame.cc.orig 2018-12-03 21:17:03.000000000 +0100
-+++ media/base/video_frame.cc 2018-12-13 23:34:19.884280000 +0100
-@@ -66,7 +66,7 @@
+--- media/base/video_frame.cc.orig 2019-03-11 22:00:59 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
-@@ -82,7 +82,7 @@
+@@ -68,7 +68,7 @@ static std::string StorageTypeToString(
// static
- static bool IsStorageTypeMappable(VideoFrame::StorageType storage_type) {
+ 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 &&
-@@ -379,7 +379,7 @@
+@@ -461,7 +461,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapExternalYuva
return frame;
}
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
// static
scoped_refptr<VideoFrame> VideoFrame::WrapExternalDmabufs(
const VideoFrameLayout& layout,
-@@ -502,7 +502,7 @@
- wrapping_frame->data_[i] = frame->data(i);
+@@ -592,7 +592,7 @@ scoped_refptr<VideoFrame> 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_);
-@@ -839,7 +839,7 @@
+@@ -917,7 +917,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<base::ScopedFD>& VideoFrame::DmabufFds() const {
DCHECK_EQ(storage_type_, STORAGE_DMABUFS);
Index: branches/2019Q2/www/chromium/files/patch-media_base_video__frame.h
===================================================================
--- branches/2019Q2/www/chromium/files/patch-media_base_video__frame.h (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-media_base_video__frame.h (revision 497959)
@@ -1,38 +1,38 @@
---- media/base/video_frame.h.orig 2018-12-03 21:17:03.000000000 +0100
-+++ media/base/video_frame.h 2018-12-13 23:50:03.082947000 +0100
-@@ -72,7 +72,7 @@
+--- media/base/video_frame.h.orig 2019-03-11 22:00:59 UTC
++++ media/base/video_frame.h
+@@ -71,7 +71,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
-@@ -238,7 +238,7 @@
+@@ -245,7 +245,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
-@@ -415,7 +415,7 @@
+@@ -430,7 +430,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
-@@ -625,7 +625,7 @@
+@@ -624,7 +624,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/2019Q2/www/chromium/files/patch-media_capture_video_create__video__capture__device__factory.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-media_capture_video_create__video__capture__device__factory.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-media_capture_video_create__video__capture__device__factory.cc (revision 497959)
@@ -1,20 +1,20 @@
---- media/capture/video/create_video_capture_device_factory.cc.orig 2018-12-12 22:56:08.000000000 +0100
-+++ media/capture/video/create_video_capture_device_factory.cc 2018-12-30 23:29:59.281943000 +0100
+--- media/capture/video/create_video_capture_device_factory.cc.orig 2019-03-11 22:00:59 UTC
++++ media/capture/video/create_video_capture_device_factory.cc
@@ -10,7 +10,7 @@
#include "media/capture/video/fake_video_capture_device_factory.h"
#include "media/capture/video/file_video_capture_device_factory.h"
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
#include "media/capture/video/linux/video_capture_device_factory_linux.h"
#elif defined(OS_CHROMEOS)
#include "media/capture/video/chromeos/public/cros_features.h"
-@@ -33,7 +33,7 @@
+@@ -33,7 +33,7 @@ namespace {
std::unique_ptr<VideoCaptureDeviceFactory>
CreatePlatformSpecificVideoCaptureDeviceFactory(
scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner) {
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
return std::make_unique<VideoCaptureDeviceFactoryLinux>(ui_task_runner);
#elif defined(OS_CHROMEOS)
// On Chrome OS we have to support two use cases:
Index: branches/2019Q2/www/chromium/files/patch-media_capture_video_fake__video__capture__device__factory.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-media_capture_video_fake__video__capture__device__factory.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-media_capture_video_fake__video__capture__device__factory.cc (revision 497959)
@@ -1,11 +1,11 @@
---- media/capture/video/fake_video_capture_device_factory.cc.orig 2017-06-05 19:03:08 UTC
+--- media/capture/video/fake_video_capture_device_factory.cc.orig 2019-03-11 22:00:59 UTC
+++ media/capture/video/fake_video_capture_device_factory.cc
-@@ -192,7 +192,7 @@ void FakeVideoCaptureDeviceFactory::GetDeviceDescripto
+@@ -204,7 +204,7 @@ void FakeVideoCaptureDeviceFactory::GetDeviceDescripto
for (const auto& entry : devices_config_) {
device_descriptors->emplace_back(
base::StringPrintf("fake_device_%d", entry_index), entry.device_id,
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
VideoCaptureApi::LINUX_V4L2_SINGLE_PLANE
#elif defined(OS_MACOSX)
VideoCaptureApi::MACOSX_AVFOUNDATION
Index: branches/2019Q2/www/chromium/files/patch-media_capture_video_file__video__capture__device__factory.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-media_capture_video_file__video__capture__device__factory.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-media_capture_video_file__video__capture__device__factory.cc (revision 497959)
@@ -1,11 +1,11 @@
---- media/capture/video/file_video_capture_device_factory.cc.orig 2017-06-05 19:03:08 UTC
+--- media/capture/video/file_video_capture_device_factory.cc.orig 2019-03-11 22:00:59 UTC
+++ media/capture/video/file_video_capture_device_factory.cc
@@ -53,7 +53,7 @@ void FileVideoCaptureDeviceFactory::GetDeviceDescripto
#elif defined(OS_MACOSX)
command_line_file_path.value(), kFileVideoCaptureDeviceName,
VideoCaptureApi::MACOSX_AVFOUNDATION
-#elif defined(OS_LINUX)
+#elif defined(OS_LINUX) || defined(OS_BSD)
command_line_file_path.value(), kFileVideoCaptureDeviceName,
VideoCaptureApi::LINUX_V4L2_SINGLE_PLANE
#else
Index: branches/2019Q2/www/chromium/files/patch-media_capture_video_linux_v4l2__capture__delegate.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-media_capture_video_linux_v4l2__capture__delegate.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-media_capture_video_linux_v4l2__capture__delegate.cc (revision 497959)
@@ -1,26 +1,26 @@
---- media/capture/video/linux/v4l2_capture_delegate.cc.orig 2017-06-05 19:03:08 UTC
+--- media/capture/video/linux/v4l2_capture_delegate.cc.orig 2019-03-11 22:00:59 UTC
+++ media/capture/video/linux/v4l2_capture_delegate.cc
@@ -4,8 +4,10 @@
#include "media/capture/video/linux/v4l2_capture_delegate.h"
+#if !defined(OS_BSD)
#include <linux/version.h>
#include <linux/videodev2.h>
+#endif
#include <poll.h>
#include <sys/fcntl.h>
#include <sys/ioctl.h>
-@@ -23,10 +25,10 @@
+@@ -24,10 +26,10 @@
using media::mojom::MeteringMode;
-#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 6, 0)
+// #if LINUX_VERSION_CODE < KERNEL_VERSION(4, 6, 0)
// 16 bit depth, Realsense F200.
#define V4L2_PIX_FMT_Z16 v4l2_fourcc('Z', '1', '6', ' ')
-#endif
+// #endif
// TODO(aleksandar.stojiljkovic): Wrap this with kernel version check once the
// format is introduced to kernel.
Index: branches/2019Q2/www/chromium/files/patch-media_capture_video_linux_video__capture__device__factory__linux.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-media_capture_video_linux_video__capture__device__factory__linux.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-media_capture_video_linux_video__capture__device__factory__linux.cc (revision 497959)
@@ -1,32 +1,32 @@
---- media/capture/video/linux/video_capture_device_factory_linux.cc.orig 2018-12-30 23:33:57.000000000 +0100
-+++ media/capture/video/linux/video_capture_device_factory_linux.cc 2018-12-30 23:35:38.475055000 +0100
-@@ -259,6 +259,7 @@
+--- media/capture/video/linux/video_capture_device_factory_linux.cc.orig 2019-03-11 22:00:59 UTC
++++ media/capture/video/linux/video_capture_device_factory_linux.cc
+@@ -259,6 +259,7 @@ bool VideoCaptureDeviceFactoryLinux::HasUsableFormats(
if (!(capabilities & V4L2_CAP_VIDEO_CAPTURE))
return false;
+#if !defined(OS_FREEBSD)
const std::vector<uint32_t>& usable_fourccs =
VideoCaptureDeviceLinux::GetListOfUsableFourCCs(false);
v4l2_fmtdesc fmtdesc = {};
-@@ -267,6 +268,7 @@
+@@ -267,6 +268,7 @@ bool VideoCaptureDeviceFactoryLinux::HasUsableFormats(
if (base::ContainsValue(usable_fourccs, fmtdesc.pixelformat))
return true;
}
+#endif
DVLOG(1) << "No usable formats found";
return false;
-@@ -312,9 +314,13 @@
+@@ -312,9 +314,13 @@ void VideoCaptureDeviceFactoryLinux::GetSupportedForma
v4l2_format.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
for (; DoIoctl(fd, VIDIOC_ENUM_FMT, &v4l2_format) == 0; ++v4l2_format.index) {
VideoCaptureFormat supported_format;
+#if !defined(OS_FREEBSD)
supported_format.pixel_format =
VideoCaptureDeviceLinux::V4l2FourCcToChromiumPixelFormat(
v4l2_format.pixelformat);
+#else
+ supported_format.pixel_format = PIXEL_FORMAT_UNKNOWN;
+#endif
if (supported_format.pixel_format == PIXEL_FORMAT_UNKNOWN)
continue;
Index: branches/2019Q2/www/chromium/files/patch-media_capture_video_linux_video__capture__device__linux.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-media_capture_video_linux_video__capture__device__linux.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-media_capture_video_linux_video__capture__device__linux.cc (revision 497959)
@@ -1,60 +1,60 @@
---- media/capture/video/linux/video_capture_device_linux.cc.orig 2018-12-13 23:54:05.391105000 +0100
-+++ media/capture/video/linux/video_capture_device_linux.cc 2018-12-14 00:02:46.685774000 +0100
-@@ -37,6 +37,7 @@
+--- media/capture/video/linux/video_capture_device_linux.cc.orig 2019-03-11 22:00:59 UTC
++++ media/capture/video/linux/video_capture_device_linux.cc
+@@ -37,6 +37,7 @@ int TranslatePowerLineFrequencyToV4L2(PowerLineFrequen
} // namespace
+#if !defined(OS_FREEBSD)
// Translates Video4Linux pixel formats to Chromium pixel formats.
// static
VideoPixelFormat VideoCaptureDeviceLinux::V4l2FourCcToChromiumPixelFormat(
-@@ -50,6 +51,7 @@
+@@ -50,6 +51,7 @@ std::vector<uint32_t> VideoCaptureDeviceLinux::GetList
bool favour_mjpeg) {
return V4L2CaptureDelegate::GetListOfUsableFourCcs(favour_mjpeg);
}
+#endif // !defined(OS_FREEBSD)
VideoCaptureDeviceLinux::VideoCaptureDeviceLinux(
scoped_refptr<V4L2CaptureDevice> v4l2,
-@@ -68,6 +70,7 @@
+@@ -68,6 +70,7 @@ VideoCaptureDeviceLinux::~VideoCaptureDeviceLinux() {
void VideoCaptureDeviceLinux::AllocateAndStart(
const VideoCaptureParams& params,
std::unique_ptr<VideoCaptureDevice::Client> client) {
+#if !defined(OS_FREEBSD)
DCHECK(!capture_impl_);
if (v4l2_thread_.IsRunning())
return; // Wrong state.
-@@ -95,9 +98,11 @@
+@@ -95,9 +98,11 @@ void VideoCaptureDeviceLinux::AllocateAndStart(
for (auto& request : photo_requests_queue_)
v4l2_thread_.task_runner()->PostTask(FROM_HERE, std::move(request));
photo_requests_queue_.clear();
+#endif // !defined(OS_FREEBSD)
}
void VideoCaptureDeviceLinux::StopAndDeAllocate() {
+#if !defined(OS_FREEBSD)
if (!v4l2_thread_.IsRunning())
return; // Wrong state.
v4l2_thread_.task_runner()->PostTask(
-@@ -107,6 +112,7 @@
+@@ -107,6 +112,7 @@ void VideoCaptureDeviceLinux::StopAndDeAllocate() {
v4l2_thread_.Stop();
capture_impl_ = nullptr;
+#endif // !defined(OS_FREEBSD)
}
void VideoCaptureDeviceLinux::TakePhoto(TakePhotoCallback callback) {
-@@ -149,11 +155,13 @@
+@@ -149,11 +155,13 @@ void VideoCaptureDeviceLinux::SetPhotoOptions(
}
void VideoCaptureDeviceLinux::SetRotation(int rotation) {
+#if !defined(OS_FREEBSD)
if (v4l2_thread_.IsRunning()) {
v4l2_thread_.task_runner()->PostTask(
FROM_HERE, base::BindOnce(&V4L2CaptureDelegate::SetRotation,
capture_impl_->GetWeakPtr(), rotation));
}
+#endif // !defined(OS_FREEBSD)
}
} // namespace media
Index: branches/2019Q2/www/chromium/files/patch-media_capture_video_mock__gpu__memory__buffer__manager.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-media_capture_video_mock__gpu__memory__buffer__manager.cc (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-media_capture_video_mock__gpu__memory__buffer__manager.cc (revision 497959)
@@ -0,0 +1,11 @@
+--- media/capture/video/mock_gpu_memory_buffer_manager.cc.orig 2019-03-11 22:00:59 UTC
++++ media/capture/video/mock_gpu_memory_buffer_manager.cc
+@@ -103,7 +103,7 @@ class FakeGpuMemoryBuffer : public gfx::GpuMemoryBuffe
+ gfx::GpuMemoryBufferHandle handle;
+ handle.type = gfx::NATIVE_PIXMAP;
+ handle.id = handle_.id;
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+ handle.native_pixmap_handle =
+ gfx::CloneHandleForIPC(handle_.native_pixmap_handle);
+ #endif
Property changes on: branches/2019Q2/www/chromium/files/patch-media_capture_video_mock__gpu__memory__buffer__manager.cc
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: branches/2019Q2/www/chromium/files/patch-media_capture_video_shared__memory__handle__provider.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-media_capture_video_shared__memory__handle__provider.cc (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-media_capture_video_shared__memory__handle__provider.cc (revision 497959)
@@ -0,0 +1,11 @@
+--- media/capture/video/shared_memory_handle_provider.cc.orig 2019-03-11 22:00:59 UTC
++++ media/capture/video/shared_memory_handle_provider.cc
+@@ -63,7 +63,7 @@ bool SharedMemoryHandleProvider::InitFromMojoHandle(
+ return true;
+ }
+
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+ bool SharedMemoryHandleProvider::InitAsReadOnlyFromRawFileDescriptor(
+ mojo::ScopedHandle fd_handle,
+ uint32_t memory_size_in_bytes) {
Property changes on: branches/2019Q2/www/chromium/files/patch-media_capture_video_shared__memory__handle__provider.cc
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: branches/2019Q2/www/chromium/files/patch-media_capture_video_shared__memory__handle__provider.h
===================================================================
--- branches/2019Q2/www/chromium/files/patch-media_capture_video_shared__memory__handle__provider.h (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-media_capture_video_shared__memory__handle__provider.h (revision 497959)
@@ -0,0 +1,11 @@
+--- media/capture/video/shared_memory_handle_provider.h.orig 2019-03-11 22:00:59 UTC
++++ media/capture/video/shared_memory_handle_provider.h
+@@ -38,7 +38,7 @@ class CAPTURE_EXPORT SharedMemoryHandleProvider
+
+ // This requires platforms where base::SharedMemoryHandle is backed by a
+ // file descriptor.
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+ bool InitAsReadOnlyFromRawFileDescriptor(mojo::ScopedHandle fd_handle,
+ uint32_t memory_size_in_bytes);
+ #endif // defined(OS_LINUX)
Property changes on: branches/2019Q2/www/chromium/files/patch-media_capture_video_shared__memory__handle__provider.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/2019Q2/www/chromium/files/patch-media_capture_video_video__capture__device__client.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-media_capture_video_video__capture__device__client.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-media_capture_video_video__capture__device__client.cc (revision 497959)
@@ -1,11 +1,11 @@
---- media/capture/video/video_capture_device_client.cc.orig 2017-06-05 19:03:08 UTC
+--- media/capture/video/video_capture_device_client.cc.orig 2019-03-11 22:00:59 UTC
+++ media/capture/video/video_capture_device_client.cc
-@@ -242,7 +242,7 @@ void VideoCaptureDeviceClient::OnIncomingCapturedData(
+@@ -236,7 +236,7 @@ void VideoCaptureDeviceClient::OnIncomingCapturedData(
// see http://linuxtv.org/downloads/v4l-dvb-apis/packed-rgb.html.
// Windows RGB24 defines blue at lowest byte,
// see https://msdn.microsoft.com/en-us/library/windows/desktop/dd407253
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
origin_colorspace = libyuv::FOURCC_RAW;
#elif defined(OS_WIN)
origin_colorspace = libyuv::FOURCC_24BG;
Index: branches/2019Q2/www/chromium/files/patch-media_filters_vp9__parser.h
===================================================================
--- branches/2019Q2/www/chromium/files/patch-media_filters_vp9__parser.h (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-media_filters_vp9__parser.h (revision 497959)
@@ -1,10 +1,10 @@
---- media/filters/vp9_parser.h.orig 2017-04-19 19:06:35 UTC
+--- media/filters/vp9_parser.h.orig 2019-03-11 22:00:59 UTC
+++ media/filters/vp9_parser.h
@@ -14,6 +14,7 @@
#include <stddef.h>
#include <stdint.h>
+#include <unistd.h>
#include <sys/types.h>
- #include <deque>
+ #include <memory>
Index: branches/2019Q2/www/chromium/files/patch-media_formats_common_offset__byte__queue.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-media_formats_common_offset__byte__queue.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-media_formats_common_offset__byte__queue.cc (revision 497959)
@@ -1,20 +1,20 @@
---- media/formats/common/offset_byte_queue.cc.orig 2017-06-05 19:03:09 UTC
+--- media/formats/common/offset_byte_queue.cc.orig 2019-03-11 22:00:59 UTC
+++ media/formats/common/offset_byte_queue.cc
@@ -46,13 +46,13 @@ void OffsetByteQueue::PeekAt(int64_t offset, const uin
*size = tail() - offset;
}
-bool OffsetByteQueue::Trim(int64_t max_offset) {
- if (max_offset < head_) return true;
- if (max_offset > tail()) {
+bool OffsetByteQueue::Trim(int64_t _max_offset) {
+ if (_max_offset < head_) return true;
+ if (_max_offset > tail()) {
Pop(size_);
return false;
}
- Pop(max_offset - head_);
+ Pop(_max_offset - head_);
return true;
}
Index: branches/2019Q2/www/chromium/files/patch-media_formats_common_offset__byte__queue.h
===================================================================
--- branches/2019Q2/www/chromium/files/patch-media_formats_common_offset__byte__queue.h (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-media_formats_common_offset__byte__queue.h (revision 497959)
@@ -1,22 +1,22 @@
---- media/formats/common/offset_byte_queue.h.orig 2017-04-19 19:06:35 UTC
+--- media/formats/common/offset_byte_queue.h.orig 2019-03-11 22:00:59 UTC
+++ media/formats/common/offset_byte_queue.h
@@ -36,15 +36,15 @@ class MEDIA_EXPORT OffsetByteQueue {
// a null |buf| and a |size| of zero.
void PeekAt(int64_t offset, const uint8_t** buf, int* size);
- // Marks the bytes up to (but not including) |max_offset| as ready for
+ // Marks the bytes up to (but not including) |_max_offset| as ready for
// deletion. This is relatively inexpensive, but will not necessarily reduce
// the resident buffer size right away (or ever).
//
// Returns true if the full range of bytes were successfully trimmed,
- // including the case where |max_offset| is less than the current head.
- // Returns false if |max_offset| > tail() (although all bytes currently
+ // including the case where |_max_offset| is less than the current head.
+ // Returns false if |_max_offset| > tail() (although all bytes currently
// buffered are still cleared).
- bool Trim(int64_t max_offset);
+ bool Trim(int64_t _max_offset);
// The head and tail positions, in terms of the file's absolute offsets.
// tail() is an exclusive bound.
Index: branches/2019Q2/www/chromium/files/patch-media_formats_mp2t_es__parser__adts.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-media_formats_mp2t_es__parser__adts.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-media_formats_mp2t_es__parser__adts.cc (revision 497959)
@@ -1,26 +1,26 @@
---- media/formats/mp2t/es_parser_adts.cc.orig 2017-06-05 19:03:09 UTC
+--- media/formats/mp2t/es_parser_adts.cc.orig 2019-03-11 22:00:59 UTC
+++ media/formats/mp2t/es_parser_adts.cc
-@@ -60,11 +60,11 @@ bool EsParserAdts::LookForAdtsFrame(AdtsFrame* adts_fr
+@@ -63,11 +63,11 @@ bool EsParserAdts::LookForAdtsFrame(AdtsFrame* adts_fr
const uint8_t* es;
es_queue_->Peek(&es, &es_size);
- int max_offset = es_size - kADTSHeaderMinSize;
- if (max_offset <= 0)
+ int _max_offset = es_size - kADTSHeaderMinSize;
+ if (_max_offset <= 0)
return false;
- for (int offset = 0; offset < max_offset; offset++) {
+ for (int offset = 0; offset < _max_offset; offset++) {
const uint8_t* cur_buf = &es[offset];
if (!isAdtsSyncWord(cur_buf))
continue;
-@@ -104,7 +104,7 @@ bool EsParserAdts::LookForAdtsFrame(AdtsFrame* adts_fr
+@@ -107,7 +107,7 @@ bool EsParserAdts::LookForAdtsFrame(AdtsFrame* adts_fr
return true;
}
- es_queue_->Pop(max_offset);
+ es_queue_->Pop(_max_offset);
return false;
}
Index: branches/2019Q2/www/chromium/files/patch-media_formats_mp2t_es__parser__mpeg1audio.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-media_formats_mp2t_es__parser__mpeg1audio.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-media_formats_mp2t_es__parser__mpeg1audio.cc (revision 497959)
@@ -1,26 +1,26 @@
---- media/formats/mp2t/es_parser_mpeg1audio.cc.orig 2017-06-05 19:03:09 UTC
+--- media/formats/mp2t/es_parser_mpeg1audio.cc.orig 2019-03-11 22:00:59 UTC
+++ media/formats/mp2t/es_parser_mpeg1audio.cc
-@@ -109,11 +109,11 @@ bool EsParserMpeg1Audio::LookForMpeg1AudioFrame(
+@@ -108,11 +108,11 @@ bool EsParserMpeg1Audio::LookForMpeg1AudioFrame(
const uint8_t* es;
es_queue_->Peek(&es, &es_size);
- int max_offset = es_size - MPEG1AudioStreamParser::kHeaderSize;
- if (max_offset <= 0)
+ int _max_offset = es_size - MPEG1AudioStreamParser::kHeaderSize;
+ if (_max_offset <= 0)
return false;
- for (int offset = 0; offset < max_offset; offset++) {
+ for (int offset = 0; offset < _max_offset; offset++) {
const uint8_t* cur_buf = &es[offset];
if (cur_buf[0] != 0xff)
continue;
-@@ -154,7 +154,7 @@ bool EsParserMpeg1Audio::LookForMpeg1AudioFrame(
+@@ -153,7 +153,7 @@ bool EsParserMpeg1Audio::LookForMpeg1AudioFrame(
return true;
}
- es_queue_->Pop(max_offset);
+ es_queue_->Pop(_max_offset);
return false;
}
Index: branches/2019Q2/www/chromium/files/patch-media_media__options.gni
===================================================================
--- branches/2019Q2/www/chromium/files/patch-media_media__options.gni (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-media_media__options.gni (revision 497959)
@@ -0,0 +1,12 @@
+--- media/media_options.gni.orig 2019-03-11 22:00:59 UTC
++++ media/media_options.gni
+@@ -100,6 +100,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 &&
Property changes on: branches/2019Q2/www/chromium/files/patch-media_media__options.gni
___________________________________________________________________
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/2019Q2/www/chromium/files/patch-media_mojo_services_gpu__mojo__media__client.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-media_mojo_services_gpu__mojo__media__client.cc (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-media_mojo_services_gpu__mojo__media__client.cc (revision 497959)
@@ -0,0 +1,20 @@
+--- media/mojo/services/gpu_mojo_media_client.cc.orig 2019-03-17 21:51:56 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<MediaGpuChannelManager> media_gpu_channel_manager,
+ base::UnguessableToken channel_token,
+@@ -172,7 +172,7 @@ std::unique_ptr<VideoDecoder> GpuMojoMediaClient::Crea
+ std::make_unique<VideoFrameFactoryImpl>(gpu_task_runner_,
+ std::move(get_stub_cb)));
+ #elif defined(OS_CHROMEOS) || defined(OS_MACOSX) || defined(OS_WIN) || \
+- defined(OS_LINUX)
++ defined(OS_LINUX) || defined(OS_BSD)
+ std::unique_ptr<VideoDecoder> vda_video_decoder = VdaVideoDecoder::Create(
+ task_runner, gpu_task_runner_, media_log->Clone(), target_color_space,
+ gpu_preferences_, gpu_workarounds_,
Property changes on: branches/2019Q2/www/chromium/files/patch-media_mojo_services_gpu__mojo__media__client.cc
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: branches/2019Q2/www/chromium/files/patch-media_video_gpu__memory__buffer__video__frame__pool.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-media_video_gpu__memory__buffer__video__frame__pool.cc (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-media_video_gpu__memory__buffer__video__frame__pool.cc (revision 497959)
@@ -0,0 +1,11 @@
+--- media/video/gpu_memory_buffer_video_frame_pool.cc.orig 2019-03-11 22:01:00 UTC
++++ media/video/gpu_memory_buffer_video_frame_pool.cc
+@@ -633,7 +633,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
+
Property changes on: branches/2019Q2/www/chromium/files/patch-media_video_gpu__memory__buffer__video__frame__pool.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/2019Q2/www/chromium/files/patch-mojo_public_c_system_thunks.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-mojo_public_c_system_thunks.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-mojo_public_c_system_thunks.cc (revision 497959)
@@ -1,47 +1,47 @@
---- mojo/public/c/system/thunks.cc.orig 2019-01-08 19:19:50.188491000 +0100
-+++ mojo/public/c/system/thunks.cc 2019-01-08 19:21:20.891924000 +0100
+--- mojo/public/c/system/thunks.cc.orig 2019-03-11 22:01:00 UTC
++++ mojo/public/c/system/thunks.cc
@@ -16,7 +16,7 @@
#include "build/build_config.h"
#include "mojo/public/c/system/core.h"
-#if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_WIN)
+#if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_WIN) || defined(OS_BSD)
#include "base/environment.h"
#include "base/files/file_path.h"
#include "base/optional.h"
-@@ -28,7 +28,7 @@
+@@ -28,7 +28,7 @@ namespace {
typedef void (*MojoGetSystemThunksFunction)(MojoSystemThunks* thunks);
-#if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_WIN)
+#if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_WIN) || defined(OS_BSD)
PROTECTED_MEMORY_SECTION
base::ProtectedMemory<MojoGetSystemThunksFunction> g_get_thunks;
#endif
-@@ -63,7 +63,7 @@
+@@ -65,7 +65,7 @@ namespace mojo {
class CoreLibraryInitializer {
public:
CoreLibraryInitializer(const MojoInitializeOptions* options) {
-#if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_WIN)
+#if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_WIN) || defined(OS_BSD)
bool application_provided_path = false;
base::Optional<base::FilePath> library_path;
if (options && options->struct_size >= sizeof(*options) &&
-@@ -82,7 +82,7 @@
+@@ -84,7 +84,7 @@ class CoreLibraryInitializer {
if (!library_path) {
// Default to looking for the library in the current working directory.
-#if defined(OS_CHROMEOS) || defined(OS_LINUX)
+#if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_BSD)
const base::FilePath::CharType kDefaultLibraryPathValue[] =
FILE_PATH_LITERAL("./libmojo_core.so");
#elif defined(OS_WIN)
-@@ -132,7 +132,7 @@
+@@ -147,7 +147,7 @@ class CoreLibraryInitializer {
~CoreLibraryInitializer() = default;
private:
-#if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_WIN)
+#if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_WIN) || defined(OS_BSD)
base::Optional<base::ScopedNativeLibrary> library_;
#endif
Index: branches/2019Q2/www/chromium/files/patch-mojo_public_js_mojo__bindings__resources.grd
===================================================================
--- branches/2019Q2/www/chromium/files/patch-mojo_public_js_mojo__bindings__resources.grd (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-mojo_public_js_mojo__bindings__resources.grd (revision 497959)
@@ -1,11 +1,11 @@
---- mojo/public/js/mojo_bindings_resources.grd.orig 2019-02-06 23:25:43.571727000 +0100
-+++ mojo/public/js/mojo_bindings_resources.grd 2019-02-06 23:25:53.104828000 +0100
+--- mojo/public/js/mojo_bindings_resources.grd.orig 2019-03-11 22:01:00 UTC
++++ mojo/public/js/mojo_bindings_resources.grd
@@ -23,7 +23,7 @@
use_base_dir="false"
type="BINDATA"
compress="gzip" />
- <if expr="is_win or is_macosx or is_linux">
+ <if expr="is_win or is_macosx or is_posix">
<include name="IDR_MOJO_TIME_MOJOM_JS"
file="${root_gen_dir}/mojo/public/mojom/base/time.mojom.js"
use_base_dir="false"
Index: branches/2019Q2/www/chromium/files/patch-net_BUILD.gn
===================================================================
--- branches/2019Q2/www/chromium/files/patch-net_BUILD.gn (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-net_BUILD.gn (revision 497959)
@@ -1,37 +1,37 @@
---- net/BUILD.gn.orig 2019-02-06 23:06:45.000000000 +0100
-+++ net/BUILD.gn 2019-02-08 22:09:39.080475000 +0100
-@@ -97,7 +97,7 @@
+--- net/BUILD.gn.orig 2019-03-11 22:01:00 UTC
++++ net/BUILD.gn
+@@ -97,7 +97,7 @@ net_configs = [
"//build/config/compiler:wexit_time_destructors",
]
-if (is_linux) {
+if (is_linux && !is_bsd) {
net_configs += [ "//build/config/linux:libresolv" ]
}
-@@ -1854,7 +1854,7 @@
+@@ -1900,7 +1900,7 @@ component("net") {
}
# Use getifaddrs() on POSIX platforms, except Linux and Android.
- if (is_posix && !is_linux && !is_android) {
+ if (is_posix && ((!is_linux && !is_android) || (is_bsd))) {
sources += [
"base/network_interfaces_getifaddrs.cc",
"base/network_interfaces_getifaddrs.h",
-@@ -1947,6 +1947,16 @@
+@@ -1993,6 +1993,16 @@ component("net") {
]
sources -= [ "disk_cache/blockfile/file_posix.cc" ]
+ }
+
+ if (is_bsd) {
+ sources -= [
+ "base/address_tracker_linux.cc",
+ "base/address_tracker_linux.h",
+ "base/network_change_notifier_linux.cc",
+ "base/network_change_notifier_linux.h",
+ "base/network_interfaces_linux.cc",
+ ]
}
if (is_ios || is_mac) {
Index: branches/2019Q2/www/chromium/files/patch-net_base_address__tracker__linux.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-net_base_address__tracker__linux.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-net_base_address__tracker__linux.cc (revision 497959)
@@ -1,360 +1,360 @@
---- net/base/address_tracker_linux.cc.orig 2018-12-03 21:17:06.000000000 +0100
-+++ net/base/address_tracker_linux.cc 2018-12-14 00:19:15.361979000 +0100
-@@ -22,96 +22,10 @@
+--- net/base/address_tracker_linux.cc.orig 2019-03-11 22:01:00 UTC
++++ net/base/address_tracker_linux.cc
+@@ -21,96 +21,10 @@
namespace net {
namespace internal {
-namespace {
-
-// Some kernel functions such as wireless_send_event and rtnetlink_ifinfo_prep
-// may send spurious messages over rtnetlink. RTM_NEWLINK messages where
-// ifi_change == 0 and rta_type == IFLA_WIRELESS should be ignored.
-bool IgnoreWirelessChange(const struct nlmsghdr* header,
- const struct ifinfomsg* msg) {
- size_t length = IFLA_PAYLOAD(header);
- for (const struct rtattr* attr = IFLA_RTA(msg); RTA_OK(attr, length);
- attr = RTA_NEXT(attr, length)) {
- if (attr->rta_type == IFLA_WIRELESS && msg->ifi_change == 0)
- return true;
- }
- return false;
-}
-
-// Retrieves address from NETLINK address message.
-// Sets |really_deprecated| for IPv6 addresses with preferred lifetimes of 0.
-bool GetAddress(const struct nlmsghdr* header,
- IPAddress* out,
- bool* really_deprecated) {
- if (really_deprecated)
- *really_deprecated = false;
- const struct ifaddrmsg* msg =
- reinterpret_cast<struct ifaddrmsg*>(NLMSG_DATA(header));
- size_t address_length = 0;
- switch (msg->ifa_family) {
- case AF_INET:
- address_length = IPAddress::kIPv4AddressSize;
- break;
- case AF_INET6:
- address_length = IPAddress::kIPv6AddressSize;
- break;
- default:
- // Unknown family.
- return false;
- }
- // Use IFA_ADDRESS unless IFA_LOCAL is present. This behavior here is based on
- // getaddrinfo in glibc (check_pf.c). Judging from kernel implementation of
- // NETLINK, IPv4 addresses have only the IFA_ADDRESS attribute, while IPv6
- // have the IFA_LOCAL attribute.
- uint8_t* address = NULL;
- uint8_t* local = NULL;
- size_t length = IFA_PAYLOAD(header);
- for (const struct rtattr* attr =
- reinterpret_cast<const struct rtattr*>(IFA_RTA(msg));
- RTA_OK(attr, length);
- attr = RTA_NEXT(attr, length)) {
- switch (attr->rta_type) {
- case IFA_ADDRESS:
- DCHECK_GE(RTA_PAYLOAD(attr), address_length);
- address = reinterpret_cast<uint8_t*>(RTA_DATA(attr));
- break;
- case IFA_LOCAL:
- DCHECK_GE(RTA_PAYLOAD(attr), address_length);
- local = reinterpret_cast<uint8_t*>(RTA_DATA(attr));
- break;
- case IFA_CACHEINFO: {
- const struct ifa_cacheinfo *cache_info =
- reinterpret_cast<const struct ifa_cacheinfo*>(RTA_DATA(attr));
- if (really_deprecated)
- *really_deprecated = (cache_info->ifa_prefered == 0);
- } break;
- default:
- break;
- }
- }
- if (local)
- address = local;
- if (!address)
- return false;
- *out = IPAddress(address, address_length);
- return true;
-}
-
-} // namespace
-
// static
char* AddressTrackerLinux::GetInterfaceName(int interface_index, char* buf) {
- memset(buf, 0, IFNAMSIZ);
- base::ScopedFD ioctl_socket = GetSocketForIoctl();
- if (!ioctl_socket.is_valid())
- return buf;
-
- struct ifreq ifr = {};
- ifr.ifr_ifindex = interface_index;
-
- if (ioctl(ioctl_socket.get(), SIOCGIFNAME, &ifr) == 0)
- strncpy(buf, ifr.ifr_name, IFNAMSIZ - 1);
- return buf;
+ NOTIMPLEMENTED();
+ return NULL;
}
AddressTrackerLinux::AddressTrackerLinux()
-@@ -154,93 +68,8 @@
+@@ -153,93 +67,8 @@ AddressTrackerLinux::~AddressTrackerLinux() {
}
void AddressTrackerLinux::Init() {
- netlink_fd_ = socket(AF_NETLINK, SOCK_RAW, NETLINK_ROUTE);
- if (netlink_fd_ < 0) {
- PLOG(ERROR) << "Could not create NETLINK socket";
- AbortAndForceOnline();
- return;
- }
-
- int rv;
-
- if (tracking_) {
- // Request notifications.
- struct sockaddr_nl addr = {};
- addr.nl_family = AF_NETLINK;
- addr.nl_pid = getpid();
- // TODO(szym): Track RTMGRP_LINK as well for ifi_type,
- // http://crbug.com/113993
- addr.nl_groups =
- RTMGRP_IPV4_IFADDR | RTMGRP_IPV6_IFADDR | RTMGRP_NOTIFY | RTMGRP_LINK;
- rv = bind(
- netlink_fd_, reinterpret_cast<struct sockaddr*>(&addr), sizeof(addr));
- if (rv < 0) {
- PLOG(ERROR) << "Could not bind NETLINK socket";
- AbortAndForceOnline();
- return;
- }
- }
-
- // Request dump of addresses.
- struct sockaddr_nl peer = {};
- peer.nl_family = AF_NETLINK;
-
- struct {
- struct nlmsghdr header;
- struct rtgenmsg msg;
- } request = {};
-
- request.header.nlmsg_len = NLMSG_LENGTH(sizeof(request.msg));
- request.header.nlmsg_type = RTM_GETADDR;
- request.header.nlmsg_flags = NLM_F_REQUEST | NLM_F_DUMP;
- request.header.nlmsg_pid = getpid();
- request.msg.rtgen_family = AF_UNSPEC;
-
- rv = HANDLE_EINTR(sendto(netlink_fd_, &request, request.header.nlmsg_len,
- 0, reinterpret_cast<struct sockaddr*>(&peer),
- sizeof(peer)));
- if (rv < 0) {
- PLOG(ERROR) << "Could not send NETLINK request";
- AbortAndForceOnline();
- return;
- }
-
- // Consume pending message to populate the AddressMap, but don't notify.
- // Sending another request without first reading responses results in EBUSY.
- bool address_changed;
- bool link_changed;
- bool tunnel_changed;
- ReadMessages(&address_changed, &link_changed, &tunnel_changed);
-
- // Request dump of link state
- request.header.nlmsg_type = RTM_GETLINK;
-
- rv = HANDLE_EINTR(sendto(netlink_fd_, &request, request.header.nlmsg_len, 0,
- reinterpret_cast<struct sockaddr*>(&peer),
- sizeof(peer)));
- if (rv < 0) {
- PLOG(ERROR) << "Could not send NETLINK request";
- AbortAndForceOnline();
- return;
- }
-
- // Consume pending message to populate links_online_, but don't notify.
- ReadMessages(&address_changed, &link_changed, &tunnel_changed);
- {
- AddressTrackerAutoLock lock(*this, connection_type_lock_);
- connection_type_initialized_ = true;
- connection_type_initialized_cv_.Broadcast();
- }
-
- if (tracking_) {
- rv = base::MessageLoopCurrentForIO::Get()->WatchFileDescriptor(
- netlink_fd_, true, base::MessagePumpForIO::WATCH_READ, &watcher_, this);
- if (rv < 0) {
- PLOG(ERROR) << "Could not watch NETLINK socket";
- AbortAndForceOnline();
- return;
- }
- }
+NOTIMPLEMENTED();
+AbortAndForceOnline();
}
void AddressTrackerLinux::AbortAndForceOnline() {
-@@ -251,25 +80,6 @@
+@@ -250,25 +79,6 @@ void AddressTrackerLinux::AbortAndForceOnline() {
connection_type_initialized_cv_.Broadcast();
}
-AddressTrackerLinux::AddressMap AddressTrackerLinux::GetAddressMap() const {
- AddressTrackerAutoLock lock(*this, address_map_lock_);
- return address_map_;
-}
-
-std::unordered_set<int> AddressTrackerLinux::GetOnlineLinks() const {
- AddressTrackerAutoLock lock(*this, online_links_lock_);
- return online_links_;
-}
-
-bool AddressTrackerLinux::IsInterfaceIgnored(int interface_index) const {
- if (ignored_interfaces_.empty())
- return false;
-
- char buf[IFNAMSIZ] = {0};
- const char* interface_name = get_interface_name_(interface_index, buf);
- return ignored_interfaces_.find(interface_name) != ignored_interfaces_.end();
-}
-
NetworkChangeNotifier::ConnectionType
AddressTrackerLinux::GetCurrentConnectionType() {
// http://crbug.com/125097
-@@ -328,102 +138,7 @@
+@@ -326,102 +136,7 @@ void AddressTrackerLinux::HandleMessage(char* buffer,
bool* address_changed,
bool* link_changed,
bool* tunnel_changed) {
- DCHECK(buffer);
- for (struct nlmsghdr* header = reinterpret_cast<struct nlmsghdr*>(buffer);
- NLMSG_OK(header, length);
- header = NLMSG_NEXT(header, length)) {
- switch (header->nlmsg_type) {
- case NLMSG_DONE:
- return;
- case NLMSG_ERROR: {
- const struct nlmsgerr* msg =
- reinterpret_cast<struct nlmsgerr*>(NLMSG_DATA(header));
- LOG(ERROR) << "Unexpected netlink error " << msg->error << ".";
- } return;
- case RTM_NEWADDR: {
- IPAddress address;
- bool really_deprecated;
- struct ifaddrmsg* msg =
- reinterpret_cast<struct ifaddrmsg*>(NLMSG_DATA(header));
- if (IsInterfaceIgnored(msg->ifa_index))
- break;
- if (GetAddress(header, &address, &really_deprecated)) {
- AddressTrackerAutoLock lock(*this, address_map_lock_);
- // Routers may frequently (every few seconds) output the IPv6 ULA
- // prefix which can cause the linux kernel to frequently output two
- // back-to-back messages, one without the deprecated flag and one with
- // the deprecated flag but both with preferred lifetimes of 0. Avoid
- // interpretting this as an actual change by canonicalizing the two
- // messages by setting the deprecated flag based on the preferred
- // lifetime also. http://crbug.com/268042
- if (really_deprecated)
- msg->ifa_flags |= IFA_F_DEPRECATED;
- // Only indicate change if the address is new or ifaddrmsg info has
- // changed.
- auto it = address_map_.find(address);
- if (it == address_map_.end()) {
- address_map_.insert(it, std::make_pair(address, *msg));
- *address_changed = true;
- } else if (memcmp(&it->second, msg, sizeof(*msg))) {
- it->second = *msg;
- *address_changed = true;
- }
- }
- } break;
- case RTM_DELADDR: {
- IPAddress address;
- const struct ifaddrmsg* msg =
- reinterpret_cast<struct ifaddrmsg*>(NLMSG_DATA(header));
- if (IsInterfaceIgnored(msg->ifa_index))
- break;
- if (GetAddress(header, &address, NULL)) {
- AddressTrackerAutoLock lock(*this, address_map_lock_);
- if (address_map_.erase(address))
- *address_changed = true;
- }
- } break;
- case RTM_NEWLINK: {
- const struct ifinfomsg* msg =
- reinterpret_cast<struct ifinfomsg*>(NLMSG_DATA(header));
- if (IsInterfaceIgnored(msg->ifi_index))
- break;
- if (IgnoreWirelessChange(header, msg)) {
- VLOG(2) << "Ignoring RTM_NEWLINK message";
- break;
- }
- if (!(msg->ifi_flags & IFF_LOOPBACK) && (msg->ifi_flags & IFF_UP) &&
- (msg->ifi_flags & IFF_LOWER_UP) && (msg->ifi_flags & IFF_RUNNING)) {
- AddressTrackerAutoLock lock(*this, online_links_lock_);
- if (online_links_.insert(msg->ifi_index).second) {
- *link_changed = true;
- if (IsTunnelInterface(msg->ifi_index))
- *tunnel_changed = true;
- }
- } else {
- AddressTrackerAutoLock lock(*this, online_links_lock_);
- if (online_links_.erase(msg->ifi_index)) {
- *link_changed = true;
- if (IsTunnelInterface(msg->ifi_index))
- *tunnel_changed = true;
- }
- }
- } break;
- case RTM_DELLINK: {
- const struct ifinfomsg* msg =
- reinterpret_cast<struct ifinfomsg*>(NLMSG_DATA(header));
- if (IsInterfaceIgnored(msg->ifi_index))
- break;
- AddressTrackerAutoLock lock(*this, online_links_lock_);
- if (online_links_.erase(msg->ifi_index)) {
- *link_changed = true;
- if (IsTunnelInterface(msg->ifi_index))
- *tunnel_changed = true;
- }
- } break;
- default:
- break;
- }
- }
+ NOTIMPLEMENTED();
}
void AddressTrackerLinux::OnFileCanReadWithoutBlocking(int fd) {
-@@ -460,31 +175,7 @@
+@@ -458,31 +173,7 @@ bool AddressTrackerLinux::IsTunnelInterfaceName(const
}
void AddressTrackerLinux::UpdateCurrentConnectionType() {
- AddressTrackerLinux::AddressMap address_map = GetAddressMap();
- std::unordered_set<int> online_links = GetOnlineLinks();
-
- // Strip out tunnel interfaces from online_links
- for (auto it = online_links.cbegin(); it != online_links.cend();) {
- if (IsTunnelInterface(*it)) {
- it = online_links.erase(it);
- } else {
- ++it;
- }
- }
-
- NetworkInterfaceList networks;
- NetworkChangeNotifier::ConnectionType type =
- NetworkChangeNotifier::CONNECTION_NONE;
- if (GetNetworkListImpl(&networks, 0, online_links, address_map,
- get_interface_name_)) {
- type = NetworkChangeNotifier::ConnectionTypeFromInterfaceList(networks);
- } else {
- type = online_links.empty() ? NetworkChangeNotifier::CONNECTION_NONE
- : NetworkChangeNotifier::CONNECTION_UNKNOWN;
- }
-
- AddressTrackerAutoLock lock(*this, connection_type_lock_);
- current_connection_type_ = type;
+ NOTIMPLEMENTED();
}
int AddressTrackerLinux::GetThreadsWaitingForConnectionTypeInitForTesting()
Index: branches/2019Q2/www/chromium/files/patch-net_base_address__tracker__linux.h
===================================================================
--- branches/2019Q2/www/chromium/files/patch-net_base_address__tracker__linux.h (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-net_base_address__tracker__linux.h (revision 497959)
@@ -1,12 +1,12 @@
---- net/base/address_tracker_linux.h.orig 2018-01-04 21:05:55.000000000 +0100
-+++ net/base/address_tracker_linux.h 2018-01-21 13:43:10.477307000 +0100
+--- net/base/address_tracker_linux.h.orig 2019-03-11 22:01:00 UTC
++++ net/base/address_tracker_linux.h
@@ -7,9 +7,6 @@
#include <sys/socket.h> // Needed to include netlink.
// Mask superfluous definition of |struct net|. This is fixed in Linux 2.6.38.
-#define net net_kernel
-#include <linux/rtnetlink.h>
-#undef net
#include <stddef.h>
#include <map>
Index: branches/2019Q2/www/chromium/files/patch-net_base_address__tracker__linux__unittest.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-net_base_address__tracker__linux__unittest.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-net_base_address__tracker__linux__unittest.cc (revision 497959)
@@ -1,14 +1,14 @@
---- net/base/address_tracker_linux_unittest.cc.orig 2017-04-19 19:06:36 UTC
+--- net/base/address_tracker_linux_unittest.cc.orig 2019-03-11 22:01:00 UTC
+++ net/base/address_tracker_linux_unittest.cc
@@ -4,7 +4,11 @@
#include "net/base/address_tracker_linux.h"
+#if defined(__linux__)
#include <linux/if.h>
+#else
+#include <net/if.h>
+#endif
#include <memory>
#include <unordered_set>
Index: branches/2019Q2/www/chromium/files/patch-net_base_network__change__notifier.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-net_base_network__change__notifier.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-net_base_network__change__notifier.cc (revision 497959)
@@ -1,10 +1,10 @@
---- net/base/network_change_notifier.cc.orig 2017-06-05 19:03:09 UTC
+--- net/base/network_change_notifier.cc.orig 2019-03-11 22:01:00 UTC
+++ net/base/network_change_notifier.cc
-@@ -533,7 +533,6 @@ NetworkChangeNotifier* NetworkChangeNotifier::Create()
- #elif defined(OS_MACOSX)
- return new NetworkChangeNotifierMac();
+@@ -221,7 +221,6 @@ NetworkChangeNotifier* NetworkChangeNotifier::Create()
+ #elif defined(OS_FUCHSIA)
+ return new NetworkChangeNotifierFuchsia(0 /* required_features */);
#else
- NOTIMPLEMENTED();
return NULL;
#endif
}
Index: branches/2019Q2/www/chromium/files/patch-net_base_network__interfaces__posix.h
===================================================================
--- branches/2019Q2/www/chromium/files/patch-net_base_network__interfaces__posix.h (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-net_base_network__interfaces__posix.h (revision 497959)
@@ -1,11 +1,11 @@
---- net/base/network_interfaces_posix.h.orig 2017-07-04 22:49:41.402276000 +0200
-+++ net/base/network_interfaces_posix.h 2017-07-04 22:49:59.456467000 +0200
+--- net/base/network_interfaces_posix.h.orig 2019-03-11 22:01:00 UTC
++++ net/base/network_interfaces_posix.h
@@ -8,6 +8,8 @@
- // This file is only used to expose some of the internals of
- // network_interfaces_posix.cc to network_interfaces_linux.cc and network_interfaces_mac.cc.
+ // This file provides some basic functionality shared between
+ // network_interfaces_linux.cc and network_interfaces_getifaddrs.cc.
+#include <sys/socket.h>
+
#include <string>
struct sockaddr;
Index: branches/2019Q2/www/chromium/files/patch-net_disk__cache_blockfile_disk__format.h
===================================================================
--- branches/2019Q2/www/chromium/files/patch-net_disk__cache_blockfile_disk__format.h (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-net_disk__cache_blockfile_disk__format.h (revision 497959)
@@ -1,12 +1,12 @@
---- net/disk_cache/blockfile/disk_format.h.orig 2017-04-19 19:06:36 UTC
+--- net/disk_cache/blockfile/disk_format.h.orig 2019-03-11 22:01:01 UTC
+++ net/disk_cache/blockfile/disk_format.h
@@ -149,7 +149,9 @@ struct RankingsNode {
};
#pragma pack(pop)
+#if !defined(OS_BSD)
static_assert(sizeof(RankingsNode) == 36, "bad RankingsNode");
+#endif
} // namespace disk_cache
Index: branches/2019Q2/www/chromium/files/patch-net_dns_address__sorter__posix.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-net_dns_address__sorter__posix.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-net_dns_address__sorter__posix.cc (revision 497959)
@@ -1,12 +1,12 @@
---- net/dns/address_sorter_posix.cc.orig 2017-07-25 21:04:58.000000000 +0200
-+++ net/dns/address_sorter_posix.cc 2017-08-02 21:07:01.353407000 +0200
+--- net/dns/address_sorter_posix.cc.orig 2019-03-11 22:01:01 UTC
++++ net/dns/address_sorter_posix.cc
@@ -13,7 +13,9 @@
#include <sys/socket.h> // Must be included before ifaddrs.h.
#include <ifaddrs.h>
#include <net/if.h>
+#include <net/if_var.h>
#include <netinet/in_var.h>
+#include <netinet6/in6_var.h>
#include <string.h>
#include <sys/ioctl.h>
#endif
Index: branches/2019Q2/www/chromium/files/patch-net_dns_dns__config__service__posix__unittest.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-net_dns_dns__config__service__posix__unittest.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-net_dns_dns__config__service__posix__unittest.cc (revision 497959)
@@ -1,11 +1,47 @@
---- net/dns/dns_config_service_posix_unittest.cc.orig 2017-04-19 19:06:36 UTC
+--- net/dns/dns_config_service_posix_unittest.cc.orig 2019-03-11 22:01:01 UTC
+++ net/dns/dns_config_service_posix_unittest.cc
@@ -2,8 +2,6 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include <resolv.h>
-
#include <memory>
#include "base/cancelable_callback.h"
+@@ -46,7 +44,7 @@ const char* const kNameserversIPv4[] = {
+ "1.0.0.1",
+ };
+
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+ const char* const kNameserversIPv6[] = {
+ NULL,
+ "2001:DB8:0::42",
+@@ -82,7 +80,7 @@ void InitializeResState(res_state res) {
+ ++res->nscount;
+ }
+
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+ // Install IPv6 addresses, replacing the corresponding IPv4 addresses.
+ unsigned nscount6 = 0;
+ for (unsigned i = 0; i < base::size(kNameserversIPv6) && i < MAXNS; ++i) {
+@@ -103,7 +101,7 @@ void InitializeResState(res_state res) {
+ }
+
+ void CloseResState(res_state res) {
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+ for (int i = 0; i < res->nscount; ++i) {
+ if (res->_u._ext.nsaddrs[i] != NULL)
+ free(res->_u._ext.nsaddrs[i]);
+@@ -128,7 +126,7 @@ void InitializeExpectedConfig(DnsConfig* config) {
+ config->nameservers.push_back(IPEndPoint(ip, NS_DEFAULTPORT + i));
+ }
+
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+ for (unsigned i = 0; i < base::size(kNameserversIPv6) && i < MAXNS; ++i) {
+ if (!kNameserversIPv6[i])
+ continue;
Index: branches/2019Q2/www/chromium/files/patch-net_dns_dns__reloader.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-net_dns_dns__reloader.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-net_dns_dns__reloader.cc (revision 497959)
@@ -1,13 +1,13 @@
---- net/dns/dns_reloader.cc.orig 2017-04-19 19:06:36 UTC
+--- net/dns/dns_reloader.cc.orig 2019-03-11 22:01:01 UTC
+++ net/dns/dns_reloader.cc
@@ -7,6 +7,10 @@
#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_OPENBSD) && \
- !defined(OS_ANDROID)
+ !defined(OS_ANDROID) && !defined(OS_FUCHSIA)
+#if defined(OS_FREEBSD)
+#include <netinet/in.h>
+#endif
+
#include <resolv.h>
#include "base/lazy_instance.h"
Index: branches/2019Q2/www/chromium/files/patch-net_dns_dns__util.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-net_dns_dns__util.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-net_dns_dns__util.cc (revision 497959)
@@ -1,11 +1,11 @@
---- net/dns/dns_util.cc.orig 2017-06-05 19:03:10 UTC
+--- net/dns/dns_util.cc.orig 2019-03-11 22:01:01 UTC
+++ net/dns/dns_util.cc
-@@ -26,6 +26,8 @@ const int kMaxLabelLength = 63;
+@@ -36,6 +36,8 @@ const uint16_t kFlagNamePointer = 0xc000;
} // namespace
+#include <sys/socket.h>
+
#if defined(OS_POSIX)
#include <netinet/in.h>
#if !defined(OS_NACL)
Index: branches/2019Q2/www/chromium/files/patch-net_dns_host__resolver__proc.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-net_dns_host__resolver__proc.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-net_dns_host__resolver__proc.cc (revision 497959)
@@ -1,11 +1,11 @@
---- net/dns/host_resolver_proc.cc.orig 2017-09-05 21:05:22.000000000 +0200
-+++ net/dns/host_resolver_proc.cc 2017-09-06 20:49:21.939725000 +0200
-@@ -190,7 +190,7 @@
- // Restrict result set to only this socket type to avoid duplicates.
- hints.ai_socktype = SOCK_STREAM;
+--- net/dns/host_resolver_proc.cc.orig 2019-03-11 22:01:01 UTC
++++ net/dns/host_resolver_proc.cc
+@@ -195,7 +195,7 @@ int SystemHostResolverCall(const std::string& host,
+ // current process during that time.
+ base::ScopedBlockingCall scoped_blocking_call(base::BlockingType::WILL_BLOCK);
-#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_OPENBSD) && \
+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD) && \
!defined(OS_ANDROID) && !defined(OS_FUCHSIA)
DnsReloaderMaybeReload();
#endif
Index: branches/2019Q2/www/chromium/files/patch-net_features.gni
===================================================================
--- branches/2019Q2/www/chromium/files/patch-net_features.gni (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-net_features.gni (revision 497959)
@@ -1,11 +1,11 @@
---- net/features.gni.orig 2019-01-30 02:18:08.000000000 +0100
-+++ net/features.gni 2019-02-01 10:21:10.600808000 +0100
-@@ -27,7 +27,7 @@
+--- net/features.gni.orig 2019-03-11 22:01:01 UTC
++++ net/features.gni
+@@ -27,7 +27,7 @@ declare_args() {
disable_brotli_filter = false
# Multicast DNS.
- enable_mdns = is_win || is_linux || is_fuchsia || is_mac || is_ios
+ enable_mdns = is_win || is_linux || is_fuchsia || is_mac || is_ios || is_bsd
# Reporting not used on iOS.
enable_reporting = !is_ios
Index: branches/2019Q2/www/chromium/files/patch-net_http_http__auth__gssapi__posix.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-net_http_http__auth__gssapi__posix.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-net_http_http__auth__gssapi__posix.cc (revision 497959)
@@ -1,14 +1,14 @@
---- net/http/http_auth_gssapi_posix.cc.orig 2018-01-04 21:05:56.000000000 +0100
-+++ net/http/http_auth_gssapi_posix.cc 2018-01-16 20:07:40.196726000 +0100
-@@ -431,8 +431,9 @@
+--- net/http/http_auth_gssapi_posix.cc.orig 2019-03-11 22:01:01 UTC
++++ net/http/http_auth_gssapi_posix.cc
+@@ -431,8 +431,9 @@ base::NativeLibrary GSSAPISharedLibrary::LoadSharedLib
static const char* const kDefaultLibraryNames[] = {
#if defined(OS_MACOSX)
"/System/Library/Frameworks/GSS.framework/GSS"
-#elif defined(OS_OPENBSD)
- "libgssapi.so" // Heimdal - OpenBSD
+#elif defined(OS_BSD)
+ "libgssapi_krb5.so.2", // MIT Kerberos - FreeBSD
+ "libgssapi.so" // Heimdal - OpenBSD, FreeBSD
#else
"libgssapi_krb5.so.2", // MIT Kerberos - FC, Suse10, Debian
"libgssapi.so.4", // Heimdal - Suse10, MDK
Index: branches/2019Q2/www/chromium/files/patch-net_http_http__network__session.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-net_http_http__network__session.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-net_http_http__network__session.cc (revision 497959)
@@ -1,12 +1,12 @@
---- net/http/http_network_session.cc.orig 2018-06-13 00:10:22.000000000 +0200
-+++ net/http/http_network_session.cc 2018-07-19 15:24:13.890886000 +0200
-@@ -20,7 +20,9 @@
+--- net/http/http_network_session.cc.orig 2019-03-11 22:01:01 UTC
++++ net/http/http_network_session.cc
+@@ -19,7 +19,9 @@
#include "base/trace_event/memory_dump_request_args.h"
#include "base/trace_event/process_memory_dump.h"
#include "base/values.h"
+#if defined(USE_KERBEROS)
#include "net/http/http_auth_handler_factory.h"
+#endif
#include "net/http/http_response_body_drainer.h"
- #include "net/http/http_stream_factory_impl.h"
+ #include "net/http/http_stream_factory.h"
#include "net/http/url_security_manager.h"
Index: branches/2019Q2/www/chromium/files/patch-net_nqe_network__quality__estimator.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-net_nqe_network__quality__estimator.cc (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-net_nqe_network__quality__estimator.cc (revision 497959)
@@ -0,0 +1,11 @@
+--- net/nqe/network_quality_estimator.cc.orig 2019-03-17 14:51:31 UTC
++++ net/nqe/network_quality_estimator.cc
+@@ -99,7 +99,7 @@ nqe::internal::NetworkID DoGetCurrentNetworkID() {
+ case NetworkChangeNotifier::ConnectionType::CONNECTION_ETHERNET:
+ break;
+ case NetworkChangeNotifier::ConnectionType::CONNECTION_WIFI:
+-#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_WIN)
++#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_WIN) || defined(OS_BSD)
+ network_id.id = GetWifiSSID();
+ #endif
+ break;
Property changes on: branches/2019Q2/www/chromium/files/patch-net_nqe_network__quality__estimator.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/2019Q2/www/chromium/files/patch-net_nqe_network__quality__estimator__unittest.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-net_nqe_network__quality__estimator__unittest.cc (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-net_nqe_network__quality__estimator__unittest.cc (revision 497959)
@@ -0,0 +1,11 @@
+--- net/nqe/network_quality_estimator_unittest.cc.orig 2019-03-17 14:56:02 UTC
++++ net/nqe/network_quality_estimator_unittest.cc
+@@ -2058,7 +2058,7 @@ TEST_F(NetworkQualityEstimatorTest, TestGlobalSocketWa
+
+ // TestTCPSocketRTT requires kernel support for tcp_info struct, and so it is
+ // enabled only on certain platforms.
+-#if defined(TCP_INFO) || defined(OS_LINUX) || defined(OS_ANDROID)
++#if defined(TCP_INFO) || defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD)
+ #define MAYBE_TestTCPSocketRTT TestTCPSocketRTT
+ #else
+ #define MAYBE_TestTCPSocketRTT DISABLED_TestTCPSocketRTT
Property changes on: branches/2019Q2/www/chromium/files/patch-net_nqe_network__quality__estimator__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/2019Q2/www/chromium/files/patch-net_proxy__resolution_proxy__config__service__linux.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-net_proxy__resolution_proxy__config__service__linux.cc (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-net_proxy__resolution_proxy__config__service__linux.cc (revision 497959)
@@ -0,0 +1,39 @@
+--- net/proxy_resolution/proxy_config_service_linux.cc.orig 2019-03-11 22:01:01 UTC
++++ net/proxy_resolution/proxy_config_service_linux.cc
+@@ -6,7 +6,9 @@
+
+ #include <errno.h>
+ #include <limits.h>
++#if !defined(OS_BSD)
+ #include <sys/inotify.h>
++#endif
+ #include <unistd.h>
+
+ #include <map>
+@@ -495,6 +497,7 @@ int StringToIntOrDefault(base::StringPiece value, int
+ return default_value;
+ }
+
++#if !defined(OS_BSD)
+ // This is the KDE version that reads kioslaverc and simulates gsettings.
+ // Doing this allows the main Delegate code, as well as the unit tests
+ // for it, to stay the same - and the settings map fairly well besides.
+@@ -986,6 +989,7 @@ class SettingGetterImplKDE : public ProxyConfigService
+
+ DISALLOW_COPY_AND_ASSIGN(SettingGetterImplKDE);
+ };
++#endif
+
+ } // namespace
+
+@@ -1197,8 +1201,10 @@ ProxyConfigServiceLinux::Delegate::Delegate(
+ case base::nix::DESKTOP_ENVIRONMENT_KDE3:
+ case base::nix::DESKTOP_ENVIRONMENT_KDE4:
+ case base::nix::DESKTOP_ENVIRONMENT_KDE5:
++#if !defined(OS_BSD)
+ setting_getter_.reset(new SettingGetterImplKDE(env_var_getter_.get()));
+ break;
++#endif
+ case base::nix::DESKTOP_ENVIRONMENT_XFCE:
+ case base::nix::DESKTOP_ENVIRONMENT_OTHER:
+ break;
Property changes on: branches/2019Q2/www/chromium/files/patch-net_proxy__resolution_proxy__config__service__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/2019Q2/www/chromium/files/patch-net_proxy__resolution_proxy__resolution__service.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-net_proxy__resolution_proxy__resolution__service.cc (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-net_proxy__resolution_proxy__resolution__service.cc (revision 497959)
@@ -0,0 +1,29 @@
+--- net/proxy_resolution/proxy_resolution_service.cc.orig 2019-03-11 22:01:01 UTC
++++ net/proxy_resolution/proxy_resolution_service.cc
+@@ -48,7 +48,7 @@
+ #elif defined(OS_MACOSX)
+ #include "net/proxy_resolution/proxy_config_service_mac.h"
+ #include "net/proxy_resolution/proxy_resolver_mac.h"
+-#elif defined(OS_LINUX) && !defined(OS_CHROMEOS)
++#elif (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
+ #include "net/proxy_resolution/proxy_config_service_linux.h"
+ #elif defined(OS_ANDROID)
+ #include "net/proxy_resolution/proxy_config_service_android.h"
+@@ -62,7 +62,7 @@ namespace net {
+ namespace {
+
+ #if defined(OS_WIN) || defined(OS_IOS) || defined(OS_MACOSX) || \
+- (defined(OS_LINUX) && !defined(OS_CHROMEOS))
++ ((defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS))
+ constexpr net::NetworkTrafficAnnotationTag kSystemProxyConfigTrafficAnnotation =
+ net::DefineNetworkTrafficAnnotation("proxy_config_system", R"(
+ semantics {
+@@ -1577,7 +1577,7 @@ ProxyResolutionService::CreateSystemProxyConfigService
+ << "profile_io_data.cc::CreateProxyConfigService and this should "
+ << "be used only for examples.";
+ return std::make_unique<UnsetProxyConfigService>();
+-#elif defined(OS_LINUX)
++#elif defined(OS_LINUX) || defined(OS_BSD)
+ std::unique_ptr<ProxyConfigServiceLinux> linux_config_service(
+ new ProxyConfigServiceLinux());
+
Property changes on: branches/2019Q2/www/chromium/files/patch-net_proxy__resolution_proxy__resolution__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/2019Q2/www/chromium/files/patch-net_socket_socket__posix.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-net_socket_socket__posix.cc (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-net_socket_socket__posix.cc (revision 497959)
@@ -0,0 +1,11 @@
+--- net/socket/socket_posix.cc.orig 2019-03-17 15:48:31 UTC
++++ net/socket/socket_posix.cc
+@@ -568,7 +568,7 @@ void SocketPosix::ReadCompleted() {
+ }
+
+ int SocketPosix::DoWrite(IOBuffer* buf, int buf_len) {
+-#if defined(OS_LINUX) || defined(OS_ANDROID)
++#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD)
+ // Disable SIGPIPE for this write. Although Chromium globally disables
+ // SIGPIPE, the net stack may be used in other consumers which do not do
+ // this. MSG_NOSIGNAL is a Linux-only API. On OS X, this is a setsockopt on
Property changes on: branches/2019Q2/www/chromium/files/patch-net_socket_socket__posix.cc
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: branches/2019Q2/www/chromium/files/patch-net_socket_socks5__client__socket.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-net_socket_socks5__client__socket.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-net_socket_socks5__client__socket.cc (revision 497959)
@@ -1,13 +1,13 @@
---- net/socket/socks5_client_socket.cc.orig 2017-04-19 19:06:36 UTC
+--- net/socket/socks5_client_socket.cc.orig 2019-03-11 22:01:01 UTC
+++ net/socket/socks5_client_socket.cc
@@ -4,6 +4,10 @@
#include "net/socket/socks5_client_socket.h"
+#if defined(OS_BSD)
+#include <netinet/in.h>
+#endif
+
#include <utility>
#include "base/callback_helpers.h"
Index: branches/2019Q2/www/chromium/files/patch-net_socket_tcp__socket__posix.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-net_socket_tcp__socket__posix.cc (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-net_socket_tcp__socket__posix.cc (revision 497959)
@@ -0,0 +1,20 @@
+--- net/socket/tcp_socket_posix.cc.orig 2019-03-17 15:46:01 UTC
++++ net/socket/tcp_socket_posix.cc
+@@ -88,6 +88,17 @@ bool SetTCPKeepAlive(int fd, bool enable, int delay) {
+ PLOG(ERROR) << "Failed to set TCP_KEEPALIVE on fd: " << fd;
+ return false;
+ }
++#elif defined(OS_BSD)
++ // Set seconds until first TCP keep alive.
++ if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPIDLE, &delay, sizeof(delay))) {
++ PLOG(ERROR) << "Failed to set TCP_KEEPIDLE on fd: " << fd;
++ return false;
++ }
++ // Set seconds between TCP keep alives.
++ if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPINTVL, &delay, sizeof(delay))) {
++ PLOG(ERROR) << "Failed to set TCP_KEEPINTVL on fd: " << fd;
++ return false;
++ }
+ #endif
+ return true;
+ }
Property changes on: branches/2019Q2/www/chromium/files/patch-net_socket_tcp__socket__posix.cc
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: branches/2019Q2/www/chromium/files/patch-net_socket_udp__socket__posix.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-net_socket_udp__socket__posix.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-net_socket_udp__socket__posix.cc (revision 497959)
@@ -1,115 +1,115 @@
---- net/socket/udp_socket_posix.cc.orig 2019-01-30 02:18:08.000000000 +0100
-+++ net/socket/udp_socket_posix.cc 2019-02-01 23:56:02.678455000 +0100
-@@ -68,7 +68,7 @@
+--- net/socket/udp_socket_posix.cc.orig 2019-03-11 22:01:01 UTC
++++ net/socket/udp_socket_posix.cc
+@@ -68,7 +68,7 @@ const int kActivityMonitorMinimumSamplesForThroughputE
const base::TimeDelta kActivityMonitorMsThreshold =
base::TimeDelta::FromMilliseconds(100);
-#if defined(OS_MACOSX)
+#if defined(OS_MACOSX) || defined(OS_BSD)
// When enabling multicast using setsockopt(IP_MULTICAST_IF) MacOS
// requires passing IPv4 address instead of interface index. This function
// resolves IPv4 address by interface index. The |address| is returned in
-@@ -97,7 +97,7 @@
+@@ -97,7 +97,7 @@ int GetIPv4AddressFromIndex(int socket, uint32_t index
return OK;
}
-#endif // OS_MACOSX
+#endif // OS_MACOSX || OS_BSD
#if defined(OS_MACOSX) && !defined(OS_IOS)
-@@ -641,13 +641,13 @@
+@@ -644,13 +644,13 @@ int UDPSocketPosix::SetDoNotFragment() {
}
void UDPSocketPosix::SetMsgConfirm(bool confirm) {
-#if !defined(OS_MACOSX) && !defined(OS_IOS)
+#if !defined(OS_MACOSX) && !defined(OS_IOS) && !defined(OS_BSD)
if (confirm) {
sendto_flags_ |= MSG_CONFIRM;
} else {
sendto_flags_ &= ~MSG_CONFIRM;
}
-#endif // !defined(OS_MACOSX) && !defined(OS_IOS)
+#endif // !defined(OS_MACOSX) && !defined(OS_IOS) && !defined(OS_BSD)
}
int UDPSocketPosix::AllowAddressReuse() {
-@@ -662,17 +662,20 @@
+@@ -665,17 +665,20 @@ int UDPSocketPosix::SetBroadcast(bool broadcast) {
DCHECK_CALLED_ON_VALID_THREAD(thread_checker_);
int value = broadcast ? 1 : 0;
int rv;
-#if defined(OS_MACOSX)
+#if defined(OS_MACOSX) || defined(OS_BSD)
// SO_REUSEPORT on OSX permits multiple processes to each receive
// UDP multicast or broadcast datagrams destined for the bound
// port.
// This is only being set on OSX because its behavior is platform dependent
// and we are playing it safe by only setting it on platforms where things
// break.
+ rv = setsockopt(socket_, SOL_SOCKET, SO_REUSEADDR, &value, sizeof(value));
+ if (rv != 0)
+ return MapSystemError(errno);
rv = setsockopt(socket_, SOL_SOCKET, SO_REUSEPORT, &value, sizeof(value));
if (rv != 0)
return MapSystemError(errno);
-#endif // defined(OS_MACOSX)
+#endif // defined(OS_MACOSX) || defined(OS_BSD)
rv = setsockopt(socket_, SOL_SOCKET, SO_BROADCAST, &value, sizeof(value));
return rv == 0 ? OK : MapSystemError(errno);
-@@ -934,19 +937,24 @@
+@@ -937,19 +940,24 @@ int UDPSocketPosix::SetMulticastOptions() {
if (multicast_interface_ != 0) {
switch (addr_family_) {
case AF_INET: {
-#if defined(OS_MACOSX)
+#if defined(OS_MACOSX) || defined(OS_BSD)
ip_mreq mreq = {};
int error = GetIPv4AddressFromIndex(socket_, multicast_interface_,
&mreq.imr_interface.s_addr);
if (error != OK)
return error;
-#else // defined(OS_MACOSX)
+#else // defined(OS_MACOSX) || defined(OS_BSD)
ip_mreqn mreq = {};
mreq.imr_ifindex = multicast_interface_;
mreq.imr_address.s_addr = htonl(INADDR_ANY);
-#endif // !defined(OS_MACOSX)
+#endif // !defined(OS_MACOSX) || defined(OS_BSD)
int rv = setsockopt(socket_, IPPROTO_IP, IP_MULTICAST_IF,
+#if defined(OS_BSD)
+ reinterpret_cast<const char*>(&mreq.imr_interface.s_addr),
+ sizeof(mreq.imr_interface.s_addr));
+#else
reinterpret_cast<const char*>(&mreq), sizeof(mreq));
+#endif
if (rv)
return MapSystemError(errno);
break;
-@@ -1008,7 +1016,7 @@
+@@ -1011,7 +1019,7 @@ int UDPSocketPosix::JoinGroup(const IPAddress& group_a
if (addr_family_ != AF_INET)
return ERR_ADDRESS_INVALID;
-#if defined(OS_MACOSX)
+#if defined(OS_MACOSX) || defined(OS_BSD)
ip_mreq mreq = {};
int error = GetIPv4AddressFromIndex(socket_, multicast_interface_,
&mreq.imr_interface.s_addr);
-@@ -1056,9 +1064,18 @@
+@@ -1059,9 +1067,18 @@ int UDPSocketPosix::LeaveGroup(const IPAddress& group_
case IPAddress::kIPv4AddressSize: {
if (addr_family_ != AF_INET)
return ERR_ADDRESS_INVALID;
+#if defined(OS_BSD)
+ ip_mreq mreq = {};
+ int error = GetIPv4AddressFromIndex(socket_, multicast_interface_,
+ &mreq.imr_interface.s_addr);
+
+ if (error != OK)
+ return error;
+#else
ip_mreqn mreq = {};
mreq.imr_ifindex = multicast_interface_;
mreq.imr_address.s_addr = INADDR_ANY;
+#endif
memcpy(&mreq.imr_multiaddr, group_address.bytes().data(),
IPAddress::kIPv4AddressSize);
int rv = setsockopt(socket_, IPPROTO_IP, IP_DROP_MEMBERSHIP,
Index: branches/2019Q2/www/chromium/files/patch-net_third__party_quic_platform_impl_quic__ip__address__impl.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-net_third__party_quic_platform_impl_quic__ip__address__impl.cc (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-net_third__party_quic_platform_impl_quic__ip__address__impl.cc (revision 497959)
@@ -0,0 +1,10 @@
+--- net/third_party/quic/platform/impl/quic_ip_address_impl.cc.orig 2019-03-11 22:01:01 UTC
++++ net/third_party/quic/platform/impl/quic_ip_address_impl.cc
+@@ -13,6 +13,7 @@
+ #include <ws2bth.h>
+ #elif defined(OS_POSIX) || defined(OS_FUCHSIA)
+ #include <netinet/in.h>
++#include <sys/socket.h>
+ #endif
+
+ using std::string;
Property changes on: branches/2019Q2/www/chromium/files/patch-net_third__party_quic_platform_impl_quic__ip__address__impl.cc
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: branches/2019Q2/www/chromium/files/patch-net_tools_cert__verify__tool_cert__verify__tool.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-net_tools_cert__verify__tool_cert__verify__tool.cc (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-net_tools_cert__verify__tool_cert__verify__tool.cc (revision 497959)
@@ -0,0 +1,20 @@
+--- net/tools/cert_verify_tool/cert_verify_tool.cc.orig 2019-03-11 22:01:01 UTC
++++ net/tools/cert_verify_tool/cert_verify_tool.cc
+@@ -27,7 +27,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
+@@ -46,7 +46,7 @@ void SetUpOnNetworkThread(std::unique_ptr<net::URLRequ
+ base::WaitableEvent* initialization_complete_event) {
+ net::URLRequestContextBuilder url_request_context_builder;
+ url_request_context_builder.set_user_agent(GetUserAgent());
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+ // On Linux, use a fixed ProxyConfigService, since the default one
+ // depends on glib.
+ //
Property changes on: branches/2019Q2/www/chromium/files/patch-net_tools_cert__verify__tool_cert__verify__tool.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/2019Q2/www/chromium/files/patch-net_tools_quic_quic__http__proxy__backend.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-net_tools_quic_quic__http__proxy__backend.cc (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-net_tools_quic_quic__http__proxy__backend.cc (revision 497959)
@@ -0,0 +1,11 @@
+--- net/tools/quic/quic_http_proxy_backend.cc.orig 2019-03-17 15:38:01 UTC
++++ net/tools/quic/quic_http_proxy_backend.cc
+@@ -160,7 +160,7 @@ void QuicHttpProxyBackend::InitializeURLRequestContext
+ // Enable HTTP2, but disable QUIC on the backend
+ context_builder.SetSpdyAndQuicEnabled(true /* http2 */, false /* quic */);
+
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+ // On Linux, use a fixed ProxyConfigService, since the default one
+ // depends on glib.
+ context_builder.set_proxy_config_service(
Property changes on: branches/2019Q2/www/chromium/files/patch-net_tools_quic_quic__http__proxy__backend.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/2019Q2/www/chromium/files/patch-net_url__request_url__request__context__builder.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-net_url__request_url__request__context__builder.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-net_url__request_url__request__context__builder.cc (revision 497959)
@@ -1,11 +1,11 @@
---- net/url_request/url_request_context_builder.cc.orig 2018-06-13 00:10:23.000000000 +0200
-+++ net/url_request/url_request_context_builder.cc 2018-07-19 16:09:43.508974000 +0200
-@@ -506,7 +506,7 @@
+--- net/url_request/url_request_context_builder.cc.orig 2019-03-11 22:01:01 UTC
++++ net/url_request/url_request_context_builder.cc
+@@ -520,7 +520,7 @@ std::unique_ptr<URLRequestContext> URLRequestContextBu
}
if (!proxy_resolution_service_) {
-#if !defined(OS_LINUX) && !defined(OS_ANDROID)
+#if !defined(OS_LINUX) && !defined(OS_ANDROID) && !defined(OS_BSD)
// TODO(willchan): Switch to using this code when
// ProxyResolutionService::CreateSystemProxyConfigService()'s signature
// doesn't suck.
Index: branches/2019Q2/www/chromium/files/patch-pdf_pdfium_pdfium__engine.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-pdf_pdfium_pdfium__engine.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-pdf_pdfium_pdfium__engine.cc (revision 497959)
@@ -1,65 +1,74 @@
---- pdf/pdfium/pdfium_engine.cc.orig 2018-08-01 00:08:54.000000000 +0200
-+++ pdf/pdfium/pdfium_engine.cc 2018-08-04 20:29:42.077905000 +0200
-@@ -134,7 +134,7 @@
+--- pdf/pdfium/pdfium_engine.cc.orig 2019-03-11 22:01:01 UTC
++++ pdf/pdfium/pdfium_engine.cc
+@@ -133,7 +133,7 @@ constexpr base::TimeDelta kMaxInitialProgressivePaintT
PDFiumEngine* g_engine_for_fontmapper = nullptr;
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
PP_Instance g_last_instance_id;
-@@ -651,7 +651,7 @@
+@@ -413,7 +413,7 @@ void Release(FPDF_SYSFONTINFO* sysfontinfo) {
+ fontinfo_with_metrics->default_sysfontinfo->Release(
+ fontinfo_with_metrics->default_sysfontinfo);
+ }
+-#endif // defined(OS_LINUX)
++#endif // defined(OS_LINUX) || defined(OS_BSD)
+
+ PDFiumEngine::CreateDocumentLoaderFunction
+ g_create_document_loader_for_testing = nullptr;
+@@ -663,7 +663,7 @@ bool InitializeSDK() {
config.m_v8EmbedderSlot = gin::kEmbedderPDFium;
FPDF_InitLibraryWithConfig(&config);
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
// Font loading doesn't work in the renderer sandbox in Linux.
FPDF_SetSystemFontInfo(&g_font_info);
#else
-@@ -676,7 +676,7 @@
+@@ -688,7 +688,7 @@ bool InitializeSDK() {
void ShutdownSDK() {
FPDF_DestroyLibrary();
-#if !defined(OS_LINUX)
+#if !defined(OS_LINUX) && !defined(OS_BSD)
delete g_font_info;
#endif
TearDownV8();
-@@ -712,7 +712,7 @@
+@@ -712,7 +712,7 @@ PDFiumEngine::PDFiumEngine(PDFEngine::Client* client,
IFSDK_PAUSE::user = nullptr;
IFSDK_PAUSE::NeedToPauseNow = Pause_NeedToPauseNow;
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
// PreviewModeClient does not know its pp::Instance.
pp::Instance* instance = client_->GetPluginInstance();
if (instance)
-@@ -1226,7 +1226,7 @@
+@@ -1176,7 +1176,7 @@ pp::Buffer_Dev PDFiumEngine::PrintPagesAsRasterPdf(
KillFormFocus();
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
g_last_instance_id = client_->GetPluginInstance()->pp_instance();
#endif
-@@ -2924,7 +2924,7 @@
+@@ -2973,7 +2973,7 @@ bool PDFiumEngine::ContinuePaint(int progressive_index
DCHECK(image_data);
last_progressive_start_time_ = base::Time::Now();
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
g_last_instance_id = client_->GetPluginInstance()->pp_instance();
#endif
-@@ -3402,7 +3402,7 @@
+@@ -3448,7 +3448,7 @@ void PDFiumEngine::SetCurrentPage(int index) {
FORM_DoPageAAction(old_page, form(), FPDFPAGE_AACTION_CLOSE);
}
most_visible_page_ = index;
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
g_last_instance_id = client_->GetPluginInstance()->pp_instance();
#endif
if (most_visible_page_ != -1 && called_do_document_action_) {
Index: branches/2019Q2/www/chromium/files/patch-ppapi_proxy_file__io__resource.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-ppapi_proxy_file__io__resource.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-ppapi_proxy_file__io__resource.cc (revision 497959)
@@ -1,48 +1,48 @@
---- ppapi/proxy/file_io_resource.cc.orig 2017-06-05 19:03:10 UTC
+--- ppapi/proxy/file_io_resource.cc.orig 2019-03-11 22:01:01 UTC
+++ ppapi/proxy/file_io_resource.cc
@@ -285,17 +285,19 @@ int32_t FileIOResource::Write(int64_t offset,
if (check_quota_) {
int64_t increase = 0;
- uint64_t max_offset = 0;
+ uint64_t _max_offset = 0;
+ // (rene) avoid name collission with /usr/include/vm/vm_map.h on FreeBSD
+ // which also defines max_offset
bool append = (open_flags_ & PP_FILEOPENFLAG_APPEND) != 0;
if (append) {
increase = bytes_to_write;
} else {
- uint64_t max_offset = offset + bytes_to_write;
- if (max_offset >
+ uint64_t _max_offset = offset + bytes_to_write;
+ if (_max_offset >
static_cast<uint64_t>(std::numeric_limits<int64_t>::max())) {
return PP_ERROR_FAILED; // amount calculation would overflow.
}
- increase = static_cast<int64_t>(max_offset) - max_written_offset_;
+ increase = static_cast<int64_t>(_max_offset) - max_written_offset_;
}
if (increase > 0) {
@@ -319,7 +321,7 @@ int32_t FileIOResource::Write(int64_t offset,
if (append)
append_mode_write_amount_ += bytes_to_write;
else
- max_written_offset_ = max_offset;
+ max_written_offset_ = _max_offset;
}
}
return WriteValidated(offset, buffer, bytes_to_write, callback);
@@ -597,9 +599,9 @@ void FileIOResource::OnRequestWriteQuotaComplete(
} else {
DCHECK_LE(offset + bytes_to_write - max_written_offset_, granted);
- int64_t max_offset = offset + bytes_to_write;
- if (max_written_offset_ < max_offset)
- max_written_offset_ = max_offset;
+ int64_t _max_offset = offset + bytes_to_write;
+ if (max_written_offset_ < _max_offset)
+ max_written_offset_ = _max_offset;
}
if (callback->is_blocking()) {
Index: branches/2019Q2/www/chromium/files/patch-printing_backend_print__backend__cups.h
===================================================================
--- branches/2019Q2/www/chromium/files/patch-printing_backend_print__backend__cups.h (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-printing_backend_print__backend__cups.h (revision 497959)
@@ -0,0 +1,11 @@
+--- printing/backend/print_backend_cups.h.orig 2019-03-11 22:01:01 UTC
++++ printing/backend/print_backend_cups.h
+@@ -5,6 +5,8 @@
+ #ifndef PRINTING_BACKEND_PRINT_BACKEND_CUPS_H_
+ #define PRINTING_BACKEND_PRINT_BACKEND_CUPS_H_
+
++#include <cups/ppd.h>
++
+ #include <string>
+
+ #include "base/files/file_util.h"
Property changes on: branches/2019Q2/www/chromium/files/patch-printing_backend_print__backend__cups.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/2019Q2/www/chromium/files/patch-printing_cups__config__helper.py
===================================================================
--- branches/2019Q2/www/chromium/files/patch-printing_cups__config__helper.py (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-printing_cups__config__helper.py (revision 497959)
@@ -1,11 +1,11 @@
---- printing/cups_config_helper.py.orig 2017-04-19 19:06:36 UTC
+--- printing/cups_config_helper.py.orig 2019-03-11 22:01:01 UTC
+++ printing/cups_config_helper.py
@@ -65,7 +65,7 @@ def main():
mode = sys.argv[1]
if len(sys.argv) > 2 and sys.argv[2]:
sysroot = sys.argv[2]
- cups_config = os.path.join(sysroot, 'usr', 'bin', 'cups-config')
+ cups_config = os.path.join(sysroot, 'bin', 'cups-config')
if not os.path.exists(cups_config):
print 'cups-config not found: %s' % cups_config
return 1
Index: branches/2019Q2/www/chromium/files/patch-remoting_base_chromoting__event.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-remoting_base_chromoting__event.cc (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-remoting_base_chromoting__event.cc (revision 497959)
@@ -0,0 +1,11 @@
+--- remoting/base/chromoting_event.cc.orig 2019-03-11 22:01:01 UTC
++++ remoting/base/chromoting_event.cc
+@@ -189,7 +189,7 @@ void ChromotingEvent::AddSystemInfo() {
+ SetString(kCpuKey, base::SysInfo::OperatingSystemArchitecture());
+ SetString(kOsVersionKey, GetOperatingSystemVersionString());
+ SetString(kWebAppVersionKey, STRINGIZE(VERSION));
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+ Os os = Os::CHROMOTING_LINUX;
+ #elif defined(OS_CHROMEOS)
+ Os os = Os::CHROMOTING_CHROMEOS;
Property changes on: branches/2019Q2/www/chromium/files/patch-remoting_base_chromoting__event.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/2019Q2/www/chromium/files/patch-remoting_client_display_sys__opengl.h
===================================================================
--- branches/2019Q2/www/chromium/files/patch-remoting_client_display_sys__opengl.h (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-remoting_client_display_sys__opengl.h (revision 497959)
@@ -0,0 +1,11 @@
+--- remoting/client/display/sys_opengl.h.orig 2019-03-11 22:01:01 UTC
++++ remoting/client/display/sys_opengl.h
+@@ -9,7 +9,7 @@
+
+ #if defined(OS_IOS)
+ #include <OpenGLES/ES3/gl.h>
+-#elif defined(OS_LINUX)
++#elif defined(OS_LINUX) || defined(OS_BSD)
+ #define GL_GLEXT_PROTOTYPES
+ #include <GL/gl.h>
+ #include <GL/glext.h>
Property changes on: branches/2019Q2/www/chromium/files/patch-remoting_client_display_sys__opengl.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/2019Q2/www/chromium/files/patch-remoting_host_evaluate__capability.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-remoting_host_evaluate__capability.cc (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-remoting_host_evaluate__capability.cc (revision 497959)
@@ -0,0 +1,11 @@
+--- remoting/host/evaluate_capability.cc.orig 2019-03-11 22:01:01 UTC
++++ remoting/host/evaluate_capability.cc
+@@ -50,7 +50,7 @@ base::FilePath BuildHostBinaryPath() {
+ }
+ #endif
+
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+ if (path.BaseName().value() ==
+ FILE_PATH_LITERAL("chrome-remote-desktop-host")) {
+ return path;
Property changes on: branches/2019Q2/www/chromium/files/patch-remoting_host_evaluate__capability.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/2019Q2/www/chromium/files/patch-remoting_host_host__attributes.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-remoting_host_host__attributes.cc (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-remoting_host_host__attributes.cc (revision 497959)
@@ -0,0 +1,11 @@
+--- remoting/host/host_attributes.cc.orig 2019-03-11 22:01:01 UTC
++++ remoting/host/host_attributes.cc
+@@ -123,7 +123,7 @@ std::string GetHostAttributes() {
+ media::InitializeMediaFoundation()) {
+ result.push_back("HWEncoder");
+ }
+-#elif defined(OS_LINUX)
++#elif defined(OS_LINUX) || defined(OS_BSD)
+ result.push_back("HWEncoder");
+ #endif
+
Property changes on: branches/2019Q2/www/chromium/files/patch-remoting_host_host__attributes.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/2019Q2/www/chromium/files/patch-remoting_host_host__details.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-remoting_host_host__details.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-remoting_host_host__details.cc (revision 497959)
@@ -1,11 +1,11 @@
---- remoting/host/host_details.cc.orig 2017-08-03 00:05:16.000000000 +0200
-+++ remoting/host/host_details.cc 2017-08-10 16:20:00.950699000 +0200
-@@ -22,7 +22,7 @@
+--- remoting/host/host_details.cc.orig 2019-03-11 22:01:01 UTC
++++ remoting/host/host_details.cc
+@@ -24,7 +24,7 @@ std::string GetHostOperatingSystemName() {
return "Mac";
#elif defined(OS_CHROMEOS)
return "ChromeOS";
-#elif defined(OS_LINUX)
+#elif defined(OS_LINUX) || defined(OS_BSD)
return "Linux";
#elif defined(OS_ANDROID)
return "Android";
Index: branches/2019Q2/www/chromium/files/patch-remoting_host_it2me_it2me__native__messaging__host__main.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-remoting_host_it2me_it2me__native__messaging__host__main.cc (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-remoting_host_it2me_it2me__native__messaging__host__main.cc (revision 497959)
@@ -0,0 +1,35 @@
+--- remoting/host/it2me/it2me_native_messaging_host_main.cc.orig 2019-03-11 22:01:01 UTC
++++ remoting/host/it2me/it2me_native_messaging_host_main.cc
+@@ -27,12 +27,12 @@
+ #include "remoting/host/resources.h"
+ #include "remoting/host/usage_stats_consent.h"
+
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+ #include <gtk/gtk.h>
+
+ #include "base/linux_util.h"
+ #include "ui/gfx/x/x11.h"
+-#endif // defined(OS_LINUX)
++#endif // defined(OS_LINUX) || defined(OS_BSD)
+
+ #if defined(OS_MACOSX)
+ #include "base/mac/scoped_nsautorelease_pool.h"
+@@ -106,7 +106,7 @@ int It2MeNativeMessagingHostMain(int argc, char** argv
+
+ remoting::LoadResources("");
+
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+ // Required in order for us to run multiple X11 threads.
+ XInitThreads();
+
+@@ -122,7 +122,7 @@ int It2MeNativeMessagingHostMain(int argc, char** argv
+ // Need to prime the host OS version value for linux to prevent IO on the
+ // network thread. base::GetLinuxDistro() caches the result.
+ base::GetLinuxDistro();
+-#endif // OS_LINUX
++#endif // OS_LINUX || OS_BSD
+
+ base::File read_file;
+ base::File write_file;
Property changes on: branches/2019Q2/www/chromium/files/patch-remoting_host_it2me_it2me__native__messaging__host__main.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/2019Q2/www/chromium/files/patch-remoting_host_me2me__desktop__environment.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-remoting_host_me2me__desktop__environment.cc (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-remoting_host_me2me__desktop__environment.cc (revision 497959)
@@ -0,0 +1,11 @@
+--- remoting/host/me2me_desktop_environment.cc.orig 2019-03-11 22:01:01 UTC
++++ remoting/host/me2me_desktop_environment.cc
+@@ -129,7 +129,7 @@ bool Me2MeDesktopEnvironment::InitializeSecurity(
+
+ // Otherwise, if the session is shared with the local user start monitoring
+ // the local input and create the in-session UI.
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+ bool want_user_interface = false;
+ #elif defined(OS_MACOSX)
+ // Don't try to display any UI on top of the system's login screen as this
Property changes on: branches/2019Q2/www/chromium/files/patch-remoting_host_me2me__desktop__environment.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/2019Q2/www/chromium/files/patch-remoting_host_remoting__me2me__host.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-remoting_host_remoting__me2me__host.cc (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-remoting_host_remoting__me2me__host.cc (revision 497959)
@@ -0,0 +1,108 @@
+--- remoting/host/remoting_me2me_host.cc.orig 2019-03-11 22:01:01 UTC
++++ remoting/host/remoting_me2me_host.cc
+@@ -117,13 +117,13 @@
+ #include "remoting/host/mac/permission_utils.h"
+ #endif // defined(OS_MACOSX)
+
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+ #include <gtk/gtk.h>
+ #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 <commctrl.h>
+@@ -158,11 +158,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
+@@ -353,7 +353,7 @@ class HostProcess : public ConfigWatcher::Delegate,
+
+ std::unique_ptr<ChromotingHostContext> 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<CertificateWatcher> cert_watcher_;
+ #endif
+@@ -567,10 +567,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;
+@@ -763,7 +763,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),
+@@ -849,7 +849,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()->
+@@ -858,7 +858,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 =
+@@ -916,7 +916,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.
+@@ -1547,7 +1547,7 @@ void HostProcess::StartHost() {
+ host_->AddExtension(std::make_unique<TestEchoExtension>());
+
+ // TODO(simonmorris): Get the maximum session duration from a policy.
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+ host_->SetMaximumSessionDuration(base::TimeDelta::FromHours(20));
+ #endif
+
+@@ -1719,7 +1719,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.
Property changes on: branches/2019Q2/www/chromium/files/patch-remoting_host_remoting__me2me__host.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/2019Q2/www/chromium/files/patch-remoting_webapp_base_js_platform.js
===================================================================
--- branches/2019Q2/www/chromium/files/patch-remoting_webapp_base_js_platform.js (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-remoting_webapp_base_js_platform.js (revision 497959)
@@ -1,17 +1,17 @@
---- remoting/webapp/base/js/platform.js.orig 2017-08-10 16:21:23.900363000 +0200
-+++ remoting/webapp/base/js/platform.js 2017-08-10 16:24:46.113671000 +0200
-@@ -107,6 +107,14 @@
+--- remoting/webapp/base/js/platform.js.orig 2019-03-11 22:01:01 UTC
++++ remoting/webapp/base/js/platform.js
+@@ -107,6 +107,14 @@ remoting.getSystemInfo = function() {
return result;
}
+ match = new RegExp('FreeBSD ([a-zA-Z0-9_]*)').exec(userAgent);
+ if (match && (match.length >= 2)) {
+ result.osName = remoting.Os.LINUX;
+ result.osVersion = '';
+ result.cpu = match[1];
+ return result;
+ }
+
match = new RegExp('([a-zA-Z]*) Mac OS X ([0-9_]*)').exec(userAgent);
if (match && (match.length >= 3)) {
result.osName = remoting.Os.MAC;
Index: branches/2019Q2/www/chromium/files/patch-sandbox_features.gni
===================================================================
--- branches/2019Q2/www/chromium/files/patch-sandbox_features.gni (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-sandbox_features.gni (revision 497959)
@@ -1,10 +1,10 @@
---- sandbox/features.gni.orig 2017-12-15 02:04:24.000000000 +0100
-+++ sandbox/features.gni 2017-12-24 17:50:45.309732000 +0100
-@@ -12,6 +12,6 @@
+--- sandbox/features.gni.orig 2019-03-11 22:01:01 UTC
++++ sandbox/features.gni
+@@ -12,6 +12,6 @@ use_seccomp_bpf =
(is_linux || is_android) &&
(current_cpu == "x86" || current_cpu == "x64" || current_cpu == "arm" ||
current_cpu == "arm64" || current_cpu == "mipsel" ||
- current_cpu == "mips64el")
+ current_cpu == "mips64el") && !is_bsd
use_seccomp_bpf = use_seccomp_bpf || is_nacl_nonsfi
Index: branches/2019Q2/www/chromium/files/patch-sandbox_linux_BUILD.gn
===================================================================
--- branches/2019Q2/www/chromium/files/patch-sandbox_linux_BUILD.gn (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-sandbox_linux_BUILD.gn (revision 497959)
@@ -1,47 +1,47 @@
---- sandbox/linux/BUILD.gn.orig 2018-08-01 00:08:55.000000000 +0200
-+++ sandbox/linux/BUILD.gn 2018-08-04 20:49:57.663117000 +0200
-@@ -12,12 +12,12 @@
+--- sandbox/linux/BUILD.gn.orig 2019-03-11 22:01:01 UTC
++++ sandbox/linux/BUILD.gn
+@@ -12,12 +12,12 @@ if (is_android) {
}
declare_args() {
- compile_suid_client = is_linux
+ compile_suid_client = is_linux && !is_bsd
- compile_credentials = is_linux
+ compile_credentials = is_linux && !is_bsd
# On Android, use plain GTest.
- use_base_test_suite = is_linux
+ use_base_test_suite = is_linux && !is_bsd
}
if (is_nacl_nonsfi) {
-@@ -399,7 +399,7 @@
+@@ -379,7 +379,7 @@ component("sandbox_services") {
public_deps += [ ":sandbox_services_headers" ]
}
- if (is_nacl_nonsfi) {
+ if (is_nacl_nonsfi || is_bsd) {
cflags = [ "-fgnu-inline-asm" ]
sources -= [
-@@ -407,6 +407,8 @@
+@@ -387,6 +387,8 @@ component("sandbox_services") {
"services/init_process_reaper.h",
"services/scoped_process.cc",
"services/scoped_process.h",
+ "services/syscall_wrappers.cc",
+ "services/syscall_wrappers.h",
"services/yama.cc",
"services/yama.h",
"syscall_broker/broker_channel.cc",
-@@ -425,6 +427,10 @@
+@@ -405,6 +407,10 @@ component("sandbox_services") {
"syscall_broker/broker_process.h",
"syscall_broker/broker_simple_message.cc",
"syscall_broker/broker_simple_message.h",
+ ]
+ sources += [
+ "services/libc_interceptor.cc",
+ "services/libc_interceptor.h",
]
} else if (!is_android) {
sources += [
Index: branches/2019Q2/www/chromium/files/patch-sandbox_linux_services_init__process__reaper.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-sandbox_linux_services_init__process__reaper.cc (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-sandbox_linux_services_init__process__reaper.cc (revision 497959)
@@ -0,0 +1,15 @@
+--- sandbox/linux/services/init_process_reaper.cc.orig 2019-03-11 22:01:01 UTC
++++ sandbox/linux/services/init_process_reaper.cc
+@@ -1,6 +1,7 @@
+ // Copyright 2013 The Chromium Authors. All rights reserved.
+ // Use of this source code is governed by a BSD-style license that can be
+ // found in the LICENSE file.
++#if 0
+
+ #include "sandbox/linux/services/init_process_reaper.h"
+
+@@ -100,3 +101,4 @@ bool CreateInitProcessReaper(base::OnceClosure post_fo
+ }
+
+ } // namespace sandbox.
++#endif
Property changes on: branches/2019Q2/www/chromium/files/patch-sandbox_linux_services_init__process__reaper.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/2019Q2/www/chromium/files/patch-sandbox_linux_services_libc__interceptor.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-sandbox_linux_services_libc__interceptor.cc (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-sandbox_linux_services_libc__interceptor.cc (revision 497959)
@@ -0,0 +1,21 @@
+--- sandbox/linux/services/libc_interceptor.cc.orig 2019-03-11 22:01:01 UTC
++++ sandbox/linux/services/libc_interceptor.cc
+@@ -11,7 +11,9 @@
+ #include <stddef.h>
+ #include <stdint.h>
+ #include <string.h>
++#if !defined(OS_BSD)
+ #include <sys/prctl.h>
++#endif
+ #include <sys/socket.h>
+ #include <sys/types.h>
+ #include <time.h>
+@@ -94,7 +96,7 @@ bool ReadTimeStruct(base::PickleIterator* iter,
+ } else {
+ base::AutoLock lock(g_timezones_lock.Get());
+ auto ret_pair = g_timezones.Get().insert(timezone);
+- output->tm_zone = ret_pair.first->c_str();
++ output->tm_zone = (char *)ret_pair.first->c_str();
+ }
+
+ return true;
Property changes on: branches/2019Q2/www/chromium/files/patch-sandbox_linux_services_libc__interceptor.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/2019Q2/www/chromium/files/patch-services_audio_BUILD.gn
===================================================================
--- branches/2019Q2/www/chromium/files/patch-services_audio_BUILD.gn (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-services_audio_BUILD.gn (revision 497959)
@@ -1,11 +1,11 @@
---- services/audio/BUILD.gn.orig 2018-12-12 22:56:10.000000000 +0100
-+++ services/audio/BUILD.gn 2018-12-29 17:36:28.236514000 +0100
-@@ -104,7 +104,7 @@
+--- services/audio/BUILD.gn.orig 2019-03-11 22:01:01 UTC
++++ services/audio/BUILD.gn
+@@ -106,7 +106,7 @@ source_set("lib") {
"//services/service_manager/sandbox:sandbox",
]
- if (is_linux) {
+ if ((is_linux) && (!is_bsd)) {
sources += [
"audio_sandbox_hook_linux.cc",
"audio_sandbox_hook_linux.h",
Index: branches/2019Q2/www/chromium/files/patch-services_catalog_store.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-services_catalog_store.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-services_catalog_store.cc (revision 497959)
@@ -1,10 +1,10 @@
---- services/catalog/store.cc.orig 2017-09-05 21:05:23.000000000 +0200
-+++ services/catalog/store.cc 2017-09-06 21:21:50.819060000 +0200
-@@ -34,5 +34,7 @@
+--- services/catalog/store.cc.orig 2019-03-11 22:01:01 UTC
++++ services/catalog/store.cc
+@@ -38,5 +38,7 @@ const char Store::kRequiredFilesKey_PlatformValue_MacO
const char Store::kRequiredFilesKey_PlatformValue_Android[] = "android";
// static
const char Store::kRequiredFilesKey_PlatformValue_Fuchsia[] = "fuchsia";
+// static
+const char Store::kRequiredFilesKey_PlatformValue_FreeBSD[] = "freebsd";
} // namespace catalog
Index: branches/2019Q2/www/chromium/files/patch-services_catalog_store.h
===================================================================
--- branches/2019Q2/www/chromium/files/patch-services_catalog_store.h (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-services_catalog_store.h (revision 497959)
@@ -1,10 +1,10 @@
---- services/catalog/store.h.orig 2017-09-05 21:05:23.000000000 +0200
-+++ services/catalog/store.h 2017-09-06 21:16:22.831744000 +0200
-@@ -34,6 +34,7 @@
+--- services/catalog/store.h.orig 2019-03-11 22:01:01 UTC
++++ services/catalog/store.h
+@@ -38,6 +38,7 @@ class Store {
static const char kRequiredFilesKey_PlatformValue_MacOSX[];
static const char kRequiredFilesKey_PlatformValue_Android[];
static const char kRequiredFilesKey_PlatformValue_Fuchsia[];
+ static const char kRequiredFilesKey_PlatformValue_FreeBSD[];
};
} // namespace catalog
Index: branches/2019Q2/www/chromium/files/patch-services_content_simple__browser_simple__browser__service.h
===================================================================
--- branches/2019Q2/www/chromium/files/patch-services_content_simple__browser_simple__browser__service.h (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-services_content_simple__browser_simple__browser__service.h (revision 497959)
@@ -0,0 +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
+@@ -16,7 +16,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
+ // service_manager::Service:
+ void OnStart() override;
+
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+ sk_sp<font_service::FontLoader> font_loader_;
+ #endif
+
Property changes on: branches/2019Q2/www/chromium/files/patch-services_content_simple__browser_simple__browser__service.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/2019Q2/www/chromium/files/patch-services_device_device__service.h
===================================================================
--- branches/2019Q2/www/chromium/files/patch-services_device_device__service.h (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-services_device_device__service.h (revision 497959)
@@ -0,0 +1,11 @@
+--- services/device/device_service.h.orig 2019-03-17 14:44:04 UTC
++++ services/device/device_service.h
+@@ -198,7 +198,7 @@ class DeviceService : public service_manager::Service
+ #endif
+
+ #if (defined(OS_LINUX) && defined(USE_UDEV)) || defined(OS_WIN) || \
+- defined(OS_MACOSX)
++ defined(OS_MACOSX) || defined(OS_BSD)
+ // Requests for the SerialPortManager interface must be bound to
+ // |serial_port_manager_| on |serial_port_manager_task_runner_| and it will
+ // be destroyed on that sequence.
Property changes on: branches/2019Q2/www/chromium/files/patch-services_device_device__service.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/2019Q2/www/chromium/files/patch-services_device_geolocation_location__arbitrator.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-services_device_geolocation_location__arbitrator.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-services_device_geolocation_location__arbitrator.cc (revision 497959)
@@ -1,11 +1,11 @@
---- services/device/geolocation/location_arbitrator.cc.orig 2018-12-13 22:21:38.804321000 +0100
-+++ services/device/geolocation/location_arbitrator.cc 2018-12-13 22:22:16.348629000 +0100
-@@ -164,7 +164,7 @@
+--- services/device/geolocation/location_arbitrator.cc.orig 2019-03-11 22:01:01 UTC
++++ services/device/geolocation/location_arbitrator.cc
+@@ -164,7 +164,7 @@ LocationArbitrator::NewNetworkLocationProvider(
std::unique_ptr<LocationProvider>
LocationArbitrator::NewSystemLocationProvider() {
#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \
- defined(OS_FUCHSIA)
+ defined(OS_FUCHSIA) || defined(OS_BSD)
return nullptr;
#else
return device::NewSystemLocationProvider();
Index: branches/2019Q2/www/chromium/files/patch-services_device_hid_BUILD.gn
===================================================================
--- branches/2019Q2/www/chromium/files/patch-services_device_hid_BUILD.gn (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-services_device_hid_BUILD.gn (revision 497959)
@@ -1,22 +1,22 @@
---- services/device/hid/BUILD.gn.orig 2018-03-04 02:07:03.748216000 +0100
-+++ services/device/hid/BUILD.gn 2018-03-04 02:10:30.278997000 +0100
-@@ -52,6 +52,19 @@
+--- services/device/hid/BUILD.gn.orig 2019-03-11 22:01:01 UTC
++++ services/device/hid/BUILD.gn
+@@ -51,6 +51,19 @@ source_set("hid") {
deps += [ "//device/udev_linux" ]
}
+ if (is_bsd) {
+ sources -= [
+ "hid_connection_linux.cc",
+ "hid_connection_linux.h",
+ ]
+ sources += [
+ "hid_connection_freebsd.cc",
+ "hid_connection_freebsd.h",
+ "hid_service_freebsd.cc",
+ "hid_service_freebsd.h",
+ ]
+ }
+
if (is_chromeos) {
- deps += [ "//chromeos" ]
+ deps += [ "//chromeos/dbus" ]
}
Index: branches/2019Q2/www/chromium/files/patch-services_device_hid_hid__service.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-services_device_hid_hid__service.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-services_device_hid_hid__service.cc (revision 497959)
@@ -1,20 +1,20 @@
---- services/device/hid/hid_service.cc.orig 2018-02-24 16:25:18.000000000 +0100
-+++ services/device/hid/hid_service.cc 2018-03-04 05:38:54.425730000 +0100
+--- services/device/hid/hid_service.cc.orig 2019-03-11 22:01:01 UTC
++++ services/device/hid/hid_service.cc
@@ -16,6 +16,8 @@
#if defined(OS_LINUX) && defined(USE_UDEV)
#include "services/device/hid/hid_service_linux.h"
+#elif defined(OS_BSD)
+#include "services/device/hid/hid_service_freebsd.h"
#elif defined(OS_MACOSX)
#include "services/device/hid/hid_service_mac.h"
#elif defined(OS_WIN)
-@@ -36,6 +38,8 @@
+@@ -36,6 +38,8 @@ constexpr base::TaskTraits HidService::kBlockingTaskTr
std::unique_ptr<HidService> HidService::Create() {
#if defined(OS_LINUX) && defined(USE_UDEV)
return base::WrapUnique(new HidServiceLinux());
+#elif defined(OS_BSD)
+ return base::WrapUnique(new HidServiceFreeBSD());
#elif defined(OS_MACOSX)
return base::WrapUnique(new HidServiceMac());
#elif defined(OS_WIN)
Index: branches/2019Q2/www/chromium/files/patch-services_device_hid_hid__service__freebsd.h
===================================================================
--- branches/2019Q2/www/chromium/files/patch-services_device_hid_hid__service__freebsd.h (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-services_device_hid_hid__service__freebsd.h (revision 497959)
@@ -1,51 +1,51 @@
---- services/device/hid/hid_service_freebsd.h.orig 2018-12-27 21:14:54.195603000 +0100
-+++ services/device/hid/hid_service_freebsd.h 2018-12-27 21:14:54.195893000 +0100
+--- services/device/hid/hid_service_freebsd.h.orig 2019-03-17 01:47:14 UTC
++++ services/device/hid/hid_service_freebsd.h
@@ -0,0 +1,48 @@
+// Copyright 2014 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef DEVICE_HID_HID_SERVICE_FREEBSD_H_
+#define DEVICE_HID_HID_SERVICE_FREEBSD_H_
+
+#include <string>
+
+#include "base/macros.h"
+#include "base/memory/ref_counted.h"
+#include "base/memory/weak_ptr.h"
+#include "base/timer/timer.h"
+#include "services/device/hid/hid_service.h"
+#include "net/base/io_buffer.h"
+
+namespace device {
+
+class HidServiceFreeBSD : public HidService {
+ public:
+ HidServiceFreeBSD();
+ ~HidServiceFreeBSD() override;
+
+ void Connect(const std::string& device_guid,
+ const ConnectCallback& connect) override;
+ base::WeakPtr<HidService> GetWeakPtr() override;
+
+ private:
+ struct ConnectParams;
+ class BlockingTaskHelper;
+
+ static void OpenOnBlockingThread(std::unique_ptr<ConnectParams> params);
+ static void FinishOpen(std::unique_ptr<ConnectParams> params);
+ static void CreateConnection(std::unique_ptr<ConnectParams> params);
+
+ const scoped_refptr<base::SequencedTaskRunner> task_runner_;
+ const scoped_refptr<base::SequencedTaskRunner> blocking_task_runner_;
+ // |helper_| lives on the sequence |blocking_task_runner_| posts to and holds
+ // a weak reference back to the service that owns it.
+ std::unique_ptr<BlockingTaskHelper> helper_;
+ base::WeakPtrFactory<HidServiceFreeBSD> weak_factory_;
+
+ DISALLOW_COPY_AND_ASSIGN(HidServiceFreeBSD);
+};
+
+} // namespace device
+
+#endif // DEVICE_HID_HID_SERVICE_FREEBSD_H_
Index: branches/2019Q2/www/chromium/files/patch-services_device_serial_BUILD.gn
===================================================================
--- branches/2019Q2/www/chromium/files/patch-services_device_serial_BUILD.gn (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-services_device_serial_BUILD.gn (revision 497959)
@@ -0,0 +1,11 @@
+--- services/device/serial/BUILD.gn.orig 2019-03-11 22:01:01 UTC
++++ services/device/serial/BUILD.gn
+@@ -4,7 +4,7 @@
+
+ import("//build/config/features.gni")
+
+-if (is_win || (is_linux && use_udev) || is_mac) {
++if (is_win || (is_linux && use_udev) || is_mac || is_bsd) {
+ config("platform_support") {
+ visibility = [ ":serial" ]
+ if (is_win) {
Property changes on: branches/2019Q2/www/chromium/files/patch-services_device_serial_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/2019Q2/www/chromium/files/patch-services_device_serial_serial__io__handler__posix.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-services_device_serial_serial__io__handler__posix.cc (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-services_device_serial_serial__io__handler__posix.cc (revision 497959)
@@ -0,0 +1,11 @@
+--- services/device/serial/serial_io_handler_posix.cc.orig 2019-03-11 22:01:01 UTC
++++ services/device/serial/serial_io_handler_posix.cc
+@@ -65,7 +65,7 @@ bool BitrateToSpeedConstant(int bitrate, speed_t* spee
+ BITRATE_TO_SPEED_CASE(9600)
+ BITRATE_TO_SPEED_CASE(19200)
+ BITRATE_TO_SPEED_CASE(38400)
+-#if !defined(OS_MACOSX)
++#if !defined(OS_MACOSX) && !defined(OS_BSD)
+ BITRATE_TO_SPEED_CASE(57600)
+ BITRATE_TO_SPEED_CASE(115200)
+ BITRATE_TO_SPEED_CASE(230400)
Property changes on: branches/2019Q2/www/chromium/files/patch-services_device_serial_serial__io__handler__posix.cc
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: branches/2019Q2/www/chromium/files/patch-services_device_time__zone__monitor_time__zone__monitor.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-services_device_time__zone__monitor_time__zone__monitor.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-services_device_time__zone__monitor_time__zone__monitor.cc (revision 497959)
@@ -1,20 +1,20 @@
---- services/device/time_zone_monitor/time_zone_monitor.cc.orig 2018-12-12 22:56:10.000000000 +0100
-+++ services/device/time_zone_monitor/time_zone_monitor.cc 2019-01-10 00:38:41.654967000 +0100
-@@ -29,7 +29,7 @@
+--- services/device/time_zone_monitor/time_zone_monitor.cc.orig 2019-03-11 22:01:01 UTC
++++ services/device/time_zone_monitor/time_zone_monitor.cc
+@@ -29,7 +29,7 @@ void TimeZoneMonitor::Bind(device::mojom::TimeZoneMoni
void TimeZoneMonitor::NotifyClients() {
DCHECK(thread_checker_.CalledOnValidThread());
-#if defined(OS_CHROMEOS) || (defined(OS_LINUX) && defined(IS_CHROMECAST))
+#if defined(OS_CHROMEOS) || ((defined(OS_BSD) || defined(OS_LINUX)) && defined(IS_CHROMECAST))
// On CrOS (and Chromecast), ICU's default tz is already set to a new zone. No
// need to redetect it with detectHostTimeZone().
std::unique_ptr<icu::TimeZone> new_zone(icu::TimeZone::createDefault());
-@@ -41,7 +41,7 @@
+@@ -41,7 +41,7 @@ void TimeZoneMonitor::NotifyClients() {
#else
std::unique_ptr<icu::TimeZone> new_zone(icu::TimeZone::detectHostTimeZone());
#endif
-#if defined(OS_LINUX) && !defined(IS_CHROMECAST)
+#if (defined(OS_LINUX) && !defined(IS_CHROMECAST)) || defined(OS_BSD)
// We get here multiple times on Linux per a single tz change, but
// want to update the ICU default zone and notify renderer only once.
std::unique_ptr<icu::TimeZone> current_zone(icu::TimeZone::createDefault());
Index: branches/2019Q2/www/chromium/files/patch-services_device_time__zone__monitor_time__zone__monitor__linux.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-services_device_time__zone__monitor_time__zone__monitor__linux.cc (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-services_device_time__zone__monitor_time__zone__monitor__linux.cc (revision 497959)
@@ -0,0 +1,14 @@
+--- services/device/time_zone_monitor/time_zone_monitor_linux.cc.orig 2019-03-11 22:01:01 UTC
++++ services/device/time_zone_monitor/time_zone_monitor_linux.cc
+@@ -104,7 +104,11 @@ class TimeZoneMonitorLinuxImpl
+ // false positives are harmless, assuming the false positive rate is
+ // reasonable.
+ const char* const kFilesToWatch[] = {
++#if defined(OS_BSD)
++ "/etc/localtime",
++#else
+ "/etc/localtime", "/etc/timezone", "/etc/TZ",
++#endif
+ };
+ for (size_t index = 0; index < base::size(kFilesToWatch); ++index) {
+ file_path_watchers_.push_back(std::make_unique<base::FilePathWatcher>());
Property changes on: branches/2019Q2/www/chromium/files/patch-services_device_time__zone__monitor_time__zone__monitor__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/2019Q2/www/chromium/files/patch-services_network_BUILD.gn
===================================================================
--- branches/2019Q2/www/chromium/files/patch-services_network_BUILD.gn (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-services_network_BUILD.gn (revision 497959)
@@ -1,10 +1,10 @@
---- services/network/BUILD.gn.orig 2018-08-04 19:29:41.578469000 +0200
-+++ services/network/BUILD.gn 2018-08-04 19:29:55.745503000 +0200
-@@ -138,7 +138,6 @@
+--- services/network/BUILD.gn.orig 2019-03-11 22:01:01 UTC
++++ services/network/BUILD.gn
+@@ -248,7 +248,6 @@ jumbo_component("network_service") {
if (is_linux) {
deps += [
- "//sandbox/linux:sandbox_services",
"//services/service_manager/sandbox:sandbox",
]
}
Index: branches/2019Q2/www/chromium/files/patch-services_network_network__context.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-services_network_network__context.cc (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-services_network_network__context.cc (revision 497959)
@@ -0,0 +1,38 @@
+--- services/network/network_context.cc.orig 2019-03-11 22:01:01 UTC
++++ services/network/network_context.cc
+@@ -132,7 +132,7 @@
+ #endif // defined(USE_NSS_CERTS)
+
+ #if defined(OS_ANDROID) || defined(OS_FUCHSIA) || \
+- (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_MACOSX)
++ ((defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)) || defined(OS_MACOSX)
+ #include "net/cert/cert_net_fetcher.h"
+ #include "net/cert_net/cert_net_fetcher_impl.h"
+ #endif
+@@ -610,7 +610,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
+ }
+@@ -1700,7 +1700,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.";
+@@ -2015,7 +2015,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
Property changes on: branches/2019Q2/www/chromium/files/patch-services_network_network__context.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/2019Q2/www/chromium/files/patch-services_network_network__sandbox__hook__linux.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-services_network_network__sandbox__hook__linux.cc (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-services_network_network__sandbox__hook__linux.cc (revision 497959)
@@ -0,0 +1,18 @@
+--- services/network/network_sandbox_hook_linux.cc.orig 2019-03-11 22:01:01 UTC
++++ services/network/network_sandbox_hook_linux.cc
+@@ -14,6 +14,7 @@ using sandbox::syscall_broker::MakeBrokerCommandSet;
+ namespace network {
+
+ bool NetworkPreSandboxHook(service_manager::SandboxLinux::Options options) {
++#if !defined(OS_BSD)
+ auto* instance = service_manager::SandboxLinux::GetInstance();
+
+ // TODO(tsepez): remove universal permission under filesytem root.
+@@ -32,6 +33,7 @@ bool NetworkPreSandboxHook(service_manager::SandboxLin
+ service_manager::SandboxLinux::PreSandboxHook(), options);
+
+ instance->EngageNamespaceSandboxIfPossible();
++#endif // defined(OS_BSD)
+ return true;
+ }
+
Property changes on: branches/2019Q2/www/chromium/files/patch-services_network_network__sandbox__hook__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/2019Q2/www/chromium/files/patch-services_network_network__service.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-services_network_network__service.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-services_network_network__service.cc (revision 497959)
@@ -1,20 +1,20 @@
---- services/network/network_service.cc.orig 2018-12-28 15:43:28.594049000 +0100
-+++ services/network/network_service.cc 2018-12-28 15:46:00.776342000 +0100
-@@ -53,7 +53,7 @@
+--- services/network/network_service.cc.orig 2019-03-21 00:36:59 UTC
++++ services/network/network_service.cc
+@@ -61,7 +61,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
-@@ -449,7 +449,7 @@
- crl_set_distributor_->OnNewCRLSet(crl_set);
+@@ -605,7 +605,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/2019Q2/www/chromium/files/patch-services_network_network__service.h
===================================================================
--- branches/2019Q2/www/chromium/files/patch-services_network_network__service.h (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-services_network_network__service.h (revision 497959)
@@ -1,11 +1,11 @@
---- services/network/network_service.h.orig 2019-01-30 02:18:10.000000000 +0100
-+++ services/network/network_service.h 2019-02-01 10:39:31.949929000 +0100
-@@ -174,7 +174,7 @@
+--- services/network/network_service.h.orig 2019-03-11 22:01:01 UTC
++++ services/network/network_service.h
+@@ -186,7 +186,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkService
#endif // !BUILDFLAG(IS_CT_SUPPORTED)
void UpdateCRLSet(base::span<const uint8_t> 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/2019Q2/www/chromium/files/patch-services_resource__coordinator_public_cpp_memory__instrumentation_os__metrics.h
===================================================================
--- branches/2019Q2/www/chromium/files/patch-services_resource__coordinator_public_cpp_memory__instrumentation_os__metrics.h (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-services_resource__coordinator_public_cpp_memory__instrumentation_os__metrics.h (revision 497959)
@@ -0,0 +1,14 @@
+--- services/resource_coordinator/public/cpp/memory_instrumentation/os_metrics.h.orig 2019-03-11 22:01:02 UTC
++++ services/resource_coordinator/public/cpp/memory_instrumentation/os_metrics.h
+@@ -26,9 +26,9 @@ class COMPONENT_EXPORT(
+ mojom::RawOSMemDump*);
+ static std::vector<mojom::VmRegionPtr> GetProcessMemoryMaps(base::ProcessId);
+
+-#if defined(OS_LINUX) || defined(OS_ANDROID)
++#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD)
+ 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);
Property changes on: branches/2019Q2/www/chromium/files/patch-services_resource__coordinator_public_cpp_memory__instrumentation_os__metrics.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/2019Q2/www/chromium/files/patch-services_resource__coordinator_public_cpp_memory__instrumentation_os__metrics__linux.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-services_resource__coordinator_public_cpp_memory__instrumentation_os__metrics__linux.cc (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-services_resource__coordinator_public_cpp_memory__instrumentation_os__metrics__linux.cc (revision 497959)
@@ -0,0 +1,80 @@
+--- services/resource_coordinator/public/cpp/memory_instrumentation/os_metrics_linux.cc.orig 2019-03-21 01:36:59.000000000 +0100
++++ services/resource_coordinator/public/cpp/memory_instrumentation/os_metrics_linux.cc 2019-03-24 18:58:48.459358000 +0100
+@@ -17,8 +17,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 {
+
+@@ -67,6 +69,7 @@
+
+ ModuleData GetMainModuleData() {
+ ModuleData module_data;
++#if !defined(OS_BSD)
+ Dl_info dl_info;
+ if (dladdr(&__ehdr_start, &dl_info)) {
+ base::Optional<std::string> build_id =
+@@ -76,6 +79,7 @@
+ module_data.build_id = *build_id;
+ }
+ }
++#endif
+ return module_data;
+ }
+
+@@ -123,14 +127,14 @@
+ // 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;
+ }
+@@ -217,6 +221,9 @@
+ // static
+ bool OSMetrics::FillOSMemoryDump(base::ProcessId pid,
+ mojom::RawOSMemDump* dump) {
++#if defined(OS_BSD)
++ return false;
++#else
+ base::ScopedFD autoclose = OpenStatm(pid);
+ int statm_fd = autoclose.get();
+
+@@ -242,10 +249,12 @@
+ dump->resident_set_kb = process_metrics->GetResidentSetSize() / 1024;
+
+ return true;
++#endif
+ }
+
+ // static
+ std::vector<VmRegionPtr> OSMetrics::GetProcessMemoryMaps(base::ProcessId pid) {
++#if defined(OS_BSD)
+ std::vector<VmRegionPtr> maps;
+ uint32_t res = 0;
+ if (g_proc_smaps_for_testing) {
+@@ -263,6 +272,10 @@
+ return std::vector<VmRegionPtr>();
+
+ return maps;
++#else
++ NOTIMPLEMENTED();
++ return std::vector<VmRegionPtr>();
++#endif
+ }
+
+ } // namespace memory_instrumentation
Property changes on: branches/2019Q2/www/chromium/files/patch-services_resource__coordinator_public_cpp_memory__instrumentation_os__metrics__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/2019Q2/www/chromium/files/patch-services_service__manager_embedder_main.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-services_service__manager_embedder_main.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-services_service__manager_embedder_main.cc (revision 497959)
@@ -1,11 +1,11 @@
---- services/service_manager/embedder/main.cc.orig 2019-01-09 13:16:40.515216000 +0100
-+++ services/service_manager/embedder/main.cc 2019-01-09 13:17:09.817906000 +0100
-@@ -331,7 +331,7 @@
+--- services/service_manager/embedder/main.cc.orig 2019-03-11 22:01:02 UTC
++++ services/service_manager/embedder/main.cc
+@@ -320,7 +320,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/2019Q2/www/chromium/files/patch-services_service__manager_embedder_set__process__title__linux.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-services_service__manager_embedder_set__process__title__linux.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-services_service__manager_embedder_set__process__title__linux.cc (revision 497959)
@@ -1,19 +1,19 @@
---- services/service_manager/embedder/set_process_title_linux.cc.orig 2017-06-05 19:03:11 UTC
+--- services/service_manager/embedder/set_process_title_linux.cc.orig 2019-03-11 22:01:02 UTC
+++ services/service_manager/embedder/set_process_title_linux.cc
@@ -49,6 +49,8 @@
extern char** environ;
static char** g_main_argv = NULL;
+
+#if !defined(OS_FREEBSD)
static char* g_orig_argv0 = NULL;
void setproctitle(const char* fmt, ...) {
@@ -101,6 +103,7 @@ void setproctitle(const char* fmt, ...) {
va_end(ap);
g_main_argv[1] = NULL;
}
+#endif
// A version of this built into glibc would not need this function, since
// it could stash the argv pointer in __libc_start_main(). But we need it.
Index: branches/2019Q2/www/chromium/files/patch-services_service__manager_embedder_set__process__title__linux.h
===================================================================
--- branches/2019Q2/www/chromium/files/patch-services_service__manager_embedder_set__process__title__linux.h (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-services_service__manager_embedder_set__process__title__linux.h (revision 497959)
@@ -1,20 +1,20 @@
---- services/service_manager/embedder/set_process_title_linux.h.orig 2017-06-05 19:03:11 UTC
+--- services/service_manager/embedder/set_process_title_linux.h.orig 2019-03-11 22:01:02 UTC
+++ services/service_manager/embedder/set_process_title_linux.h
@@ -5,6 +5,9 @@
#ifndef SERVICES_SERVICE_MANAGER_EMBEDDER_SET_PROCESS_TITLE_LINUX_H_
#define SERVICES_SERVICE_MANAGER_EMBEDDER_SET_PROCESS_TITLE_LINUX_H_
+#include "build/build_config.h"
+
+#if !defined(OS_FREEBSD)
// Set the process title that will show in "ps" and similar tools. Takes
// printf-style format string and arguments. After calling setproctitle()
// the original main() argv[] array should not be used. By default, the
@@ -14,6 +17,7 @@
// This signature and naming is to be compatible with most other Unix
// implementations of setproctitle().
void setproctitle(const char* fmt, ...);
+#endif
// Initialize state needed for setproctitle() on Linux. Pass the argv pointer
// from main() to setproctitle_init() before calling setproctitle().
Index: branches/2019Q2/www/chromium/files/patch-services_service__manager_public_cpp_service__executable_BUILD.gn
===================================================================
--- branches/2019Q2/www/chromium/files/patch-services_service__manager_public_cpp_service__executable_BUILD.gn (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-services_service__manager_public_cpp_service__executable_BUILD.gn (revision 497959)
@@ -0,0 +1,14 @@
+--- services/service_manager/public/cpp/service_executable/BUILD.gn.orig 2019-03-11 22:01:02 UTC
++++ services/service_manager/public/cpp/service_executable/BUILD.gn
+@@ -30,6 +30,11 @@ source_set("support") {
+ "//sandbox/linux:seccomp_bpf",
+ ]
+ }
++ if (is_bsd) {
++ deps -= [
++ "//sandbox/linux:seccomp_bpf"
++ ]
++ }
+ }
+
+ # Service executable targets should link against this to get a boilerplate entry
Property changes on: branches/2019Q2/www/chromium/files/patch-services_service__manager_public_cpp_service__executable_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/2019Q2/www/chromium/files/patch-services_service__manager_runner_host_BUILD.gn
===================================================================
--- branches/2019Q2/www/chromium/files/patch-services_service__manager_runner_host_BUILD.gn (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-services_service__manager_runner_host_BUILD.gn (revision 497959)
@@ -1,11 +1,11 @@
---- services/service_manager/runner/host/BUILD.gn.orig 2018-12-03 21:17:09.000000000 +0100
-+++ services/service_manager/runner/host/BUILD.gn 2018-12-15 14:50:24.143808000 +0100
-@@ -31,7 +31,7 @@
+--- services/service_manager/runner/host/BUILD.gn.orig 2019-03-11 22:01:02 UTC
++++ services/service_manager/runner/host/BUILD.gn
+@@ -30,7 +30,7 @@ source_set("lib") {
"//mojo/public/cpp/system",
]
- if (is_linux) {
+ if (is_linux && !is_bsd) {
deps += [ "//sandbox/linux:sandbox_services" ]
}
Index: branches/2019Q2/www/chromium/files/patch-services_service__manager_sandbox_BUILD.gn
===================================================================
--- branches/2019Q2/www/chromium/files/patch-services_service__manager_sandbox_BUILD.gn (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-services_service__manager_sandbox_BUILD.gn (revision 497959)
@@ -1,11 +1,11 @@
---- services/service_manager/sandbox/BUILD.gn.orig 2018-03-03 20:51:40.189699000 +0100
-+++ services/service_manager/sandbox/BUILD.gn 2018-03-03 20:51:56.739150000 +0100
-@@ -23,7 +23,7 @@
- deps = [
+--- services/service_manager/sandbox/BUILD.gn.orig 2019-03-11 22:01:02 UTC
++++ services/service_manager/sandbox/BUILD.gn
+@@ -28,7 +28,7 @@ component("sandbox") {
"//base",
+ "//sandbox:common",
]
- if (is_linux) {
+ if (is_linux && !is_bsd) {
sources += [
- "linux/bpf_base_policy_linux.cc",
- "linux/bpf_base_policy_linux.h",
+ "linux/bpf_audio_policy_linux.cc",
+ "linux/bpf_audio_policy_linux.h",
Index: branches/2019Q2/www/chromium/files/patch-services_service__manager_sandbox_sandbox__type.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-services_service__manager_sandbox_sandbox__type.cc (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-services_service__manager_sandbox_sandbox__type.cc (revision 497959)
@@ -0,0 +1,11 @@
+--- services/service_manager/sandbox/sandbox_type.cc.orig 2019-03-17 14:36:49 UTC
++++ services/service_manager/sandbox/sandbox_type.cc
+@@ -25,7 +25,7 @@ bool IsUnsandboxedSandboxType(SandboxType sandbox_type
+ service_manager::features::kXRSandbox);
+ #endif
+ case SANDBOX_TYPE_AUDIO:
+-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)
++#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD)
+ return !base::FeatureList::IsEnabled(
+ service_manager::features::kAudioServiceSandbox);
+ #else
Property changes on: branches/2019Q2/www/chromium/files/patch-services_service__manager_sandbox_sandbox__type.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/2019Q2/www/chromium/files/patch-services_service__manager_zygote_common_zygote__features.gni
===================================================================
--- branches/2019Q2/www/chromium/files/patch-services_service__manager_zygote_common_zygote__features.gni (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-services_service__manager_zygote_common_zygote__features.gni (revision 497959)
@@ -0,0 +1,8 @@
+--- services/service_manager/zygote/common/zygote_features.gni.orig 2019-03-11 22:01:02 UTC
++++ services/service_manager/zygote/common/zygote_features.gni
+@@ -2,4 +2,4 @@
+ # Use of this source code is governed by a BSD-style license that can be
+ # found in the LICENSE file.
+
+-use_zygote_handle = is_posix && !is_android && !is_mac
++use_zygote_handle = is_posix && !is_android && !is_mac && !is_bsd
Property changes on: branches/2019Q2/www/chromium/files/patch-services_service__manager_zygote_common_zygote__features.gni
___________________________________________________________________
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/2019Q2/www/chromium/files/patch-services_service__manager_zygote_host_zygote__host__impl__linux.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-services_service__manager_zygote_host_zygote__host__impl__linux.cc (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-services_service__manager_zygote_host_zygote__host__impl__linux.cc (revision 497959)
@@ -0,0 +1,40 @@
+--- services/service_manager/zygote/host/zygote_host_impl_linux.cc.orig 2019-03-11 22:01:02 UTC
++++ services/service_manager/zygote/host/zygote_host_impl_linux.cc
+@@ -72,6 +72,7 @@ ZygoteHostImpl* ZygoteHostImpl::GetInstance() {
+ }
+
+ void ZygoteHostImpl::Init(const base::CommandLine& command_line) {
++#if !defined(OS_BSD)
+ if (command_line.HasSwitch(service_manager::switches::kNoSandbox)) {
+ return;
+ }
+@@ -122,6 +123,7 @@ void ZygoteHostImpl::Init(const base::CommandLine& com
+ "you can try using --"
+ << service_manager::switches::kNoSandbox << ".";
+ }
++#endif
+ }
+
+ void ZygoteHostImpl::AddZygotePid(pid_t pid) {
+@@ -146,6 +148,7 @@ pid_t ZygoteHostImpl::LaunchZygote(
+ base::CommandLine* cmd_line,
+ base::ScopedFD* control_fd,
+ base::FileHandleMappingVector additional_remapped_fds) {
++#if !defined(OS_BSD)
+ int fds[2];
+ CHECK_EQ(0, socketpair(AF_UNIX, SOCK_SEQPACKET, 0, fds));
+ CHECK(base::UnixDomainSocket::EnableReceiveProcessId(fds[0]));
+@@ -210,9 +213,12 @@ pid_t ZygoteHostImpl::LaunchZygote(
+
+ AddZygotePid(pid);
+ return pid;
++#else
++ return 0;
++#endif
+ }
+
+-#if !defined(OS_OPENBSD)
++#if !defined(OS_BSD)
+ void ZygoteHostImpl::AdjustRendererOOMScore(base::ProcessHandle pid,
+ int score) {
+ // 1) You can't change the oom_score_adj of a non-dumpable process
Property changes on: branches/2019Q2/www/chromium/files/patch-services_service__manager_zygote_host_zygote__host__impl__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/2019Q2/www/chromium/files/patch-services_service__manager_zygote_host_zygote__host__impl__linux.h
===================================================================
--- branches/2019Q2/www/chromium/files/patch-services_service__manager_zygote_host_zygote__host__impl__linux.h (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-services_service__manager_zygote_host_zygote__host__impl__linux.h (revision 497959)
@@ -0,0 +1,13 @@
+--- services/service_manager/zygote/host/zygote_host_impl_linux.h.orig 2019-03-11 22:01:02 UTC
++++ services/service_manager/zygote/host/zygote_host_impl_linux.h
+@@ -44,8 +44,10 @@ class COMPONENT_EXPORT(SERVICE_MANAGER_ZYGOTE) ZygoteH
+ base::ScopedFD* control_fd,
+ base::FileHandleMappingVector additional_remapped_fds);
+
++#if !defined(OS_BSD)
+ void AdjustRendererOOMScore(base::ProcessHandle process_handle,
+ int score) override;
++#endif
+ bool HasZygote() { return !zygote_pids_.empty(); }
+
+ private:
Property changes on: branches/2019Q2/www/chromium/files/patch-services_service__manager_zygote_host_zygote__host__impl__linux.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/2019Q2/www/chromium/files/patch-services_service__manager_zygote_zygote__host__linux.h
===================================================================
--- branches/2019Q2/www/chromium/files/patch-services_service__manager_zygote_zygote__host__linux.h (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-services_service__manager_zygote_zygote__host__linux.h (revision 497959)
@@ -0,0 +1,16 @@
+--- services/service_manager/zygote/zygote_host_linux.h.orig 2019-03-11 22:01:02 UTC
++++ services/service_manager/zygote/zygote_host_linux.h
+@@ -30,11 +30,13 @@ class ZygoteHost {
+ // after the first render has been forked.
+ virtual int GetRendererSandboxStatus() const = 0;
+
++#if !defined(OS_BSD)
+ // Adjust the OOM score of the given renderer's PID. The allowed
+ // range for the score is [0, 1000], where higher values are more
+ // likely to be killed by the OOM killer.
+ virtual void AdjustRendererOOMScore(base::ProcessHandle process_handle,
+ int score) = 0;
++#endif
+ };
+
+ } // namespace service_manager
Property changes on: branches/2019Q2/www/chromium/files/patch-services_service__manager_zygote_zygote__host__linux.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/2019Q2/www/chromium/files/patch-services_service__manager_zygote_zygote__linux.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-services_service__manager_zygote_zygote__linux.cc (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-services_service__manager_zygote_zygote__linux.cc (revision 497959)
@@ -0,0 +1,15 @@
+--- services/service_manager/zygote/zygote_linux.cc.orig 2019-03-11 22:01:02 UTC
++++ services/service_manager/zygote/zygote_linux.cc
+@@ -1,6 +1,7 @@
+ // Copyright (c) 2012 The Chromium Authors. All rights reserved.
+ // Use of this source code is governed by a BSD-style license that can be
+ // found in the LICENSE file.
++#if 0
+
+ #include "services/service_manager/zygote/zygote_linux.h"
+
+@@ -664,3 +665,4 @@ bool Zygote::HandleGetSandboxStatus(int fd, base::Pick
+ }
+
+ } // namespace service_manager
++#endif
Property changes on: branches/2019Q2/www/chromium/files/patch-services_service__manager_zygote_zygote__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/2019Q2/www/chromium/files/patch-services_service__manager_zygote_zygote__main__linux.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-services_service__manager_zygote_zygote__main__linux.cc (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-services_service__manager_zygote_zygote__main__linux.cc (revision 497959)
@@ -0,0 +1,48 @@
+--- services/service_manager/zygote/zygote_main_linux.cc.orig 2019-03-11 22:01:02 UTC
++++ services/service_manager/zygote/zygote_main_linux.cc
+@@ -11,7 +11,9 @@
+ #include <stddef.h>
+ #include <stdint.h>
+ #include <string.h>
++#if !defined(OS_BSD)
+ #include <sys/prctl.h>
++#endif
+ #include <sys/socket.h>
+ #include <sys/types.h>
+ #include <unistd.h>
+@@ -101,6 +103,7 @@ static bool CreateInitProcessReaper(
+ // created through the setuid sandbox.
+ static bool EnterSuidSandbox(sandbox::SetuidSandboxClient* setuid_sandbox,
+ base::OnceClosure post_fork_parent_callback) {
++#if !defined(OS_BSD)
+ DCHECK(setuid_sandbox);
+ DCHECK(setuid_sandbox->IsSuidSandboxChild());
+
+@@ -133,6 +136,9 @@ static bool EnterSuidSandbox(sandbox::SetuidSandboxCli
+
+ CHECK(service_manager::SandboxDebugHandling::SetDumpableStatusAndHandlers());
+ return true;
++#else
++ return false;
++#endif
+ }
+
+ static void DropAllCapabilities(int proc_fd) {
+@@ -178,6 +184,7 @@ static void EnterLayerOneSandbox(service_manager::Sand
+
+ bool ZygoteMain(
+ std::vector<std::unique_ptr<ZygoteForkDelegate>> fork_delegates) {
++#if !defined(OS_BSD)
+ sandbox::SetAmZygoteOrRenderer(true, GetSandboxFD());
+
+ auto* linux_sandbox = service_manager::SandboxLinux::GetInstance();
+@@ -240,6 +247,9 @@ bool ZygoteMain(
+
+ // This function call can return multiple times, once per fork().
+ return zygote.ProcessRequests();
++#else
++ return false;
++#endif
+ }
+
+ } // namespace service_manager
Property changes on: branches/2019Q2/www/chromium/files/patch-services_service__manager_zygote_zygote__main__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/2019Q2/www/chromium/files/patch-skia_ext_SkMemory__new__handler.cpp
===================================================================
--- branches/2019Q2/www/chromium/files/patch-skia_ext_SkMemory__new__handler.cpp (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-skia_ext_SkMemory__new__handler.cpp (revision 497959)
@@ -1,20 +1,20 @@
---- skia/ext/SkMemory_new_handler.cpp.orig 2018-03-20 23:05:30.000000000 +0100
-+++ skia/ext/SkMemory_new_handler.cpp 2018-03-24 18:36:03.256042000 +0100
-@@ -69,7 +69,7 @@
+--- skia/ext/SkMemory_new_handler.cpp.orig 2019-03-11 22:01:02 UTC
++++ skia/ext/SkMemory_new_handler.cpp
+@@ -77,7 +77,7 @@ static void* malloc_nothrow(size_t size) {
// TODO(b.kelemen): we should always use UncheckedMalloc but currently it
// doesn't work as intended everywhere.
void* result;
-#if defined(OS_IOS)
+#if defined(OS_IOS) || defined(OS_BSD)
result = malloc(size);
#else
// It's the responsibility of the caller to check the return value.
-@@ -89,7 +89,7 @@
+@@ -97,7 +97,7 @@ static void* calloc_nothrow(size_t size) {
// TODO(b.kelemen): we should always use UncheckedCalloc but currently it
// doesn't work as intended everywhere.
void* result;
-#if defined(OS_IOS)
+#if defined(OS_IOS) || defined(OS_BSD)
result = calloc(1, size);
#else
// It's the responsibility of the caller to check the return value.
Index: branches/2019Q2/www/chromium/files/patch-third__party_angle_BUILD.gn
===================================================================
--- branches/2019Q2/www/chromium/files/patch-third__party_angle_BUILD.gn (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-third__party_angle_BUILD.gn (revision 497959)
@@ -1,21 +1,21 @@
---- third_party/angle/BUILD.gn.orig 2018-12-03 21:20:20.000000000 +0100
-+++ third_party/angle/BUILD.gn 2018-12-15 15:01:55.525312000 +0100
-@@ -283,6 +283,7 @@
+--- third_party/angle/BUILD.gn.orig 2019-03-11 22:07:58 UTC
++++ third_party/angle/BUILD.gn
+@@ -276,6 +276,7 @@ angle_static_library("angle_gpu_info_util") {
"X11",
"Xi",
"Xext",
+ "GL",
]
}
}
-@@ -822,10 +823,6 @@
+@@ -842,10 +843,6 @@ foreach(is_shared_library,
libs = []
if (is_linux) {
sources += util_linux_sources
- libs += [
- "rt",
- "dl",
- ]
}
if (is_mac) {
Index: branches/2019Q2/www/chromium/files/patch-third__party_angle_src_gpu__info__util_SystemInfo__internal.h
===================================================================
--- branches/2019Q2/www/chromium/files/patch-third__party_angle_src_gpu__info__util_SystemInfo__internal.h (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-third__party_angle_src_gpu__info__util_SystemInfo__internal.h (revision 497959)
@@ -0,0 +1,16 @@
+--- third_party/angle/src/gpu_info_util/SystemInfo_internal.h.orig 2019-03-11 22:07:59 UTC
++++ third_party/angle/src/gpu_info_util/SystemInfo_internal.h
+@@ -14,8 +14,13 @@
+ namespace angle
+ {
+
++bool CollectMesaCardInfo(std::vector<GPUDeviceInfo> *devices);
++
+ // Defined in SystemInfo_libpci when GPU_INFO_USE_LIBPCI is defined.
+ bool GetPCIDevicesWithLibPCI(std::vector<GPUDeviceInfo> *devices);
++#if defined(__FreeBSD__)
++bool GetPCIDevicesFreeBSD(std::vector<GPUDeviceInfo> *devices);
++#endif
+ // Defined in SystemInfo_x11 when GPU_INFO_USE_X11 is defined.
+ bool GetNvidiaDriverVersionWithXNVCtrl(std::string *version);
+
Property changes on: branches/2019Q2/www/chromium/files/patch-third__party_angle_src_gpu__info__util_SystemInfo__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/2019Q2/www/chromium/files/patch-third__party_angle_src_gpu__info__util_SystemInfo__libpci.cpp
===================================================================
--- branches/2019Q2/www/chromium/files/patch-third__party_angle_src_gpu__info__util_SystemInfo__libpci.cpp (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-third__party_angle_src_gpu__info__util_SystemInfo__libpci.cpp (revision 497959)
@@ -0,0 +1,90 @@
+--- third_party/angle/src/gpu_info_util/SystemInfo_libpci.cpp.orig 2019-03-11 22:07:59 UTC
++++ third_party/angle/src/gpu_info_util/SystemInfo_libpci.cpp
+@@ -12,6 +12,11 @@
+ #include <pci/pci.h>
+ #include <unistd.h>
+
++#if defined(__FreeBSD__)
++#include <fcntl.h>
++#include <sys/pciio.h>
++#endif
++
+ #include "common/angleutils.h"
+ #include "common/debug.h"
+
+@@ -82,6 +87,75 @@ struct LibPCI : private angle::NonCopyable
+ };
+
+ } // anonymous namespace
++
++#if defined(__FreeBSD__)
++// Adds an entry per PCI GPU found and fills the device and vendor ID.
++bool GetPCIDevicesFreeBSD(std::vector<GPUDeviceInfo> *devices)
++{
++ int fd;
++ struct pci_conf_io conf;
++ struct pci_conf *matches;
++ uint32_t offset = 0;
++
++ fd = open("/dev/pci", O_RDONLY);
++ if (fd < 0)
++ return false;
++
++ matches = new struct pci_conf[32];
++ conf.generation = 0;
++ do {
++ conf.pat_buf_len = 0;
++ conf.num_patterns = 0;
++ conf.patterns = NULL;
++ conf.match_buf_len = 32 * sizeof(struct pci_conf);
++ conf.num_matches = 32;
++ conf.matches = matches;
++ conf.offset = offset;
++ conf.status = PCI_GETCONF_ERROR;
++ if (ioctl(fd, PCIOCGETCONF, &conf) < 0) {
++ if (errno == ENODEV)
++ break;
++ }
++ /* PCI_GETCONF_LIST_CHANGED would require us to start over. */
++ if (conf.status == PCI_GETCONF_ERROR || conf.status == PCI_GETCONF_LIST_CHANGED) {
++ break;
++ }
++
++ for (unsigned int i = 0; i < conf.num_matches; i++) {
++ uint16_t device_class = (matches[i].pc_class << 8) | matches[i].pc_subclass;
++
++ // Skip non-GPU devices
++ switch (device_class)
++ {
++ case PCI_CLASS_DISPLAY_VGA:
++ case PCI_CLASS_DISPLAY_XGA:
++ case PCI_CLASS_DISPLAY_3D:
++ break;
++ default:
++ continue;
++ }
++
++ // Skip unknown devices
++ if (matches[i].pc_vendor == 0 || matches[i].pc_device == 0) {
++ continue;
++ }
++
++ GPUDeviceInfo info;
++ info.vendorId = matches[i].pc_vendor;
++ info.deviceId = matches[i].pc_device;
++
++ devices->push_back(info);
++ }
++ offset += conf.num_matches;
++ } while (conf.status == PCI_GETCONF_MORE_DEVS);
++
++ delete[] matches;
++
++ close(fd);
++
++ return true;
++}
++#endif
+
+ // Adds an entry per PCI GPU found and fills the device and vendor ID.
+ bool GetPCIDevicesWithLibPCI(std::vector<GPUDeviceInfo> *devices)
Property changes on: branches/2019Q2/www/chromium/files/patch-third__party_angle_src_gpu__info__util_SystemInfo__libpci.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/2019Q2/www/chromium/files/patch-third__party_angle_src_gpu__info__util_SystemInfo__linux.cpp
===================================================================
--- branches/2019Q2/www/chromium/files/patch-third__party_angle_src_gpu__info__util_SystemInfo__linux.cpp (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-third__party_angle_src_gpu__info__util_SystemInfo__linux.cpp (revision 497959)
@@ -0,0 +1,21 @@
+--- third_party/angle/src/gpu_info_util/SystemInfo_linux.cpp.orig 2019-03-11 22:07:59 UTC
++++ third_party/angle/src/gpu_info_util/SystemInfo_linux.cpp
+@@ -71,10 +71,18 @@ bool GetPCIDevicesWithLibPCI(std::vector<GPUDeviceInfo
+
+ bool GetSystemInfo(SystemInfo *info)
+ {
++#if defined(__FreeBSD__)
++ if (!CollectMesaCardInfo(&(info->gpus)))
++ {
++ if (!GetPCIDevicesFreeBSD(&(info->gpus)))
++ return false;
++ }
++#else
+ if (!GetPCIDevicesWithLibPCI(&(info->gpus)))
+ {
+ return false;
+ }
++#endif
+
+ if (info->gpus.size() == 0)
+ {
Property changes on: branches/2019Q2/www/chromium/files/patch-third__party_angle_src_gpu__info__util_SystemInfo__linux.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/2019Q2/www/chromium/files/patch-third__party_angle_src_gpu__info__util_SystemInfo__x11.cpp
===================================================================
--- branches/2019Q2/www/chromium/files/patch-third__party_angle_src_gpu__info__util_SystemInfo__x11.cpp (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-third__party_angle_src_gpu__info__util_SystemInfo__x11.cpp (revision 497959)
@@ -0,0 +1,55 @@
+--- third_party/angle/src/gpu_info_util/SystemInfo_x11.cpp.orig 2019-03-11 22:07:59 UTC
++++ third_party/angle/src/gpu_info_util/SystemInfo_x11.cpp
+@@ -8,6 +8,8 @@
+
+ #include "gpu_info_util/SystemInfo_internal.h"
+
++#include <GL/glx.h>
++#include <GL/glxext.h>
+ #include <X11/Xlib.h>
+
+ #include "common/debug.h"
+@@ -18,8 +20,43 @@
+ # error SystemInfo_x11.cpp compiled without GPU_INFO_USE_X11
+ #endif
+
++#define GLX_RENDERER_VENDOR_ID_MESA 0x8183
++#define GLX_RENDERER_DEVICE_ID_MESA 0x8184
++
+ namespace angle
+ {
++
++bool CollectMesaCardInfo(std::vector<GPUDeviceInfo> *devices)
++{
++
++ unsigned int vid[3], did[3];
++
++ Display *display = XOpenDisplay(NULL);
++ if (!display) {
++ return false;
++ }
++
++ PFNGLXQUERYRENDERERINTEGERMESAPROC queryInteger =
++ (PFNGLXQUERYRENDERERINTEGERMESAPROC) glXGetProcAddressARB((const GLubyte *)
++ "glXQueryRendererIntegerMESA");
++
++ if (!queryInteger)
++ return false;
++
++ bool vendor_ret =
++ queryInteger(display, 0, 0, GLX_RENDERER_VENDOR_ID_MESA, vid);
++ bool device_ret =
++ queryInteger(display, 0, 0, GLX_RENDERER_DEVICE_ID_MESA, did);
++
++ if (vendor_ret && device_ret) {
++ GPUDeviceInfo info;
++ info.vendorId = vid[0];
++ info.deviceId = did[0];
++ devices->push_back(info);
++ }
++
++ return true;
++}
+
+ bool GetNvidiaDriverVersionWithXNVCtrl(std::string *version)
+ {
Property changes on: branches/2019Q2/www/chromium/files/patch-third__party_angle_src_gpu__info__util_SystemInfo__x11.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/2019Q2/www/chromium/files/patch-third__party_angle_src_libANGLE_Display.cpp
===================================================================
--- branches/2019Q2/www/chromium/files/patch-third__party_angle_src_libANGLE_Display.cpp (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-third__party_angle_src_libANGLE_Display.cpp (revision 497959)
@@ -1,20 +1,20 @@
---- third_party/angle/src/libANGLE/Display.cpp.orig 2019-01-30 02:20:31.000000000 +0100
-+++ third_party/angle/src/libANGLE/Display.cpp 2019-02-01 11:09:24.980814000 +0100
-@@ -63,7 +63,7 @@
+--- third_party/angle/src/libANGLE/Display.cpp.orig 2019-03-11 22:07:59 UTC
++++ third_party/angle/src/libANGLE/Display.cpp
+@@ -64,7 +64,7 @@
#if defined(ANGLE_ENABLE_VULKAN)
# if defined(ANGLE_PLATFORM_WINDOWS)
# include "libANGLE/renderer/vulkan/win32/DisplayVkWin32.h"
-# elif defined(ANGLE_PLATFORM_LINUX)
+# elif defined(ANGLE_PLATFORM_POSIX)
# include "libANGLE/renderer/vulkan/xcb/DisplayVkXcb.h"
# elif defined(ANGLE_PLATFORM_ANDROID)
# include "libANGLE/renderer/vulkan/android/DisplayVkAndroid.h"
-@@ -215,7 +215,7 @@
+@@ -216,7 +216,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(const Attrib
#if defined(ANGLE_ENABLE_VULKAN)
# if defined(ANGLE_PLATFORM_WINDOWS)
impl = new rx::DisplayVkWin32(state);
-# elif defined(ANGLE_PLATFORM_LINUX)
+# elif defined(ANGLE_PLATFORM_POSIX)
impl = new rx::DisplayVkXcb(state);
# elif defined(ANGLE_PLATFORM_ANDROID)
impl = new rx::DisplayVkAndroid(state);
Index: branches/2019Q2/www/chromium/files/patch-third__party_angle_src_libANGLE_renderer_driver__utils.h
===================================================================
--- branches/2019Q2/www/chromium/files/patch-third__party_angle_src_libANGLE_renderer_driver__utils.h (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-third__party_angle_src_libANGLE_renderer_driver__utils.h (revision 497959)
@@ -0,0 +1,11 @@
+--- third_party/angle/src/libANGLE/renderer/driver_utils.h.orig 2019-03-11 22:07:59 UTC
++++ third_party/angle/src/libANGLE/renderer/driver_utils.h
+@@ -107,7 +107,7 @@ inline bool IsWindows()
+
+ inline bool IsLinux()
+ {
+-#if defined(ANGLE_PLATFORM_LINUX)
++#if defined(ANGLE_PLATFORM_POSIX)
+ return true;
+ #else
+ return false;
Property changes on: branches/2019Q2/www/chromium/files/patch-third__party_angle_src_libANGLE_renderer_driver__utils.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/2019Q2/www/chromium/files/patch-third__party_angle_third__party_vulkan-loader_src_loader_loader.c
===================================================================
--- branches/2019Q2/www/chromium/files/patch-third__party_angle_third__party_vulkan-loader_src_loader_loader.c (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-third__party_angle_third__party_vulkan-loader_src_loader_loader.c (revision 497959)
@@ -1,11 +1,11 @@
---- third_party/angle/third_party/vulkan-loader/src/loader/loader.c.orig 2018-12-15 15:11:13.525509000 +0100
-+++ third_party/angle/third_party/vulkan-loader/src/loader/loader.c 2018-12-15 15:12:11.085519000 +0100
-@@ -215,7 +215,7 @@
+--- third_party/angle/third_party/vulkan-loader/src/loader/loader.c.orig 2019-03-11 22:08:05 UTC
++++ third_party/angle/third_party/vulkan-loader/src/loader/loader.c
+@@ -215,7 +215,7 @@ void *loader_device_heap_realloc(const struct loader_d
}
// Environment variables
-#if defined(__linux__) || defined(__APPLE__)
+#if defined(__linux__) || defined(__APPLE__) || defined(__FreeBSD__)
static inline char *loader_getenv(const char *name, const struct loader_instance *inst) {
// No allocation of memory necessary for Linux, but we should at least touch
Index: branches/2019Q2/www/chromium/files/patch-third__party_angle_third__party_vulkan-loader_src_loader_vk__loader__platform.h
===================================================================
--- branches/2019Q2/www/chromium/files/patch-third__party_angle_third__party_vulkan-loader_src_loader_vk__loader__platform.h (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-third__party_angle_third__party_vulkan-loader_src_loader_vk__loader__platform.h (revision 497959)
@@ -1,11 +1,11 @@
---- third_party/angle/third_party/vulkan-loader/src/loader/vk_loader_platform.h.orig 2018-12-15 15:17:52.636531000 +0100
-+++ third_party/angle/third_party/vulkan-loader/src/loader/vk_loader_platform.h 2018-12-15 15:18:37.634423000 +0100
+--- third_party/angle/third_party/vulkan-loader/src/loader/vk_loader_platform.h.orig 2019-03-11 22:08:05 UTC
++++ third_party/angle/third_party/vulkan-loader/src/loader/vk_loader_platform.h
@@ -31,7 +31,7 @@
#include "vulkan/vk_platform.h"
#include "vulkan/vk_sdk_platform.h"
-#if defined(__linux__) || defined(__APPLE__)
+#if defined(__linux__) || defined(__APPLE__) || defined(__FreeBSD__)
/* Linux-specific common code: */
// Headers:
Index: branches/2019Q2/www/chromium/files/patch-third__party_angle_third__party_vulkan-validation-layers_src_layers_vk__loader__platform.h
===================================================================
--- branches/2019Q2/www/chromium/files/patch-third__party_angle_third__party_vulkan-validation-layers_src_layers_vk__loader__platform.h (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-third__party_angle_third__party_vulkan-validation-layers_src_layers_vk__loader__platform.h (revision 497959)
@@ -1,11 +1,11 @@
---- third_party/angle/third_party/vulkan-validation-layers/src/layers/vk_loader_platform.h.orig 2018-12-12 23:03:04.000000000 +0100
-+++ third_party/angle/third_party/vulkan-validation-layers/src/layers/vk_loader_platform.h 2018-12-16 00:53:28.074127000 +0100
+--- third_party/angle/third_party/vulkan-validation-layers/src/layers/vk_loader_platform.h.orig 2019-03-11 22:08:06 UTC
++++ third_party/angle/third_party/vulkan-validation-layers/src/layers/vk_loader_platform.h
@@ -31,7 +31,7 @@
#include "vulkan/vk_platform.h"
#include "vulkan/vk_sdk_platform.h"
-#if defined(__linux__) || defined(__APPLE__)
+#if defined(__linux__) || defined(__APPLE__) || defined(__FreeBSD__)
/* Linux-specific common code: */
// Headers:
Index: branches/2019Q2/www/chromium/files/patch-third__party_blink_renderer_core_editing_editing__behavior.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-third__party_blink_renderer_core_editing_editing__behavior.cc (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-third__party_blink_renderer_core_editing_editing__behavior.cc (revision 497959)
@@ -0,0 +1,11 @@
+--- third_party/blink/renderer/core/editing/editing_behavior.cc.orig 2019-03-11 22:01:03 UTC
++++ third_party/blink/renderer/core/editing/editing_behavior.cc
+@@ -270,7 +270,7 @@ bool EditingBehavior::ShouldInsertCharacter(const Keyb
+ // unexpected behaviour
+ if (ch < ' ')
+ return false;
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+ // According to XKB map no keyboard combinations with ctrl key are mapped to
+ // printable characters, however we need the filter as the DomKey/text could
+ // contain printable characters.
Property changes on: branches/2019Q2/www/chromium/files/patch-third__party_blink_renderer_core_editing_editing__behavior.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/2019Q2/www/chromium/files/patch-third__party_blink_renderer_core_html_canvas_canvas__async__blob__creator.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-third__party_blink_renderer_core_html_canvas_canvas__async__blob__creator.cc (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-third__party_blink_renderer_core_html_canvas_canvas__async__blob__creator.cc (revision 497959)
@@ -0,0 +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
+@@ -39,7 +39,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
Property changes on: branches/2019Q2/www/chromium/files/patch-third__party_blink_renderer_core_html_canvas_canvas__async__blob__creator.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/2019Q2/www/chromium/files/patch-third__party_blink_renderer_core_html_forms_internal__popup__menu.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-third__party_blink_renderer_core_html_forms_internal__popup__menu.cc (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-third__party_blink_renderer_core_html_forms_internal__popup__menu.cc (revision 497959)
@@ -0,0 +1,11 @@
+--- third_party/blink/renderer/core/html/forms/internal_popup_menu.cc.orig 2019-03-11 22:01:03 UTC
++++ third_party/blink/renderer/core/html/forms/internal_popup_menu.cc
+@@ -127,7 +127,7 @@ class InternalPopupMenu::ItemIterationContext {
+ is_in_group_(false),
+ buffer_(buffer) {
+ DCHECK(buffer_);
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+ // On other platforms, the <option> background color is the same as the
+ // <select> background color. On Linux, that makes the <option>
+ // background color very dark, so by default, try to use a lighter
Property changes on: branches/2019Q2/www/chromium/files/patch-third__party_blink_renderer_core_html_forms_internal__popup__menu.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/2019Q2/www/chromium/files/patch-third__party_blink_renderer_core_inspector_inspector__memory__agent.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-third__party_blink_renderer_core_inspector_inspector__memory__agent.cc (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-third__party_blink_renderer_core_inspector_inspector__memory__agent.cc (revision 497959)
@@ -0,0 +1,11 @@
+--- third_party/blink/renderer/core/inspector/inspector_memory_agent.cc.orig 2019-03-11 22:01:03 UTC
++++ third_party/blink/renderer/core/inspector/inspector_memory_agent.cc
+@@ -171,7 +171,7 @@ InspectorMemoryAgent::GetSamplingProfileById(uint32_t
+
+ std::vector<std::string> InspectorMemoryAgent::Symbolize(
+ const std::vector<void*>& addresses) {
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+ // TODO(alph): Move symbolization to the client.
+ std::vector<void*> addresses_to_symbolize;
+ for (void* address : addresses) {
Property changes on: branches/2019Q2/www/chromium/files/patch-third__party_blink_renderer_core_inspector_inspector__memory__agent.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/2019Q2/www/chromium/files/patch-third__party_blink_renderer_core_layout_layout__view.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-third__party_blink_renderer_core_layout_layout__view.cc (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-third__party_blink_renderer_core_layout_layout__view.cc (revision 497959)
@@ -0,0 +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
+@@ -58,7 +58,7 @@
+ #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
Property changes on: branches/2019Q2/www/chromium/files/patch-third__party_blink_renderer_core_layout_layout__view.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/2019Q2/www/chromium/files/patch-third__party_blink_renderer_core_paint_paint__layer.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-third__party_blink_renderer_core_paint_paint__layer.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-third__party_blink_renderer_core_paint_paint__layer.cc (revision 497959)
@@ -1,11 +1,11 @@
---- third_party/blink/renderer/core/paint/paint_layer.cc.orig 2019-02-06 23:36:21.401100000 +0100
-+++ third_party/blink/renderer/core/paint/paint_layer.cc 2019-02-06 23:38:08.649536000 +0100
-@@ -104,7 +104,7 @@
+--- third_party/blink/renderer/core/paint/paint_layer.cc.orig 2019-03-11 22:01:03 UTC
++++ third_party/blink/renderer/core/paint/paint_layer.cc
+@@ -104,7 +104,7 @@ namespace {
static CompositingQueryMode g_compositing_query_mode =
kCompositingQueriesAreOnlyAllowedInCertainDocumentLifecyclePhases;
-#ifdef OS_LINUX
+#if defined(OS_LINUX) || defined(OS_BSD)
struct SameSizeAsPaintLayer : DisplayItemClient {
// The bit fields may fit into the machine word of DisplayItemClient which
// has only 8-bit data.
Index: branches/2019Q2/www/chromium/files/patch-third__party_blink_renderer_core_scroll_scrollbar__theme__aura.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-third__party_blink_renderer_core_scroll_scrollbar__theme__aura.cc (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-third__party_blink_renderer_core_scroll_scrollbar__theme__aura.cc (revision 497959)
@@ -0,0 +1,11 @@
+--- third_party/blink/renderer/core/scroll/scrollbar_theme_aura.cc.orig 2019-03-11 22:01:03 UTC
++++ third_party/blink/renderer/core/scroll/scrollbar_theme_aura.cc
+@@ -332,7 +332,7 @@ ScrollbarPart ScrollbarThemeAura::InvalidateOnThumbPos
+
+ bool ScrollbarThemeAura::ShouldCenterOnThumb(const Scrollbar& scrollbar,
+ const WebMouseEvent& event) {
+-#if (defined(OS_LINUX) && !defined(OS_CHROMEOS))
++#if ((defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS))
+ if (event.button == WebPointerProperties::Button::kMiddle)
+ return true;
+ #endif
Property changes on: branches/2019Q2/www/chromium/files/patch-third__party_blink_renderer_core_scroll_scrollbar__theme__aura.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/2019Q2/www/chromium/files/patch-third__party_blink_renderer_platform_BUILD.gn
===================================================================
--- branches/2019Q2/www/chromium/files/patch-third__party_blink_renderer_platform_BUILD.gn (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-third__party_blink_renderer_platform_BUILD.gn (revision 497959)
@@ -0,0 +1,10 @@
+--- third_party/blink/renderer/platform/BUILD.gn.orig 2019-03-11 22:01:04 UTC
++++ third_party/blink/renderer/platform/BUILD.gn
+@@ -129,6 +129,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",
Property changes on: branches/2019Q2/www/chromium/files/patch-third__party_blink_renderer_platform_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/2019Q2/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.cc (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.cc (revision 497959)
@@ -0,0 +1,20 @@
+--- third_party/blink/renderer/platform/fonts/font_cache.cc.orig 2019-03-11 22:01:04 UTC
++++ third_party/blink/renderer/platform/fonts/font_cache.cc
+@@ -66,7 +66,7 @@ namespace blink {
+
+ 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
+
+@@ -89,7 +89,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
Property changes on: branches/2019Q2/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.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/2019Q2/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.h
===================================================================
--- branches/2019Q2/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.h (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.h (revision 497959)
@@ -0,0 +1,53 @@
+--- third_party/blink/renderer/platform/fonts/font_cache.h.orig 2019-03-11 22:01:04 UTC
++++ third_party/blink/renderer/platform/fonts/font_cache.h
+@@ -157,7 +157,7 @@ class PLATFORM_EXPORT FontCache {
+ sk_sp<SkFontMgr> FontManager() { return font_manager_; }
+ static void SetFontManager(sk_sp<SkFontMgr>);
+
+-#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_; }
+@@ -218,7 +218,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;
+@@ -230,7 +230,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<SimpleFontData> FontDataFromFontPlatformData(
+ const FontPlatformData*,
+@@ -294,12 +294,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)
+ 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)
+
+ scoped_refptr<SimpleFontData> FallbackOnStandardFontStyle(const FontDescription&,
+ UChar32);
+@@ -330,7 +330,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
+
Property changes on: branches/2019Q2/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.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/2019Q2/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__description.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__description.cc (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__description.cc (revision 497959)
@@ -0,0 +1,20 @@
+--- third_party/blink/renderer/platform/fonts/font_description.cc.orig 2019-03-11 22:01:04 UTC
++++ third_party/blink/renderer/platform/fonts/font_description.cc
+@@ -38,7 +38,7 @@
+ #include "third_party/blink/renderer/platform/wtf/text/atomic_string_hash.h"
+ #include "third_party/blink/renderer/platform/wtf/text/string_hash.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
+
+@@ -223,7 +223,7 @@ FontCacheKey FontDescription::CacheKey(
+ static_cast<unsigned>(fields_.orientation_) << 1 | // bit 2-3
+ static_cast<unsigned>(fields_.subpixel_text_position_); // bit 1
+
+-#if defined(OS_LINUX) || defined(OS_CHROMEOS)
++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
+ float device_scale_factor_for_key = FontCache::DeviceScaleFactor();
+ #else
+ float device_scale_factor_for_key = 1.0f;
Property changes on: branches/2019Q2/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__description.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/2019Q2/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__metrics.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__metrics.cc (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__metrics.cc (revision 497959)
@@ -0,0 +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
+@@ -39,7 +39,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(
+ 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(
+ 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
Property changes on: branches/2019Q2/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__metrics.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/2019Q2/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__unique__name__lookup.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__unique__name__lookup.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__unique__name__lookup.cc (revision 497959)
@@ -1,20 +1,20 @@
---- third_party/blink/renderer/platform/fonts/font_unique_name_lookup.cc.orig 2019-02-04 23:35:56.748592000 +0100
-+++ third_party/blink/renderer/platform/fonts/font_unique_name_lookup.cc 2019-02-04 23:36:16.158548000 +0100
-@@ -8,7 +8,7 @@
-
+--- third_party/blink/renderer/platform/fonts/font_unique_name_lookup.cc.orig 2019-03-11 22:01:04 UTC
++++ third_party/blink/renderer/platform/fonts/font_unique_name_lookup.cc
+@@ -10,7 +10,7 @@
#if defined(OS_ANDROID)
+ #include "third_party/blink/public/platform/modules/font_unique_name_lookup/font_unique_name_lookup.mojom-blink.h"
#include "third_party/blink/renderer/platform/fonts/android/font_unique_name_lookup_android.h"
-#elif defined(OS_LINUX)
+#elif defined(OS_LINUX) || defined(OS_BSD)
#include "third_party/blink/renderer/platform/fonts/linux/font_unique_name_lookup_linux.h"
- #endif
-
-@@ -21,7 +21,7 @@
+ #elif defined(OS_WIN)
+ #include "third_party/blink/public/mojom/dwrite_font_proxy/dwrite_font_proxy.mojom-blink.h"
+@@ -26,7 +26,7 @@ std::unique_ptr<FontUniqueNameLookup>
FontUniqueNameLookup::GetPlatformUniqueNameLookup() {
#if defined(OS_ANDROID)
return std::make_unique<FontUniqueNameLookupAndroid>();
-#elif defined(OS_LINUX)
+#elif defined(OS_LINUX) || defined(OS_BSD)
return std::make_unique<FontUniqueNameLookupLinux>();
- #else
- NOTREACHED();
+ #elif defined(OS_WIN)
+ return std::make_unique<FontUniqueNameLookupWin>();
Index: branches/2019Q2/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_skia_font__cache__skia.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_skia_font__cache__skia.cc (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_skia_font__cache__skia.cc (revision 497959)
@@ -0,0 +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
+@@ -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(
+ 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)
+
+ void FontCache::PlatformInit() {}
+
+@@ -249,7 +249,7 @@ sk_sp<SkTypeface> 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<FontPlatformData> FontCache::CreateFon
+ CString name;
+
+ sk_sp<SkTypeface> 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);
Property changes on: branches/2019Q2/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_skia_font__cache__skia.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/2019Q2/www/chromium/files/patch-third__party_blink_renderer_platform_heap_stack__frame__depth.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-third__party_blink_renderer_platform_heap_stack__frame__depth.cc (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-third__party_blink_renderer_platform_heap_stack__frame__depth.cc (revision 497959)
@@ -0,0 +1,14 @@
+--- third_party/blink/renderer/platform/heap/stack_frame_depth.cc.orig 2019-03-11 22:01:04 UTC
++++ third_party/blink/renderer/platform/heap/stack_frame_depth.cc
+@@ -15,6 +15,11 @@
+ extern "C" void* __libc_stack_end; // NOLINT
+ #endif
+
++#if defined(OS_FREEBSD)
++#include <sys/signal.h>
++#include <pthread_np.h>
++#endif
++
+ namespace blink {
+
+ static const char* g_avoid_optimization = nullptr;
Property changes on: branches/2019Q2/www/chromium/files/patch-third__party_blink_renderer_platform_heap_stack__frame__depth.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/2019Q2/www/chromium/files/patch-third__party_blink_renderer_platform_wtf_BUILD.gn
===================================================================
--- branches/2019Q2/www/chromium/files/patch-third__party_blink_renderer_platform_wtf_BUILD.gn (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-third__party_blink_renderer_platform_wtf_BUILD.gn (revision 497959)
@@ -0,0 +1,16 @@
+--- third_party/blink/renderer/platform/wtf/BUILD.gn.orig 2019-03-11 22:01:04 UTC
++++ third_party/blink/renderer/platform/wtf/BUILD.gn
+@@ -267,8 +267,12 @@ jumbo_component("wtf") {
+ if (is_android) {
+ libs = [ "log" ]
+ }
+- if (is_linux) {
++ if (is_linux && !is_bsd) {
+ libs = [ "dl" ]
++ }
++
++ if (is_bsd) {
++ libs = [ "execinfo" ]
+ }
+
+ if (is_mac) {
Property changes on: branches/2019Q2/www/chromium/files/patch-third__party_blink_renderer_platform_wtf_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/2019Q2/www/chromium/files/patch-third__party_blink_renderer_platform_wtf_assertions.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-third__party_blink_renderer_platform_wtf_assertions.cc (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-third__party_blink_renderer_platform_wtf_assertions.cc (revision 497959)
@@ -0,0 +1,11 @@
+--- third_party/blink/renderer/platform/wtf/assertions.cc.orig 2019-03-11 22:01:04 UTC
++++ third_party/blink/renderer/platform/wtf/assertions.cc
+@@ -48,7 +48,7 @@
+ #include <windows.h>
+ #endif
+
+-#if defined(OS_MACOSX) || (defined(OS_LINUX) && !defined(__UCLIBC__))
++#if defined(OS_MACOSX) || ((defined(OS_LINUX) || defined(OS_BSD)) && !defined(__UCLIBC__))
+ #include <cxxabi.h>
+ #include <dlfcn.h>
+ #include <execinfo.h>
Property changes on: branches/2019Q2/www/chromium/files/patch-third__party_blink_renderer_platform_wtf_assertions.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/2019Q2/www/chromium/files/patch-third__party_blink_renderer_platform_wtf_container__annotations.h
===================================================================
--- branches/2019Q2/www/chromium/files/patch-third__party_blink_renderer_platform_wtf_container__annotations.h (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-third__party_blink_renderer_platform_wtf_container__annotations.h (revision 497959)
@@ -0,0 +1,11 @@
+--- third_party/blink/renderer/platform/wtf/container_annotations.h.orig 2019-03-11 22:01:04 UTC
++++ third_party/blink/renderer/platform/wtf/container_annotations.h
+@@ -10,7 +10,7 @@
+
+ // TODO(ochang): Remove the ARCH_CPU_X86_64 condition to enable this for X86
+ // once the crashes there have been fixed: http://crbug.com/461406
+-#if defined(ADDRESS_SANITIZER) && defined(OS_LINUX) && defined(ARCH_CPU_X86_64)
++#if defined(ADDRESS_SANITIZER) && (defined(OS_LINUX) || defined(OS_BSD)) && defined(ARCH_CPU_X86_64)
+ #define ANNOTATE_CONTIGUOUS_CONTAINER
+ #define ANNOTATE_NEW_BUFFER(buffer, capacity, newSize) \
+ if (buffer) { \
Property changes on: branches/2019Q2/www/chromium/files/patch-third__party_blink_renderer_platform_wtf_container__annotations.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/2019Q2/www/chromium/files/patch-third__party_blink_renderer_platform_wtf_stack__util.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-third__party_blink_renderer_platform_wtf_stack__util.cc (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-third__party_blink_renderer_platform_wtf_stack__util.cc (revision 497959)
@@ -0,0 +1,14 @@
+--- third_party/blink/renderer/platform/wtf/stack_util.cc.orig 2019-03-11 22:01:04 UTC
++++ third_party/blink/renderer/platform/wtf/stack_util.cc
+@@ -18,6 +18,11 @@
+ extern "C" void* __libc_stack_end; // NOLINT
+ #endif
+
++#if defined(OS_FREEBSD)
++#include <sys/signal.h>
++#include <pthread_np.h>
++#endif
++
+ namespace WTF {
+
+ size_t GetUnderestimatedStackSize() {
Property changes on: branches/2019Q2/www/chromium/files/patch-third__party_blink_renderer_platform_wtf_stack__util.cc
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: branches/2019Q2/www/chromium/files/patch-third__party_blink_renderer_platform_wtf_threading.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-third__party_blink_renderer_platform_wtf_threading.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-third__party_blink_renderer_platform_wtf_threading.cc (revision 497959)
@@ -1,29 +1,29 @@
---- third_party/blink/renderer/platform/wtf/threading.cc.orig 2018-12-15 18:39:29.942481000 +0100
-+++ third_party/blink/renderer/platform/wtf/threading.cc 2018-12-15 18:41:49.286222000 +0100
+--- third_party/blink/renderer/platform/wtf/threading.cc.orig 2019-03-11 22:01:04 UTC
++++ third_party/blink/renderer/platform/wtf/threading.cc
@@ -17,12 +17,16 @@
#error Blink does not support threading on your platform.
#endif
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
#include <sys/syscall.h>
#elif defined(OS_ANDROID)
#include <sys/types.h>
#endif
+#if defined(OS_BSD)
+#include <pthread_np.h>
+#endif
+
namespace WTF {
// Current thread identity
-@@ -38,6 +42,8 @@
+@@ -38,6 +42,8 @@ ThreadIdentifier CurrentThreadSyscall() {
return syscall(__NR_gettid);
#elif defined(OS_ANDROID)
return gettid();
+#elif defined(OS_BSD)
+ return pthread_getthreadid_np();
#else
return reinterpret_cast<uintptr_t>(pthread_self());
#endif
Index: branches/2019Q2/www/chromium/files/patch-third__party_blink_renderer_platform_wtf_threading__pthreads.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-third__party_blink_renderer_platform_wtf_threading__pthreads.cc (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-third__party_blink_renderer_platform_wtf_threading__pthreads.cc (revision 497959)
@@ -0,0 +1,22 @@
+--- third_party/blink/renderer/platform/wtf/threading_pthreads.cc.orig 2019-03-11 22:01:04 UTC
++++ third_party/blink/renderer/platform/wtf/threading_pthreads.cc
+@@ -52,12 +52,17 @@
+ #include <objc/objc-auto.h>
+ #endif
+
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+ #include <sys/syscall.h>
+ #endif
+
+-#if defined(OS_LINUX) || defined(OS_ANDROID)
++#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD)
+ #include <unistd.h>
++#endif
++
++#if defined(OS_BSD)
++#include <sys/signal.h>
++#include <pthread_np.h>
+ #endif
+
+ namespace WTF {
Property changes on: branches/2019Q2/www/chromium/files/patch-third__party_blink_renderer_platform_wtf_threading__pthreads.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/2019Q2/www/chromium/files/patch-third__party_boringssl_BUILD.gn
===================================================================
--- branches/2019Q2/www/chromium/files/patch-third__party_boringssl_BUILD.gn (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-third__party_boringssl_BUILD.gn (revision 497959)
@@ -1,36 +1,36 @@
---- third_party/boringssl/BUILD.gn.orig 2017-09-05 21:05:42.000000000 +0200
-+++ third_party/boringssl/BUILD.gn 2017-09-06 22:45:41.435863000 +0200
-@@ -85,7 +85,7 @@
+--- third_party/boringssl/BUILD.gn.orig 2019-03-11 22:01:15 UTC
++++ third_party/boringssl/BUILD.gn
+@@ -71,7 +71,7 @@ if (is_win && !is_msan && current_cpu != "arm64") {
} else if (current_cpu == "x64") {
if (is_mac) {
sources += crypto_sources_mac_x86_64
- } else if (is_linux || is_android) {
+ } else if (is_linux || is_bsd || is_android) {
sources += crypto_sources_linux_x86_64
} else {
public_configs = [ ":no_asm_config" ]
-@@ -93,13 +93,13 @@
+@@ -79,13 +79,13 @@ if (is_win && !is_msan && current_cpu != "arm64") {
} else if (current_cpu == "x86") {
if (is_mac) {
sources += crypto_sources_mac_x86
- } else if (is_linux || is_android) {
+ } else if (is_linux || is_bsd || is_android) {
sources += crypto_sources_linux_x86
} else {
public_configs = [ ":no_asm_config" ]
}
} else if (current_cpu == "arm") {
- if (is_linux || is_android) {
+ if (is_linux || is_bsd || is_android) {
sources += crypto_sources_linux_arm
} else if (is_ios) {
sources += crypto_sources_ios_arm
-@@ -107,7 +107,7 @@
+@@ -93,7 +93,7 @@ if (is_win && !is_msan && current_cpu != "arm64") {
public_configs = [ ":no_asm_config" ]
}
} else if (current_cpu == "arm64") {
- if (is_linux || is_android) {
+ if (is_linux || is_bsd || is_android) {
sources += crypto_sources_linux_aarch64
} else if (is_ios) {
sources += crypto_sources_ios_aarch64
Index: branches/2019Q2/www/chromium/files/patch-third__party_boringssl_src_crypto_cpu-aarch64-linux.c
===================================================================
--- branches/2019Q2/www/chromium/files/patch-third__party_boringssl_src_crypto_cpu-aarch64-linux.c (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-third__party_boringssl_src_crypto_cpu-aarch64-linux.c (revision 497959)
@@ -1,54 +1,54 @@
---- third_party/boringssl/src/crypto/cpu-aarch64-linux.c.orig 2018-08-08 21:13:09.000000000 +0200
-+++ third_party/boringssl/src/crypto/cpu-aarch64-linux.c 2018-12-02 10:28:41.672362000 +0100
+--- third_party/boringssl/src/crypto/cpu-aarch64-linux.c.orig 2019-03-11 22:07:58 UTC
++++ third_party/boringssl/src/crypto/cpu-aarch64-linux.c
@@ -14,49 +14,7 @@
#include <openssl/cpu.h>
-#if defined(OPENSSL_AARCH64) && defined(OPENSSL_LINUX) && \
- !defined(OPENSSL_STATIC_ARMCAP)
-
-#include <sys/auxv.h>
-
-#include <openssl/arm_arch.h>
-
-#include "internal.h"
-
-
-extern uint32_t OPENSSL_armcap_P;
-
+#ifdef __FreeBSD__
void OPENSSL_cpuid_setup(void) {
- unsigned long hwcap = getauxval(AT_HWCAP);
-
- // See /usr/include/asm/hwcap.h on an aarch64 installation for the source of
- // these values.
- static const unsigned long kNEON = 1 << 1;
- static const unsigned long kAES = 1 << 3;
- static const unsigned long kPMULL = 1 << 4;
- static const unsigned long kSHA1 = 1 << 5;
- static const unsigned long kSHA256 = 1 << 6;
-
- if ((hwcap & kNEON) == 0) {
- // Matching OpenSSL, if NEON is missing, don't report other features
- // either.
- return;
- }
-
- OPENSSL_armcap_P |= ARMV7_NEON;
-
- if (hwcap & kAES) {
- OPENSSL_armcap_P |= ARMV8_AES;
- }
- if (hwcap & kPMULL) {
- OPENSSL_armcap_P |= ARMV8_PMULL;
- }
- if (hwcap & kSHA1) {
- OPENSSL_armcap_P |= ARMV8_SHA1;
- }
- if (hwcap & kSHA256) {
- OPENSSL_armcap_P |= ARMV8_SHA256;
- }
}
-
-#endif // OPENSSL_AARCH64 && !OPENSSL_STATIC_ARMCAP
+#endif
Index: branches/2019Q2/www/chromium/files/patch-third__party_boringssl_src_crypto_ex__data.c
===================================================================
--- branches/2019Q2/www/chromium/files/patch-third__party_boringssl_src_crypto_ex__data.c (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-third__party_boringssl_src_crypto_ex__data.c (revision 497959)
@@ -1,13 +1,13 @@
---- third_party/boringssl/src/crypto/ex_data.c.orig 2017-06-05 19:04:14 UTC
+--- third_party/boringssl/src/crypto/ex_data.c.orig 2019-03-11 22:07:58 UTC
+++ third_party/boringssl/src/crypto/ex_data.c
-@@ -188,7 +188,9 @@ int CRYPTO_set_ex_data(CRYPTO_EX_DATA *ad, int index,
+@@ -186,7 +186,9 @@ int CRYPTO_set_ex_data(CRYPTO_EX_DATA *ad, int index,
}
}
- sk_void_set(ad->sk, index, val);
+ // expression result unused; should this cast be to 'void'?
+ // seems it should, feel free to investigate those #def
+ (void) sk_void_set(ad->sk, index, val);
return 1;
}
Index: branches/2019Q2/www/chromium/files/patch-third__party_breakpad_breakpad_src_common_simple__string__dictionary.h
===================================================================
--- branches/2019Q2/www/chromium/files/patch-third__party_breakpad_breakpad_src_common_simple__string__dictionary.h (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-third__party_breakpad_breakpad_src_common_simple__string__dictionary.h (revision 497959)
@@ -0,0 +1,11 @@
+--- third_party/breakpad/breakpad/src/common/simple_string_dictionary.h.orig 2019-03-11 22:07:58 UTC
++++ third_party/breakpad/breakpad/src/common/simple_string_dictionary.h
+@@ -33,7 +33,7 @@
+ #include <assert.h>
+ #include <string.h>
+
+-#include "common/basictypes.h"
++#include "third_party/breakpad/breakpad/src/common/basictypes.h"
+
+ namespace google_breakpad {
+
Property changes on: branches/2019Q2/www/chromium/files/patch-third__party_breakpad_breakpad_src_common_simple__string__dictionary.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/2019Q2/www/chromium/files/patch-third__party_cacheinvalidation_src_google_cacheinvalidation_include_types.h
===================================================================
--- branches/2019Q2/www/chromium/files/patch-third__party_cacheinvalidation_src_google_cacheinvalidation_include_types.h (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-third__party_cacheinvalidation_src_google_cacheinvalidation_include_types.h (revision 497959)
@@ -1,11 +1,11 @@
---- third_party/cacheinvalidation/src/google/cacheinvalidation/include/types.h.orig 2017-04-19 19:06:51 UTC
+--- third_party/cacheinvalidation/src/google/cacheinvalidation/include/types.h.orig 2019-03-11 22:01:15 UTC
+++ third_party/cacheinvalidation/src/google/cacheinvalidation/include/types.h
@@ -334,6 +334,8 @@ class Status {
*/
PERMANENT_FAILURE
};
+
+ Status() : code_(SUCCESS), message_() {}
/* Creates a new Status object given the code and message. */
Status(Code code, const string& message) : code_(code), message_(message) {}
Index: branches/2019Q2/www/chromium/files/patch-third__party_crashpad_crashpad_build_crashpad__buildconfig.gni
===================================================================
--- branches/2019Q2/www/chromium/files/patch-third__party_crashpad_crashpad_build_crashpad__buildconfig.gni (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-third__party_crashpad_crashpad_build_crashpad__buildconfig.gni (revision 497959)
@@ -0,0 +1,11 @@
+--- third_party/crashpad/crashpad/build/crashpad_buildconfig.gni.orig 2019-03-11 22:01:15 UTC
++++ third_party/crashpad/crashpad/build/crashpad_buildconfig.gni
+@@ -38,7 +38,7 @@ crashpad_is_standalone = crashpad_dependencies == "sta
+ if (crashpad_is_in_chromium) {
+ crashpad_is_mac = is_mac
+ crashpad_is_win = is_win
+- crashpad_is_linux = is_linux
++ crashpad_is_linux = is_linux && !is_bsd
+ crashpad_is_android = is_android
+ crashpad_is_fuchsia = is_fuchsia
+
Property changes on: branches/2019Q2/www/chromium/files/patch-third__party_crashpad_crashpad_build_crashpad__buildconfig.gni
___________________________________________________________________
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/2019Q2/www/chromium/files/patch-third__party_crashpad_crashpad_client_BUILD.gn
===================================================================
--- branches/2019Q2/www/chromium/files/patch-third__party_crashpad_crashpad_client_BUILD.gn (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-third__party_crashpad_crashpad_client_BUILD.gn (revision 497959)
@@ -0,0 +1,15 @@
+--- third_party/crashpad/crashpad/client/BUILD.gn.orig 2019-03-11 22:01:15 UTC
++++ third_party/crashpad/crashpad/client/BUILD.gn
+@@ -71,6 +71,12 @@ static_library("client") {
+ sources += [ "crashpad_client_fuchsia.cc" ]
+ }
+
++ if (crashpad_is_posix) {
++ sources += [
++ "crashpad_client_posix.cc",
++ ]
++ }
++
+ if (crashpad_is_linux || crashpad_is_android || crashpad_is_fuchsia) {
+ sources += [ "crash_report_database_generic.cc" ]
+ }
Property changes on: branches/2019Q2/www/chromium/files/patch-third__party_crashpad_crashpad_client_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/2019Q2/www/chromium/files/patch-third__party_crashpad_crashpad_client_crashpad__client__posix.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-third__party_crashpad_crashpad_client_crashpad__client__posix.cc (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-third__party_crashpad_crashpad_client_crashpad__client__posix.cc (revision 497959)
@@ -0,0 +1,41 @@
+--- third_party/crashpad/crashpad/client/crashpad_client_posix.cc.orig 2019-03-17 01:47:14 UTC
++++ third_party/crashpad/crashpad/client/crashpad_client_posix.cc
+@@ -0,0 +1,38 @@
++// Copyright 2017 The Crashpad Authors. All rights reserved.
++//
++// Licensed under the Apache License, Version 2.0 (the "License");
++// you may not use this file except in compliance with the License.
++// You may obtain a copy of the License at
++//
++// http://www.apache.org/licenses/LICENSE-2.0
++//
++// Unless required by applicable law or agreed to in writing, software
++// distributed under the License is distributed on an "AS IS" BASIS,
++// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
++// See the License for the specific language governing permissions and
++// limitations under the License.
++
++#include "client/crashpad_client.h"
++
++#include "base/logging.h"
++
++namespace crashpad {
++
++CrashpadClient::CrashpadClient() {}
++
++CrashpadClient::~CrashpadClient() {}
++
++bool CrashpadClient::StartHandler(
++ const base::FilePath& handler,
++ const base::FilePath& database,
++ const base::FilePath& metrics_dir,
++ const std::string& url,
++ const std::map<std::string, std::string>& annotations,
++ const std::vector<std::string>& arguments,
++ bool restartable,
++ bool asynchronous_start) {
++ NOTREACHED(); // TODO(scottmg): https://crashpad.chromium.org/bug/196
++ return false;
++}
++
++} // namespace crashpad
Property changes on: branches/2019Q2/www/chromium/files/patch-third__party_crashpad_crashpad_client_crashpad__client__posix.cc
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: branches/2019Q2/www/chromium/files/patch-third__party_crashpad_crashpad_util_misc_address__types.h
===================================================================
--- branches/2019Q2/www/chromium/files/patch-third__party_crashpad_crashpad_util_misc_address__types.h (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-third__party_crashpad_crashpad_util_misc_address__types.h (revision 497959)
@@ -1,20 +1,20 @@
---- third_party/crashpad/crashpad/util/misc/address_types.h.orig 2018-12-12 22:56:23.000000000 +0100
-+++ third_party/crashpad/crashpad/util/misc/address_types.h 2018-12-16 00:59:49.906370000 +0100
+--- third_party/crashpad/crashpad/util/misc/address_types.h.orig 2019-03-11 22:01:15 UTC
++++ third_party/crashpad/crashpad/util/misc/address_types.h
@@ -25,7 +25,7 @@
#include <mach/mach_types.h>
#elif defined(OS_WIN)
#include "util/win/address_types.h"
-#elif defined(OS_LINUX) || defined(OS_ANDROID)
+#elif defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD)
#include "util/linux/address_types.h"
#elif defined(OS_FUCHSIA)
#include <zircon/types.h>
-@@ -55,7 +55,7 @@
+@@ -55,7 +55,7 @@ using VMSize = mach_vm_size_t;
using VMAddress = WinVMAddress;
using VMSize = WinVMSize;
-#elif defined(OS_LINUX) || defined(OS_ANDROID)
+#elif defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD)
using VMAddress = LinuxVMAddress;
using VMSize = LinuxVMSize;
Index: branches/2019Q2/www/chromium/files/patch-third__party_crashpad_crashpad_util_misc_capture__context.h
===================================================================
--- branches/2019Q2/www/chromium/files/patch-third__party_crashpad_crashpad_util_misc_capture__context.h (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-third__party_crashpad_crashpad_util_misc_capture__context.h (revision 497959)
@@ -0,0 +1,20 @@
+--- third_party/crashpad/crashpad/util/misc/capture_context.h.orig 2019-03-11 22:01:15 UTC
++++ third_party/crashpad/crashpad/util/misc/capture_context.h
+@@ -21,7 +21,7 @@
+ #include <mach/mach.h>
+ #elif defined(OS_WIN)
+ #include <windows.h>
+-#elif defined(OS_LINUX) || defined(OS_ANDROID)
++#elif defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD)
+ #include <ucontext.h>
+ #elif defined(OS_FUCHSIA)
+ #include <signal.h>
+@@ -35,7 +35,7 @@ using NativeCPUContext = x86_thread_state;
+ #endif
+ #elif defined(OS_WIN)
+ using NativeCPUContext = CONTEXT;
+-#elif defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FUCHSIA)
++#elif defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FUCHSIA) || defined(OS_BSD)
+ using NativeCPUContext = ucontext_t;
+ #endif // OS_MACOSX
+
Property changes on: branches/2019Q2/www/chromium/files/patch-third__party_crashpad_crashpad_util_misc_capture__context.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/2019Q2/www/chromium/files/patch-third__party_crashpad_crashpad_util_misc_metrics.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-third__party_crashpad_crashpad_util_misc_metrics.cc (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-third__party_crashpad_crashpad_util_misc_metrics.cc (revision 497959)
@@ -0,0 +1,11 @@
+--- third_party/crashpad/crashpad/util/misc/metrics.cc.orig 2019-03-11 22:01:15 UTC
++++ third_party/crashpad/crashpad/util/misc/metrics.cc
+@@ -25,7 +25,7 @@
+ #define METRICS_OS_NAME "Win"
+ #elif defined(OS_ANDROID)
+ #define METRICS_OS_NAME "Android"
+-#elif defined(OS_LINUX)
++#elif defined(OS_LINUX) || defined(OS_BSD)
+ #define METRICS_OS_NAME "Linux"
+ #elif defined(OS_FUCHSIA)
+ #define METRICS_OS_NAME "Fuchsia"
Property changes on: branches/2019Q2/www/chromium/files/patch-third__party_crashpad_crashpad_util_misc_metrics.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/2019Q2/www/chromium/files/patch-third__party_crashpad_crashpad_util_misc_uuid.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-third__party_crashpad_crashpad_util_misc_uuid.cc (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-third__party_crashpad_crashpad_util_misc_uuid.cc (revision 497959)
@@ -0,0 +1,11 @@
+--- third_party/crashpad/crashpad/util/misc/uuid.cc.orig 2019-03-11 22:01:15 UTC
++++ third_party/crashpad/crashpad/util/misc/uuid.cc
+@@ -95,7 +95,7 @@ bool UUID::InitializeWithNew() {
+ InitializeFromBytes(uuid);
+ return true;
+ #elif defined(OS_WIN) || defined(OS_LINUX) || defined(OS_ANDROID) || \
+- defined(OS_FUCHSIA)
++ defined(OS_FUCHSIA) || defined(OS_BSD)
+ // Linux, Android, and Fuchsia do not provide a UUID generator in a
+ // widely-available system library. On Linux and Android, uuid_generate()
+ // from libuuid is not available everywhere.
Property changes on: branches/2019Q2/www/chromium/files/patch-third__party_crashpad_crashpad_util_misc_uuid.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/2019Q2/www/chromium/files/patch-third__party_crashpad_crashpad_util_posix_close__multiple.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-third__party_crashpad_crashpad_util_posix_close__multiple.cc (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-third__party_crashpad_crashpad_util_posix_close__multiple.cc (revision 497959)
@@ -0,0 +1,29 @@
+--- third_party/crashpad/crashpad/util/posix/close_multiple.cc.orig 2019-03-11 22:01:15 UTC
++++ third_party/crashpad/crashpad/util/posix/close_multiple.cc
+@@ -31,7 +31,7 @@
+ #include "util/file/directory_reader.h"
+ #include "util/misc/implicit_cast.h"
+
+-#if defined(OS_MACOSX)
++#if defined(OS_MACOSX) || defined(OS_BSD)
+ #include <sys/sysctl.h>
+ #endif
+
+@@ -72,7 +72,7 @@ void CloseNowOrOnExec(int fd, bool ebadf_ok) {
+ // This is an advantage over looping over all possible file descriptors, because
+ // no attempt needs to be made to close file descriptors that are not open.
+ bool CloseMultipleNowOrOnExecUsingFDDir(int min_fd, int preserve_fd) {
+-#if defined(OS_MACOSX)
++#if defined(OS_MACOSX) || defined(OS_BSD)
+ static constexpr char kFDDir[] = "/dev/fd";
+ #elif defined(OS_LINUX) || defined(OS_ANDROID)
+ static constexpr char kFDDir[] = "/proc/self/fd";
+@@ -146,7 +146,7 @@ void CloseMultipleNowOrOnExec(int fd, int preserve_fd)
+ // while the system is running, but it’s still a better upper bound than the
+ // current RLIMIT_NOFILE value.
+
+-#if defined(OS_MACOSX)
++#if defined(OS_MACOSX) || defined(OS_BSD)
+ // See 10.11.6 xnu-3248.60.10/bsd/kern/kern_resource.c maxfilesperproc,
+ // referenced by dosetrlimit().
+ int oid[] = {CTL_KERN, KERN_MAXFILESPERPROC};
Property changes on: branches/2019Q2/www/chromium/files/patch-third__party_crashpad_crashpad_util_posix_close__multiple.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/2019Q2/www/chromium/files/patch-third__party_crashpad_crashpad_util_posix_drop__privileges.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-third__party_crashpad_crashpad_util_posix_drop__privileges.cc (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-third__party_crashpad_crashpad_util_posix_drop__privileges.cc (revision 497959)
@@ -0,0 +1,11 @@
+--- third_party/crashpad/crashpad/util/posix/drop_privileges.cc.orig 2019-03-11 22:01:15 UTC
++++ third_party/crashpad/crashpad/util/posix/drop_privileges.cc
+@@ -23,7 +23,7 @@ void DropPrivileges() {
+ gid_t gid = getgid();
+ uid_t uid = getuid();
+
+-#if defined(OS_MACOSX)
++#if defined(OS_MACOSX) || defined(OS_BSD)
+ // Based on the POSIX.1-2008 2013 edition documentation for setreuid() and
+ // setregid(), setreuid() and setregid() alone should be sufficient to drop
+ // privileges. The standard specifies that the saved ID should be set to the
Property changes on: branches/2019Q2/www/chromium/files/patch-third__party_crashpad_crashpad_util_posix_drop__privileges.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/2019Q2/www/chromium/files/patch-third__party_crashpad_crashpad_util_posix_signals.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-third__party_crashpad_crashpad_util_posix_signals.cc (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-third__party_crashpad_crashpad_util_posix_signals.cc (revision 497959)
@@ -0,0 +1,40 @@
+--- third_party/crashpad/crashpad/util/posix/signals.cc.orig 2019-03-11 22:01:15 UTC
++++ third_party/crashpad/crashpad/util/posix/signals.cc
+@@ -45,10 +45,10 @@ constexpr int kCrashSignals[] = {
+ #if defined(SIGEMT)
+ SIGEMT,
+ #endif // defined(SIGEMT)
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+ SIGXCPU,
+ SIGXFSZ,
+-#endif // defined(OS_LINUX)
++#endif // defined(OS_LINUX) || defined(OS_BSD)
+ };
+
+ // These are the non-core-generating but terminating signals.
+@@ -85,9 +85,9 @@ constexpr int kTerminateSignals[] = {
+ SIGXCPU,
+ SIGXFSZ,
+ #endif // defined(OS_MACOSX)
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+ SIGIO,
+-#endif // defined(OS_LINUX)
++#endif // defined(OS_LINUX) || defined(OS_BSD)
+ };
+
+ bool InstallHandlers(const std::vector<int>& signals,
+@@ -216,8 +216,12 @@ bool Signals::WillSignalReraiseAutonomously(const sigi
+ // remains. See 10.12.3 xnu-3789.41.3/bsd/kern/kern_sig.c
+ // psignal_internal().
+ (code > 0 &&
++#if defined(SI_ASYNCIO)
+ code != SI_ASYNCIO &&
++#endif
++#if defined(SI_MESGQ)
+ code != SI_MESGQ &&
++#endif
+ code != SI_QUEUE &&
+ code != SI_TIMER &&
+ code != SI_USER &&
Property changes on: branches/2019Q2/www/chromium/files/patch-third__party_crashpad_crashpad_util_posix_signals.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/2019Q2/www/chromium/files/patch-third__party_crashpad_crashpad_util_posix_symbolic__constants__posix.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-third__party_crashpad_crashpad_util_posix_symbolic__constants__posix.cc (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-third__party_crashpad_crashpad_util_posix_symbolic__constants__posix.cc (revision 497959)
@@ -0,0 +1,20 @@
+--- third_party/crashpad/crashpad/util/posix/symbolic_constants_posix.cc.orig 2019-03-11 22:01:15 UTC
++++ third_party/crashpad/crashpad/util/posix/symbolic_constants_posix.cc
+@@ -64,7 +64,7 @@ constexpr const char* kSignalNames[] = {
+ "INFO",
+ "USR1",
+ "USR2",
+-#elif defined(OS_LINUX) || defined(OS_ANDROID)
++#elif defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD)
+ #if defined(ARCH_CPU_MIPS_FAMILY)
+ "HUP",
+ "INT",
+@@ -135,7 +135,7 @@ constexpr const char* kSignalNames[] = {
+ #endif // defined(ARCH_CPU_MIPS_FAMILY)
+ #endif
+ };
+-#if defined(OS_LINUX) || defined(OS_ANDROID)
++#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD)
+ // NSIG is 64 to account for real-time signals.
+ static_assert(base::size(kSignalNames) == 32, "kSignalNames length");
+ #else
Property changes on: branches/2019Q2/www/chromium/files/patch-third__party_crashpad_crashpad_util_posix_symbolic__constants__posix.cc
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: branches/2019Q2/www/chromium/files/patch-third__party_crc32c_src_src_crc32c__arm64__linux__check.h
===================================================================
--- branches/2019Q2/www/chromium/files/patch-third__party_crc32c_src_src_crc32c__arm64__linux__check.h (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-third__party_crc32c_src_src_crc32c__arm64__linux__check.h (revision 497959)
@@ -0,0 +1,19 @@
+--- third_party/crc32c/src/src/crc32c_arm64_linux_check.h.orig 2019-03-11 22:07:59 UTC
++++ third_party/crc32c/src/src/crc32c_arm64_linux_check.h
+@@ -29,6 +29,8 @@ extern "C" unsigned long getauxval(unsigned long type)
+ namespace crc32c {
+
+ inline bool CanUseArm64Linux() {
++return false;
++#if 0
+ #if HAVE_STRONG_GETAUXVAL || HAVE_WEAK_GETAUXVAL
+ // From 'arch/arm64/include/uapi/asm/hwcap.h' in Linux kernel source code.
+ constexpr unsigned long kHWCAP_PMULL = 1 << 4;
+@@ -39,6 +41,7 @@ inline bool CanUseArm64Linux() {
+ #else
+ return false;
+ #endif // HAVE_STRONG_GETAUXVAL || HAVE_WEAK_GETAUXVAL
++#endif
+ }
+
+ } // namespace crc32c
Property changes on: branches/2019Q2/www/chromium/files/patch-third__party_crc32c_src_src_crc32c__arm64__linux__check.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/2019Q2/www/chromium/files/patch-third__party_ffmpeg_libavutil_mem.c
===================================================================
--- branches/2019Q2/www/chromium/files/patch-third__party_ffmpeg_libavutil_mem.c (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-third__party_ffmpeg_libavutil_mem.c (revision 497959)
@@ -1,12 +1,12 @@
---- third_party/ffmpeg/libavutil/mem.c.orig 2017-04-19 19:07:44 UTC
+--- third_party/ffmpeg/libavutil/mem.c.orig 2019-03-11 22:08:00 UTC
+++ third_party/ffmpeg/libavutil/mem.c
@@ -32,9 +32,6 @@
#include <stdint.h>
#include <stdlib.h>
#include <string.h>
-#if HAVE_MALLOC_H
-#include <malloc.h>
-#endif
#include "avassert.h"
#include "avutil.h"
Index: branches/2019Q2/www/chromium/files/patch-third__party_googletest_src_googletest_include_gtest_internal_gtest-port.h
===================================================================
--- branches/2019Q2/www/chromium/files/patch-third__party_googletest_src_googletest_include_gtest_internal_gtest-port.h (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-third__party_googletest_src_googletest_include_gtest_internal_gtest-port.h (revision 497959)
@@ -0,0 +1,11 @@
+--- third_party/googletest/src/googletest/include/gtest/internal/gtest-port.h.orig 2019-03-11 22:08:00 UTC
++++ third_party/googletest/src/googletest/include/gtest/internal/gtest-port.h
+@@ -623,7 +623,7 @@ typedef struct _RTL_CRITICAL_SECTION GTEST_CRITICAL_SE
+ (GTEST_OS_WINDOWS || GTEST_OS_CYGWIN || GTEST_OS_AIX || GTEST_OS_OS2)
+
+ // Determines whether test results can be streamed to a socket.
+-#if GTEST_OS_LINUX
++#if GTEST_OS_LINUX || GTEST_OS_FREEBSD
+ # define GTEST_CAN_STREAM_RESULTS_ 1
+ #endif
+
Property changes on: branches/2019Q2/www/chromium/files/patch-third__party_googletest_src_googletest_include_gtest_internal_gtest-port.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/2019Q2/www/chromium/files/patch-third__party_googletest_src_googletest_src_gtest-port.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-third__party_googletest_src_googletest_src_gtest-port.cc (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-third__party_googletest_src_googletest_src_gtest-port.cc (revision 497959)
@@ -0,0 +1,43 @@
+--- third_party/googletest/src/googletest/src/gtest-port.cc.orig 2019-03-11 22:08:00 UTC
++++ third_party/googletest/src/googletest/src/gtest-port.cc
+@@ -55,6 +55,11 @@
+ # include <mach/vm_map.h>
+ #endif // GTEST_OS_MAC
+
++#if GTEST_OS_FREEBSD
++#include <sys/sysctl.h>
++#include <sys/user.h>
++#endif
++
+ #if GTEST_OS_QNX
+ # include <devctl.h>
+ # include <fcntl.h>
+@@ -129,6 +134,28 @@ size_t GetThreadCount() {
+ } else {
+ return 0;
+ }
++}
++
++#elif GTEST_OS_FREEBSD
++
++#define KP_NLWP(kp) (kp.ki_numthreads)
++
++// Return the number of threads running in the process, or 0 to indicate that
++// we cannot detect it.
++size_t GetThreadCount() {
++ int mib[] = {
++ CTL_KERN,
++ KERN_PROC,
++ KERN_PROC_PID,
++ getpid(),
++ };
++ u_int miblen = sizeof(mib) / sizeof(mib[0]);
++ struct kinfo_proc(info);
++ size_t size = sizeof(info);
++ if (sysctl(mib, miblen, &info, &size, NULL, 0)) {
++ return 0;
++ }
++ return KP_NLWP(info);
+ }
+
+ #elif GTEST_OS_QNX
Property changes on: branches/2019Q2/www/chromium/files/patch-third__party_googletest_src_googletest_src_gtest-port.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/2019Q2/www/chromium/files/patch-third__party_googletest_src_googletest_src_gtest.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-third__party_googletest_src_googletest_src_gtest.cc (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-third__party_googletest_src_googletest_src_gtest.cc (revision 497959)
@@ -0,0 +1,10 @@
+--- third_party/googletest/src/googletest/src/gtest.cc.orig 2019-03-11 22:08:00 UTC
++++ third_party/googletest/src/googletest/src/gtest.cc
+@@ -114,6 +114,7 @@
+
+ #if GTEST_CAN_STREAM_RESULTS_
+ # include <arpa/inet.h> // NOLINT
++# include <sys/socket.h> // NOLINT
+ # include <netdb.h> // NOLINT
+ # include <sys/socket.h> // NOLINT
+ # include <sys/types.h> // NOLINT
Property changes on: branches/2019Q2/www/chromium/files/patch-third__party_googletest_src_googletest_src_gtest.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/2019Q2/www/chromium/files/patch-third__party_googletest_src_googletest_test_googletest-port-test.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-third__party_googletest_src_googletest_test_googletest-port-test.cc (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-third__party_googletest_src_googletest_test_googletest-port-test.cc (revision 497959)
@@ -0,0 +1,11 @@
+--- third_party/googletest/src/googletest/test/googletest-port-test.cc.orig 2019-03-11 22:08:00 UTC
++++ third_party/googletest/src/googletest/test/googletest-port-test.cc
+@@ -286,7 +286,7 @@ TEST(FormatCompilerIndependentFileLocationTest, Format
+ EXPECT_EQ("unknown file", FormatCompilerIndependentFileLocation(nullptr, -1));
+ }
+
+-#if GTEST_OS_LINUX || GTEST_OS_MAC || GTEST_OS_QNX || GTEST_OS_FUCHSIA
++#if GTEST_OS_LINUX || GTEST_OS_MAC || GTEST_OS_QNX || GTEST_OS_FUCHSIA || GTEST_OS_FREEBSD
+ void* ThreadFunc(void* data) {
+ internal::Mutex* mutex = static_cast<internal::Mutex*>(data);
+ mutex->Lock();
Property changes on: branches/2019Q2/www/chromium/files/patch-third__party_googletest_src_googletest_test_googletest-port-test.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/2019Q2/www/chromium/files/patch-third__party_leveldatabase_env__chromium.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-third__party_leveldatabase_env__chromium.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-third__party_leveldatabase_env__chromium.cc (revision 497959)
@@ -1,14 +1,14 @@
---- third_party/leveldatabase/env_chromium.cc.orig 2017-04-19 19:06:52 UTC
+--- third_party/leveldatabase/env_chromium.cc.orig 2019-03-11 22:01:15 UTC
+++ third_party/leveldatabase/env_chromium.cc
-@@ -25,7 +25,11 @@
- #include "base/trace_event/trace_event.h"
- #include "third_party/leveldatabase/chromium_logger.h"
+@@ -39,7 +39,11 @@
+ #include "third_party/leveldatabase/leveldb_chrome.h"
+ #include "third_party/leveldatabase/leveldb_features.h"
#include "third_party/leveldatabase/src/include/leveldb/options.h"
+#if defined(OS_BSD)
+#include <re2/re2.h>
+#else
#include "third_party/re2/src/re2/re2.h"
+#endif
using base::FilePath;
- using leveldb::FileLock;
+ using base::trace_event::MemoryAllocatorDump;
Index: branches/2019Q2/www/chromium/files/patch-third__party_libXNVCtrl_NVCtrl.c
===================================================================
--- branches/2019Q2/www/chromium/files/patch-third__party_libXNVCtrl_NVCtrl.c (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-third__party_libXNVCtrl_NVCtrl.c (revision 497959)
@@ -1,25 +1,25 @@
---- third_party/libXNVCtrl/NVCtrl.c.orig 2017-12-30 16:57:06.449527000 +0100
-+++ third_party/libXNVCtrl/NVCtrl.c 2017-12-30 16:57:57.055972000 +0100
+--- third_party/libXNVCtrl/NVCtrl.c.orig 2019-03-11 22:01:15 UTC
++++ third_party/libXNVCtrl/NVCtrl.c
@@ -27,10 +27,6 @@
* libXNVCtrl library properly protects the Display connection.
*/
-#if !defined(XTHREADS)
-#define XTHREADS
-#endif /* XTHREADS */
-
#define NEED_EVENTS
#define NEED_REPLIES
#include <stdint.h>
@@ -39,6 +35,11 @@
#include <X11/Xutil.h>
#include <X11/extensions/Xext.h>
#include <X11/extensions/extutil.h>
+
+#if !defined(XTHREADS)
+#define XTHREADS
+#endif /* XTHREADS */
+
#include "NVCtrlLib.h"
#include "nv_control.h"
Index: branches/2019Q2/www/chromium/files/patch-third__party_libphonenumber_dist_cpp_src_phonenumbers_base_memory_singleton.h
===================================================================
--- branches/2019Q2/www/chromium/files/patch-third__party_libphonenumber_dist_cpp_src_phonenumbers_base_memory_singleton.h (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-third__party_libphonenumber_dist_cpp_src_phonenumbers_base_memory_singleton.h (revision 497959)
@@ -1,11 +1,11 @@
---- third_party/libphonenumber/dist/cpp/src/phonenumbers/base/memory/singleton.h.orig 2017-06-05 19:04:19 UTC
+--- third_party/libphonenumber/dist/cpp/src/phonenumbers/base/memory/singleton.h.orig 2019-03-11 22:08:01 UTC
+++ third_party/libphonenumber/dist/cpp/src/phonenumbers/base/memory/singleton.h
@@ -56,7 +56,7 @@ template <class T> boost::once_flag Singleton<T>::flag
#include "phonenumbers/base/logging.h"
#include "phonenumbers/base/thread_checker.h"
-#if !defined(__linux__) && !defined(__APPLE__)
+#if !defined(__linux__) && !defined(__APPLE__) && !defined(__FreeBSD__) && !defined(__OpenBSD__)
namespace i18n {
namespace phonenumbers {
Index: branches/2019Q2/www/chromium/files/patch-third__party_libphonenumber_dist_cpp_src_phonenumbers_base_synchronization_lock.h
===================================================================
--- branches/2019Q2/www/chromium/files/patch-third__party_libphonenumber_dist_cpp_src_phonenumbers_base_synchronization_lock.h (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-third__party_libphonenumber_dist_cpp_src_phonenumbers_base_synchronization_lock.h (revision 497959)
@@ -1,11 +1,11 @@
---- third_party/libphonenumber/dist/cpp/src/phonenumbers/base/synchronization/lock.h.orig 2017-06-05 19:04:19 UTC
+--- third_party/libphonenumber/dist/cpp/src/phonenumbers/base/synchronization/lock.h.orig 2019-03-11 22:08:01 UTC
+++ third_party/libphonenumber/dist/cpp/src/phonenumbers/base/synchronization/lock.h
@@ -37,7 +37,7 @@ typedef boost::mutex::scoped_lock AutoLock;
// Dummy lock implementation on non-POSIX platforms. If you are running on a
// different platform and care about thread-safety, please compile with
// -DI18N_PHONENUMBERS_USE_BOOST.
-#if !defined(__linux__) && !defined(__APPLE__)
+#if !defined(__linux__) && !defined(__APPLE__) && !defined(__FreeBSD__) && !defined(__OpenBSD__)
namespace i18n {
namespace phonenumbers {
Index: branches/2019Q2/www/chromium/files/patch-third__party_libphonenumber_dist_cpp_src_phonenumbers_base_thread__checker.h
===================================================================
--- branches/2019Q2/www/chromium/files/patch-third__party_libphonenumber_dist_cpp_src_phonenumbers_base_thread__checker.h (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-third__party_libphonenumber_dist_cpp_src_phonenumbers_base_thread__checker.h (revision 497959)
@@ -1,19 +1,19 @@
---- third_party/libphonenumber/dist/cpp/src/phonenumbers/base/thread_checker.h.orig 2017-04-19 19:07:47 UTC
+--- third_party/libphonenumber/dist/cpp/src/phonenumbers/base/thread_checker.h.orig 2019-03-11 22:08:01 UTC
+++ third_party/libphonenumber/dist/cpp/src/phonenumbers/base/thread_checker.h
@@ -23,6 +23,7 @@
// user of the library know that it can't be used in a thread-safe manner when
// it is not depending on Boost.
#if !defined(__linux__) && !defined(__APPLE__) && \
+ !defined(__FreeBSD__) && !defined(__OpenBSD__) && \
!defined(I18N_PHONENUMBERS_NO_THREAD_SAFETY)
#error Building without Boost, please provide \
-DI18N_PHONENUMBERS_NO_THREAD_SAFETY
@@ -31,7 +32,7 @@
#endif
#if !defined(NDEBUG) && !defined(I18N_PHONENUMBERS_USE_BOOST) && \
- (defined(__linux__) || defined(__apple__))
+ (defined(__linux__) || defined(__apple__)) || defined(__FreeBSD__) || defined(__OpenBSD__)
#include <pthread.h>
Index: branches/2019Q2/www/chromium/files/patch-third__party_libyuv_include_libyuv_row.h
===================================================================
--- branches/2019Q2/www/chromium/files/patch-third__party_libyuv_include_libyuv_row.h (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-third__party_libyuv_include_libyuv_row.h (revision 497959)
@@ -1,37 +1,37 @@
---- third_party/libyuv/include/libyuv/row.h.orig 2017-04-19 19:07:47 UTC
+--- third_party/libyuv/include/libyuv/row.h.orig 2019-03-11 22:08:01 UTC
+++ third_party/libyuv/include/libyuv/row.h
-@@ -161,10 +161,14 @@ extern "C" {
+@@ -157,10 +157,14 @@ extern "C" {
#define HAS_ARGBSHADEROW_SSE2
#define HAS_ARGBSUBTRACTROW_SSE2
#define HAS_ARGBUNATTENUATEROW_SSE2
+#if !(defined(__i386__) && defined(__GNUC__))
#define HAS_BLENDPLANEROW_SSSE3
+#endif
#define HAS_COMPUTECUMULATIVESUMROW_SSE2
#define HAS_CUMULATIVESUMTOAVERAGEROW_SSE2
+#if !(defined(__i386__) && defined(__GNUC__))
#define HAS_INTERPOLATEROW_SSSE3
+#endif
#define HAS_RGBCOLORTABLEROW_X86
#define HAS_SOBELROW_SSE2
#define HAS_SOBELTOPLANEROW_SSE2
-@@ -211,7 +215,9 @@ extern "C" {
+@@ -206,7 +210,9 @@ extern "C" {
#define HAS_I422TORGB565ROW_AVX2
#define HAS_I422TORGBAROW_AVX2
#define HAS_I444TOARGBROW_AVX2
+#if !(defined(__i386__) && defined(__GNUC__))
#define HAS_INTERPOLATEROW_AVX2
+#endif
#define HAS_J422TOARGBROW_AVX2
#define HAS_MERGEUVROW_AVX2
#define HAS_MIRRORROW_AVX2
-@@ -234,7 +240,9 @@ extern "C" {
+@@ -231,7 +237,9 @@ extern "C" {
#define HAS_ARGBMULTIPLYROW_AVX2
#define HAS_ARGBSUBTRACTROW_AVX2
#define HAS_ARGBUNATTENUATEROW_AVX2
+#if !(defined(__i386__) && defined(__GNUC__))
#define HAS_BLENDPLANEROW_AVX2
+#endif
#if defined(__x86_64__) || !defined(__pic__) || defined(__clang__) || \
defined(_MSC_VER)
Index: branches/2019Q2/www/chromium/files/patch-third__party_node_node.py
===================================================================
--- branches/2019Q2/www/chromium/files/patch-third__party_node_node.py (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-third__party_node_node.py (revision 497959)
@@ -1,10 +1,10 @@
---- third_party/node/node.py.orig 2017-04-19 19:06:52 UTC
+--- third_party/node/node.py.orig 2019-03-11 22:01:16 UTC
+++ third_party/node/node.py
@@ -12,6 +12,7 @@ import sys
def GetBinaryPath():
return os_path.join(os_path.dirname(__file__), *{
'Darwin': ('mac', 'node-darwin-x64', 'bin', 'node'),
+ 'FreeBSD': ('freebsd', 'node-freebsd-x64', 'bin', 'node'),
'Linux': ('linux', 'node-linux-x64', 'bin', 'node'),
'Windows': ('win', 'node.exe'),
}[platform.system()])
Index: branches/2019Q2/www/chromium/files/patch-third__party_pdfium_core_fxcrt_fx__system.h
===================================================================
--- branches/2019Q2/www/chromium/files/patch-third__party_pdfium_core_fxcrt_fx__system.h (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-third__party_pdfium_core_fxcrt_fx__system.h (revision 497959)
@@ -1,11 +1,11 @@
---- third_party/pdfium/core/fxcrt/fx_system.h.orig 2017-12-15 02:05:39.000000000 +0100
-+++ third_party/pdfium/core/fxcrt/fx_system.h 2017-12-24 18:45:42.922884000 +0100
-@@ -40,7 +40,7 @@
+--- third_party/pdfium/core/fxcrt/fx_system.h.orig 2019-03-11 22:08:02 UTC
++++ third_party/pdfium/core/fxcrt/fx_system.h
+@@ -41,7 +41,7 @@
#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__)
Index: branches/2019Q2/www/chromium/files/patch-third__party_pdfium_core_fxge_fx__ge__linux.cpp
===================================================================
--- branches/2019Q2/www/chromium/files/patch-third__party_pdfium_core_fxge_fx__ge__linux.cpp (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-third__party_pdfium_core_fxge_fx__ge__linux.cpp (revision 497959)
@@ -0,0 +1,14 @@
+--- third_party/pdfium/core/fxge/fx_ge_linux.cpp.orig 2019-03-11 22:08:02 UTC
++++ third_party/pdfium/core/fxge/fx_ge_linux.cpp
+@@ -146,9 +146,8 @@ std::unique_ptr<SystemFontInfoIface> SystemFontInfoIfa
+ const char** pUserPaths) {
+ auto pInfo = pdfium::MakeUnique<CFX_LinuxFontInfo>();
+ if (!pInfo->ParseFontCfg(pUserPaths)) {
+- pInfo->AddPath("/usr/share/fonts");
+- pInfo->AddPath("/usr/share/X11/fonts/Type1");
+- pInfo->AddPath("/usr/share/X11/fonts/TTF");
++ pInfo->AddPath("/usr/local/share/fonts/Type1");
++ pInfo->AddPath("/usr/local/share/fonts/TTF");
+ pInfo->AddPath("/usr/local/share/fonts");
+ }
+ return std::move(pInfo);
Property changes on: branches/2019Q2/www/chromium/files/patch-third__party_pdfium_core_fxge_fx__ge__linux.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/2019Q2/www/chromium/files/patch-third__party_pdfium_fxjs_cjs__publicmethods.cpp
===================================================================
--- branches/2019Q2/www/chromium/files/patch-third__party_pdfium_fxjs_cjs__publicmethods.cpp (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-third__party_pdfium_fxjs_cjs__publicmethods.cpp (revision 497959)
@@ -0,0 +1,106 @@
+--- third_party/pdfium/fxjs/cjs_publicmethods.cpp.orig 2019-03-11 22:08:02 UTC
++++ third_party/pdfium/fxjs/cjs_publicmethods.cpp
+@@ -85,6 +85,103 @@ constexpr const wchar_t* kDateFormats[] = {L"m/d",
+ constexpr const wchar_t* kTimeFormats[] = {L"HH:MM", L"h:MM tt", L"HH:MM:ss",
+ L"h:MM:ss tt"};
+
++#if defined(__FreeBSD__)
++/*
++ * cvt.c - IEEE floating point formatting routines for FreeBSD
++ * from GNU libc-4.6.27
++ */
++
++/*
++ * ap_ecvt converts to decimal
++ * the number of digits is specified by ndigit
++ * decpt is set to the position of the decimal point
++ * sign is set to 0 for positive, 1 for negative
++ */
++
++#define NDIG 80
++
++static char *
++ ap_cvt(double arg, int ndigits, int *decpt, int *sign, int eflag)
++{
++ register int r2;
++ double fi, fj;
++ register char *p, *p1;
++ static char buf[NDIG];
++
++ if (ndigits >= NDIG - 1)
++ ndigits = NDIG - 2;
++ r2 = 0;
++ *sign = 0;
++ p = &buf[0];
++ if (arg < 0) {
++ *sign = 1;
++ arg = -arg;
++ }
++ arg = modf(arg, &fi);
++ p1 = &buf[NDIG];
++ /*
++ * Do integer part
++ */
++ if (fi != 0) {
++ p1 = &buf[NDIG];
++ while (fi != 0) {
++ fj = modf(fi / 10, &fi);
++ *--p1 = (int) ((fj + .03) * 10) + '0';
++ r2++;
++ }
++ while (p1 < &buf[NDIG])
++ *p++ = *p1++;
++ }
++ else if (arg > 0) {
++ while ((fj = arg * 10) < 1) {
++ arg = fj;
++ r2--;
++ }
++ }
++ p1 = &buf[ndigits];
++ if (eflag == 0)
++ p1 += r2;
++ *decpt = r2;
++ if (p1 < &buf[0]) {
++ buf[0] = '\0';
++ return (buf);
++ }
++ while (p <= p1 && p < &buf[NDIG]) {
++ arg *= 10;
++ arg = modf(arg, &fj);
++ *p++ = (int) fj + '0';
++ }
++ if (p1 >= &buf[NDIG]) {
++ buf[NDIG - 1] = '\0';
++ return (buf);
++ }
++ p = p1;
++ *p1 += 5;
++ while (*p1 > '9') {
++ *p1 = '0';
++ if (p1 > buf)
++ ++ * --p1;
++ else {
++ *p1 = '1';
++ (*decpt)++;
++ if (eflag == 0) {
++ if (p > buf)
++ *p = '0';
++ p++;
++ }
++ }
++ }
++ *p = '\0';
++ return (buf);
++}
++
++static char *
++ fcvt(double arg, int ndigits, int *decpt, int *sign)
++{
++ return (ap_cvt(arg, ndigits, decpt, sign, 0));
++}
++#endif // defined(__FreeBSD__)
++
+ template <typename T>
+ T StrTrim(const T& str) {
+ T result = str;
Property changes on: branches/2019Q2/www/chromium/files/patch-third__party_pdfium_fxjs_cjs__publicmethods.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/2019Q2/www/chromium/files/patch-third__party_pdfium_fxjs_fx__date__helpers.cpp
===================================================================
--- branches/2019Q2/www/chromium/files/patch-third__party_pdfium_fxjs_fx__date__helpers.cpp (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-third__party_pdfium_fxjs_fx__date__helpers.cpp (revision 497959)
@@ -1,22 +1,22 @@
---- third_party/pdfium/fxjs/fx_date_helpers.cpp.orig 2019-02-01 12:43:47.112647000 +0100
-+++ third_party/pdfium/fxjs/fx_date_helpers.cpp 2019-02-01 12:49:38.012493000 +0100
-@@ -34,6 +34,11 @@
+--- third_party/pdfium/fxjs/fx_date_helpers.cpp.orig 2019-03-11 22:08:02 UTC
++++ third_party/pdfium/fxjs/fx_date_helpers.cpp
+@@ -34,6 +34,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_
// In gcc 'timezone' is a global variable declared in time.h. In VC++, that
-@@ -42,6 +47,7 @@
+@@ -42,6 +47,7 @@ double GetLocalTZA() {
_get_timezone(&timezone);
#endif // _FX_PLATFORM_ == _FX_PLATFORM_WINDOWS_
return (double)(-(timezone * 1000));
+#endif // __FreeBSD__
}
int GetDaylightSavingTA(double d) {
Index: branches/2019Q2/www/chromium/files/patch-third__party_pdfium_xfa_fgas_font_cfx__fontsourceenum__file.cpp
===================================================================
--- branches/2019Q2/www/chromium/files/patch-third__party_pdfium_xfa_fgas_font_cfx__fontsourceenum__file.cpp (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-third__party_pdfium_xfa_fgas_font_cfx__fontsourceenum__file.cpp (revision 497959)
@@ -1,14 +1,14 @@
---- third_party/pdfium/xfa/fgas/font/cfx_fontsourceenum_file.cpp.orig 2018-12-15 16:04:31.993078000 +0100
-+++ third_party/pdfium/xfa/fgas/font/cfx_fontsourceenum_file.cpp 2018-12-15 16:06:14.341565000 +0100
-@@ -14,8 +14,9 @@
+--- third_party/pdfium/xfa/fgas/font/cfx_fontsourceenum_file.cpp.orig 2019-03-11 22:08:03 UTC
++++ third_party/pdfium/xfa/fgas/font/cfx_fontsourceenum_file.cpp
+@@ -14,8 +14,9 @@ constexpr char kFolderSeparator = '/';
constexpr const char* g_FontFolders[] = {
#if _FX_PLATFORM_ == _FX_PLATFORM_LINUX_
- "/usr/share/fonts", "/usr/share/X11/fonts/Type1",
- "/usr/share/X11/fonts/TTF", "/usr/local/share/fonts",
+ "/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 _FX_PLATFORM_ == _FX_PLATFORM_ANDROID_
Index: branches/2019Q2/www/chromium/files/patch-third__party_perfetto_include_perfetto_base_build__config.h
===================================================================
--- branches/2019Q2/www/chromium/files/patch-third__party_perfetto_include_perfetto_base_build__config.h (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-third__party_perfetto_include_perfetto_base_build__config.h (revision 497959)
@@ -0,0 +1,51 @@
+--- third_party/perfetto/include/perfetto/base/build_config.h.orig 2019-03-11 22:08:02 UTC
++++ third_party/perfetto/include/perfetto/base/build_config.h
+@@ -28,6 +28,7 @@
+ #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_ANDROID() 1
+ #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_MACOSX() 0
+ #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_LINUX() 0
++#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_FREEBSD() 0
+ #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_WIN() 0
+ #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_WASM() 0
+ #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_FUCHSIA() 0
+@@ -35,13 +36,15 @@
+ #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_ANDROID() 0
+ #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_MACOSX() 1
+ #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_LINUX() 0
++#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_FREEBSD() 0
+ #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_WIN() 0
+ #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_WASM() 0
+ #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_FUCHSIA() 0
+-#elif defined(__linux__)
++#elif defined(__linux__) || defined(__FreeBSD__)
+ #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_ANDROID() 0
+ #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_MACOSX() 0
+ #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_LINUX() 1
++#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_FREEBSD() 1
+ #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_WIN() 0
+ #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_WASM() 0
+ #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_FUCHSIA() 0
+@@ -49,6 +52,7 @@
+ #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_ANDROID() 0
+ #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_MACOSX() 0
+ #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_LINUX() 0
++#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_FREEBSD() 0
+ #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_WIN() 1
+ #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_WASM() 0
+ #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_FUCHSIA() 0
+@@ -56,6 +60,7 @@
+ #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_ANDROID() 0
+ #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_MACOSX() 0
+ #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_LINUX() 0
++#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_FREEBSD() 0
+ #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_WIN() 0
+ #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_WASM() 1
+ #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_FUCHSIA() 0
+@@ -63,6 +68,7 @@
+ #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_ANDROID() 0
+ #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_MACOSX() 0
+ #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_LINUX() 0
++#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_FREEBSD() 0
+ #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_WIN() 0
+ #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_WASM() 0
+ #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_FUCHSIA() 1
Property changes on: branches/2019Q2/www/chromium/files/patch-third__party_perfetto_include_perfetto_base_build__config.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/2019Q2/www/chromium/files/patch-third__party_perfetto_include_perfetto_base_event.h
===================================================================
--- branches/2019Q2/www/chromium/files/patch-third__party_perfetto_include_perfetto_base_event.h (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-third__party_perfetto_include_perfetto_base_event.h (revision 497959)
@@ -1,14 +1,14 @@
---- third_party/perfetto/include/perfetto/base/event.h.orig 2018-12-16 01:39:09.000000000 +0100
-+++ third_party/perfetto/include/perfetto/base/event.h 2018-12-16 01:39:40.143826000 +0100
+--- third_party/perfetto/include/perfetto/base/event.h.orig 2019-03-11 22:08:02 UTC
++++ third_party/perfetto/include/perfetto/base/event.h
@@ -20,8 +20,9 @@
#include "perfetto/base/build_config.h"
#include "perfetto/base/scoped_file.h"
-#if PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) || \
- PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID)
+#if (PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) || \
+ PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID)) && \
+ !PERFETTO_BUILDFLAG(PERFETTO_OS_FREEBSD)
#define PERFETTO_USE_EVENTFD() 1
#else
#define PERFETTO_USE_EVENTFD() 0
Index: branches/2019Q2/www/chromium/files/patch-third__party_perfetto_include_perfetto_base_time.h
===================================================================
--- branches/2019Q2/www/chromium/files/patch-third__party_perfetto_include_perfetto_base_time.h (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-third__party_perfetto_include_perfetto_base_time.h (revision 497959)
@@ -1,20 +1,20 @@
---- third_party/perfetto/include/perfetto/base/time.h.orig 2018-12-16 01:32:46.000000000 +0100
-+++ third_party/perfetto/include/perfetto/base/time.h 2018-12-16 01:38:40.852314000 +0100
-@@ -123,6 +123,9 @@
+--- third_party/perfetto/include/perfetto/base/time.h.orig 2019-03-11 22:08:02 UTC
++++ third_party/perfetto/include/perfetto/base/time.h
+@@ -123,6 +123,9 @@ inline TimeNanos GetTimeInternalNs(clockid_t clk_id) {
// Return ns from boot. Conversely to GetWallTimeNs, this clock counts also time
// during suspend (when supported).
inline TimeNanos GetBootTimeNs() {
+#if PERFETTO_BUILDFLAG(PERFETTO_OS_FREEBSD)
+ return GetTimeInternalNs(kWallTimeClockSource);
+#else
// Determine if CLOCK_BOOTTIME is available on the first call.
static const clockid_t kBootTimeClockSource = [] {
struct timespec ts = {};
-@@ -130,6 +133,7 @@
+@@ -130,6 +133,7 @@ inline TimeNanos GetBootTimeNs() {
return res == 0 ? CLOCK_BOOTTIME : kWallTimeClockSource;
}();
return GetTimeInternalNs(kBootTimeClockSource);
+#endif
}
inline TimeNanos GetWallTimeNs() {
Index: branches/2019Q2/www/chromium/files/patch-third__party_perfetto_include_perfetto_base_watchdog__posix.h
===================================================================
--- branches/2019Q2/www/chromium/files/patch-third__party_perfetto_include_perfetto_base_watchdog__posix.h (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-third__party_perfetto_include_perfetto_base_watchdog__posix.h (revision 497959)
@@ -0,0 +1,11 @@
+--- third_party/perfetto/include/perfetto/base/watchdog_posix.h.orig 2019-03-11 22:08:02 UTC
++++ third_party/perfetto/include/perfetto/base/watchdog_posix.h
+@@ -46,7 +46,7 @@ class Watchdog {
+ Timer(const Timer&) = delete;
+ Timer& operator=(const Timer&) = delete;
+
+- timer_t timerid_ = nullptr;
++ timer_t timerid_ = 0;
+ };
+ virtual ~Watchdog();
+
Property changes on: branches/2019Q2/www/chromium/files/patch-third__party_perfetto_include_perfetto_base_watchdog__posix.h
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: branches/2019Q2/www/chromium/files/patch-third__party_perfetto_src_base_unix__socket.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-third__party_perfetto_src_base_unix__socket.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-third__party_perfetto_src_base_unix__socket.cc (revision 497959)
@@ -1,12 +1,12 @@
---- third_party/perfetto/src/base/unix_socket.cc.orig 2018-12-15 19:07:57.840463000 +0100
-+++ third_party/perfetto/src/base/unix_socket.cc 2018-12-15 19:08:37.030799000 +0100
-@@ -387,7 +387,8 @@
+--- third_party/perfetto/src/base/unix_socket.cc.orig 2019-03-11 22:08:02 UTC
++++ third_party/perfetto/src/base/unix_socket.cc
+@@ -502,7 +502,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 res = getsockopt(*fd_, SOL_SOCKET, SO_PEERCRED, &user_cred, &len);
+ int fd = sock_raw_.fd();
Index: branches/2019Q2/www/chromium/files/patch-third__party_perfetto_src_tracing_core_tracing__service__impl.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-third__party_perfetto_src_tracing_core_tracing__service__impl.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-third__party_perfetto_src_tracing_core_tracing__service__impl.cc (revision 497959)
@@ -1,22 +1,22 @@
---- third_party/perfetto/src/tracing/core/tracing_service_impl.cc.orig 2018-12-12 23:03:02.000000000 +0100
-+++ third_party/perfetto/src/tracing/core/tracing_service_impl.cc 2019-01-12 23:04:39.364791000 +0100
-@@ -1180,7 +1180,8 @@
+--- third_party/perfetto/src/tracing/core/tracing_service_impl.cc.orig 2019-03-11 22:08:02 UTC
++++ third_party/perfetto/src/tracing/core/tracing_service_impl.cc
+@@ -1494,7 +1494,8 @@ TraceBuffer* TracingServiceImpl::GetBufferByID(BufferI
void TracingServiceImpl::UpdateMemoryGuardrail() {
- #if !PERFETTO_BUILDFLAG(PERFETTO_CHROMIUM_BUILD) && \
+ #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.
-@@ -1231,7 +1232,8 @@
+@@ -1545,7 +1546,8 @@ void TracingServiceImpl::SnapshotClocks(std::vector<Tr
protos::ClockSnapshot* clock_snapshot = packet.mutable_clock_snapshot();
#if !PERFETTO_BUILDFLAG(PERFETTO_OS_MACOSX) && \
- !PERFETTO_BUILDFLAG(PERFETTO_OS_WIN)
+ !PERFETTO_BUILDFLAG(PERFETTO_OS_WIN) && \
+ !PERFETTO_BUILDFLAG(PERFETTO_OS_FREEBSD)
struct {
clockid_t id;
protos::ClockSnapshot::Clock::Type type;
Index: branches/2019Q2/www/chromium/files/patch-third__party_protobuf_src_google_protobuf_stubs_platform__macros.h
===================================================================
--- branches/2019Q2/www/chromium/files/patch-third__party_protobuf_src_google_protobuf_stubs_platform__macros.h (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-third__party_protobuf_src_google_protobuf_stubs_platform__macros.h (revision 497959)
@@ -0,0 +1,11 @@
+--- third_party/protobuf/src/google/protobuf/stubs/platform_macros.h.orig 2019-03-11 22:01:16 UTC
++++ third_party/protobuf/src/google/protobuf/stubs/platform_macros.h
+@@ -117,7 +117,7 @@ GOOGLE_PROTOBUF_PLATFORM_ERROR
+
+ #undef GOOGLE_PROTOBUF_PLATFORM_ERROR
+
+-#if defined(GOOGLE_PROTOBUF_OS_ANDROID) || defined(GOOGLE_PROTOBUF_OS_IPHONE) || defined(__OpenBSD__)
++#if defined(GOOGLE_PROTOBUF_OS_ANDROID) || defined(GOOGLE_PROTOBUF_OS_IPHONE) || defined(__FreeBSD__)
+ // Android ndk does not support the __thread keyword very well yet. Here
+ // we use pthread_key_create()/pthread_getspecific()/... methods for
+ // TLS support on android.
Property changes on: branches/2019Q2/www/chromium/files/patch-third__party_protobuf_src_google_protobuf_stubs_platform__macros.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/2019Q2/www/chromium/files/patch-third__party_skia_src_core_SkCpu.cpp
===================================================================
--- branches/2019Q2/www/chromium/files/patch-third__party_skia_src_core_SkCpu.cpp (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-third__party_skia_src_core_SkCpu.cpp (revision 497959)
@@ -1,19 +1,19 @@
---- third_party/skia/src/core/SkCpu.cpp.orig 2018-06-13 00:12:11.000000000 +0200
-+++ third_party/skia/src/core/SkCpu.cpp 2018-07-19 20:40:05.469146000 +0200
-@@ -78,6 +78,8 @@
+--- third_party/skia/src/core/SkCpu.cpp.orig 2019-03-11 22:08:22 UTC
++++ third_party/skia/src/core/SkCpu.cpp
+@@ -74,6 +74,8 @@
#include <sys/auxv.h>
static uint32_t read_cpu_features() {
+return 0;
+#if 0
const uint32_t kHWCAP_CRC32 = (1<< 7),
kHWCAP_ASIMDHP = (1<<10);
-@@ -86,6 +88,7 @@
+@@ -82,6 +84,7 @@
if (hwcaps & kHWCAP_CRC32 ) { features |= SkCpu::CRC32; }
if (hwcaps & kHWCAP_ASIMDHP) { features |= SkCpu::ASIMDHP; }
return features;
+#endif
}
#elif defined(SK_CPU_ARM32) && __has_include(<sys/auxv.h>) && \
Index: branches/2019Q2/www/chromium/files/patch-third__party_skia_src_gpu_GrAutoLocaleSetter.h
===================================================================
--- branches/2019Q2/www/chromium/files/patch-third__party_skia_src_gpu_GrAutoLocaleSetter.h (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-third__party_skia_src_gpu_GrAutoLocaleSetter.h (revision 497959)
@@ -1,11 +1,11 @@
---- third_party/skia/src/gpu/GrAutoLocaleSetter.h.orig 2017-04-19 19:07:51 UTC
+--- third_party/skia/src/gpu/GrAutoLocaleSetter.h.orig 2019-03-11 22:08:28 UTC
+++ third_party/skia/src/gpu/GrAutoLocaleSetter.h
-@@ -25,7 +25,7 @@
+@@ -27,7 +27,7 @@
#define HAVE_XLOCALE 0
#endif
-#if defined(SK_BUILD_FOR_ANDROID) || defined(__UCLIBC__) || defined(_NEWLIB_VERSION)
+#if defined(SK_BUILD_FOR_ANDROID) || defined(__UCLIBC__) || defined(_NEWLIB_VERSION) || defined(__FreeBSD__)
#define HAVE_LOCALE_T 0
#else
#define HAVE_LOCALE_T 1
Index: branches/2019Q2/www/chromium/files/patch-third__party_skia_src_images_SkJpegEncoder.cpp
===================================================================
--- branches/2019Q2/www/chromium/files/patch-third__party_skia_src_images_SkJpegEncoder.cpp (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-third__party_skia_src_images_SkJpegEncoder.cpp (revision 497959)
@@ -1,41 +1,41 @@
---- third_party/skia/src/images/SkJpegEncoder.cpp.orig 2017-12-28 17:28:55.164840000 +0100
-+++ third_party/skia/src/images/SkJpegEncoder.cpp 2017-12-28 17:34:22.821694000 +0100
-@@ -86,9 +86,14 @@
- }
+--- third_party/skia/src/images/SkJpegEncoder.cpp.orig 2019-03-11 22:08:28 UTC
++++ third_party/skia/src/images/SkJpegEncoder.cpp
+@@ -75,9 +75,14 @@ bool SkJpegEncoderMgr::setParams(const SkImageInfo& sr
+ return (transform_scanline_proc) nullptr;
};
+#ifdef JCS_EXTENSIONS
J_COLOR_SPACE jpegColorType = JCS_EXT_RGBA;
+#else
+ J_COLOR_SPACE jpegColorType = JCS_RGB;
+#endif
int numComponents = 0;
switch (srcInfo.colorType()) {
+#ifdef JCS_EXTENSIONS
case kRGBA_8888_SkColorType:
fProc = chooseProc8888();
jpegColorType = JCS_EXT_RGBA;
-@@ -99,6 +104,7 @@
+@@ -88,6 +93,7 @@ bool SkJpegEncoderMgr::setParams(const SkImageInfo& sr
jpegColorType = JCS_EXT_BGRA;
numComponents = 4;
break;
+#endif
case kRGB_565_SkColorType:
fProc = transform_scanline_565;
jpegColorType = JCS_RGB;
-@@ -118,6 +124,7 @@
+@@ -107,6 +113,7 @@ bool SkJpegEncoderMgr::setParams(const SkImageInfo& sr
jpegColorType = JCS_GRAYSCALE;
numComponents = 1;
break;
+#ifdef JCS_EXTENSIONS
case kRGBA_F16_SkColorType:
- if (!srcInfo.colorSpace() || !srcInfo.colorSpace()->gammaIsLinear() ||
- SkTransferFunctionBehavior::kRespect != options.fBlendBehavior) {
-@@ -134,6 +141,7 @@
+ if (kUnpremul_SkAlphaType == srcInfo.alphaType() &&
+ options.fAlphaOption == SkJpegEncoder::AlphaOption::kBlendOnBlack) {
+@@ -117,6 +124,7 @@ bool SkJpegEncoderMgr::setParams(const SkImageInfo& sr
jpegColorType = JCS_EXT_RGBA;
numComponents = 4;
break;
+#endif
default:
return false;
}
Index: branches/2019Q2/www/chromium/files/patch-third__party_skia_src_opts_SkRasterPipeline__opts.h
===================================================================
--- branches/2019Q2/www/chromium/files/patch-third__party_skia_src_opts_SkRasterPipeline__opts.h (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-third__party_skia_src_opts_SkRasterPipeline__opts.h (revision 497959)
@@ -0,0 +1,20 @@
+--- third_party/skia/src/opts/SkRasterPipeline_opts.h.orig 2019-03-11 22:08:28 UTC
++++ third_party/skia/src/opts/SkRasterPipeline_opts.h
+@@ -729,7 +729,7 @@ SI F approx_powf(F x, F y) {
+ }
+
+ SI F from_half(U16 h) {
+-#if defined(SK_CPU_ARM64) && !defined(SK_BUILD_FOR_GOOGLE3) // Temporary workaround for some Google3 builds.
++#if defined(JUMPER_IS_NEON) && defined(SK_CPU_ARM64) && !defined(SK_BUILD_FOR_GOOGLE3) // Temporary workaround for some Google3 builds.
+ return vcvt_f32_f16(h);
+
+ #elif defined(JUMPER_IS_HSW) || defined(JUMPER_IS_AVX512)
+@@ -749,7 +749,7 @@ SI F from_half(U16 h) {
+ }
+
+ SI U16 to_half(F f) {
+-#if defined(SK_CPU_ARM64) && !defined(SK_BUILD_FOR_GOOGLE3) // Temporary workaround for some Google3 builds.
++#if defined(JUMPER_IS_NEON) && defined(SK_CPU_ARM64) && !defined(SK_BUILD_FOR_GOOGLE3) // Temporary workaround for some Google3 builds.
+ return vcvt_f16_f32(f);
+
+ #elif defined(JUMPER_IS_HSW) || defined(JUMPER_IS_AVX512)
Property changes on: branches/2019Q2/www/chromium/files/patch-third__party_skia_src_opts_SkRasterPipeline__opts.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/2019Q2/www/chromium/files/patch-third__party_skia_src_ports_SkFontHost__FreeType.cpp
===================================================================
--- branches/2019Q2/www/chromium/files/patch-third__party_skia_src_ports_SkFontHost__FreeType.cpp (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-third__party_skia_src_ports_SkFontHost__FreeType.cpp (revision 497959)
@@ -0,0 +1,77 @@
+--- third_party/skia/src/ports/SkFontHost_FreeType.cpp.orig 2019-03-11 22:08:28 UTC
++++ third_party/skia/src/ports/SkFontHost_FreeType.cpp
+@@ -122,8 +122,6 @@ class FreeTypeLibrary : SkNoncopyable { (public)
+ : fGetVarDesignCoordinates(nullptr)
+ , fGetVarAxisFlags(nullptr)
+ , fLibrary(nullptr)
+- , fIsLCDSupported(false)
+- , fLCDExtra(0)
+ {
+ if (FT_New_Library(&gFTMemory, &fLibrary)) {
+ return;
+@@ -183,12 +181,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) {
+@@ -197,8 +190,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.
+@@ -215,8 +206,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.
+@@ -713,17 +702,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/2019Q2/www/chromium/files/patch-third__party_skia_src_ports_SkFontHost__FreeType.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/2019Q2/www/chromium/files/patch-third__party_skia_src_ports_SkOSFile__stdio.cpp
===================================================================
--- branches/2019Q2/www/chromium/files/patch-third__party_skia_src_ports_SkOSFile__stdio.cpp (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-third__party_skia_src_ports_SkOSFile__stdio.cpp (revision 497959)
@@ -0,0 +1,11 @@
+--- third_party/skia/src/ports/SkOSFile_stdio.cpp.orig 2019-03-11 22:08:28 UTC
++++ third_party/skia/src/ports/SkOSFile_stdio.cpp
+@@ -129,7 +129,7 @@ void sk_fflush(FILE* f) {
+
+ void sk_fsync(FILE* f) {
+ #if !defined(_WIN32) && !defined(SK_BUILD_FOR_ANDROID) && !defined(__UCLIBC__) \
+- && !defined(_NEWLIB_VERSION)
++ && !defined(_NEWLIB_VERSION) && !defined(__FreeBSD__)
+ int fd = fileno(f);
+ fsync(fd);
+ #endif
Property changes on: branches/2019Q2/www/chromium/files/patch-third__party_skia_src_ports_SkOSFile__stdio.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/2019Q2/www/chromium/files/patch-third__party_skia_src_sksl_SkSLString.h
===================================================================
--- branches/2019Q2/www/chromium/files/patch-third__party_skia_src_sksl_SkSLString.h (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-third__party_skia_src_sksl_SkSLString.h (revision 497959)
@@ -1,11 +1,11 @@
---- third_party/skia/src/sksl/SkSLString.h.orig 2017-12-24 19:10:48.599527000 +0100
-+++ third_party/skia/src/sksl/SkSLString.h 2017-12-24 19:11:12.662001000 +0100
+--- third_party/skia/src/sksl/SkSLString.h.orig 2019-03-11 22:08:28 UTC
++++ third_party/skia/src/sksl/SkSLString.h
@@ -22,6 +22,8 @@
#include "SkString.h"
#endif
+#include <stdarg.h>
+
namespace SkSL {
// Represents a (not necessarily null-terminated) slice of a string.
Index: branches/2019Q2/www/chromium/files/patch-third__party_skia_third__party_vulkanmemoryallocator_include_vk__mem__alloc.h
===================================================================
--- branches/2019Q2/www/chromium/files/patch-third__party_skia_third__party_vulkanmemoryallocator_include_vk__mem__alloc.h (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-third__party_skia_third__party_vulkanmemoryallocator_include_vk__mem__alloc.h (revision 497959)
@@ -1,11 +1,11 @@
---- third_party/skia/third_party/vulkanmemoryallocator/include/vk_mem_alloc.h.orig 2018-12-12 23:03:06.000000000 +0100
-+++ third_party/skia/third_party/vulkanmemoryallocator/include/vk_mem_alloc.h 2018-12-16 02:27:17.323830000 +0100
-@@ -2232,7 +2232,7 @@
+--- third_party/skia/third_party/vulkanmemoryallocator/include/vk_mem_alloc.h.orig 2019-03-17 01:47:13 UTC
++++ third_party/skia/third_party/vulkanmemoryallocator/include/vk_mem_alloc.h
+@@ -2232,7 +2232,7 @@ remove them if not needed.
#include <mutex> // for std::mutex
#include <atomic> // for std::atomic
-#if !defined(_WIN32) && !defined(__APPLE__)
+#if !defined(_WIN32) && !defined(__APPLE__) && !defined(__FreeBSD__)
#include <malloc.h> // for aligned_alloc()
#endif
Index: branches/2019Q2/www/chromium/files/patch-third__party_sqlite_BUILD.gn
===================================================================
--- branches/2019Q2/www/chromium/files/patch-third__party_sqlite_BUILD.gn (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-third__party_sqlite_BUILD.gn (revision 497959)
@@ -1,11 +1,11 @@
---- third_party/sqlite/BUILD.gn.orig 2018-12-12 22:56:25.000000000 +0100
-+++ third_party/sqlite/BUILD.gn 2019-01-04 00:53:21.136257000 +0100
-@@ -213,7 +213,7 @@
+--- third_party/sqlite/BUILD.gn.orig 2019-03-11 22:01:16 UTC
++++ third_party/sqlite/BUILD.gn
+@@ -251,7 +251,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/2019Q2/www/chromium/files/patch-third__party_swiftshader_BUILD.gn
===================================================================
--- branches/2019Q2/www/chromium/files/patch-third__party_swiftshader_BUILD.gn (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-third__party_swiftshader_BUILD.gn (revision 497959)
@@ -1,19 +1,24 @@
---- third_party/swiftshader/BUILD.gn.orig 2019-01-30 02:20:34.000000000 +0100
-+++ third_party/swiftshader/BUILD.gn 2019-02-01 13:30:51.566784000 +0100
-@@ -118,16 +118,12 @@
+--- third_party/swiftshader/BUILD.gn.orig 2019-03-11 22:08:03 UTC
++++ third_party/swiftshader/BUILD.gn
+@@ -126,9 +126,6 @@ config("swiftshader_config") {
+ ldflags = [ "-Wl,--gc-sections" ]
if (target_cpu == "mipsel") {
- ldflags += [
+- ldflags += [
- "-Wl,--hash-style=sysv",
- "-mips32r2",
- ]
+- ]
+ if (mips_arch_variant == "r1") {
+ ldflags += [
+ "-mips32",
+@@ -140,11 +137,8 @@ config("swiftshader_config") {
+ }
} else if (target_cpu == "mips64el") {
ldflags += [
- "-Wl,--hash-style=sysv",
"-mips64r2",
]
- } else {
- ldflags += [ "-Wl,--hash-style=both" ]
}
# A bug in the gold linker prevents using ICF on 32-bit (crbug.com/729532)
Index: branches/2019Q2/www/chromium/files/patch-third__party_swiftshader_src_Common_Configurator.cpp
===================================================================
--- branches/2019Q2/www/chromium/files/patch-third__party_swiftshader_src_Common_Configurator.cpp (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-third__party_swiftshader_src_Common_Configurator.cpp (revision 497959)
@@ -1,12 +1,12 @@
---- third_party/swiftshader/src/Common/Configurator.cpp.orig 2018-07-19 21:20:56.462917000 +0200
-+++ third_party/swiftshader/src/Common/Configurator.cpp 2018-07-19 21:23:09.940292000 +0200
-@@ -42,6 +42,9 @@
+--- third_party/swiftshader/src/Common/Configurator.cpp.orig 2019-03-11 22:08:03 UTC
++++ third_party/swiftshader/src/Common/Configurator.cpp
+@@ -42,6 +42,9 @@ namespace sw
bool Configurator::readFile()
{
+#if defined(__FreeBSD__)
+ return false;
+#endif
#if defined(__unix__)
if(access(path.c_str(), R_OK) != 0)
{
Index: branches/2019Q2/www/chromium/files/patch-third__party_swiftshader_src_Common_MutexLock.hpp
===================================================================
--- branches/2019Q2/www/chromium/files/patch-third__party_swiftshader_src_Common_MutexLock.hpp (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-third__party_swiftshader_src_Common_MutexLock.hpp (revision 497959)
@@ -1,11 +1,11 @@
---- third_party/swiftshader/src/Common/MutexLock.hpp.orig 2017-06-26 22:06:54.283201000 +0200
-+++ third_party/swiftshader/src/Common/MutexLock.hpp 2017-06-26 22:07:18.656810000 +0200
+--- third_party/swiftshader/src/Common/MutexLock.hpp.orig 2019-03-11 22:08:03 UTC
++++ third_party/swiftshader/src/Common/MutexLock.hpp
@@ -17,7 +17,7 @@
#include "Thread.hpp"
-#if defined(__linux__)
+#if defined(__linux__) || defined(__FreeBSD__)
// Use a pthread mutex on Linux. Since many processes may use SwiftShader
// at the same time it's best to just have the scheduler overhead.
#include <pthread.h>
Index: branches/2019Q2/www/chromium/files/patch-third__party_swiftshader_src_Common_SharedLibrary.hpp
===================================================================
--- branches/2019Q2/www/chromium/files/patch-third__party_swiftshader_src_Common_SharedLibrary.hpp (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-third__party_swiftshader_src_Common_SharedLibrary.hpp (revision 497959)
@@ -1,11 +1,11 @@
---- third_party/swiftshader/src/Common/SharedLibrary.hpp.orig 2017-06-26 22:08:50.265243000 +0200
-+++ third_party/swiftshader/src/Common/SharedLibrary.hpp 2017-06-26 22:10:22.637465000 +0200
-@@ -92,7 +92,7 @@
+--- third_party/swiftshader/src/Common/SharedLibrary.hpp.orig 2019-03-11 22:08:03 UTC
++++ third_party/swiftshader/src/Common/SharedLibrary.hpp
+@@ -97,7 +97,7 @@ void *loadLibrary(const std::string &libraryDirectory,
inline void *getLibraryHandle(const char *path)
{
- #ifdef __ANDROID__
+ #if defined( __ANDROID__) || defined(__FreeBSD__)
// bionic doesn't support RTLD_NOLOAD before L
return dlopen(path, RTLD_NOW | RTLD_LOCAL);
#else
Index: branches/2019Q2/www/chromium/files/patch-third__party_swiftshader_src_Main_SwiftConfig.cpp
===================================================================
--- branches/2019Q2/www/chromium/files/patch-third__party_swiftshader_src_Main_SwiftConfig.cpp (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-third__party_swiftshader_src_Main_SwiftConfig.cpp (revision 497959)
@@ -1,14 +1,14 @@
---- third_party/swiftshader/src/Main/SwiftConfig.cpp.orig 2018-07-19 21:23:23.845651000 +0200
-+++ third_party/swiftshader/src/Main/SwiftConfig.cpp 2018-07-19 21:24:08.531304000 +0200
-@@ -762,7 +762,11 @@
+--- third_party/swiftshader/src/Main/SwiftConfig.cpp.orig 2019-03-11 22:08:03 UTC
++++ third_party/swiftshader/src/Main/SwiftConfig.cpp
+@@ -762,7 +762,11 @@ namespace sw
struct stat status;
int lastModified = ini.getInteger("LastModified", "Time", 0);
+#if !defined(__FreeBSD__)
bool noConfig = stat("SwiftShader.ini", &status) != 0;
+#else
+ bool noConfig = false;
+#endif
newConfig = !noConfig && abs((int)status.st_mtime - lastModified) > 1;
if(disableServerOverride)
Index: branches/2019Q2/www/chromium/files/patch-third__party_swiftshader_src_OpenGL_libEGL_Display.cpp
===================================================================
--- branches/2019Q2/www/chromium/files/patch-third__party_swiftshader_src_OpenGL_libEGL_Display.cpp (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-third__party_swiftshader_src_OpenGL_libEGL_Display.cpp (revision 497959)
@@ -1,20 +1,20 @@
---- third_party/swiftshader/src/OpenGL/libEGL/Display.cpp.orig 2019-01-12 22:59:44.902034000 +0100
-+++ third_party/swiftshader/src/OpenGL/libEGL/Display.cpp 2019-01-12 23:00:33.372667000 +0100
-@@ -684,7 +684,7 @@
+--- third_party/swiftshader/src/OpenGL/libEGL/Display.cpp.orig 2019-03-11 22:08:03 UTC
++++ third_party/swiftshader/src/OpenGL/libEGL/Display.cpp
+@@ -686,7 +686,7 @@ bool Display::isValidWindow(EGLNativeWindowType window
return status != 0;
}
return false;
- #elif defined(__linux__)
+ #elif defined(__linux__) || defined(__FreeBSD__)
return false; // Non X11 linux is headless only
#elif defined(__APPLE__)
return sw::OSX::IsValidWindow(window);
-@@ -860,7 +860,7 @@
+@@ -862,7 +862,7 @@ sw::Format Display::getDisplayFormat() const
{
return sw::FORMAT_X8R8G8B8;
}
- #elif defined(__linux__) // Non X11 linux is headless only
+ #elif defined(__linux__) || defined(__FreeBSD__) // Non X11 linux is headless only
return sw::FORMAT_A8B8G8R8;
#elif defined(__APPLE__)
return sw::FORMAT_A8B8G8R8;
Index: branches/2019Q2/www/chromium/files/patch-third__party_swiftshader_src_OpenGL_libEGL_Surface.cpp
===================================================================
--- branches/2019Q2/www/chromium/files/patch-third__party_swiftshader_src_OpenGL_libEGL_Surface.cpp (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-third__party_swiftshader_src_OpenGL_libEGL_Surface.cpp (revision 497959)
@@ -1,11 +1,11 @@
---- third_party/swiftshader/src/OpenGL/libEGL/Surface.cpp.orig 2019-01-12 22:56:53.902120000 +0100
-+++ third_party/swiftshader/src/OpenGL/libEGL/Surface.cpp 2019-01-12 22:57:13.884671000 +0100
-@@ -352,7 +352,7 @@
+--- third_party/swiftshader/src/OpenGL/libEGL/Surface.cpp.orig 2019-03-11 22:08:03 UTC
++++ third_party/swiftshader/src/OpenGL/libEGL/Surface.cpp
+@@ -352,7 +352,7 @@ bool WindowSurface::checkForResize()
int windowWidth = windowAttributes.width;
int windowHeight = windowAttributes.height;
- #elif defined(__linux__)
+ #elif defined(__linux__) || defined(__FreeBSD__)
// Non X11 linux is headless only
int windowWidth = 100;
int windowHeight = 100;
Index: branches/2019Q2/www/chromium/files/patch-third__party_swiftshader_src_OpenGL_libEGL_libEGL.cpp
===================================================================
--- branches/2019Q2/www/chromium/files/patch-third__party_swiftshader_src_OpenGL_libEGL_libEGL.cpp (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-third__party_swiftshader_src_OpenGL_libEGL_libEGL.cpp (revision 497959)
@@ -1,29 +1,29 @@
---- third_party/swiftshader/src/OpenGL/libEGL/libEGL.cpp.orig 2018-12-15 16:34:59.695784000 +0100
-+++ third_party/swiftshader/src/OpenGL/libEGL/libEGL.cpp 2018-12-15 16:37:11.859379000 +0100
-@@ -148,7 +148,7 @@
+--- third_party/swiftshader/src/OpenGL/libEGL/libEGL.cpp.orig 2019-03-11 22:08:03 UTC
++++ third_party/swiftshader/src/OpenGL/libEGL/libEGL.cpp
+@@ -148,7 +148,7 @@ EGLDisplay GetDisplay(EGLNativeDisplayType display_id)
// FIXME: Check if display_id is the default display
}
- #if defined(__linux__) && !defined(__ANDROID__)
+ #if (defined(__linux__) || defined(__FreeBSD)) && !defined(__ANDROID__)
#if defined(USE_X11)
if(!libX11)
#endif // Non X11 linux is headless only
-@@ -207,7 +207,7 @@
+@@ -207,7 +207,7 @@ const char *QueryString(EGLDisplay dpy, EGLint name)
{
return success(
"EGL_KHR_client_get_all_proc_addresses "
-#if defined(__linux__) && !defined(__ANDROID__)
+#if (defined(__linux__) || defined(__FreeBSD__)) && !defined(__ANDROID__)
"EGL_KHR_platform_gbm "
#endif
#if defined(USE_X11)
-@@ -1248,7 +1248,7 @@
+@@ -1248,7 +1248,7 @@ EGLDisplay GetPlatformDisplay(EGLenum platform, void *
{
TRACE("(EGLenum platform = 0x%X, void *native_display = %p, const EGLAttrib *attrib_list = %p)", platform, native_display, attrib_list);
- #if defined(__linux__) && !defined(__ANDROID__)
+ #if (defined(__linux__) || defined(__FreeBSD__)) && !defined(__ANDROID__)
switch(platform)
{
#if defined(USE_X11)
Index: branches/2019Q2/www/chromium/files/patch-third__party_swiftshader_src_OpenGL_libEGL_libEGL.hpp
===================================================================
--- branches/2019Q2/www/chromium/files/patch-third__party_swiftshader_src_OpenGL_libEGL_libEGL.hpp (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-third__party_swiftshader_src_OpenGL_libEGL_libEGL.hpp (revision 497959)
@@ -1,11 +1,11 @@
---- third_party/swiftshader/src/OpenGL/libEGL/libEGL.hpp.orig 2018-12-15 16:38:54.529408000 +0100
-+++ third_party/swiftshader/src/OpenGL/libEGL/libEGL.hpp 2018-12-15 16:39:22.143716000 +0100
-@@ -100,7 +100,7 @@
+--- third_party/swiftshader/src/OpenGL/libEGL/libEGL.hpp.orig 2019-03-11 22:08:03 UTC
++++ third_party/swiftshader/src/OpenGL/libEGL/libEGL.hpp
+@@ -100,7 +100,7 @@ class LibEGL (private)
#endif
#elif defined(__ANDROID__)
const char *libEGL_lib[] = {"libEGL_swiftshader.so", "libEGL_swiftshader.so"};
- #elif defined(__linux__)
+ #elif defined(__linux__) || defined(__FreeBSD__)
#if defined(__LP64__)
const char *libEGL_lib[] = {"lib64EGL_translator.so", "libEGL.so.1", "libEGL.so"};
#else
Index: branches/2019Q2/www/chromium/files/patch-third__party_swiftshader_src_OpenGL_libGLES__CM_libGLES__CM.hpp
===================================================================
--- branches/2019Q2/www/chromium/files/patch-third__party_swiftshader_src_OpenGL_libGLES__CM_libGLES__CM.hpp (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-third__party_swiftshader_src_OpenGL_libGLES__CM_libGLES__CM.hpp (revision 497959)
@@ -0,0 +1,11 @@
+--- third_party/swiftshader/src/OpenGL/libGLES_CM/libGLES_CM.hpp.orig 2019-03-11 22:08:03 UTC
++++ third_party/swiftshader/src/OpenGL/libGLES_CM/libGLES_CM.hpp
+@@ -261,7 +261,7 @@ class LibGLES_CM (private)
+ #endif
+ #elif defined(__ANDROID__)
+ const char *libGLES_CM_lib[] = {"libGLESv1_CM_swiftshader.so", "libGLESv1_CM_swiftshader.so"};
+- #elif defined(__linux__)
++ #elif defined(__linux__) || defined(__FreeBSD__)
+ #if defined(__LP64__)
+ const char *libGLES_CM_lib[] = {"lib64GLES_CM_translator.so", "libGLES_CM.so.1", "libGLES_CM.so"};
+ #else
Property changes on: branches/2019Q2/www/chromium/files/patch-third__party_swiftshader_src_OpenGL_libGLES__CM_libGLES__CM.hpp
___________________________________________________________________
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/2019Q2/www/chromium/files/patch-third__party_swiftshader_src_OpenGL_libGLESv2_libGLESv2.hpp
===================================================================
--- branches/2019Q2/www/chromium/files/patch-third__party_swiftshader_src_OpenGL_libGLESv2_libGLESv2.hpp (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-third__party_swiftshader_src_OpenGL_libGLESv2_libGLESv2.hpp (revision 497959)
@@ -1,11 +1,11 @@
---- third_party/swiftshader/src/OpenGL/libGLESv2/libGLESv2.hpp.orig 2018-12-03 21:20:24.000000000 +0100
-+++ third_party/swiftshader/src/OpenGL/libGLESv2/libGLESv2.hpp 2018-12-15 16:50:37.213988000 +0100
-@@ -286,7 +286,7 @@
+--- third_party/swiftshader/src/OpenGL/libGLESv2/libGLESv2.hpp.orig 2019-03-11 22:08:03 UTC
++++ third_party/swiftshader/src/OpenGL/libGLESv2/libGLESv2.hpp
+@@ -286,7 +286,7 @@ class LibGLESv2 (private)
#endif
#elif defined(__ANDROID__)
const char *libGLESv2_lib[] = {"libGLESv2_swiftshader.so", "libGLESv2_swiftshader.so"};
- #elif defined(__linux__)
+ #elif defined(__linux__) || defined(__FreeBSD__)
#if defined(__LP64__)
const char *libGLESv2_lib[] = {"lib64GLES_V2_translator.so", "libGLESv2.so.2", "libGLESv2.so"};
#else
Index: branches/2019Q2/www/chromium/files/patch-third__party_swiftshader_third__party_llvm-subzero_build_Linux_include_llvm_Config_config.h
===================================================================
--- branches/2019Q2/www/chromium/files/patch-third__party_swiftshader_third__party_llvm-subzero_build_Linux_include_llvm_Config_config.h (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-third__party_swiftshader_third__party_llvm-subzero_build_Linux_include_llvm_Config_config.h (revision 497959)
@@ -0,0 +1,29 @@
+--- third_party/swiftshader/third_party/llvm-subzero/build/Linux/include/llvm/Config/config.h.orig 2019-03-11 22:08:30 UTC
++++ third_party/swiftshader/third_party/llvm-subzero/build/Linux/include/llvm/Config/config.h
+@@ -121,7 +121,7 @@
+ #define HAVE_LINK_H 1
+
+ /* Define to 1 if you have the `lseek64' function. */
+-#define HAVE_LSEEK64 1
++/* #undef HAVE_LSEEK64 */
+
+ /* Define to 1 if you have the <mach/mach.h> header file. */
+ /* #undef HAVE_MACH_MACH_H */
+@@ -130,7 +130,7 @@
+ /* #undef HAVE_MALLCTL */
+
+ /* Define to 1 if you have the `mallinfo' function. */
+-#define HAVE_MALLINFO 1
++/* #undef HAVE_MALLINFO */
+
+ /* Define to 1 if you have the <malloc.h> header file. */
+ #define HAVE_MALLOC_H 1
+@@ -154,7 +154,7 @@
+ /* #undef HAVE_NDIR_H */
+
+ /* Define to 1 if you have the `posix_fallocate' function. */
+-#define HAVE_POSIX_FALLOCATE 1
++/* #undef HAVE_POSIX_FALLOCATE */
+
+ /* Define to 1 if you have the `posix_spawn' function. */
+ #define HAVE_POSIX_SPAWN 1
Property changes on: branches/2019Q2/www/chromium/files/patch-third__party_swiftshader_third__party_llvm-subzero_build_Linux_include_llvm_Config_config.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/2019Q2/www/chromium/files/patch-third__party_swiftshader_third__party_llvm-subzero_lib_Support_Unix_Process.inc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-third__party_swiftshader_third__party_llvm-subzero_lib_Support_Unix_Process.inc (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-third__party_swiftshader_third__party_llvm-subzero_lib_Support_Unix_Process.inc (revision 497959)
@@ -0,0 +1,11 @@
+--- third_party/swiftshader/third_party/llvm-subzero/lib/Support/Unix/Process.inc.orig 2019-03-11 22:08:30 UTC
++++ third_party/swiftshader/third_party/llvm-subzero/lib/Support/Unix/Process.inc
+@@ -35,7 +35,7 @@
+ // DragonFlyBSD, OpenBSD, and Bitrig have deprecated <malloc.h> for
+ // <stdlib.h> instead. Unix.h includes this for us already.
+ #if defined(HAVE_MALLOC_H) && !defined(__DragonFly__) && \
+- !defined(__OpenBSD__) && !defined(__Bitrig__)
++ !defined(__FreeBSD__) && !defined(__OpenBSD__) && !defined(__Bitrig__)
+ #include <malloc.h>
+ #endif
+ #if defined(HAVE_MALLCTL)
Property changes on: branches/2019Q2/www/chromium/files/patch-third__party_swiftshader_third__party_llvm-subzero_lib_Support_Unix_Process.inc
___________________________________________________________________
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/2019Q2/www/chromium/files/patch-third__party_usrsctp_BUILD.gn
===================================================================
--- branches/2019Q2/www/chromium/files/patch-third__party_usrsctp_BUILD.gn (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-third__party_usrsctp_BUILD.gn (revision 497959)
@@ -1,20 +1,20 @@
---- third_party/usrsctp/BUILD.gn.orig 2017-12-15 02:04:50.000000000 +0100
-+++ third_party/usrsctp/BUILD.gn 2018-01-03 13:28:10.295173000 +0100
-@@ -109,11 +109,16 @@
+--- third_party/usrsctp/BUILD.gn.orig 2019-03-11 22:01:18 UTC
++++ third_party/usrsctp/BUILD.gn
+@@ -116,11 +116,16 @@ static_library("usrsctp") {
"-UINET6",
]
- if (is_linux || is_android) {
+ if ((is_linux && !is_bsd) || is_android ) {
defines += [
"__Userspace_os_Linux",
"_GNU_SOURCE",
]
+ } else if (is_bsd) {
+ defines += [
+ "__Userspace_os_FreeBSD",
+ ]
+ cflags += [ "-U__FreeBSD__" ]
} else if (is_mac || is_ios) {
defines += [
"HAVE_SA_LEN",
Index: branches/2019Q2/www/chromium/files/patch-third__party_webrtc_BUILD.gn
===================================================================
--- branches/2019Q2/www/chromium/files/patch-third__party_webrtc_BUILD.gn (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-third__party_webrtc_BUILD.gn (revision 497959)
@@ -1,12 +1,12 @@
---- third_party/webrtc/BUILD.gn.orig 2017-12-15 02:05:39.000000000 +0100
-+++ third_party/webrtc/BUILD.gn 2017-12-24 19:21:52.441317000 +0100
-@@ -80,6 +80,9 @@
+--- third_party/webrtc/BUILD.gn.orig 2019-03-11 22:08:05 UTC
++++ third_party/webrtc/BUILD.gn
+@@ -153,6 +153,9 @@ config("common_inherited_config") {
if (is_linux) {
defines += [ "WEBRTC_LINUX" ]
}
+ if (is_bsd) {
+ defines += [ "WEBRTC_BSD" ]
+ }
if (is_mac) {
defines += [ "WEBRTC_MAC" ]
}
Index: branches/2019Q2/www/chromium/files/patch-third__party_webrtc_modules_audio__device_BUILD.gn
===================================================================
--- branches/2019Q2/www/chromium/files/patch-third__party_webrtc_modules_audio__device_BUILD.gn (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-third__party_webrtc_modules_audio__device_BUILD.gn (revision 497959)
@@ -1,11 +1,11 @@
---- third_party/webrtc/modules/audio_device/BUILD.gn.orig 2017-12-15 02:05:40.000000000 +0100
-+++ third_party/webrtc/modules/audio_device/BUILD.gn 2017-12-30 03:44:43.126008000 +0100
-@@ -177,7 +177,7 @@
+--- third_party/webrtc/modules/audio_device/BUILD.gn.orig 2019-03-11 22:08:06 UTC
++++ third_party/webrtc/modules/audio_device/BUILD.gn
+@@ -312,7 +312,7 @@ rtc_source_set("audio_device_impl") {
if (rtc_use_dummy_audio_file_devices) {
defines += [ "WEBRTC_DUMMY_FILE_DEVICES" ]
} else {
- if (is_linux) {
+ if (is_linux && !is_bsd) {
sources += [
"linux/alsasymboltable_linux.cc",
"linux/alsasymboltable_linux.h",
Index: branches/2019Q2/www/chromium/files/patch-third__party_webrtc_modules_rtp__rtcp_source_forward__error__correction.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-third__party_webrtc_modules_rtp__rtcp_source_forward__error__correction.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-third__party_webrtc_modules_rtp__rtcp_source_forward__error__correction.cc (revision 497959)
@@ -1,10 +1,10 @@
---- third_party/webrtc/modules/rtp_rtcp/source/forward_error_correction.cc.orig 2019-01-30 02:20:37.000000000 +0100
-+++ third_party/webrtc/modules/rtp_rtcp/source/forward_error_correction.cc 2019-02-01 13:38:23.452214000 +0100
+--- third_party/webrtc/modules/rtp_rtcp/source/forward_error_correction.cc.orig 2019-03-11 22:08:10 UTC
++++ third_party/webrtc/modules/rtp_rtcp/source/forward_error_correction.cc
@@ -12,6 +12,7 @@
#include <string.h>
#include <algorithm>
+#include <cstdlib>
#include <utility>
#include "modules/include/module_common_types_public.h"
Index: branches/2019Q2/www/chromium/files/patch-third__party_webrtc_rtc__base_BUILD.gn
===================================================================
--- branches/2019Q2/www/chromium/files/patch-third__party_webrtc_rtc__base_BUILD.gn (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-third__party_webrtc_rtc__base_BUILD.gn (revision 497959)
@@ -0,0 +1,20 @@
+--- third_party/webrtc/rtc_base/BUILD.gn.orig 2019-03-11 22:08:15 UTC
++++ third_party/webrtc/rtc_base/BUILD.gn
+@@ -1088,8 +1088,6 @@ rtc_static_library("rtc_base") {
+
+ if (rtc_use_x11) {
+ libs += [
+- "dl",
+- "rt",
+ "Xext",
+ "X11",
+ "Xcomposite",
+@@ -1097,7 +1095,7 @@ rtc_static_library("rtc_base") {
+ ]
+ }
+
+- if (is_linux) {
++ if (is_linux && !is_bsd) {
+ libs += [
+ "dl",
+ "rt",
Property changes on: branches/2019Q2/www/chromium/files/patch-third__party_webrtc_rtc__base_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/2019Q2/www/chromium/files/patch-third__party_webrtc_rtc__base_byte__order.h
===================================================================
--- branches/2019Q2/www/chromium/files/patch-third__party_webrtc_rtc__base_byte__order.h (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-third__party_webrtc_rtc__base_byte__order.h (revision 497959)
@@ -0,0 +1,11 @@
+--- third_party/webrtc/rtc_base/byte_order.h.orig 2019-03-11 22:08:15 UTC
++++ third_party/webrtc/rtc_base/byte_order.h
+@@ -79,7 +79,7 @@
+ #error WEBRTC_ARCH_BIG_ENDIAN or WEBRTC_ARCH_LITTLE_ENDIAN must be defined.
+ #endif // defined(WEBRTC_ARCH_LITTLE_ENDIAN)
+ #elif defined(WEBRTC_POSIX)
+-#include <endian.h>
++#include <sys/endian.h>
+ #endif
+
+ namespace rtc {
Property changes on: branches/2019Q2/www/chromium/files/patch-third__party_webrtc_rtc__base_byte__order.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/2019Q2/www/chromium/files/patch-third__party_webrtc_rtc__base_ifaddrs__converter.h
===================================================================
--- branches/2019Q2/www/chromium/files/patch-third__party_webrtc_rtc__base_ifaddrs__converter.h (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-third__party_webrtc_rtc__base_ifaddrs__converter.h (revision 497959)
@@ -0,0 +1,11 @@
+--- third_party/webrtc/rtc_base/ifaddrs_converter.h.orig 2019-03-11 22:08:15 UTC
++++ third_party/webrtc/rtc_base/ifaddrs_converter.h
+@@ -14,6 +14,8 @@
+ #if defined(WEBRTC_ANDROID)
+ #include "rtc_base/ifaddrs_android.h"
+ #else
++#include <sys/types.h>
++#include <sys/socket.h>
+ #include <ifaddrs.h>
+ #endif // WEBRTC_ANDROID
+
Property changes on: branches/2019Q2/www/chromium/files/patch-third__party_webrtc_rtc__base_ifaddrs__converter.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/2019Q2/www/chromium/files/patch-third__party_webrtc_rtc__base_ip__address.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-third__party_webrtc_rtc__base_ip__address.cc (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-third__party_webrtc_rtc__base_ip__address.cc (revision 497959)
@@ -0,0 +1,12 @@
+--- third_party/webrtc/rtc_base/ip_address.cc.orig 2019-03-11 22:08:15 UTC
++++ third_party/webrtc/rtc_base/ip_address.cc
+@@ -11,6 +11,9 @@
+ #if defined(WEBRTC_POSIX)
+ #include <netinet/in.h>
+ #include <sys/socket.h>
++#if defined(WEBRTC_BSD)
++#include <sys/types.h>
++#endif
+ #ifdef OPENBSD
+ #include <netinet/in_systm.h>
+ #endif
Property changes on: branches/2019Q2/www/chromium/files/patch-third__party_webrtc_rtc__base_ip__address.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/2019Q2/www/chromium/files/patch-third__party_webrtc_rtc__base_ip__address.h
===================================================================
--- branches/2019Q2/www/chromium/files/patch-third__party_webrtc_rtc__base_ip__address.h (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-third__party_webrtc_rtc__base_ip__address.h (revision 497959)
@@ -0,0 +1,13 @@
+--- third_party/webrtc/rtc_base/ip_address.h.orig 2019-03-11 22:08:15 UTC
++++ third_party/webrtc/rtc_base/ip_address.h
+@@ -17,6 +17,10 @@
+ #include <netinet/in.h>
+ #include <sys/socket.h>
+ #endif
++#if defined(WEBRTC_BSD)
++#include <sys/types.h>
++#include <sys/socket.h>
++#endif
+ #if defined(WEBRTC_WIN)
+ #include <winsock2.h>
+ #include <ws2tcpip.h>
Property changes on: branches/2019Q2/www/chromium/files/patch-third__party_webrtc_rtc__base_ip__address.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/2019Q2/www/chromium/files/patch-third__party_webrtc_rtc__base_network.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-third__party_webrtc_rtc__base_network.cc (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-third__party_webrtc_rtc__base_network.cc (revision 497959)
@@ -0,0 +1,29 @@
+--- third_party/webrtc/rtc_base/network.cc.orig 2019-03-11 22:08:15 UTC
++++ third_party/webrtc/rtc_base/network.cc
+@@ -14,7 +14,7 @@
+ // linux/if.h can't be included at the same time as the posix sys/if.h, and
+ // it's transitively required by linux/route.h, so include that version on
+ // linux instead of the standard posix one.
+-#if defined(WEBRTC_LINUX)
++#if defined(WEBRTC_LINUX) && !defined(WEBRTC_BSD)
+ #include <linux/if.h>
+ #include <linux/route.h>
+ #elif !defined(__native_client__)
+@@ -762,7 +762,7 @@ bool BasicNetworkManager::CreateNetworks(bool include_
+ }
+ #endif // WEBRTC_WIN
+
+-#if defined(WEBRTC_LINUX)
++#if defined(WEBRTC_LINUX) && !defined(WEBRTC_BSD)
+ bool IsDefaultRoute(const std::string& network_name) {
+ FILE* f = fopen("/proc/net/route", "r");
+ if (!f) {
+@@ -805,7 +805,7 @@ bool BasicNetworkManager::IsIgnoredNetwork(const Netwo
+ strncmp(network.name().c_str(), "vboxnet", 7) == 0) {
+ return true;
+ }
+-#if defined(WEBRTC_LINUX)
++#if defined(WEBRTC_LINUX) && !defined(WEBRTC_BSD)
+ // Make sure this is a default route, if we're ignoring non-defaults.
+ if (ignore_non_default_routes_ && !IsDefaultRoute(network.name())) {
+ return true;
Property changes on: branches/2019Q2/www/chromium/files/patch-third__party_webrtc_rtc__base_network.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/2019Q2/www/chromium/files/patch-third__party_webrtc_rtc__base_network.h
===================================================================
--- branches/2019Q2/www/chromium/files/patch-third__party_webrtc_rtc__base_network.h (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-third__party_webrtc_rtc__base_network.h (revision 497959)
@@ -0,0 +1,13 @@
+--- third_party/webrtc/rtc_base/network.h.orig 2019-03-11 22:08:15 UTC
++++ third_party/webrtc/rtc_base/network.h
+@@ -25,6 +25,10 @@
+ #include "rtc_base/network_monitor.h"
+ #include "rtc_base/third_party/sigslot/sigslot.h"
+
++#if defined(WEBRTC_BSD)
++#include <sys/types.h>
++#endif
++
+ #if defined(WEBRTC_POSIX)
+ struct ifaddrs;
+ #endif // defined(WEBRTC_POSIX)
Property changes on: branches/2019Q2/www/chromium/files/patch-third__party_webrtc_rtc__base_network.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/2019Q2/www/chromium/files/patch-third__party_webrtc_rtc__base_physical__socket__server.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-third__party_webrtc_rtc__base_physical__socket__server.cc (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-third__party_webrtc_rtc__base_physical__socket__server.cc (revision 497959)
@@ -0,0 +1,56 @@
+--- 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
+@@ -66,7 +66,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)
+ 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) {
+ 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) {
+ int PhysicalSocket::Send(const void* pv, size_t cb) {
+ int sent = DoSend(
+ s_, reinterpret_cast<const char*>(pv), static_cast<int>(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,
+ size_t len = addr.ToSockAddrStorage(&saddr);
+ int sent =
+ DoSendTo(s_, static_cast<const char*>(buffer), static_cast<int>(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
+ *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)
Property changes on: branches/2019Q2/www/chromium/files/patch-third__party_webrtc_rtc__base_physical__socket__server.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/2019Q2/www/chromium/files/patch-third__party_webrtc_rtc__base_physical__socket__server.h
===================================================================
--- branches/2019Q2/www/chromium/files/patch-third__party_webrtc_rtc__base_physical__socket__server.h (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-third__party_webrtc_rtc__base_physical__socket__server.h (revision 497959)
@@ -0,0 +1,11 @@
+--- third_party/webrtc/rtc_base/physical_socket_server.h.orig 2019-03-11 22:08:16 UTC
++++ third_party/webrtc/rtc_base/physical_socket_server.h
+@@ -11,7 +11,7 @@
+ #ifndef RTC_BASE_PHYSICAL_SOCKET_SERVER_H_
+ #define RTC_BASE_PHYSICAL_SOCKET_SERVER_H_
+
+-#if defined(WEBRTC_POSIX) && defined(WEBRTC_LINUX)
++#if defined(WEBRTC_POSIX) && defined(WEBRTC_LINUX) && !defined(WEBRTC_BSD)
+ #include <sys/epoll.h>
+ #define WEBRTC_USE_EPOLL 1
+ #endif
Property changes on: branches/2019Q2/www/chromium/files/patch-third__party_webrtc_rtc__base_physical__socket__server.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/2019Q2/www/chromium/files/patch-third__party_webrtc_rtc__base_platform__thread__types.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-third__party_webrtc_rtc__base_platform__thread__types.cc (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-third__party_webrtc_rtc__base_platform__thread__types.cc (revision 497959)
@@ -0,0 +1,40 @@
+--- third_party/webrtc/rtc_base/platform_thread_types.cc.orig 2019-03-11 22:08:16 UTC
++++ third_party/webrtc/rtc_base/platform_thread_types.cc
+@@ -11,7 +11,9 @@
+ #include "rtc_base/platform_thread_types.h"
+
+ #if defined(WEBRTC_LINUX)
++#if !defined(__FreeBSD__)
+ #include <sys/prctl.h>
++#endif
+ #include <sys/syscall.h>
+ #endif
+
+@@ -27,8 +29,10 @@ PlatformThreadId CurrentThreadId() {
+ return gettid();
+ #elif defined(WEBRTC_FUCHSIA)
+ return zx_thread_self();
+-#elif defined(WEBRTC_LINUX)
++#elif defined(WEBRTC_LINUX) && !defined(__FreeBSD__)
+ return syscall(__NR_gettid);
++#elif defined(__FreeBSD__)
++ return reinterpret_cast<uint64_t>(pthread_self());
+ #else
+ // Default implementation for nacl and solaris.
+ return reinterpret_cast<pid_t>(pthread_self());
+@@ -55,6 +59,7 @@ bool IsThreadRefEqual(const PlatformThreadRef& a, cons
+ }
+
+ void SetCurrentThreadName(const char* name) {
++#if !defined(__FreeBSD__)
+ #if defined(WEBRTC_WIN)
+ struct {
+ DWORD dwType;
+@@ -72,6 +77,7 @@ void SetCurrentThreadName(const char* name) {
+ prctl(PR_SET_NAME, reinterpret_cast<unsigned long>(name)); // NOLINT
+ #elif defined(WEBRTC_MAC) || defined(WEBRTC_IOS)
+ pthread_setname_np(name);
++#endif
+ #endif
+ }
+
Property changes on: branches/2019Q2/www/chromium/files/patch-third__party_webrtc_rtc__base_platform__thread__types.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/2019Q2/www/chromium/files/patch-third__party_webrtc_rtc__base_string__utils.h
===================================================================
--- branches/2019Q2/www/chromium/files/patch-third__party_webrtc_rtc__base_string__utils.h (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-third__party_webrtc_rtc__base_string__utils.h (revision 497959)
@@ -0,0 +1,17 @@
+--- 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 <stdlib.h>
+-#else // BSD
++#else // WEBRTC_BSD
+ #include <alloca.h>
+-#endif // !BSD
++#endif // !WEBRTC_BSD
+ #include <strings.h>
+ #endif // WEBRTC_POSIX
+
Property changes on: branches/2019Q2/www/chromium/files/patch-third__party_webrtc_rtc__base_string__utils.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/2019Q2/www/chromium/files/patch-third__party_webrtc_system__wrappers_BUILD.gn
===================================================================
--- branches/2019Q2/www/chromium/files/patch-third__party_webrtc_system__wrappers_BUILD.gn (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-third__party_webrtc_system__wrappers_BUILD.gn (revision 497959)
@@ -1,11 +1,11 @@
---- third_party/webrtc/system_wrappers/BUILD.gn.orig 2017-12-15 02:05:40.000000000 +0100
-+++ third_party/webrtc/system_wrappers/BUILD.gn 2017-12-24 19:38:19.942270000 +0100
-@@ -72,8 +72,6 @@
+--- third_party/webrtc/system_wrappers/BUILD.gn.orig 2019-03-11 22:08:22 UTC
++++ third_party/webrtc/system_wrappers/BUILD.gn
+@@ -59,8 +59,6 @@ rtc_static_library("system_wrappers") {
if (!build_with_chromium) {
deps += [ ":cpu_features_linux" ]
}
-
- libs += [ "rt" ]
}
- if (is_linux || is_android) {
+ if (is_win) {
Index: branches/2019Q2/www/chromium/files/patch-third__party_yasm_yasm__assemble.gni
===================================================================
--- branches/2019Q2/www/chromium/files/patch-third__party_yasm_yasm__assemble.gni (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-third__party_yasm_yasm__assemble.gni (revision 497959)
@@ -0,0 +1,159 @@
+--- third_party/yasm/yasm_assemble.gni.orig 2019-03-18 08:59:45 UTC
++++ third_party/yasm/yasm_assemble.gni
+@@ -1,105 +1,23 @@
+-# Copyright 2014 The Chromium Authors. All rights reserved.
++# Copyright 2016 The Chromium Authors. All rights reserved.
+ # Use of this source code is governed by a BSD-style license that can be
+ # found in the LICENSE file.
+
+-# This provides the yasm_assemble() template which uses YASM to assemble
+-# assembly files.
+-#
+-# Files to be assembled with YASM should have an extension of .asm.
+-#
+-# Parameters
+-#
+-# yasm_flags (optional)
+-# [list of strings] Pass additional flags into YASM. These are appended
+-# to the command line. Note that the target machine type and system is
+-# already set up based on the current toolchain so you don't need to
+-# specify these things (see below).
+-#
+-# Example: yasm_flags = [ "--force-strict" ]
+-#
+-# include_dirs (optional)
+-# [list of dir names] List of additional include dirs. Note that the
+-# source root and the root generated file dir is always added, just like
+-# our C++ build sets up.
+-#
+-# Example: include_dirs = [ "//some/other/path", target_gen_dir ]
+-#
+-# defines (optional)
+-# [list of strings] List of defines, as with the native code defines.
+-#
+-# Example: defines = [ "FOO", "BAR=1" ]
+-#
+-# inputs, deps, visibility (optional)
+-# These have the same meaning as in an action.
+-#
+-# Example
+-#
+-# yasm_assemble("my_yasm_target") {
+-# sources = [
+-# "ultra_optimized_awesome.asm",
+-# ]
+-# include_dirs = [ "assembly_include" ]
+-# }
+-
+-if (is_mac || is_ios) {
+- if (current_cpu == "x86") {
+- _yasm_flags = [
+- "-fmacho32",
+- "-m",
+- "x86",
+- ]
+- } else if (current_cpu == "x64") {
+- _yasm_flags = [
+- "-fmacho64",
+- "-m",
+- "amd64",
+- ]
+- }
+-} else if (is_posix || is_fuchsia) {
+- if (current_cpu == "x86") {
+- _yasm_flags = [
+- "-felf32",
+- "-m",
+- "x86",
+- ]
+- } else if (current_cpu == "x64") {
+- _yasm_flags = [
+- "-DPIC",
+- "-felf64",
+- "-m",
+- "amd64",
+- ]
+- }
+-} else if (is_win) {
+- if (current_cpu == "x86") {
+- _yasm_flags = [
+- "-DPREFIX",
+- "-fwin32",
+- "-m",
+- "x86",
+- ]
+- } else if (current_cpu == "x64") {
+- _yasm_flags = [
+- "-fwin64",
+- "-m",
+- "amd64",
+- ]
+- }
++if (current_cpu == "x86") {
++ _yasm_flags = [
++ "-felf32",
++ "-m",
++ "x86",
++ ]
++} else if (current_cpu == "x64") {
++ _yasm_flags = [
++ "-DPIC",
++ "-felf64",
++ "-m",
++ "amd64",
++ ]
+ }
+
+-if (is_win) {
+- asm_obj_extension = "obj"
+-} else {
+- asm_obj_extension = "o"
+-}
+-
+ template("yasm_assemble") {
+- assert(defined(invoker.sources), "Need sources defined for $target_name")
+-
+- # Only depend on YASM on x86 systems. Force compilation of .asm files for
+- # ARM to fail.
+- assert(current_cpu == "x86" || current_cpu == "x64")
+-
+ action_name = "${target_name}_action"
+ source_set_name = target_name
+
+@@ -114,24 +32,12 @@ template("yasm_assemble") {
+ inputs = invoker.inputs
+ }
+
+- # Executable (first in the args). The binary might be in the root build dir
+- # (no cross-compiling) or in a toolchain-specific subdirectory of that
+- # (when cross-compiling).
+- yasm_label = "//third_party/yasm($host_toolchain)"
+- args = [ "./" + # Force current dir.
+- rebase_path(get_label_info(yasm_label, "root_out_dir") + "/yasm",
+- root_build_dir) ]
+-
+- # Deps.
+- deps = [
+- yasm_label,
+- ]
++ deps = []
+ if (defined(invoker.deps)) {
+ deps += invoker.deps
+ }
+
+- # Flags.
+- args += _yasm_flags
++ args = [ "yasm" ] + _yasm_flags
+ if (defined(invoker.yasm_flags)) {
+ args += invoker.yasm_flags
+ }
+@@ -188,9 +94,6 @@ template("yasm_assemble") {
+ }
+
+ sources = get_target_outputs(":$action_name")
+-
+- # Do not publicize any header to remove build dependency.
+- public = []
+
+ deps = [
+ ":$action_name",
Property changes on: branches/2019Q2/www/chromium/files/patch-third__party_yasm_yasm__assemble.gni
___________________________________________________________________
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/2019Q2/www/chromium/files/patch-third__party_zlib_arm__features.c
===================================================================
--- branches/2019Q2/www/chromium/files/patch-third__party_zlib_arm__features.c (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-third__party_zlib_arm__features.c (revision 497959)
@@ -1,28 +1,28 @@
---- third_party/zlib/arm_features.c.orig 2019-01-30 02:18:52.000000000 +0100
-+++ third_party/zlib/arm_features.c 2019-02-01 14:35:44.086582000 +0100
-@@ -21,9 +21,10 @@
+--- third_party/zlib/arm_features.c.orig 2019-03-11 22:01:18 UTC
++++ third_party/zlib/arm_features.c
+@@ -21,9 +21,10 @@ int ZLIB_INTERNAL arm_cpu_enable_pmull = 0;
#include <asm/hwcap.h>
#include <sys/auxv.h>
#else
-#error ### No ARM CPU features detection in your platform/OS
+/* #error ### No ARM CPU features detection in your platform/OS */
#endif
+#ifdef ARMV8_OS_LINUX
static pthread_once_t cpu_check_inited_once = PTHREAD_ONCE_INIT;
static void init_arm_features(void)
-@@ -55,10 +56,13 @@
+@@ -55,10 +56,13 @@ static void init_arm_features(void)
if (capabilities & flag_pmull)
arm_cpu_enable_pmull = 1;
}
+#endif
void ZLIB_INTERNAL arm_check_features(void)
{
+#ifdef ARMV8_OS_LINUX
pthread_once(&cpu_check_inited_once, init_arm_features);
+#endif
}
#else
#include <windows.h>
Index: branches/2019Q2/www/chromium/files/patch-tools_gn_base_files_file__posix.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-tools_gn_base_files_file__posix.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-tools_gn_base_files_file__posix.cc (revision 497959)
@@ -1,11 +1,11 @@
---- tools/gn/base/files/file_posix.cc.orig 2019-02-06 23:16:22.000000000 +0100
-+++ tools/gn/base/files/file_posix.cc 2019-02-08 18:18:17.423059000 +0100
-@@ -414,7 +414,7 @@
+--- tools/gn/base/files/file_posix.cc.orig 2019-03-11 22:12:13 UTC
++++ tools/gn/base/files/file_posix.cc
+@@ -414,7 +414,7 @@ void File::DoInitialize(const FilePath& path, uint32_t
bool File::Flush() {
DCHECK(IsValid());
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
return !HANDLE_EINTR(fdatasync(file_.get()));
#else
return !HANDLE_EINTR(fsync(file_.get()));
Index: branches/2019Q2/www/chromium/files/patch-tools_gn_build_gen.py
===================================================================
--- branches/2019Q2/www/chromium/files/patch-tools_gn_build_gen.py (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-tools_gn_build_gen.py (revision 497959)
@@ -1,33 +1,33 @@
---- tools/gn/build/gen.py.orig 2019-02-06 23:16:22.000000000 +0100
-+++ tools/gn/build/gen.py 2019-02-08 18:27:37.227094000 +0100
-@@ -44,7 +44,7 @@
+--- tools/gn/build/gen.py.orig 2019-03-11 22:12:13 UTC
++++ tools/gn/build/gen.py
+@@ -44,7 +44,7 @@ class Platform(object):
@staticmethod
def known_platforms():
- return ['linux', 'darwin', 'msvc', 'aix', 'fuchsia']
+ return ['linux', 'darwin', 'msvc', 'aix', 'fuchsia', 'freebsd']
def platform(self):
return self._platform
-@@ -67,6 +67,9 @@
+@@ -67,6 +67,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']
-@@ -332,6 +335,11 @@
+@@ -332,6 +335,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/2019Q2/www/chromium/files/patch-tools_gn_tools_gn_exec__process.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-tools_gn_tools_gn_exec__process.cc (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-tools_gn_tools_gn_exec__process.cc (revision 497959)
@@ -0,0 +1,13 @@
+--- tools/gn/tools/gn/exec_process.cc.orig 2019-03-11 22:12:13 UTC
++++ tools/gn/tools/gn/exec_process.cc
+@@ -29,6 +29,10 @@
+ #include "base/posix/file_descriptor_shuffle.h"
+ #endif
+
++#if defined(OS_BSD)
++#include <signal.h>
++#endif
++
+ namespace internal {
+
+ #if defined(OS_WIN)
Property changes on: branches/2019Q2/www/chromium/files/patch-tools_gn_tools_gn_exec__process.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/2019Q2/www/chromium/files/patch-tools_json__schema__compiler_feature__compiler.py
===================================================================
--- branches/2019Q2/www/chromium/files/patch-tools_json__schema__compiler_feature__compiler.py (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-tools_json__schema__compiler_feature__compiler.py (revision 497959)
@@ -0,0 +1,10 @@
+--- tools/json_schema_compiler/feature_compiler.py.orig 2019-03-11 22:01:18 UTC
++++ tools/json_schema_compiler/feature_compiler.py
+@@ -205,6 +205,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',
+ }
Property changes on: branches/2019Q2/www/chromium/files/patch-tools_json__schema__compiler_feature__compiler.py
___________________________________________________________________
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/2019Q2/www/chromium/files/patch-tools_json__schema__compiler_model.py
===================================================================
--- branches/2019Q2/www/chromium/files/patch-tools_json__schema__compiler_model.py (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-tools_json__schema__compiler_model.py (revision 497959)
@@ -0,0 +1,11 @@
+--- tools/json_schema_compiler/model.py.orig 2019-03-11 22:01:18 UTC
++++ tools/json_schema_compiler/model.py
+@@ -602,7 +602,7 @@ class Platforms(object):
+ """
+ CHROMEOS = _PlatformInfo("chromeos")
+ CHROMEOS_TOUCH = _PlatformInfo("chromeos_touch")
+- LINUX = _PlatformInfo("linux")
++ LINUX = _PlatformInfo("bsd")
+ MAC = _PlatformInfo("mac")
+ WIN = _PlatformInfo("win")
+
Property changes on: branches/2019Q2/www/chromium/files/patch-tools_json__schema__compiler_model.py
___________________________________________________________________
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/2019Q2/www/chromium/files/patch-tools_perf_chrome__telemetry__build_BUILD.gn
===================================================================
--- branches/2019Q2/www/chromium/files/patch-tools_perf_chrome__telemetry__build_BUILD.gn (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-tools_perf_chrome__telemetry__build_BUILD.gn (revision 497959)
@@ -1,11 +1,11 @@
---- tools/perf/chrome_telemetry_build/BUILD.gn.orig 2017-12-15 02:04:51.000000000 +0100
-+++ tools/perf/chrome_telemetry_build/BUILD.gn 2017-12-24 19:48:41.050737000 +0100
-@@ -37,7 +37,7 @@
+--- tools/perf/chrome_telemetry_build/BUILD.gn.orig 2019-03-11 22:01:18 UTC
++++ tools/perf/chrome_telemetry_build/BUILD.gn
+@@ -40,7 +40,7 @@ group("telemetry_chrome_test") {
data_deps += [ "//chrome:reorder_imports" ]
}
- if (is_linux) {
+ if (is_linux && !is_bsd) {
data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ]
}
Index: branches/2019Q2/www/chromium/files/patch-tools_variations_fieldtrial__to__struct.py
===================================================================
--- branches/2019Q2/www/chromium/files/patch-tools_variations_fieldtrial__to__struct.py (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-tools_variations_fieldtrial__to__struct.py (revision 497959)
@@ -1,10 +1,10 @@
---- tools/variations/fieldtrial_to_struct.py.orig 2019-02-06 23:07:02.000000000 +0100
-+++ tools/variations/fieldtrial_to_struct.py 2019-02-08 19:20:20.308979000 +0100
-@@ -24,6 +24,7 @@
+--- tools/variations/fieldtrial_to_struct.py.orig 2019-03-11 22:01:18 UTC
++++ tools/variations/fieldtrial_to_struct.py
+@@ -24,6 +24,7 @@ finally:
_platforms = [
'android',
'android_webview',
+ 'freebsd',
'chromeos',
'fuchsia',
'ios',
Index: branches/2019Q2/www/chromium/files/patch-ui_base_dragdrop_os__exchange__data__provider__factory.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-ui_base_dragdrop_os__exchange__data__provider__factory.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-ui_base_dragdrop_os__exchange__data__provider__factory.cc (revision 497959)
@@ -1,20 +1,20 @@
---- ui/base/dragdrop/os_exchange_data_provider_factory.cc.orig 2018-02-24 16:25:37.000000000 +0100
-+++ ui/base/dragdrop/os_exchange_data_provider_factory.cc 2018-03-04 04:46:54.356687000 +0100
-@@ -9,7 +9,7 @@
+--- 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
+@@ -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"
-@@ -43,7 +43,7 @@
+@@ -42,7 +42,7 @@ OSExchangeDataProviderFactory::CreateProvider() {
#if defined(USE_X11)
return std::make_unique<OSExchangeDataProviderAuraX11>();
-#elif defined(OS_LINUX)
+#elif defined(OS_LINUX) || defined(OS_BSD)
return std::make_unique<OSExchangeDataProviderAura>();
#elif defined(OS_MACOSX)
return ui::BuildOSExchangeDataProviderMac();
Index: branches/2019Q2/www/chromium/files/patch-ui_base_ime_ime__engine__handler__interface.h
===================================================================
--- branches/2019Q2/www/chromium/files/patch-ui_base_ime_ime__engine__handler__interface.h (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-ui_base_ime_ime__engine__handler__interface.h (revision 497959)
@@ -1,11 +1,11 @@
---- ui/base/ime/ime_engine_handler_interface.h.orig 2017-06-05 19:03:30 UTC
+--- ui/base/ime/ime_engine_handler_interface.h.orig 2019-03-11 22:01:19 UTC
+++ ui/base/ime/ime_engine_handler_interface.h
-@@ -142,7 +142,7 @@ class UI_BASE_IME_EXPORT IMEEngineHandlerInterface {
- // Hides the input view window (from API call).
- virtual void HideInputView() = 0;
+@@ -166,7 +166,7 @@ class UI_BASE_IME_EXPORT IMEEngineHandlerInterface {
+ virtual void SetMirroringEnabled(bool mirroring_enabled) = 0;
+ virtual void SetCastingEnabled(bool casting_enabled) = 0;
-#elif defined(OS_LINUX) || defined(OS_WIN)
+#elif defined(OS_LINUX) || defined(OS_WIN) || defined(OS_BSD)
// Get the id of the IME extension.
virtual std::string GetExtensionId() const = 0;
Index: branches/2019Q2/www/chromium/files/patch-ui_base_ime_input__method__initializer.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-ui_base_ime_input__method__initializer.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-ui_base_ime_input__method__initializer.cc (revision 497959)
@@ -1,38 +1,38 @@
---- ui/base/ime/input_method_initializer.cc.orig 2018-06-13 00:11:09.000000000 +0200
-+++ ui/base/ime/input_method_initializer.cc 2018-07-19 21:52:04.744818000 +0200
+--- ui/base/ime/input_method_initializer.cc.orig 2019-03-11 22:01:19 UTC
++++ ui/base/ime/input_method_initializer.cc
@@ -8,7 +8,7 @@
#if defined(OS_CHROMEOS)
#include "ui/base/ime/ime_bridge.h"
-#elif defined(USE_AURA) && defined(OS_LINUX)
+#elif defined(USE_AURA) && (defined(OS_LINUX) || defined(OS_BSD))
#include "base/logging.h"
#include "ui/base/ime/linux/fake_input_method_context_factory.h"
#elif defined(OS_WIN)
@@ -18,7 +18,7 @@
namespace {
-#if !defined(OS_CHROMEOS) && defined(USE_AURA) && defined(OS_LINUX)
+#if !defined(OS_CHROMEOS) && defined(USE_AURA) && (defined(OS_LINUX) || defined(OS_BSD))
const ui::LinuxInputMethodContextFactory*
g_linux_input_method_context_factory_for_testing;
#endif
-@@ -46,7 +46,7 @@
+@@ -46,7 +46,7 @@ void ShutdownInputMethod() {
void InitializeInputMethodForTesting() {
#if defined(OS_CHROMEOS)
IMEBridge::Initialize();
-#elif defined(USE_AURA) && defined(OS_LINUX)
+#elif defined(USE_AURA) && (defined(OS_LINUX) || defined(OS_BSD))
if (!g_linux_input_method_context_factory_for_testing)
g_linux_input_method_context_factory_for_testing =
new FakeInputMethodContextFactory();
-@@ -67,7 +67,7 @@
+@@ -67,7 +67,7 @@ void InitializeInputMethodForTesting() {
void ShutdownInputMethodForTesting() {
#if defined(OS_CHROMEOS)
IMEBridge::Shutdown();
-#elif defined(USE_AURA) && defined(OS_LINUX)
+#elif defined(USE_AURA) && (defined(OS_LINUX) || defined(OS_BSD))
const LinuxInputMethodContextFactory* factory =
LinuxInputMethodContextFactory::instance();
CHECK(!factory || factory == g_linux_input_method_context_factory_for_testing)
Index: branches/2019Q2/www/chromium/files/patch-ui_base_resource_resource__bundle.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-ui_base_resource_resource__bundle.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-ui_base_resource_resource__bundle.cc (revision 497959)
@@ -1,20 +1,20 @@
---- ui/base/resource/resource_bundle.cc.orig 2018-06-13 00:11:10.000000000 +0200
-+++ ui/base/resource/resource_bundle.cc 2018-07-19 21:58:34.994550000 +0200
-@@ -708,7 +708,7 @@
+--- ui/base/resource/resource_bundle.cc.orig 2019-03-11 22:01:19 UTC
++++ ui/base/resource/resource_bundle.cc
+@@ -692,7 +692,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();
-@@ -754,7 +754,7 @@
+@@ -745,7 +745,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/2019Q2/www/chromium/files/patch-ui_base_resource_resource__bundle__freebsd.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-ui_base_resource_resource__bundle__freebsd.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-ui_base_resource_resource__bundle__freebsd.cc (revision 497959)
@@ -1,24 +1,24 @@
---- ui/base/resource/resource_bundle_freebsd.cc.orig 2017-09-08 18:23:28.279481000 +0200
-+++ ui/base/resource/resource_bundle_freebsd.cc 2017-09-08 18:23:04.528326000 +0200
+--- ui/base/resource/resource_bundle_freebsd.cc.orig 2019-03-17 01:47:14 UTC
++++ ui/base/resource/resource_bundle_freebsd.cc
@@ -0,0 +1,21 @@
+// Copyright 2017 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 "ui/base/resource/resource_bundle.h"
+
+#include "base/logging.h"
+#include "base/macros.h"
+#include "ui/gfx/image/image.h"
+
+namespace ui {
+
+void ResourceBundle::LoadCommonResources() {
+ LoadChromeResources();
+}
+
+gfx::Image& ResourceBundle::GetNativeImageNamed(int resource_id) {
+ return GetImageNamed(resource_id);
+}
+
+} // namespace ui
Index: branches/2019Q2/www/chromium/files/patch-ui_base_ui__base__features.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-ui_base_ui__base__features.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-ui_base_ui__base__features.cc (revision 497959)
@@ -1,20 +1,20 @@
---- ui/base/ui_base_features.cc.orig 2018-12-28 17:00:26.368000000 +0100
-+++ ui/base/ui_base_features.cc 2018-12-28 17:01:57.144030000 +0100
-@@ -115,7 +115,7 @@
- "PrecisionTouchpadScrollPhase", base::FEATURE_ENABLED_BY_DEFAULT};
- #endif // defined(OS_WIN)
+--- ui/base/ui_base_features.cc.orig 2019-03-11 22:01:19 UTC
++++ ui/base/ui_base_features.cc
+@@ -111,7 +111,7 @@ const base::Feature kEnableAutomaticUiAdjustmentsForTo
+ "EnableAutomaticUiAdjustmentsForTouch", base::FEATURE_ENABLED_BY_DEFAULT};
+ #endif // defined(OS_WIN) || 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)
// Enables stylus appearing as touch when in contact with digitizer.
const base::Feature kDirectManipulationStylus = {
"DirectManipulationStylus",
-@@ -125,7 +125,7 @@
+@@ -121,7 +121,7 @@ const base::Feature kDirectManipulationStylus = {
base::FEATURE_DISABLED_BY_DEFAULT
#endif
};
-#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)
+#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD)
const base::Feature kMash = {"Mash", base::FEATURE_DISABLED_BY_DEFAULT};
Index: branches/2019Q2/www/chromium/files/patch-ui_base_ui__base__features.h
===================================================================
--- branches/2019Q2/www/chromium/files/patch-ui_base_ui__base__features.h (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-ui_base_ui__base__features.h (revision 497959)
@@ -1,14 +1,14 @@
---- ui/base/ui_base_features.h.orig 2018-12-28 17:00:21.672100000 +0100
-+++ ui/base/ui_base_features.h 2018-12-28 17:01:57.139278000 +0100
-@@ -42,9 +42,9 @@
- UI_BASE_EXPORT bool IsUsingWMPointerForTouch();
- #endif // defined(OS_WIN)
+--- ui/base/ui_base_features.h.orig 2019-03-11 22:01:19 UTC
++++ ui/base/ui_base_features.h
+@@ -46,9 +46,9 @@ UI_BASE_EXPORT bool IsUsingWMPointerForTouch();
+ UI_BASE_EXPORT extern const base::Feature kEnableAutomaticUiAdjustmentsForTouch;
+ #endif // defined(OS_WIN) || 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)
UI_BASE_EXPORT extern const base::Feature kDirectManipulationStylus;
-#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)
+#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD)
// Used to have ash (Chrome OS system UI) run in its own process.
// TODO(jamescook): Make flag only available in Chrome OS.
Index: branches/2019Q2/www/chromium/files/patch-ui_base_webui_web__ui__util.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-ui_base_webui_web__ui__util.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-ui_base_webui_web__ui__util.cc (revision 497959)
@@ -1,11 +1,11 @@
---- ui/base/webui/web_ui_util.cc.orig 2017-04-19 19:06:54 UTC
+--- ui/base/webui/web_ui_util.cc.orig 2019-03-11 22:01:19 UTC
+++ ui/base/webui/web_ui_util.cc
-@@ -161,7 +161,7 @@ std::string GetFontFamily() {
+@@ -217,7 +217,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/2019Q2/www/chromium/files/patch-ui_events_devices_x11_device__data__manager__x11.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-ui_events_devices_x11_device__data__manager__x11.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-ui_events_devices_x11_device__data__manager__x11.cc (revision 497959)
@@ -1,19 +1,19 @@
---- ui/events/devices/x11/device_data_manager_x11.cc.orig 2017-06-05 19:03:30 UTC
+--- ui/events/devices/x11/device_data_manager_x11.cc.orig 2019-03-11 22:01:19 UTC
+++ ui/events/devices/x11/device_data_manager_x11.cc
-@@ -834,6 +834,8 @@ void DeviceDataManagerX11::SetDisabledKeyboardAllowedK
+@@ -828,6 +828,8 @@ void DeviceDataManagerX11::SetDisabledKeyboardAllowedK
}
void DeviceDataManagerX11::DisableDevice(int deviceid) {
+ NOTIMPLEMENTED();
+#if !defined(OS_BSD)
blocked_devices_.set(deviceid, true);
// TODO(rsadam@): Support blocking touchscreen devices.
std::vector<InputDevice> keyboards = GetKeyboardDevices();
-@@ -845,6 +847,7 @@ void DeviceDataManagerX11::DisableDevice(int deviceid)
+@@ -838,6 +840,7 @@ void DeviceDataManagerX11::DisableDevice(int deviceid)
keyboards.erase(it);
DeviceDataManager::OnKeyboardDevicesUpdated(keyboards);
}
+#endif
}
void DeviceDataManagerX11::EnableDevice(int deviceid) {
Index: branches/2019Q2/www/chromium/files/patch-ui_events_event__switches.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-ui_events_event__switches.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-ui_events_event__switches.cc (revision 497959)
@@ -1,11 +1,11 @@
---- ui/events/event_switches.cc.orig 2017-06-05 19:03:30 UTC
+--- ui/events/event_switches.cc.orig 2019-03-11 22:01:19 UTC
+++ ui/events/event_switches.cc
-@@ -17,7 +17,7 @@ const char kEnableScrollPrediction[] = "enable-scroll-
+@@ -14,7 +14,7 @@ namespace switches {
const char kCompensateForUnstablePinchZoom[] =
"compensate-for-unstable-pinch-zoom";
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_FREEBSD)
// Tells chrome to interpret events from these devices as touch events. Only
// available with XInput 2 (i.e. X server 1.8 or above). The id's of the
// devices can be retrieved from 'xinput list'.
Index: branches/2019Q2/www/chromium/files/patch-ui_events_event__switches.h
===================================================================
--- branches/2019Q2/www/chromium/files/patch-ui_events_event__switches.h (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-ui_events_event__switches.h (revision 497959)
@@ -1,11 +1,11 @@
---- ui/events/event_switches.h.orig 2018-12-12 22:56:27.000000000 +0100
-+++ ui/events/event_switches.h 2019-01-09 23:42:56.991577000 +0100
-@@ -13,7 +13,7 @@
-
+--- ui/events/event_switches.h.orig 2019-03-11 22:01:19 UTC
++++ ui/events/event_switches.h
+@@ -13,7 +13,7 @@ namespace switches {
+
EVENTS_BASE_EXPORT extern const char kCompensateForUnstablePinchZoom[];
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_FREEBSD)
EVENTS_BASE_EXPORT extern const char kTouchDevices[];
EVENTS_BASE_EXPORT extern const char kPenDevices[];
#endif
Index: branches/2019Q2/www/chromium/files/patch-ui_events_keycodes_dom_keycode__converter.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-ui_events_keycodes_dom_keycode__converter.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-ui_events_keycodes_dom_keycode__converter.cc (revision 497959)
@@ -1,11 +1,11 @@
---- ui/events/keycodes/dom/keycode_converter.cc.orig 2017-04-19 19:06:54 UTC
+--- ui/events/keycodes/dom/keycode_converter.cc.orig 2019-03-11 22:01:19 UTC
+++ ui/events/keycodes/dom/keycode_converter.cc
@@ -19,7 +19,7 @@ namespace {
// and DOM Level 3 |code| strings.
#if defined(OS_WIN)
#define USB_KEYMAP(usb, evdev, xkb, win, mac, code, id) {usb, win, code}
-#elif defined(OS_LINUX)
+#elif defined(OS_LINUX) || defined(OS_BSD)
#define USB_KEYMAP(usb, evdev, xkb, win, mac, code, id) {usb, xkb, code}
#elif defined(OS_MACOSX)
#define USB_KEYMAP(usb, evdev, xkb, win, mac, code, id) {usb, mac, code}
Index: branches/2019Q2/www/chromium/files/patch-ui_gfx_BUILD.gn
===================================================================
--- branches/2019Q2/www/chromium/files/patch-ui_gfx_BUILD.gn (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-ui_gfx_BUILD.gn (revision 497959)
@@ -1,11 +1,11 @@
---- ui/gfx/BUILD.gn.orig 2018-08-01 00:09:48.000000000 +0200
-+++ ui/gfx/BUILD.gn 2018-08-04 22:24:28.133674000 +0200
-@@ -568,7 +568,7 @@
- deps += [ "//third_party/libdrm" ]
+--- ui/gfx/BUILD.gn.orig 2019-03-11 22:01:19 UTC
++++ ui/gfx/BUILD.gn
+@@ -532,7 +532,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/2019Q2/www/chromium/files/patch-ui_gfx_canvas__skia.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-ui_gfx_canvas__skia.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-ui_gfx_canvas__skia.cc (revision 497959)
@@ -1,11 +1,11 @@
---- ui/gfx/canvas_skia.cc.orig 2017-06-05 19:03:30 UTC
+--- ui/gfx/canvas_skia.cc.orig 2019-03-11 22:01:19 UTC
+++ ui/gfx/canvas_skia.cc
-@@ -200,7 +200,7 @@ void Canvas::DrawStringRectWithFlags(const base::strin
+@@ -209,7 +209,7 @@ void Canvas::DrawStringRectWithFlags(const base::strin
Range range = StripAcceleratorChars(flags, &adjusted_text);
bool elide_text = ((flags & NO_ELLIPSIS) == 0);
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
// On Linux, eliding really means fading the end of the string. But only
// for LTR text. RTL text is still elided (on the left) with "...".
if (elide_text) {
Index: branches/2019Q2/www/chromium/files/patch-ui_gfx_codec_jpeg__codec.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-ui_gfx_codec_jpeg__codec.cc (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-ui_gfx_codec_jpeg__codec.cc (revision 497959)
@@ -0,0 +1,20 @@
+--- ui/gfx/codec/jpeg_codec.cc.orig 2019-03-11 22:01:19 UTC
++++ ui/gfx/codec/jpeg_codec.cc
+@@ -207,6 +207,7 @@ bool JPEGCodec::Decode(const unsigned char* input, siz
+ case JCS_GRAYSCALE:
+ case JCS_RGB:
+ case JCS_YCbCr:
++#ifdef JCS_EXTENSIONS
+ // Choose an output colorspace and return if it is an unsupported one.
+ // Same as JPEGCodec::Encode(), libjpeg-turbo supports all input formats
+ // used by Chromium (i.e. RGBA and BGRA) and we just map the input
+@@ -223,6 +224,9 @@ bool JPEGCodec::Decode(const unsigned char* input, siz
+ NOTREACHED() << "Invalid pixel format";
+ return false;
+ }
++#else
++ cinfo.out_color_space = JCS_RGB;
++#endif
+ break;
+ case JCS_CMYK:
+ case JCS_YCCK:
Property changes on: branches/2019Q2/www/chromium/files/patch-ui_gfx_codec_jpeg__codec.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/2019Q2/www/chromium/files/patch-ui_gfx_font__fallback__linux.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-ui_gfx_font__fallback__linux.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-ui_gfx_font__fallback__linux.cc (revision 497959)
@@ -1,13 +1,13 @@
---- ui/gfx/font_fallback_linux.cc.orig 2017-04-19 19:06:54 UTC
+--- ui/gfx/font_fallback_linux.cc.orig 2019-03-11 22:01:19 UTC
+++ ui/gfx/font_fallback_linux.cc
@@ -15,6 +15,10 @@
#include "base/memory/ptr_util.h"
#include "ui/gfx/font.h"
+#if defined(OS_BSD)
+#include <unistd.h>
+#endif
+
namespace gfx {
namespace {
Index: branches/2019Q2/www/chromium/files/patch-ui_gfx_font__list.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-ui_gfx_font__list.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-ui_gfx_font__list.cc (revision 497959)
@@ -1,11 +1,11 @@
---- ui/gfx/font_list.cc.orig 2018-12-03 21:18:06.000000000 +0100
-+++ ui/gfx/font_list.cc 2018-12-15 20:17:39.591084000 +0100
-@@ -24,7 +24,7 @@
+--- ui/gfx/font_list.cc.orig 2019-03-11 22:01:19 UTC
++++ ui/gfx/font_list.cc
+@@ -24,7 +24,7 @@ base::LazyInstance<scoped_refptr<gfx::FontListImpl>>::
bool g_default_impl_initialized = false;
bool IsFontFamilyAvailable(const std::string& family, SkFontMgr* fontManager) {
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
return !!fontManager->legacyMakeTypeface(family.c_str(), SkFontStyle());
#else
sk_sp<SkFontStyleSet> set(fontManager->matchFamily(family.c_str()));
Index: branches/2019Q2/www/chromium/files/patch-ui_gfx_font__render__params.h
===================================================================
--- branches/2019Q2/www/chromium/files/patch-ui_gfx_font__render__params.h (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-ui_gfx_font__render__params.h (revision 497959)
@@ -1,18 +1,18 @@
---- ui/gfx/font_render_params.h.orig 2019-01-30 02:18:54.000000000 +0100
-+++ ui/gfx/font_render_params.h 2019-02-01 15:04:34.285442000 +0100
-@@ -111,13 +111,13 @@
+--- ui/gfx/font_render_params.h.orig 2019-03-11 22:01:19 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)
// Gets the device scale factor to query the FontRenderParams.
GFX_EXPORT float GetFontRenderParamsDeviceScaleFactor();
Index: branches/2019Q2/www/chromium/files/patch-ui_gfx_gpu__memory__buffer.h
===================================================================
--- branches/2019Q2/www/chromium/files/patch-ui_gfx_gpu__memory__buffer.h (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-ui_gfx_gpu__memory__buffer.h (revision 497959)
@@ -0,0 +1,20 @@
+--- ui/gfx/gpu_memory_buffer.h.orig 2019-03-11 22:01:19 UTC
++++ ui/gfx/gpu_memory_buffer.h
+@@ -16,7 +16,7 @@
+ #include "ui/gfx/geometry/rect.h"
+ #include "ui/gfx/gfx_export.h"
+
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+ #include "ui/gfx/native_pixmap_handle.h"
+ #elif defined(OS_MACOSX) && !defined(OS_IOS)
+ #include "ui/gfx/mac/io_surface.h"
+@@ -65,7 +65,7 @@ struct GFX_EXPORT GpuMemoryBufferHandle {
+ base::UnsafeSharedMemoryRegion region;
+ uint32_t offset;
+ int32_t stride;
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+ // TODO(crbug.com/863011): convert this to a scoped handle.
+ NativePixmapHandle native_pixmap_handle;
+ #elif defined(OS_MACOSX) && !defined(OS_IOS)
Property changes on: branches/2019Q2/www/chromium/files/patch-ui_gfx_gpu__memory__buffer.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/2019Q2/www/chromium/files/patch-ui_gfx_ipc_gfx__param__traits__macros.h
===================================================================
--- branches/2019Q2/www/chromium/files/patch-ui_gfx_ipc_gfx__param__traits__macros.h (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-ui_gfx_ipc_gfx__param__traits__macros.h (revision 497959)
@@ -0,0 +1,29 @@
+--- ui/gfx/ipc/gfx_param_traits_macros.h.orig 2019-03-11 22:01:19 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)
++#if defined(OS_LINUX) || defined(OS_BSD)
+ IPC_STRUCT_TRAITS_MEMBER(native_pixmap_handle)
+ #elif defined(OS_MACOSX)
+ IPC_STRUCT_TRAITS_MEMBER(mach_port)
+@@ -66,7 +66,7 @@ IPC_STRUCT_TRAITS_BEGIN(gfx::GpuMemoryBufferId)
+ IPC_STRUCT_TRAITS_MEMBER(id)
+ IPC_STRUCT_TRAITS_END()
+
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+ IPC_STRUCT_TRAITS_BEGIN(gfx::NativePixmapPlane)
+ IPC_STRUCT_TRAITS_MEMBER(stride)
+ IPC_STRUCT_TRAITS_MEMBER(offset)
Property changes on: branches/2019Q2/www/chromium/files/patch-ui_gfx_ipc_gfx__param__traits__macros.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/2019Q2/www/chromium/files/patch-ui_gfx_linux_client__native__pixmap__dmabuf.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-ui_gfx_linux_client__native__pixmap__dmabuf.cc (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-ui_gfx_linux_client__native__pixmap__dmabuf.cc (revision 497959)
@@ -0,0 +1,25 @@
+--- ui/gfx/linux/client_native_pixmap_dmabuf.cc.orig 2019-03-11 22:01:19 UTC
++++ ui/gfx/linux/client_native_pixmap_dmabuf.cc
+@@ -5,7 +5,9 @@
+ #include "ui/gfx/linux/client_native_pixmap_dmabuf.h"
+
+ #include <fcntl.h>
++#if !defined(__FreeBSD__)
+ #include <linux/version.h>
++#endif
+ #include <stddef.h>
+ #include <sys/ioctl.h>
+ #include <sys/mman.h>
+@@ -18,11 +20,7 @@
+ #include "base/trace_event/trace_event.h"
+ #include "build/build_config.h"
+
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0)
+-#include <linux/dma-buf.h>
+-#else
+-#include <linux/types.h>
+-
++#if defined(__FreeBSD__)
+ struct dma_buf_sync {
+ __u64 flags;
+ };
Property changes on: branches/2019Q2/www/chromium/files/patch-ui_gfx_linux_client__native__pixmap__dmabuf.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/2019Q2/www/chromium/files/patch-ui_gfx_mojo_buffer__types__struct__traits.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-ui_gfx_mojo_buffer__types__struct__traits.cc (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-ui_gfx_mojo_buffer__types__struct__traits.cc (revision 497959)
@@ -0,0 +1,38 @@
+--- ui/gfx/mojo/buffer_types_struct_traits.cc.orig 2019-03-11 22:01:19 UTC
++++ ui/gfx/mojo/buffer_types_struct_traits.cc
+@@ -28,7 +28,7 @@ bool StructTraits<gfx::mojom::BufferUsageAndFormatData
+ return data.ReadUsage(&out->usage) && data.ReadFormat(&out->format);
+ }
+
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+ std::vector<mojo::ScopedHandle>
+ StructTraits<gfx::mojom::NativePixmapHandleDataView, gfx::NativePixmapHandle>::
+ fds(const gfx::NativePixmapHandle& pixmap_handle) {
+@@ -55,7 +55,7 @@ bool StructTraits<
+ }
+ return data.ReadPlanes(&out->planes);
+ }
+-#endif // defined(OS_LINUX)
++#endif // defined(OS_LINUX) || defined(OS_BSD)
+
+ gfx::mojom::GpuMemoryBufferPlatformHandlePtr StructTraits<
+ gfx::mojom::GpuMemoryBufferHandleDataView,
+@@ -68,7 +68,7 @@ gfx::mojom::GpuMemoryBufferPlatformHandlePtr StructTra
+ return gfx::mojom::GpuMemoryBufferPlatformHandle::NewSharedMemoryHandle(
+ std::move(handle.region));
+ case gfx::NATIVE_PIXMAP:
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+ return gfx::mojom::GpuMemoryBufferPlatformHandle::NewNativePixmapHandle(
+ handle.native_pixmap_handle);
+ #else
+@@ -144,7 +144,7 @@ bool StructTraits<gfx::mojom::GpuMemoryBufferHandleDat
+ out->type = gfx::SHARED_MEMORY_BUFFER;
+ out->region = std::move(platform_handle->get_shared_memory_handle());
+ return true;
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+ case gfx::mojom::GpuMemoryBufferPlatformHandleDataView::Tag::
+ NATIVE_PIXMAP_HANDLE:
+ out->type = gfx::NATIVE_PIXMAP;
Property changes on: branches/2019Q2/www/chromium/files/patch-ui_gfx_mojo_buffer__types__struct__traits.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/2019Q2/www/chromium/files/patch-ui_gfx_mojo_buffer__types__struct__traits.h
===================================================================
--- branches/2019Q2/www/chromium/files/patch-ui_gfx_mojo_buffer__types__struct__traits.h (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-ui_gfx_mojo_buffer__types__struct__traits.h (revision 497959)
@@ -0,0 +1,20 @@
+--- ui/gfx/mojo/buffer_types_struct_traits.h.orig 2019-03-11 22:01:19 UTC
++++ ui/gfx/mojo/buffer_types_struct_traits.h
+@@ -189,7 +189,7 @@ struct StructTraits<gfx::mojom::GpuMemoryBufferIdDataV
+ }
+ };
+
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+ template <>
+ struct StructTraits<gfx::mojom::NativePixmapPlaneDataView,
+ gfx::NativePixmapPlane> {
+@@ -229,7 +229,7 @@ struct StructTraits<gfx::mojom::NativePixmapHandleData
+ static bool Read(gfx::mojom::NativePixmapHandleDataView data,
+ gfx::NativePixmapHandle* out);
+ };
+-#endif // defined(OS_LINUX)
++#endif // defined(OS_LINUX) || defined(OS_BSD)
+
+ template <>
+ struct StructTraits<gfx::mojom::GpuMemoryBufferHandleDataView,
Property changes on: branches/2019Q2/www/chromium/files/patch-ui_gfx_mojo_buffer__types__struct__traits.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/2019Q2/www/chromium/files/patch-ui_gfx_native__pixmap__handle.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-ui_gfx_native__pixmap__handle.cc (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-ui_gfx_native__pixmap__handle.cc (revision 497959)
@@ -0,0 +1,28 @@
+--- ui/gfx/native_pixmap_handle.cc.orig 2019-03-11 22:01:19 UTC
++++ ui/gfx/native_pixmap_handle.cc
+@@ -4,14 +4,14 @@
+
+ #include "ui/gfx/native_pixmap_handle.h"
+
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+ #include <drm_fourcc.h>
+ #include "base/posix/eintr_wrapper.h"
+ #endif
+
+ 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"
+ "DRM_FORMAT_MOD_INVALID");
+@@ -36,7 +36,7 @@ NativePixmapHandle::NativePixmapHandle(const NativePix
+
+ NativePixmapHandle::~NativePixmapHandle() {}
+
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+ NativePixmapHandle CloneHandleForIPC(const NativePixmapHandle& handle) {
+ NativePixmapHandle clone;
+ std::vector<base::ScopedFD> scoped_fds;
Property changes on: branches/2019Q2/www/chromium/files/patch-ui_gfx_native__pixmap__handle.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/2019Q2/www/chromium/files/patch-ui_gfx_native__pixmap__handle.h
===================================================================
--- branches/2019Q2/www/chromium/files/patch-ui_gfx_native__pixmap__handle.h (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-ui_gfx_native__pixmap__handle.h (revision 497959)
@@ -0,0 +1,28 @@
+--- ui/gfx/native_pixmap_handle.h.orig 2019-03-11 22:01:19 UTC
++++ ui/gfx/native_pixmap_handle.h
+@@ -13,7 +13,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/file_descriptor_posix.h"
+ #endif
+
+@@ -54,14 +54,14 @@ struct GFX_EXPORT NativePixmapHandle {
+
+ ~NativePixmapHandle();
+
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+ // File descriptors for the underlying memory objects (usually dmabufs).
+ std::vector<base::FileDescriptor> fds;
+ #endif
+ std::vector<NativePixmapPlane> planes;
+ };
+
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+ // Returns an instance of |handle| which can be sent over IPC. This duplicates
+ // the file-handles, so that the IPC code take ownership of them, without
+ // invalidating |handle|.
Property changes on: branches/2019Q2/www/chromium/files/patch-ui_gfx_native__pixmap__handle.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/2019Q2/www/chromium/files/patch-ui_gfx_render__text.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-ui_gfx_render__text.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-ui_gfx_render__text.cc (revision 497959)
@@ -1,46 +1,46 @@
---- ui/gfx/render_text.cc.orig 2017-06-05 19:03:30 UTC
+--- ui/gfx/render_text.cc.orig 2019-03-11 22:01:19 UTC
+++ ui/gfx/render_text.cc
-@@ -948,32 +948,33 @@ void RenderText::SetDisplayOffset(int horizontal_offse
+@@ -934,32 +934,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/2019Q2/www/chromium/files/patch-ui_gl_BUILD.gn
===================================================================
--- branches/2019Q2/www/chromium/files/patch-ui_gl_BUILD.gn (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-ui_gl_BUILD.gn (revision 497959)
@@ -1,11 +1,11 @@
---- ui/gl/BUILD.gn.orig 2018-12-03 21:18:06.000000000 +0100
-+++ ui/gl/BUILD.gn 2018-12-15 20:36:26.132070000 +0100
-@@ -203,7 +203,7 @@
+--- ui/gl/BUILD.gn.orig 2019-03-11 22:01:19 UTC
++++ ui/gl/BUILD.gn
+@@ -212,7 +212,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
Index: branches/2019Q2/www/chromium/files/patch-ui_gl_generate__bindings.py
===================================================================
--- branches/2019Q2/www/chromium/files/patch-ui_gl_generate__bindings.py (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-ui_gl_generate__bindings.py (revision 497959)
@@ -0,0 +1,12 @@
+--- ui/gl/generate_bindings.py.orig 2019-03-11 22:01:19 UTC
++++ ui/gl/generate_bindings.py
+@@ -2624,6 +2624,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', },
Property changes on: branches/2019Q2/www/chromium/files/patch-ui_gl_generate__bindings.py
___________________________________________________________________
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/2019Q2/www/chromium/files/patch-ui_gl_gl__bindings__api__autogen__glx.h
===================================================================
--- branches/2019Q2/www/chromium/files/patch-ui_gl_gl__bindings__api__autogen__glx.h (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-ui_gl_gl__bindings__api__autogen__glx.h (revision 497959)
@@ -0,0 +1,10 @@
+--- ui/gl/gl_bindings_api_autogen_glx.h.orig 2019-03-11 22:01:19 UTC
++++ ui/gl/gl_bindings_api_autogen_glx.h
+@@ -88,6 +88,7 @@ bool glXGetMscRateOMLFn(Display* dpy,
+ GLXDrawable drawable,
+ int32_t* numerator,
+ int32_t* denominator) override;
++__GLXextFuncPtr glXGetProcAddressARBFn(const GLubyte* procName) override;
+ void glXGetSelectedEventFn(Display* dpy,
+ GLXDrawable drawable,
+ unsigned long* mask) override;
Property changes on: branches/2019Q2/www/chromium/files/patch-ui_gl_gl__bindings__api__autogen__glx.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/2019Q2/www/chromium/files/patch-ui_gl_gl__bindings__autogen__glx.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-ui_gl_gl__bindings__autogen__glx.cc (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-ui_gl_gl__bindings__autogen__glx.cc (revision 497959)
@@ -0,0 +1,61 @@
+--- ui/gl/gl_bindings_autogen_glx.cc.orig 2019-03-11 22:01:19 UTC
++++ ui/gl/gl_bindings_autogen_glx.cc
+@@ -115,6 +115,8 @@ void DriverGLX::InitializeExtensionBindings() {
+
+ ext.b_GLX_ARB_create_context =
+ gfx::HasExtension(extensions, "GLX_ARB_create_context");
++ ext.b_GLX_ARB_get_proc_address =
++ gfx::HasExtension(extensions, "GLX_ARB_get_proc_address");
+ ext.b_GLX_EXT_swap_control =
+ gfx::HasExtension(extensions, "GLX_EXT_swap_control");
+ ext.b_GLX_EXT_texture_from_pixmap =
+@@ -145,6 +147,11 @@ void DriverGLX::InitializeExtensionBindings() {
+ GetGLProcAddress("glXCreateContextAttribsARB"));
+ }
+
++ if (ext.b_GLX_ARB_get_proc_address) {
++ fn.glXGetProcAddressARBFn = reinterpret_cast<glXGetProcAddressARBProc>(
++ GetGLProcAddress("glXGetProcAddressARB"));
++ }
++
+ if (ext.b_GLX_SGIX_fbconfig) {
+ fn.glXGetFBConfigFromVisualSGIXFn =
+ reinterpret_cast<glXGetFBConfigFromVisualSGIXProc>(
+@@ -346,6 +353,10 @@ bool GLXApiBase::glXGetMscRateOMLFn(Display* dpy,
+ return driver_->fn.glXGetMscRateOMLFn(dpy, drawable, numerator, denominator);
+ }
+
++__GLXextFuncPtr GLXApiBase::glXGetProcAddressARBFn(const GLubyte* procName) {
++ return driver_->fn.glXGetProcAddressARBFn(procName);
++}
++
+ void GLXApiBase::glXGetSelectedEventFn(Display* dpy,
+ GLXDrawable drawable,
+ unsigned long* mask) {
+@@ -646,6 +657,11 @@ bool TraceGLXApi::glXGetMscRateOMLFn(Display* dpy,
+ return glx_api_->glXGetMscRateOMLFn(dpy, drawable, numerator, denominator);
+ }
+
++__GLXextFuncPtr TraceGLXApi::glXGetProcAddressARBFn(const GLubyte* procName) {
++ TRACE_EVENT_BINARY_EFFICIENT0("gpu", "TraceGLAPI::glXGetProcAddressARB")
++ return glx_api_->glXGetProcAddressARBFn(procName);
++}
++
+ void TraceGLXApi::glXGetSelectedEventFn(Display* dpy,
+ GLXDrawable drawable,
+ unsigned long* mask) {
+@@ -1068,6 +1084,14 @@ bool DebugGLXApi::glXGetMscRateOMLFn(Display* dpy,
+ << static_cast<const void*>(denominator) << ")");
+ bool result =
+ glx_api_->glXGetMscRateOMLFn(dpy, drawable, numerator, denominator);
++ GL_SERVICE_LOG("GL_RESULT: " << result);
++ return result;
++}
++
++__GLXextFuncPtr DebugGLXApi::glXGetProcAddressARBFn(const GLubyte* procName) {
++ GL_SERVICE_LOG("glXGetProcAddressARB"
++ << "(" << static_cast<const void*>(procName) << ")");
++ __GLXextFuncPtr result = glx_api_->glXGetProcAddressARBFn(procName);
+ GL_SERVICE_LOG("GL_RESULT: " << result);
+ return result;
+ }
Property changes on: branches/2019Q2/www/chromium/files/patch-ui_gl_gl__bindings__autogen__glx.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/2019Q2/www/chromium/files/patch-ui_gl_gl__bindings__autogen__glx.h
===================================================================
--- branches/2019Q2/www/chromium/files/patch-ui_gl_gl__bindings__autogen__glx.h (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-ui_gl_gl__bindings__autogen__glx.h (revision 497959)
@@ -0,0 +1,43 @@
+--- ui/gl/gl_bindings_autogen_glx.h.orig 2019-03-11 22:01:19 UTC
++++ ui/gl/gl_bindings_autogen_glx.h
+@@ -104,6 +104,8 @@ typedef bool(GL_BINDING_CALL* glXGetMscRateOMLProc)(Di
+ GLXDrawable drawable,
+ int32_t* numerator,
+ int32_t* denominator);
++typedef __GLXextFuncPtr(GL_BINDING_CALL* glXGetProcAddressARBProc)(
++ const GLubyte* procName);
+ typedef void(GL_BINDING_CALL* glXGetSelectedEventProc)(Display* dpy,
+ GLXDrawable drawable,
+ unsigned long* mask);
+@@ -166,6 +168,7 @@ typedef void(GL_BINDING_CALL* glXWaitXProc)(void);
+
+ struct ExtensionsGLX {
+ bool b_GLX_ARB_create_context;
++ bool b_GLX_ARB_get_proc_address;
+ bool b_GLX_EXT_swap_control;
+ bool b_GLX_EXT_texture_from_pixmap;
+ bool b_GLX_MESA_copy_sub_buffer;
+@@ -203,6 +206,7 @@ struct ProcsGLX {
+ glXGetFBConfigFromVisualSGIXProc glXGetFBConfigFromVisualSGIXFn;
+ glXGetFBConfigsProc glXGetFBConfigsFn;
+ glXGetMscRateOMLProc glXGetMscRateOMLFn;
++ glXGetProcAddressARBProc glXGetProcAddressARBFn;
+ glXGetSelectedEventProc glXGetSelectedEventFn;
+ glXGetSyncValuesOMLProc glXGetSyncValuesOMLFn;
+ glXGetVisualFromFBConfigProc glXGetVisualFromFBConfigFn;
+@@ -310,6 +314,7 @@ class GL_EXPORT GLXApi {
+ GLXDrawable drawable,
+ int32_t* numerator,
+ int32_t* denominator) = 0;
++ virtual __GLXextFuncPtr glXGetProcAddressARBFn(const GLubyte* procName) = 0;
+ virtual void glXGetSelectedEventFn(Display* dpy,
+ GLXDrawable drawable,
+ unsigned long* mask) = 0;
+@@ -394,6 +399,7 @@ class GL_EXPORT GLXApi {
+ ::gl::g_current_glx_context->glXGetFBConfigFromVisualSGIXFn
+ #define glXGetFBConfigs ::gl::g_current_glx_context->glXGetFBConfigsFn
+ #define glXGetMscRateOML ::gl::g_current_glx_context->glXGetMscRateOMLFn
++#define glXGetProcAddressARB ::gl::g_current_glx_context->glXGetProcAddressARBFn
+ #define glXGetSelectedEvent ::gl::g_current_glx_context->glXGetSelectedEventFn
+ #define glXGetSyncValuesOML ::gl::g_current_glx_context->glXGetSyncValuesOMLFn
+ #define glXGetVisualFromFBConfig \
Property changes on: branches/2019Q2/www/chromium/files/patch-ui_gl_gl__bindings__autogen__glx.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/2019Q2/www/chromium/files/patch-ui_gl_gl__fence.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-ui_gl_gl__fence.cc (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-ui_gl_gl__fence.cc (revision 497959)
@@ -0,0 +1,11 @@
+--- ui/gl/gl_fence.cc.orig 2019-03-11 22:01:19 UTC
++++ ui/gl/gl_fence.cc
+@@ -18,7 +18,7 @@
+ #include "ui/gl/gl_fence_apple.h"
+ #endif
+
+-#if defined(USE_EGL) && defined(OS_POSIX) && !defined(OS_MACOSX)
++#if defined(USE_EGL) && defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_FREEBSD)
+ #define USE_GL_FENCE_ANDROID_NATIVE_FENCE_SYNC
+ #include "ui/gl/gl_fence_android_native_fence_sync.h"
+ #include "ui/gl/gl_surface_egl.h"
Property changes on: branches/2019Q2/www/chromium/files/patch-ui_gl_gl__fence.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/2019Q2/www/chromium/files/patch-ui_gl_sync__control__vsync__provider.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-ui_gl_sync__control__vsync__provider.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-ui_gl_sync__control__vsync__provider.cc (revision 497959)
@@ -1,43 +1,43 @@
---- ui/gl/sync_control_vsync_provider.cc.orig 2018-12-12 22:56:28.000000000 +0100
-+++ ui/gl/sync_control_vsync_provider.cc 2019-01-09 23:55:37.488409000 +0100
+--- ui/gl/sync_control_vsync_provider.cc.orig 2019-03-11 22:01:19 UTC
++++ ui/gl/sync_control_vsync_provider.cc
@@ -11,7 +11,7 @@
#include "base/trace_event/trace_event.h"
#include "build/build_config.h"
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
// These constants define a reasonable range for a calculated refresh interval.
// Calculating refreshes out of this range will be considered a fatal error.
const int64_t kMinVsyncIntervalUs = base::Time::kMicrosecondsPerSecond / 400;
-@@ -26,7 +26,7 @@
+@@ -26,7 +26,7 @@ const double kRelativeIntervalDifferenceThreshold = 0.
namespace gl {
SyncControlVSyncProvider::SyncControlVSyncProvider() : gfx::VSyncProvider() {
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
// On platforms where we can't get an accurate reading on the refresh
// rate we fall back to the assumption that we're displaying 60 frames
// per second.
-@@ -48,7 +48,7 @@
+@@ -48,7 +48,7 @@ bool SyncControlVSyncProvider::GetVSyncParametersIfAva
base::TimeTicks* timebase_out,
base::TimeDelta* interval_out) {
TRACE_EVENT0("gpu", "SyncControlVSyncProvider::GetVSyncParameters");
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
// The actual clock used for the system time returned by glXGetSyncValuesOML
// is unspecified. In practice, the clock used is likely to be either
// CLOCK_REALTIME or CLOCK_MONOTONIC, so we compare the returned time to the
-@@ -157,11 +157,11 @@
+@@ -157,11 +157,11 @@ bool SyncControlVSyncProvider::GetVSyncParametersIfAva
return true;
#else
return false;
-#endif // defined(OS_LINUX)
+#endif // defined(OS_LINUX) || defined(OS_BSD)
}
bool SyncControlVSyncProvider::SupportGetVSyncParametersIfAvailable() const {
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
return true;
#else
return false;
Index: branches/2019Q2/www/chromium/files/patch-ui_gl_sync__control__vsync__provider.h
===================================================================
--- branches/2019Q2/www/chromium/files/patch-ui_gl_sync__control__vsync__provider.h (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-ui_gl_sync__control__vsync__provider.h (revision 497959)
@@ -1,34 +1,34 @@
---- ui/gl/sync_control_vsync_provider.h.orig 2017-12-15 02:04:52.000000000 +0100
-+++ ui/gl/sync_control_vsync_provider.h 2017-12-24 20:29:58.843365000 +0100
-@@ -23,11 +23,11 @@
- void GetVSyncParameters(const UpdateVSyncCallback& callback) override;
+--- ui/gl/sync_control_vsync_provider.h.orig 2019-03-11 22:01:19 UTC
++++ ui/gl/sync_control_vsync_provider.h
+@@ -26,11 +26,11 @@ class SyncControlVSyncProvider : public gfx::VSyncProv
+ bool SupportGetVSyncParametersIfAvailable() const override;
static constexpr bool IsSupported() {
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
return true;
#else
return false;
-#endif // defined(OS_LINUX)
+#endif // defined(OS_LINUX) || defined(OS_BSD)
}
protected:
-@@ -38,7 +38,7 @@
+@@ -41,7 +41,7 @@ class SyncControlVSyncProvider : public gfx::VSyncProv
virtual bool GetMscRate(int32_t* numerator, int32_t* denominator) = 0;
private:
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
base::TimeTicks last_timebase_;
uint64_t last_media_stream_counter_ = 0;
base::TimeDelta last_good_interval_;
-@@ -49,7 +49,7 @@
+@@ -52,7 +52,7 @@ class SyncControlVSyncProvider : public gfx::VSyncProv
// from configuration change (monitor reconfiguration, moving windows
// between monitors, suspend and resume, etc.).
base::queue<base::TimeDelta> last_computed_intervals_;
-#endif // defined(OS_LINUX)
+#endif // defined(OS_LINUX) || defined(OS_BSD)
DISALLOW_COPY_AND_ASSIGN(SyncControlVSyncProvider);
};
Index: branches/2019Q2/www/chromium/files/patch-ui_message__center_public_cpp_message__center__constants.h
===================================================================
--- branches/2019Q2/www/chromium/files/patch-ui_message__center_public_cpp_message__center__constants.h (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-ui_message__center_public_cpp_message__center__constants.h (revision 497959)
@@ -0,0 +1,11 @@
+--- ui/message_center/public/cpp/message_center_constants.h.orig 2019-03-11 22:01:19 UTC
++++ ui/message_center/public/cpp/message_center_constants.h
+@@ -101,7 +101,7 @@ const int kButtonHorizontalPadding = 16; // In DIPs.
+ const int kButtonIconTopPadding = 11; // In DIPs.
+ const int kButtonIconToTitlePadding = 16; // In DIPs.
+
+-#if !defined(OS_LINUX) || defined(USE_AURA)
++#if (!defined(OS_LINUX) && !defined(OS_BSD)) || defined(USE_AURA)
+ constexpr SkColor kButtonSeparatorColor = SkColorSetRGB(234, 234, 234);
+ constexpr SkColor kHoveredButtonBackgroundColor = SkColorSetRGB(243, 243, 243);
+ #endif
Property changes on: branches/2019Q2/www/chromium/files/patch-ui_message__center_public_cpp_message__center__constants.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/2019Q2/www/chromium/files/patch-ui_message__center_views_message__popup__view.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-ui_message__center_views_message__popup__view.cc (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-ui_message__center_views_message__popup__view.cc (revision 497959)
@@ -0,0 +1,11 @@
+--- ui/message_center/views/message_popup_view.cc.orig 2019-03-11 22:01:19 UTC
++++ ui/message_center/views/message_popup_view.cc
+@@ -114,7 +114,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_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
+ params.opacity = views::Widget::InitParams::OPAQUE_WINDOW;
+ #else
+ params.opacity = views::Widget::InitParams::TRANSLUCENT_WINDOW;
Property changes on: branches/2019Q2/www/chromium/files/patch-ui_message__center_views_message__popup__view.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/2019Q2/www/chromium/files/patch-ui_native__theme_native__theme.h
===================================================================
--- branches/2019Q2/www/chromium/files/patch-ui_native__theme_native__theme.h (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-ui_native__theme_native__theme.h (revision 497959)
@@ -0,0 +1,11 @@
+--- ui/native_theme/native_theme.h.orig 2019-03-11 22:01:19 UTC
++++ ui/native_theme/native_theme.h
+@@ -48,7 +48,7 @@ class NATIVE_THEME_EXPORT NativeTheme {
+ // The part to be painted / sized.
+ enum Part {
+ kCheckbox,
+-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
++#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
+ kFrameTopArea,
+ #endif
+ kInnerSpinButton,
Property changes on: branches/2019Q2/www/chromium/files/patch-ui_native__theme_native__theme.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/2019Q2/www/chromium/files/patch-ui_native__theme_native__theme__base.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-ui_native__theme_native__theme__base.cc (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-ui_native__theme_native__theme__base.cc (revision 497959)
@@ -0,0 +1,11 @@
+--- ui/native_theme/native_theme_base.cc.orig 2019-03-11 22:01:19 UTC
++++ ui/native_theme/native_theme_base.cc
+@@ -172,7 +172,7 @@ void NativeThemeBase::Paint(cc::PaintCanvas* canvas,
+ case kCheckbox:
+ PaintCheckbox(canvas, state, rect, extra.button);
+ break;
+-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
++#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
+ case kFrameTopArea:
+ PaintFrameTopArea(canvas, state, rect, extra.frame_top_area);
+ break;
Property changes on: branches/2019Q2/www/chromium/files/patch-ui_native__theme_native__theme__base.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/2019Q2/www/chromium/files/patch-ui_strings_app__locale__settings.grd
===================================================================
--- branches/2019Q2/www/chromium/files/patch-ui_strings_app__locale__settings.grd (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-ui_strings_app__locale__settings.grd (revision 497959)
@@ -0,0 +1,11 @@
+--- ui/strings/app_locale_settings.grd.orig 2019-03-11 22:01:19 UTC
++++ ui/strings/app_locale_settings.grd
+@@ -187,7 +187,7 @@
+ 75%
+ </message>
+ </if>
+- <if expr="(is_linux or is_android or is_bsd) and not chromeos">
++ <if expr="is_posix and not chromeos">
+ <!-- The font used in Web UI (e.g. History). Note that these are only
+ backups. We try to use the system font if possible. -->
+ <message name="IDS_WEB_FONT_FAMILY" use_name_for_id="true">
Property changes on: branches/2019Q2/www/chromium/files/patch-ui_strings_app__locale__settings.grd
___________________________________________________________________
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/2019Q2/www/chromium/files/patch-ui_views_bubble_bubble__dialog__delegate__view.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-ui_views_bubble_bubble__dialog__delegate__view.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-ui_views_bubble_bubble__dialog__delegate__view.cc (revision 497959)
@@ -1,11 +1,11 @@
---- ui/views/bubble/bubble_dialog_delegate_view.cc.orig 2018-12-15 21:04:16.740410000 +0100
-+++ ui/views/bubble/bubble_dialog_delegate_view.cc 2018-12-15 21:05:12.625861000 +0100
-@@ -114,7 +114,7 @@
+--- ui/views/bubble/bubble_dialog_delegate_view.cc.orig 2019-03-11 22:01:19 UTC
++++ ui/views/bubble/bubble_dialog_delegate_view.cc
+@@ -112,7 +112,7 @@ Widget* BubbleDialogDelegateView::CreateBubble(
bubble_delegate->SetAnchorView(bubble_delegate->GetAnchorView());
Widget* bubble_widget = CreateBubbleWidget(bubble_delegate);
-#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_MACOSX)
+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_MACOSX) || defined(OS_BSD)
// Linux clips bubble windows that extend outside their parent window bounds.
// Mac never adjusts.
bubble_delegate->set_adjust_if_offscreen(false);
Index: branches/2019Q2/www/chromium/files/patch-ui_views_controls_label.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-ui_views_controls_label.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-ui_views_controls_label.cc (revision 497959)
@@ -1,20 +1,20 @@
---- ui/views/controls/label.cc.orig 2017-06-05 19:03:30 UTC
+--- ui/views/controls/label.cc.orig 2019-03-11 22:01:19 UTC
+++ ui/views/controls/label.cc
-@@ -553,7 +553,7 @@ bool Label::OnMousePressed(const ui::MouseEvent& event
+@@ -542,7 +542,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() {
+@@ -727,7 +727,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/2019Q2/www/chromium/files/patch-ui_views_controls_textfield_textfield.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-ui_views_controls_textfield_textfield.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-ui_views_controls_textfield_textfield.cc (revision 497959)
@@ -1,73 +1,73 @@
---- ui/views/controls/textfield/textfield.cc.orig 2017-07-25 21:05:19.000000000 +0200
-+++ ui/views/controls/textfield/textfield.cc 2017-08-02 16:52:12.933845000 +0200
-@@ -58,7 +58,7 @@
- #include "ui/base/win/osk_display_manager.h"
+--- ui/views/controls/textfield/textfield.cc.orig 2019-03-11 22:01:19 UTC
++++ ui/views/controls/textfield/textfield.cc
+@@ -59,7 +59,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"
-@@ -165,14 +165,14 @@
+@@ -162,14 +162,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;
-@@ -233,7 +233,7 @@
+@@ -228,7 +228,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;
-@@ -619,7 +619,7 @@
- ShowImeIfNeeded();
+@@ -682,7 +682,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())
- RequestFocus();
+ RequestFocusWithPointer(ui::EventPointerType::POINTER_TYPE_MOUSE);
#endif
-@@ -658,7 +658,7 @@
+@@ -726,7 +726,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<ui::TextEditCommandAuraLinux> commands;
-@@ -801,7 +801,7 @@
+@@ -894,7 +894,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();
-@@ -1897,7 +1897,7 @@
+@@ -2076,7 +2076,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/2019Q2/www/chromium/files/patch-ui_views_corewm_tooltip__aura.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-ui_views_corewm_tooltip__aura.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-ui_views_corewm_tooltip__aura.cc (revision 497959)
@@ -1,11 +1,11 @@
---- ui/views/corewm/tooltip_aura.cc.orig 2017-04-19 19:06:54 UTC
+--- ui/views/corewm/tooltip_aura.cc.orig 2019-03-11 22:01:19 UTC
+++ ui/views/corewm/tooltip_aura.cc
@@ -34,7 +34,7 @@ const int kCursorOffsetY = 15;
// TODO(varkha): Update if native widget can be transparent on Linux.
bool CanUseTranslucentTooltipWidget() {
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
return false;
#else
return true;
Index: branches/2019Q2/www/chromium/files/patch-ui_views_examples_widget__example.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-ui_views_examples_widget__example.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-ui_views_examples_widget__example.cc (revision 497959)
@@ -1,11 +1,11 @@
---- ui/views/examples/widget_example.cc.orig 2017-06-05 19:03:30 UTC
+--- ui/views/examples/widget_example.cc.orig 2019-03-11 22:01:19 UTC
+++ ui/views/examples/widget_example.cc
-@@ -77,7 +77,7 @@ void WidgetExample::CreateExampleView(View* container)
+@@ -79,7 +79,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/2019Q2/www/chromium/files/patch-ui_views_selection__controller.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-ui_views_selection__controller.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-ui_views_selection__controller.cc (revision 497959)
@@ -1,11 +1,11 @@
---- ui/views/selection_controller.cc.orig 2017-06-05 19:03:30 UTC
+--- ui/views/selection_controller.cc.orig 2019-03-11 22:01:19 UTC
+++ ui/views/selection_controller.cc
@@ -20,7 +20,7 @@ SelectionController::SelectionController(SelectionCont
delegate_(delegate),
handles_selection_clipboard_(false) {
// On Linux, update the selection clipboard on a text selection.
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
set_handles_selection_clipboard(true);
#endif
Index: branches/2019Q2/www/chromium/files/patch-ui_views_style_platform__style.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-ui_views_style_platform__style.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-ui_views_style_platform__style.cc (revision 497959)
@@ -1,11 +1,11 @@
---- ui/views/style/platform_style.cc.orig 2017-04-19 19:06:55 UTC
+--- ui/views/style/platform_style.cc.orig 2019-03-11 22:01:19 UTC
+++ ui/views/style/platform_style.cc
-@@ -19,7 +19,7 @@
+@@ -18,7 +18,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/2019Q2/www/chromium/files/patch-ui_views_views__delegate.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-ui_views_views__delegate.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-ui_views_views__delegate.cc (revision 497959)
@@ -1,11 +1,11 @@
---- ui/views/views_delegate.cc.orig 2017-06-05 19:03:30 UTC
+--- ui/views/views_delegate.cc.orig 2019-03-11 22:01:19 UTC
+++ ui/views/views_delegate.cc
-@@ -85,7 +85,7 @@ HICON ViewsDelegate::GetDefaultWindowIcon() const {
+@@ -85,7 +85,7 @@ HICON ViewsDelegate::GetSmallWindowIcon() const {
bool ViewsDelegate::IsWindowInMetro(gfx::NativeWindow window) const {
return false;
}
-#elif defined(OS_LINUX) && !defined(OS_CHROMEOS)
+#elif (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_FREEBSD)
gfx::ImageSkia* ViewsDelegate::GetDefaultWindowIcon() const {
return nullptr;
}
Index: branches/2019Q2/www/chromium/files/patch-ui_views_views__delegate.h
===================================================================
--- branches/2019Q2/www/chromium/files/patch-ui_views_views__delegate.h (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-ui_views_views__delegate.h (revision 497959)
@@ -1,11 +1,11 @@
---- ui/views/views_delegate.h.orig 2017-06-05 19:03:30 UTC
+--- ui/views/views_delegate.h.orig 2019-03-11 22:01:19 UTC
+++ ui/views/views_delegate.h
-@@ -161,7 +161,7 @@ class VIEWS_EXPORT ViewsDelegate {
+@@ -146,7 +146,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/2019Q2/www/chromium/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform.cc (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform.cc (revision 497959)
@@ -0,0 +1,20 @@
+--- ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc.orig 2019-03-17 17:58:04 UTC
++++ ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc
+@@ -89,7 +89,7 @@ void DesktopWindowTreeHostPlatform::OnNativeWidgetCrea
+ const Widget::InitParams& params) {
+ native_widget_delegate_->OnNativeWidgetCreated();
+
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+ // Setup a non_client_window_event_filter, which handles resize/move, double
+ // click and other events.
+ DCHECK(!non_client_window_event_filter_);
+@@ -540,7 +540,7 @@ void DesktopWindowTreeHostPlatform::Relayout() {
+ }
+
+ void DesktopWindowTreeHostPlatform::RemoveNonClientEventFilter() {
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+ if (!non_client_window_event_filter_)
+ return;
+
Property changes on: branches/2019Q2/www/chromium/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform.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/2019Q2/www/chromium/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform.h
===================================================================
--- branches/2019Q2/www/chromium/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform.h (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform.h (revision 497959)
@@ -0,0 +1,11 @@
+--- ui/views/widget/desktop_aura/desktop_window_tree_host_platform.h.orig 2019-03-17 17:59:02 UTC
++++ ui/views/widget/desktop_aura/desktop_window_tree_host_platform.h
+@@ -119,7 +119,7 @@ class VIEWS_EXPORT DesktopWindowTreeHostPlatform
+
+ bool is_active_ = false;
+
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+ // A handler for events intended for non client area.
+ std::unique_ptr<WindowEventFilter> non_client_window_event_filter_;
+ #endif
Property changes on: branches/2019Q2/www/chromium/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform.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/2019Q2/www/chromium/files/patch-ui_views_window_custom__frame__view.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-ui_views_window_custom__frame__view.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-ui_views_window_custom__frame__view.cc (revision 497959)
@@ -1,11 +1,11 @@
---- ui/views/window/custom_frame_view.cc.orig 2017-06-05 19:03:30 UTC
+--- ui/views/window/custom_frame_view.cc.orig 2019-03-11 22:01:19 UTC
+++ ui/views/window/custom_frame_view.cc
-@@ -302,7 +302,7 @@ int CustomFrameView::NonClientTopBorderHeight() const
+@@ -305,7 +305,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/2019Q2/www/chromium/files/patch-ui_views_window_dialog__delegate.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-ui_views_window_dialog__delegate.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-ui_views_window_dialog__delegate.cc (revision 497959)
@@ -1,11 +1,11 @@
---- ui/views/window/dialog_delegate.cc.orig 2017-06-05 19:03:30 UTC
+--- ui/views/window/dialog_delegate.cc.orig 2019-03-11 22:01:19 UTC
+++ ui/views/window/dialog_delegate.cc
-@@ -57,7 +57,7 @@ Widget::InitParams DialogDelegate::GetDialogWidgetInit
+@@ -64,7 +64,7 @@ Widget::InitParams DialogDelegate::GetDialogWidgetInit
params.bounds = bounds;
DialogDelegate* dialog = delegate->AsDialogDelegate();
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
// The new style doesn't support unparented dialogs on Linux desktop.
if (dialog)
dialog->supports_custom_frame_ &= parent != NULL;
Index: branches/2019Q2/www/chromium/files/patch-ui_views_window_frame__background.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-ui_views_window_frame__background.cc (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-ui_views_window_frame__background.cc (revision 497959)
@@ -0,0 +1,11 @@
+--- ui/views/window/frame_background.cc.orig 2019-03-11 22:01:19 UTC
++++ ui/views/window/frame_background.cc
+@@ -122,7 +122,7 @@ void FrameBackground::PaintMaximized(gfx::Canvas* canv
+ const View* view) const {
+ // Fill the top with the frame color first so we have a constant background
+ // for areas not covered by the theme image.
+-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
++#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
+ auto* native_theme = view->GetNativeTheme();
+ ui::NativeTheme::ExtraParams params;
+ params.frame_top_area.use_custom_frame = use_custom_frame_;
Property changes on: branches/2019Q2/www/chromium/files/patch-ui_views_window_frame__background.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/2019Q2/www/chromium/files/patch-ui_webui_resources_js_cr.js
===================================================================
--- branches/2019Q2/www/chromium/files/patch-ui_webui_resources_js_cr.js (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-ui_webui_resources_js_cr.js (revision 497959)
@@ -1,14 +1,14 @@
---- ui/webui/resources/js/cr.js.orig 2017-04-19 19:06:55 UTC
+--- ui/webui/resources/js/cr.js.orig 2019-03-11 22:01:19 UTC
+++ ui/webui/resources/js/cr.js
-@@ -451,6 +451,11 @@ var cr = cr || function() {
+@@ -463,6 +463,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/2019Q2/www/chromium/files/patch-ui_webui_resources_js_icon.js
===================================================================
--- branches/2019Q2/www/chromium/files/patch-ui_webui_resources_js_icon.js (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-ui_webui_resources_js_icon.js (revision 497959)
@@ -1,11 +1,11 @@
---- ui/webui/resources/js/icon.js.orig 2017-04-19 19:06:55 UTC
+--- ui/webui/resources/js/icon.js.orig 2019-03-11 22:01:19 UTC
+++ ui/webui/resources/js/icon.js
@@ -14,7 +14,7 @@ cr.define('cr.icon', function() {
// supports SCALE_FACTOR_100P on all non-iOS platforms.
supportedScaleFactors.push(1);
}
- if (cr.isMac || cr.isChromeOS || cr.isWindows || cr.isLinux) {
+ if (cr.isMac || cr.isChromeOS || cr.isWindows || cr.isLinux || cr.isBSD) {
// All desktop platforms support zooming which also updates the renderer's
// device scale factors (a.k.a devicePixelRatio), and these platforms have
// high DPI assets for 2x. Let the renderer pick the closest image for
Index: branches/2019Q2/www/chromium/files/patch-v8_BUILD.gn
===================================================================
--- branches/2019Q2/www/chromium/files/patch-v8_BUILD.gn (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-v8_BUILD.gn (revision 497959)
@@ -1,32 +1,32 @@
---- v8/BUILD.gn.orig 2019-01-30 02:20:39.000000000 +0100
-+++ v8/BUILD.gn 2019-02-01 15:22:52.852309000 +0100
-@@ -3254,7 +3254,7 @@
+--- v8/BUILD.gn.orig 2019-03-11 22:08:08 UTC
++++ v8/BUILD.gn
+@@ -3160,7 +3160,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",
-@@ -3274,6 +3274,12 @@
+@@ -3180,6 +3180,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 = [
-@@ -3478,6 +3484,7 @@
+@@ -3384,6 +3390,7 @@ if (v8_use_snapshot && current_toolchain == v8_snapsho
"src/snapshot/embedded-file-writer.h",
"src/snapshot/mksnapshot.cc",
]
+ libs = ["execinfo"]
configs = [ ":internal_config" ]
Index: branches/2019Q2/www/chromium/files/patch-v8_src_api.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-v8_src_api.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-v8_src_api.cc (revision 497959)
@@ -1,20 +1,20 @@
---- v8/src/api.cc.orig 2019-02-06 23:49:54.462307000 +0100
-+++ v8/src/api.cc 2019-02-06 23:50:45.414499000 +0100
-@@ -105,7 +105,7 @@
+--- v8/src/api.cc.orig 2019-03-11 22:08:08 UTC
++++ v8/src/api.cc
+@@ -107,7 +107,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 <signal.h>
+ #include "include/v8-wasm-trap-handler-posix.h"
#include "src/trap-handler/handler-inside-posix.h"
- #endif
-@@ -5885,7 +5885,7 @@
+@@ -5759,7 +5759,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
Index: branches/2019Q2/www/chromium/files/patch-v8_src_base_cpu.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-v8_src_base_cpu.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-v8_src_base_cpu.cc (revision 497959)
@@ -1,18 +1,18 @@
---- v8/src/base/cpu.cc.orig 2017-09-11 03:04:32.333164000 +0200
-+++ v8/src/base/cpu.cc 2017-09-11 03:05:48.364215000 +0200
-@@ -607,6 +607,7 @@
+--- v8/src/base/cpu.cc.orig 2019-03-11 22:08:08 UTC
++++ v8/src/base/cpu.cc
+@@ -424,6 +424,7 @@ CPU::CPU()
- #elif V8_HOST_ARCH_ARM64
+ #if V8_OS_LINUX
+#if V8_OS_LINUX
CPUInfo cpu_info;
// Extract implementor from the "CPU implementer" field.
-@@ -640,6 +641,7 @@
+@@ -457,6 +458,7 @@ CPU::CPU()
}
delete[] part;
}
+#endif
- #elif V8_HOST_ARCH_PPC
-
+ // Extract architecture from the "CPU Architecture" field.
+ // The list is well-known, unlike the the output of
Index: branches/2019Q2/www/chromium/files/patch-v8_src_base_platform_platform-posix.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-v8_src_base_platform_platform-posix.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-v8_src_base_platform_platform-posix.cc (revision 497959)
@@ -1,15 +1,24 @@
---- v8/src/base/platform/platform-posix.cc.orig 2018-02-24 16:26:18.000000000 +0100
-+++ v8/src/base/platform/platform-posix.cc 2018-03-04 05:02:38.985674000 +0100
-@@ -459,6 +459,12 @@
+--- v8/src/base/platform/platform-posix.cc.orig 2019-03-21 01:39:38.000000000 +0100
++++ v8/src/base/platform/platform-posix.cc 2019-03-24 19:04:25.066535000 +0100
+@@ -376,7 +376,7 @@
+
+ // static
+ bool OS::HasLazyCommits() {
+-#if V8_OS_AIX || V8_OS_LINUX || V8_OS_MACOSX
++#if V8_OS_AIX || V8_OS_LINUX || V8_OS_MACOSX || V8_OS_FREEBSD
+ return true;
+ #else
+ // TODO(bbudge) Return true for all POSIX platforms.
+@@ -501,6 +501,12 @@
return static_cast<int>(syscall(__NR_gettid));
#elif V8_OS_ANDROID
return static_cast<int>(gettid());
+#elif V8_OS_DRAGONFLYBSD || defined(__DragonFly__)
+ return static_cast<int>(lwp_gettid());
+#elif V8_OS_FREEBSD
+ return static_cast<int>(pthread_getthreadid_np());
+#elif V8_OS_NETBSD
+ return static_cast<int>(_lwp_self());
#elif V8_OS_AIX
return static_cast<int>(thread_self());
#elif V8_OS_FUCHSIA
Index: branches/2019Q2/www/chromium/files/patch-v8_src_external-reference-table.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-v8_src_external-reference-table.cc (nonexistent)
+++ branches/2019Q2/www/chromium/files/patch-v8_src_external-reference-table.cc (revision 497959)
@@ -0,0 +1,11 @@
+--- 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 <execinfo.h>
+ #include <vector>
Property changes on: branches/2019Q2/www/chromium/files/patch-v8_src_external-reference-table.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/2019Q2/www/chromium/files/patch-v8_src_log-utils.h
===================================================================
--- branches/2019Q2/www/chromium/files/patch-v8_src_log-utils.h (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-v8_src_log-utils.h (revision 497959)
@@ -1,11 +1,11 @@
---- v8/src/log-utils.h.orig 2017-07-04 22:40:30.657540000 +0200
-+++ v8/src/log-utils.h 2017-07-04 22:40:59.090730000 +0200
-@@ -14,6 +14,8 @@
- #include "src/base/platform/mutex.h"
+--- 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 <stdarg.h>
+
namespace v8 {
namespace internal {
Index: branches/2019Q2/www/chromium/files/patch-v8_src_trap-handler_handler-inside-posix.cc
===================================================================
--- branches/2019Q2/www/chromium/files/patch-v8_src_trap-handler_handler-inside-posix.cc (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-v8_src_trap-handler_handler-inside-posix.cc (revision 497959)
@@ -1,20 +1,20 @@
---- v8/src/trap-handler/handler-inside-posix.cc.orig 2019-02-02 10:20:15.963337000 +0100
-+++ v8/src/trap-handler/handler-inside-posix.cc 2019-02-02 10:41:12.897011000 +0100
+--- v8/src/trap-handler/handler-inside-posix.cc.orig 2019-03-11 22:08:08 UTC
++++ v8/src/trap-handler/handler-inside-posix.cc
@@ -27,7 +27,7 @@
#include <signal.h>
-#ifdef V8_OS_LINUX
+#if defined(V8_OS_LINUX) || defined(V8_OS_FREEBSD)
#include <ucontext.h>
#elif V8_OS_MACOSX
#include <sys/ucontext.h>
-@@ -109,6 +109,8 @@
+@@ -112,6 +112,8 @@ bool TryHandleSignal(int signum, siginfo_t* info, void
auto* context_rip = &uc->uc_mcontext.gregs[REG_RIP];
#elif V8_OS_MACOSX
auto* context_rip = &uc->uc_mcontext->__ss.__rip;
+#elif V8_OS_FREEBSD
+ auto* context_rip = &uc->uc_mcontext.mc_rip;
#else
#error Unsupported platform
#endif
Index: branches/2019Q2/www/chromium/files/patch-v8_src_trap-handler_handler-inside-posix.h
===================================================================
--- branches/2019Q2/www/chromium/files/patch-v8_src_trap-handler_handler-inside-posix.h (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-v8_src_trap-handler_handler-inside-posix.h (revision 497959)
@@ -1,11 +1,11 @@
---- v8/src/trap-handler/handler-inside-posix.h.orig 2019-02-02 10:19:11.070129000 +0100
-+++ v8/src/trap-handler/handler-inside-posix.h 2019-02-02 10:19:28.516985000 +0100
-@@ -12,7 +12,7 @@
+--- v8/src/trap-handler/handler-inside-posix.h.orig 2019-03-11 22:08:08 UTC
++++ v8/src/trap-handler/handler-inside-posix.h
+@@ -12,7 +12,7 @@ namespace v8 {
namespace internal {
namespace trap_handler {
-#if V8_OS_LINUX
+#if defined(V8_OS_LINUX) || defined(V8_OS_FREEBSD)
constexpr int kOobSignal = SIGSEGV;
#elif V8_OS_MACOSX
constexpr int kOobSignal = SIGBUS;
Index: branches/2019Q2/www/chromium/files/patch-v8_src_trap-handler_trap-handler.h
===================================================================
--- branches/2019Q2/www/chromium/files/patch-v8_src_trap-handler_trap-handler.h (revision 497958)
+++ branches/2019Q2/www/chromium/files/patch-v8_src_trap-handler_trap-handler.h (revision 497959)
@@ -1,11 +1,11 @@
---- v8/src/trap-handler/trap-handler.h.orig 2019-02-02 10:48:04.472258000 +0100
-+++ v8/src/trap-handler/trap-handler.h 2019-02-02 10:49:11.178676000 +0100
-@@ -23,6 +23,8 @@
+--- v8/src/trap-handler/trap-handler.h.orig 2019-03-11 22:08:08 UTC
++++ v8/src/trap-handler/trap-handler.h
+@@ -23,6 +23,8 @@ namespace trap_handler {
#define V8_TRAP_HANDLER_SUPPORTED true
#elif V8_TARGET_ARCH_X64 && V8_OS_MACOSX
#define V8_TRAP_HANDLER_SUPPORTED true
+#elif V8_TARGET_ARCH_X64 && V8_OS_FREEBSD
+#define V8_TRAP_HANDLER_SUPPORTED true
#else
#define V8_TRAP_HANDLER_SUPPORTED false
#endif
Index: branches/2019Q2/www/chromium/pkg-plist
===================================================================
--- branches/2019Q2/www/chromium/pkg-plist (revision 497958)
+++ branches/2019Q2/www/chromium/pkg-plist (revision 497959)
@@ -1,335 +1,334 @@
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%%/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.png
+%%DATADIR%%/resources/inspector/Images/accelerometer-back.svg
%%DATADIR%%/resources/inspector/Images/accelerometer-bottom.png
-%%DATADIR%%/resources/inspector/Images/accelerometer-front.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/deleteIcon.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/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/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_tracker.so
%%DEBUG%%%%DATADIR%%/libVkLayer_parameter_validation.so
%%DEBUG%%%%DATADIR%%/libVkLayer_threading.so
%%DEBUG%%%%DATADIR%%/libVkLayer_unique_objects.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/2019Q2
===================================================================
--- branches/2019Q2 (revision 497958)
+++ branches/2019Q2 (revision 497959)
Property changes on: branches/2019Q2
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
Merged /head:r497949