Index: head/www/chromium/Makefile =================================================================== --- head/www/chromium/Makefile (revision 489611) +++ head/www/chromium/Makefile (revision 489612) @@ -1,326 +1,329 @@ # Created by: Florent Thoumie # $FreeBSD$ PORTNAME= chromium -PORTVERSION= 68.0.3440.106 -PORTREVISION= 7 +PORTVERSION= 71.0.3578.98 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-lite>0:x11-fonts/noto-lite 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 localbase:ldflags ninja pkgconfig \ python:2.7,build shebangfix tar:xz .else -USES= bison cpe desktop-file-utils gnome jpeg localbase:ldflags \ +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_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_gtk3=true \ + 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 +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_BUILD_DEPENDS= git:devel/git DRIVER_MAKE_ARGS= chromedriver KERBEROS_VARS= GN_ARGS+=use_kerberos=true KERBEROS_VARS_OFF= GN_ARGS+=use_kerberos=false PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio PULSEAUDIO_VARS= GN_ARGS+=use_pulseaudio=true PULSEAUDIO_VARS_OFF= GN_ARGS+=use_pulseaudio=false # With SNDIO=on we exclude audio_manager_linux from the build (see # media/audio/BUILD.gn) and use audio_manager_openbsd which does not # support falling back to ALSA or PulseAudio. SNDIO_PREVENTS= ALSA PULSEAUDIO SNDIO_LIB_DEPENDS= libsndio.so:audio/sndio SNDIO_VARS= GN_ARGS+=use_sndio=true SNDIO_VARS_OFF= GN_ARGS+=use_sndio=false .endif .include "Makefile.tests" TEST_ALL_TARGET= ${TEST_TARGETS} TEST_DISTFILES= ${PORTNAME}-${DISTVERSION}-testdata${EXTRACT_SUFX} \ test_fonts${EXTRACT_SUFX}:fonts .include # swiftshader/lib/{libEGL.so,libGLESv2.so} is x86 only .if ${ARCH} == aarch64 -PLIST_SUB+= NOT_AARCH64="@comment " +PLIST_SUB+= NOT_AARCH64="@comment " .else PLIST_SUB+= NOT_AARCH64="" .endif -BUILD_DEPENDS+= ${LOCALBASE}/bin/ar:devel/binutils -EXTRA_PATCHES+= ${FILESDIR}/extra-patch-llvm-base +# 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 .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 - ${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/*.service ${STAGEDIR}${DATADIR} .for s in 22 24 48 64 128 256 @${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/${s}x${s}/apps ${INSTALL_DATA} ${WRKSRC}/chrome/app/theme/chromium/product_logo_${s}.png \ ${STAGEDIR}${PREFIX}/share/icons/hicolor/${s}x${s}/apps/chrome.png .endfor ${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/*.png ${STAGEDIR}${DATADIR} ${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/*.pak ${STAGEDIR}${DATADIR} .for d in protoc icudtl.dat mksnapshot natives_blob.bin snapshot_blob.bin v8_context_snapshot.bin ${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/${d} ${STAGEDIR}${DATADIR} .endfor ${INSTALL_PROGRAM} ${WRKSRC}/out/${BUILDTYPE}/chrome \ ${STAGEDIR}${DATADIR} cd ${WRKSRC}/out/${BUILDTYPE} && \ ${COPYTREE_SHARE} "locales resources" ${STAGEDIR}${DATADIR} @${MKDIR} ${STAGEDIR}${DESKTOPDIR} ${INSTALL_DATA} ${WRKDIR}/chromium-browser.desktop \ ${STAGEDIR}${DESKTOPDIR} ${INSTALL_SCRIPT} ${WRKDIR}/chrome ${STAGEDIR}${PREFIX}/bin ${INSTALL_SCRIPT} ${WRKSRC}/chrome/tools/build/linux/chrome-wrapper \ ${STAGEDIR}${DATADIR} # ANGLE .for f in libEGL.so libGLESv2.so ${INSTALL_LIB} ${WRKSRC}/out/${BUILDTYPE}/${f} ${STAGEDIR}${DATADIR} .endfor # SwiftShader .if ${ARCH} != aarch64 @${MKDIR} ${STAGEDIR}${DATADIR}/swiftshader .for g in libEGL.so libGLESv2.so ${INSTALL_LIB} ${WRKSRC}/out/${BUILDTYPE}/swiftshader/${g} \ ${STAGEDIR}${DATADIR}/swiftshader .endfor .endif post-install-DEBUG-on: ${INSTALL_LIB} ${WRKSRC}/out/${BUILDTYPE}/*.so \ ${STAGEDIR}${DATADIR} ${INSTALL_PROGRAM} ${WRKSRC}/out/${BUILDTYPE}/character_data_generator \ ${STAGEDIR}${DATADIR} post-install-DRIVER-on: ${INSTALL_PROGRAM} ${WRKSRC}/out/${BUILDTYPE}/chromedriver \ ${STAGEDIR}${PREFIX}/bin .endif .include Index: head/www/chromium/Makefile.tests =================================================================== --- head/www/chromium/Makefile.tests (revision 489611) +++ head/www/chromium/Makefile.tests (revision 489612) @@ -1,9 +1,8 @@ # $FreeBSD$ TEST_TARGETS= base_unittests \ chromedriver_unittests \ crypto_unittests \ - gn_unittests \ headless_unittests \ printing_unittests \ url_unittests Index: head/www/chromium/distinfo =================================================================== --- head/www/chromium/distinfo (revision 489611) +++ head/www/chromium/distinfo (revision 489612) @@ -1,7 +1,7 @@ -TIMESTAMP = 1534764533 -SHA256 (chromium-68.0.3440.106.tar.xz) = 7021040635a0a0d47f699bdb22e3ef5c91482e4f51b428d1de3016da95f0e698 -SIZE (chromium-68.0.3440.106.tar.xz) = 630289544 -SHA256 (chromium-68.0.3440.106-testdata.tar.xz) = 2a736b339f7cbf9fd26901666f17f53b51f7191ed2f64ea65fb8afe638a1633b -SIZE (chromium-68.0.3440.106-testdata.tar.xz) = 310263984 +TIMESTAMP = 1544905827 +SHA256 (chromium-71.0.3578.98.tar.xz) = 1c56a9e30825774c83d568d194e9585625c6e90f81ee0ef09760fcedc86b9d45 +SIZE (chromium-71.0.3578.98.tar.xz) = 633860888 +SHA256 (chromium-71.0.3578.98-testdata.tar.xz) = 5559bc92d6fbf17e88828dbeb94015d2f7998a12e2d0fe27a33096f7c16b434f +SIZE (chromium-71.0.3578.98-testdata.tar.xz) = 350636612 SHA256 (test_fonts.tar.xz) = cf9cbe3b7f1c4c42d426bddc65ec178d333ad7e205a36fe0a606a3c0c545ece1 SIZE (test_fonts.tar.xz) = 200040 Index: head/www/chromium/files/patch-content_renderer_renderer_main.cc =================================================================== --- head/www/chromium/files/patch-content_renderer_renderer_main.cc (revision 489611) +++ head/www/chromium/files/patch-content_renderer_renderer_main.cc (nonexistent) @@ -1,20 +0,0 @@ ---- content/renderer/renderer_main.cc.orig 2018-08-01 00:08:45.000000000 +0200 -+++ content/renderer/renderer_main.cc 2018-08-04 19:44:52.562529000 +0200 -@@ -218,7 +218,7 @@ - InitializeWebRtcModule(); - - { --#if defined(OS_WIN) || defined(OS_MACOSX) -+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_BSD) - // TODO(markus): Check if it is OK to unconditionally move this - // instruction down. - auto render_process = RenderProcessImpl::Create(); -@@ -228,7 +228,7 @@ - bool run_loop = true; - if (!no_sandbox) - run_loop = platform.EnableSandbox(); --#if defined(OS_POSIX) && !defined(OS_MACOSX) -+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD) - auto render_process = RenderProcessImpl::Create(); - RenderThreadImpl::Create(std::move(main_message_loop), - std::move(main_thread_scheduler)); Property changes on: head/www/chromium/files/patch-content_renderer_renderer_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: head/www/chromium/files/patch-chrome_browser_web__applications_web__app.cc =================================================================== --- head/www/chromium/files/patch-chrome_browser_web__applications_web__app.cc (revision 489611) +++ head/www/chromium/files/patch-chrome_browser_web__applications_web__app.cc (nonexistent) @@ -1,20 +0,0 @@ ---- chrome/browser/web_applications/web_app.cc.orig 2017-06-05 19:03:03 UTC -+++ chrome/browser/web_applications/web_app.cc -@@ -58,7 +58,7 @@ namespace { - #if defined(OS_MACOSX) - const int kDesiredSizes[] = {16, 32, 128, 256, 512}; - const size_t kNumDesiredSizes = arraysize(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}; -@@ -501,7 +501,7 @@ void GetIconsInfo(const WebApplicationInfo& app_info, - } - #endif - --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) - std::string GetWMClassFromAppName(std::string app_name) { - base::i18n::ReplaceIllegalCharactersInPath(&app_name, '_'); - base::TrimString(app_name, "_", &app_name); Property changes on: head/www/chromium/files/patch-chrome_browser_web__applications_web__app.cc ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/www/chromium/files/patch-third_party_blink_renderer_platform_image-decoders_jpeg_jpeg_image_decoder.cc =================================================================== --- head/www/chromium/files/patch-third_party_blink_renderer_platform_image-decoders_jpeg_jpeg_image_decoder.cc (revision 489611) +++ head/www/chromium/files/patch-third_party_blink_renderer_platform_image-decoders_jpeg_jpeg_image_decoder.cc (nonexistent) @@ -1,12 +0,0 @@ ---- third_party/blink/renderer/platform/image-decoders/jpeg/jpeg_image_decoder.cc.orig 2018-08-13 22:34:03.760055000 +0200 -+++ third_party/blink/renderer/platform/image-decoders/jpeg/jpeg_image_decoder.cc 2018-08-13 22:41:48.671075000 +0200 -@@ -643,6 +643,9 @@ - IntSize UvSize() const { return uv_size_; } - - private: -+#if defined(USE_SYSTEM_LIBJPEG) -+ NO_SANITIZE_CFI_ICALL -+#endif - JSAMPARRAY AllocateSampleArray() { - // Some output color spaces don't need the sample array: don't allocate in that - // case. Property changes on: head/www/chromium/files/patch-third_party_blink_renderer_platform_image-decoders_jpeg_jpeg_image_decoder.cc ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/www/chromium/files/patch-services_network_public_cpp_cors_cors_legacy.cc =================================================================== --- head/www/chromium/files/patch-services_network_public_cpp_cors_cors_legacy.cc (revision 489611) +++ head/www/chromium/files/patch-services_network_public_cpp_cors_cors_legacy.cc (nonexistent) @@ -1,11 +0,0 @@ ---- services/network/public/cpp/cors/cors_legacy.cc.orig 2018-08-15 14:32:14.128925000 +0200 -+++ services/network/public/cpp/cors/cors_legacy.cc 2018-08-15 14:32:27.135579000 +0200 -@@ -5,8 +5,6 @@ - #include "services/network/public/cpp/cors/cors_legacy.h" - - #include --#include --#include - - #include "url/gurl.h" - #include "url/url_util.h" Property changes on: head/www/chromium/files/patch-services_network_public_cpp_cors_cors_legacy.cc ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/www/chromium/files/patch-third_party_blink_renderer_platform_wtf_byte_swap.h =================================================================== --- head/www/chromium/files/patch-third_party_blink_renderer_platform_wtf_byte_swap.h (revision 489611) +++ head/www/chromium/files/patch-third_party_blink_renderer_platform_wtf_byte_swap.h (nonexistent) @@ -1,24 +0,0 @@ ---- third_party/blink/renderer/platform/wtf/byte_swap.h.orig 2018-07-19 20:15:20.782500000 +0200 -+++ third_party/blink/renderer/platform/wtf/byte_swap.h 2018-07-19 20:16:32.779700000 +0200 -@@ -60,15 +60,21 @@ - - #else - -+#ifndef Bswap64 - ALWAYS_INLINE uint64_t Bswap64(uint64_t x) { - return __builtin_bswap64(x); - } -+#endif -+#ifndef Bswap32 - ALWAYS_INLINE uint32_t Bswap32(uint32_t x) { - return __builtin_bswap32(x); - } -+#endif -+#ifndef Bswap16 - ALWAYS_INLINE uint16_t Bswap16(uint16_t x) { - return __builtin_bswap16(x); - } -+#endif - - #endif - Property changes on: head/www/chromium/files/patch-third_party_blink_renderer_platform_wtf_byte_swap.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/www/chromium/files/patch-ui_message__center_views_toast__contents__view.cc =================================================================== --- head/www/chromium/files/patch-ui_message__center_views_toast__contents__view.cc (revision 489611) +++ head/www/chromium/files/patch-ui_message__center_views_toast__contents__view.cc (nonexistent) @@ -1,11 +0,0 @@ ---- ui/message_center/views/toast_contents_view.cc.orig 2017-04-19 19:06:54 UTC -+++ ui/message_center/views/toast_contents_view.cc -@@ -388,7 +388,7 @@ void ToastContentsView::CreateWidget( - PopupAlignmentDelegate* alignment_delegate) { - 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: head/www/chromium/files/patch-ui_message__center_views_toast__contents__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: head/www/chromium/files/patch-content_public_browser_web_ui.h =================================================================== --- head/www/chromium/files/patch-content_public_browser_web_ui.h (revision 489611) +++ head/www/chromium/files/patch-content_public_browser_web_ui.h (nonexistent) @@ -1,19 +0,0 @@ ---- content/public/browser/web_ui.h.orig 2018-07-20 15:49:47.533832000 +0200 -+++ content/public/browser/web_ui.h 2018-07-20 15:50:46.750401000 +0200 -@@ -9,7 +9,6 @@ - - #include "base/callback.h" - #include "base/strings/string16.h" --#include "base/strings/string_piece.h" - #include "content/common/content_export.h" - #include "ui/base/page_transition_types.h" - -@@ -73,7 +72,7 @@ - // Used by WebUIMessageHandlers. If the given message is already registered, - // the call has no effect. - using MessageCallback = base::RepeatingCallback; -- virtual void RegisterMessageCallback(base::StringPiece message, -+ virtual void RegisterMessageCallback(const std::string& message, - const MessageCallback& callback) = 0; - - // This is only needed if an embedder overrides handling of a WebUIMessage and Property changes on: head/www/chromium/files/patch-content_public_browser_web_ui.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/www/chromium/files/extra-patch-llvm-base =================================================================== --- head/www/chromium/files/extra-patch-llvm-base (revision 489611) +++ head/www/chromium/files/extra-patch-llvm-base (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: head/www/chromium/files/extra-patch-llvm-base ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/www/chromium/files/patch-third__party_pdfium_xfa_fgas_font_cfgas_fontmgr.cpp =================================================================== --- head/www/chromium/files/patch-third__party_pdfium_xfa_fgas_font_cfgas_fontmgr.cpp (revision 489611) +++ head/www/chromium/files/patch-third__party_pdfium_xfa_fgas_font_cfgas_fontmgr.cpp (nonexistent) @@ -1,13 +0,0 @@ ---- third_party/pdfium/xfa/fgas/font/cfgas_fontmgr.cpp.orig 2017-12-15 02:05:39.000000000 +0100 -+++ third_party/pdfium/xfa/fgas/font/cfgas_fontmgr.cpp 2017-12-24 19:04:05.574318000 +0100 -@@ -436,8 +436,8 @@ - - 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_ Property changes on: head/www/chromium/files/patch-third__party_pdfium_xfa_fgas_font_cfgas_fontmgr.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: head/www/chromium/files/patch-third__party_swiftshader_src_OpenGL_libEGL_Display.cpp =================================================================== --- head/www/chromium/files/patch-third__party_swiftshader_src_OpenGL_libEGL_Display.cpp (revision 489611) +++ head/www/chromium/files/patch-third__party_swiftshader_src_OpenGL_libEGL_Display.cpp (nonexistent) @@ -1,47 +0,0 @@ ---- third_party/swiftshader/src/OpenGL/libEGL/Display.cpp.orig 2017-06-26 22:14:07.363371000 +0200 -+++ third_party/swiftshader/src/OpenGL/libEGL/Display.cpp 2017-06-26 22:15:57.992270000 +0200 -@@ -30,7 +30,7 @@ - #include - #include - #include --#elif defined(__linux__) -+#elif defined(__linux__) || defined(__FreeBSD__) - #include "Main/libX11.hpp" - #elif defined(__APPLE__) - #include "OSXUtils.hpp" -@@ -53,7 +53,7 @@ - - static void *nativeDisplay = nullptr; - -- #if defined(__linux__) && !defined(__ANDROID__) -+ #if (defined(__linux__) || defined(__FreeBSD__)) && !defined(__ANDROID__) - // Even if the application provides a native display handle, we open (and close) our own connection - if(!nativeDisplay && dpy != HEADLESS_DISPLAY && libX11 && libX11->XOpenDisplay) - { -@@ -76,7 +76,7 @@ - { - terminate(); - -- #if defined(__linux__) && !defined(__ANDROID__) -+ #if (defined(__linux__) || defined(__FreeBSD__)) && !defined(__ANDROID__) - if(nativeDisplay && libX11->XCloseDisplay) - { - libX11->XCloseDisplay((::Display*)nativeDisplay); -@@ -550,7 +550,7 @@ - return false; - } - return true; -- #elif defined(__linux__) -+ #elif defined(__linux__) || defined(__FreeBSD__) - if(nativeDisplay) - { - XWindowAttributes windowAttributes; -@@ -707,7 +707,7 @@ - - // No framebuffer device found, or we're in user space - return sw::FORMAT_X8B8G8R8; -- #elif defined(__linux__) -+ #elif defined(__linux__) || defined(__FreeBSD__) - if(nativeDisplay) - { - Screen *screen = libX11->XDefaultScreenOfDisplay((::Display*)nativeDisplay); Property changes on: head/www/chromium/files/patch-third__party_swiftshader_src_OpenGL_libEGL_Display.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: head/www/chromium/files/patch-ui_gl_gl_implementation.cc =================================================================== --- head/www/chromium/files/patch-ui_gl_gl_implementation.cc (revision 489611) +++ head/www/chromium/files/patch-ui_gl_gl_implementation.cc (nonexistent) @@ -1,11 +0,0 @@ ---- ui/gl/gl_implementation.cc.orig 2018-08-01 00:09:48.000000000 +0200 -+++ ui/gl/gl_implementation.cc 2018-08-04 21:27:12.545235000 +0200 -@@ -123,7 +123,7 @@ - - GLImplementation GetSoftwareGLImplementation() { - #if (defined(OS_WIN) || \ -- (defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(USE_OZONE)) || \ -+ ((defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) && !defined(USE_OZONE)) || \ - (defined(OS_MACOSX) && defined(USE_EGL))) - return kGLImplementationSwiftShaderGL; - #else Property changes on: head/www/chromium/files/patch-ui_gl_gl_implementation.cc ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/www/chromium/files/patch-ui_views_widget_desktop_aura_desktop_screen_x11.cc =================================================================== --- head/www/chromium/files/patch-ui_views_widget_desktop_aura_desktop_screen_x11.cc (revision 489611) +++ head/www/chromium/files/patch-ui_views_widget_desktop_aura_desktop_screen_x11.cc (nonexistent) @@ -1,18 +0,0 @@ ---- ui/views/widget/desktop_aura/desktop_screen_x11.cc.orig 2018-06-13 00:11:10.000000000 +0200 -+++ ui/views/widget/desktop_aura/desktop_screen_x11.cc 2018-07-20 17:57:12.071809000 +0200 -@@ -216,8 +216,13 @@ - if (host) { - DesktopWindowTreeHostX11* rwh = DesktopWindowTreeHostX11::GetHostForXID( - host->GetAcceleratedWidget()); -- if (rwh) -- return GetDisplayMatching(rwh->GetX11RootWindowBounds()); -+ if (rwh) { -+ const float scale = 1.0f / GetDeviceScaleFactor(); -+ const gfx::Rect pixel_rect = rwh->GetX11RootWindowBounds(); -+ return GetDisplayMatching( -+ gfx::Rect(gfx::ScaleToFlooredPoint(pixel_rect.origin(), scale), -+ gfx::ScaleToCeiledSize(pixel_rect.size(), scale))); -+ } - } - - return GetPrimaryDisplay(); Property changes on: head/www/chromium/files/patch-ui_views_widget_desktop_aura_desktop_screen_x11.cc ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/www/chromium/files/patch-sandbox_BUILD.gn =================================================================== --- head/www/chromium/files/patch-sandbox_BUILD.gn (revision 489611) +++ head/www/chromium/files/patch-sandbox_BUILD.gn (nonexistent) @@ -1,11 +0,0 @@ ---- sandbox/BUILD.gn.orig 2017-08-02 15:41:12.498502000 +0200 -+++ sandbox/BUILD.gn 2017-08-02 15:42:43.975385000 +0200 -@@ -24,7 +24,7 @@ - "//sandbox/mac:sandbox", - "//sandbox/mac:seatbelt", - ] -- } else if (is_linux || is_android) { -+ } else if ((is_linux && !is_bsd) || is_android) { - public_deps = [ - "//sandbox/linux:sandbox", - ] Property changes on: head/www/chromium/files/patch-sandbox_BUILD.gn ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/www/chromium/files/patch-components_drive_drive__api__util.cc =================================================================== --- head/www/chromium/files/patch-components_drive_drive__api__util.cc (revision 489611) +++ head/www/chromium/files/patch-components_drive_drive__api__util.cc (nonexistent) @@ -1,14 +0,0 @@ ---- components/drive/drive_api_util.cc.orig 2017-04-19 19:06:32 UTC -+++ components/drive/drive_api_util.cc -@@ -22,7 +22,11 @@ - #include "google_apis/drive/drive_api_parser.h" - #include "net/base/escape.h" - #include "net/base/net_errors.h" -+#if defined(OS_BSD) -+#include -+#else - #include "third_party/re2/src/re2/re2.h" -+#endif - #include "url/gurl.h" - - namespace drive { Property changes on: head/www/chromium/files/patch-components_drive_drive__api__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: head/www/chromium/files/patch-third_party_blink_renderer_platform_image-encoders_image_encoder.cc =================================================================== --- head/www/chromium/files/patch-third_party_blink_renderer_platform_image-encoders_image_encoder.cc (revision 489611) +++ head/www/chromium/files/patch-third_party_blink_renderer_platform_image-encoders_image_encoder.cc (nonexistent) @@ -1,20 +0,0 @@ ---- third_party/blink/renderer/platform/image-encoders/image_encoder.cc.orig 2018-08-13 22:25:20.364425000 +0200 -+++ third_party/blink/renderer/platform/image-encoders/image_encoder.cc 2018-08-13 22:28:52.206462000 +0200 -@@ -4,6 +4,17 @@ - - #include "third_party/blink/renderer/platform/image-encoders/image_encoder.h" - -+#include "build/build_config.h" -+ -+#if defined(OS_WIN) -+#include // Included before jpeglib.h because of INT32 clash -+#endif // OS_WIN -+#include // Needed by jpeglib.h -+ -+#include "jpeglib.h" // for JPEG_MAX_DIMENSION -+ -+#include "third_party/libwebp/src/webp/encode.h" // for WEBP_MAX_DIMENSION -+ - namespace blink { - - bool ImageEncoder::Encode(Vector* dst, Property changes on: head/www/chromium/files/patch-third_party_blink_renderer_platform_image-encoders_image_encoder.cc ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/www/chromium/files/patch-base_process_process__metrics.cc =================================================================== --- head/www/chromium/files/patch-base_process_process__metrics.cc (revision 489611) +++ head/www/chromium/files/patch-base_process_process__metrics.cc (nonexistent) @@ -1,11 +0,0 @@ ---- base/process/process_metrics.cc.orig 2017-12-23 21:01:02.481980000 +0100 -+++ base/process/process_metrics.cc 2017-12-23 21:01:15.848759000 +0100 -@@ -10,7 +10,7 @@ - #include "base/values.h" - #include "build/build_config.h" - --#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_AIX) -+#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_AIX) || defined(OS_BSD) - namespace { - int CalculateEventsPerSecond(uint64_t event_count, - uint64_t* last_event_count, Property changes on: head/www/chromium/files/patch-base_process_process__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: head/www/chromium/files/patch-ui_gfx_gpu_memory_buffer.cc =================================================================== --- head/www/chromium/files/patch-ui_gfx_gpu_memory_buffer.cc (revision 489611) +++ head/www/chromium/files/patch-ui_gfx_gpu_memory_buffer.cc (nonexistent) @@ -1,11 +0,0 @@ ---- ui/gfx/gpu_memory_buffer.cc.orig 2017-08-02 17:09:18.637721000 +0200 -+++ ui/gfx/gpu_memory_buffer.cc 2017-08-02 17:09:34.476081000 +0200 -@@ -37,7 +37,7 @@ - gfx::GpuMemoryBufferHandle handle; - handle.type = gfx::NATIVE_PIXMAP; - handle.id = source_handle.id; --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) - handle.native_pixmap_handle = - gfx::CloneHandleForIPC(source_handle.native_pixmap_handle); - #endif Property changes on: head/www/chromium/files/patch-ui_gfx_gpu_memory_buffer.cc ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/www/chromium/files/patch-third__party_angle_third_party_vulkan-validation-layers_src_loader_vk_loader_platform.h =================================================================== --- head/www/chromium/files/patch-third__party_angle_third_party_vulkan-validation-layers_src_loader_vk_loader_platform.h (revision 489611) +++ head/www/chromium/files/patch-third__party_angle_third_party_vulkan-validation-layers_src_loader_vk_loader_platform.h (nonexistent) @@ -1,11 +0,0 @@ ---- third_party/angle/third_party/vulkan-validation-layers/src/loader/vk_loader_platform.h.orig 2018-07-19 21:07:44.888863000 +0200 -+++ third_party/angle/third_party/vulkan-validation-layers/src/loader/vk_loader_platform.h 2018-07-19 21:08:10.994378000 +0200 -@@ -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: Property changes on: head/www/chromium/files/patch-third__party_angle_third_party_vulkan-validation-layers_src_loader_vk_loader_platform.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/www/chromium/files/patch-chrome_browser_ui_libgtkui_nav_button_provider_gtk3.h =================================================================== --- head/www/chromium/files/patch-chrome_browser_ui_libgtkui_nav_button_provider_gtk3.h (revision 489611) +++ head/www/chromium/files/patch-chrome_browser_ui_libgtkui_nav_button_provider_gtk3.h (nonexistent) @@ -1,11 +0,0 @@ ---- chrome/browser/ui/libgtkui/nav_button_provider_gtk3.h.orig 2018-02-11 02:34:07.340548000 +0100 -+++ chrome/browser/ui/libgtkui/nav_button_provider_gtk3.h 2018-02-11 02:32:04.747163000 +0100 -@@ -31,7 +31,7 @@ - - private: - std::map -+ std::array> - button_images_; - std::map button_margins_; - gfx::Insets top_area_spacing_; Property changes on: head/www/chromium/files/patch-chrome_browser_ui_libgtkui_nav_button_provider_gtk3.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/www/chromium/files/patch-third_party_perfetto_src_tracing_core_service_impl.cc =================================================================== --- head/www/chromium/files/patch-third_party_perfetto_src_tracing_core_service_impl.cc (revision 489611) +++ head/www/chromium/files/patch-third_party_perfetto_src_tracing_core_service_impl.cc (nonexistent) @@ -1,11 +0,0 @@ ---- third_party/perfetto/src/tracing/core/service_impl.cc.orig 2018-08-04 21:18:16.978067000 +0200 -+++ third_party/perfetto/src/tracing/core/service_impl.cc 2018-08-04 21:18:54.197576000 +0200 -@@ -1041,7 +1041,7 @@ - protos::TrustedPacket packet; - protos::ClockSnapshot* clock_snapshot = packet.mutable_clock_snapshot(); - --#if !PERFETTO_BUILDFLAG(PERFETTO_OS_MACOSX) && !PERFETTO_BUILDFLAG(PERFETTO_OS_WIN) -+#if !PERFETTO_BUILDFLAG(PERFETTO_OS_MACOSX) && !PERFETTO_BUILDFLAG(PERFETTO_OS_WIN) && !PERFETTO_BUILDFLAG(PERFETTO_OS_FREEBSD) - struct { - clockid_t id; - protos::ClockSnapshot::Clock::Type type; Property changes on: head/www/chromium/files/patch-third_party_perfetto_src_tracing_core_service_impl.cc ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/www/chromium/files/patch-services_network_public_cpp_cors_cors_legacy.h =================================================================== --- head/www/chromium/files/patch-services_network_public_cpp_cors_cors_legacy.h (revision 489611) +++ head/www/chromium/files/patch-services_network_public_cpp_cors_cors_legacy.h (nonexistent) @@ -1,10 +0,0 @@ ---- services/network/public/cpp/cors/cors_legacy.h.orig 2018-08-15 14:32:05.126217000 +0200 -+++ services/network/public/cpp/cors/cors_legacy.h 2018-08-15 14:32:40.328286000 +0200 -@@ -5,6 +5,7 @@ - #ifndef SERVICES_NETWORK_PUBLIC_CPP_CORS_CORS_LEGACY_H_ - #define SERVICES_NETWORK_PUBLIC_CPP_CORS_CORS_LEGACY_H_ - -+#include - #include - - #include "base/component_export.h" Property changes on: head/www/chromium/files/patch-services_network_public_cpp_cors_cors_legacy.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/www/chromium/files/patch-chrome_browser_browser__process__impl.cc =================================================================== --- head/www/chromium/files/patch-chrome_browser_browser__process__impl.cc (revision 489611) +++ head/www/chromium/files/patch-chrome_browser_browser__process__impl.cc (nonexistent) @@ -1,20 +0,0 @@ ---- chrome/browser/browser_process_impl.cc.orig 2018-06-13 00:10:04.000000000 +0200 -+++ chrome/browser/browser_process_impl.cc 2018-07-14 13:27:02.197056000 +0200 -@@ -180,7 +180,7 @@ - #include "chrome/browser/media/webrtc/webrtc_log_uploader.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/resource_coordinator/tab_manager.h" - #endif - -@@ -856,7 +856,7 @@ - - resource_coordinator::TabManager* BrowserProcessImpl::GetTabManager() { - DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); --#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) -+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) - if (!tab_manager_) { - tab_manager_ = std::make_unique(); - tab_lifecycle_unit_source_ = Property changes on: head/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: head/www/chromium/files/patch-content_renderer_webscrollbarbehavior__impl__aura.cc =================================================================== --- head/www/chromium/files/patch-content_renderer_webscrollbarbehavior__impl__aura.cc (revision 489611) +++ head/www/chromium/files/patch-content_renderer_webscrollbarbehavior__impl__aura.cc (nonexistent) @@ -1,20 +0,0 @@ ---- content/renderer/webscrollbarbehavior_impl_aura.cc.orig 2017-06-05 19:03:07 UTC -+++ content/renderer/webscrollbarbehavior_impl_aura.cc -@@ -14,7 +14,7 @@ bool WebScrollbarBehaviorImpl::ShouldCenterOnThumb( - blink::WebPointerProperties::Button mouseButton, - bool shiftKeyPressed, - bool altKeyPressed) { --#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) -+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) - if (mouseButton == blink::WebPointerProperties::Button::kMiddle) - return true; - #endif -@@ -29,7 +29,7 @@ bool WebScrollbarBehaviorImpl::ShouldSnapBackToDragOri - // Disable snapback on desktop Linux to better integrate with the desktop - // behavior. Typically, Linux apps do not implement scrollbar snapback (this is - // true for at least GTK and QT apps). --#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) -+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) - return false; - #endif - Property changes on: head/www/chromium/files/patch-content_renderer_webscrollbarbehavior__impl__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: head/www/chromium/files/patch-chrome_browser_web__applications_web__app.h =================================================================== --- head/www/chromium/files/patch-chrome_browser_web__applications_web__app.h (revision 489611) +++ head/www/chromium/files/patch-chrome_browser_web__applications_web__app.h (nonexistent) @@ -1,11 +0,0 @@ ---- chrome/browser/web_applications/web_app.h.orig 2017-06-05 19:03:03 UTC -+++ chrome/browser/web_applications/web_app.h -@@ -206,7 +206,7 @@ typedef std::vector Icon - void GetIconsInfo(const WebApplicationInfo& app_info, IconInfoList* icons); - #endif - --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_FREEBSD) - // Windows that correspond to web apps need to have a deterministic (and - // different) WMClass than normal chrome windows so the window manager groups - // them as a separate application. Property changes on: head/www/chromium/files/patch-chrome_browser_web__applications_web__app.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/www/chromium/files/patch-components_json__schema_json__schema__validator.cc =================================================================== --- head/www/chromium/files/patch-components_json__schema_json__schema__validator.cc (revision 489611) +++ head/www/chromium/files/patch-components_json__schema_json__schema__validator.cc (nonexistent) @@ -1,14 +0,0 @@ ---- components/json_schema/json_schema_validator.cc.orig 2017-04-19 19:06:32 UTC -+++ components/json_schema/json_schema_validator.cc -@@ -20,7 +20,11 @@ - #include "base/strings/stringprintf.h" - #include "base/values.h" - #include "components/json_schema/json_schema_constants.h" -+#if defined(OS_BSD) -+#include -+#else - #include "third_party/re2/src/re2/re2.h" -+#endif - - namespace schema = json_schema_constants; - Property changes on: head/www/chromium/files/patch-components_json__schema_json__schema__validator.cc ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/www/chromium/files/patch-chrome_browser_ui_views_profiles_avatar_button.cc =================================================================== --- head/www/chromium/files/patch-chrome_browser_ui_views_profiles_avatar_button.cc (revision 489611) +++ head/www/chromium/files/patch-chrome_browser_ui_views_profiles_avatar_button.cc (nonexistent) @@ -1,20 +0,0 @@ ---- chrome/browser/ui/views/profiles/avatar_button.cc.orig 2018-06-13 00:10:08.000000000 +0200 -+++ chrome/browser/ui/views/profiles/avatar_button.cc 2018-07-18 22:53:21.770071000 +0200 -@@ -250,7 +250,7 @@ - } else if (apply_ink_drop) { - SetInkDropMode(InkDropMode::ON); - SetFocusPainter(nullptr); --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) - set_ink_drop_base_color(SK_ColorWHITE); - SetBorder(std::make_unique()); - generic_avatar_ = -@@ -544,7 +544,7 @@ - #endif - } - bool AvatarButton::ShouldApplyInkDrop() const { --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) - DCHECK_EQ(AvatarButtonStyle::THEMED, button_style_); - return true; - #elif defined(OS_MACOSX) Property changes on: head/www/chromium/files/patch-chrome_browser_ui_views_profiles_avatar_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: head/www/chromium/files/patch-chrome_browser_diagnostics_diagnostics__writer.cc =================================================================== --- head/www/chromium/files/patch-chrome_browser_diagnostics_diagnostics__writer.cc (revision 489611) +++ head/www/chromium/files/patch-chrome_browser_diagnostics_diagnostics__writer.cc (nonexistent) @@ -1,11 +0,0 @@ ---- chrome/browser/diagnostics/diagnostics_writer.cc.orig 2017-06-05 19:03:02 UTC -+++ chrome/browser/diagnostics/diagnostics_writer.cc -@@ -263,7 +263,7 @@ bool DiagnosticsWriter::WriteResult(bool success, - console_->SetColor(color); - console_->Write(base::ASCIIToUTF16(result)); - } -- if (format_ == MACHINE) { -+ if (format_ == THEMACHINE) { - return WriteInfoLine(base::StringPrintf( - "%03d %s (%s)", outcome_code, id.c_str(), extra.c_str())); - } else { Property changes on: head/www/chromium/files/patch-chrome_browser_diagnostics_diagnostics__writer.cc ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/www/chromium/files/patch-content_browser_webui_web_ui_data_source_impl.cc =================================================================== --- head/www/chromium/files/patch-content_browser_webui_web_ui_data_source_impl.cc (revision 489611) +++ head/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 2018-07-19 22:40:51.613006000 +0200 -+++ content/browser/webui/web_ui_data_source_impl.cc 2018-07-19 22:47:18.163395000 +0200 -@@ -112,24 +112,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( -@@ -139,7 +139,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 -@@ -148,21 +148,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: head/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: head/www/chromium/files/patch-content_common_view__messages.h =================================================================== --- head/www/chromium/files/patch-content_common_view__messages.h (revision 489611) +++ head/www/chromium/files/patch-content_common_view__messages.h (nonexistent) @@ -1,11 +0,0 @@ ---- content/common/view_messages.h.orig 2017-06-05 19:03:07 UTC -+++ content/common/view_messages.h -@@ -245,7 +245,7 @@ IPC_STRUCT_TRAITS_BEGIN(content::RendererPreferences) - IPC_STRUCT_TRAITS_MEMBER(plugin_fullscreen_allowed) - IPC_STRUCT_TRAITS_MEMBER(use_video_overlay_for_embedded_encrypted_video) - 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) Property changes on: head/www/chromium/files/patch-content_common_view__messages.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/www/chromium/files/patch-build_linux_unbundle_libwebp.gn =================================================================== --- head/www/chromium/files/patch-build_linux_unbundle_libwebp.gn (revision 489611) +++ head/www/chromium/files/patch-build_linux_unbundle_libwebp.gn (nonexistent) @@ -1,41 +0,0 @@ ---- build/linux/unbundle/libwebp.gn.orig 2018-08-13 22:43:49.456935000 +0200 -+++ build/linux/unbundle/libwebp.gn 2018-08-13 22:48:47.151901000 +0200 -@@ -2,12 +2,34 @@ - # 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_libwebp") { -+ packages = [ -+ "libwebp", -+ "libwebpdemux", -+ "libwebpmux", -+ ] -+} -+ -+shim_headers("libwebp_shim") { -+ root_path = "src" -+ headers = [ -+ "webp/decode.h", -+ "webp/demux.h", -+ "webp/encode.h", -+ "webp/mux.h", -+ "webp/mux_types.h", -+ "webp/types.h", -+ ] -+} -+ - source_set("libwebp_webp") { -- libs = [ -- "webp", -- "webpdemux", -- "webpmux", -+ deps = [ -+ ":libwebp_shim", - ] -+ public_configs = [ ":system_libwebp" ] - } - - group("libwebp") { Property changes on: head/www/chromium/files/patch-build_linux_unbundle_libwebp.gn ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/www/chromium/files/patch-components_password__manager_core_browser_password_reuse_defines.h =================================================================== --- head/www/chromium/files/patch-components_password__manager_core_browser_password_reuse_defines.h (revision 489611) +++ head/www/chromium/files/patch-components_password__manager_core_browser_password_reuse_defines.h (nonexistent) @@ -1,11 +0,0 @@ ---- components/password_manager/core/browser/password_reuse_defines.h.orig 2018-03-20 23:05:22.000000000 +0100 -+++ components/password_manager/core/browser/password_reuse_defines.h 2018-03-24 13:50:16.794379000 +0100 -@@ -6,7 +6,7 @@ - #define COMPONENTS_PASSWORD_MANAGER_CORE_BROWSER_PASSWORD_REUSE_DEFINES_H_ - - #if defined(OS_WIN) || (defined(OS_MACOSX) && !defined(OS_IOS)) || \ -- defined(OS_LINUX) || defined(OS_CHROMEOS) -+ defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) - // Enable the detection when the sync password is typed not on the sync domain. - #define SYNC_PASSWORD_REUSE_DETECTION_ENABLED - #endif Property changes on: head/www/chromium/files/patch-components_password__manager_core_browser_password_reuse_defines.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/www/chromium/files/patch-third_party_blink_renderer_platform_image-encoders_image_encoder.h =================================================================== --- head/www/chromium/files/patch-third_party_blink_renderer_platform_image-encoders_image_encoder.h (revision 489611) +++ head/www/chromium/files/patch-third_party_blink_renderer_platform_image-encoders_image_encoder.h (nonexistent) @@ -1,11 +0,0 @@ ---- third_party/blink/renderer/platform/image-encoders/image_encoder.h.orig 2018-08-13 22:29:12.687720000 +0200 -+++ third_party/blink/renderer/platform/image-encoders/image_encoder.h 2018-08-13 22:29:25.094079000 +0200 -@@ -7,8 +7,6 @@ - - #include "third_party/blink/renderer/platform/platform_export.h" - #include "third_party/blink/renderer/platform/wtf/vector.h" --#include "third_party/libjpeg/jpeglib.h" // for JPEG_MAX_DIMENSION --#include "third_party/libwebp/src/webp/encode.h" // for WEBP_MAX_DIMENSION - #include "third_party/skia/include/core/SkStream.h" - #include "third_party/skia/include/encode/SkJpegEncoder.h" - #include "third_party/skia/include/encode/SkPngEncoder.h" Property changes on: head/www/chromium/files/patch-third_party_blink_renderer_platform_image-encoders_image_encoder.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/www/chromium/files/patch-third_party_blink_renderer_platform_wtf_compiler.h =================================================================== --- head/www/chromium/files/patch-third_party_blink_renderer_platform_wtf_compiler.h (revision 489611) +++ head/www/chromium/files/patch-third_party_blink_renderer_platform_wtf_compiler.h (nonexistent) @@ -1,13 +0,0 @@ ---- third_party/blink/renderer/platform/wtf/compiler.h.orig 2018-08-13 22:36:40.462317000 +0200 -+++ third_party/blink/renderer/platform/wtf/compiler.h 2018-08-13 22:38:32.823279000 +0200 -@@ -74,8 +74,10 @@ - #if defined(__clang__) - #define NO_SANITIZE_UNRELATED_CAST \ - __attribute__((no_sanitize("cfi-unrelated-cast", "vptr"))) -+#define NO_SANITIZE_CFI_ICALL __attribute__((no_sanitize("cfi-icall"))) - #else - #define NO_SANITIZE_UNRELATED_CAST -+#define NO_SANITIZE_CFI_ICALL - #endif - - #endif /* WTF_Compiler_h */ Property changes on: head/www/chromium/files/patch-third_party_blink_renderer_platform_wtf_compiler.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/www/chromium/files/patch-ui_views_bubble_bubble__dialog__delegate.cc =================================================================== --- head/www/chromium/files/patch-ui_views_bubble_bubble__dialog__delegate.cc (revision 489611) +++ head/www/chromium/files/patch-ui_views_bubble_bubble__dialog__delegate.cc (nonexistent) @@ -1,11 +0,0 @@ ---- ui/views/bubble/bubble_dialog_delegate.cc.orig 2017-06-05 19:03:30 UTC -+++ ui/views/bubble/bubble_dialog_delegate.cc -@@ -76,7 +76,7 @@ Widget* BubbleDialogDelegateView::CreateBubble( - // the parent frame and let DWM handle compositing. If not, then we don't - // want to allow the bubble to extend the frame because it will be clipped. - bubble_delegate->set_adjust_if_offscreen(ui::win::IsAeroGlassEnabled()); --#elif (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_MACOSX) -+#elif (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); Property changes on: head/www/chromium/files/patch-ui_views_bubble_bubble__dialog__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: head/www/chromium/files/patch-base_process_process__posix.cc =================================================================== --- head/www/chromium/files/patch-base_process_process__posix.cc (revision 489611) +++ head/www/chromium/files/patch-base_process_process__posix.cc (nonexistent) @@ -1,67 +0,0 @@ ---- base/process/process_posix.cc.orig 2017-12-15 02:04:05.000000000 +0100 -+++ base/process/process_posix.cc 2017-12-23 21:14:03.546283000 +0100 -@@ -22,8 +22,17 @@ - #include - #endif - -+#if defined(OS_BSD) -+#include -+#include -+#include -+#endif -+ - namespace { - -+const int kBackgroundPriority = 5; -+const int kForegroundPriority = 0; -+ - #if !defined(OS_NACL_NONSFI) - - bool WaitpidWithTimeout(base::ProcessHandle handle, -@@ -263,12 +272,10 @@ - return Process(handle); - } - --#if !defined(OS_LINUX) && !defined(OS_MACOSX) && !defined(OS_AIX) - // static - bool Process::CanBackgroundProcesses() { -- return false; -+ return true; - } --#endif // !defined(OS_LINUX) && !defined(OS_MACOSX) && !defined(OS_AIX) - - // static - void Process::TerminateCurrentProcessImmediately(int exit_code) { -@@ -372,21 +379,23 @@ - return WaitForExitWithTimeoutImpl(Handle(), exit_code, timeout); - } - --#if !defined(OS_LINUX) && !defined(OS_MACOSX) && !defined(OS_AIX) - bool Process::IsProcessBackgrounded() const { - // See SetProcessBackgrounded(). - DCHECK(IsValid()); -- return false; -+ return GetPriority() == kBackgroundPriority; - } - --bool Process::SetProcessBackgrounded(bool value) { -- // Not implemented for POSIX systems other than Linux and Mac. With POSIX, if -- // we were to lower the process priority we wouldn't be able to raise it back -- // to its initial priority. -- NOTIMPLEMENTED(); -- return false; -+bool Process::SetProcessBackgrounded(bool background) { -+ DCHECK(IsValid()); -+ -+ if (!CanBackgroundProcesses()) -+ return false; -+ -+ int priority = background ? kBackgroundPriority : kForegroundPriority; -+ int result = setpriority(PRIO_PROCESS, process_, priority); -+ DPCHECK(result == 0); -+ return result == 0; - } --#endif // !defined(OS_LINUX) && !defined(OS_MACOSX) && !defined(OS_AIX) - - int Process::GetPriority() const { - DCHECK(IsValid()); Property changes on: head/www/chromium/files/patch-base_process_process__posix.cc ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/www/chromium/files/patch-chrome_browser_extensions_api_music__manager__private_device__id__linux.cc =================================================================== --- head/www/chromium/files/patch-chrome_browser_extensions_api_music__manager__private_device__id__linux.cc (revision 489611) +++ head/www/chromium/files/patch-chrome_browser_extensions_api_music__manager__private_device__id__linux.cc (nonexistent) @@ -1,66 +0,0 @@ ---- chrome/browser/extensions/api/music_manager_private/device_id_linux.cc.orig 2017-04-19 19:06:29 UTC -+++ chrome/browser/extensions/api/music_manager_private/device_id_linux.cc -@@ -4,6 +4,10 @@ - - #include "chrome/browser/extensions/api/music_manager_private/device_id.h" - -+#if defined(OS_FREEBSD) -+#include -+#include -+#endif - #include - #include - #include -@@ -105,11 +109,33 @@ 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)); -- strncpy(ifinfo.ifr_name, ifaddr->ifa_name, sizeof(ifinfo.ifr_name) - 1); - -+#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); - int result = ioctl(sd, SIOCGIFHWADDR, &ifinfo); - close(sd); -@@ -119,11 +145,17 @@ class MacAddressProcessor { - - const char* mac_address = - static_cast(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: head/www/chromium/files/patch-chrome_browser_extensions_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: head/www/chromium/files/patch-third_party_googletest_src_googletest_test_gtest-port_test.cc =================================================================== --- head/www/chromium/files/patch-third_party_googletest_src_googletest_test_gtest-port_test.cc (revision 489611) +++ head/www/chromium/files/patch-third_party_googletest_src_googletest_test_gtest-port_test.cc (nonexistent) @@ -1,12 +0,0 @@ ---- third_party/googletest/src/googletest/test/gtest-port_test.cc.orig 2018-08-23 02:48:03.607358000 +0200 -+++ third_party/googletest/src/googletest/test/gtest-port_test.cc 2018-08-23 02:48:57.198397000 +0200 -@@ -296,7 +296,8 @@ - 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(data); - mutex->Lock(); Property changes on: head/www/chromium/files/patch-third_party_googletest_src_googletest_test_gtest-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: head/www/chromium/files/patch-third__party_pdfium_fxjs_JS_Define.cpp =================================================================== --- head/www/chromium/files/patch-third__party_pdfium_fxjs_JS_Define.cpp (revision 489611) +++ head/www/chromium/files/patch-third__party_pdfium_fxjs_JS_Define.cpp (nonexistent) @@ -1,15 +0,0 @@ ---- third_party/pdfium/fxjs/JS_Define.cpp.orig 2018-03-04 04:13:13.591977000 +0100 -+++ third_party/pdfium/fxjs/JS_Define.cpp 2018-03-04 04:14:44.297142000 +0100 -@@ -30,7 +30,12 @@ - long timezone = 0; - _get_timezone(&timezone); - #endif // _FX_PLATFORM_ == _FX_PLATFORM_WINDOWS_ -+#ifdef __FreeBSD__ -+ struct tm *lt; -+ return (double)(-(lt->tm_gmtoff * 1000)); -+#else - return (double)(-(timezone * 1000)); -+#endif - } - - int GetDaylightSavingTA(double d) { Property changes on: head/www/chromium/files/patch-third__party_pdfium_fxjs_JS_Define.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: head/www/chromium/files/patch-chrome_common_extensions_chrome__extensions__client.cc =================================================================== --- head/www/chromium/files/patch-chrome_common_extensions_chrome__extensions__client.cc (revision 489611) +++ head/www/chromium/files/patch-chrome_common_extensions_chrome__extensions__client.cc (nonexistent) @@ -1,14 +0,0 @@ ---- chrome/common/extensions/chrome_extensions_client.cc.orig 2017-06-05 19:03:03 UTC -+++ chrome/common/extensions/chrome_extensions_client.cc -@@ -97,7 +97,10 @@ ChromeChannelForHistogram GetChromeChannelForHistogram - static base::LazyInstance::DestructorAtExit g_client = - LAZY_INSTANCE_INITIALIZER; - --ChromeExtensionsClient::ChromeExtensionsClient() {} -+ChromeExtensionsClient::ChromeExtensionsClient() -+ : chrome_api_permissions_(ChromeAPIPermissions()), -+ extensions_api_permissions_(ExtensionsAPIPermissions()) { -+} - - ChromeExtensionsClient::~ChromeExtensionsClient() { - } Property changes on: head/www/chromium/files/patch-chrome_common_extensions_chrome__extensions__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: head/www/chromium/files/patch-third_party_blink_renderer_bindings_core_v8_v8_script_runner.cc =================================================================== --- head/www/chromium/files/patch-third_party_blink_renderer_bindings_core_v8_v8_script_runner.cc (revision 489611) +++ head/www/chromium/files/patch-third_party_blink_renderer_bindings_core_v8_v8_script_runner.cc (nonexistent) @@ -1,11 +0,0 @@ ---- third_party/blink/renderer/bindings/core/v8/v8_script_runner.cc.orig 2018-07-19 16:25:31.421721000 +0200 -+++ third_party/blink/renderer/bindings/core/v8/v8_script_runner.cc 2018-07-19 16:26:01.053291000 +0200 -@@ -54,7 +54,7 @@ - - #if defined(OS_WIN) - #include --#else -+#elif !defined(OS_FREEBSD) - #include - #endif - Property changes on: head/www/chromium/files/patch-third_party_blink_renderer_bindings_core_v8_v8_script_runner.cc ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/www/chromium/files/patch-content_browser_webui_web_ui_impl.h =================================================================== --- head/www/chromium/files/patch-content_browser_webui_web_ui_impl.h (revision 489611) +++ head/www/chromium/files/patch-content_browser_webui_web_ui_impl.h (nonexistent) @@ -1,11 +0,0 @@ ---- content/browser/webui/web_ui_impl.h.orig 2018-07-19 22:41:27.362717000 +0200 -+++ content/browser/webui/web_ui_impl.h 2018-07-19 22:51:17.719203000 +0200 -@@ -52,7 +52,7 @@ - int GetBindings() const override; - void SetBindings(int bindings) override; - void AddMessageHandler(std::unique_ptr handler) override; -- void RegisterMessageCallback(base::StringPiece message, -+ void RegisterMessageCallback(const std::string& message, - const MessageCallback& callback) override; - void ProcessWebUIMessage(const GURL& source_url, - const std::string& message, Property changes on: head/www/chromium/files/patch-content_browser_webui_web_ui_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: head/www/chromium/files/patch-tools_gn_args.cc =================================================================== --- head/www/chromium/files/patch-tools_gn_args.cc (revision 489611) +++ head/www/chromium/files/patch-tools_gn_args.cc (nonexistent) @@ -1,11 +0,0 @@ ---- tools/gn/args.cc.orig 2017-06-05 19:03:29 UTC -+++ tools/gn/args.cc -@@ -298,6 +298,8 @@ void Args::SetSystemVarsLocked(Scope* dest) const { - os = "mac"; - #elif defined(OS_LINUX) - os = "linux"; -+#elif defined(OS_BSD) -+ os = "bsd"; - #elif defined(OS_ANDROID) - os = "android"; - #elif defined(OS_NETBSD) Property changes on: head/www/chromium/files/patch-tools_gn_args.cc ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/www/chromium/files/patch-ui_message__center_views_message__view__factory.cc =================================================================== --- head/www/chromium/files/patch-ui_message__center_views_message__view__factory.cc (revision 489611) +++ head/www/chromium/files/patch-ui_message__center_views_message__view__factory.cc (nonexistent) @@ -1,11 +0,0 @@ ---- ui/message_center/views/message_view_factory.cc.orig 2017-06-05 19:03:30 UTC -+++ ui/message_center/views/message_view_factory.cc -@@ -43,7 +43,7 @@ MessageView* MessageViewFactory::Create(MessageCenterC - notification_view = new NotificationView(controller, notification); - } - --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) - // Don't create shadows for notification toasts on Linux or CrOS. - if (top_level) - return notification_view; Property changes on: head/www/chromium/files/patch-ui_message__center_views_message__view__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: head/www/chromium/files/patch-ui_views_mus_aura__init.h =================================================================== --- head/www/chromium/files/patch-ui_views_mus_aura__init.h (revision 489611) +++ head/www/chromium/files/patch-ui_views_mus_aura__init.h (nonexistent) @@ -1,11 +0,0 @@ ---- ui/views/mus/aura_init.h.orig 2017-04-19 19:06:55 UTC -+++ ui/views/mus/aura_init.h -@@ -68,7 +68,7 @@ class VIEWS_MUS_EXPORT AuraInit { - private: - void InitializeResources(service_manager::Connector* connector); - --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) - sk_sp font_loader_; - #endif - Property changes on: head/www/chromium/files/patch-ui_views_mus_aura__init.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/www/chromium/files/patch-content_browser_webui_web_ui_data_source_impl.h =================================================================== --- head/www/chromium/files/patch-content_browser_webui_web_ui_data_source_impl.h (revision 489611) +++ head/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 2018-07-19 22:41:03.715788000 +0200 -+++ content/browser/webui/web_ui_data_source_impl.h 2018-07-19 22:49:20.849552000 +0200 -@@ -30,15 +30,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: head/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: head/www/chromium/files/patch-third_party_blink_renderer_core_xml_parser_xml_document_parser.cc =================================================================== --- head/www/chromium/files/patch-third_party_blink_renderer_core_xml_parser_xml_document_parser.cc (revision 489611) +++ head/www/chromium/files/patch-third_party_blink_renderer_core_xml_parser_xml_document_parser.cc (nonexistent) @@ -1,23 +0,0 @@ ---- third_party/blink/renderer/core/xml/parser/xml_document_parser.cc.orig 2018-07-20 01:07:52.189302000 +0200 -+++ third_party/blink/renderer/core/xml/parser/xml_document_parser.cc 2018-07-20 01:10:37.425716000 +0200 -@@ -28,6 +28,10 @@ - - #include - #include -+#include -+#if defined(LIBXML_CATALOG_ENABLED) -+#include -+#endif - #include - - #include -@@ -646,6 +650,9 @@ - if (did_init) - return; - -+#if defined(LIBXML_CATALOG_ENABLED) -+ xmlCatalogSetDefaults(XML_CATA_ALLOW_NONE); -+#endif - xmlInitParser(); - xmlRegisterInputCallbacks(MatchFunc, OpenFunc, ReadFunc, CloseFunc); - xmlRegisterOutputCallbacks(MatchFunc, OpenFunc, WriteFunc, CloseFunc); Property changes on: head/www/chromium/files/patch-third_party_blink_renderer_core_xml_parser_xml_document_parser.cc ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/www/chromium/files/patch-device_geolocation_location__arbitrator.cc =================================================================== --- head/www/chromium/files/patch-device_geolocation_location__arbitrator.cc (revision 489611) +++ head/www/chromium/files/patch-device_geolocation_location__arbitrator.cc (nonexistent) @@ -1,11 +0,0 @@ ---- device/geolocation/location_arbitrator.cc.orig 2017-12-15 02:04:18.000000000 +0100 -+++ device/geolocation/location_arbitrator.cc 2017-12-24 15:54:40.400280000 +0100 -@@ -173,7 +173,7 @@ - std::unique_ptr - 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(); Property changes on: head/www/chromium/files/patch-device_geolocation_location__arbitrator.cc ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/www/chromium/files/patch-content_public_browser_web_ui_data_source.h =================================================================== --- head/www/chromium/files/patch-content_public_browser_web_ui_data_source.h (revision 489611) +++ head/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 2018-07-20 15:50:02.520469000 +0200 -+++ content/public/browser/web_ui_data_source.h 2018-07-20 15:53:16.811577000 +0200 -@@ -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 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: head/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: head/www/chromium/files/patch-third_party_perfetto_src_base_unix_task_runner.cc =================================================================== --- head/www/chromium/files/patch-third_party_perfetto_src_base_unix_task_runner.cc (revision 489611) +++ head/www/chromium/files/patch-third_party_perfetto_src_base_unix_task_runner.cc (nonexistent) @@ -1,11 +0,0 @@ ---- third_party/perfetto/src/base/unix_task_runner.cc.orig 2018-08-04 21:17:17.721052000 +0200 -+++ third_party/perfetto/src/base/unix_task_runner.cc 2018-08-04 21:17:57.424940000 +0200 -@@ -45,7 +45,7 @@ - control_read_.reset(pipe_fds[0]); - control_write_.reset(pipe_fds[1]); - --#if PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) -+#if PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) && !PERFETTO_BUILDFLAG(PERFETTO_OS_FREEBSD) - // We are never expecting to have more than a few bytes in the wake-up pipe. - // Reduce the buffer size on Linux. Note that this gets rounded up to the page - // size. Property changes on: head/www/chromium/files/patch-third_party_perfetto_src_base_unix_task_runner.cc ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/www/chromium/files/patch-content_renderer_input_input_event_prediction.cc =================================================================== --- head/www/chromium/files/patch-content_renderer_input_input_event_prediction.cc (revision 489611) +++ head/www/chromium/files/patch-content_renderer_input_input_event_prediction.cc (nonexistent) @@ -1,12 +0,0 @@ ---- content/renderer/input/input_event_prediction.cc.orig 2018-08-06 10:06:45.824140000 +0200 -+++ content/renderer/input/input_event_prediction.cc 2018-08-06 10:09:29.835896000 +0200 -@@ -119,7 +119,8 @@ - if (predictor != pointer_id_predictor_map_.end()) { - predictor->second->Update(data); - } else { -- pointer_id_predictor_map_.insert({event.id, SetUpPredictor()}); -+ auto pair = std::make_pair(event.id, SetUpPredictor()); -+ pointer_id_predictor_map_.insert(std::move(pair)); - pointer_id_predictor_map_[event.id]->Update(data); - } - } Property changes on: head/www/chromium/files/patch-content_renderer_input_input_event_prediction.cc ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/www/chromium/files/patch-media_capture_video_video__capture__device__factory.cc =================================================================== --- head/www/chromium/files/patch-media_capture_video_video__capture__device__factory.cc (revision 489611) +++ head/www/chromium/files/patch-media_capture_video_video__capture__device__factory.cc (nonexistent) @@ -1,30 +0,0 @@ ---- media/capture/video/video_capture_device_factory.cc.orig 2018-06-13 00:10:20.000000000 +0200 -+++ media/capture/video/video_capture_device_factory.cc 2018-07-20 21:26:51.824846000 +0200 -@@ -21,6 +21,10 @@ - gpu::GpuMemoryBufferManager* gpu_buffer_manager, - MojoJpegDecodeAcceleratorFactoryCB jda_factory, - MojoJpegEncodeAcceleratorFactoryCB jea_factory) { -+#if defined(OS_BSD) -+ return std::unique_ptr( -+ new media::FakeVideoCaptureDeviceFactory()); -+#else - const base::CommandLine* command_line = - base::CommandLine::ForCurrentProcess(); - // Use a Fake or File Video Device Factory if the command line flags are -@@ -47,6 +51,7 @@ - std::move(jda_factory), - std::move(jea_factory))); - } -+#endif - } - - VideoCaptureDeviceFactory::VideoCaptureDeviceFactory() { -@@ -56,7 +61,7 @@ - VideoCaptureDeviceFactory::~VideoCaptureDeviceFactory() = default; - - #if !defined(OS_MACOSX) && !defined(OS_LINUX) && !defined(OS_ANDROID) && \ -- !defined(OS_WIN) -+ !defined(OS_WIN) && !defined(OS_BSD) - // static - VideoCaptureDeviceFactory* - VideoCaptureDeviceFactory::CreateVideoCaptureDeviceFactory( Property changes on: head/www/chromium/files/patch-media_capture_video_video__capture__device__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: head/www/chromium/files/patch-base_task_scheduler_scheduler_single_thread_task_runner_manager_unittest.cc =================================================================== --- head/www/chromium/files/patch-base_task_scheduler_scheduler_single_thread_task_runner_manager_unittest.cc (revision 489611) +++ head/www/chromium/files/patch-base_task_scheduler_scheduler_single_thread_task_runner_manager_unittest.cc (nonexistent) @@ -1,12 +0,0 @@ ---- base/task_scheduler/scheduler_single_thread_task_runner_manager_unittest.cc.orig 2018-08-31 05:44:39.768079000 +0200 -+++ base/task_scheduler/scheduler_single_thread_task_runner_manager_unittest.cc 2018-08-31 05:45:55.842704000 +0200 -@@ -301,6 +301,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::BACKGROUND, - TaskShutdownBehavior::BLOCK_SHUTDOWN}; Property changes on: head/www/chromium/files/patch-base_task_scheduler_scheduler_single_thread_task_runner_manager_unittest.cc ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/www/chromium/files/patch-chrome_common_extensions_api_BUILD.gn =================================================================== --- head/www/chromium/files/patch-chrome_common_extensions_api_BUILD.gn (revision 489611) +++ head/www/chromium/files/patch-chrome_common_extensions_api_BUILD.gn (nonexistent) @@ -1,11 +0,0 @@ ---- chrome/common/extensions/api/BUILD.gn.orig 2017-06-05 19:03:03 UTC -+++ chrome/common/extensions/api/BUILD.gn -@@ -121,7 +121,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" ] - } - if (enable_service_discovery) { Property changes on: head/www/chromium/files/patch-chrome_common_extensions_api_BUILD.gn ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/www/chromium/files/patch-third__party_webrtc_rtc_base_httpcommon.cc =================================================================== --- head/www/chromium/files/patch-third__party_webrtc_rtc_base_httpcommon.cc (revision 489611) +++ head/www/chromium/files/patch-third__party_webrtc_rtc_base_httpcommon.cc (nonexistent) @@ -1,11 +0,0 @@ ---- third_party/webrtc/rtc_base/httpcommon.cc.orig 2017-09-07 00:39:17.532376000 +0200 -+++ third_party/webrtc/rtc_base/httpcommon.cc 2017-09-07 00:41:55.817287000 +0200 -@@ -384,7 +384,7 @@ - gmt = non_gmt + kTimeZoneOffsets[zindex] * 60 * 60; - } - // TODO: Android should support timezone, see b/2441195 --#if defined(WEBRTC_MAC) && !defined(WEBRTC_IOS) || defined(WEBRTC_ANDROID) || defined(BSD) -+#if defined(WEBRTC_MAC) && !defined(WEBRTC_IOS) || defined(WEBRTC_ANDROID) || defined(WEBRTC_BSD) - tm *tm_for_timezone = localtime(&gmt); - *seconds = gmt + tm_for_timezone->tm_gmtoff; - #else Property changes on: head/www/chromium/files/patch-third__party_webrtc_rtc_base_httpcommon.cc ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/www/chromium/files/patch-content_browser_webui_web_ui_impl.cc =================================================================== --- head/www/chromium/files/patch-content_browser_webui_web_ui_impl.cc (revision 489611) +++ head/www/chromium/files/patch-content_browser_webui_web_ui_impl.cc (nonexistent) @@ -1,14 +0,0 @@ ---- content/browser/webui/web_ui_impl.cc.orig 2018-07-19 22:41:18.526274000 +0200 -+++ content/browser/webui/web_ui_impl.cc 2018-07-19 22:50:47.735965000 +0200 -@@ -247,9 +247,9 @@ - ExecuteJavascript(GetJavascriptCall(function_name, args)); - } - --void WebUIImpl::RegisterMessageCallback(base::StringPiece message, -+void WebUIImpl::RegisterMessageCallback(const std::string &message, - const MessageCallback& callback) { -- message_callbacks_.emplace(message, callback); -+ message_callbacks_.insert(std::make_pair(message, callback)); - } - - void WebUIImpl::ProcessWebUIMessage(const GURL& source_url, Property changes on: head/www/chromium/files/patch-content_browser_webui_web_ui_impl.cc ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/www/chromium/files/patch-ui_views_mus_aura__init.cc =================================================================== --- head/www/chromium/files/patch-ui_views_mus_aura__init.cc (revision 489611) +++ head/www/chromium/files/patch-ui_views_mus_aura__init.cc (nonexistent) @@ -1,29 +0,0 @@ ---- ui/views/mus/aura_init.cc.orig 2018-06-13 00:11:10.000000000 +0200 -+++ ui/views/mus/aura_init.cc 2018-07-19 22:04:02.069063000 +0200 -@@ -24,7 +24,7 @@ - #include "ui/views/style/typography_provider.h" - #include "ui/views/views_delegate.h" - --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) - #include "components/services/font/public/cpp/font_loader.h" - #include "ui/gfx/platform_font_linux.h" - #endif -@@ -59,7 +59,7 @@ - } - - AuraInit::~AuraInit() { --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) - if (font_loader_.get()) { - SkFontConfigInterface::SetGlobal(nullptr); - // FontLoader is ref counted. We need to explicitly shutdown the background -@@ -112,7 +112,7 @@ - } - - // Initialize the skia font code to go ask fontconfig underneath. --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) - font_loader_ = sk_make_sp(connector); - SkFontConfigInterface::SetGlobal(font_loader_.get()); - Property changes on: head/www/chromium/files/patch-ui_views_mus_aura__init.cc ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/www/chromium/files/patch-third__party_mesa_BUILD.gn =================================================================== --- head/www/chromium/files/patch-third__party_mesa_BUILD.gn (revision 489611) +++ head/www/chromium/files/patch-third__party_mesa_BUILD.gn (nonexistent) @@ -1,13 +0,0 @@ ---- third_party/mesa/BUILD.gn.orig 2017-06-05 19:03:28 UTC -+++ third_party/mesa/BUILD.gn -@@ -90,6 +90,10 @@ config("mesa_internal_config") { - defines += [ "_GNU_SOURCE" ] - } - -+ if (is_bsd) { -+ defines += [ "_BSD_SOURCE" ] -+ } -+ - if (is_win) { - defines += [ - # Generated files use const only if __cplusplus or __STDC__ is defined. Property changes on: head/www/chromium/files/patch-third__party_mesa_BUILD.gn ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/www/chromium/files/patch-content_browser_background_fetch_background_fetch_context.cc =================================================================== --- head/www/chromium/files/patch-content_browser_background_fetch_background_fetch_context.cc (revision 489611) +++ head/www/chromium/files/patch-content_browser_background_fetch_background_fetch_context.cc (nonexistent) @@ -1,12 +0,0 @@ ---- content/browser/background_fetch/background_fetch_context.cc.orig 2018-08-06 00:37:02.712040000 +0200 -+++ content/browser/background_fetch/background_fetch_context.cc 2018-08-06 01:03:47.477355000 +0200 -@@ -218,7 +218,8 @@ - - scheduler_->AddJobController(controller.get()); - -- job_controllers_.insert({unique_id, std::move(controller)}); -+ auto pair = std::make_pair(unique_id, std::move(controller)); -+ job_controllers_.insert(std::move(pair)); - std::move(done_closure).Run(); - } - Property changes on: head/www/chromium/files/patch-content_browser_background_fetch_background_fetch_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: head/www/chromium/files/patch-chrome_browser_browser__process__impl.h =================================================================== --- head/www/chromium/files/patch-chrome_browser_browser__process__impl.h (revision 489611) +++ head/www/chromium/files/patch-chrome_browser_browser__process__impl.h (nonexistent) @@ -1,11 +0,0 @@ ---- chrome/browser/browser_process_impl.h.orig 2017-06-05 19:03:02 UTC -+++ chrome/browser/browser_process_impl.h -@@ -343,7 +343,7 @@ class BrowserProcessImpl : public BrowserProcess, - - std::unique_ptr device_client_; - --#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) -+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) - // Any change to this #ifdef must be reflected as well in - // chrome/browser/memory/tab_manager_browsertest.cc - std::unique_ptr tab_manager_; Property changes on: head/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: head/www/chromium/files/patch-third__party_angle_third_party_vulkan-validation-layers_src_loader_loader.c =================================================================== --- head/www/chromium/files/patch-third__party_angle_third_party_vulkan-validation-layers_src_loader_loader.c (revision 489611) +++ head/www/chromium/files/patch-third__party_angle_third_party_vulkan-validation-layers_src_loader_loader.c (nonexistent) @@ -1,11 +0,0 @@ ---- third_party/angle/third_party/vulkan-validation-layers/src/loader/loader.c.orig 2018-07-19 21:08:23.127507000 +0200 -+++ third_party/angle/third_party/vulkan-validation-layers/src/loader/loader.c 2018-07-19 21:08:38.418461000 +0200 -@@ -208,7 +208,7 @@ - } - - // 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 Property changes on: head/www/chromium/files/patch-third__party_angle_third_party_vulkan-validation-layers_src_loader_loader.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/www/chromium/files/patch-build_linux_unbundle_ffmpeg.gn =================================================================== --- head/www/chromium/files/patch-build_linux_unbundle_ffmpeg.gn (revision 489611) +++ head/www/chromium/files/patch-build_linux_unbundle_ffmpeg.gn (nonexistent) @@ -1,22 +0,0 @@ ---- build/linux/unbundle/ffmpeg.gn.orig 2018-07-20 01:03:59.604084000 +0200 -+++ build/linux/unbundle/ffmpeg.gn 2018-07-20 01:04:45.406745000 +0200 -@@ -14,8 +14,8 @@ - ] - } - --buildflag_header("ffmpeg_buildflags") { -- header = "ffmpeg_buildflags.h" -+buildflag_header("ffmpeg_features") { -+ header = "ffmpeg_features.h" - flags = [ "USE_SYSTEM_FFMPEG=true" ] - } - -@@ -30,7 +30,7 @@ - - source_set("ffmpeg") { - deps = [ -- ":ffmpeg_buildflags", -+ ":ffmpeg_features", - ":ffmpeg_shim", - ] - public_configs = [ ":system_ffmpeg" ] Property changes on: head/www/chromium/files/patch-build_linux_unbundle_ffmpeg.gn ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/www/chromium/files/patch-chrome_browser_notifications_message__center__notification__manager.cc =================================================================== --- head/www/chromium/files/patch-chrome_browser_notifications_message__center__notification__manager.cc (revision 489611) +++ head/www/chromium/files/patch-chrome_browser_notifications_message__center__notification__manager.cc (nonexistent) @@ -1,11 +0,0 @@ ---- chrome/browser/notifications/message_center_notification_manager.cc.orig 2017-06-05 19:03:02 UTC -+++ chrome/browser/notifications/message_center_notification_manager.cc -@@ -62,7 +62,7 @@ MessageCenterNotificationManager::MessageCenterNotific - base::MakeUnique(message_center)); - - #if defined(OS_WIN) || defined(OS_MACOSX) \ -- || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) -+ || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) - // On Windows, Linux and Mac, the notification manager owns the tray icon and - // views.Other platforms have global ownership and Create will return NULL. - tray_.reset(message_center::CreateMessageCenterTray()); Property changes on: head/www/chromium/files/patch-chrome_browser_notifications_message__center__notification__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: head/www/chromium/files/patch-chrome_browser_ui_views_apps_chrome__native__app__window__views__aura.cc =================================================================== --- head/www/chromium/files/patch-chrome_browser_ui_views_apps_chrome__native__app__window__views__aura.cc (revision 489611) +++ head/www/chromium/files/patch-chrome_browser_ui_views_apps_chrome__native__app__window__views__aura.cc (nonexistent) @@ -1,11 +0,0 @@ ---- chrome/browser/ui/views/apps/chrome_native_app_window_views_aura.cc.orig 2017-09-05 21:05:14.000000000 +0200 -+++ chrome/browser/ui/views/apps/chrome_native_app_window_views_aura.cc 2017-09-06 18:35:55.806325000 +0200 -@@ -19,7 +19,7 @@ - #include "ui/gfx/image/image_skia.h" - #include "ui/views/widget/widget.h" - --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) - #include "chrome/browser/shell_integration_linux.h" - #endif - Property changes on: head/www/chromium/files/patch-chrome_browser_ui_views_apps_chrome__native__app__window__views__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: head/www/chromium/files/patch-third__party_swiftshader_src_OpenGL_libEGL_Surface.cpp =================================================================== --- head/www/chromium/files/patch-third__party_swiftshader_src_OpenGL_libEGL_Surface.cpp (revision 489611) +++ head/www/chromium/files/patch-third__party_swiftshader_src_OpenGL_libEGL_Surface.cpp (nonexistent) @@ -1,20 +0,0 @@ ---- third_party/swiftshader/src/OpenGL/libEGL/Surface.cpp.orig 2017-09-07 00:06:19.888841000 +0200 -+++ third_party/swiftshader/src/OpenGL/libEGL/Surface.cpp 2017-09-07 00:08:19.628679000 +0200 -@@ -26,7 +26,7 @@ - #include "common/debug.h" - #include "Main/FrameBuffer.hpp" - --#if defined(__linux__) && !defined(__ANDROID__) -+#if (defined(__linux__) || defined(__FreeBSD__)) && !defined(__ANDROID__) - #include "Main/libX11.hpp" - #elif defined(_WIN32) - #include -@@ -287,7 +287,7 @@ - #elif defined(__ANDROID__) - int windowWidth; window->query(window, NATIVE_WINDOW_WIDTH, &windowWidth); - int windowHeight; window->query(window, NATIVE_WINDOW_HEIGHT, &windowHeight); -- #elif defined(__linux__) -+ #elif defined(__linux__) || defined(__FreeBSD__) - XWindowAttributes windowAttributes; - libX11->XGetWindowAttributes((::Display*)display->getNativeDisplay(), window, &windowAttributes); - Property changes on: head/www/chromium/files/patch-third__party_swiftshader_src_OpenGL_libEGL_Surface.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: head/www/chromium/files/patch-base_BUILD.gn =================================================================== --- head/www/chromium/files/patch-base_BUILD.gn (revision 489611) +++ head/www/chromium/files/patch-base_BUILD.gn (revision 489612) @@ -1,76 +1,67 @@ ---- base/BUILD.gn.orig 2017-12-15 02:04:05.000000000 +0100 -+++ base/BUILD.gn 2017-12-30 01:18:00.438461000 +0100 -@@ -1125,7 +1125,7 @@ +--- base/BUILD.gn.orig 2018-12-03 21:16:32.000000000 +0100 ++++ base/BUILD.gn 2018-12-05 13:50:51.133919000 +0100 +@@ -1182,7 +1182,7 @@ # Needed for if using newer C++ library than sysroot, except if # building inside the cros_sdk environment - use host_toolchain as a # more robust check for this. - if (!use_sysroot && (is_android || (is_linux && !is_chromecast)) && + if (!use_sysroot && (is_android || (is_linux && !is_chromecast) && !is_clang) && host_toolchain != "//build/toolchain/cros:host") { - libs = [ "atomic" ] + libs += [ "atomic" ] } -@@ -1151,7 +1151,7 @@ +@@ -1208,7 +1208,7 @@ "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 += [ -@@ -1539,7 +1539,7 @@ - "//base/third_party/xdg_user_dirs", - ] - } else { -- # Non-Linux. -+ # Non-Linux/BSD. - sources -= [ - "nix/mime_util_xdg.cc", - "nix/mime_util_xdg.h", -@@ -1555,6 +1555,33 @@ +@@ -1740,6 +1740,33 @@ } } + if (is_bsd) { + sources -= [ + "files/file_path_watcher_linux.cc", + "files/file_util_linux.cc", + "process/memory_linux.cc", + "process/process_linux.cc", + "process/process_handle_linux.cc", + "process/process_iterator_linux.cc", + "process/process_metrics_linux.cc", + "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", + "sys_info_freebsd.cc", + ] + libs = [ + "execinfo", # logging.cc + "kvm" # process_metrics_freebsd + ] + } + # iOS if (is_ios) { set_sources_assignment_filter([]) -@@ -2389,6 +2416,12 @@ +@@ -2753,6 +2780,12 @@ ] set_sources_assignment_filter(sources_assignment_filter) } + + if (is_bsd) { + sources -= [ + "debug/proc_maps_linux_unittest.cc", + ] + } if (is_win) { deps += [ "//base:scoped_handle_test_dll" ] Index: head/www/chromium/files/patch-base_allocator_partition_allocator_partition_alloc_unittest.cc =================================================================== --- head/www/chromium/files/patch-base_allocator_partition_allocator_partition_alloc_unittest.cc (revision 489611) +++ head/www/chromium/files/patch-base_allocator_partition_allocator_partition_alloc_unittest.cc (revision 489612) @@ -1,11 +1,11 @@ ---- base/allocator/partition_allocator/partition_alloc_unittest.cc.orig 2018-08-23 19:18:25.616099000 +0200 -+++ base/allocator/partition_allocator/partition_alloc_unittest.cc 2018-08-23 19:34:45.738651000 +0200 -@@ -1297,7 +1297,7 @@ - // not provide a working setrlimit(). - #if !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))) +--- 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)))) - // This is defined as a separate test class because RepeatedReturnNull - // test exhausts the process memory, and breaks any test in the same + // 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 Index: head/www/chromium/files/patch-base_posix_can__lower__nice__to.cc =================================================================== --- head/www/chromium/files/patch-base_posix_can__lower__nice__to.cc (nonexistent) +++ head/www/chromium/files/patch-base_posix_can__lower__nice__to.cc (revision 489612) @@ -0,0 +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 @@ + 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 @@ + // 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 Property changes on: head/www/chromium/files/patch-base_posix_can__lower__nice__to.cc ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/chromium/files/patch-base_task_task_scheduler_scheduler_single_thread_task_runner_manager_unittest.cc =================================================================== --- head/www/chromium/files/patch-base_task_task_scheduler_scheduler_single_thread_task_runner_manager_unittest.cc (nonexistent) +++ head/www/chromium/files/patch-base_task_task_scheduler_scheduler_single_thread_task_runner_manager_unittest.cc (revision 489612) @@ -0,0 +1,12 @@ +--- 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: head/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: head/www/chromium/files/patch-base_test_generate__fontconfig__caches.cc =================================================================== --- head/www/chromium/files/patch-base_test_generate__fontconfig__caches.cc (nonexistent) +++ head/www/chromium/files/patch-base_test_generate__fontconfig__caches.cc (revision 489612) @@ -0,0 +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::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; + } Property changes on: head/www/chromium/files/patch-base_test_generate__fontconfig__caches.cc ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/chromium/files/patch-build_config_BUILDCONFIG.gn =================================================================== --- head/www/chromium/files/patch-build_config_BUILDCONFIG.gn (revision 489611) +++ head/www/chromium/files/patch-build_config_BUILDCONFIG.gn (revision 489612) @@ -1,118 +1,119 @@ ---- build/config/BUILDCONFIG.gn.orig 2018-08-01 00:08:26.000000000 +0200 -+++ build/config/BUILDCONFIG.gn 2018-08-04 13:56:21.383564000 +0200 +--- build/config/BUILDCONFIG.gn.orig 2018-12-12 22:56:02.000000000 +0100 ++++ build/config/BUILDCONFIG.gn 2018-12-15 22:33:58.610110000 +0100 @@ -131,10 +131,10 @@ 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 == "bsd" # Set to true when compiling with the Clang compiler. - is_clang = current_os != "linux" || + is_clang = current_os != "linux" || current_os == "bsd" || (current_cpu != "s390x" && current_cpu != "s390" && current_cpu != "ppc64" && current_cpu != "ppc" && current_cpu != "mips" && current_cpu != "mips64") @@ -186,8 +186,8 @@ # 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 == "bsd") { + if (target_os != "linux" || target_os != "bsd") { # 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 @@ -227,7 +227,7 @@ 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 == "bsd") { # See comments in build/toolchain/cros/BUILD.gn about board compiles. if (is_clang) { _default_toolchain = "//build/toolchain/linux:clang_$target_cpu" -@@ -300,6 +300,7 @@ +@@ -301,6 +301,7 @@ is_nacl = false is_posix = false is_win = true + is_bsd = false } else if (current_os == "mac") { + is_aix = false is_android = false - is_chromeos = false -@@ -310,6 +311,7 @@ +@@ -312,6 +313,7 @@ is_nacl = false is_posix = true is_win = false + is_bsd = false } else if (current_os == "android") { + is_aix = false is_android = true - is_chromeos = false -@@ -320,6 +322,7 @@ +@@ -323,6 +325,7 @@ is_nacl = false is_posix = true is_win = false + is_bsd = false } else if (current_os == "chromeos") { + is_aix = false is_android = false - is_chromeos = true -@@ -330,6 +333,7 @@ +@@ -334,6 +337,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 -@@ -343,6 +347,7 @@ +@@ -348,6 +352,7 @@ is_nacl = true is_posix = true is_win = false + is_bsd = false } else if (current_os == "fuchsia") { + is_aix = false is_android = false - is_chromeos = false -@@ -353,6 +358,7 @@ +@@ -359,6 +364,7 @@ is_nacl = false is_posix = false is_win = false + is_bsd = false } else if (current_os == "ios") { + is_aix = false is_android = false - is_chromeos = false -@@ -363,6 +369,7 @@ +@@ -370,6 +376,7 @@ is_nacl = false is_posix = true is_win = false + is_bsd = false } else if (current_os == "linux") { + is_aix = false is_android = false - is_chromeos = false -@@ -373,6 +380,7 @@ +@@ -381,6 +388,7 @@ is_nacl = false is_posix = true is_win = false + is_bsd = false } else if (current_os == "aix") { + is_aix = true is_android = false - is_chromeos = false -@@ -383,6 +391,18 @@ +@@ -392,6 +400,19 @@ is_nacl = false is_posix = true is_win = false + is_bsd = false +} else if (current_os == "bsd") { ++ 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 } # ============================================================================= Index: head/www/chromium/files/patch-build_config_compiler_BUILD.gn =================================================================== --- head/www/chromium/files/patch-build_config_compiler_BUILD.gn (revision 489611) +++ head/www/chromium/files/patch-build_config_compiler_BUILD.gn (revision 489612) @@ -1,89 +1,95 @@ ---- build/config/compiler/BUILD.gn.orig 2018-08-01 00:08:26.000000000 +0200 -+++ build/config/compiler/BUILD.gn 2018-08-05 04:12:50.165240000 +0200 -@@ -51,7 +51,7 @@ +--- build/config/compiler/BUILD.gn.orig 2018-12-12 22:56:02.000000000 +0100 ++++ build/config/compiler/BUILD.gn 2018-12-16 01:04:15.942884000 +0100 +@@ -53,7 +53,7 @@ # 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) -@@ -266,7 +266,7 @@ +@@ -274,7 +274,7 @@ # 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 -@@ -380,12 +380,6 @@ +@@ -391,15 +391,6 @@ "-Wl,-z,now", "-Wl,-z,relro", ] -- if (!using_sanitizer) { +- +- # 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 && !is_safestack) { - ldflags += [ - "-Wl,-z,defs", - "-Wl,--as-needed", - ] - } } # Linux-specific compiler flags setup. -@@ -489,7 +483,7 @@ +@@ -502,7 +493,7 @@ + } } - if (is_clang && !is_nacl && current_toolchain == host_toolchain && -- target_os != "chromeos") { -+ target_os != "chromeos" && !is_bsd) { +- 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 -@@ -734,7 +728,7 @@ +@@ -793,7 +784,7 @@ 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" ] } -@@ -1415,10 +1409,6 @@ - - # TODO(hans): https://crbug.com/766891 - "-Wno-null-pointer-arithmetic", +@@ -1498,13 +1489,6 @@ + cflags += [ + # TODO(thakis): https://crbug.com/753973 + "-Wno-enum-compare-switch", - -- # Ignore warnings about MSVC optimization pragmas. -- # TODO(thakis): Only for no_chromium_code? http://crbug.com/505314 -- "-Wno-ignored-pragma-optimize", - ] - } else if (use_xcode_clang) { - cflags += [ -@@ -1594,7 +1584,7 @@ +- # Ignore warnings about MSVC optimization pragmas. +- # TODO(thakis): Only for no_chromium_code? http://crbug.com/505314 +- "-Wno-ignored-pragma-optimize", +- +- # TODO(hans): https://crbug.com/890307 +- "-Wno-defaulted-function-deleted", + ] + } + } +@@ -1691,7 +1675,7 @@ # 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" ] } } -@@ -2119,7 +2109,7 @@ +@@ -2264,7 +2248,7 @@ # [1] crrev.com/a81d5ade0b043208e06ad71a38bcf9c348a1a52f cflags += [ "-gdwarf-3" ] } - cflags += [ "-g2" ] + cflags += [ "-g0" ] } if (use_debug_fission && !is_nacl && !is_android) { # NOTE: Some Chrome OS builds globally set |use_debug_fission| to true, -@@ -2139,7 +2129,7 @@ +@@ -2284,7 +2268,7 @@ # 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 && target_cpu != "x86" && + if (!is_mac && !is_ios && !is_nacl && current_cpu != "x86" && - (use_gold || use_lld)) { + (use_gold || use_lld) && !is_bsd) { if (is_clang) { # This flag enables the GNU-format pubnames and pubtypes sections, # which lld needs in order to generate a correct GDB index. Index: head/www/chromium/files/patch-build_config_sysroot.gni =================================================================== --- head/www/chromium/files/patch-build_config_sysroot.gni (nonexistent) +++ head/www/chromium/files/patch-build_config_sysroot.gni (revision 489612) @@ -0,0 +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 @@ + # 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 && Property changes on: head/www/chromium/files/patch-build_config_sysroot.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: head/www/chromium/files/patch-build_linux_chrome.map =================================================================== --- head/www/chromium/files/patch-build_linux_chrome.map (nonexistent) +++ head/www/chromium/files/patch-build_linux_chrome.map (revision 489612) @@ -0,0 +1,29 @@ +--- build/linux/chrome.map.orig 2018-08-08 19:10:32 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: +- *; + }; Property changes on: head/www/chromium/files/patch-build_linux_chrome.map ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/chromium/files/patch-build_toolchain_gcc_toolchain.gni =================================================================== --- head/www/chromium/files/patch-build_toolchain_gcc_toolchain.gni (nonexistent) +++ head/www/chromium/files/patch-build_toolchain_gcc_toolchain.gni (revision 489612) @@ -0,0 +1,45 @@ +--- 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: head/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: head/www/chromium/files/patch-cc_BUILD.gn =================================================================== --- head/www/chromium/files/patch-cc_BUILD.gn (revision 489611) +++ head/www/chromium/files/patch-cc_BUILD.gn (revision 489612) @@ -1,22 +1,21 @@ ---- cc/BUILD.gn.orig 2017-12-30 06:26:13.722587000 +0100 -+++ cc/BUILD.gn 2017-12-30 06:26:46.042197000 +0100 -@@ -541,7 +541,7 @@ +--- 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 @@ "//ui/gl:test_support", "//ui/latency", ] - if (!is_android) { + if (!is_android && !is_bsd) { data_deps = [ - "//third_party/mesa:osmesa", + "//third_party/mesa_headers", ] -@@ -717,10 +717,6 @@ +@@ -751,9 +751,6 @@ "//ui/gfx/geometry", "//ui/gl", "//ui/gl:test_support", - ] -- - data_deps = [ -- "//third_party/mesa:osmesa", +- "//third_party/mesa_headers", ] } Index: head/www/chromium/files/patch-chrome_app_chrome__main.cc =================================================================== --- head/www/chromium/files/patch-chrome_app_chrome__main.cc (revision 489611) +++ head/www/chromium/files/patch-chrome_app_chrome__main.cc (revision 489612) @@ -1,19 +1,16 @@ ---- chrome/app/chrome_main.cc.orig 2017-09-05 21:05:12.000000000 +0200 -+++ chrome/app/chrome_main.cc 2017-09-06 17:23:42.720920000 +0200 -@@ -99,14 +99,14 @@ - ALLOW_UNUSED_LOCAL(command_line); +--- 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 @@ + #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)) { - #if defined(OS_MACOSX) - SetUpBundleOverrides(); - #endif 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) - #if BUILDFLAG(ENABLE_OOP_HEAP_PROFILING) - #if !defined(OS_WIN) || defined(COMPONENT_BUILD) || \ + int rv = content::ContentMain(params); + Index: head/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc =================================================================== --- head/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc (revision 489611) +++ head/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc (revision 489612) @@ -1,92 +1,74 @@ ---- chrome/app/chrome_main_delegate.cc.orig 2018-02-24 16:25:09.000000000 +0100 -+++ chrome/app/chrome_main_delegate.cc 2018-03-03 20:07:40.484969000 +0100 -@@ -98,7 +98,7 @@ +--- chrome/app/chrome_main_delegate.cc.orig 2018-12-12 22:56:02.000000000 +0100 ++++ chrome/app/chrome_main_delegate.cc 2019-01-04 00:08:47.109460000 +0100 +@@ -99,7 +99,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 @@ -133,7 +133,7 @@ #include "v8/include/v8.h" #endif -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) #include "base/environment.h" #endif -@@ -238,7 +238,7 @@ +@@ -233,7 +233,7 @@ #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; -@@ -407,7 +407,7 @@ +@@ -401,7 +401,7 @@ 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. -@@ -581,7 +581,7 @@ +@@ -595,7 +595,7 @@ #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 -@@ -603,7 +603,7 @@ - std::string format_str = - command_line.GetSwitchValueASCII(switches::kDiagnosticsFormat); - if (format_str == "machine") { -- format = diagnostics::DiagnosticsWriter::MACHINE; -+ format = diagnostics::DiagnosticsWriter::THEMACHINE; - } else if (format_str == "log") { - format = diagnostics::DiagnosticsWriter::LOG; - } else { -@@ -653,7 +653,7 @@ - std::string format_str = - command_line.GetSwitchValueASCII(switches::kDiagnosticsFormat); - if (format_str == "machine") { -- format = diagnostics::DiagnosticsWriter::MACHINE; -+ format = diagnostics::DiagnosticsWriter::THEMACHINE; - } else if (format_str == "human") { - format = diagnostics::DiagnosticsWriter::HUMAN; - } else { -@@ -915,7 +915,7 @@ +@@ -912,7 +912,7 @@ 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 != switches::kZygoteProcess) { + if (process_type != service_manager::switches::kZygoteProcess) { #if defined(OS_ANDROID) -@@ -931,7 +931,7 @@ +@@ -928,7 +928,7 @@ 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. -@@ -941,7 +941,7 @@ +@@ -938,7 +938,7 @@ void ChromeMainDelegate::SandboxInitialized(const std::string& process_type) { // Note: If you are adding a new process type below, be sure to adjust the // AdjustLinuxOOMScore function too. -#if defined(OS_LINUX) +#if defined(OS_LINUX) && !defined(OS_BSD) AdjustLinuxOOMScore(process_type); #endif #if defined(OS_WIN) Index: head/www/chromium/files/patch-chrome_app_generated__resources.grd =================================================================== --- head/www/chromium/files/patch-chrome_app_generated__resources.grd (revision 489611) +++ head/www/chromium/files/patch-chrome_app_generated__resources.grd (revision 489612) @@ -1,29 +1,29 @@ ---- chrome/app/generated_resources.grd.orig 2018-02-24 16:25:09.000000000 +0100 -+++ chrome/app/generated_resources.grd 2018-03-03 20:22:12.855371000 +0100 -@@ -6919,7 +6919,7 @@ - Google Payments - +--- 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 @@ + + -- -+ - - Themes +- ++ + + Press |$1Ctrl|+|$2Shift| followed by |$3Q| to exit -@@ -6927,7 +6927,7 @@ - - Reset to default theme +@@ -6117,7 +6117,7 @@ + Google Pay + - + - - Use GTK+ theme + + Use system title bar and borders -@@ -8076,7 +8076,7 @@ +@@ -6942,7 +6942,7 @@ Set as default - + Minimize Index: head/www/chromium/files/patch-chrome_app_shutdown__signal__handlers__posix.cc =================================================================== --- head/www/chromium/files/patch-chrome_app_shutdown__signal__handlers__posix.cc (revision 489611) +++ head/www/chromium/files/patch-chrome_app_shutdown__signal__handlers__posix.cc (revision 489612) @@ -1,22 +1,15 @@ ---- chrome/app/shutdown_signal_handlers_posix.cc.orig 2017-06-05 19:03:01 UTC -+++ chrome/app/shutdown_signal_handlers_posix.cc -@@ -183,6 +183,11 @@ void InstallShutdownSignalHandlers( +--- chrome/app/shutdown_signal_handlers_posix.cc.orig 2018-12-03 21:16:37.000000000 +0100 ++++ chrome/app/shutdown_signal_handlers_posix.cc 2018-12-05 14:20:17.094777000 +0100 +@@ -183,7 +183,11 @@ g_pipe_pid = getpid(); g_shutdown_pipe_read_fd = pipefd[0]; g_shutdown_pipe_write_fd = pipefd[1]; +-#if !defined(ADDRESS_SANITIZER) +#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) && !defined(KEEP_SHADOW_STACKS) ++#elif !defined(ADDRESS_SANITIZER) const size_t kShutdownDetectorThreadStackSize = PTHREAD_STACK_MIN * 2; #else -@@ -190,6 +195,7 @@ void InstallShutdownSignalHandlers( - // shadow stacks) bloat 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); + // ASan instrumentation bloats the stack frames, so we need to increase the Index: head/www/chromium/files/patch-chrome_browser_about__flags.cc =================================================================== --- head/www/chromium/files/patch-chrome_browser_about__flags.cc (revision 489611) +++ head/www/chromium/files/patch-chrome_browser_about__flags.cc (revision 489612) @@ -1,20 +1,111 @@ ---- chrome/browser/about_flags.cc.orig 2018-08-01 00:08:29.000000000 +0200 -+++ chrome/browser/about_flags.cc 2018-08-04 14:12:27.193526000 +0200 -@@ -2408,7 +2408,7 @@ - flag_descriptions::kEnableMaterialDesignExtensionsDescription, kOsDesktop, - FEATURE_VALUE_TYPE(features::kMaterialDesignExtensions)}, - #endif // ENABLE_EXTENSIONS +--- chrome/browser/about_flags.cc.orig 2018-12-12 22:56:02.000000000 +0100 ++++ chrome/browser/about_flags.cc 2018-12-28 16:40:37.628497000 +0100 +@@ -884,7 +884,7 @@ + {"(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}, +@@ -2609,12 +2609,12 @@ + {"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, -@@ -3024,7 +3024,7 @@ + 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)}, +@@ -2813,12 +2813,12 @@ + FEATURE_VALUE_TYPE( + password_manager::features::kPasswordsKeyboardAccessory)}, + #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) + #if defined(OS_CHROMEOS) + {"enable-experimental-accessibility-features", + flag_descriptions::kExperimentalAccessibilityFeaturesName, +@@ -3225,7 +3225,7 @@ flag_descriptions::kLeftToRightUrlsDescription, kOsDesktop, FEATURE_VALUE_TYPE(features::kLeftToRightUrls)}, -#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, +@@ -3257,7 +3257,7 @@ + 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", +@@ -3566,13 +3566,13 @@ + 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, + kOsWin | kOsMac | kOsLinux, + FEATURE_VALUE_TYPE(features::kDirectManipulationStylus)}, +-#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, +@@ -4021,7 +4021,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, +@@ -4030,7 +4030,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, +@@ -4082,7 +4082,7 @@ + FEATURE_VALUE_TYPE(ash::features::kOverviewSwipeToClose)}, + #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) + {"ntp-backgrounds", flag_descriptions::kNtpBackgroundsName, + flag_descriptions::kNtpBackgroundsDescription, kOsDesktop, + FEATURE_VALUE_TYPE(features::kNtpBackgrounds)}, +@@ -4098,7 +4098,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, Index: head/www/chromium/files/patch-chrome_browser_apps_platform_apps_api_music_manager_private_device__id__linux.cc =================================================================== --- head/www/chromium/files/patch-chrome_browser_apps_platform_apps_api_music_manager_private_device__id__linux.cc (nonexistent) +++ head/www/chromium/files/patch-chrome_browser_apps_platform_apps_api_music_manager_private_device__id__linux.cc (revision 489612) @@ -0,0 +1,70 @@ +--- 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 ++#include ++#endif ++ + #include + #include + #include +@@ -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(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: head/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: head/www/chromium/files/patch-chrome_browser_chrome__browser__main.cc =================================================================== --- head/www/chromium/files/patch-chrome_browser_chrome__browser__main.cc (revision 489611) +++ head/www/chromium/files/patch-chrome_browser_chrome__browser__main.cc (revision 489612) @@ -1,51 +1,42 @@ ---- chrome/browser/chrome_browser_main.cc.orig 2018-06-13 00:10:04.000000000 +0200 -+++ chrome/browser/chrome_browser_main.cc 2018-07-14 13:55:52.288113000 +0200 -@@ -211,7 +211,7 @@ +--- chrome/browser/chrome_browser_main.cc.orig 2018-11-19 19:55:03.000000000 +0100 ++++ chrome/browser/chrome_browser_main.cc 2018-12-04 14:28:26.209004000 +0100 +@@ -214,7 +214,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) -@@ -251,7 +251,7 @@ +@@ -255,7 +255,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 -@@ -1342,10 +1342,10 @@ +@@ -1279,10 +1279,10 @@ } #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 -@@ -1369,7 +1369,7 @@ +@@ -1306,7 +1306,7 @@ } #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(); -@@ -1514,7 +1514,7 @@ - - // Start the tab manager here so that we give the most amount of time for the - // other services to start up before we start adjusting the oom priority. --#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) -+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) - g_browser_process->GetTabManager()->Start(); - #endif - Index: head/www/chromium/files/patch-chrome_browser_chrome__browser__main__linux.cc =================================================================== --- head/www/chromium/files/patch-chrome_browser_chrome__browser__main__linux.cc (revision 489611) +++ head/www/chromium/files/patch-chrome_browser_chrome__browser__main__linux.cc (revision 489612) @@ -1,27 +1,27 @@ ---- chrome/browser/chrome_browser_main_linux.cc.orig 2017-06-05 19:03:02 UTC -+++ chrome/browser/chrome_browser_main_linux.cc -@@ -77,12 +77,14 @@ void ChromeBrowserMainPartsLinux::PreProfileInit() { +--- 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 @@ 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::DBusThreadManagerLinux::Initialize(); - bluez::BluezDBusManager::Initialize( - bluez::DBusThreadManagerLinux::Get()->GetSystemBus(), false); -@@ -92,7 +94,7 @@ void ChromeBrowserMainPartsLinux::PostMainMessageLoopS + bluez::BluezDBusThreadManager::Initialize(); + bluez::BluezDBusManager::Initialize(); + #endif +@@ -104,7 +106,7 @@ } void ChromeBrowserMainPartsLinux::PostDestroyThreads() { -#if !defined(OS_CHROMEOS) +#if !defined(OS_CHROMEOS) && !defined(OS_BSD) bluez::BluezDBusManager::Shutdown(); - bluez::DBusThreadManagerLinux::Shutdown(); + bluez::BluezDBusThreadManager::Shutdown(); #endif Index: head/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.cc =================================================================== --- head/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.cc (revision 489611) +++ head/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.cc (revision 489612) @@ -1,74 +1,74 @@ ---- chrome/browser/chrome_content_browser_client.cc.orig 2018-08-01 00:08:29.000000000 +0200 -+++ chrome/browser/chrome_content_browser_client.cc 2018-08-04 14:22:56.785429000 +0200 -@@ -309,7 +309,7 @@ - #include "chromeos/chromeos_switches.h" +--- chrome/browser/chrome_content_browser_client.cc.orig 2018-12-03 21:16:38.000000000 +0100 ++++ chrome/browser/chrome_content_browser_client.cc 2018-12-05 14:32:20.666302000 +0100 +@@ -348,7 +348,7 @@ + #include "chromeos/services/secure_channel/secure_channel_service.h" #include "components/user_manager/user_manager.h" #include "services/service_manager/public/mojom/interface_provider_spec.mojom.h" -#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" -@@ -347,7 +347,7 @@ - #include "chrome/common/importer/profile_import.mojom.h" +@@ -391,7 +391,7 @@ + #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 -@@ -361,7 +361,7 @@ +@@ -413,7 +413,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 -@@ -1061,7 +1061,7 @@ +@@ -1099,7 +1099,7 @@ #elif defined(OS_CHROMEOS) main_parts = new chromeos::ChromeBrowserMainPartsChromeos( - parameters, std::move(service_manifest_data_pack_)); + parameters, chrome_feature_list_creator_); -#elif defined(OS_LINUX) +#elif defined(OS_LINUX) || defined(OS_BSD) - main_parts = new ChromeBrowserMainPartsLinux( - parameters, std::move(service_manifest_data_pack_)); + main_parts = + new ChromeBrowserMainPartsLinux(parameters, chrome_feature_list_creator_); #elif defined(OS_ANDROID) -@@ -1081,7 +1081,7 @@ +@@ -1119,7 +1119,7 @@ // 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()); -@@ -1823,7 +1823,7 @@ +@@ -1897,7 +1897,7 @@ 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 client_info = -@@ -3177,7 +3177,7 @@ +@@ -3411,7 +3411,7 @@ } } -#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, -@@ -3892,7 +3892,7 @@ +@@ -4249,7 +4249,7 @@ #if defined(OS_ANDROID) frame_interfaces_parameterized_->AddInterface(base::Bind( &ForwardToJavaWebContentsRegistry)); -#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 Index: head/www/chromium/files/patch-chrome_browser_diagnostics_diagnostics__writer.h =================================================================== --- head/www/chromium/files/patch-chrome_browser_diagnostics_diagnostics__writer.h (revision 489611) +++ head/www/chromium/files/patch-chrome_browser_diagnostics_diagnostics__writer.h (revision 489612) @@ -1,11 +1,11 @@ ---- chrome/browser/diagnostics/diagnostics_writer.h.orig 2017-06-05 19:03:02 UTC -+++ chrome/browser/diagnostics/diagnostics_writer.h -@@ -19,7 +19,7 @@ class DiagnosticsWriter : public DiagnosticsModel::Obs +--- 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 @@ + // Console base class used internally. + class SimpleConsole; + ++#undef MACHINE ++ + class DiagnosticsWriter : public DiagnosticsModel::Observer { public: // The type of formatting done by this writer. - enum FormatType { -- MACHINE, -+ THEMACHINE, - LOG, - HUMAN - }; Index: head/www/chromium/files/patch-chrome_browser_download_download__commands.cc =================================================================== --- head/www/chromium/files/patch-chrome_browser_download_download__commands.cc (revision 489611) +++ head/www/chromium/files/patch-chrome_browser_download_download__commands.cc (revision 489612) @@ -1,38 +1,20 @@ ---- chrome/browser/download/download_commands.cc.orig 2018-06-13 00:10:05.000000000 +0200 -+++ chrome/browser/download/download_commands.cc 2018-07-14 14:30:03.853964000 +0200 -@@ -249,7 +249,7 @@ - return download_item_->GetOpenWhenComplete() || - download_crx_util::IsExtensionDownload(*download_item_); - case 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 (CanOpenPdfInSystemViewer()) { - DownloadPrefs* prefs = DownloadPrefs::FromBrowserContext( - content::DownloadItemUtils::GetBrowserContext(download_item_)); -@@ -293,7 +293,7 @@ - bool is_checked = IsCommandChecked(ALWAYS_OPEN_TYPE); - DownloadPrefs* prefs = DownloadPrefs::FromBrowserContext( - content::DownloadItemUtils::GetBrowserContext(download_item_)); --#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) -+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) - if (CanOpenPdfInSystemViewer()) { - prefs->SetShouldOpenPdfInSystemReader(!is_checked); - DownloadItemModel(download_item_) -@@ -408,7 +408,7 @@ +--- 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 @@ 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 = download_item_->GetTargetFilePath(); + base::FilePath path = model_->GetTargetFilePath(); return path.MatchesExtension(FILE_PATH_LITERAL(".pdf")); -@@ -425,7 +425,7 @@ +@@ -237,7 +237,7 @@ 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: head/www/chromium/files/patch-chrome_browser_extensions_bookmark__app__helper.cc =================================================================== --- head/www/chromium/files/patch-chrome_browser_extensions_bookmark__app__helper.cc (revision 489611) +++ head/www/chromium/files/patch-chrome_browser_extensions_bookmark__app__helper.cc (revision 489612) @@ -1,11 +1,11 @@ ---- chrome/browser/extensions/bookmark_app_helper.cc.orig 2017-06-05 19:03:02 UTC -+++ chrome/browser/extensions/bookmark_app_helper.cc -@@ -721,7 +721,7 @@ void BookmarkAppHelper::FinishInstallation(const Exten - #if !defined(OS_MACOSX) - #if !defined(USE_ASH) - web_app::ShortcutLocations creation_locations; +--- chrome/browser/extensions/bookmark_app_helper.cc.orig 2018-11-19 19:55:03.000000000 +0100 ++++ chrome/browser/extensions/bookmark_app_helper.cc 2018-12-04 14:45:16.963992000 +0100 +@@ -597,7 +597,7 @@ + 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; + creation_locations.on_desktop = true; #else - creation_locations.on_desktop = false; + creation_locations.on_desktop = false; Index: head/www/chromium/files/patch-chrome_browser_extensions_external__provider__impl.cc =================================================================== --- head/www/chromium/files/patch-chrome_browser_extensions_external__provider__impl.cc (revision 489611) +++ head/www/chromium/files/patch-chrome_browser_extensions_external__provider__impl.cc (revision 489612) @@ -1,20 +1,20 @@ ---- chrome/browser/extensions/external_provider_impl.cc.orig 2018-03-20 23:05:17.000000000 +0100 -+++ chrome/browser/extensions/external_provider_impl.cc 2018-03-24 13:22:20.011401000 +0100 -@@ -689,7 +689,7 @@ - Manifest::EXTERNAL_PREF, Manifest::EXTERNAL_PREF_DOWNLOAD, - oem_extension_creation_flags)); +--- 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 @@ + 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( service, -@@ -717,7 +717,7 @@ +@@ -739,7 +739,7 @@ bundled_extension_creation_flags)); // Define a per-user source of external extensions. -#if defined(OS_MACOSX) || (defined(OS_LINUX) && defined(CHROMIUM_BUILD)) +#if defined(OS_MACOSX) || ((defined(OS_LINUX) || defined(OS_BSD)) && defined(CHROMIUM_BUILD)) provider_list->push_back(std::make_unique( service, new ExternalPrefLoader(chrome::DIR_USER_EXTERNAL_EXTENSIONS, Index: head/www/chromium/files/patch-chrome_browser_flag__descriptions.cc =================================================================== --- head/www/chromium/files/patch-chrome_browser_flag__descriptions.cc (revision 489611) +++ head/www/chromium/files/patch-chrome_browser_flag__descriptions.cc (revision 489612) @@ -1,11 +1,34 @@ ---- chrome/browser/flag_descriptions.cc.orig 2017-12-15 02:04:09.000000000 +0100 -+++ chrome/browser/flag_descriptions.cc 2017-12-24 01:21:43.685723000 +0100 -@@ -2643,7 +2643,7 @@ +--- 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 @@ // 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 @@ + + #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."; Index: head/www/chromium/files/patch-chrome_browser_flag__descriptions.h =================================================================== --- head/www/chromium/files/patch-chrome_browser_flag__descriptions.h (revision 489611) +++ head/www/chromium/files/patch-chrome_browser_flag__descriptions.h (revision 489612) @@ -1,20 +1,32 @@ ---- chrome/browser/flag_descriptions.h.orig 2017-06-05 19:03:02 UTC -+++ chrome/browser/flag_descriptions.h -@@ -1754,7 +1754,7 @@ extern const char kForceUiDirectionLtr[]; - // Name for the option to force right-to-left UI direction mode. - extern const char kForceUiDirectionRtl[]; +--- 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 @@ + // Random platform combinations ----------------------------------------------- + -#if defined(OS_WIN) || defined(OS_LINUX) +#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) - // Name of the flag to enable che chrome.input.ime API. extern const char kEnableInputImeApiName[]; -@@ -1762,7 +1762,7 @@ extern const char kEnableInputImeApiName[]; - // Description of the flag to enable the chrome.input.ime API. extern const char kEnableInputImeApiDescription[]; -#endif // defined(OS_WIN) || defined(OS_LINUX) +#endif // defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) - // Enables grouping websites by domain on chrome://history. - extern const char kEnableGroupedHistoryName[]; + extern const char kExperimentalUiName[]; + extern const char kExperimentalUiDescription[]; +@@ -2184,12 +2184,12 @@ + + #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 -------------------------------------------------------------- + Index: head/www/chromium/files/patch-chrome_browser_media_router_providers_wired_display_wired_display_media_route_provider.cc =================================================================== --- head/www/chromium/files/patch-chrome_browser_media_router_providers_wired_display_wired_display_media_route_provider.cc (revision 489611) +++ head/www/chromium/files/patch-chrome_browser_media_router_providers_wired_display_wired_display_media_route_provider.cc (revision 489612) @@ -1,22 +1,23 @@ ---- chrome/browser/media/router/providers/wired_display/wired_display_media_route_provider.cc.orig 2018-07-21 15:25:50.187627000 +0200 -+++ chrome/browser/media/router/providers/wired_display/wired_display_media_route_provider.cc 2018-07-21 15:28:47.631030000 +0200 -@@ -111,6 +111,11 @@ +--- 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, std::string("Not implemented"), ++ std::move(callback).Run(base::nullopt, nullptr, ++ std::string("Not implemented"), + RouteRequestResult::UNKNOWN_ERROR); + return; +#else base::Optional display = GetDisplayBySinkId(sink_id); if (!display) { - std::move(callback).Run(base::nullopt, std::string("Display not found"), -@@ -135,6 +140,7 @@ - presentation.receiver()->Start(presentation_id, GURL(media_source)); - std::move(callback).Run(route, base::nullopt, RouteRequestResult::OK); + 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( Index: head/www/chromium/files/patch-chrome_browser_renderer__preferences__util.cc =================================================================== --- head/www/chromium/files/patch-chrome_browser_renderer__preferences__util.cc (revision 489611) +++ head/www/chromium/files/patch-chrome_browser_renderer__preferences__util.cc (revision 489612) @@ -1,38 +1,38 @@ ---- chrome/browser/renderer_preferences_util.cc.orig 2017-06-05 19:03:02 UTC -+++ chrome/browser/renderer_preferences_util.cc +--- 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/WebKit/public/public_features.h" + #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 @@ #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" -@@ -134,7 +134,7 @@ void UpdateFromSystemSettings(content::RendererPrefere - prefs->caret_blink_interval = interval.InSecondsF(); +@@ -131,7 +131,7 @@ + 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()) { -@@ -156,7 +156,7 @@ void UpdateFromSystemSettings(content::RendererPrefere +@@ -150,7 +150,7 @@ } #endif -#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_WIN) +#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_WIN) || defined(OS_BSD) - CR_DEFINE_STATIC_LOCAL(const gfx::FontRenderParams, params, - (gfx::GetFontRenderParams(gfx::FontRenderParamsQuery(), NULL))); - prefs->should_antialias_text = params.antialiasing; + static const base::NoDestructor params( + gfx::GetFontRenderParams(gfx::FontRenderParamsQuery(), nullptr)); + prefs->should_antialias_text = params->antialiasing; Index: head/www/chromium/files/patch-chrome_browser_ui_browser__view__prefs.cc =================================================================== --- head/www/chromium/files/patch-chrome_browser_ui_browser__view__prefs.cc (nonexistent) +++ head/www/chromium/files/patch-chrome_browser_ui_browser__view__prefs.cc (revision 489612) @@ -0,0 +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 @@ + + 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 @@ + #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) { Property changes on: head/www/chromium/files/patch-chrome_browser_ui_browser__view__prefs.cc ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/chromium/files/patch-chrome_browser_ui_browser__window.h =================================================================== --- head/www/chromium/files/patch-chrome_browser_ui_browser__window.h (nonexistent) +++ head/www/chromium/files/patch-chrome_browser_ui_browser__window.h (revision 489612) @@ -0,0 +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 @@ + 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 + Property changes on: head/www/chromium/files/patch-chrome_browser_ui_browser__window.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/chromium/files/patch-chrome_browser_ui_webui_about__ui.cc =================================================================== --- head/www/chromium/files/patch-chrome_browser_ui_webui_about__ui.cc (revision 489611) +++ head/www/chromium/files/patch-chrome_browser_ui_webui_about__ui.cc (revision 489612) @@ -1,20 +1,20 @@ ---- chrome/browser/ui/webui/about_ui.cc.orig 2018-02-24 16:25:10.000000000 +0100 -+++ chrome/browser/ui/webui/about_ui.cc 2018-03-03 22:12:29.265266000 +0100 -@@ -390,7 +390,7 @@ - DISALLOW_COPY_AND_ASSIGN(AboutDnsHandler); - }; +--- 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 @@ + 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 @@ - } else if (source_name_ == chrome::kChromeUIDNSHost) { - AboutDnsHandler::Start(profile(), callback); - return; + .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: head/www/chromium/files/patch-chrome_browser_web_applications_extensions_web_app_extension_shortcut.cc =================================================================== --- head/www/chromium/files/patch-chrome_browser_web_applications_extensions_web_app_extension_shortcut.cc (nonexistent) +++ head/www/chromium/files/patch-chrome_browser_web_applications_extensions_web_app_extension_shortcut.cc (revision 489612) @@ -0,0 +1,11 @@ +--- 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: head/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: head/www/chromium/files/patch-chrome_common_chrome__features.cc =================================================================== --- head/www/chromium/files/patch-chrome_common_chrome__features.cc (revision 489611) +++ head/www/chromium/files/patch-chrome_common_chrome__features.cc (revision 489612) @@ -1,29 +1,36 @@ ---- chrome/common/chrome_features.cc.orig 2018-08-01 00:08:33.000000000 +0200 -+++ chrome/common/chrome_features.cc 2018-08-05 16:46:49.046411000 +0200 -@@ -85,7 +85,7 @@ +--- 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 @@ 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. -@@ -142,7 +142,7 @@ - base::FEATURE_ENABLED_BY_DEFAULT}; + 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 @@ + "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{ -@@ -367,7 +367,7 @@ - "AcknowledgeNtpOverrideOnDeactivate", base::FEATURE_DISABLED_BY_DEFAULT}; - #endif - --#if defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) -+#if defined(OS_WIN) || ((defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)) - const base::Feature kWarnBeforeQuitting{"WarnBeforeQuitting", - base::FEATURE_DISABLED_BY_DEFAULT}; - #endif +@@ -201,7 +201,7 @@ + // Enables or disables windowing related features for desktop PWAs. + const base::Feature kDesktopPWAWindowing { + "DesktopPWAWindowing", +-#if defined(OS_CHROMEOS) || defined(OS_WIN) || defined(OS_LINUX) ++#if defined(OS_CHROMEOS) || defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) + base::FEATURE_ENABLED_BY_DEFAULT + #else + base::FEATURE_DISABLED_BY_DEFAULT Index: head/www/chromium/files/patch-chrome_common_chrome__features.h =================================================================== --- head/www/chromium/files/patch-chrome_common_chrome__features.h (revision 489611) +++ head/www/chromium/files/patch-chrome_common_chrome__features.h (revision 489612) @@ -1,29 +1,24 @@ ---- chrome/common/chrome_features.h.orig 2018-08-01 00:08:33.000000000 +0200 -+++ chrome/common/chrome_features.h 2018-08-05 16:48:04.662112000 +0200 -@@ -52,7 +52,7 @@ +--- 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 @@ 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) ++#endif // defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) -@@ -76,7 +76,7 @@ + COMPONENT_EXPORT(CHROME_FEATURES) + extern const base::Feature kBlockPromptsIfDismissedOften; +@@ -90,7 +90,7 @@ extern const base::Feature kTabStripKeyboardFocus; #endif // defined(OS_MACOSX) -#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 - -@@ -204,7 +204,7 @@ - extern const base::Feature kAcknowledgeNtpOverrideOnDeactivate; - #endif - --#if defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) -+#if defined(OS_WIN) || ((defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)) - extern const base::Feature kWarnBeforeQuitting; - #endif - Index: head/www/chromium/files/patch-chrome_common_extensions_api_api__sources.gni =================================================================== --- head/www/chromium/files/patch-chrome_common_extensions_api_api__sources.gni (nonexistent) +++ head/www/chromium/files/patch-chrome_common_extensions_api_api__sources.gni (revision 489612) @@ -0,0 +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 @@ + "wallpaper.json", + "wallpaper_private.json", + ] +-} else if (is_linux || is_win) { ++} else if (is_linux || is_bsd || is_win) { + schema_sources_ += [ "input_ime.json" ] + } + Property changes on: head/www/chromium/files/patch-chrome_common_extensions_api_api__sources.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: head/www/chromium/files/patch-chrome_renderer_pepper_pepper__flash__font__file__host.cc =================================================================== --- head/www/chromium/files/patch-chrome_renderer_pepper_pepper__flash__font__file__host.cc (revision 489611) +++ head/www/chromium/files/patch-chrome_renderer_pepper_pepper__flash__font__file__host.cc (revision 489612) @@ -1,38 +1,29 @@ ---- chrome/renderer/pepper/pepper_flash_font_file_host.cc.orig 2017-06-05 19:03:03 UTC -+++ chrome/renderer/pepper/pepper_flash_font_file_host.cc -@@ -14,7 +14,7 @@ +--- 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 +@@ -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 "content/public/child/child_process_sandbox_support_linux.h" + #include "components/services/font/public/cpp/font_loader.h" #include "content/public/common/common_sandbox_support_linux.h" #elif defined(OS_WIN) -@@ -28,7 +28,7 @@ PepperFlashFontFileHost::PepperFlashFontFileHost( +@@ -29,7 +29,7 @@ const ppapi::proxy::SerializedFontDescription& description, PP_PrivateFontCharset charset) : ResourceHost(host->GetPpapiHost(), instance, resource) { --#if defined(OS_LINUX) || defined(OS_OPENBSD) +-#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) - fd_.reset(content::MatchFontWithFallback( - description.face, - description.weight >= PP_BROWSERFONT_TRUSTED_WEIGHT_BOLD, -@@ -45,7 +45,7 @@ PepperFlashFontFileHost::PepperFlashFontFileHost( - sk_sp font_mgr(SkFontMgr::RefDefault()); - typeface_ = sk_sp( - font_mgr->matchFamilyStyle(description.face.c_str(), style)); --#endif // defined(OS_LINUX) || defined(OS_OPENBSD) -+#endif // defined(OS_LINUX) || defined(OS_BSD) - } - - PepperFlashFontFileHost::~PepperFlashFontFileHost() {} -@@ -64,7 +64,7 @@ bool PepperFlashFontFileHost::GetFontData(uint32_t tab + // 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 @@ void* buffer, size_t* length) { bool result = false; --#if defined(OS_LINUX) || defined(OS_OPENBSD) +-#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) - int fd = fd_.get(); - if (fd != -1) - result = content::GetFontTable(fd, table, 0 /* offset */, + if (font_file_.IsValid()) { + result = content::GetFontTable(font_file_.GetPlatformFile(), table, + 0 /* offset */, Index: head/www/chromium/files/patch-chrome_renderer_pepper_pepper__flash__font__file__host.h =================================================================== --- head/www/chromium/files/patch-chrome_renderer_pepper_pepper__flash__font__file__host.h (revision 489611) +++ head/www/chromium/files/patch-chrome_renderer_pepper_pepper__flash__font__file__host.h (revision 489612) @@ -1,20 +1,20 @@ ---- chrome/renderer/pepper/pepper_flash_font_file_host.h.orig 2017-06-05 19:03:03 UTC -+++ chrome/renderer/pepper/pepper_flash_font_file_host.h +--- 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 @@ -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/scoped_file.h" + #include "base/files/file.h" #elif defined(OS_WIN) #include "third_party/skia/include/core/SkRefCnt.h" -@@ -50,7 +50,7 @@ class PepperFlashFontFileHost : public ppapi::host::Re +@@ -50,7 +50,7 @@ uint32_t table); bool GetFontData(uint32_t table, void* buffer, size_t* length); --#if defined(OS_LINUX) || defined(OS_OPENBSD) +-#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) - base::ScopedFD fd_; + base::File font_file_; #elif defined(OS_WIN) sk_sp typeface_; Index: head/www/chromium/files/patch-components_autofill_core_browser_autofill__experiments.cc =================================================================== --- head/www/chromium/files/patch-components_autofill_core_browser_autofill__experiments.cc (revision 489611) +++ head/www/chromium/files/patch-components_autofill_core_browser_autofill__experiments.cc (revision 489612) @@ -1,11 +1,80 @@ ---- components/autofill/core/browser/autofill_experiments.cc.orig 2017-06-05 19:03:05 UTC -+++ components/autofill/core/browser/autofill_experiments.cc -@@ -153,7 +153,7 @@ unsigned int GetPopupMargin() { +--- 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 @@ + + 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 @@ + 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 @@ + } + bool OfferStoreUnmaskedCards() { -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) // 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 @@ + 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 @@ + NOTREACHED(); + return ForcedPopupLayoutState::kDefault; + } +-#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) ++#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD) + + } // namespace autofill Index: head/www/chromium/files/patch-components_autofill_core_browser_autofill__experiments.h =================================================================== --- head/www/chromium/files/patch-components_autofill_core_browser_autofill__experiments.h (nonexistent) +++ head/www/chromium/files/patch-components_autofill_core_browser_autofill__experiments.h (revision 489612) @@ -0,0 +1,57 @@ +--- 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 @@ + 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 @@ + // 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 @@ + // if the experiment param matches kAutofillDropdownLayoutParameterLeadingIcon + // or kAutofillDropdownLayoutParameterTrailingIcon, respectively. + ForcedPopupLayoutState GetForcedPopupLayoutState(); +-#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) ++#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD) + + } // namespace autofill + Property changes on: head/www/chromium/files/patch-components_autofill_core_browser_autofill__experiments.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/chromium/files/patch-components_autofill_strings.grdp =================================================================== --- head/www/chromium/files/patch-components_autofill_strings.grdp (revision 489611) +++ head/www/chromium/files/patch-components_autofill_strings.grdp (revision 489612) @@ -1,29 +1,11 @@ ---- components/autofill_strings.grdp.orig 2018-08-01 00:08:37.000000000 +0200 -+++ components/autofill_strings.grdp 2018-08-04 17:51:10.986958000 +0200 -@@ -195,7 +195,7 @@ - - Confirm +--- 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 @@ + + Save card? - + Do you want to save this card to your Google Account? -@@ -213,7 +213,7 @@ - - Pay quickly on sites and apps across devices using cards you have saved with Google. - -- -+ - - - To pay faster next time, save this card to your Google Account. -@@ -225,7 +225,7 @@ - - - -- -+ - - - To pay faster next time, save your card and billing address to your Google Account. Index: head/www/chromium/files/patch-components_crash_content_app_BUILD.gn =================================================================== --- head/www/chromium/files/patch-components_crash_content_app_BUILD.gn (revision 489611) +++ head/www/chromium/files/patch-components_crash_content_app_BUILD.gn (revision 489612) @@ -1,19 +1,20 @@ ---- components/crash/content/app/BUILD.gn.orig 2018-06-13 00:10:13.000000000 +0200 -+++ components/crash/content/app/BUILD.gn 2018-07-18 23:31:26.635837000 +0200 +--- 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 @@ sources += [ "crashpad.cc" ] } - if (is_android || is_linux) { + if (is_android || is_linux && !is_bsd) { # Want these files on both Linux and Android. set_sources_assignment_filter([]) sources += [ -@@ -73,7 +73,6 @@ +@@ -73,8 +73,6 @@ "//content/public/common:content_descriptors", "//content/public/common:result_codes", "//sandbox", - "//third_party/breakpad:client", +- "//third_party/crashpad/crashpad/snapshot", ] + } - # Clang's -mstackrealign doesn't work well with Index: head/www/chromium/files/patch-components_download_quarantine_quarantine_linux.cc =================================================================== --- head/www/chromium/files/patch-components_download_quarantine_quarantine_linux.cc (revision 489611) +++ head/www/chromium/files/patch-components_download_quarantine_quarantine_linux.cc (revision 489612) @@ -1,49 +1,33 @@ ---- components/download/quarantine/quarantine_linux.cc.orig 2018-07-19 22:21:43.332341000 +0200 -+++ components/download/quarantine/quarantine_linux.cc 2018-07-19 22:24:04.361819000 +0200 +--- components/download/quarantine/quarantine_linux.cc.orig 2018-12-03 21:16:48.000000000 +0100 ++++ components/download/quarantine/quarantine_linux.cc 2018-12-13 18:59:24.718194000 +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 #include +#if !defined(OS_BSD) #include +#endif #include "base/files/file_path.h" - #include "base/files/file_util.h" -@@ -29,17 +33,20 @@ + #include "base/logging.h" +@@ -24,12 +28,14 @@ size_t value_size, int flags) { - base::AssertBlockingAllowed(); + base::ScopedBlockingCall scoped_blocking_call(base::BlockingType::MAY_BLOCK); +#if !defined(OS_BSD) int result = setxattr(path, name, value, value_size, flags); if (result) { DPLOG(ERROR) << "Could not set extended attribute " << name << " on file " << path; return false; } -+#endif ++#endif // defined(OS_BSD) return true; } - std::string GetExtendedFileAttribute(const char* path, const char* name) { - base::AssertBlockingAllowed(); -+#if !defined(OS_BSD) - ssize_t len = getxattr(path, name, nullptr, 0); - if (len <= 0) - return std::string(); -@@ -49,6 +56,9 @@ - if (len < static_cast(buffer.size())) - return std::string(); - return std::string(buffer.begin(), buffer.end()); -+#else -+ return std::string(); -+#endif - } - - } // namespace Index: head/www/chromium/files/patch-components_download_quarantine_test_support_linux.cc =================================================================== --- head/www/chromium/files/patch-components_download_quarantine_test_support_linux.cc (nonexistent) +++ head/www/chromium/files/patch-components_download_quarantine_test_support_linux.cc (revision 489612) @@ -0,0 +1,20 @@ +--- components/download/quarantine/test_support_linux.cc.orig 2018-12-13 19:01:53.437126000 +0100 ++++ components/download/quarantine/test_support_linux.cc 2018-12-13 19:02:49.728978000 +0100 +@@ -22,6 +22,7 @@ + + std::string GetExtendedFileAttribute(const char* path, const char* name) { + base::AssertBlockingAllowed(); ++#if !defined(OS_BSD) + ssize_t len = getxattr(path, name, nullptr, 0); + if (len <= 0) + return std::string(); +@@ -31,6 +32,9 @@ + if (len < static_cast(buffer.size())) + return std::string(); + return std::string(buffer.begin(), buffer.end()); ++#else ++ return std::string(); ++#endif // !defined(OS_BSD) + } + + } // namespace Property changes on: head/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: head/www/chromium/files/patch-components_os__crypt_os__crypt.h =================================================================== --- head/www/chromium/files/patch-components_os__crypt_os__crypt.h (revision 489611) +++ head/www/chromium/files/patch-components_os__crypt_os__crypt.h (revision 489612) @@ -1,47 +1,48 @@ ---- components/os_crypt/os_crypt.h.orig 2017-09-05 21:05:17.000000000 +0200 -+++ components/os_crypt/os_crypt.h 2017-09-06 19:12:09.251431000 +0200 -@@ -14,9 +14,9 @@ +--- 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 +@@ -15,9 +15,9 @@ #include "base/strings/string16.h" #include "build/build_config.h" --#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && defined(UNIT_TEST) -+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) && defined(UNIT_TEST) +-#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) && defined(UNIT_TEST) -+#endif // (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) && defined(UNIT_TEST) +-#endif // defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#endif // (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) - namespace os_crypt { - struct Config; -@@ -28,13 +28,13 @@ + #if defined(OS_MACOSX) && !defined(OS_IOS) + class PrefRegistrySimple; +@@ -34,13 +34,13 @@ // 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_BSD)) && !defined(OS_CHROMEOS) ++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) // Set the configuration of OSCrypt. - static void SetConfig(std::unique_ptr config); - - // Returns true iff the real secret key (not hardcoded one) is available. - static bool IsEncryptionAvailable(); + static COMPONENT_EXPORT(OS_CRYPT) void SetConfig( + std::unique_ptr config); -#endif // defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#endif // (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) ++#endif // (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) - // Encrypt a string16. The output (second argument) is really an array of - // bytes, but we're passing it back as a std::string. -@@ -67,7 +67,7 @@ +-#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 @@ DISALLOW_IMPLICIT_CONSTRUCTORS(OSCrypt); }; --#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && defined(UNIT_TEST) -+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) && defined(UNIT_TEST) +-#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. -@@ -80,6 +80,6 @@ +@@ -127,6 +127,6 @@ // Clears any caching and most lazy initialisations performed by the production // code. Should be used after any test which required a password. - void ClearCacheForTesting(); --#endif // defined(OS_LINUX) && !defined(OS_CHROMEOS) && defined(UNIT_TEST) -+#endif // (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) && defined(UNIT_TEST) + 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: head/www/chromium/files/patch-content_app_content_main_runner_impl.cc =================================================================== --- head/www/chromium/files/patch-content_app_content_main_runner_impl.cc (revision 489611) +++ head/www/chromium/files/patch-content_app_content_main_runner_impl.cc (revision 489612) @@ -1,38 +1,29 @@ ---- content/app/content_main_runner_impl.cc.orig 2018-08-01 00:08:43.000000000 +0200 -+++ content/app/content_main_runner_impl.cc 2018-08-04 18:50:49.262605000 +0200 -@@ -83,10 +83,10 @@ +--- content/app/content_main_runner_impl.cc.orig 2018-12-03 21:16:54.000000000 +0100 ++++ content/app/content_main_runner_impl.cc 2018-12-13 20:19:01.539883000 +0100 +@@ -90,10 +90,10 @@ #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 -@@ -150,7 +150,7 @@ - namespace content { - extern int GpuMain(const content::MainFunctionParams&); - #if BUILDFLAG(ENABLE_PLUGINS) --#if !defined(OS_LINUX) -+#if !defined(OS_LINUX) && !defined(OS_BSD) - extern int PluginMain(const content::MainFunctionParams&); - #endif - extern int PpapiPluginMain(const MainFunctionParams&); -@@ -722,11 +722,11 @@ +@@ -627,11 +627,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 Index: head/www/chromium/files/patch-content_browser_BUILD.gn =================================================================== --- head/www/chromium/files/patch-content_browser_BUILD.gn (revision 489611) +++ head/www/chromium/files/patch-content_browser_BUILD.gn (revision 489612) @@ -1,14 +1,14 @@ ---- content/browser/BUILD.gn.orig 2018-08-01 00:08:43.000000000 +0200 -+++ content/browser/BUILD.gn 2018-08-04 21:53:48.299617000 +0200 -@@ -1802,11 +1802,6 @@ - "tracing/cros_tracing_agent.cc", +--- 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 @@ "tracing/cros_tracing_agent.h", ] + deps += [ "//chromeos/resources" ] - } else { - sources += [ - "memory/memory_monitor_linux.cc", - "memory/memory_monitor_linux.h", - ] } if (is_chromeos || is_android || is_chromecast) { Index: head/www/chromium/files/patch-content_browser_scheduler_responsiveness_native__event__observer.cc =================================================================== --- head/www/chromium/files/patch-content_browser_scheduler_responsiveness_native__event__observer.cc (nonexistent) +++ head/www/chromium/files/patch-content_browser_scheduler_responsiveness_native__event__observer.cc (revision 489612) @@ -0,0 +1,29 @@ +--- content/browser/scheduler/responsiveness/native_event_observer.cc.orig 2018-12-12 22:56:07.000000000 +0100 ++++ content/browser/scheduler/responsiveness/native_event_observer.cc 2018-12-29 17:27:50.449973000 +0100 +@@ -17,7 +17,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 +@@ -29,7 +29,7 @@ + namespace content { + namespace responsiveness { + +-#if defined(OS_WIN) || (defined(OS_LINUX) && defined(USE_X11)) ++#if defined(OS_WIN) || ((defined(OS_LINUX) || defined(OS_BSD)) && defined(USE_X11)) + + namespace { + +@@ -64,7 +64,7 @@ + DeregisterObserver(); + } + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + void NativeEventObserver::RegisterObserver() { + aura::Env::GetInstance()->AddWindowEventDispatcherObserver(this); + } Property changes on: head/www/chromium/files/patch-content_browser_scheduler_responsiveness_native__event__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: head/www/chromium/files/patch-content_browser_scheduler_responsiveness_native__event__observer.h =================================================================== --- head/www/chromium/files/patch-content_browser_scheduler_responsiveness_native__event__observer.h (nonexistent) +++ head/www/chromium/files/patch-content_browser_scheduler_responsiveness_native__event__observer.h (revision 489612) @@ -0,0 +1,47 @@ +--- content/browser/scheduler/responsiveness/native_event_observer.h.orig 2018-12-12 22:56:07.000000000 +0100 ++++ content/browser/scheduler/responsiveness/native_event_observer.h 2018-12-30 00:51:50.166518000 +0100 +@@ -15,7 +15,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 + +@@ -40,7 +40,7 @@ + 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 +@@ -60,7 +60,7 @@ + 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(); +@@ -73,7 +73,7 @@ + void WillRunNativeEvent(const void* opaque_identifier) override; + void DidRunNativeEvent(const void* opaque_identifier, + base::TimeTicks creation_time) override; +-#elif defined(OS_LINUX) ++#elif defined(OS_LINUX) || defined(OS_BSD) + // aura::WindowEventDispatcherObserver overrides: + void OnWindowEventDispatcherStartedProcessing( + aura::WindowEventDispatcher* dispatcher, +@@ -90,7 +90,7 @@ + void RegisterObserver(); + void DeregisterObserver(); + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + struct EventInfo { + const void* unique_id; + base::TimeTicks creation_time; Property changes on: head/www/chromium/files/patch-content_browser_scheduler_responsiveness_native__event__observer.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/chromium/files/patch-content_gpu_gpu__main.cc =================================================================== --- head/www/chromium/files/patch-content_gpu_gpu__main.cc (revision 489611) +++ head/www/chromium/files/patch-content_gpu_gpu__main.cc (revision 489612) @@ -1,47 +1,47 @@ ---- content/gpu/gpu_main.cc.orig 2018-02-24 16:25:14.000000000 +0100 -+++ content/gpu/gpu_main.cc 2018-03-04 01:23:12.209864000 +0100 -@@ -76,7 +76,7 @@ - #include "ui/gfx/x/x11_switches.h" // nogncheck +--- 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 @@ + #include "ui/gfx/x/x11_switches.h" // nogncheck #endif -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) - #include "content/common/font_config_ipc_linux.h" #include "content/gpu/gpu_sandbox_hook_linux.h" - #include "content/public/common/common_sandbox_support_linux.h" -@@ -102,7 +102,7 @@ + #include "content/public/common/sandbox_init.h" + #include "services/service_manager/sandbox/linux/sandbox_linux.h" +@@ -110,7 +110,7 @@ namespace { -#if defined(OS_LINUX) +#if defined(OS_LINUX) && !defined(OS_BSD) bool StartSandboxLinux(gpu::GpuWatchdogThread*, const gpu::GPUInfo*, const gpu::GpuPreferences&); -@@ -163,7 +163,7 @@ +@@ -171,7 +171,7 @@ 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_); -@@ -340,7 +340,7 @@ +@@ -361,7 +361,7 @@ 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) { -@@ -378,7 +378,7 @@ +@@ -396,7 +396,7 @@ 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: head/www/chromium/files/patch-content_ppapi__plugin_ppapi__blink__platform__impl.cc =================================================================== --- head/www/chromium/files/patch-content_ppapi__plugin_ppapi__blink__platform__impl.cc (nonexistent) +++ head/www/chromium/files/patch-content_ppapi__plugin_ppapi__blink__platform__impl.cc (revision 489612) @@ -0,0 +1,29 @@ +--- content/ppapi_plugin/ppapi_blink_platform_impl.cc.orig 2018-12-29 00:39:49.705019000 +0100 ++++ content/ppapi_plugin/ppapi_blink_platform_impl.cc 2018-12-29 00:41:23.442527000 +0100 +@@ -40,7 +40,7 @@ + + class PpapiBlinkPlatformImpl::SandboxSupport : public WebSandboxSupport { + public: +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + explicit SandboxSupport(sk_sp font_loader) + : font_loader_(std::move(font_loader)) {} + #endif +@@ -48,7 +48,7 @@ + + #if defined(OS_MACOSX) + bool LoadFont(CTFontRef srcFont, CGFontRef* out, uint32_t* fontID) override; +-#elif defined(OS_LINUX) ++#elif defined(OS_LINUX) || defined(OS_BSD) + SandboxSupport(); + void GetFallbackFontForCharacter( + WebUChar32 character, +@@ -140,7 +140,7 @@ + #endif // !defined(OS_ANDROID) && !defined(OS_WIN) + + PpapiBlinkPlatformImpl::PpapiBlinkPlatformImpl() { +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + font_loader_ = + sk_make_sp(ChildThread::Get()->GetConnector()); + SkFontConfigInterface::SetGlobal(font_loader_); Property changes on: head/www/chromium/files/patch-content_ppapi__plugin_ppapi__blink__platform__impl.cc ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/chromium/files/patch-content_ppapi__plugin_ppapi__blink__platform__impl.h =================================================================== --- head/www/chromium/files/patch-content_ppapi__plugin_ppapi__blink__platform__impl.h (nonexistent) +++ head/www/chromium/files/patch-content_ppapi__plugin_ppapi__blink__platform__impl.h (revision 489612) @@ -0,0 +1,20 @@ +--- content/ppapi_plugin/ppapi_blink_platform_impl.h.orig 2018-12-29 00:40:09.590096000 +0100 ++++ content/ppapi_plugin/ppapi_blink_platform_impl.h 2018-12-29 00:41:23.439801000 +0100 +@@ -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 +@@ -47,7 +47,7 @@ + std::unique_ptr sandbox_support_; + #endif + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + sk_sp font_loader_; + #endif + Property changes on: head/www/chromium/files/patch-content_ppapi__plugin_ppapi__blink__platform__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: head/www/chromium/files/patch-content_public_common_common__param__traits__macros.h =================================================================== --- head/www/chromium/files/patch-content_public_common_common__param__traits__macros.h (nonexistent) +++ head/www/chromium/files/patch-content_public_common_common__param__traits__macros.h (revision 489612) @@ -0,0 +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 @@ + 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) Property changes on: head/www/chromium/files/patch-content_public_common_common__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: head/www/chromium/files/patch-content_renderer_render__thread__impl.cc =================================================================== --- head/www/chromium/files/patch-content_renderer_render__thread__impl.cc (revision 489611) +++ head/www/chromium/files/patch-content_renderer_render__thread__impl.cc (revision 489612) @@ -1,60 +1,56 @@ ---- content/renderer/render_thread_impl.cc.orig 2018-08-01 00:08:45.000000000 +0200 -+++ content/renderer/render_thread_impl.cc 2018-08-04 19:38:18.130085000 +0200 -@@ -199,12 +199,21 @@ - #include "content/common/external_ipc_dumper.h" +--- 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 @@ + #include "mojo/public/cpp/bindings/message_dumper.h" #endif +#if !defined(OS_BSD) #if defined(OS_MACOSX) #include #else #include #endif +#endif +#if defined(OS_BSD) +#include +#include +#include +#include +#endif + using base::ThreadRestrictions; using blink::WebDocument; using blink::WebFrame; -@@ -1002,7 +1011,7 @@ +@@ -932,7 +941,7 @@ 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( -@@ -1043,7 +1052,7 @@ +@@ -973,7 +982,7 @@ 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 -@@ -1248,7 +1257,7 @@ - false)); - GetContentClient()->renderer()->PostCompositorThreadCreated( - compositor_task_runner_.get()); --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) - render_message_filter()->SetThreadPriority(compositor_thread_->ThreadId(), - base::ThreadPriority::DISPLAY); - #endif -@@ -1485,7 +1494,7 @@ +@@ -1331,11 +1340,11 @@ 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: head/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.cc =================================================================== --- head/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.cc (revision 489611) +++ head/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.cc (revision 489612) @@ -1,56 +1,56 @@ ---- content/renderer/renderer_blink_platform_impl.cc.orig 2018-06-13 00:10:17.000000000 +0200 -+++ content/renderer/renderer_blink_platform_impl.cc 2018-07-19 13:00:02.053483000 +0200 -@@ -136,7 +136,7 @@ +--- content/renderer/renderer_blink_platform_impl.cc.orig 2018-12-03 21:16:57.000000000 +0100 ++++ content/renderer/renderer_blink_platform_impl.cc 2018-12-13 21:57:40.197655000 +0100 +@@ -119,7 +119,7 @@ #if defined(OS_POSIX) #include "base/file_descriptor_posix.h" -#if !defined(OS_MACOSX) && !defined(OS_ANDROID) +#if !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD) #include #include -@@ -249,7 +249,7 @@ - scoped_refptr file_utilities_host_; - }; +@@ -197,7 +197,7 @@ + //------------------------------------------------------------------------------ + -#if !defined(OS_ANDROID) && !defined(OS_WIN) && !defined(OS_FUCHSIA) +#if !defined(OS_ANDROID) && !defined(OS_WIN) && !defined(OS_FUCHSIA) && !defined(OS_BSD) class RendererBlinkPlatformImpl::SandboxSupport : public blink::WebSandboxSupport { public: -@@ -293,7 +293,7 @@ - default_task_runner_(main_thread_scheduler->DefaultTaskRunner()), - web_scrollbar_behavior_(new WebScrollbarBehaviorImpl), - main_thread_scheduler_(main_thread_scheduler) { +@@ -268,7 +268,7 @@ + connector_ = service_manager::Connector::Create(&request); + } + -#if !defined(OS_ANDROID) && !defined(OS_WIN) && !defined(OS_FUCHSIA) +#if !defined(OS_ANDROID) && !defined(OS_WIN) && !defined(OS_FUCHSIA) && !defined(OS_BSD) if (g_sandbox_enabled && sandboxEnabled()) { - sandbox_support_.reset(new RendererBlinkPlatformImpl::SandboxSupport); - } else { -@@ -341,7 +341,7 @@ + #if defined(OS_MACOSX) + sandbox_support_.reset(new RendererBlinkPlatformImpl::SandboxSupport()); +@@ -297,7 +297,7 @@ } void RendererBlinkPlatformImpl::Shutdown() { -#if !defined(OS_ANDROID) && !defined(OS_WIN) && !defined(OS_FUCHSIA) +#if !defined(OS_ANDROID) && !defined(OS_WIN) && !defined(OS_FUCHSIA) && !defined(OS_BSD) - // SandboxSupport contains a map of WebFallbackFont objects, which hold + // 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() -@@ -449,7 +449,7 @@ +@@ -391,7 +391,7 @@ } blink::WebSandboxSupport* RendererBlinkPlatformImpl::GetSandboxSupport() { -#if defined(OS_ANDROID) || defined(OS_WIN) || defined(OS_FUCHSIA) +#if defined(OS_ANDROID) || defined(OS_WIN) || defined(OS_FUCHSIA) || defined(OS_BSD) // These platforms do not require sandbox support. return NULL; #else -@@ -657,7 +657,7 @@ +@@ -591,7 +591,7 @@ return content::LoadFont(src_font, out, font_id); } --#elif defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_FUCHSIA) -+#elif defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_FUCHSIA) && !defined(OS_BSD) +-#elif defined(OS_POSIX) && !defined(OS_ANDROID) ++#elif defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_BSD) void RendererBlinkPlatformImpl::SandboxSupport::GetFallbackFontForCharacter( blink::WebUChar32 character, Index: head/www/chromium/files/patch-extensions_common_image__util.cc =================================================================== --- head/www/chromium/files/patch-extensions_common_image__util.cc (revision 489611) +++ head/www/chromium/files/patch-extensions_common_image__util.cc (revision 489612) @@ -1,14 +1,14 @@ ---- extensions/common/image_util.cc.orig 2017-04-19 19:06:34 UTC -+++ extensions/common/image_util.cc -@@ -11,7 +11,11 @@ +--- extensions/common/image_util.cc.orig 2018-12-03 21:16:58.000000000 +0100 ++++ extensions/common/image_util.cc 2018-12-13 23:08:46.488425000 +0100 +@@ -13,7 +13,11 @@ #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h" #include "base/strings/stringprintf.h" +#if defined(OS_BSD) +#include +#else #include "third_party/re2/src/re2/re2.h" +#endif + #include "third_party/skia/include/core/SkBitmap.h" #include "third_party/skia/include/core/SkColor.h" #include "third_party/skia/include/utils/SkParse.h" - #include "ui/gfx/color_utils.h" Index: head/www/chromium/files/patch-extensions_renderer_bindings_api__binding__util.cc =================================================================== --- head/www/chromium/files/patch-extensions_renderer_bindings_api__binding__util.cc (nonexistent) +++ head/www/chromium/files/patch-extensions_renderer_bindings_api__binding__util.cc (revision 489612) @@ -0,0 +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 @@ + return "mac"; + #elif defined(OS_WIN) + return "win"; ++#elif defined(OS_BSD) ++ return "bsd"; + #else + NOTREACHED(); + return std::string(); Property changes on: head/www/chromium/files/patch-extensions_renderer_bindings_api__binding__util.cc ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/chromium/files/patch-gpu_command__buffer_service_program__manager.cc =================================================================== --- head/www/chromium/files/patch-gpu_command__buffer_service_program__manager.cc (revision 489611) +++ head/www/chromium/files/patch-gpu_command__buffer_service_program__manager.cc (revision 489612) @@ -1,14 +1,14 @@ ---- gpu/command_buffer/service/program_manager.cc.orig 2017-04-19 19:06:34 UTC -+++ gpu/command_buffer/service/program_manager.cc -@@ -31,7 +31,11 @@ +--- 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 +@@ -30,7 +30,11 @@ #include "gpu/command_buffer/service/program_cache.h" - #include "gpu/command_buffer/service/progress_reporter.h" #include "gpu/command_buffer/service/shader_manager.h" + #include "gpu/config/gpu_preferences.h" +#if defined(OS_BSD) +#include +#else #include "third_party/re2/src/re2/re2.h" +#endif #include "ui/gl/gl_version_info.h" + #include "ui/gl/progress_reporter.h" - using base::TimeDelta; Index: head/www/chromium/files/patch-headless_lib_browser_headless__content__browser__client.h =================================================================== --- head/www/chromium/files/patch-headless_lib_browser_headless__content__browser__client.h (revision 489611) +++ head/www/chromium/files/patch-headless_lib_browser_headless__content__browser__client.h (revision 489612) @@ -1,11 +1,11 @@ ---- headless/lib/browser/headless_content_browser_client.h.orig 2017-09-05 21:05:20.000000000 +0200 -+++ headless/lib/browser/headless_content_browser_client.h 2017-09-06 20:33:27.212197000 +0200 -@@ -30,7 +30,7 @@ +--- headless/lib/browser/headless_content_browser_client.h.orig 2018-12-03 21:16:59.000000000 +0100 ++++ headless/lib/browser/headless_content_browser_client.h 2018-12-13 23:21:30.880956000 +0100 +@@ -32,7 +32,7 @@ content::BrowserContext* context, content::StoragePartition* partition, - storage::OptionalQuotaSettingsCallback callback) override; + ::storage::OptionalQuotaSettingsCallback callback) override; -#if defined(OS_POSIX) && !defined(OS_MACOSX) +#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD) void GetAdditionalMappedFilesForChildProcess( const base::CommandLine& command_line, int child_process_id, Index: head/www/chromium/files/patch-headless_lib_headless__macros.h =================================================================== --- head/www/chromium/files/patch-headless_lib_headless__macros.h (revision 489611) +++ head/www/chromium/files/patch-headless_lib_headless__macros.h (revision 489612) @@ -1,13 +1,13 @@ ---- headless/lib/headless_macros.h.orig 2017-12-15 02:04:19.000000000 +0100 -+++ headless/lib/headless_macros.h 2017-12-24 16:44:30.147915000 +0100 +--- 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 @@ -7,8 +7,8 @@ #include "build/build_config.h" --#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_FUCHSIA) -+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_FUCHSIA) && !defined(OS_BSD) +-#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) && !defined(OS_FUCHSIA) -+#endif // defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_FUCHSIA) && !defined(OS_BSD) +-#endif // defined(OS_POSIX) && !defined(OS_MACOSX) ++#endif // defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD) #endif // HEADLESS_LIB_HEADLESS_MACROS_H_ Index: head/www/chromium/files/patch-media_base_scopedfd__helper.h =================================================================== --- head/www/chromium/files/patch-media_base_scopedfd__helper.h (nonexistent) +++ head/www/chromium/files/patch-media_base_scopedfd__helper.h (revision 489612) @@ -0,0 +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 @@ + // 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 DuplicateFDs( + const std::vector& fds); + +-#endif // OS_LINUX ++#endif // OS_LINUX || OS_BSD + + } // namespace media + Property changes on: head/www/chromium/files/patch-media_base_scopedfd__helper.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/chromium/files/patch-media_base_video__frame.cc =================================================================== --- head/www/chromium/files/patch-media_base_video__frame.cc (revision 489611) +++ head/www/chromium/files/patch-media_base_video__frame.cc (revision 489612) @@ -1,47 +1,47 @@ ---- media/base/video_frame.cc.orig 2017-06-05 19:03:08 UTC -+++ media/base/video_frame.cc -@@ -53,7 +53,7 @@ static std::string StorageTypeToString( +--- 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 @@ 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 -@@ -69,7 +69,7 @@ static std::string StorageTypeToString( +@@ -82,7 +82,7 @@ // static static bool 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 && -@@ -324,7 +324,7 @@ scoped_refptr VideoFrame::WrapExternalYuva +@@ -379,7 +379,7 @@ return frame; } -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) // static scoped_refptr VideoFrame::WrapExternalDmabufs( - VideoPixelFormat format, -@@ -436,7 +436,7 @@ scoped_refptr VideoFrame::WrapVideoFrame( + const VideoFrameLayout& layout, +@@ -502,7 +502,7 @@ wrapping_frame->data_[i] = frame->data(i); } -#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) { - std::vector original_fds; -@@ -722,7 +722,7 @@ size_t VideoFrame::shared_memory_offset() const { + wrapping_frame->dmabuf_fds_ = DuplicateFDs(frame->dmabuf_fds_); +@@ -839,7 +839,7 @@ return shared_memory_offset_; } -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) - int VideoFrame::DmabufFd(size_t plane) const { + const std::vector& VideoFrame::DmabufFds() const { DCHECK_EQ(storage_type_, STORAGE_DMABUFS); - DCHECK(IsValidPlane(plane, format_)); + Index: head/www/chromium/files/patch-media_base_video__frame.h =================================================================== --- head/www/chromium/files/patch-media_base_video__frame.h (revision 489611) +++ head/www/chromium/files/patch-media_base_video__frame.h (revision 489612) @@ -1,38 +1,38 @@ ---- media/base/video_frame.h.orig 2017-06-05 19:03:08 UTC -+++ media/base/video_frame.h -@@ -62,7 +62,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte +--- 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 @@ 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 -@@ -188,7 +188,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte +@@ -238,7 +238,7 @@ 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/Documentation/dma-buf-sharing.txt) with a - // VideoFrame. The dmabuf fds are dup()ed on creation, so that the VideoFrame -@@ -338,7 +338,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte + // (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 @@ // 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 backing DmaBuf file descriptor for given |plane|, if present, or - // -1 if not. - int DmabufFd(size_t plane) const; -@@ -531,7 +531,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte - base::SharedMemoryHandle shared_memory_handle_; + // 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 @@ + // memory. size_t shared_memory_offset_; -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) - // Dmabufs for each plane. If set, this frame has DmaBuf backing in some way. - base::ScopedFD dmabuf_fds_[kMaxPlanes]; - #endif + // Dmabufs for the frame, used when storage is STORAGE_DMABUFS. Size is either + // equal or less than the number of planes of the frame. If it is less, then + // the memory area represented by the last FD contains the remaining planes. Index: head/www/chromium/files/patch-media_capture_video_create__video__capture__device__factory.cc =================================================================== --- head/www/chromium/files/patch-media_capture_video_create__video__capture__device__factory.cc (nonexistent) +++ head/www/chromium/files/patch-media_capture_video_create__video__capture__device__factory.cc (revision 489612) @@ -0,0 +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 +@@ -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 @@ + std::unique_ptr + CreatePlatformSpecificVideoCaptureDeviceFactory( + scoped_refptr ui_task_runner) { +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + return std::make_unique(ui_task_runner); + #elif defined(OS_CHROMEOS) + // On Chrome OS we have to support two use cases: Property changes on: head/www/chromium/files/patch-media_capture_video_create__video__capture__device__factory.cc ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/chromium/files/patch-media_capture_video_linux_video__capture__device__factory__linux.cc =================================================================== --- head/www/chromium/files/patch-media_capture_video_linux_video__capture__device__factory__linux.cc (nonexistent) +++ head/www/chromium/files/patch-media_capture_video_linux_video__capture__device__factory__linux.cc (revision 489612) @@ -0,0 +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 @@ + if (!(capabilities & V4L2_CAP_VIDEO_CAPTURE)) + return false; + ++#if !defined(OS_FREEBSD) + const std::vector& usable_fourccs = + VideoCaptureDeviceLinux::GetListOfUsableFourCCs(false); + v4l2_fmtdesc fmtdesc = {}; +@@ -267,6 +268,7 @@ + if (base::ContainsValue(usable_fourccs, fmtdesc.pixelformat)) + return true; + } ++#endif + + DVLOG(1) << "No usable formats found"; + return false; +@@ -312,9 +314,13 @@ + 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; Property changes on: head/www/chromium/files/patch-media_capture_video_linux_video__capture__device__factory__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: head/www/chromium/files/patch-media_capture_video_linux_video__capture__device__linux.cc =================================================================== --- head/www/chromium/files/patch-media_capture_video_linux_video__capture__device__linux.cc (revision 489611) +++ head/www/chromium/files/patch-media_capture_video_linux_video__capture__device__linux.cc (revision 489612) @@ -1,62 +1,60 @@ ---- media/capture/video/linux/video_capture_device_linux.cc.orig 2017-06-05 19:03:08 UTC -+++ media/capture/video/linux/video_capture_device_linux.cc -@@ -21,6 +21,7 @@ +--- 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 @@ - namespace media { + } // namespace +#if !defined(OS_FREEBSD) // Translates Video4Linux pixel formats to Chromium pixel formats. // static VideoPixelFormat VideoCaptureDeviceLinux::V4l2FourCcToChromiumPixelFormat( -@@ -34,6 +35,7 @@ std::list VideoCaptureDeviceLinux::GetListOf +@@ -50,6 +51,7 @@ bool favour_mjpeg) { return V4L2CaptureDelegate::GetListOfUsableFourCcs(favour_mjpeg); } +#endif // !defined(OS_FREEBSD) VideoCaptureDeviceLinux::VideoCaptureDeviceLinux( - const VideoCaptureDeviceDescriptor& device_descriptor) -@@ -47,6 +49,7 @@ VideoCaptureDeviceLinux::~VideoCaptureDeviceLinux() { - v4l2_thread_.Stop(); - } - -+#if !defined(OS_FREEBSD) + scoped_refptr v4l2, +@@ -68,6 +70,7 @@ void VideoCaptureDeviceLinux::AllocateAndStart( const VideoCaptureParams& params, std::unique_ptr client) { -@@ -74,7 +77,13 @@ void VideoCaptureDeviceLinux::AllocateAndStart( - v4l2_thread_.task_runner()->PostTask(FROM_HERE, request); ++#if !defined(OS_FREEBSD) + DCHECK(!capture_impl_); + if (v4l2_thread_.IsRunning()) + return; // Wrong state. +@@ -95,9 +98,11 @@ + for (auto& request : photo_requests_queue_) + v4l2_thread_.task_runner()->PostTask(FROM_HERE, std::move(request)); photo_requests_queue_.clear(); - } -+#else // !defined(OS_FREEBSD) -+void VideoCaptureDeviceLinux::AllocateAndStart( -+ const VideoCaptureParams& params, -+ std::unique_ptr client) {} +#endif // !defined(OS_FREEBSD) + } -+#if !defined(OS_FREEBSD) void VideoCaptureDeviceLinux::StopAndDeAllocate() { ++#if !defined(OS_FREEBSD) if (!v4l2_thread_.IsRunning()) return; // Wrong state. -@@ -123,7 +132,11 @@ void VideoCaptureDeviceLinux::SetPhotoOptions( - } - v4l2_thread_.task_runner()->PostTask(FROM_HERE, std::move(functor)); - } -+#else // !defined(OS_FREEBSD) -+void VideoCaptureDeviceLinux::StopAndDeAllocate() {} + v4l2_thread_.task_runner()->PostTask( +@@ -107,6 +112,7 @@ + v4l2_thread_.Stop(); + + capture_impl_ = nullptr; +#endif // !defined(OS_FREEBSD) + } -+#if !defined(OS_FREEBSD) + void VideoCaptureDeviceLinux::TakePhoto(TakePhotoCallback callback) { +@@ -149,11 +155,13 @@ + } + void VideoCaptureDeviceLinux::SetRotation(int rotation) { ++#if !defined(OS_FREEBSD) if (v4l2_thread_.IsRunning()) { v4l2_thread_.task_runner()->PostTask( -@@ -131,6 +144,9 @@ void VideoCaptureDeviceLinux::SetRotation(int rotation - base::Bind(&V4L2CaptureDelegate::SetRotation, capture_impl_, rotation)); + FROM_HERE, base::BindOnce(&V4L2CaptureDelegate::SetRotation, + capture_impl_->GetWeakPtr(), rotation)); } - } -+#else // !defined(OS_FREEBSD) -+void VideoCaptureDeviceLinux::SetRotation(int rotation) {} +#endif // !defined(OS_FREEBSD) + } - // static - int VideoCaptureDeviceLinux::TranslatePowerLineFrequencyToV4L2( + } // namespace media Index: head/www/chromium/files/patch-net_base_address__tracker__linux.cc =================================================================== --- head/www/chromium/files/patch-net_base_address__tracker__linux.cc (revision 489611) +++ head/www/chromium/files/patch-net_base_address__tracker__linux.cc (revision 489612) @@ -1,363 +1,360 @@ ---- net/base/address_tracker_linux.cc.orig 2018-08-01 00:08:53.000000000 +0200 -+++ net/base/address_tracker_linux.cc 2018-08-04 20:12:48.684622000 +0200 -@@ -20,96 +20,10 @@ +--- 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 @@ 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(NLMSG_DATA(header)); - size_t address_length = 0; - switch (msg->ifa_family) { - case AF_INET: - address_length = IPAddress::kIPv4AddressSize; - break; - case AF_INET6: - address_length = IPAddress::kIPv6AddressSize; - break; - default: - // Unknown family. - return false; - } - // Use IFA_ADDRESS unless IFA_LOCAL is present. This behavior here is based on - // getaddrinfo in glibc (check_pf.c). Judging from kernel implementation of - // NETLINK, IPv4 addresses have only the IFA_ADDRESS attribute, while IPv6 - // have the IFA_LOCAL attribute. - uint8_t* address = NULL; - uint8_t* local = NULL; - size_t length = IFA_PAYLOAD(header); - for (const struct rtattr* attr = - reinterpret_cast(IFA_RTA(msg)); - RTA_OK(attr, length); - attr = RTA_NEXT(attr, length)) { - switch (attr->rta_type) { - case IFA_ADDRESS: - DCHECK_GE(RTA_PAYLOAD(attr), address_length); - address = reinterpret_cast(RTA_DATA(attr)); - break; - case IFA_LOCAL: - DCHECK_GE(RTA_PAYLOAD(attr), address_length); - local = reinterpret_cast(RTA_DATA(attr)); - break; - case IFA_CACHEINFO: { - const struct ifa_cacheinfo *cache_info = - reinterpret_cast(RTA_DATA(attr)); - if (really_deprecated) - *really_deprecated = (cache_info->ifa_prefered == 0); - } break; - default: - break; - } - } - if (local) - address = local; - if (!address) - return false; - *out = IPAddress(address, address_length); - return true; -} - -} // namespace - // static char* AddressTrackerLinux::GetInterfaceName(int interface_index, char* buf) { - memset(buf, 0, IFNAMSIZ); - base::ScopedFD ioctl_socket = GetSocketForIoctl(); - if (!ioctl_socket.is_valid()) - return buf; - - struct ifreq ifr = {}; - ifr.ifr_ifindex = interface_index; - - if (ioctl(ioctl_socket.get(), SIOCGIFNAME, &ifr) == 0) - strncpy(buf, ifr.ifr_name, IFNAMSIZ - 1); - return buf; + NOTIMPLEMENTED(); + return NULL; } AddressTrackerLinux::AddressTrackerLinux() -@@ -152,93 +66,8 @@ +@@ -154,93 +68,8 @@ } 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(&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(&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(&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() { -@@ -249,25 +78,6 @@ +@@ -251,25 +80,6 @@ connection_type_initialized_cv_.Broadcast(); } -AddressTrackerLinux::AddressMap AddressTrackerLinux::GetAddressMap() const { - AddressTrackerAutoLock lock(*this, address_map_lock_); - return address_map_; -} - -std::unordered_set AddressTrackerLinux::GetOnlineLinks() const { - AddressTrackerAutoLock lock(*this, online_links_lock_); - return online_links_; -} - -bool AddressTrackerLinux::IsInterfaceIgnored(int interface_index) const { - if (ignored_interfaces_.empty()) - return false; - - char buf[IFNAMSIZ] = {0}; - const char* interface_name = get_interface_name_(interface_index, buf); - return ignored_interfaces_.find(interface_name) != ignored_interfaces_.end(); -} - NetworkChangeNotifier::ConnectionType AddressTrackerLinux::GetCurrentConnectionType() { // http://crbug.com/125097 -@@ -318,102 +128,7 @@ +@@ -328,102 +138,7 @@ bool* address_changed, bool* link_changed, bool* tunnel_changed) { - DCHECK(buffer); - for (struct nlmsghdr* header = reinterpret_cast(buffer); - NLMSG_OK(header, length); - header = NLMSG_NEXT(header, length)) { - switch (header->nlmsg_type) { - case NLMSG_DONE: - return; - case NLMSG_ERROR: { - const struct nlmsgerr* msg = - reinterpret_cast(NLMSG_DATA(header)); - LOG(ERROR) << "Unexpected netlink error " << msg->error << "."; - } return; - case RTM_NEWADDR: { - IPAddress address; - bool really_deprecated; - struct ifaddrmsg* msg = - reinterpret_cast(NLMSG_DATA(header)); - if (IsInterfaceIgnored(msg->ifa_index)) - break; - if (GetAddress(header, &address, &really_deprecated)) { - AddressTrackerAutoLock lock(*this, address_map_lock_); - // Routers may frequently (every few seconds) output the IPv6 ULA - // prefix which can cause the linux kernel to frequently output two - // back-to-back messages, one without the deprecated flag and one with - // the deprecated flag but both with preferred lifetimes of 0. Avoid - // interpretting this as an actual change by canonicalizing the two - // messages by setting the deprecated flag based on the preferred - // lifetime also. http://crbug.com/268042 - if (really_deprecated) - msg->ifa_flags |= IFA_F_DEPRECATED; - // Only indicate change if the address is new or ifaddrmsg info has - // changed. -- AddressMap::iterator it = address_map_.find(address); +- auto it = address_map_.find(address); - if (it == address_map_.end()) { - address_map_.insert(it, std::make_pair(address, *msg)); - *address_changed = true; - } else if (memcmp(&it->second, msg, sizeof(*msg))) { - it->second = *msg; - *address_changed = true; - } - } - } break; - case RTM_DELADDR: { - IPAddress address; - const struct ifaddrmsg* msg = - reinterpret_cast(NLMSG_DATA(header)); - if (IsInterfaceIgnored(msg->ifa_index)) - break; - if (GetAddress(header, &address, NULL)) { - AddressTrackerAutoLock lock(*this, address_map_lock_); - if (address_map_.erase(address)) - *address_changed = true; - } - } break; - case RTM_NEWLINK: { - const struct ifinfomsg* msg = - reinterpret_cast(NLMSG_DATA(header)); - if (IsInterfaceIgnored(msg->ifi_index)) - break; - if (IgnoreWirelessChange(header, msg)) { - VLOG(2) << "Ignoring RTM_NEWLINK message"; - break; - } - if (!(msg->ifi_flags & IFF_LOOPBACK) && (msg->ifi_flags & IFF_UP) && - (msg->ifi_flags & IFF_LOWER_UP) && (msg->ifi_flags & IFF_RUNNING)) { - AddressTrackerAutoLock lock(*this, online_links_lock_); - if (online_links_.insert(msg->ifi_index).second) { - *link_changed = true; - if (IsTunnelInterface(msg->ifi_index)) - *tunnel_changed = true; - } - } else { - AddressTrackerAutoLock lock(*this, online_links_lock_); - if (online_links_.erase(msg->ifi_index)) { - *link_changed = true; - if (IsTunnelInterface(msg->ifi_index)) - *tunnel_changed = true; - } - } - } break; - case RTM_DELLINK: { - const struct ifinfomsg* msg = - reinterpret_cast(NLMSG_DATA(header)); - if (IsInterfaceIgnored(msg->ifi_index)) - break; - AddressTrackerAutoLock lock(*this, online_links_lock_); - if (online_links_.erase(msg->ifi_index)) { - *link_changed = true; - if (IsTunnelInterface(msg->ifi_index)) - *tunnel_changed = true; - } - } break; - default: - break; - } - } + NOTIMPLEMENTED(); } void AddressTrackerLinux::OnFileCanReadWithoutBlocking(int fd) { -@@ -450,34 +165,7 @@ +@@ -460,31 +175,7 @@ } void AddressTrackerLinux::UpdateCurrentConnectionType() { - AddressTrackerLinux::AddressMap address_map = GetAddressMap(); - std::unordered_set online_links = GetOnlineLinks(); - - // Strip out tunnel interfaces from online_links -- for (std::unordered_set::const_iterator it = online_links.begin(); -- it != online_links.end();) { +- for (auto it = online_links.cbegin(); it != online_links.cend();) { - if (IsTunnelInterface(*it)) { -- std::unordered_set::const_iterator tunnel_it = it; -- ++it; -- online_links.erase(*tunnel_it); +- it = online_links.erase(it); - } else { - ++it; - } - } - - NetworkInterfaceList networks; - NetworkChangeNotifier::ConnectionType type = - NetworkChangeNotifier::CONNECTION_NONE; - if (GetNetworkListImpl(&networks, 0, online_links, address_map, - get_interface_name_)) { - type = NetworkChangeNotifier::ConnectionTypeFromInterfaceList(networks); - } else { - type = online_links.empty() ? NetworkChangeNotifier::CONNECTION_NONE - : NetworkChangeNotifier::CONNECTION_UNKNOWN; - } - - AddressTrackerAutoLock lock(*this, connection_type_lock_); - current_connection_type_ = type; + NOTIMPLEMENTED(); } int AddressTrackerLinux::GetThreadsWaitingForConnectionTypeInitForTesting() Index: head/www/chromium/files/patch-net_features.gni =================================================================== --- head/www/chromium/files/patch-net_features.gni (revision 489611) +++ head/www/chromium/files/patch-net_features.gni (revision 489612) @@ -1,11 +1,11 @@ ---- net/features.gni.orig 2017-09-08 22:18:41.065160000 +0200 -+++ net/features.gni 2017-09-08 22:18:51.191168000 +0200 +--- net/features.gni.orig 2018-12-03 21:17:07.000000000 +0100 ++++ net/features.gni 2018-12-14 00:32:48.565388000 +0100 @@ -27,7 +27,7 @@ disable_brotli_filter = false # Multicast DNS. -- enable_mdns = is_win || is_linux -+ enable_mdns = is_win || is_linux || is_bsd +- enable_mdns = is_win || is_linux || is_fuchsia ++ enable_mdns = is_win || is_linux || is_fuchsia || is_bsd # Reporting not used on iOS. enable_reporting = !is_ios Index: head/www/chromium/files/patch-net_socket_udp__socket__posix.cc =================================================================== --- head/www/chromium/files/patch-net_socket_udp__socket__posix.cc (revision 489611) +++ head/www/chromium/files/patch-net_socket_udp__socket__posix.cc (revision 489612) @@ -1,74 +1,96 @@ ---- net/socket/udp_socket_posix.cc.orig 2018-06-13 00:10:23.000000000 +0200 -+++ net/socket/udp_socket_posix.cc 2018-07-20 14:49:13.507247000 +0200 -@@ -72,7 +72,7 @@ +--- net/socket/udp_socket_posix.cc.orig 2018-12-03 21:17:07.000000000 +0100 ++++ net/socket/udp_socket_posix.cc 2018-12-14 00:43:45.072257000 +0100 +@@ -68,7 +68,7 @@ const base::TimeDelta kActivityMonitorMsThreshold = base::TimeDelta::FromMilliseconds(100); --#if defined(OS_MACOSX) || defined(OS_FUCHSIA) -+#if defined(OS_MACOSX) || defined(OS_FUCHSIA) || defined(OS_BSD) +-#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 @@ + return OK; + } - // When enabling multicast using setsockopt(IP_MULTICAST_IF) MacOS and Fuchsia - // require passing IPv4 address instead of interface index. This function -@@ -656,7 +656,7 @@ +-#endif // OS_MACOSX ++#endif // OS_MACOSX || OS_BSD + + #if defined(OS_MACOSX) && !defined(OS_IOS) + +@@ -632,13 +632,13 @@ } 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 { -@@ -677,13 +677,16 @@ + sendto_flags_ &= ~MSG_CONFIRM; + } +-#endif // !defined(OS_MACOSX) && !defined(OS_IOS) ++#endif // !defined(OS_MACOSX) && !defined(OS_IOS) && !defined(OS_BSD) + } + + int UDPSocketPosix::AllowAddressReuse() { +@@ -653,17 +653,20 @@ 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); -@@ -925,19 +928,24 @@ +-#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); +@@ -901,19 +904,24 @@ if (multicast_interface_ != 0) { switch (addr_family_) { case AF_INET: { --#if defined(OS_MACOSX) || defined(OS_FUCHSIA) -+#if defined(OS_MACOSX) || defined(OS_FUCHSIA) || defined(OS_BSD) - ip_mreq mreq; +-#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) || defined(OS_FUCHSIA) -+#else // defined(OS_MACOSX) || defined(OS_FUCHSIA) || defined(OS_BSD) - ip_mreqn mreq; +-#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) && !defined(OS_FUCHSIA) +-#endif // !defined(OS_MACOSX) ++#endif // !defined(OS_MACOSX) || defined(OS_BSD) int rv = setsockopt(socket_, IPPROTO_IP, IP_MULTICAST_IF, -+#if defined(OS_BSD) ++#ifdef defined(OS_BSD) + reinterpret_cast(&mreq.imr_interface.s_addr), + sizeof(mreq.imr_interface.s_addr)); +#else reinterpret_cast(&mreq), sizeof(mreq)); +#endif if (rv) return MapSystemError(errno); break; -@@ -999,7 +1007,7 @@ +@@ -975,7 +983,7 @@ if (addr_family_ != AF_INET) return ERR_ADDRESS_INVALID; --#if defined(OS_MACOSX) || defined(OS_FUCHSIA) -+#if defined(OS_MACOSX) || defined(OS_FUCHSIA) || defined(OS_BSD) - ip_mreq mreq; +-#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); Index: head/www/chromium/files/patch-services_audio_BUILD.gn =================================================================== --- head/www/chromium/files/patch-services_audio_BUILD.gn (nonexistent) +++ head/www/chromium/files/patch-services_audio_BUILD.gn (revision 489612) @@ -0,0 +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/service_manager/sandbox:sandbox", + ] + +- if (is_linux) { ++ if ((is_linux) && (!is_bsd)) { + sources += [ + "audio_sandbox_hook_linux.cc", + "audio_sandbox_hook_linux.h", Property changes on: head/www/chromium/files/patch-services_audio_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: head/www/chromium/files/patch-services_device_geolocation_location__arbitrator.cc =================================================================== --- head/www/chromium/files/patch-services_device_geolocation_location__arbitrator.cc (nonexistent) +++ head/www/chromium/files/patch-services_device_geolocation_location__arbitrator.cc (revision 489612) @@ -0,0 +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 @@ + std::unique_ptr + 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(); Property changes on: head/www/chromium/files/patch-services_device_geolocation_location__arbitrator.cc ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/chromium/files/patch-services_device_hid_hid__connection__freebsd.cc =================================================================== --- head/www/chromium/files/patch-services_device_hid_hid__connection__freebsd.cc (revision 489611) +++ head/www/chromium/files/patch-services_device_hid_hid__connection__freebsd.cc (revision 489612) @@ -1,280 +1,194 @@ ---- services/device/hid/hid_connection_freebsd.cc.orig 2018-07-20 13:47:11.556393000 +0200 -+++ services/device/hid/hid_connection_freebsd.cc 2018-07-20 15:22:57.210103000 +0200 -@@ -0,0 +1,277 @@ +--- services/device/hid/hid_connection_freebsd.cc.orig 2018-12-27 21:14:54.188404000 +0100 ++++ services/device/hid/hid_connection_freebsd.cc 2018-12-29 17:34:19.982594000 +0100 +@@ -0,0 +1,191 @@ +// Copyright (c) 2014 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#include "services/device/hid/hid_connection_freebsd.h" + +#include +#include + +#include "base/bind.h" +#include "base/files/file_descriptor_watcher_posix.h" +#include "base/location.h" +#include "base/numerics/safe_math.h" +#include "base/posix/eintr_wrapper.h" +#include "base/single_thread_task_runner.h" +#include "base/strings/stringprintf.h" -+#include "base/task_scheduler/post_task.h" ++#include "base/task/post_task.h" +#include "base/threading/thread_restrictions.h" +#include "base/threading/thread_task_runner_handle.h" +#include "components/device_event_log/device_event_log.h" +#include "services/device/hid/hid_service.h" + +namespace device { + +class HidConnectionFreeBSD::BlockingTaskHelper { + public: + BlockingTaskHelper(base::ScopedFD fd, + scoped_refptr device_info, + base::WeakPtr connection) + : fd_(std::move(fd)), + connection_(connection), + origin_task_runner_(base::ThreadTaskRunnerHandle::Get()) { + DETACH_FROM_SEQUENCE(sequence_checker_); + // Report buffers must always have room for the report ID. + report_buffer_size_ = device_info->max_input_report_size() + 1; + has_report_id_ = device_info->has_report_id(); + } + + ~BlockingTaskHelper() { DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); } + + // Starts the FileDescriptorWatcher that reads input events from the device. + // Must be called on a thread that has a base::MessageLoopForIO. + void Start() { + DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); + base::AssertBlockingAllowed(); -+ -+ file_watcher_ = base::FileDescriptorWatcher::WatchReadable( -+ fd_.get(), base::Bind(&BlockingTaskHelper::OnFileCanReadWithoutBlocking, -+ base::Unretained(this))); + } + + void Write(scoped_refptr buffer, + WriteCallback callback) { + DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); + auto data = buffer->front(); + size_t size = buffer->size(); + // if report id is 0, it shouldn't be included + if (data[0] == 0) { + data++; + size--; + } + + ssize_t result = HANDLE_EINTR(write(fd_.get(), data, size)); + if (result < 0) { + HID_PLOG(EVENT) << "Write failed"; + origin_task_runner_->PostTask(FROM_HERE, base::BindOnce(std::move(callback), false)); + } else { + if (static_cast(result) != size) + HID_LOG(EVENT) << "Incomplete HID write: " << result << " != " << size; + origin_task_runner_->PostTask(FROM_HERE, base::BindOnce(std::move(callback), true)); + } + } + + void GetFeatureReport(uint8_t report_id, + scoped_refptr buffer, + ReadCallback callback) { + DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); + struct usb_gen_descriptor ugd; + ugd.ugd_report_type = UHID_FEATURE_REPORT; + ugd.ugd_data = buffer->front(); + ugd.ugd_maxlen = buffer->size(); + int result = HANDLE_EINTR( + ioctl(fd_.get(), USB_GET_REPORT, &ugd)); + if (result < 0) { + HID_PLOG(EVENT) << "Failed to get feature report"; + origin_task_runner_->PostTask(FROM_HERE, + base::BindOnce(std::move(callback), false, nullptr, 0)); + } else if (result == 0) { + HID_LOG(EVENT) << "Get feature result too short."; + origin_task_runner_->PostTask(FROM_HERE, + base::BindOnce(std::move(callback), false, nullptr, 0)); + } else { + origin_task_runner_->PostTask(FROM_HERE, + base::BindOnce(std::move(callback), true, buffer, result)); + } + } + + void SendFeatureReport(scoped_refptr buffer, + WriteCallback callback) { + DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); + struct usb_gen_descriptor ugd; + ugd.ugd_report_type = UHID_FEATURE_REPORT; + ugd.ugd_data = buffer->front(); + ugd.ugd_maxlen = buffer->size(); + // FreeBSD does not require report id if it's not used + if (buffer->front()[0] == 0) { + ugd.ugd_data = buffer->front() + 1; + ugd.ugd_maxlen = buffer->size() - 1; + } else { + ugd.ugd_data = buffer->front(); + ugd.ugd_maxlen = buffer->size(); + } + int result = HANDLE_EINTR( + ioctl(fd_.get(), USB_SET_REPORT, &ugd)); + if (result < 0) { + HID_PLOG(EVENT) << "Failed to send feature report"; + origin_task_runner_->PostTask(FROM_HERE, + base::BindOnce(std::move(callback), false)); + } else { + origin_task_runner_->PostTask(FROM_HERE, + base::BindOnce(std::move(callback), true)); + } + } + + private: -+ void OnFileCanReadWithoutBlocking() { -+ DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); -+ -+ scoped_refptr buffer(new base::RefCountedBytes(report_buffer_size_)); -+ unsigned char* data = buffer->front(); -+ size_t length = report_buffer_size_; -+ if (!has_report_id_) { -+ // FreeBSD will not prefix the buffer with a report ID if report IDs are not -+ // used by the device. Prefix the buffer with 0. -+ *data++ = 0; -+ length--; -+ } -+ -+ ssize_t bytes_read = HANDLE_EINTR(read(fd_.get(), data, length)); -+ if (bytes_read < 0) { -+ if (errno != EAGAIN) { -+ HID_PLOG(EVENT) << "Read failed"; -+ // This assumes that the error is unrecoverable and disables reading -+ // from the device until it has been re-opened. -+ // TODO(reillyg): Investigate starting and stopping the file descriptor -+ // watcher in response to pending read requests so that per-request -+ // errors can be returned to the client. -+ file_watcher_.reset(); -+ } -+ return; -+ } -+ if (!has_report_id_) { -+ // Behave as if the byte prefixed above as the the report ID was read. -+ bytes_read++; -+ } -+ -+ origin_task_runner_->PostTask( -+ FROM_HERE, base::BindOnce(&HidConnectionFreeBSD::ProcessInputReport, -+ connection_, buffer, bytes_read)); -+ } -+ + SEQUENCE_CHECKER(sequence_checker_); + base::ScopedFD fd_; + size_t report_buffer_size_; + bool has_report_id_; + base::WeakPtr connection_; + const scoped_refptr origin_task_runner_; -+ std::unique_ptr file_watcher_; + + DISALLOW_COPY_AND_ASSIGN(BlockingTaskHelper); +}; + +HidConnectionFreeBSD::HidConnectionFreeBSD( + scoped_refptr device_info, + base::ScopedFD fd, + scoped_refptr blocking_task_runner) + : HidConnection(device_info), + blocking_task_runner_(std::move(blocking_task_runner)), + weak_factory_(this) { + helper_ = std::make_unique(std::move(fd), device_info, + weak_factory_.GetWeakPtr()); + blocking_task_runner_->PostTask( + FROM_HERE, base::BindOnce(&BlockingTaskHelper::Start, + base::Unretained(helper_.get()))); +} + +HidConnectionFreeBSD::~HidConnectionFreeBSD() {} + +void HidConnectionFreeBSD::PlatformClose() { + // By closing the device on the blocking task runner 1) the requirement that + // base::ScopedFD is destroyed on a thread where I/O is allowed is satisfied + // and 2) any tasks posted to this task runner that refer to this file will + // complete before it is closed. + blocking_task_runner_->DeleteSoon(FROM_HERE, helper_.release()); -+ -+ while (!pending_reads_.empty()) { -+ std::move(pending_reads_.front().callback).Run(false, NULL, 0); -+ pending_reads_.pop(); -+ } +} + -+void HidConnectionFreeBSD::PlatformRead(ReadCallback callback) { -+ PendingHidRead pending_read; -+ pending_read.callback = std::move(callback); -+ pending_reads_.push(std::move(pending_read)); -+ ProcessReadQueue(); -+} -+ +void HidConnectionFreeBSD::PlatformWrite(scoped_refptr buffer, + WriteCallback callback) { + + blocking_task_runner_->PostTask( + FROM_HERE, + base::BindOnce(&BlockingTaskHelper::Write, base::Unretained(helper_.get()), + buffer, std::move(callback))); +} + +void HidConnectionFreeBSD::PlatformGetFeatureReport(uint8_t report_id, + ReadCallback callback) { + // The first byte of the destination buffer is the report ID being requested + // and is overwritten by the feature report. + DCHECK_GT(device_info()->max_feature_report_size(), 0u); + scoped_refptr buffer( + new base::RefCountedBytes(device_info()->max_feature_report_size() + 1)); + if (report_id != 0) + buffer->data()[0] = report_id; + + blocking_task_runner_->PostTask( + FROM_HERE, + base::BindOnce(&BlockingTaskHelper::GetFeatureReport, + base::Unretained(helper_.get()), report_id, + buffer, std::move(callback))); +} + +void HidConnectionFreeBSD::PlatformSendFeatureReport( + scoped_refptr buffer, + WriteCallback callback) { + blocking_task_runner_->PostTask( + FROM_HERE, + base::BindOnce(&BlockingTaskHelper::SendFeatureReport, + base::Unretained(helper_.get()), buffer, std::move(callback))); -+} -+ -+void HidConnectionFreeBSD::ProcessInputReport( -+ scoped_refptr buffer, -+ size_t size) { -+ DCHECK(thread_checker().CalledOnValidThread()); -+ DCHECK_GE(size, 1u); -+ -+ uint8_t report_id = buffer->data()[0]; -+ if (IsReportIdProtected(report_id)) -+ return; -+ -+ PendingHidReport report; -+ report.buffer = buffer; -+ report.size = size; -+ pending_reports_.push(report); -+ ProcessReadQueue(); -+} -+ -+void HidConnectionFreeBSD::ProcessReadQueue() { -+ DCHECK(thread_checker().CalledOnValidThread()); -+ -+ // Hold a reference to |this| to prevent a callback from freeing this object -+ // during the loop. -+ scoped_refptr self(this); -+ while (pending_reads_.size() && pending_reports_.size()) { -+ PendingHidRead read = std::move(pending_reads_.front()); -+ PendingHidReport report = std::move(pending_reports_.front()); -+ -+ pending_reads_.pop(); -+ pending_reports_.pop(); -+ std::move(read.callback).Run(true, std::move(report.buffer), report.size); -+ } +} + +} // namespace device Index: head/www/chromium/files/patch-services_device_hid_hid__connection__freebsd.h =================================================================== --- head/www/chromium/files/patch-services_device_hid_hid__connection__freebsd.h (revision 489611) +++ head/www/chromium/files/patch-services_device_hid_hid__connection__freebsd.h (revision 489612) @@ -1,80 +1,73 @@ ---- services/device/hid/hid_connection_freebsd.h.orig 2018-03-26 19:51:55.337385000 -0700 -+++ services/device/hid/hid_connection_freebsd.h 2018-03-26 22:46:52.914490000 -0700 -@@ -0,0 +1,77 @@ +--- services/device/hid/hid_connection_freebsd.h.orig 2018-12-27 21:14:54.190483000 +0100 ++++ services/device/hid/hid_connection_freebsd.h 2018-12-28 15:27:41.475526000 +0100 +@@ -0,0 +1,70 @@ +// Copyright (c) 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_CONNECTION_FREEBSD_H_ +#define DEVICE_HID_HID_CONNECTION_FREEBSD_H_ + +#include +#include + -+#include -+ +#include "base/files/scoped_file.h" +#include "base/macros.h" +#include "base/memory/ptr_util.h" +#include "base/memory/ref_counted_memory.h" +#include "base/memory/weak_ptr.h" +#include "base/sequence_checker.h" +#include "services/device/hid/hid_connection.h" + +namespace base { +class SequencedTaskRunner; +} + +namespace net { +class IOBuffer; +} + +namespace device { + +class HidConnectionFreeBSD : public HidConnection { + public: + HidConnectionFreeBSD( + scoped_refptr device_info, + base::ScopedFD fd, + scoped_refptr blocking_task_runner); + + private: + friend class base::RefCountedThreadSafe; + class BlockingTaskHelper; + + ~HidConnectionFreeBSD() override; + + // HidConnection implementation. + void PlatformClose() override; -+ void PlatformRead(ReadCallback callback) override; + void PlatformWrite(scoped_refptr buffer, + WriteCallback callback) override; + void PlatformGetFeatureReport(uint8_t report_id, + ReadCallback callback) override; + void PlatformSendFeatureReport(scoped_refptr buffer, + WriteCallback callback) override; + void ProcessInputReport(scoped_refptr buffer, + size_t size); -+ void ProcessReadQueue(); + + // |helper_| lives on the sequence to which |blocking_task_runner_| posts + // tasks so all calls must be posted there including this object's + // destruction. + std::unique_ptr helper_; + + const scoped_refptr blocking_task_runner_; -+ -+ std::queue pending_reports_; -+ std::queue pending_reads_; + const scoped_refptr task_runner_; + + SEQUENCE_CHECKER(sequence_checker_); + + base::WeakPtrFactory weak_factory_; + + DISALLOW_COPY_AND_ASSIGN(HidConnectionFreeBSD); +}; + +} // namespace device + +#endif // DEVICE_HID_HID_CONNECTION_FREEBSD_H_ Index: head/www/chromium/files/patch-services_device_hid_hid__service__freebsd.cc =================================================================== --- head/www/chromium/files/patch-services_device_hid_hid__service__freebsd.cc (revision 489611) +++ head/www/chromium/files/patch-services_device_hid_hid__service__freebsd.cc (revision 489612) @@ -1,374 +1,374 @@ ---- services/device/hid/hid_service_freebsd.cc.orig 2018-07-20 13:47:11.569682000 +0200 -+++ services/device/hid/hid_service_freebsd.cc 2018-07-20 15:20:19.980971000 +0200 +--- services/device/hid/hid_service_freebsd.cc.orig 2018-12-27 21:14:54.193271000 +0100 ++++ services/device/hid/hid_service_freebsd.cc 2018-12-28 15:20:01.597855000 +0100 @@ -0,0 +1,371 @@ +// Copyright 2014 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#include "services/device/hid/hid_service_freebsd.h" + +#include +#include +#include +#include + +#include +#include +#include + +#include "base/bind.h" +#include "base/files/file_descriptor_watcher_posix.h" +#include "base/files/file_enumerator.h" +#include "base/location.h" +#include "base/logging.h" +#include "base/posix/eintr_wrapper.h" +#include "base/single_thread_task_runner.h" +#include "base/stl_util.h" +#include "base/strings/pattern.h" +#include "base/strings/stringprintf.h" +#include "base/strings/sys_string_conversions.h" +#include "base/strings/string_util.h" +#include "base/strings/string_split.h" -+#include "base/task_scheduler/post_task.h" ++#include "base/task/post_task.h" +#include "base/threading/thread_restrictions.h" +#include "base/threading/thread_task_runner_handle.h" +#include "components/device_event_log/device_event_log.h" +#include "services/device/hid/hid_connection_freebsd.h" + +const int kMaxPermissionChecks = 5; + +namespace device { + +struct HidServiceFreeBSD::ConnectParams { + ConnectParams(scoped_refptr device_info, + const ConnectCallback& callback) + : device_info(std::move(device_info)), + callback(callback), + task_runner(base::ThreadTaskRunnerHandle::Get()), + blocking_task_runner( + base::CreateSequencedTaskRunnerWithTraits(kBlockingTaskTraits)) {} + ~ConnectParams() {} + + scoped_refptr device_info; + ConnectCallback callback; + scoped_refptr task_runner; + scoped_refptr blocking_task_runner; + base::ScopedFD fd; +}; + +class HidServiceFreeBSD::BlockingTaskHelper { + public: + BlockingTaskHelper(base::WeakPtr service) + : service_(std::move(service)), + task_runner_(base::ThreadTaskRunnerHandle::Get()) { + DETACH_FROM_SEQUENCE(sequence_checker_); + + timer_.reset(new base::RepeatingTimer()); + devd_buffer_ = new net::IOBufferWithSize(1024); + } + + ~BlockingTaskHelper() { + } + + void Start() { + base::AssertBlockingAllowed(); + DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); + + const base::FilePath kDevRoot("/dev"); + const std::string kUHIDPattern("/dev/uhid*"); + + base::FileEnumerator enumerator(kDevRoot, false, base::FileEnumerator::FILES); + do { + const base::FilePath next_device_path(enumerator.Next()); + const std::string next_device = next_device_path.value(); + if (next_device.empty()) + break; + + if (base::MatchPattern(next_device, kUHIDPattern)) + OnDeviceAdded(next_device.substr(5)); + } while (true); + + SetupDevdMonitor(); + + task_runner_->PostTask( + FROM_HERE, + base::Bind(&HidServiceFreeBSD::FirstEnumerationComplete, service_)); + } + + bool HaveReadWritePermissions(std::string device_id) { + std::string device_node = "/dev/" + device_id; + base::AssertBlockingAllowed(); + + base::FilePath device_path(device_node); + base::File device_file; + int flags = + base::File::FLAG_OPEN | base::File::FLAG_READ | base::File::FLAG_WRITE; + device_file.Initialize(device_path, flags); + if (!device_file.IsValid()) + return false; + + return true; + } + + void OnDeviceAdded(std::string device_id) { + std::string device_node = "/dev/" + device_id; + uint16_t vendor_id = 0xffff; + uint16_t product_id = 0xffff; + std::string product_name = ""; + std::string serial_number = ""; + + std::vector report_descriptor; + + base::AssertBlockingAllowed(); + + base::FilePath device_path(device_node); + base::File device_file; + int flags = + base::File::FLAG_OPEN | base::File::FLAG_READ | base::File::FLAG_WRITE; + device_file.Initialize(device_path, flags); + if (!device_file.IsValid()) { + HID_LOG(ERROR) << "Failed to open '" << device_node + << "': " + << base::File::ErrorToString(device_file.error_details()); + return; + } + + base::ScopedFD fd; + fd.reset(device_file.TakePlatformFile()); + + struct usb_gen_descriptor ugd; + ugd.ugd_data = NULL; + ugd.ugd_maxlen = 0xffff; + int result = HANDLE_EINTR( + ioctl(fd.get(), USB_GET_REPORT_DESC, &ugd)); + + if (result < 0) { + HID_LOG(ERROR) << "Failed to get report descriptor size"; + return; + } + + report_descriptor.resize(ugd.ugd_actlen); + + ugd.ugd_data = report_descriptor.data(); + ugd.ugd_maxlen = ugd.ugd_actlen; + result = HANDLE_EINTR( + ioctl(fd.get(), USB_GET_REPORT_DESC, &ugd)); + + if (result < 0) { + HID_LOG(ERROR) << "Failed to get report descriptor"; + return; + } + + scoped_refptr device_info(new HidDeviceInfo( + device_id, vendor_id, product_id, product_name, serial_number, + device::mojom::HidBusType::kHIDBusTypeUSB, + report_descriptor, device_node)); + + task_runner_->PostTask(FROM_HERE, base::Bind(&HidServiceFreeBSD::AddDevice, + service_, device_info)); + } + + void OnDeviceRemoved(std::string device_id) { + task_runner_->PostTask( + FROM_HERE, base::Bind(&HidServiceFreeBSD::RemoveDevice, service_, + device_id)); + } + + private: + + void CheckPendingPermissionChange() { + base::AssertBlockingAllowed(); + std::map::iterator it; + for (it = permissions_checks_attempts_.begin(); it != permissions_checks_attempts_.end();) { + std::string device_name = it->first; + bool keep = true; + if (HaveReadWritePermissions(device_name)) { + OnDeviceAdded(device_name); + keep = false; + } + else if (it->second-- <= 0) { + HID_LOG(ERROR) << "Still don't have write permissions to '" << device_name + << "' after " << kMaxPermissionChecks << " attempts"; + keep = false; + } + + if (keep) + ++it; + else + permissions_checks_attempts_.erase(it++); + } + + if (permissions_checks_attempts_.empty()) + timer_->Stop(); + } + + void SetupDevdMonitor() { + base::AssertBlockingAllowed(); + + int devd_fd = socket(AF_UNIX, SOCK_SEQPACKET, 0); + if (devd_fd < 0) + return; + + struct sockaddr_un sa; + + sa.sun_family = AF_UNIX; + strlcpy(sa.sun_path, "/var/run/devd.seqpacket.pipe", sizeof(sa.sun_path)); + if (connect(devd_fd, (struct sockaddr *) &sa, sizeof(sa)) < 0) { + close(devd_fd); + return; + } + + devd_fd_.reset(devd_fd); + file_watcher_ = base::FileDescriptorWatcher::WatchReadable( + devd_fd_.get(), base::Bind(&BlockingTaskHelper::OnDevdMessageCanBeRead, + base::Unretained(this))); + } + + void OnDevdMessageCanBeRead() { + DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); + ssize_t bytes_read = HANDLE_EINTR(recv(devd_fd_.get(), devd_buffer_->data(), + devd_buffer_->size() - 1, MSG_WAITALL)); + if (bytes_read < 0) { + if (errno != EAGAIN) { + HID_LOG(ERROR) << "Read failed"; + file_watcher_.reset(); + } + return; + } + + devd_buffer_->data()[bytes_read] = 0; + char *data = devd_buffer_->data(); + // It may take some time for devd to change permissions + // on /dev/uhidX node. So do not fail immediately if + // open fail. Retry each second for kMaxPermissionChecks + // times before giving up entirely + if (base::StartsWith(data, "+uhid", base::CompareCase::SENSITIVE)) { + std::vector parts = base::SplitString( + data, " ", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL); + if (!parts.empty()) { + std::string device_name = parts[0].substr(1); // skip '+' + if (HaveReadWritePermissions(device_name)) + OnDeviceAdded(parts[0].substr(1)); + else { + // Do not re-add to checks + if (permissions_checks_attempts_.find(device_name) == permissions_checks_attempts_.end()) { + permissions_checks_attempts_.insert(std::pair(device_name, kMaxPermissionChecks)); + timer_->Start(FROM_HERE, base::TimeDelta::FromSeconds(1), + this, &BlockingTaskHelper::CheckPendingPermissionChange); + } + } + } + } + + if (base::StartsWith(data, "-uhid", base::CompareCase::SENSITIVE)) { + std::vector parts = base::SplitString( + data, " ", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL); + if (!parts.empty()) { + std::string device_name = parts[0].substr(1); // skip '-' + auto it = permissions_checks_attempts_.find(device_name); + if (it != permissions_checks_attempts_.end()) { + permissions_checks_attempts_.erase(it); + if (permissions_checks_attempts_.empty()) + timer_->Stop(); + } + OnDeviceRemoved(parts[0].substr(1)); + } + } + } + + SEQUENCE_CHECKER(sequence_checker_); + + // This weak pointer is only valid when checked on this task runner. + base::WeakPtr service_; + scoped_refptr task_runner_; + std::unique_ptr file_watcher_; + std::unique_ptr timer_; + base::ScopedFD devd_fd_; + scoped_refptr devd_buffer_; + std::map permissions_checks_attempts_; + + DISALLOW_COPY_AND_ASSIGN(BlockingTaskHelper); +}; + +HidServiceFreeBSD::HidServiceFreeBSD() + : task_runner_(base::ThreadTaskRunnerHandle::Get()), + blocking_task_runner_( + base::CreateSequencedTaskRunnerWithTraits(kBlockingTaskTraits)), + weak_factory_(this) { + helper_ = std::make_unique(weak_factory_.GetWeakPtr()); + blocking_task_runner_->PostTask( + FROM_HERE, + base::Bind(&BlockingTaskHelper::Start, base::Unretained(helper_.get()))); +} + +HidServiceFreeBSD::~HidServiceFreeBSD() { + blocking_task_runner_->DeleteSoon(FROM_HERE, helper_.release()); +} + +base::WeakPtr HidServiceFreeBSD::GetWeakPtr() { + return weak_factory_.GetWeakPtr(); +} + +// static +void HidServiceFreeBSD::OpenOnBlockingThread( + std::unique_ptr params) { + base::AssertBlockingAllowed(); + scoped_refptr task_runner = params->task_runner; + + base::FilePath device_path(params->device_info->device_node()); + base::File device_file; + int flags = + base::File::FLAG_OPEN | base::File::FLAG_READ | base::File::FLAG_WRITE; + device_file.Initialize(device_path, flags); + if (!device_file.IsValid()) { + HID_LOG(EVENT) << "Failed to open '" << params->device_info->device_node() + << "': " + << base::File::ErrorToString(device_file.error_details()); + task_runner->PostTask(FROM_HERE, base::Bind(params->callback, nullptr)); + return; + } + params->fd.reset(device_file.TakePlatformFile()); + FinishOpen(std::move(params)); +} + +void HidServiceFreeBSD::Connect(const std::string& device_guid, + const ConnectCallback& callback) { + DCHECK(thread_checker_.CalledOnValidThread()); + + const auto& map_entry = devices().find(device_guid); + if (map_entry == devices().end()) { + base::ThreadTaskRunnerHandle::Get()->PostTask( + FROM_HERE, base::Bind(callback, nullptr)); + return; + } + + scoped_refptr device_info = map_entry->second; + + auto params = std::make_unique(device_info, callback); + + scoped_refptr blocking_task_runner = + params->blocking_task_runner; + blocking_task_runner->PostTask( + FROM_HERE, base::Bind(&HidServiceFreeBSD::OpenOnBlockingThread, + base::Passed(¶ms))); +} + +// static +void HidServiceFreeBSD::FinishOpen(std::unique_ptr params) { + base::AssertBlockingAllowed(); + scoped_refptr task_runner = params->task_runner; + + task_runner->PostTask( + FROM_HERE, + base::Bind(&HidServiceFreeBSD::CreateConnection, base::Passed(¶ms))); +} + +// static +void HidServiceFreeBSD::CreateConnection(std::unique_ptr params) { + DCHECK(params->fd.is_valid()); + params->callback.Run(base::MakeRefCounted( + std::move(params->device_info), std::move(params->fd), + std::move(params->blocking_task_runner))); +} + +} // namespace device Index: head/www/chromium/files/patch-services_device_hid_hid__service__freebsd.h =================================================================== --- head/www/chromium/files/patch-services_device_hid_hid__service__freebsd.h (revision 489611) +++ head/www/chromium/files/patch-services_device_hid_hid__service__freebsd.h (revision 489612) @@ -1,51 +1,51 @@ ---- services/device/hid/hid_service_freebsd.h.orig 2018-03-04 05:38:54.468408000 +0100 -+++ services/device/hid/hid_service_freebsd.h 2018-03-04 08:35:47.483290000 +0100 +--- 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 @@ -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 + +#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 GetWeakPtr() override; + + private: + struct ConnectParams; + class BlockingTaskHelper; + + static void OpenOnBlockingThread(std::unique_ptr params); + static void FinishOpen(std::unique_ptr params); + static void CreateConnection(std::unique_ptr params); + + const scoped_refptr task_runner_; + const scoped_refptr 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 helper_; + base::WeakPtrFactory weak_factory_; + + DISALLOW_COPY_AND_ASSIGN(HidServiceFreeBSD); +}; + +} // namespace device + +#endif // DEVICE_HID_HID_SERVICE_FREEBSD_H_ Index: head/www/chromium/files/patch-services_device_time__zone__monitor_time__zone__monitor.cc =================================================================== --- head/www/chromium/files/patch-services_device_time__zone__monitor_time__zone__monitor.cc (revision 489611) +++ head/www/chromium/files/patch-services_device_time__zone__monitor_time__zone__monitor.cc (revision 489612) @@ -1,11 +1,11 @@ ---- services/device/time_zone_monitor/time_zone_monitor.cc.orig 2017-09-05 21:05:23.000000000 +0200 -+++ services/device/time_zone_monitor/time_zone_monitor.cc 2017-09-06 21:23:20.120961000 +0200 +--- services/device/time_zone_monitor/time_zone_monitor.cc.orig 2018-12-03 21:17:09.000000000 +0100 ++++ services/device/time_zone_monitor/time_zone_monitor.cc 2018-12-14 00:48:16.376188000 +0100 @@ -41,7 +41,7 @@ #else std::unique_ptr new_zone(icu::TimeZone::detectHostTimeZone()); #endif --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#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 current_zone(icu::TimeZone::createDefault()); Index: head/www/chromium/files/patch-services_network_network__service.cc =================================================================== --- head/www/chromium/files/patch-services_network_network__service.cc (nonexistent) +++ head/www/chromium/files/patch-services_network_network__service.cc (revision 489612) @@ -0,0 +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 @@ + #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); + } + +-#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_); Property changes on: head/www/chromium/files/patch-services_network_network__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: head/www/chromium/files/patch-services_network_network__service.h =================================================================== --- head/www/chromium/files/patch-services_network_network__service.h (nonexistent) +++ head/www/chromium/files/patch-services_network_network__service.h (revision 489612) @@ -0,0 +1,11 @@ +--- services/network/network_service.h.orig 2018-12-28 15:42:09.726485000 +0100 ++++ services/network/network_service.h 2018-12-28 15:43:21.875987000 +0100 +@@ -148,7 +148,7 @@ + mojom::NetworkService::GetTotalNetworkUsagesCallback callback) override; + void UpdateSignedTreeHead(const net::ct::SignedTreeHead& sth) override; + void UpdateCRLSet(base::span crl_set) 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) Property changes on: head/www/chromium/files/patch-services_network_network__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: head/www/chromium/files/patch-services_network_network_sandbox_hook_linux.cc =================================================================== --- head/www/chromium/files/patch-services_network_network_sandbox_hook_linux.cc (revision 489611) +++ head/www/chromium/files/patch-services_network_network_sandbox_hook_linux.cc (revision 489612) @@ -1,18 +1,18 @@ ---- services/network/network_sandbox_hook_linux.cc.orig 2018-07-20 00:26:50.262722000 +0200 -+++ services/network/network_sandbox_hook_linux.cc 2018-07-20 00:17:37.945110000 +0200 +--- 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->EngageNamespaceSandbox(false /* from_zygote */); -+#endif + instance->EngageNamespaceSandboxIfPossible(); ++#endif // defined(OS_BSD) return true; } Index: head/www/chromium/files/patch-services_service__manager_public_cpp_standalone__service_BUILD.gn =================================================================== --- head/www/chromium/files/patch-services_service__manager_public_cpp_standalone__service_BUILD.gn (revision 489611) +++ head/www/chromium/files/patch-services_service__manager_public_cpp_standalone__service_BUILD.gn (revision 489612) @@ -1,11 +1,11 @@ ---- services/service_manager/public/cpp/standalone_service/BUILD.gn.orig 2018-02-24 16:25:18.000000000 +0100 -+++ services/service_manager/public/cpp/standalone_service/BUILD.gn 2018-03-04 03:48:04.087144000 +0100 -@@ -24,7 +24,7 @@ - "//services/service_manager/public/interfaces", +--- 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 && !is_android) { -+ if (is_linux && !is_android && !is_bsd) { +- if (is_linux) { ++ if (is_linux && !is_bsd) { deps += [ "//sandbox/linux:sandbox", "//sandbox/linux:sandbox_services", Index: head/www/chromium/files/patch-services_service__manager_runner_host_BUILD.gn =================================================================== --- head/www/chromium/files/patch-services_service__manager_runner_host_BUILD.gn (revision 489611) +++ head/www/chromium/files/patch-services_service__manager_runner_host_BUILD.gn (revision 489612) @@ -1,11 +1,11 @@ ---- services/service_manager/runner/host/BUILD.gn.orig 2017-04-19 19:06:37 UTC -+++ services/service_manager/runner/host/BUILD.gn -@@ -28,7 +28,7 @@ source_set("lib") { +--- 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 @@ "//mojo/public/cpp/system", ] -- if (is_linux && !is_android) { -+ if (is_linux && !is_android && !is_bsd) { +- if (is_linux) { ++ if (is_linux && !is_bsd) { deps += [ "//sandbox/linux:sandbox_services" ] } - } + Index: head/www/chromium/files/patch-third__party_angle_BUILD.gn =================================================================== --- head/www/chromium/files/patch-third__party_angle_BUILD.gn (revision 489611) +++ head/www/chromium/files/patch-third__party_angle_BUILD.gn (revision 489612) @@ -1,21 +1,21 @@ ---- third_party/angle/BUILD.gn.orig 2018-08-01 00:10:50.000000000 +0200 -+++ third_party/angle/BUILD.gn 2018-08-04 20:58:43.991734000 +0200 -@@ -271,6 +271,7 @@ +--- 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 @@ "X11", "Xi", "Xext", + "GL", ] } } -@@ -844,10 +845,6 @@ +@@ -822,10 +823,6 @@ libs = [] if (is_linux) { - sources += rebase_path(util_gypi.util_linux_sources, ".", "util") + sources += util_linux_sources - libs += [ - "rt", - "dl", - ] } if (is_mac) { Index: head/www/chromium/files/patch-third__party_angle_third__party_vulkan-loader_src_loader_loader.c =================================================================== --- head/www/chromium/files/patch-third__party_angle_third__party_vulkan-loader_src_loader_loader.c (nonexistent) +++ head/www/chromium/files/patch-third__party_angle_third__party_vulkan-loader_src_loader_loader.c (revision 489612) @@ -0,0 +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 @@ + } + + // 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 Property changes on: head/www/chromium/files/patch-third__party_angle_third__party_vulkan-loader_src_loader_loader.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/chromium/files/patch-third__party_angle_third__party_vulkan-loader_src_loader_vk__loader__platform.h =================================================================== --- head/www/chromium/files/patch-third__party_angle_third__party_vulkan-loader_src_loader_vk__loader__platform.h (nonexistent) +++ head/www/chromium/files/patch-third__party_angle_third__party_vulkan-loader_src_loader_vk__loader__platform.h (revision 489612) @@ -0,0 +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 +@@ -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: Property changes on: head/www/chromium/files/patch-third__party_angle_third__party_vulkan-loader_src_loader_vk__loader__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: head/www/chromium/files/patch-third__party_angle_third__party_vulkan-validation-layers_src_layers_vk__loader__platform.h =================================================================== --- head/www/chromium/files/patch-third__party_angle_third__party_vulkan-validation-layers_src_layers_vk__loader__platform.h (nonexistent) +++ head/www/chromium/files/patch-third__party_angle_third__party_vulkan-validation-layers_src_layers_vk__loader__platform.h (revision 489612) @@ -0,0 +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 +@@ -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: Property changes on: head/www/chromium/files/patch-third__party_angle_third__party_vulkan-validation-layers_src_layers_vk__loader__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: head/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_shaping_harfbuzz__face.cc =================================================================== --- head/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_shaping_harfbuzz__face.cc (nonexistent) +++ head/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_shaping_harfbuzz__face.cc (revision 489612) @@ -0,0 +1,20 @@ +--- third_party/blink/renderer/platform/fonts/shaping/harfbuzz_face.cc.orig 2018-12-29 14:23:27.944448000 +0100 ++++ third_party/blink/renderer/platform/fonts/shaping/harfbuzz_face.cc 2018-12-29 14:29:49.494355000 +0100 +@@ -139,7 +139,7 @@ + static void HarfBuzzGetGlyphHorizontalAdvances(hb_font_t* font, + void* font_data, + unsigned count, +- hb_codepoint_t* first_glyph, ++ const hb_codepoint_t* first_glyph, + unsigned int glyph_stride, + hb_position_t* first_advance, + unsigned int advance_stride, +@@ -147,7 +147,7 @@ + HarfBuzzFontData* hb_font_data = + reinterpret_cast(font_data); + SkiaTextMetrics(&hb_font_data->paint_) +- .GetGlyphWidthForHarfBuzz(count, first_glyph, glyph_stride, first_advance, ++ .GetGlyphWidthForHarfBuzz(count, const_cast(first_glyph), glyph_stride, first_advance, + advance_stride); + } + Property changes on: head/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_shaping_harfbuzz__face.cc ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/chromium/files/patch-third__party_blink_renderer_platform_wtf_threading.cc =================================================================== --- head/www/chromium/files/patch-third__party_blink_renderer_platform_wtf_threading.cc (nonexistent) +++ head/www/chromium/files/patch-third__party_blink_renderer_platform_wtf_threading.cc (revision 489612) @@ -0,0 +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 +@@ -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 + #elif defined(OS_ANDROID) + #include + #endif + ++#if defined(OS_BSD) ++#include ++#endif ++ + namespace WTF { + + // Current thread identity +@@ -38,6 +42,8 @@ + return syscall(__NR_gettid); + #elif defined(OS_ANDROID) + return gettid(); ++#elif defined(OS_BSD) ++ return pthread_getthreadid_np(); + #else + return reinterpret_cast(pthread_self()); + #endif Property changes on: head/www/chromium/files/patch-third__party_blink_renderer_platform_wtf_threading.cc ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/chromium/files/patch-third__party_crashpad_crashpad_util_misc_address__types.h =================================================================== --- head/www/chromium/files/patch-third__party_crashpad_crashpad_util_misc_address__types.h (nonexistent) +++ head/www/chromium/files/patch-third__party_crashpad_crashpad_util_misc_address__types.h (revision 489612) @@ -0,0 +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 +@@ -25,7 +25,7 @@ + #include + #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 +@@ -55,7 +55,7 @@ + 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; Property changes on: head/www/chromium/files/patch-third__party_crashpad_crashpad_util_misc_address__types.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/chromium/files/patch-third__party_googletest_src_googletest_test_googletest-port__test.cc =================================================================== --- head/www/chromium/files/patch-third__party_googletest_src_googletest_test_googletest-port__test.cc (nonexistent) +++ head/www/chromium/files/patch-third__party_googletest_src_googletest_test_googletest-port__test.cc (revision 489612) @@ -0,0 +1,11 @@ +--- 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(data); + mutex->Lock(); Property changes on: head/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: head/www/chromium/files/patch-third__party_pdfium_fxjs_js__define.cpp =================================================================== --- head/www/chromium/files/patch-third__party_pdfium_fxjs_js__define.cpp (nonexistent) +++ head/www/chromium/files/patch-third__party_pdfium_fxjs_js__define.cpp (revision 489612) @@ -0,0 +1,22 @@ +--- third_party/pdfium/fxjs/js_define.cpp.orig 2018-12-15 15:47:24.332696000 +0100 ++++ third_party/pdfium/fxjs/js_define.cpp 2018-12-15 15:47:30.435519000 +0100 +@@ -24,6 +24,11 @@ + return 0; + time_t t = 0; + FXSYS_time(&t); ++#ifdef __FreeBSD__ ++ struct tm lt; ++ localtime_r(&t, <); ++ return (double)(-(lt.tm_gmtoff * 1000)); ++#else + localtime(&t); + #if _FX_PLATFORM_ == _FX_PLATFORM_WINDOWS_ + // In gcc 'timezone' is a global variable declared in time.h. In VC++, that +@@ -32,6 +37,7 @@ + _get_timezone(&timezone); + #endif // _FX_PLATFORM_ == _FX_PLATFORM_WINDOWS_ + return (double)(-(timezone * 1000)); ++#endif // __FreeBSD__ + } + + int GetDaylightSavingTA(double d) { Property changes on: head/www/chromium/files/patch-third__party_pdfium_fxjs_js__define.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: head/www/chromium/files/patch-third__party_pdfium_xfa_fgas_font_cfx__fontsourceenum__file.cpp =================================================================== --- head/www/chromium/files/patch-third__party_pdfium_xfa_fgas_font_cfx__fontsourceenum__file.cpp (nonexistent) +++ head/www/chromium/files/patch-third__party_pdfium_xfa_fgas_font_cfx__fontsourceenum__file.cpp (revision 489612) @@ -0,0 +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 @@ + + 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_ Property changes on: head/www/chromium/files/patch-third__party_pdfium_xfa_fgas_font_cfx__fontsourceenum__file.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: head/www/chromium/files/patch-third__party_perfetto_include_perfetto_base_event.h =================================================================== --- head/www/chromium/files/patch-third__party_perfetto_include_perfetto_base_event.h (nonexistent) +++ head/www/chromium/files/patch-third__party_perfetto_include_perfetto_base_event.h (revision 489612) @@ -0,0 +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 +@@ -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 Property changes on: head/www/chromium/files/patch-third__party_perfetto_include_perfetto_base_event.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/chromium/files/patch-third__party_perfetto_include_perfetto_base_time.h =================================================================== --- head/www/chromium/files/patch-third__party_perfetto_include_perfetto_base_time.h (nonexistent) +++ head/www/chromium/files/patch-third__party_perfetto_include_perfetto_base_time.h (revision 489612) @@ -0,0 +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 @@ + // 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 @@ + return res == 0 ? CLOCK_BOOTTIME : kWallTimeClockSource; + }(); + return GetTimeInternalNs(kBootTimeClockSource); ++#endif + } + + inline TimeNanos GetWallTimeNs() { Property changes on: head/www/chromium/files/patch-third__party_perfetto_include_perfetto_base_time.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/chromium/files/patch-third__party_perfetto_src_base_unix__socket.cc =================================================================== --- head/www/chromium/files/patch-third__party_perfetto_src_base_unix__socket.cc (nonexistent) +++ head/www/chromium/files/patch-third__party_perfetto_src_base_unix__socket.cc (revision 489612) @@ -0,0 +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 @@ + + 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); Property changes on: head/www/chromium/files/patch-third__party_perfetto_src_base_unix__socket.cc ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/chromium/files/patch-third__party_perfetto_src_tracing_core_tracing__service__impl.cc =================================================================== --- head/www/chromium/files/patch-third__party_perfetto_src_tracing_core_tracing__service__impl.cc (nonexistent) +++ head/www/chromium/files/patch-third__party_perfetto_src_tracing_core_tracing__service__impl.cc (revision 489612) @@ -0,0 +1,12 @@ +--- third_party/perfetto/src/tracing/core/tracing_service_impl.cc.orig 2018-12-15 19:14:38.117664000 +0100 ++++ third_party/perfetto/src/tracing/core/tracing_service_impl.cc 2018-12-15 19:15:20.324077000 +0100 +@@ -1231,7 +1231,8 @@ + 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; Property changes on: head/www/chromium/files/patch-third__party_perfetto_src_tracing_core_tracing__service__impl.cc ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/chromium/files/patch-third__party_skia_src_opts_SkRasterPipeline_opts.h =================================================================== --- head/www/chromium/files/patch-third__party_skia_src_opts_SkRasterPipeline_opts.h (revision 489611) +++ head/www/chromium/files/patch-third__party_skia_src_opts_SkRasterPipeline_opts.h (revision 489612) @@ -1,20 +1,20 @@ ---- third_party/skia/src/opts/SkRasterPipeline_opts.h.orig 2018-07-20 03:02:44.498284000 +0200 -+++ third_party/skia/src/opts/SkRasterPipeline_opts.h 2018-07-20 03:04:09.892857000 +0200 -@@ -653,7 +653,7 @@ +--- 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(__aarch64__) && !defined(SK_BUILD_FOR_GOOGLE3) // Temporary workaround for some Google3 builds. -+#if defined(JUMPER_IS_NEON) && defined(__aarch64__) && !defined(SK_BUILD_FOR_GOOGLE3) // Temporary workaround for some Google3 builds. +-#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) -@@ -673,7 +673,7 @@ +@@ -678,7 +678,7 @@ } SI U16 to_half(F f) { --#if defined(__aarch64__) && !defined(SK_BUILD_FOR_GOOGLE3) // Temporary workaround for some Google3 builds. -+#if defined(JUMPER_IS_NEON) && defined(__aarch64__) && !defined(SK_BUILD_FOR_GOOGLE3) // Temporary workaround for some Google3 builds. +-#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) Index: head/www/chromium/files/patch-third__party_skia_third__party_vulkanmemoryallocator_include_vk__mem__alloc.h =================================================================== --- head/www/chromium/files/patch-third__party_skia_third__party_vulkanmemoryallocator_include_vk__mem__alloc.h (nonexistent) +++ head/www/chromium/files/patch-third__party_skia_third__party_vulkanmemoryallocator_include_vk__mem__alloc.h (revision 489612) @@ -0,0 +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 @@ + #include // for std::mutex + #include // for std::atomic + +-#if !defined(_WIN32) && !defined(__APPLE__) ++#if !defined(_WIN32) && !defined(__APPLE__) && !defined(__FreeBSD__) + #include // for aligned_alloc() + #endif + Property changes on: head/www/chromium/files/patch-third__party_skia_third__party_vulkanmemoryallocator_include_vk__mem__alloc.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/chromium/files/patch-third__party_sqlite_BUILD.gn =================================================================== --- head/www/chromium/files/patch-third__party_sqlite_BUILD.gn (revision 489611) +++ head/www/chromium/files/patch-third__party_sqlite_BUILD.gn (revision 489612) @@ -1,29 +1,11 @@ ---- third_party/sqlite/BUILD.gn.orig 2018-06-13 00:11:05.000000000 +0200 -+++ third_party/sqlite/BUILD.gn 2018-07-19 20:59:10.723249000 +0200 -@@ -155,7 +155,7 @@ - # sqlite3Fts3InitTok). - cflags += [ "-Wno-unused-function" ] - } -- if (is_linux) { -+ if (is_linux && !is_bsd) { - cflags += [ - # SQLite doesn"t believe in compiler warnings, - # preferring testing. -@@ -208,7 +208,7 @@ +--- 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 @@ + ] } } - -- if (is_linux || is_android) { -+ if ((is_linux && !is_bsd) || is_android) { - defines += [ - # Linux provides fdatasync(), a faster equivalent of fsync(). - "fdatasync=fdatasync", -@@ -243,7 +243,7 @@ - ":sqlite_warnings", - ] - - if (is_linux) { + if (is_linux && !is_bsd) { - libs = [ "dl" ] - } else if (is_mac || is_ios) { - libs = [ "CoreFoundation.framework" ] + cflags += [ + # SQLite doesn't believe in compiler warnings, preferring testing. + # http://www.sqlite.org/faq.html#q17 Index: head/www/chromium/files/patch-third__party_swiftshader_src_OpenGL_libEGL_libEGL.cpp =================================================================== --- head/www/chromium/files/patch-third__party_swiftshader_src_OpenGL_libEGL_libEGL.cpp (revision 489611) +++ head/www/chromium/files/patch-third__party_swiftshader_src_OpenGL_libEGL_libEGL.cpp (revision 489612) @@ -1,47 +1,29 @@ ---- third_party/swiftshader/src/OpenGL/libEGL/libEGL.cpp.orig 2018-03-20 23:06:53.000000000 +0100 -+++ third_party/swiftshader/src/OpenGL/libEGL/libEGL.cpp 2018-03-24 18:42:49.216641000 +0100 -@@ -25,7 +25,7 @@ - - #if defined(__ANDROID__) - #include --#elif defined(__linux__) -+#elif defined(__linux__) || defined(__FreeBSD__) - #include "Main/libX11.hpp" - #endif - -@@ -119,7 +119,7 @@ +--- 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 @@ // FIXME: Check if display_id is the default display } - #if defined(__linux__) && !defined(__ANDROID__) -+ #if (defined(__linux__) || defined(__FreeBSD__)) && !defined(__ANDROID__) ++ #if (defined(__linux__) || defined(__FreeBSD)) && !defined(__ANDROID__) + #if defined(USE_X11) if(!libX11) - { - return success(HEADLESS_DISPLAY); -@@ -176,7 +176,7 @@ + #endif // Non X11 linux is headless only +@@ -207,7 +207,7 @@ { 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 " - "EGL_KHR_platform_x11 " #endif -@@ -944,7 +944,7 @@ - - if(context) - { -- #if defined(__linux__) && !defined(__ANDROID__) -+ #if (defined(__linux__) || defined(__FreeBSD__)) && !defined(__ANDROID__) - egl::Display *display = context->getDisplay(); - - if(!display) -@@ -1110,7 +1110,7 @@ + #if defined(USE_X11) +@@ -1248,7 +1248,7 @@ { - TRACE("(EGLenum platform = 0x%X, void *native_display = %p, const EGLint *attrib_list = %p)", platform, native_display, attrib_list); + 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) { - case EGL_PLATFORM_X11_EXT: break; + #if defined(USE_X11) Index: head/www/chromium/files/patch-third__party_swiftshader_src_OpenGL_libEGL_libEGL.hpp =================================================================== --- head/www/chromium/files/patch-third__party_swiftshader_src_OpenGL_libEGL_libEGL.hpp (revision 489611) +++ head/www/chromium/files/patch-third__party_swiftshader_src_OpenGL_libEGL_libEGL.hpp (revision 489612) @@ -1,11 +1,11 @@ ---- third_party/swiftshader/src/OpenGL/libEGL/libEGL.hpp.orig 2017-06-26 22:22:21.418803000 +0200 -+++ third_party/swiftshader/src/OpenGL/libEGL/libEGL.hpp 2017-06-26 22:22:37.089147000 +0200 -@@ -106,7 +106,7 @@ - #else - const char *libEGL_lib[] = {"/vendor/lib/egl/libEGL_swiftshader.so"}; +--- 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 @@ #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: head/www/chromium/files/patch-third__party_swiftshader_src_OpenGL_libGLES_CM_libGLES_CM.hpp =================================================================== --- head/www/chromium/files/patch-third__party_swiftshader_src_OpenGL_libGLES_CM_libGLES_CM.hpp (revision 489611) +++ head/www/chromium/files/patch-third__party_swiftshader_src_OpenGL_libGLES_CM_libGLES_CM.hpp (revision 489612) @@ -1,11 +1,11 @@ ---- third_party/swiftshader/src/OpenGL/libGLES_CM/libGLES_CM.hpp.orig 2017-06-26 22:23:31.609734000 +0200 -+++ third_party/swiftshader/src/OpenGL/libGLES_CM/libGLES_CM.hpp 2017-06-26 22:23:56.904096000 +0200 -@@ -267,7 +267,7 @@ - #else - const char *libGLES_CM_lib[] = {"/vendor/lib/egl/libGLESv1_CM_swiftshader.so"}; +--- 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 Index: head/www/chromium/files/patch-third__party_swiftshader_src_OpenGL_libGLESv2_libGLESv2.hpp =================================================================== --- head/www/chromium/files/patch-third__party_swiftshader_src_OpenGL_libGLESv2_libGLESv2.hpp (revision 489611) +++ head/www/chromium/files/patch-third__party_swiftshader_src_OpenGL_libGLESv2_libGLESv2.hpp (revision 489612) @@ -1,11 +1,11 @@ ---- third_party/swiftshader/src/OpenGL/libGLESv2/libGLESv2.hpp.orig 2017-06-26 22:26:03.983772000 +0200 -+++ third_party/swiftshader/src/OpenGL/libGLESv2/libGLESv2.hpp 2017-06-26 22:26:31.197604000 +0200 -@@ -290,7 +290,7 @@ - #else - const char *libGLESv2_lib[] = {"/vendor/lib/egl/libGLESv2_swiftshader.so"}; +--- 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 @@ #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: head/www/chromium/files/patch-third__party_webrtc_rtc_base_physicalsocketserver.cc =================================================================== --- head/www/chromium/files/patch-third__party_webrtc_rtc_base_physicalsocketserver.cc (revision 489611) +++ head/www/chromium/files/patch-third__party_webrtc_rtc_base_physicalsocketserver.cc (revision 489612) @@ -1,56 +1,56 @@ ---- third_party/webrtc/rtc_base/physicalsocketserver.cc.orig 2018-08-08 21:13:16.000000000 +0200 -+++ third_party/webrtc/rtc_base/physicalsocketserver.cc 2018-08-27 01:15:56.484919000 +0200 -@@ -68,7 +68,7 @@ +--- 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; -@@ -295,7 +295,7 @@ +@@ -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 } -@@ -308,7 +308,7 @@ +@@ -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 } -@@ -318,7 +318,7 @@ +@@ -309,7 +309,7 @@ int PhysicalSocket::Send(const void* pv, size_t cb) { - int sent = DoSend(s_, reinterpret_cast(pv), - static_cast(cb), + int sent = DoSend( + s_, reinterpret_cast(pv), static_cast(cb), -#if defined(WEBRTC_LINUX) && !defined(WEBRTC_ANDROID) +#if defined(WEBRTC_LINUX) && !defined(WEBRTC_ANDROID) && !defined(WEBRTC_BSD) // Suppress SIGPIPE. Without this, attempting to send on a socket whose // other end is closed will result in a SIGPIPE signal being raised to // our process, which by default will terminate the process, which we -@@ -347,7 +347,7 @@ +@@ -338,7 +338,7 @@ size_t len = addr.ToSockAddrStorage(&saddr); - int sent = DoSendTo( - s_, static_cast(buffer), static_cast(length), + int sent = + DoSendTo(s_, static_cast(buffer), static_cast(length), -#if defined(WEBRTC_LINUX) && !defined(WEBRTC_ANDROID) +#if defined(WEBRTC_LINUX) && !defined(WEBRTC_ANDROID) && !defined(WEBRTC_BSD) - // Suppress SIGPIPE. See above for explanation. - MSG_NOSIGNAL, + // Suppress SIGPIPE. See above for explanation. + MSG_NOSIGNAL, #else -@@ -538,7 +538,7 @@ +@@ -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) Index: head/www/chromium/files/patch-third_party_blink_renderer_platform_fonts_font_cache.cc =================================================================== --- head/www/chromium/files/patch-third_party_blink_renderer_platform_fonts_font_cache.cc (revision 489611) +++ head/www/chromium/files/patch-third_party_blink_renderer_platform_fonts_font_cache.cc (revision 489612) @@ -1,11 +1,20 @@ ---- third_party/blink/renderer/platform/fonts/font_cache.cc.orig 2018-07-19 19:24:25.598357000 +0200 -+++ third_party/blink/renderer/platform/fonts/font_cache.cc 2018-07-19 19:24:38.659689000 +0200 -@@ -85,7 +85,7 @@ +--- third_party/blink/renderer/platform/fonts/font_cache.cc.orig 2018-12-12 22:56:23.000000000 +0100 ++++ third_party/blink/renderer/platform/fonts/font_cache.cc 2018-12-29 13:18:26.479678000 +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 == FontFamilyNames::system_ui) return nullptr; #else Index: head/www/chromium/files/patch-third_party_blink_renderer_platform_fonts_font_cache.h =================================================================== --- head/www/chromium/files/patch-third_party_blink_renderer_platform_fonts_font_cache.h (revision 489611) +++ head/www/chromium/files/patch-third_party_blink_renderer_platform_fonts_font_cache.h (revision 489612) @@ -1,20 +1,38 @@ ---- third_party/blink/renderer/platform/fonts/font_cache.h.orig 2018-07-19 19:26:12.883838000 +0200 -+++ third_party/blink/renderer/platform/fonts/font_cache.h 2018-07-19 19:26:49.537827000 +0200 -@@ -213,7 +213,7 @@ +--- third_party/blink/renderer/platform/fonts/font_cache.h.orig 2018-12-12 22:56:23.000000000 +0100 ++++ third_party/blink/renderer/platform/fonts/font_cache.h 2018-12-29 13:18:26.483036000 +0100 +@@ -157,7 +157,7 @@ + sk_sp FontManager() { return font_manager_; } + static void SetFontManager(sk_sp); + +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + // These are needed for calling QueryRenderStyleForStrike, since + // gfx::GetFontRenderParams makes distinctions based on DSF. + static float DeviceScaleFactor() { return device_scale_factor_; } +@@ -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; -@@ -287,7 +287,7 @@ - const FontFaceCreationParams&, - CString& name); +@@ -291,7 +291,7 @@ + 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&, +@@ -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 + Index: head/www/chromium/files/patch-third_party_blink_renderer_platform_wtf_threading_pthreads.cc =================================================================== --- head/www/chromium/files/patch-third_party_blink_renderer_platform_wtf_threading_pthreads.cc (revision 489611) +++ head/www/chromium/files/patch-third_party_blink_renderer_platform_wtf_threading_pthreads.cc (revision 489612) @@ -1,33 +1,22 @@ ---- third_party/blink/renderer/platform/wtf/threading_pthreads.cc.orig 2018-07-19 20:19:23.794139000 +0200 -+++ third_party/blink/renderer/platform/wtf/threading_pthreads.cc 2018-07-19 20:21:15.447060000 +0200 -@@ -51,14 +51,19 @@ +--- 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 #endif -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) #include #endif -#if defined(OS_LINUX) || defined(OS_ANDROID) +#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) #include - #endif - ++#endif ++ +#if defined(OS_BSD) +#include +#include -+#endif -+ - namespace WTF { - - namespace internal { -@@ -70,6 +75,8 @@ - return syscall(__NR_gettid); - #elif defined(OS_ANDROID) - return gettid(); -+#elif defined(OS_BSD) -+ return pthread_getthreadid_np(); - #else - return reinterpret_cast(pthread_self()); #endif + + namespace WTF { Index: head/www/chromium/files/patch-third_party_crashpad_crashpad_util_posix_symbolic_constants_posix.cc =================================================================== --- head/www/chromium/files/patch-third_party_crashpad_crashpad_util_posix_symbolic_constants_posix.cc (revision 489611) +++ head/www/chromium/files/patch-third_party_crashpad_crashpad_util_posix_symbolic_constants_posix.cc (revision 489612) @@ -1,20 +1,20 @@ ---- third_party/crashpad/crashpad/util/posix/symbolic_constants_posix.cc.orig 2018-07-19 19:55:17.168592000 +0200 -+++ third_party/crashpad/crashpad/util/posix/symbolic_constants_posix.cc 2018-07-19 19:55:37.640206000 +0200 +--- 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) - // sed -Ene 's/^#define[[:space:]]SIG([[:alnum:]]+)[[:space:]]+[[:digit:]]{1,2}([[:space:]]|$).*/ "\1",/p' - // /usr/include/asm-generic/signal.h - // and fix up by removing SIGIOT, SIGLOST, SIGUNUSED, and SIGRTMIN. -@@ -101,7 +101,7 @@ - "SYS", + #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 Index: head/www/chromium/files/patch-tools_gn_base_files_file__posix.cc =================================================================== --- head/www/chromium/files/patch-tools_gn_base_files_file__posix.cc (nonexistent) +++ head/www/chromium/files/patch-tools_gn_base_files_file__posix.cc (revision 489612) @@ -0,0 +1,11 @@ +--- tools/gn/base/files/file_posix.cc.orig 2018-12-12 23:06:54.000000000 +0100 ++++ tools/gn/base/files/file_posix.cc 2018-12-15 21:58:11.127692000 +0100 +@@ -86,7 +86,7 @@ + is_symbolic_link = S_ISLNK(stat_info.st_mode); + size = stat_info.st_size; + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + time_t last_modified_sec = stat_info.st_mtim.tv_sec; + int64_t last_modified_nsec = stat_info.st_mtim.tv_nsec; + time_t last_accessed_sec = stat_info.st_atim.tv_sec; Property changes on: head/www/chromium/files/patch-tools_gn_base_files_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: head/www/chromium/files/patch-tools_gn_bootstrap_bootstrap.py =================================================================== --- head/www/chromium/files/patch-tools_gn_bootstrap_bootstrap.py (revision 489611) +++ head/www/chromium/files/patch-tools_gn_bootstrap_bootstrap.py (revision 489612) @@ -1,77 +1,20 @@ ---- tools/gn/bootstrap/bootstrap.py.orig 2018-06-13 00:11:08.000000000 +0200 -+++ tools/gn/bootstrap/bootstrap.py 2018-07-19 21:45:27.959100000 +0200 -@@ -32,9 +32,10 @@ +--- tools/gn/bootstrap/bootstrap.py.orig 2018-12-12 22:56:27.000000000 +0100 ++++ tools/gn/bootstrap/bootstrap.py 2018-12-16 00:01:37.174054000 +0100 +@@ -76,8 +76,6 @@ + '--no-last-commit-position', + '--out-path=' + gn_build_dir, + ] +- if not options.with_sysroot: +- cmd.append('--no-sysroot') + if options.debug: + cmd.append('--debug') + subprocess.check_call(cmd) +@@ -86,6 +84,8 @@ + os.path.join(BOOTSTRAP_DIR, 'last_commit_position.h'), gn_build_dir) + subprocess.check_call( + ['ninja', '-C', gn_build_dir, 'gn', '-w', 'dupbuild=err']) ++ subprocess.check_call( ++ ['ninja', '-C', gn_build_dir, 'gn_unittests', '-w', 'dupbuild=err']) + shutil.copy2(os.path.join(gn_build_dir, 'gn'), gn_path) - is_win = sys.platform.startswith('win') - is_linux = sys.platform.startswith('linux') -+is_bsd = platform.system().lower().endswith('bsd') - is_mac = sys.platform.startswith('darwin') - is_aix = sys.platform.startswith('aix') --is_posix = is_linux or is_mac or is_aix -+is_posix = is_linux or is_mac or is_aix or is_bsd - - def check_call(cmd, **kwargs): - logging.debug('Running: %s', ' '.join(cmd)) -@@ -712,6 +713,43 @@ - 'cflags': cflags + ['-DHAVE_CONFIG_H'], - } - -+ if is_bsd: -+ libs.extend(['-lexecinfo', '-lkvm']) -+ ldflags.extend(['-pthread']) -+ include_dirs += ["/usr/local/include"] -+ -+ static_libraries['xdg_user_dirs'] = { -+ 'sources': [ -+ 'base/third_party/xdg_user_dirs/xdg_user_dir_lookup.cc', -+ ], -+ 'tool': 'cxx', -+ } -+ static_libraries['base']['sources'].extend([ -+ 'base/memory/shared_memory_handle_posix.cc', -+ 'base/memory/shared_memory_posix.cc', -+ 'base/nix/xdg_util.cc', -+ 'base/process/memory_stubs.cc', -+ 'base/process/process_info_linux.cc', -+ 'base/process/internal_linux.cc', -+ 'base/process/process_handle_freebsd.cc', -+ 'base/process/process_metrics_freebsd.cc', -+ 'base/strings/sys_string_conversions_posix.cc', -+ 'base/sys_info_freebsd.cc', -+ 'base/threading/platform_thread_linux.cc', -+ 'base/synchronization/waitable_event_posix.cc', -+ 'base/time/time_exploded_posix.cc', -+ 'base/time/time_now_posix.cc', -+ ]) -+ static_libraries['libevent']['include_dirs'].extend([ -+ os.path.join(SRC_ROOT, 'base', 'third_party', 'libevent', 'freebsd') -+ ]) -+ static_libraries['libevent']['sources'].extend([ -+ 'base/third_party/libevent/kqueue.c', -+ ]) -+ -+ # Suppressing warnings -+ cflags.extend(['-Wno-deprecated-register', '-Wno-parentheses-equality']) -+ - if is_linux or is_aix: - static_libraries['xdg_user_dirs'] = { - 'sources': [ -@@ -827,18 +865,6 @@ - ]) - static_libraries['libevent']['sources'].extend([ - 'base/third_party/libevent/epoll.c', -- ]) -- else: -- ldflags.extend(['-pthread']) -- libs.extend(['-lrt']) -- static_libraries['base']['sources'].extend([ -- 'base/process/internal_aix.cc' -- ]) -- static_libraries['libevent']['include_dirs'].extend([ -- os.path.join(SRC_ROOT, 'base', 'third_party', 'libevent', 'aix') -- ]) -- static_libraries['libevent']['include_dirs'].extend([ -- os.path.join(SRC_ROOT, 'base', 'third_party', 'libevent', 'compat') - ]) - - if is_mac: + if not options.skip_generate_buildfiles: Index: head/www/chromium/files/patch-tools_gn_build_gen.py =================================================================== --- head/www/chromium/files/patch-tools_gn_build_gen.py (nonexistent) +++ head/www/chromium/files/patch-tools_gn_build_gen.py (revision 489612) @@ -0,0 +1,50 @@ +--- tools/gn/build/gen.py.orig 2018-12-12 23:06:54.000000000 +0100 ++++ tools/gn/build/gen.py 2018-12-15 23:20:32.529540000 +0100 +@@ -39,10 +39,12 @@ + self._platform = 'aix' + elif self._platform.startswith('fuchsia'): + self._platform = 'fuchsia' ++ elif self._platform.lower().startswith('freebsd'): ++ self._platform = 'bsd' + + @staticmethod + def known_platforms(): +- return ['linux', 'darwin', 'msvc', 'aix', 'fuchsia'] ++ return ['linux', 'darwin', 'msvc', 'aix', 'fuchsia', 'bsd'] + + def platform(self): + return self._platform +@@ -65,8 +67,11 @@ + def is_aix(self): + return self._platform == 'aix' + ++ def is_bsd(self): ++ return self._platform == 'bsd' ++ + def is_posix(self): +- return self._platform in ['linux', 'darwin', 'aix'] ++ return self._platform in ['linux', 'darwin', 'aix', 'bsd'] + + + def main(argv): +@@ -168,6 +173,7 @@ + 'darwin': 'build_mac.ninja.template', + 'linux': 'build_linux.ninja.template', + 'aix': 'build_aix.ninja.template', ++ 'bsd': 'build_linux.ninja.template' + }[platform.platform()]) + + with open(template_filename) as f: +@@ -327,7 +333,11 @@ + elif platform.is_aix(): + cflags_cc.append('-maix64') + ldflags.extend(['-maix64', '-pthread']) +- ++ elif platform.is_bsd(): ++ cflags.extend(['-Wno-deprecated-register', '-Wno-parentheses-equality']) ++ ldflags.extend(['-pthread']) ++ libs.extend(['-lexecinfo', '-lkvm']) ++ include_dirs += ['/usr/local/include'] + if options.use_lto: + cflags.extend(['-flto', '-fwhole-program-vtables']) + ldflags.extend(['-flto', '-fwhole-program-vtables']) Property changes on: head/www/chromium/files/patch-tools_gn_build_gen.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: head/www/chromium/files/patch-tools_gn_tools_gn_args.cc =================================================================== --- head/www/chromium/files/patch-tools_gn_tools_gn_args.cc (nonexistent) +++ head/www/chromium/files/patch-tools_gn_tools_gn_args.cc (revision 489612) @@ -0,0 +1,11 @@ +--- tools/gn/tools/gn/args.cc.orig 2018-12-15 19:22:28.337753000 +0100 ++++ tools/gn/tools/gn/args.cc 2018-12-15 19:22:44.479580000 +0100 +@@ -294,6 +294,8 @@ + os = "mac"; + #elif defined(OS_LINUX) + os = "linux"; ++#elif defined(OS_BSD) ++ os = "bsd"; + #elif defined(OS_AIX) + os = "aix"; + #else Property changes on: head/www/chromium/files/patch-tools_gn_tools_gn_args.cc ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/chromium/files/patch-tools_gn_tools_gn_exec_process.cc =================================================================== --- head/www/chromium/files/patch-tools_gn_tools_gn_exec_process.cc (nonexistent) +++ head/www/chromium/files/patch-tools_gn_tools_gn_exec_process.cc (revision 489612) @@ -0,0 +1,13 @@ +--- 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 ++#endif ++ + namespace internal { + + #if defined(OS_WIN) Property changes on: head/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: head/www/chromium/files/patch-tools_gn_util_exe__path.cc =================================================================== --- head/www/chromium/files/patch-tools_gn_util_exe__path.cc (nonexistent) +++ head/www/chromium/files/patch-tools_gn_util_exe__path.cc (revision 489612) @@ -0,0 +1,33 @@ +--- tools/gn/util/exe_path.cc.orig 2018-12-12 23:06:54.000000000 +0100 ++++ tools/gn/util/exe_path.cc 2018-12-15 23:13:30.454635000 +0100 +@@ -13,6 +13,9 @@ + #include + #elif defined(OS_WIN) + #include ++#elif defined(OS_FREEBSD) ++#include ++#include + #endif + + #if defined(OS_MACOSX) +@@ -44,6 +47,20 @@ + return base::FilePath(); + } + return base::FilePath(system_buffer); ++} ++ ++#elif defined(OS_FREEBSD) ++ ++base::FilePath GetExePath() { ++ int name[] = { CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, -1 }; ++ char system_buffer[PATH_MAX + 1]; ++ size_t length = sizeof(system_buffer); ++ int error = sysctl(name, 4, system_buffer, &length, NULL, 0); ++ if (error < 0 || length <= 1) { ++ NOTREACHED() << "Unable to resolve path."; ++ return base::FilePath(); ++ } ++ return base::FilePath(base::FilePath::StringType(system_buffer, length - 1)); + } + + #else Property changes on: head/www/chromium/files/patch-tools_gn_util_exe__path.cc ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/chromium/files/patch-tools_gn_util_semaphore.cc =================================================================== --- head/www/chromium/files/patch-tools_gn_util_semaphore.cc (nonexistent) +++ head/www/chromium/files/patch-tools_gn_util_semaphore.cc (revision 489612) @@ -0,0 +1,11 @@ +--- tools/gn/util/semaphore.cc.orig 2018-12-12 23:06:54.000000000 +0100 ++++ tools/gn/util/semaphore.cc 2018-12-15 22:08:39.431096000 +0100 +@@ -36,7 +36,7 @@ + } + } + +-#elif defined(OS_LINUX) || defined(OS_AIX) ++#elif defined(OS_LINUX) || defined(OS_AIX) || defined(OS_BSD) + + Semaphore::Semaphore(int count) { + DCHECK_GE(count, 0); Property changes on: head/www/chromium/files/patch-tools_gn_util_semaphore.cc ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/chromium/files/patch-tools_gn_util_semaphore.h =================================================================== --- head/www/chromium/files/patch-tools_gn_util_semaphore.h (nonexistent) +++ head/www/chromium/files/patch-tools_gn_util_semaphore.h (revision 489612) @@ -0,0 +1,20 @@ +--- tools/gn/util/semaphore.h.orig 2018-12-12 23:06:54.000000000 +0100 ++++ tools/gn/util/semaphore.h 2018-12-15 22:00:54.077539000 +0100 +@@ -15,7 +15,7 @@ + #include + #elif defined(OS_MACOSX) + #include +-#elif defined(OS_LINUX) || defined(OS_AIX) ++#elif defined(OS_LINUX) || defined(OS_AIX) || defined(OS_BSD) + #include + #else + #error Port. +@@ -35,7 +35,7 @@ + + #if defined(OS_MACOSX) + typedef semaphore_t NativeHandle; +-#elif defined(OS_LINUX) || defined(OS_AIX) ++#elif defined(OS_LINUX) || defined(OS_AIX) || defined(OS_BSD) + typedef sem_t NativeHandle; + #elif defined(OS_WIN) + typedef HANDLE NativeHandle; Property changes on: head/www/chromium/files/patch-tools_gn_util_semaphore.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/chromium/files/patch-tools_gn_util_ticks.cc =================================================================== --- head/www/chromium/files/patch-tools_gn_util_ticks.cc (nonexistent) +++ head/www/chromium/files/patch-tools_gn_util_ticks.cc (revision 489612) @@ -0,0 +1,38 @@ +--- tools/gn/util/ticks.cc.orig 2018-12-12 23:06:54.000000000 +0100 ++++ tools/gn/util/ticks.cc 2018-12-15 22:06:44.653261000 +0100 +@@ -11,7 +11,7 @@ + #include + #elif defined(OS_MACOSX) + #include +-#elif defined(OS_LINUX) || defined(OS_AIX) ++#elif defined(OS_LINUX) || defined(OS_AIX) || defined(OS_BSD) + #include + #else + #error Port. +@@ -27,7 +27,7 @@ + #elif defined(OS_MACOSX) + mach_timebase_info_data_t g_timebase; + uint64_t g_start; +-#elif defined(OS_LINUX) || defined(OS_AIX) ++#elif defined(OS_LINUX) || defined(OS_AIX) || defined(OS_BSD) + uint64_t g_start; + #else + #error Port. +@@ -44,7 +44,7 @@ + #elif defined(OS_MACOSX) + mach_timebase_info(&g_timebase); + g_start = (mach_absolute_time() * g_timebase.numer) / g_timebase.denom; +-#elif defined(OS_LINUX) || defined(OS_AIX) ++#elif defined(OS_LINUX) || defined(OS_AIX) || defined(OS_BSD) + struct timespec ts; + clock_gettime(CLOCK_MONOTONIC, &ts); + g_start = static_cast(ts.tv_sec) * kNano + +@@ -74,7 +74,7 @@ + #elif defined(OS_MACOSX) + now = + ((mach_absolute_time() * g_timebase.numer) / g_timebase.denom) - g_start; +-#elif defined(OS_LINUX) || defined(OS_AIX) ++#elif defined(OS_LINUX) || defined(OS_AIX) || defined(OS_BSD) + struct timespec ts; + clock_gettime(CLOCK_MONOTONIC, &ts); + now = (static_cast(ts.tv_sec) * kNano + Property changes on: head/www/chromium/files/patch-tools_gn_util_ticks.cc ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/chromium/files/patch-tools_variations_fieldtrial__to__struct.py =================================================================== --- head/www/chromium/files/patch-tools_variations_fieldtrial__to__struct.py (revision 489611) +++ head/www/chromium/files/patch-tools_variations_fieldtrial__to__struct.py (revision 489612) @@ -1,11 +1,10 @@ ---- tools/variations/fieldtrial_to_struct.py.orig 2017-12-15 02:04:51.000000000 +0100 -+++ tools/variations/fieldtrial_to_struct.py 2017-12-24 19:54:09.044002000 +0100 -@@ -117,7 +117,7 @@ - parser.error('You must specify a --platform.') - - supported_platforms = ['android', 'chromeos', 'fuchsia', 'ios', 'linux', -- 'mac', 'win'] -+ 'mac', 'win', 'bsd'] - if opts.platform not in supported_platforms: - parser.error('\'%s\' is an unknown platform. Supported platforms: %s' % - (opts.platform, supported_platforms)) +--- tools/variations/fieldtrial_to_struct.py.orig 2018-12-03 21:18:05.000000000 +0100 ++++ tools/variations/fieldtrial_to_struct.py 2018-12-15 20:10:55.090226000 +0100 +@@ -24,6 +24,7 @@ + _platforms = [ + 'android', + 'android_webview', ++ 'bsd', + 'chromeos', + 'fuchsia', + 'ios', Index: head/www/chromium/files/patch-ui_base_ui__base__features.cc =================================================================== --- head/www/chromium/files/patch-ui_base_ui__base__features.cc (nonexistent) +++ head/www/chromium/files/patch-ui_base_ui__base__features.cc (revision 489612) @@ -0,0 +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) + +-#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 @@ + 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}; + Property changes on: head/www/chromium/files/patch-ui_base_ui__base__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: head/www/chromium/files/patch-ui_base_ui__base__features.h =================================================================== --- head/www/chromium/files/patch-ui_base_ui__base__features.h (nonexistent) +++ head/www/chromium/files/patch-ui_base_ui__base__features.h (revision 489612) @@ -0,0 +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) + +-#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. Property changes on: head/www/chromium/files/patch-ui_base_ui__base__features.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/chromium/files/patch-ui_gfx_font__list.cc =================================================================== --- head/www/chromium/files/patch-ui_gfx_font__list.cc (revision 489611) +++ head/www/chromium/files/patch-ui_gfx_font__list.cc (revision 489612) @@ -1,11 +1,11 @@ ---- ui/gfx/font_list.cc.orig 2017-12-15 02:04:51.000000000 +0100 -+++ ui/gfx/font_list.cc 2017-12-24 20:09:47.066057000 +0100 +--- 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 @@ 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()); + return !!fontManager->legacyMakeTypeface(family.c_str(), SkFontStyle()); #else sk_sp set(fontManager->matchFamily(family.c_str())); Index: head/www/chromium/files/patch-ui_gfx_font__render__params.h =================================================================== --- head/www/chromium/files/patch-ui_gfx_font__render__params.h (revision 489611) +++ head/www/chromium/files/patch-ui_gfx_font__render__params.h (revision 489612) @@ -1,18 +1,18 @@ ---- ui/gfx/font_render_params.h.orig 2017-12-15 02:04:51.000000000 +0100 -+++ ui/gfx/font_render_params.h 2017-12-24 20:14:06.436950000 +0100 -@@ -107,13 +107,13 @@ +--- ui/gfx/font_render_params.h.orig 2018-12-03 21:18:06.000000000 +0100 ++++ ui/gfx/font_render_params.h 2018-12-15 20:21:38.472663000 +0100 +@@ -111,13 +111,13 @@ 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) && BUILDFLAG(ENABLE_VR)) -+#if defined(OS_LINUX) || defined(OS_BSD) || (defined(OS_ANDROID) && BUILDFLAG(ENABLE_VR)) +-#if defined(OS_LINUX) || defined(OS_ANDROID) ++#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) // Gets the device scale factor to query the FontRenderParams. GFX_EXPORT float GetFontRenderParamsDeviceScaleFactor(); Index: head/www/chromium/files/patch-ui_gfx_gpu_memory_buffer.h =================================================================== --- head/www/chromium/files/patch-ui_gfx_gpu_memory_buffer.h (revision 489611) +++ head/www/chromium/files/patch-ui_gfx_gpu_memory_buffer.h (revision 489612) @@ -1,20 +1,20 @@ ---- ui/gfx/gpu_memory_buffer.h.orig 2017-08-02 16:52:58.362137000 +0200 -+++ ui/gfx/gpu_memory_buffer.h 2017-08-02 16:53:34.724326000 +0200 -@@ -16,7 +16,7 @@ +--- 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" -@@ -48,7 +48,7 @@ +@@ -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) - ScopedRefCountedIOSurfaceMachPort mach_port; Index: head/www/chromium/files/patch-ui_gl_BUILD.gn =================================================================== --- head/www/chromium/files/patch-ui_gl_BUILD.gn (revision 489611) +++ head/www/chromium/files/patch-ui_gl_BUILD.gn (revision 489612) @@ -1,30 +1,11 @@ ---- ui/gl/BUILD.gn.orig 2018-08-01 00:09:48.000000000 +0200 -+++ ui/gl/BUILD.gn 2018-08-04 23:32:57.498139000 +0200 -@@ -214,7 +214,7 @@ - } +--- 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 @@ + ] } - 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 -@@ -311,7 +311,6 @@ - data_deps += [ - "//third_party/angle:libEGL", - "//third_party/angle:libGLESv2", -- "//third_party/mesa:osmesa", - "//third_party/swiftshader", - ] - } -@@ -545,10 +544,6 @@ - "//ui/gl/init", - "//ui/platform_window", - "//ui/platform_window:platform_impls", -- ] -- -- data_deps = [ -- "//third_party/mesa:osmesa", - ] - - if (use_x11) { Index: head/www/chromium/files/patch-ui_gl_gl_bindings_autogen_glx.cc =================================================================== --- head/www/chromium/files/patch-ui_gl_gl_bindings_autogen_glx.cc (revision 489611) +++ head/www/chromium/files/patch-ui_gl_gl_bindings_autogen_glx.cc (revision 489612) @@ -1,61 +1,61 @@ ---- ui/gl/gl_bindings_autogen_glx.cc.orig 2018-02-24 16:25:37.000000000 +0100 -+++ ui/gl/gl_bindings_autogen_glx.cc 2018-03-04 04:53:49.532617000 +0100 +--- 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 = - HasExtension(extensions, "GLX_ARB_create_context"); + gfx::HasExtension(extensions, "GLX_ARB_create_context"); + ext.b_GLX_ARB_get_proc_address = -+ HasExtension(extensions, "GLX_ARB_get_proc_address"); - ext.b_GLX_EXT_swap_control = HasExtension(extensions, "GLX_EXT_swap_control"); ++ 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 = - HasExtension(extensions, "GLX_EXT_texture_from_pixmap"); -@@ -142,6 +144,11 @@ +@@ -145,6 +147,11 @@ GetGLProcAddress("glXCreateContextAttribsARB")); } + if (ext.b_GLX_ARB_get_proc_address) { + fn.glXGetProcAddressARBFn = reinterpret_cast( + GetGLProcAddress("glXGetProcAddressARB")); + } + if (ext.b_GLX_SGIX_fbconfig) { fn.glXGetFBConfigFromVisualSGIXFn = reinterpret_cast( -@@ -343,6 +350,10 @@ +@@ -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) { -@@ -643,6 +654,11 @@ +@@ -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) { -@@ -1065,6 +1081,14 @@ +@@ -1068,6 +1084,14 @@ << static_cast(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(procName) << ")"); + __GLXextFuncPtr result = glx_api_->glXGetProcAddressARBFn(procName); GL_SERVICE_LOG("GL_RESULT: " << result); return result; } Index: head/www/chromium/files/patch-ui_gl_gl_fence.cc =================================================================== --- head/www/chromium/files/patch-ui_gl_gl_fence.cc (revision 489611) +++ head/www/chromium/files/patch-ui_gl_gl_fence.cc (revision 489612) @@ -1,11 +1,11 @@ ---- ui/gl/gl_fence.cc.orig 2018-08-04 21:33:30.691170000 +0200 -+++ ui/gl/gl_fence.cc 2018-08-04 21:33:47.409485000 +0200 -@@ -19,7 +19,7 @@ +--- 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_FUCHSIA) && \ -- !defined(OS_MACOSX) -+ !defined(OS_MACOSX) && !defined(OS_FREEBSD) +-#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" Index: head/www/chromium/files/patch-ui_message_center_public_cpp_message_center_constants.h =================================================================== --- head/www/chromium/files/patch-ui_message_center_public_cpp_message_center_constants.h (nonexistent) +++ head/www/chromium/files/patch-ui_message_center_public_cpp_message_center_constants.h (revision 489612) @@ -0,0 +1,11 @@ +--- 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: head/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: head/www/chromium/files/patch-ui_message_center_views_message_popup_view.cc =================================================================== --- head/www/chromium/files/patch-ui_message_center_views_message_popup_view.cc (nonexistent) +++ head/www/chromium/files/patch-ui_message_center_views_message_popup_view.cc (revision 489612) @@ -0,0 +1,11 @@ +--- 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: head/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: head/www/chromium/files/patch-ui_views_bubble_bubble__dialog__delegate__view.cc =================================================================== --- head/www/chromium/files/patch-ui_views_bubble_bubble__dialog__delegate__view.cc (nonexistent) +++ head/www/chromium/files/patch-ui_views_bubble_bubble__dialog__delegate__view.cc (revision 489612) @@ -0,0 +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 @@ + 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); Property changes on: head/www/chromium/files/patch-ui_views_bubble_bubble__dialog__delegate__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: head/www/chromium/files/patch-ui_views_window_frame_background.cc =================================================================== --- head/www/chromium/files/patch-ui_views_window_frame_background.cc (revision 489611) +++ head/www/chromium/files/patch-ui_views_window_frame_background.cc (revision 489612) @@ -1,11 +1,11 @@ ---- ui/views/window/frame_background.cc.orig 2017-09-07 02:06:18.851705000 +0200 -+++ ui/views/window/frame_background.cc 2017-09-07 02:06:40.569927000 +0200 -@@ -173,7 +173,7 @@ - - void FrameBackground::PaintFrameTopArea(gfx::Canvas* canvas, - const View* view) const { +--- 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_; Index: head/www/chromium/pkg-plist =================================================================== --- head/www/chromium/pkg-plist (revision 489611) +++ head/www/chromium/pkg-plist (revision 489612) @@ -1,335 +1,336 @@ bin/chrome %%DATADIR%%/chrome %%DATADIR%%/chrome-wrapper %%DATADIR%%/chrome_100_percent.pak %%DATADIR%%/chrome_200_percent.pak -%%DATADIR%%/font_service.service %%DATADIR%%/headless_lib.pak %%DATADIR%%/icudtl.dat -%%DATADIR%%/keyboard_resources.pak %%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-bottom.png %%DATADIR%%/resources/inspector/Images/accelerometer-front.png %%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_console/browser_console_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_worker.js %%DATADIR%%/resources/inspector/formatter/formatter_module.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%%/libmalloc_wrapper.so +%%DEBUG%%%%DATADIR%%/libtest_shared_library.so %%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 %%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