Index: head/www/chromium/Makefile =================================================================== --- head/www/chromium/Makefile (revision 436364) +++ head/www/chromium/Makefile (revision 436365) @@ -1,282 +1,285 @@ # Created by: Florent Thoumie # $FreeBSD$ PORTNAME= chromium -PORTVERSION= 56.0.2924.87 -PORTREVISION= 2 +PORTVERSION= 57.0.2987.110 CATEGORIES= www MASTER_SITES= http://commondatastorage.googleapis.com/chromium-browser-official/ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} # default, but needed to get distinfo correct if TEST is on MAINTAINER= chromium@FreeBSD.org COMMENT= Google web browser based on WebKit LICENSE= BSD3CLAUSE LGPL21 MPL LICENSE_COMB= multi BUILD_DEPENDS= gperf:devel/gperf \ clang39:devel/llvm39 \ yasm:devel/yasm \ python:lang/python \ ffmpeg>=3.2.2,1:multimedia/ffmpeg \ bash:shells/bash \ flock:sysutils/flock \ ${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat \ ${LOCALBASE}/share/usbids/usb.ids:misc/usbids \ ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2 \ ${PYTHON_PKGNAMEPREFIX}ply>0:devel/py-ply \ ${PYTHON_PKGNAMEPREFIX}html5lib>0:www/py-html5lib LIB_DEPENDS= libspeechd.so:accessibility/speech-dispatcher \ libsnappy.so:archivers/snappy \ libFLAC.so:audio/flac \ 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 \ libcups.so:print/cups \ libfreetype.so:print/freetype2 \ libharfbuzz.so:print/harfbuzz \ libgcrypt.so:security/libgcrypt \ libgnome-keyring.so:security/libgnome-keyring \ libnss3.so:security/nss \ libexpat.so:textproc/expat2 \ libxml2.so:textproc/libxml2 \ libfontconfig.so:x11-fonts/fontconfig RUN_DEPENDS= xdg-open:devel/xdg-utils \ droid-fonts-ttf>0:x11-fonts/droid-fonts-ttf ONLY_FOR_ARCHS= i386 amd64 USES= compiler bison cpe desktop-file-utils execinfo jpeg \ ninja perl5 pkgconfig python:2,build shebangfix tar:xz CPE_VENDOR= google CPE_PRODUCT= chrome USE_PERL5= build USE_XORG= scrnsaverproto x11 xcb xcomposite xcursor xext xdamage xfixes xi \ xproto xrandr xrender xscrnsaver xtst USE_GNOME= atk glib20 gtk20 gtk30 dconf libxslt libxml2 MAKE_ARGS= -C out/${BUILDTYPE} SHEBANG_FILES= chrome/tools/build/linux/chrome-wrapper ALL_TARGET= chrome INSTALLS_ICONS= yes # 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+= is_clang=true \ clang_use_chrome_plugins=false \ enable_media_router=true \ enable_nacl=false \ enable_one_click_signin=true \ enable_remoting=false \ enable_webrtc=false \ + fieldtrial_testing_like_official_build=true \ toolkit_views=true \ use_allocator="none" \ use_aura=true \ use_experimental_allocator_shim=true \ treat_warnings_as_errors=false \ use_sysroot=false \ use_system_libjpeg=true \ use_system_sqlite=false # chrome has additional patches # TODO: investigate building with these options: # use_system_icu use_system_harfbuzz use_system_minigbm GN_BOOTSTRAP_FLAGS= --no-clean --no-rebuild # 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" SUB_FILES= chromium-browser.desktop chrome SUB_LIST+= COMMENT="${COMMENT}" OPTIONS_DEFINE= CODECS GCONF KERBEROS DRIVER CODECS_DESC= Compile and enable patented codecs like H.264 DRIVER_DESC= Install chromedriver OPTIONS_GROUP= AUDIO TESTS OPTIONS_GROUP_AUDIO= ALSA PULSEAUDIO OPTIONS_GROUP_TESTS= DEBUG TEST OPTIONS_DEFAULT= ALSA CODECS DRIVER GCONF KERBEROS OPTIONS_SUB= yes GCONF_USE= GNOME=gconf2 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 PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio DRIVER_MAKE_ARGS=chromedriver TEST_DISTFILES= ${PORTNAME}-${DISTVERSION}-testdata${EXTRACT_SUFX} .include .if ${PORT_OPTIONS:MALSA} GN_ARGS+= use_alsa=true .else GN_ARGS+= use_alsa=false .endif .if ${PORT_OPTIONS:MCODECS} GN_ARGS+= ffmpeg_branding="Chrome" GN_ARGS+= proprietary_codecs=true GN_ARGS+= enable_hevc_demuxing=true .else GN_ARGS+= ffmpeg_branding="Chromium" GN_ARGS+= proprietary_codecs=false GN_ARGS+= enable_hevc_demuxing=false .endif DEBUG_MAKE_ENV= V=1 .if ${PORT_OPTIONS:MDEBUG} BUILDTYPE= Debug GN_ARGS+= is_debug=true GN_BOOTSTRAP_FLAGS+= --debug #GN_ARGS+= is_component_build=true .else BUILDTYPE= Release .if ${ARCH} == amd64 GN_ARGS+= use_lld=true # harder, better, faster, stronger .endif GN_ARGS+= is_debug=false GN_ARGS+= symbol_level=0 GN_ARGS+= remove_webcore_debug_symbols=true .endif .if ${PORT_OPTIONS:MGCONF} GN_ARGS+= use_gconf=true .else GN_ARGS+= use_gconf=false .endif .if ${PORT_OPTIONS:MKERBEROS} GN_ARGS+= use_kerberos=true .else GN_ARGS+= use_kerberos=false .endif .if ${PORT_OPTIONS:MPULSEAUDIO} GN_ARGS+= use_pulseaudio=true .else GN_ARGS+= use_pulseaudio=false .endif .if ${PORT_OPTIONS:MTEST} .include "Makefile.tests" ALL_TARGET+= ${TEST_TARGETS} .endif .include CC= clang39 CXX= clang++39 #optionally set AR, LD, NM, READELF ? # 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 # TODO: move this big extra to small ones EXTRA_PATCHES+= ${FILESDIR}/extra-patch-clang .if ${OPSYS} == FreeBSD .if ${OSVERSION} < 1100000 EXTRA_PATCHES+= ${FILESDIR}/extra-patch-10 .endif -.if ${OSVERSION} >= 1200017 || (${OSVERSION} >= 1100508 && ${OSVERSION} < 1200000) -EXTRA_PATCHES+= ${FILESDIR}/extra-patch-libc++-new -.else -EXTRA_PATCHES+= ${FILESDIR}/extra-patch-libc++-old +# Work around base r261801 +.if ${OSVERSION} < 1100508 +GN_ARGS+= extra_cxxflags="-D_LIBCPP_TRIVIAL_PAIR_COPY_CTOR=1" .endif .endif pre-everything:: @${ECHO_MSG} @${ECHO_MSG} "To build Chromium, you should have around 2GB of memory," .if ${PORT_OPTIONS:MDEBUG} @${ECHO_MSG} "lots of free diskspace (~ 40GB)" @${ECHO_MSG} "and no less then 16GB of memory for linking." .else @${ECHO_MSG} "and a fair amount of free diskspace (~ 3.7GB)." .endif @${ECHO_MSG} @${ECHO_MSG} "Make sure you have Python build with the SEM option ON" @${ECHO_MSG} "(default in python27-2.7.8 since r361735)" @${ECHO_MSG} pre-configure: # We used to remove bundled libraries to be sure that chromium uses # system libraries and not shippen ones. # cd ${WRKSRC} && ${PYTHON_CMD} \ #./build/linux/unbundle/remove_bundled_libraries.py [list of preserved] cd ${WRKSRC} && ${PYTHON_CMD} \ ./build/linux/unbundle/replace_gn_files.py --system-libraries \ ffmpeg flac harfbuzz-ng libwebp libxml libxslt snappy yasm || ${FALSE} do-configure: # GN generator bootstrapping and generating ninja files cd ${WRKSRC} && ${SETENV} CC=${CC} CXX=${CXX} LD=${CXX} \ READELF=${READELF} AR=${AR} NM=${NM} ${PYTHON_CMD} \ ./tools/gn/bootstrap/bootstrap.py ${GN_BOOTSTRAP_FLAGS} cd ${WRKSRC} && ${SETENV} ./out/${BUILDTYPE}/gn \ gen --args='${GN_ARGS}' out/${BUILDTYPE} test regression-test: build .for t in ${TEST_TARGETS} cd ${WRKSRC}/out/${BUILDTYPE} && ${SETENV} LC_ALL=en_US.UTF-8 \ ./${t} --gtest_filter=-${EXCLUDE_${t}:ts:} || ${TRUE} .endfor do-install: @${MKDIR} ${STAGEDIR}${DATADIR} ${INSTALL_MAN} ${WRKSRC}/out/${BUILDTYPE}/chrome.1 ${STAGEDIR}${MANPREFIX}/man/man1 +.for t in font_service ui + ${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/${t}.service \ + ${STAGEDIR}${DATADIR} +.endfor .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_SCRIPT} ${WRKSRC}/chrome/tools/build/linux/chrome-wrapper \ ${STAGEDIR}${DATADIR} -.for p in chrome_100_percent chrome_200_percent keyboard_resources resources \ - mus_app_resources_100 mus_app_resources_200 mus_app_resources_strings \ +.for p in chrome_100_percent chrome_200_percent headless_lib keyboard_resources \ + resources mus_app_resources_100 mus_app_resources_200 mus_app_resources_strings \ views_mus_resources ${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/${p}.pak \ ${STAGEDIR}${DATADIR} .endfor .for d in icudtl.dat natives_blob.bin snapshot_blob.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_PROGRAM} ${WRKSRC}/out/${BUILDTYPE}/mksnapshot \ ${STAGEDIR}${DATADIR} .if ${PORT_OPTIONS:MDRIVER} ${INSTALL_PROGRAM} ${WRKSRC}/out/${BUILDTYPE}/chromedriver \ ${STAGEDIR}${PREFIX}/bin .endif .include Index: head/www/chromium/distinfo =================================================================== --- head/www/chromium/distinfo (revision 436364) +++ head/www/chromium/distinfo (revision 436365) @@ -1,5 +1,5 @@ -TIMESTAMP = 1486036781 -SHA256 (chromium-56.0.2924.87.tar.xz) = 9aac081ffccaae6497068100477a4e6ac7086bd15ad3c3cd009b9a760b7a53e0 -SIZE (chromium-56.0.2924.87.tar.xz) = 514429808 -SHA256 (chromium-56.0.2924.87-testdata.tar.xz) = 2dea413379e4eccd351bb50cede549e9a8c4fbd897f6a8b03442c7a9b57d6b55 -SIZE (chromium-56.0.2924.87-testdata.tar.xz) = 123553884 +TIMESTAMP = 1489743061 +SHA256 (chromium-57.0.2987.110.tar.xz) = 6a03a290b313c5d8bb89891bfc816c61c798e6c96eaa62fb254d77ce9c2b89e4 +SIZE (chromium-57.0.2987.110.tar.xz) = 525293172 +SHA256 (chromium-57.0.2987.110-testdata.tar.xz) = 8f8b768190da7cea9365816443b0b98811cf7da939eed0752092d30b2d51752e +SIZE (chromium-57.0.2987.110-testdata.tar.xz) = 124084508 Index: head/www/chromium/files/patch-chrome_browser_ui_views_app__list_linux_app__list__linux.cc =================================================================== --- head/www/chromium/files/patch-chrome_browser_ui_views_app__list_linux_app__list__linux.cc (revision 436364) +++ head/www/chromium/files/patch-chrome_browser_ui_views_app__list_linux_app__list__linux.cc (nonexistent) @@ -1,11 +0,0 @@ ---- chrome/browser/ui/views/app_list/linux/app_list_linux.cc.orig 2017-02-02 02:02:50 UTC -+++ chrome/browser/ui/views/app_list/linux/app_list_linux.cc -@@ -91,7 +91,7 @@ void AppListLinux::MoveNearCursor(app_li - view->SetBubbleArrow(views::BubbleBorder::FLOAT); - - AppListPositioner::ScreenEdge edge; --#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) - // In the Unity desktop environment, special case SCREEN_EDGE_LEFT. It is - // always on the left side in Unity, but ShelfLocationInDisplay will not - // detect this if the shelf is hidden. Property changes on: head/www/chromium/files/patch-chrome_browser_ui_views_app__list_linux_app__list__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_webrtc_base_linux.h =================================================================== --- head/www/chromium/files/patch-third__party_webrtc_base_linux.h (revision 436364) +++ head/www/chromium/files/patch-third__party_webrtc_base_linux.h (nonexistent) @@ -1,18 +0,0 @@ ---- third_party/webrtc/base/linux.h.orig 2017-01-26 00:50:17 UTC -+++ third_party/webrtc/base/linux.h -@@ -11,7 +11,7 @@ - #ifndef WEBRTC_BASE_LINUX_H_ - #define WEBRTC_BASE_LINUX_H_ - --#if defined(WEBRTC_LINUX) -+#if defined(WEBRTC_LINUX) || defined(WEBRTC_BSD) - #include - #include - #include -@@ -114,5 +114,5 @@ int ReadCpuMaxFreq(); - - } // namespace rtc - --#endif // defined(WEBRTC_LINUX) -+#endif // defined(WEBRTC_LINUX) || defined(WEBRTC_BSD) - #endif // WEBRTC_BASE_LINUX_H_ Property changes on: head/www/chromium/files/patch-third__party_webrtc_base_linux.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/www/chromium/files/patch-third__party_webrtc_base_linux.cc =================================================================== --- head/www/chromium/files/patch-third__party_webrtc_base_linux.cc (revision 436364) +++ head/www/chromium/files/patch-third__party_webrtc_base_linux.cc (nonexistent) @@ -1,17 +0,0 @@ ---- third_party/webrtc/base/linux.cc.orig 2017-01-26 00:50:17 UTC -+++ third_party/webrtc/base/linux.cc -@@ -8,7 +8,7 @@ - * be found in the AUTHORS file in the root of the source tree. - */ - --#if defined(WEBRTC_LINUX) -+#if defined(WEBRTC_LINUX) || defined(WEBRTC_BSD) - #include "webrtc/base/linux.h" - - #include -@@ -261,4 +261,4 @@ int ReadCpuMaxFreq() { - - } // namespace rtc - --#endif // defined(WEBRTC_LINUX) -+#endif // defined(WEBRTC_LINUX) || defined(WEBRTC_BSD) Property changes on: head/www/chromium/files/patch-third__party_webrtc_base_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-ash_shell.cc =================================================================== --- head/www/chromium/files/patch-ash_shell.cc (revision 436364) +++ head/www/chromium/files/patch-ash_shell.cc (nonexistent) @@ -1,11 +0,0 @@ ---- ash/shell.cc.orig 2017-01-26 00:49:07 UTC -+++ ash/shell.cc -@@ -579,7 +579,7 @@ void Shell::Init(const ShellInitParams& - - immersive_handler_factory_ = base::MakeUnique(); - --#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) - NOTREACHED() << "linux desktop does not support ash."; - #endif - Property changes on: head/www/chromium/files/patch-ash_shell.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_pepper_pepper__media__device__manager.cc =================================================================== --- head/www/chromium/files/patch-content_renderer_pepper_pepper__media__device__manager.cc (revision 436364) +++ head/www/chromium/files/patch-content_renderer_pepper_pepper__media__device__manager.cc (nonexistent) @@ -1,15 +0,0 @@ ---- content/renderer/pepper/pepper_media_device_manager.cc.orig 2017-02-02 02:02:54 UTC -+++ content/renderer/pepper/pepper_media_device_manager.cc -@@ -89,9 +89,9 @@ void PepperMediaDeviceManager::Enumerate - callback, ToMediaDeviceType(type))); - #else - base::ThreadTaskRunnerHandle::Get()->PostTask( -- FROM_HERE, -- base::Bind(&PepperMediaDeviceManager::DevicesEnumerated, AsWeakPtr(), -- callback, ToMediaDeviceType(type), MediaDeviceInfoArray())); -+ FROM_HERE, base::Bind(&PepperMediaDeviceManager::DevicesEnumerated, -+ AsWeakPtr(), callback, ToMediaDeviceType(type), -+ std::vector())); - #endif - } - Property changes on: head/www/chromium/files/patch-content_renderer_pepper_pepper__media__device__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-services_ui_surfaces_surfaces__context__provider.cc =================================================================== --- head/www/chromium/files/patch-services_ui_surfaces_surfaces__context__provider.cc (revision 436364) +++ head/www/chromium/files/patch-services_ui_surfaces_surfaces__context__provider.cc (nonexistent) @@ -1,11 +0,0 @@ ---- services/ui/surfaces/surfaces_context_provider.cc.orig 2017-02-02 02:02:57 UTC -+++ services/ui/surfaces/surfaces_context_provider.cc -@@ -78,7 +78,7 @@ bool SurfacesContextProvider::BindToCurr - gpu::CommandBuffer* command_buffer = command_buffer_proxy_impl_.get(); - - gles2_helper_.reset(new gpu::gles2::GLES2CmdHelper(command_buffer)); -- constexpr gpu::SharedMemoryLimits default_limits; -+ constexpr gpu::SharedMemoryLimits default_limits = gpu::SharedMemoryLimits(); - if (!gles2_helper_->Initialize(default_limits.command_buffer_size)) - return false; - gles2_helper_->SetAutomaticFlushes(false); Property changes on: head/www/chromium/files/patch-services_ui_surfaces_surfaces__context__provider.cc ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/www/chromium/files/extra-patch-libc++-new =================================================================== --- head/www/chromium/files/extra-patch-libc++-new (revision 436364) +++ head/www/chromium/files/extra-patch-libc++-new (nonexistent) @@ -1,14 +0,0 @@ ---- services/ui/ws/BUILD.gn.orig 2016-12-09 17:47:26.343517000 +0000 -+++ services/ui/ws/BUILD.gn 2016-12-09 17:48:45.323876000 +0000 -@@ -103,6 +103,11 @@ - "window_tree_host_factory.h", - ] - -+ # Work around base r261801 -+ if (is_bsd) { -+ defines = ["_LIBCPP_ABI_UNSTABLE=1"] -+ } -+ - deps = [ - # TODO(sad): Temporary, until the GPU process is split out of ws. - "//services/ui/gpu", Property changes on: head/www/chromium/files/extra-patch-libc++-new ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,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_child__process__launcher.cc =================================================================== --- head/www/chromium/files/patch-content_browser_child__process__launcher.cc (revision 436364) +++ head/www/chromium/files/patch-content_browser_child__process__launcher.cc (nonexistent) @@ -1,47 +0,0 @@ ---- content/browser/child_process_launcher.cc.orig 2017-01-26 00:49:13 UTC -+++ content/browser/child_process_launcher.cc -@@ -249,7 +249,7 @@ void LaunchOnLauncherThread(const Notify - // We need to close the client end of the IPC channel to reliably detect - // child termination. - --#if !defined(OS_MACOSX) -+#if !defined(OS_MACOSX) && !defined(OS_BSD) - ZygoteHandle* zygote_handle = - !base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kNoZygote) - ? delegate->GetZygote() -@@ -267,7 +267,7 @@ void LaunchOnLauncherThread(const Notify - process = base::Process(handle); - } else - // Fall through to the normal posix case below when we're not zygoting. --#endif // !defined(OS_MACOSX) -+#endif // !defined(OS_MACOSX) && !defined(OS_BSD) - { - // Convert FD mapping to FileHandleMappingVector - base::FileHandleMappingVector fds_to_map = -@@ -358,7 +358,7 @@ void TerminateOnLauncherThread(ZygoteHan - process.Terminate(RESULT_CODE_NORMAL_EXIT, false); - // On POSIX, we must additionally reap the child. - #if defined(OS_POSIX) --#if !defined(OS_MACOSX) -+#if !defined(OS_MACOSX) && !defined(OS_BSD) - if (zygote) { - // If the renderer was created via a zygote, we have to proxy the reaping - // through the zygote process. -@@ -475,7 +475,7 @@ void ChildProcessLauncher::Launch(Sandbo - - void ChildProcessLauncher::UpdateTerminationStatus(bool known_dead) { - DCHECK(CalledOnValidThread()); --#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) -+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD) - if (zygote_) { - termination_status_ = zygote_->GetTerminationStatus( - process_.Handle(), known_dead, &exit_code_); -@@ -549,7 +549,7 @@ void ChildProcessLauncher::Notify(Zygote - mojo_child_token_, process_error_callback_); - } - --#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) -+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD) - zygote_ = zygote; - #endif - if (process_.IsValid()) { Property changes on: head/www/chromium/files/patch-content_browser_child__process__launcher.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_app__list_views_app__list__view.cc =================================================================== --- head/www/chromium/files/patch-ui_app__list_views_app__list__view.cc (revision 436364) +++ head/www/chromium/files/patch-ui_app__list_views_app__list__view.cc (nonexistent) @@ -1,20 +0,0 @@ ---- ui/app_list/views/app_list_view.cc.orig 2017-01-26 00:49:31 UTC -+++ ui/app_list/views/app_list_view.cc -@@ -70,7 +70,7 @@ const int kArrowOffset = 10; - - // Determines whether the current environment supports shadows bubble borders. - bool SupportsShadow() { --#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) - // Shadows are not supported on (non-ChromeOS) Linux. - return false; - #endif -@@ -538,7 +538,7 @@ void AppListView::OnBeforeBubbleWidgetIn - if (!params->native_widget && delegate_ && delegate_->ForceNativeDesktop()) - params->native_widget = new views::DesktopNativeWidgetAura(widget); - #endif --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) - // Set up a custom WM_CLASS for the app launcher window. This allows task - // switchers in X11 environments to distinguish it from main browser windows. - params->wm_class_name = kAppListWMClass; Property changes on: head/www/chromium/files/patch-ui_app__list_views_app__list__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-chrome_browser_extensions_api_omnibox_omnibox__api.cc =================================================================== --- head/www/chromium/files/patch-chrome_browser_extensions_api_omnibox_omnibox__api.cc (revision 436364) +++ head/www/chromium/files/patch-chrome_browser_extensions_api_omnibox_omnibox__api.cc (nonexistent) @@ -1,11 +0,0 @@ ---- chrome/browser/extensions/api/omnibox/omnibox_api.cc.orig 2017-01-26 00:49:08 UTC -+++ chrome/browser/extensions/api/omnibox/omnibox_api.cc -@@ -45,7 +45,7 @@ const char kBackgroundTabDisposition[] = - // Pref key for omnibox.setDefaultSuggestion. - const char kOmniboxDefaultSuggestion[] = "omnibox_default_suggestion"; - --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) - static const int kOmniboxIconPaddingLeft = 2; - static const int kOmniboxIconPaddingRight = 2; - #elif defined(OS_MACOSX) Property changes on: head/www/chromium/files/patch-chrome_browser_extensions_api_omnibox_omnibox__api.cc ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/www/chromium/files/extra-patch-libc++-old =================================================================== --- head/www/chromium/files/extra-patch-libc++-old (revision 436364) +++ head/www/chromium/files/extra-patch-libc++-old (nonexistent) @@ -1,14 +0,0 @@ ---- services/ui/ws/BUILD.gn.orig 2016-12-09 17:47:26.343517000 +0000 -+++ services/ui/ws/BUILD.gn 2016-12-09 17:50:06.387679000 +0000 -@@ -103,6 +103,11 @@ - "window_tree_host_factory.h", - ] - -+ # Work around base r261801 -+ if (is_bsd) { -+ defines = ["_LIBCPP_TRIVIAL_PAIR_COPY_CTOR=1"] -+ } -+ - deps = [ - # TODO(sad): Temporary, until the GPU process is split out of ws. - "//services/ui/gpu", Property changes on: head/www/chromium/files/extra-patch-libc++-old ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,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_ui_public_cpp_gles2__context.cc =================================================================== --- head/www/chromium/files/patch-services_ui_public_cpp_gles2__context.cc (revision 436364) +++ head/www/chromium/files/patch-services_ui_public_cpp_gles2__context.cc (nonexistent) @@ -1,11 +0,0 @@ ---- services/ui/public/cpp/gles2_context.cc.orig 2017-02-02 02:02:57 UTC -+++ services/ui/public/cpp/gles2_context.cc -@@ -46,7 +46,7 @@ bool GLES2Context::Initialize( - gpu::CommandBuffer* command_buffer = command_buffer_proxy_impl_.get(); - gpu::GpuControl* gpu_control = command_buffer_proxy_impl_.get(); - -- constexpr gpu::SharedMemoryLimits default_limits; -+ constexpr gpu::SharedMemoryLimits default_limits = gpu::SharedMemoryLimits(); - gles2_helper_.reset(new gpu::gles2::GLES2CmdHelper(command_buffer)); - if (!gles2_helper_->Initialize(default_limits.command_buffer_size)) - return false; Property changes on: head/www/chromium/files/patch-services_ui_public_cpp_gles2__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-third__party_webrtc_base_systeminfo.cc =================================================================== --- head/www/chromium/files/patch-third__party_webrtc_base_systeminfo.cc (revision 436364) +++ head/www/chromium/files/patch-third__party_webrtc_base_systeminfo.cc (nonexistent) @@ -1,40 +0,0 @@ ---- third_party/webrtc/base/systeminfo.cc.orig 2017-01-26 00:50:17 UTC -+++ third_party/webrtc/base/systeminfo.cc -@@ -20,8 +20,12 @@ - #elif defined(WEBRTC_MAC) && !defined(WEBRTC_IOS) - #include - #include --#elif defined(WEBRTC_LINUX) -+#elif defined(WEBRTC_LINUX) || defined(WEBRTC_BSD) - #include -+#if defined(WEBRTC_BSD) -+#include -+#include -+#endif - #endif - #if defined(WEBRTC_MAC) - #include -@@ -66,7 +70,7 @@ static int DetectNumberOfCores() { - SYSTEM_INFO si; - GetSystemInfo(&si); - number_of_cores = static_cast(si.dwNumberOfProcessors); --#elif defined(WEBRTC_LINUX) || defined(WEBRTC_ANDROID) -+#elif defined(WEBRTC_LINUX) || defined(WEBRTC_ANDROID) || defined(WEBRTC_BSD) - number_of_cores = static_cast(sysconf(_SC_NPROCESSORS_ONLN)); - #elif defined(WEBRTC_MAC) - int name[] = {CTL_HW, HW_AVAILCPU}; -@@ -174,9 +178,13 @@ int64_t SystemInfo::GetMemorySize() { - LOG_GLE(LS_WARNING) << "GlobalMemoryStatusEx failed."; - } - --#elif defined(WEBRTC_MAC) -+#elif defined(WEBRTC_MAC) || defined(WEBRTC_BSD) - size_t len = sizeof(memory); -+ #if defined(WEBRTC_MAC) - int error = sysctlbyname("hw.memsize", &memory, &len, NULL, 0); -+ #else -+ int error = sysctlbyname("hw.physmem", &memory, &len, NULL, 0); -+ #endif - if (error || memory == 0) - memory = -1; - #elif defined(WEBRTC_LINUX) Property changes on: head/www/chromium/files/patch-third__party_webrtc_base_systeminfo.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/extra-patch-clang =================================================================== --- head/www/chromium/files/extra-patch-clang (revision 436364) +++ head/www/chromium/files/extra-patch-clang (revision 436365) @@ -1,143 +1,111 @@ --- base/strings/safe_sprintf_unittest.cc.orig 2016-10-06 04:02:08.000000000 +0300 +++ base/strings/safe_sprintf_unittest.cc 2016-10-25 21:42:28.951114000 +0300 @@ -728,6 +728,7 @@ } TEST(SafeSPrintfTest, EmitNULL) { +/* Avoid compiler error: http://pastebin.com/1edWUE84 char buf[40]; #if defined(__GNUC__) #pragma GCC diagnostic push @@ -739,6 +740,7 @@ EXPECT_EQ("0x0", std::string(buf)); EXPECT_EQ(6, SafeSPrintf(buf, "%s", NULL)); EXPECT_EQ("", std::string(buf)); +*/ #if defined(__GCC__) #pragma GCC diagnostic pop #endif --- base/threading/thread_local_storage_unittest.cc 2015-04-15 00:18:48.000000000 +0200 +++ base/threading/thread_local_storage_unittest.cc 2015-04-18 21:45:40.000000000 +0200 @@ -60,7 +60,7 @@ void ThreadLocalStorageCleanup(void *value) { int *ptr = reinterpret_cast(value); // Destructors should never be called with a NULL. - ASSERT_NE(reinterpret_cast(NULL), ptr); + ASSERT_NE(static_cast(NULL), ptr); if (*ptr == kFinalTlsValue) return; // We've been called enough times. ASSERT_LT(kFinalTlsValue, *ptr); ---- base/tracked_objects.cc 2015-04-15 00:31:20.000000000 +0200 -+++ base/tracked_objects.cc 2015-04-18 21:57:33.000000000 +0200 -@@ -425,7 +425,7 @@ - } - // We must NOT do any allocations during this callback. - // Using the simple linked lists avoids all allocations. -- DCHECK_EQ(this->next_retired_worker_, reinterpret_cast(NULL)); -+ DCHECK_EQ(this->next_retired_worker_, static_cast(NULL)); - this->next_retired_worker_ = first_retired_worker_; - first_retired_worker_ = this; - } --- base/tracked_objects_unittest.cc.orig 2015-08-22 15:01:51.000000000 -0400 +++ base/tracked_objects_unittest.cc 2015-09-03 09:20:53.370191000 -0400 @@ -58,9 +58,9 @@ Births* birth = ThreadData::TallyABirthIfActive(location); if (ThreadData::status() == ThreadData::DEACTIVATED) - EXPECT_EQ(reinterpret_cast(NULL), birth); + EXPECT_EQ(static_cast(NULL), birth); else - EXPECT_NE(reinterpret_cast(NULL), birth); + EXPECT_NE(static_cast(NULL), birth); } // Helper function to verify the most common test expectations. --- media/audio/audio_output_proxy_unittest.cc 2015-04-15 00:18:55.000000000 +0200 +++ media/audio/audio_output_proxy_unittest.cc 2015-04-18 22:02:38.000000000 +0200 @@ -387,7 +387,7 @@ // |stream| is closed at this point. Start() should reopen it again. EXPECT_CALL(manager(), MakeAudioOutputStream(_, _)) .Times(2) - .WillRepeatedly(Return(reinterpret_cast(NULL))); + .WillRepeatedly(Return(static_cast(NULL))); EXPECT_CALL(callback_, OnError(_)) .Times(2); ---- third_party/hunspell/src/hunspell/affentry.hxx.orig 2015-07-21 18:46:37.322427000 -0400 -+++ third_party/hunspell/src/hunspell/affentry.hxx 2015-07-21 18:48:02.034251000 -0400 -@@ -27,7 +27,7 @@ - struct hentry * checkword(const char * word, int len, char in_compound, - const FLAG needflag = FLAG_NULL); - -- struct hentry * check_twosfx(const char * word, int len, char in_compound, const FLAG needflag = NULL); -+ struct hentry * check_twosfx(const char * word, int len, char in_compound, const FLAG needflag = 0); - - char * check_morph(const char * word, int len, char in_compound, - const FLAG needflag = FLAG_NULL); -@@ -90,7 +90,7 @@ - // const FLAG cclass = FLAG_NULL, const FLAG needflag = FLAG_NULL, char in_compound=IN_CPD_NOT); - const FLAG cclass = FLAG_NULL, const FLAG needflag = FLAG_NULL, const FLAG badflag = 0); - -- struct hentry * check_twosfx(const char * word, int len, int optflags, PfxEntry* ppfx, const FLAG needflag = NULL); -+ struct hentry * check_twosfx(const char * word, int len, int optflags, PfxEntry* ppfx, const FLAG needflag = 0); - - char * check_twosfx_morph(const char * word, int len, int optflags, - PfxEntry* ppfx, const FLAG needflag = FLAG_NULL); --- third_party/sfntly/src/cpp/src/sfntly/table/core/cmap_table.cc 2015-04-15 00:31:48.000000000 +0200 +++ third_party/sfntly/src/cpp/src/sfntly/table/core/cmap_table.cc 2015-04-18 22:05:41.000000000 +0200 @@ -439,7 +439,7 @@ } CMapTable::CMapFormat0::Builder::Builder(const CMapId& cmap_id) - : CMap::Builder(reinterpret_cast(NULL), + : CMap::Builder(static_cast(NULL), CMapFormat::kFormat0, cmap_id) { } @@ -563,7 +563,7 @@ : CMapTable::CMap::Builder(data ? down_cast( data->Slice(offset, data->ReadUShort( offset + Offset::kFormat0Length))) - : reinterpret_cast(NULL), + : static_cast(NULL), CMapFormat::kFormat2, cmap_id) { // TODO(arthurhsu): FIXIT: heavy lifting and leak, need fix. } @@ -574,7 +574,7 @@ : CMapTable::CMap::Builder(data ? down_cast( data->Slice(offset, data->ReadUShort( offset + Offset::kFormat0Length))) - : reinterpret_cast(NULL), + : static_cast(NULL), CMapFormat::kFormat2, cmap_id) { // TODO(arthurhsu): FIXIT: heavy lifting and leak, need fix. } @@ -958,7 +958,7 @@ CMapTable::CMapFormat4::Builder::Builder(SegmentList* segments, IntegerList* glyph_id_array, const CMapId& cmap_id) - : CMap::Builder(reinterpret_cast(NULL), + : CMap::Builder(static_cast(NULL), CMapFormat::kFormat4, cmap_id), segments_(segments->begin(), segments->end()), glyph_id_array_(glyph_id_array->begin(), glyph_id_array->end()) { @@ -966,7 +966,7 @@ } CMapTable::CMapFormat4::Builder::Builder(const CMapId& cmap_id) - : CMap::Builder(reinterpret_cast(NULL), + : CMap::Builder(static_cast(NULL), CMapFormat::kFormat4, cmap_id) { } ---- third_party/webrtc/base/taskrunner.cc 2015-04-15 00:32:17.000000000 +0200 -+++ third_party/webrtc/base/taskrunner.cc 2015-04-18 22:10:53.000000000 +0200 -@@ -102,7 +102,7 @@ +--- third_party/webrtc/base/taskrunner.cc.orig 2017-03-09 21:05:29.000000000 +0100 ++++ third_party/webrtc/base/taskrunner.cc 2017-03-10 13:19:54.203141000 +0100 +@@ -96,7 +96,7 @@ std::vector::iterator it; it = std::remove(tasks_.begin(), tasks_.end(), - reinterpret_cast(NULL)); + static_cast(NULL)); - + tasks_.erase(it, tasks_.end()); - Index: head/www/chromium/files/patch-BUILD.gn =================================================================== --- head/www/chromium/files/patch-BUILD.gn (revision 436364) +++ head/www/chromium/files/patch-BUILD.gn (revision 436365) @@ -1,173 +1,173 @@ ---- BUILD.gn.orig 2017-01-26 00:49:06 UTC +--- BUILD.gn.orig 2017-03-09 20:04:26 UTC +++ BUILD.gn -@@ -217,7 +217,7 @@ group("both_gn_and_gyp") { +@@ -221,7 +221,7 @@ group("both_gn_and_gyp") { ] } - if (!is_ios && !is_android && !is_chromecast) { + if (!is_ios && !is_android && !is_bsd && !is_chromecast) { deps += [ "//chrome", "//chrome/test:browser_tests", -@@ -277,7 +277,7 @@ group("both_gn_and_gyp") { +@@ -281,7 +281,7 @@ group("both_gn_and_gyp") { ] } - if (!is_ios) { + if (!is_ios && !is_bsd) { # TODO(GYP): Figure out which of these should actually build on iOS, # and whether there should be other targets that are iOS-only and missing. deps += [ -@@ -320,7 +320,7 @@ group("both_gn_and_gyp") { +@@ -325,7 +325,7 @@ group("both_gn_and_gyp") { "//ui/touch_selection:ui_touch_selection_unittests", "//url/ipc:url_ipc_unittests", ] - } else { + } else if (!is_bsd) { deps += [ "//ios:all" ] } -@@ -488,7 +488,7 @@ group("both_gn_and_gyp") { +@@ -495,7 +495,7 @@ group("both_gn_and_gyp") { ] } - if (is_linux) { + if (is_linux || is_bsd) { # The following are definitely linux-only. deps += [ "//chrome:manpage", -@@ -515,9 +515,16 @@ group("both_gn_and_gyp") { +@@ -518,9 +518,16 @@ group("both_gn_and_gyp") { # TODO(dpranke): add the linux_dump_symbols flag? deps += [ "//chrome:linux_symbols" ] } + + if (is_bsd) { + deps -= [ + "//sandbox/linux:chrome_sandbox", + "//sandbox/linux:sandbox_linux_unittests", + ] + } } - if (is_ios || is_win || (is_linux && !is_chromeos)) { + if (is_ios || is_win || is_bsd || (is_linux && !is_chromeos)) { deps += [ "//base:base_i18n_perftests", "//base:base_perftests", -@@ -588,7 +595,7 @@ group("both_gn_and_gyp") { +@@ -592,7 +599,7 @@ group("both_gn_and_gyp") { if (enable_nacl) { deps += [ "//components/nacl/loader:nacl_loader_unittests" ] - if (is_linux) { + if (is_linux || is_bsd) { # TODO(dpranke): Figure out what platforms should actually have this. deps += [ "//components/nacl/loader:nacl_helper" ] -@@ -698,7 +705,7 @@ group("both_gn_and_gyp") { +@@ -700,7 +707,7 @@ group("both_gn_and_gyp") { deps += [ "//chrome/installer/mini_installer:next_version_mini_installer" ] } - } else if (!is_android && !is_ios) { + } else if (!is_android && !is_ios && !is_bsd) { deps += [ "//breakpad:symupload($host_toolchain)" ] } -@@ -743,7 +750,7 @@ group("gn_only") { +@@ -745,7 +752,7 @@ group("gn_only") { deps += [ "//components/proximity_auth:proximity_auth_unittests" ] } - if (is_win || is_linux) { + if (is_win || is_linux || is_bsd) { deps += [ "//mash:all", - "//media/mojo/services:media_mojo_shell_unittests", -@@ -763,7 +770,7 @@ group("gn_only") { + "//media/mojo/services:media_service_unittests", +@@ -771,7 +778,7 @@ group("gn_only") { } } - if (is_linux && !is_chromeos && !is_chromecast) { + if ((is_linux || is_bsd) && !is_chromeos && !is_chromecast) { # TODO(GYP): Figure out if any of these should be in gn_all # and figure out how cross-platform they are deps += [ -@@ -816,7 +823,7 @@ group("gn_only") { - ] +@@ -826,7 +833,7 @@ group("gn_only") { + } if (target_cpu == "x86" || target_cpu == "x64") { - if (!is_android) { + if (!is_android && !is_bsd) { deps += [ "//chrome/test:load_library_perf_tests" ] } deps += [ -@@ -824,7 +831,7 @@ group("gn_only") { +@@ -834,7 +841,7 @@ group("gn_only") { "//third_party/libjpeg_turbo:simd_asm", ] } - if (is_linux && current_toolchain == host_toolchain) { + if ((is_linux || is_bsd) && current_toolchain == host_toolchain) { deps += [ "//v8:v8_shell" ] } } -@@ -834,7 +841,7 @@ group("gn_only") { +@@ -844,7 +851,7 @@ group("gn_only") { } if ((is_linux && !is_chromeos && !is_chromecast) || (is_win && use_drfuzz) || - (use_libfuzzer && is_mac)) { + (use_libfuzzer && is_mac) || is_bsd) { deps += [ "//testing/libfuzzer/fuzzers", "//testing/libfuzzer/tests:libfuzzer_tests", -@@ -877,7 +884,7 @@ group("gn_only") { +@@ -876,7 +883,7 @@ group("gn_only") { group("gn_mojo_targets") { testonly = true - if (is_linux && !is_chromeos) { + if ((is_linux || is_bsd) && !is_chromeos) { # TODO(GYP): Figure out if any of these should be in gn_all # and figure out how cross-platform they are deps = [ -@@ -903,7 +910,7 @@ group("gn_visibility") { +@@ -902,7 +909,7 @@ group("gn_visibility") { } } -if (!is_ios) { +if (!is_ios || !is_bsd) { # This group includes all of the targets needed to build and test Blink, # including running the layout tests (see below). group("blink_tests") { -@@ -949,7 +956,7 @@ if (!is_ios) { +@@ -948,7 +955,7 @@ if (!is_ios) { data_deps += [ "//content/shell:content_shell_crash_service" ] } - if (!is_win && !is_android) { + if (!is_win && !is_android && !is_bsd) { data_deps += [ "//breakpad:minidump_stackwalk($host_toolchain)" ] } -@@ -957,7 +964,7 @@ if (!is_ios) { +@@ -956,7 +963,7 @@ if (!is_ios) { data_deps += [ "//breakpad:dump_syms($host_toolchain)" ] } - if (is_linux) { + if (is_linux && !is_bsd) { data_deps += [ "//breakpad:dump_syms($host_toolchain)" ] } -@@ -979,7 +986,7 @@ group("chromium_swarm_tests") { +@@ -978,7 +985,7 @@ group("chromium_swarm_tests") { group("chromium_builder_perf") { testonly = true - if (!is_ios && !is_android && !is_chromecast) { + if (!is_ios && !is_android && !is_chromecast && !is_bsd) { data_deps = [ "//cc:cc_perftests", "//chrome/test:load_library_perf_tests", -@@ -1009,7 +1016,7 @@ group("chromium_builder_perf") { +@@ -1008,7 +1015,7 @@ group("chromium_builder_perf") { "//chrome/installer/mini_installer:mini_installer", "//chrome/test:angle_perftests", ] - } else { + } else if (!is_bsd) { data_deps += [ "//breakpad:minidump_stackwalk($host_toolchain)" ] } } Index: head/www/chromium/files/patch-base_BUILD.gn =================================================================== --- head/www/chromium/files/patch-base_BUILD.gn (revision 436364) +++ head/www/chromium/files/patch-base_BUILD.gn (revision 436365) @@ -1,83 +1,83 @@ ---- base/BUILD.gn.orig 2017-01-26 00:49:07 UTC +--- base/BUILD.gn.orig 2017-03-09 20:04:26 UTC +++ base/BUILD.gn -@@ -1076,6 +1076,35 @@ component("base") { +@@ -1116,6 +1116,35 @@ component("base") { public_deps += [ "//base/allocator:unified_allocator_shim" ] } + if (is_bsd) { + sources -= [ + "files/file_util_linux.cc", + "files/file_path_watcher_linux.cc", + "process/process_linux.cc", + "process/process_iterator_linux.cc", + "process/process_metrics_linux.cc", + "process/process_handle_linux.cc", + "sys_info_linux.cc", + "trace_event/malloc_dump_provider.cc", + "trace_event/malloc_dump_provider.h", + "debug/proc_maps_linux.cc", + "debug/proc_maps_linux.h", + ] + sources += [ + "files/file_path_watcher_stub.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 + ] + } + + + # Allow more direct string conversions on platforms with native utf8 # strings if (is_mac || is_ios || is_chromeos || is_chromecast) { -@@ -1347,7 +1376,7 @@ component("base") { +@@ -1416,7 +1445,7 @@ component("base") { } # Linux. - if (is_linux) { + if (is_linux || is_bsd) { if (is_asan || is_lsan || is_msan || is_tsan) { # For llvm-sanitizer. data += [ "//third_party/llvm-build/Release+Asserts/lib/libstdc++.so.6" ] -@@ -1372,7 +1401,7 @@ component("base") { +@@ -1441,7 +1470,7 @@ component("base") { "//base/third_party/xdg_user_dirs", ] } else { - # Non-Linux. + # Non-Linux/BSD. sources -= [ "nix/mime_util_xdg.cc", "nix/mime_util_xdg.h", -@@ -1388,6 +1417,13 @@ component("base") { +@@ -1457,6 +1486,13 @@ component("base") { } } + if (is_bsd) { + sources -= [ + "threading/platform_thread_linux.cc", + ] + sources += [ "threading/platform_thread_freebsd.cc" ] + } + # iOS if (is_ios) { set_sources_assignment_filter([]) -@@ -2154,6 +2190,12 @@ test("base_unittests") { +@@ -2245,6 +2281,12 @@ test("base_unittests") { set_sources_assignment_filter(sources_assignment_filter) } + if (is_bsd) { + sources -= [ + "debug/proc_maps_linux_unittest.cc", + ] + } + if (is_win) { deps += [ "//base:scoped_handle_test_dll" ] if (current_cpu == "x64") { Index: head/www/chromium/files/patch-base_allocator_allocator__shim__unittest.cc =================================================================== --- head/www/chromium/files/patch-base_allocator_allocator__shim__unittest.cc (revision 436364) +++ head/www/chromium/files/patch-base_allocator_allocator__shim__unittest.cc (revision 436365) @@ -1,61 +1,61 @@ ---- base/allocator/allocator_shim_unittest.cc.orig 2017-01-26 00:49:07 UTC +--- base/allocator/allocator_shim_unittest.cc.orig 2017-03-09 20:04:26 UTC +++ base/allocator/allocator_shim_unittest.cc @@ -4,7 +4,6 @@ #include "base/allocator/allocator_shim.h" -#include #include #include -@@ -193,11 +192,13 @@ TEST_F(AllocatorShimTest, InterceptLibcS +@@ -196,11 +195,13 @@ TEST_F(AllocatorShimTest, InterceptLibcS ASSERT_GE(zero_allocs_intercepted_by_size[2 * 23], 1u); #if !defined(OS_WIN) +#if !defined(OS_BSD) void* memalign_ptr = memalign(128, 53); ASSERT_NE(nullptr, memalign_ptr); ASSERT_EQ(0u, reinterpret_cast(memalign_ptr) % 128); ASSERT_GE(aligned_allocs_intercepted_by_alignment[128], 1u); ASSERT_GE(aligned_allocs_intercepted_by_size[53], 1u); +#endif void* posix_memalign_ptr = nullptr; int res = posix_memalign(&posix_memalign_ptr, 256, 59); -@@ -214,12 +215,14 @@ TEST_F(AllocatorShimTest, InterceptLibcS +@@ -217,12 +218,14 @@ TEST_F(AllocatorShimTest, InterceptLibcS ASSERT_GE(aligned_allocs_intercepted_by_alignment[kPageSize], 1u); ASSERT_GE(aligned_allocs_intercepted_by_size[61], 1u); +#if !defined(OS_BSD) void* pvalloc_ptr = pvalloc(67); ASSERT_NE(nullptr, pvalloc_ptr); ASSERT_EQ(0u, reinterpret_cast(pvalloc_ptr) % kPageSize); ASSERT_GE(aligned_allocs_intercepted_by_alignment[kPageSize], 1u); // pvalloc rounds the size up to the next page. ASSERT_GE(aligned_allocs_intercepted_by_size[kPageSize], 1u); +#endif #endif // OS_WIN char* realloc_ptr = static_cast(realloc(nullptr, 71)); -@@ -240,8 +243,10 @@ TEST_F(AllocatorShimTest, InterceptLibcS +@@ -243,8 +246,10 @@ TEST_F(AllocatorShimTest, InterceptLibcS ASSERT_GE(frees_intercepted_by_addr[Hash(zero_alloc_ptr)], 1u); #if !defined(OS_WIN) +#if !defined(OS_BSD) free(memalign_ptr); ASSERT_GE(frees_intercepted_by_addr[Hash(memalign_ptr)], 1u); +#endif free(posix_memalign_ptr); ASSERT_GE(frees_intercepted_by_addr[Hash(posix_memalign_ptr)], 1u); -@@ -249,8 +254,10 @@ TEST_F(AllocatorShimTest, InterceptLibcS +@@ -252,8 +257,10 @@ TEST_F(AllocatorShimTest, InterceptLibcS free(valloc_ptr); ASSERT_GE(frees_intercepted_by_addr[Hash(valloc_ptr)], 1u); +#if !defined(OS_BSD) free(pvalloc_ptr); ASSERT_GE(frees_intercepted_by_addr[Hash(pvalloc_ptr)], 1u); +#endif #endif // OS_WIN free(realloc_ptr); Index: head/www/chromium/files/patch-base_debug_stack__trace__posix.cc =================================================================== --- head/www/chromium/files/patch-base_debug_stack__trace__posix.cc (revision 436364) +++ head/www/chromium/files/patch-base_debug_stack__trace__posix.cc (revision 436365) @@ -1,21 +1,30 @@ ---- base/debug/stack_trace_posix.cc.orig 2017-01-26 00:49:07 UTC +--- base/debug/stack_trace_posix.cc.orig 2017-03-09 20:04:26 UTC +++ base/debug/stack_trace_posix.cc -@@ -571,6 +571,10 @@ class SandboxSymbolizeHelper { +@@ -33,7 +33,7 @@ + #include + #endif + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + #include "base/debug/proc_maps_linux.h" + #endif + +@@ -574,6 +574,10 @@ class SandboxSymbolizeHelper { // for the modules that are loaded in the current process. // Returns true on success. bool CacheMemoryRegions() { +#if defined(OS_FREEBSD) + // TODO (rene) avoid link error, implement something? + return false; +#else // Reads /proc/self/maps. std::string contents; if (!ReadProcMaps(&contents)) { -@@ -586,6 +590,7 @@ class SandboxSymbolizeHelper { +@@ -589,6 +593,7 @@ class SandboxSymbolizeHelper { is_initialized_ = true; return true; +#endif } // Opens all object files and caches their file descriptors. Index: head/www/chromium/files/patch-base_process_process__metrics.h =================================================================== --- head/www/chromium/files/patch-base_process_process__metrics.h (revision 436364) +++ head/www/chromium/files/patch-base_process_process__metrics.h (revision 436365) @@ -1,33 +1,33 @@ ---- base/process/process_metrics.h.orig 2017-01-26 00:49:07 UTC +--- base/process/process_metrics.h.orig 2017-03-09 20:04:26 UTC +++ base/process/process_metrics.h @@ -22,6 +22,12 @@ #include "base/values.h" #include "build/build_config.h" +#if defined(OS_BSD) +#include +#include +#include +#endif + #if defined(OS_MACOSX) #include #include "base/process/port_provider_mac.h" -@@ -326,13 +332,17 @@ BASE_EXPORT bool GetSystemMemoryInfo(Sys +@@ -329,13 +335,17 @@ BASE_EXPORT bool GetSystemMemoryInfo(Sys // CPU-related ticks. Returns -1 on parse error. // Exposed for testing. BASE_EXPORT int ParseProcStatCPU(const std::string& input); +#endif +#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FREEBSD) // Get the number of threads of |process| as available in /proc//stat. // This should be used with care as no synchronization with running threads is // done. This is mostly useful to guarantee being single-threaded. // Returns 0 on failure. BASE_EXPORT int GetNumberOfThreads(ProcessHandle process); +#endif +#if defined(OS_LINUX) || defined(OS_ANDROID) // /proc/self/exe refers to the current executable. BASE_EXPORT extern const char kProcSelfExe[]; Index: head/www/chromium/files/patch-base_test_BUILD.gn =================================================================== --- head/www/chromium/files/patch-base_test_BUILD.gn (revision 436364) +++ head/www/chromium/files/patch-base_test_BUILD.gn (revision 436365) @@ -1,11 +1,11 @@ ---- base/test/BUILD.gn.orig 2017-01-26 00:49:07 UTC +--- base/test/BUILD.gn.orig 2017-03-09 20:04:26 UTC +++ base/test/BUILD.gn -@@ -303,7 +303,7 @@ static_library("run_all_base_unittests") +@@ -312,7 +312,7 @@ static_library("run_all_base_unittests") ] } -if (is_linux) { +if (is_linux || is_bsd) { shared_library("malloc_wrapper") { testonly = true sources = [ Index: head/www/chromium/files/patch-base_test_launcher_test__launcher.cc =================================================================== --- head/www/chromium/files/patch-base_test_launcher_test__launcher.cc (revision 436364) +++ head/www/chromium/files/patch-base_test_launcher_test__launcher.cc (revision 436365) @@ -1,13 +1,13 @@ ---- base/test/launcher/test_launcher.cc.orig 2017-01-26 00:49:07 UTC +--- base/test/launcher/test_launcher.cc.orig 2017-03-09 20:04:26 UTC +++ base/test/launcher/test_launcher.cc -@@ -59,6 +59,10 @@ +@@ -60,6 +60,10 @@ #include "base/win/windows_version.h" #endif +#if defined(OS_FREEBSD) +#include +#endif + namespace base { // See https://groups.google.com/a/chromium.org/d/msg/chromium-dev/nkdTP7sstSc/uT3FaE_sgkAJ . Index: head/www/chromium/files/patch-base_third__party_libevent_BUILD.gn =================================================================== --- head/www/chromium/files/patch-base_third__party_libevent_BUILD.gn (revision 436364) +++ head/www/chromium/files/patch-base_third__party_libevent_BUILD.gn (revision 436365) @@ -1,12 +1,12 @@ ---- base/third_party/libevent/BUILD.gn.orig 2017-01-26 00:49:07 UTC +--- base/third_party/libevent/BUILD.gn.orig 2017-03-09 20:04:26 UTC +++ base/third_party/libevent/BUILD.gn -@@ -29,6 +29,9 @@ static_library("libevent") { - } else if (is_linux) { - sources += [ "epoll.c" ] +@@ -50,6 +50,9 @@ static_library("libevent") { + "linux/event-config.h", + ] include_dirs = [ "linux" ] + } else if (is_bsd) { + sources += [ "kqueue.c" ] + include_dirs = [ "freebsd" ] } else if (is_android) { - sources += [ "epoll.c" ] - include_dirs = [ "android" ] + sources += [ + "android/config.h", Index: head/www/chromium/files/patch-build_config_BUILD.gn =================================================================== --- head/www/chromium/files/patch-build_config_BUILD.gn (revision 436364) +++ head/www/chromium/files/patch-build_config_BUILD.gn (revision 436365) @@ -1,20 +1,29 @@ ---- build/config/BUILD.gn.orig 2017-01-26 00:49:07 UTC +--- build/config/BUILD.gn.orig 2017-03-09 20:04:27 UTC +++ build/config/BUILD.gn -@@ -224,7 +224,7 @@ config("debug") { +@@ -196,7 +196,7 @@ config("debug") { # builds, and we have to tell it to turn it off. defines += [ "_HAS_ITERATOR_DEBUGGING=0" ] } - } else if (is_linux && current_cpu == "x64" && enable_iterator_debugging) { + } else if ((is_linux || is_bsd) && current_cpu == "x64" && enable_iterator_debugging) { # Enable libstdc++ debugging facilities to help catch problems early, see # http://crbug.com/65151 . # TODO(phajdan.jr): Should we enable this for all of POSIX? -@@ -338,7 +338,7 @@ config("executable_config") { +@@ -279,7 +279,7 @@ config("default_libs") { + "CoreText.framework", + "Foundation.framework", + ] +- } else if (is_linux) { ++ } else if (is_linux && !is_bsd) { + libs = [ + "dl", + "rt", +@@ -310,7 +310,7 @@ config("executable_config") { ] } else if (is_ios) { configs += [ "//build/config/ios:ios_dynamic_flags" ] - } else if (is_linux || is_android) { + } else if (is_linux || is_android || is_bsd) { configs += [ "//build/config/gcc:executable_ldconfig" ] if (is_android) { configs += [ "//build/config/android:executable_config" ] Index: head/www/chromium/files/patch-build_config_BUILDCONFIG.gn =================================================================== --- head/www/chromium/files/patch-build_config_BUILDCONFIG.gn (revision 436364) +++ head/www/chromium/files/patch-build_config_BUILDCONFIG.gn (revision 436365) @@ -1,66 +1,66 @@ ---- build/config/BUILDCONFIG.gn.orig 2017-01-26 00:49:07 UTC +--- build/config/BUILDCONFIG.gn.orig 2017-03-09 20:04:27 UTC +++ build/config/BUILDCONFIG.gn -@@ -134,12 +134,13 @@ declare_args() { - is_debug = !is_official_build +@@ -131,12 +131,13 @@ declare_args() { + is_official_build = false # Whether we're a traditional desktop unix. - is_desktop_linux = current_os == "linux" + is_desktop_linux = current_os == "linux" || current_os == "bsd" # Set to true when compiling with the Clang compiler. Typically this is used # to configure warnings. is_clang = current_os == "mac" || current_os == "ios" || - current_os == "linux" || current_os == "chromeos" + current_os == "linux" || current_os == "chromeos" || + current_os == "bsd" # Allows the path to a custom target toolchain to be injected as a single # argument, and set as the default toolchain. -@@ -183,8 +184,8 @@ if (host_toolchain == "") { +@@ -185,8 +186,8 @@ if (host_toolchain == "") { # TODO(dpranke): Add some sort of assert here that verifies that # no toolchain omitted host_toolchain from its toolchain_args(). - if (host_os == "linux") { - if (target_os != "linux") { + if (host_os == "linux" || host_os == "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 -@@ -220,7 +221,7 @@ if (target_os == "android") { +@@ -222,7 +223,7 @@ if (target_os == "android") { } else { _default_toolchain = "//build/toolchain/android:android_$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" -@@ -340,8 +341,17 @@ if (current_os == "win" || current_os == +@@ -342,8 +343,17 @@ if (current_os == "win" || current_os == is_nacl = false is_posix = true is_win = false +} else if (current_os == "bsd") { + is_android = false + is_chromeos = false + is_ios = false + is_linux = false + is_bsd = true + is_mac = false + is_nacl = false + is_posix = true + is_win = false } - # ============================================================================= # SOURCES FILTERS # ============================================================================= -@@ -410,7 +420,7 @@ if (!is_ios) { +@@ -412,7 +422,7 @@ if (!is_ios) { if (!is_mac && !is_ios) { sources_assignment_filter += [ "*.mm" ] } -if (!is_linux) { +if (!is_linux && !is_bsd) { sources_assignment_filter += [ "*_linux.h", "*_linux.cc", Index: head/www/chromium/files/patch-build_config_compiler_BUILD.gn =================================================================== --- head/www/chromium/files/patch-build_config_compiler_BUILD.gn (revision 436364) +++ head/www/chromium/files/patch-build_config_compiler_BUILD.gn (revision 436365) @@ -1,100 +1,100 @@ ---- build/config/compiler/BUILD.gn.orig 2017-01-26 00:49:07 UTC +--- build/config/compiler/BUILD.gn.orig 2017-03-09 20:04:27 UTC +++ build/config/compiler/BUILD.gn -@@ -150,7 +150,7 @@ config("compiler") { +@@ -155,7 +155,7 @@ config("compiler") { configs += [ "//build/config/win:compiler" ] } else if (is_android) { configs += [ "//build/config/android:compiler" ] - } else if (is_linux) { + } else if (is_linux || is_bsd) { configs += [ "//build/config/linux:compiler" ] } else if (is_nacl) { configs += [ "//build/config/nacl:compiler" ] -@@ -277,7 +277,7 @@ config("compiler") { +@@ -282,7 +282,7 @@ config("compiler") { # Linux/Android common flags setup. # --------------------------------- - if (is_linux || is_android) { + if (is_linux || is_bsd || is_android) { cflags += [ "-fPIC", "-pipe", # Use pipes for communicating between sub-processes. Faster. -@@ -401,14 +401,14 @@ config("compiler") { +@@ -409,14 +409,14 @@ config("compiler") { # clang-cl (used if is_win) doesn't expose this flag. # Currently disabled for nacl since its toolchain lacks this flag (too old). # TODO(zforman): Once nacl's toolchain is updated, remove check. - if (is_clang && is_linux) { + if (is_clang && (is_linux || is_bsd)) { absolute_path = rebase_path("//.") cflags += [ "-fdebug-prefix-map=$absolute_path=." ] } # C++11 compiler flags setup. # --------------------------- - if (is_linux || is_android || (is_nacl && is_clang)) { + if (is_linux || is_bsd || is_android || (is_nacl && is_clang)) { # gnu++11 instead of c++11 is needed because some code uses typeof() (a # GNU extension). # TODO(thakis): Eventually switch this to c++11 instead, -@@ -458,7 +458,7 @@ config("compiler") { +@@ -469,7 +469,7 @@ config("compiler") { ] # Apply a lower LTO optimization level as the default is too slow. - if (is_linux) { + if (is_linux || is_bsd) { if (use_lld) { ldflags += [ "-Wl,--lto-O1" ] } else { -@@ -478,7 +478,7 @@ config("compiler") { +@@ -489,7 +489,7 @@ config("compiler") { # targeting ARM, without this flag, LTO produces a .text section that is # larger than the maximum call displacement, preventing the linker from # relocating calls (http://llvm.org/PR22999). - if (is_linux) { + if (is_linux || is_bsd) { ldflags += [ "-Wl,-plugin-opt,-function-sections" ] } } -@@ -742,7 +742,7 @@ config("compiler_codegen") { +@@ -757,7 +757,7 @@ config("compiler_codegen") { # configs -= [ "//build/config/compiler:clang_stackrealign" ] # See https://crbug.com/556393 for details of where it must be avoided. config("clang_stackrealign") { - if (is_clang && current_cpu == "x86" && is_linux) { + if (is_clang && current_cpu == "x86" && (is_linux || is_bsd)) { cflags = [ # Align the stack on 16-byte boundaries, http://crbug.com/418554. "-mstack-alignment=16", -@@ -788,7 +788,7 @@ config("runtime_library") { +@@ -811,7 +811,7 @@ config("runtime_library") { # smaller. if (is_win) { configs += [ "//build/config/win:runtime_library" ] - } else if (is_linux) { + } else if (is_linux || is_bsd) { configs += [ "//build/config/linux:runtime_library" ] } else if (is_ios) { configs += [ "//build/config/ios:runtime_library" ] -@@ -1038,7 +1038,7 @@ config("default_warnings") { +@@ -1076,7 +1076,7 @@ config("default_warnings") { "-Wno-nonportable-include-path", # TODO(hans): https://crbug.com/637306 - "-Wno-address-of-packed-member", + # "-Wno-address-of-packed-member", ] - } - } -@@ -1070,7 +1070,7 @@ config("chromium_code") { + if (llvm_force_head_revision) { + cflags += [ +@@ -1119,7 +1119,7 @@ config("chromium_code") { ] if (!is_debug && !using_sanitizer && - (!is_linux || !is_clang || is_official_build)) { + (!is_linux || !is_bsd || !is_clang || is_official_build)) { # _FORTIFY_SOURCE isn't really supported by Clang now, see # http://llvm.org/bugs/show_bug.cgi?id=16821. # It seems to work fine with Ubuntu 12 headers though, so use it in -@@ -1128,7 +1128,7 @@ config("no_chromium_code") { +@@ -1178,7 +1178,7 @@ config("no_chromium_code") { ] } - if (is_linux || is_android) { + if (is_linux || is_bsd || is_android) { cflags_cc += [ # Don't warn about hash_map in third-party code. "-Wno-deprecated", Index: head/www/chromium/files/patch-build_config_features.gni =================================================================== --- head/www/chromium/files/patch-build_config_features.gni (revision 436364) +++ head/www/chromium/files/patch-build_config_features.gni (revision 436365) @@ -1,19 +1,19 @@ ---- build/config/features.gni.orig 2017-01-26 00:49:07 UTC +--- build/config/features.gni.orig 2017-03-09 20:04:27 UTC +++ build/config/features.gni -@@ -67,13 +67,13 @@ declare_args() { +@@ -57,13 +57,13 @@ declare_args() { # libudev usage. This currently only affects the content layer. use_udev = is_linux && !is_chromecast - use_dbus = is_linux && !is_chromecast + use_dbus = (is_linux || is_bsd) && !is_chromecast # Option controlling the use of GConf (the classic GNOME configuration # system). - use_gconf = is_linux && !is_chromeos && !is_chromecast + use_gconf = (is_linux || is_bsd) && !is_chromeos && !is_chromecast - use_gio = is_linux && !is_chromeos && !is_chromecast + use_gio = (is_linux || is_bsd) && !is_chromeos && !is_chromecast # Whether or not to use external popup menu. use_external_popup_menu = is_android || is_mac Index: head/www/chromium/files/patch-build_config_linux_gtk2_BUILD.gn =================================================================== --- head/www/chromium/files/patch-build_config_linux_gtk2_BUILD.gn (revision 436364) +++ head/www/chromium/files/patch-build_config_linux_gtk2_BUILD.gn (revision 436365) @@ -1,11 +1,11 @@ ---- build/config/linux/gtk2/BUILD.gn.orig 2017-01-26 00:49:07 UTC +--- build/config/linux/gtk2/BUILD.gn.orig 2017-03-09 20:04:27 UTC +++ build/config/linux/gtk2/BUILD.gn @@ -4,7 +4,7 @@ import("//build/config/linux/pkg_config.gni") -assert(is_linux, "This file should only be referenced on Linux") +assert(is_linux || is_bsd, "This file should only be referenced on Linux") - # Depend on //build/config/linux/gtk2 to use GTKv2. - # + # Depend on //build/config/linux/gtk2 to use GTKv2. Depend on + # //build/config/linux/gtk to get GTK 2 or 3 depending on the build flags. Index: head/www/chromium/files/patch-build_config_linux_gtk3_BUILD.gn =================================================================== --- head/www/chromium/files/patch-build_config_linux_gtk3_BUILD.gn (revision 436364) +++ head/www/chromium/files/patch-build_config_linux_gtk3_BUILD.gn (revision 436365) @@ -1,11 +1,11 @@ ---- build/config/linux/gtk3/BUILD.gn.orig 2017-01-26 00:49:07 UTC +--- build/config/linux/gtk3/BUILD.gn.orig 2017-03-09 20:04:27 UTC +++ build/config/linux/gtk3/BUILD.gn @@ -4,7 +4,7 @@ import("//build/config/linux/pkg_config.gni") -assert(is_linux, "This file should only be referenced on Linux") +assert(is_linux || is_bsd, "This file should only be referenced on Linux") - # Depend on //build/config/linux/gtk3 to use GTKv3. - # + # Depend on //build/config/linux/gtk3 to use GTKv3. Depend on + # //build/config/linux/gtk to get GTK 2 or 3 depending on the build flags. Index: head/www/chromium/files/patch-build_config_linux_gtk_BUILD.gn =================================================================== --- head/www/chromium/files/patch-build_config_linux_gtk_BUILD.gn (nonexistent) +++ head/www/chromium/files/patch-build_config_linux_gtk_BUILD.gn (revision 436365) @@ -0,0 +1,11 @@ +--- build/config/linux/gtk/BUILD.gn.orig 2017-03-09 20:04:27 UTC ++++ build/config/linux/gtk/BUILD.gn +@@ -5,7 +5,7 @@ + import("//build/config/linux/gtk/gtk.gni") + import("//build/config/linux/pkg_config.gni") + +-assert(is_linux, "This file should only be referenced on Linux") ++assert(is_linux || is_bsd, "This file should only be referenced on Linux") + + # The target in this file will automatically reference GTK2 or GTK3 depending + # on the state of the build flag. Some builds reference both 2 and 3, and some Property changes on: head/www/chromium/files/patch-build_config_linux_gtk_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-build_config_sanitizers_BUILD.gn =================================================================== --- head/www/chromium/files/patch-build_config_sanitizers_BUILD.gn (revision 436364) +++ head/www/chromium/files/patch-build_config_sanitizers_BUILD.gn (revision 436365) @@ -1,20 +1,20 @@ ---- build/config/sanitizers/BUILD.gn.orig 2017-01-26 00:49:07 UTC +--- build/config/sanitizers/BUILD.gn.orig 2017-03-09 20:04:27 UTC +++ build/config/sanitizers/BUILD.gn -@@ -405,7 +405,7 @@ config("lsan_flags") { +@@ -420,7 +420,7 @@ config("lsan_flags") { config("msan_flags") { if (is_msan) { - assert(is_linux, "msan only supported on linux x86_64") + assert(is_linux || is_bsd, "msan only supported on linux x86_64") - msan_blacklist_path = - rebase_path("//tools/msan/blacklist.txt", root_build_dir) - cflags = [ -@@ -418,7 +418,7 @@ config("msan_flags") { + if (!defined(msan_blacklist_path)) { + msan_blacklist_path = + rebase_path("//tools/msan/blacklist.txt", root_build_dir) +@@ -435,7 +435,7 @@ config("msan_flags") { config("tsan_flags") { if (is_tsan) { - assert(is_linux, "tsan only supported on linux x86_64") + assert(is_linux || is_bsd, "tsan only supported on linux x86_64") - tsan_blacklist_path = - rebase_path("//tools/memory/tsan_v2/ignores.txt", root_build_dir) - cflags = [ + if (!defined(tsan_blacklist_path)) { + tsan_blacklist_path = + rebase_path("//tools/memory/tsan_v2/ignores.txt", root_build_dir) Index: head/www/chromium/files/patch-build_config_sanitizers_sanitizers.gni =================================================================== --- head/www/chromium/files/patch-build_config_sanitizers_sanitizers.gni (revision 436364) +++ head/www/chromium/files/patch-build_config_sanitizers_sanitizers.gni (revision 436365) @@ -1,14 +1,13 @@ ---- build/config/sanitizers/sanitizers.gni.orig 2017-01-26 00:49:07 UTC +--- build/config/sanitizers/sanitizers.gni.orig 2017-03-09 20:04:27 UTC +++ build/config/sanitizers/sanitizers.gni -@@ -54,8 +54,9 @@ declare_args() { +@@ -54,8 +54,8 @@ declare_args() { # See http://clang.llvm.org/docs/ControlFlowIntegrity.html # # TODO(pcc): Remove this flag if/when CFI is enabled in all official builds. - is_cfi = target_os == "linux" && !is_chromeos && target_cpu == "x64" && -- is_chrome_branded && is_official_build && allow_posix_link_time_opt +- is_official_build && allow_posix_link_time_opt + is_cfi = (target_os == "linux" || target_os == "bsd") && !is_chromeos && -+ target_cpu == "x64" && is_chrome_branded && is_official_build && -+ allow_posix_link_time_opt ++ target_cpu == "x64" && is_official_build && allow_posix_link_time_opt # Enable checks for bad casts: derived cast and unrelated cast. # TODO(krasin): remove this, when we're ready to add these checks by default. Index: head/www/chromium/files/patch-build_config_ui.gni =================================================================== --- head/www/chromium/files/patch-build_config_ui.gni (revision 436364) +++ head/www/chromium/files/patch-build_config_ui.gni (revision 436365) @@ -1,41 +1,36 @@ ---- build/config/ui.gni.orig 2017-01-26 00:49:07 UTC +--- build/config/ui.gni.orig 2017-03-09 20:04:27 UTC +++ build/config/ui.gni -@@ -31,7 +31,7 @@ declare_args() { +@@ -31,10 +31,10 @@ declare_args() { # Indicates if Aura is enabled. Aura is a low-level windowing library, sort # of a replacement for GDI or GTK. - use_aura = is_win || is_linux + use_aura = is_win || is_linux || is_bsd - # True means the UI is built using the "views" framework. - toolkit_views = -@@ -47,7 +47,7 @@ declare_args() { - use_xkbcommon = false - # Whether we should use glib, a low level C utility library. - use_glib = is_linux + use_glib = is_linux || is_bsd # Indicates if Wayland display server support is enabled. enable_wayland_server = is_chromeos -@@ -62,17 +62,17 @@ declare_args() { +@@ -55,17 +55,17 @@ declare_args() { # Use GPU accelerated cross process image transport by default on linux builds # with the Aura window manager. -ui_compositor_image_transport = use_aura && is_linux +ui_compositor_image_transport = use_aura && (is_linux || is_bsd) # Indicates if the UI toolkit depends on X11. -use_x11 = is_linux && !use_ozone +use_x11 = (is_linux || is_bsd) && !use_ozone # Turn off glib if Ozone is enabled. if (use_ozone) { use_glib = false } -if (is_linux && !use_ozone) { +if ((is_linux || is_bsd) && !use_ozone) { use_cairo = true use_pango = true } else { Index: head/www/chromium/files/patch-cc_trees_property__tree.cc =================================================================== --- head/www/chromium/files/patch-cc_trees_property__tree.cc (revision 436364) +++ head/www/chromium/files/patch-cc_trees_property__tree.cc (revision 436365) @@ -1,20 +1,20 @@ ---- cc/trees/property_tree.cc.orig 2017-01-26 00:49:07 UTC +--- cc/trees/property_tree.cc.orig 2017-03-09 20:04:27 UTC +++ cc/trees/property_tree.cc -@@ -1113,13 +1113,13 @@ gfx::ScrollOffset ScrollTree::MaxScrollO +@@ -1196,13 +1196,13 @@ gfx::ScrollOffset ScrollTree::MaxScrollO gfx::Size clip_layer_bounds = scroll_clip_layer_bounds(scroll_node->id); - gfx::ScrollOffset max_offset( + gfx::ScrollOffset _max_offset( scaled_scroll_bounds.width() - clip_layer_bounds.width(), scaled_scroll_bounds.height() - clip_layer_bounds.height()); - max_offset.Scale(1 / scale_factor); - max_offset.SetToMax(gfx::ScrollOffset()); - return max_offset; + _max_offset.Scale(1 / scale_factor); + _max_offset.SetToMax(gfx::ScrollOffset()); + return _max_offset; } void ScrollTree::OnScrollOffsetAnimated(int layer_id, Index: head/www/chromium/files/patch-chrome_BUILD.gn =================================================================== --- head/www/chromium/files/patch-chrome_BUILD.gn (revision 436364) +++ head/www/chromium/files/patch-chrome_BUILD.gn (revision 436365) @@ -1,29 +1,29 @@ ---- chrome/BUILD.gn.orig 2017-01-26 00:49:07 UTC +--- chrome/BUILD.gn.orig 2017-03-09 20:04:27 UTC +++ chrome/BUILD.gn -@@ -132,7 +132,7 @@ if (!is_android && !is_mac) { +@@ -143,7 +143,7 @@ if (!is_android && !is_mac) { data = [ "$root_out_dir/resources.pak", ] - if (is_linux || is_win) { + if (is_linux || is_bsd || is_win) { data += [ "$root_out_dir/chrome_100_percent.pak", "$root_out_dir/locales/en-US.pak", -@@ -212,7 +212,7 @@ if (!is_android && !is_mac) { +@@ -222,7 +222,7 @@ if (!is_android && !is_mac) { sources += [ "app/chrome_exe_main_aura.cc" ] } - if (is_linux) { + if (is_linux || is_bsd) { sources += [ "app/chrome_dll_resource.h", "app/chrome_main.cc", -@@ -1539,7 +1539,7 @@ if (enable_resource_whitelist_generation +@@ -1521,7 +1521,7 @@ if (enable_resource_whitelist_generation } } -if (is_linux) { +if (is_linux || is_bsd) { action("manpage") { if (is_chrome_branded) { name = "Google Chrome" Index: head/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc =================================================================== --- head/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc (revision 436364) +++ head/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc (revision 436365) @@ -1,115 +1,115 @@ ---- chrome/app/chrome_main_delegate.cc.orig 2017-02-02 02:02:48 UTC +--- chrome/app/chrome_main_delegate.cc.orig 2017-03-09 20:04:27 UTC +++ chrome/app/chrome_main_delegate.cc -@@ -86,7 +86,7 @@ +@@ -89,7 +89,7 @@ #include "chrome/app/chrome_crash_reporter_client.h" #endif -#if !defined(DISABLE_NACL) && defined(OS_LINUX) +#if !defined(DISABLE_NACL) && defined(OS_LINUX) && !defined(OS_BSD) #include "components/nacl/common/nacl_paths.h" #include "components/nacl/zygote/nacl_fork_delegate_linux.h" #endif @@ -117,11 +117,11 @@ #include "ui/base/x/x11_util.h" // nogncheck #endif -#if defined(OS_POSIX) && !defined(OS_MACOSX) +#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD) #include "components/crash/content/app/breakpad_linux.h" #endif -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) #include "base/environment.h" #endif @@ -163,7 +163,7 @@ base::LazyInstance::Leaky g_chrome_crash_client = LAZY_INSTANCE_INITIALIZER; #endif @@ -280,7 +280,7 @@ static void AdjustLinuxOOMScore(const st // and resources loaded. bool SubprocessNeedsResourceBundle(const std::string& process_type) { return -#if defined(OS_POSIX) && !defined(OS_MACOSX) +#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD) // The zygote process opens the resources for the renderers. process_type == switches::kZygoteProcess || #endif @@ -332,7 +332,7 @@ void HandleHelpSwitches(const base::Comm } #endif -#if !defined(OS_MACOSX) && !defined(OS_ANDROID) +#if !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD) void SIGTERMProfilingShutdown(int signal) { Profiling::Stop(); struct sigaction sigact; -@@ -366,7 +366,7 @@ void InitializeUserDataDir() { +@@ -399,7 +399,7 @@ void InitializeUserDataDir(base::Command std::string process_type = command_line->GetSwitchValueASCII(switches::kProcessType); -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) // On Linux, Chrome does not support running multiple copies under different // DISPLAYs, so the profile directory can be specified in the environment to // support the virtual desktop use-case. -@@ -560,7 +560,7 @@ bool ChromeMainDelegate::BasicStartupCom +@@ -592,7 +592,7 @@ bool ChromeMainDelegate::BasicStartupCom 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 { -@@ -610,7 +610,7 @@ bool ChromeMainDelegate::BasicStartupCom +@@ -642,7 +642,7 @@ bool ChromeMainDelegate::BasicStartupCom 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 { -@@ -722,7 +722,7 @@ void ChromeMainDelegate::PreSandboxStart +@@ -754,7 +754,7 @@ void ChromeMainDelegate::PreSandboxStart std::string process_type = command_line.GetSwitchValueASCII(switches::kProcessType); -#if defined(OS_POSIX) +#if defined(OS_POSIX) && !defined(OS_BSD) crash_reporter::SetCrashReporterClient(g_chrome_crash_client.Pointer()); #endif -@@ -852,7 +852,7 @@ void ChromeMainDelegate::PreSandboxStart +@@ -884,7 +884,7 @@ void ChromeMainDelegate::PreSandboxStart chrome::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 defined(OS_ANDROID) -@@ -870,7 +870,7 @@ void ChromeMainDelegate::PreSandboxStart +@@ -898,7 +898,7 @@ void ChromeMainDelegate::PreSandboxStart 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. -@@ -980,7 +980,7 @@ bool ChromeMainDelegate::DelaySandboxIni +@@ -1008,7 +1008,7 @@ bool ChromeMainDelegate::DelaySandboxIni #endif return process_type == switches::kRelauncherProcess; } -#elif defined(OS_POSIX) && !defined(OS_ANDROID) +#elif defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_BSD) void ChromeMainDelegate::ZygoteStarting( ScopedVector* delegates) { #if defined(OS_CHROMEOS) Index: head/www/chromium/files/patch-chrome_app_chromium__strings.grd =================================================================== --- head/www/chromium/files/patch-chrome_app_chromium__strings.grd (revision 436364) +++ head/www/chromium/files/patch-chrome_app_chromium__strings.grd (revision 436365) @@ -1,11 +1,11 @@ ---- chrome/app/chromium_strings.grd.orig 2017-01-26 00:49:07 UTC +--- chrome/app/chromium_strings.grd.orig 2017-03-09 20:04:27 UTC +++ chrome/app/chromium_strings.grd -@@ -939,7 +939,7 @@ Signing in anyway will merge Chromium in +@@ -887,7 +887,7 @@ Signing in anyway will merge Chromium in - + The profile appears to be in use by another Chromium process ($112345) on another computer ($2example.com). Chromium has locked the profile so that it doesn't get corrupted. If you are sure no other processes are using this profile, you can unlock the profile and relaunch Chromium. Index: head/www/chromium/files/patch-chrome_app_generated__resources.grd =================================================================== --- head/www/chromium/files/patch-chrome_app_generated__resources.grd (revision 436364) +++ head/www/chromium/files/patch-chrome_app_generated__resources.grd (revision 436365) @@ -1,38 +1,38 @@ ---- chrome/app/generated_resources.grd.orig 2017-01-26 00:49:07 UTC +--- chrome/app/generated_resources.grd.orig 2017-03-09 20:04:27 UTC +++ chrome/app/generated_resources.grd -@@ -6939,7 +6939,7 @@ Keep your key file in a safe place. You +@@ -6868,7 +6868,7 @@ Keep your key file in a safe place. You Right-to-left - + Enable Input IME API -@@ -10334,7 +10334,7 @@ I don't think this site should be blocke +@@ -10122,7 +10122,7 @@ I don't think this site should be blocke Appearance - + Themes -@@ -10342,7 +10342,7 @@ I don't think this site should be blocke +@@ -10130,7 +10130,7 @@ I don't think this site should be blocke Reset to default theme - + Use GTK+ theme -@@ -11663,7 +11663,7 @@ Tell us what happened exactly before you +@@ -11455,7 +11455,7 @@ Tell us what happened exactly before you Set as default - + Use system title bar and borders Index: head/www/chromium/files/patch-chrome_app_google__chrome__strings.grd =================================================================== --- head/www/chromium/files/patch-chrome_app_google__chrome__strings.grd (revision 436364) +++ head/www/chromium/files/patch-chrome_app_google__chrome__strings.grd (revision 436365) @@ -1,11 +1,11 @@ ---- chrome/app/google_chrome_strings.grd.orig 2017-02-02 02:02:48 UTC +--- chrome/app/google_chrome_strings.grd.orig 2017-03-09 20:04:27 UTC +++ chrome/app/google_chrome_strings.grd -@@ -940,7 +940,7 @@ Signing in anyway will merge Chrome info +@@ -888,7 +888,7 @@ Signing in anyway will merge Chrome info - + The profile appears to be in use by another Google Chrome process ($112345) on another computer ($2example.com). Chrome has locked the profile so that it doesn't get corrupted. If you are sure no other processes are using this profile, you can unlock the profile and relaunch Chrome. Index: head/www/chromium/files/patch-chrome_app_mash_mash__runner.cc =================================================================== --- head/www/chromium/files/patch-chrome_app_mash_mash__runner.cc (revision 436364) +++ head/www/chromium/files/patch-chrome_app_mash_mash__runner.cc (revision 436365) @@ -1,11 +1,11 @@ ---- chrome/app/mash/mash_runner.cc.orig 2017-02-02 02:02:48 UTC +--- chrome/app/mash/mash_runner.cc.orig 2017-03-09 20:04:27 UTC +++ chrome/app/mash/mash_runner.cc -@@ -207,7 +207,7 @@ int MashMain() { +@@ -249,7 +249,7 @@ int MashMain() { + // TODO(sky): wire this up correctly. service_manager::InitializeLogging(); - std::unique_ptr message_loop; -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) base::AtExitManager exit_manager; #endif - if (!IsChild()) + Index: head/www/chromium/files/patch-chrome_app_settings__strings.grdp =================================================================== --- head/www/chromium/files/patch-chrome_app_settings__strings.grdp (revision 436364) +++ head/www/chromium/files/patch-chrome_app_settings__strings.grdp (revision 436365) @@ -1,20 +1,20 @@ ---- chrome/app/settings_strings.grdp.orig 2017-02-02 02:02:48 UTC +--- chrome/app/settings_strings.grdp.orig 2017-03-09 20:04:27 UTC +++ chrome/app/settings_strings.grdp -@@ -178,7 +178,7 @@ +@@ -225,7 +225,7 @@ Themes - + GTK+ -@@ -192,7 +192,7 @@ +@@ -239,7 +239,7 @@ Use Classic - + Reset to default Index: head/www/chromium/files/patch-chrome_browser_BUILD.gn =================================================================== --- head/www/chromium/files/patch-chrome_browser_BUILD.gn (revision 436364) +++ head/www/chromium/files/patch-chrome_browser_BUILD.gn (revision 436365) @@ -1,20 +1,20 @@ ---- chrome/browser/BUILD.gn.orig 2017-01-26 00:49:08 UTC +--- chrome/browser/BUILD.gn.orig 2017-03-09 20:04:27 UTC +++ chrome/browser/BUILD.gn -@@ -2142,7 +2142,7 @@ split_static_library("browser") { +@@ -2177,7 +2177,7 @@ split_static_library("browser") { deps += [ "//device/udev_linux" ] } - if (is_linux && !is_chromeos) { + if ((is_linux || is_bsd) && !is_chromeos) { deps += [ "//third_party/speech-dispatcher" ] } -@@ -3507,7 +3507,7 @@ split_static_library("browser") { +@@ -3559,7 +3559,7 @@ split_static_library("browser") { } } - if (is_linux) { + if (is_linux || is_bsd) { if (use_aura) { deps += [ "//build/linux:fontconfig" ] if (use_dbus) { Index: head/www/chromium/files/patch-chrome_browser_about__flags.cc =================================================================== --- head/www/chromium/files/patch-chrome_browser_about__flags.cc (revision 436364) +++ head/www/chromium/files/patch-chrome_browser_about__flags.cc (revision 436365) @@ -1,34 +1,34 @@ ---- chrome/browser/about_flags.cc.orig 2017-02-02 02:02:48 UTC +--- chrome/browser/about_flags.cc.orig 2017-03-09 20:04:27 UTC +++ chrome/browser/about_flags.cc -@@ -776,7 +776,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -820,7 +820,7 @@ const FeatureEntry kFeatureEntries[] = { kOsLinux | kOsCrOS | kOsWin | kOsAndroid, ENABLE_DISABLE_VALUE_TYPE(switches::kEnableSmoothScrolling, switches::kDisableSmoothScrolling)}, -#if defined(USE_AURA) || defined(OS_LINUX) +#if defined(USE_AURA) || defined(OS_LINUX) || defined(OS_BSD) {"overlay-scrollbars", IDS_FLAGS_OVERLAY_SCROLLBARS_NAME, IDS_FLAGS_OVERLAY_SCROLLBARS_DESCRIPTION, // Uses the system preference on Mac (a different implementation). -@@ -1291,11 +1291,11 @@ const FeatureEntry kFeatureEntries[] = { +@@ -1345,11 +1345,11 @@ const FeatureEntry kFeatureEntries[] = { ENABLE_DISABLE_VALUE_TYPE(switches::kEnableTranslateNewUX, switches::kDisableTranslateNewUX)}, #endif // OS_MACOSX -#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_CHROMEOS) || defined(OS_BSD) {"translate-2016q2-ui", IDS_FLAGS_TRANSLATE_2016Q2_UI_NAME, IDS_FLAGS_TRANSLATE_2016Q2_UI_DESCRIPTION, kOsCrOS | kOsWin | kOsLinux, FEATURE_VALUE_TYPE(translate::kTranslateUI2016Q2)}, -#endif // OS_LINUX || OS_WIN || OS_CHROMEOS +#endif // OS_LINUX || OS_WIN || OS_CHROMEOS || OS_BSD {"translate-lang-by-ulp", IDS_FLAGS_TRANSLATE_LANGUAGE_BY_ULP_NAME, IDS_FLAGS_TRANSLATE_LANGUAGE_BY_ULP_DESCRIPTION, kOsAll, FEATURE_VALUE_TYPE(translate::kTranslateLanguageByULP)}, -@@ -1769,7 +1769,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -1778,7 +1778,7 @@ const FeatureEntry kFeatureEntries[] = { IDS_FLAGS_ENABLE_MATERIAL_DESIGN_EXTENSIONS_DESCRIPTION, kOsDesktop, FEATURE_VALUE_TYPE(features::kMaterialDesignExtensions)}, #endif // ENABLE_EXTENSIONS -#if defined(OS_WIN) || defined(OS_LINUX) +#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) {"enable-input-ime-api", IDS_FLAGS_ENABLE_INPUT_IME_API_NAME, IDS_FLAGS_ENABLE_INPUT_IME_API_DESCRIPTION, kOsWin | kOsLinux, ENABLE_DISABLE_VALUE_TYPE(switches::kEnableInputImeAPI, Index: head/www/chromium/files/patch-chrome_browser_browser__process__impl.cc =================================================================== --- head/www/chromium/files/patch-chrome_browser_browser__process__impl.cc (revision 436364) +++ head/www/chromium/files/patch-chrome_browser_browser__process__impl.cc (revision 436365) @@ -1,20 +1,20 @@ ---- chrome/browser/browser_process_impl.cc.orig 2017-01-26 00:49:08 UTC +--- chrome/browser/browser_process_impl.cc.orig 2017-03-09 20:04:27 UTC +++ chrome/browser/browser_process_impl.cc -@@ -165,7 +165,7 @@ +@@ -170,7 +170,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/memory/tab_manager.h" #endif -@@ -771,7 +771,7 @@ gcm::GCMDriver* BrowserProcessImpl::gcm_ +@@ -783,7 +783,7 @@ gcm::GCMDriver* BrowserProcessImpl::gcm_ memory::TabManager* BrowserProcessImpl::GetTabManager() { DCHECK(CalledOnValidThread()); -#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_.get()) tab_manager_.reset(new memory::TabManager()); return tab_manager_.get(); Index: head/www/chromium/files/patch-chrome_browser_browser__process__impl.h =================================================================== --- head/www/chromium/files/patch-chrome_browser_browser__process__impl.h (revision 436364) +++ head/www/chromium/files/patch-chrome_browser_browser__process__impl.h (revision 436365) @@ -1,11 +1,11 @@ ---- chrome/browser/browser_process_impl.h.orig 2017-01-26 00:49:08 UTC +--- chrome/browser/browser_process_impl.h.orig 2017-03-09 20:04:27 UTC +++ chrome/browser/browser_process_impl.h -@@ -340,7 +340,7 @@ class BrowserProcessImpl : public Browse +@@ -341,7 +341,7 @@ class BrowserProcessImpl : public Browse 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_; Index: head/www/chromium/files/patch-chrome_browser_browser__resources.grd =================================================================== --- head/www/chromium/files/patch-chrome_browser_browser__resources.grd (revision 436364) +++ head/www/chromium/files/patch-chrome_browser_browser__resources.grd (revision 436365) @@ -1,11 +1,11 @@ ---- chrome/browser/browser_resources.grd.orig 2017-02-02 02:02:48 UTC +--- chrome/browser/browser_resources.grd.orig 2017-03-09 20:04:27 UTC +++ chrome/browser/browser_resources.grd -@@ -372,7 +372,7 @@ +@@ -384,7 +384,7 @@ - + Index: head/www/chromium/files/patch-chrome_browser_chrome__browser__main.cc =================================================================== --- head/www/chromium/files/patch-chrome_browser_chrome__browser__main.cc (revision 436364) +++ head/www/chromium/files/patch-chrome_browser_chrome__browser__main.cc (revision 436365) @@ -1,25 +1,25 @@ ---- chrome/browser/chrome_browser_main.cc.orig 2017-01-26 00:49:08 UTC +--- chrome/browser/chrome_browser_main.cc.orig 2017-03-09 20:04:28 UTC +++ chrome/browser/chrome_browser_main.cc -@@ -181,7 +181,7 @@ - #include "chrome/browser/feedback/feedback_profile_observer.h" +@@ -180,7 +180,7 @@ + #include "chrome/browser/lifetime/application_lifetime.h" #endif // defined(OS_ANDROID) -#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) -@@ -1194,11 +1194,11 @@ int ChromeBrowserMainParts::PreCreateThr +@@ -1173,11 +1173,11 @@ int ChromeBrowserMainParts::PreCreateThr } #endif // !defined(OS_ANDROID) && !defined(OS_CHROMEOS) -#if defined(OS_LINUX) || defined(OS_OPENBSD) +#if defined(OS_LINUX) || defined(OS_BSD) // Set the product channel for crash reports. base::debug::SetCrashKeyValue(crash_keys::kChannel, chrome::GetChannelString()); -#endif // defined(OS_LINUX) || defined(OS_OPENBSD) +#endif // defined(OS_LINUX) || defined(OS_BSD) // Initialize tracking synchronizer system. tracking_synchronizer_ = new metrics::TrackingSynchronizer( 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 436364) +++ head/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.cc (revision 436365) @@ -1,74 +1,83 @@ ---- chrome/browser/chrome_content_browser_client.cc.orig 2017-01-26 00:49:08 UTC +--- chrome/browser/chrome_content_browser_client.cc.orig 2017-03-09 20:04:28 UTC +++ chrome/browser/chrome_content_browser_client.cc -@@ -224,7 +224,7 @@ +@@ -242,7 +242,7 @@ #include "chrome/browser/ui/browser_dialogs.h" #include "chromeos/chromeos_switches.h" #include "components/user_manager/user_manager.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 "chrome/browser/chrome_browser_main_android.h" -@@ -236,7 +236,7 @@ - #include "chrome/browser/chrome_browser_main_posix.h" +@@ -258,7 +258,7 @@ + #include "chrome/browser/payments/payment_request_factory.h" #endif -#if defined(OS_POSIX) && !defined(OS_MACOSX) +#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD) #include "base/debug/leak_annotations.h" #include "components/crash/content/app/breakpad_linux.h" #include "components/crash/content/browser/crash_handler_host_linux.h" -@@ -261,7 +261,7 @@ +@@ -281,7 +281,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 -@@ -555,7 +555,7 @@ bool CertMatchesFilter(const net::X509Ce +@@ -576,7 +576,7 @@ bool CertMatchesFilter(const net::X509Ce return false; } -#if defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX) +#if defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX) && !defined(OS_BSD) breakpad::CrashHandlerHostLinux* CreateCrashHandlerHost( const std::string& process_type) { base::FilePath dumps_path; -@@ -883,7 +883,7 @@ content::BrowserMainParts* ChromeContent +@@ -899,7 +899,7 @@ content::BrowserMainParts* ChromeContent main_parts = new ChromeBrowserMainPartsMac(parameters); #elif defined(OS_CHROMEOS) main_parts = new chromeos::ChromeBrowserMainPartsChromeos(parameters); -#elif defined(OS_LINUX) +#elif defined(OS_LINUX) || defined(OS_BSD) main_parts = new ChromeBrowserMainPartsLinux(parameters); #elif defined(OS_ANDROID) main_parts = new ChromeBrowserMainPartsAndroid(parameters); -@@ -899,7 +899,7 @@ content::BrowserMainParts* ChromeContent +@@ -915,7 +915,7 @@ content::BrowserMainParts* ChromeContent // 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_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) && !defined(USE_OZONE) main_parts->AddParts(new ChromeBrowserMainExtraPartsViewsLinux()); #else - main_parts->AddParts(new ChromeBrowserMainExtraPartsViews()); -@@ -1531,7 +1531,7 @@ void ChromeContentBrowserClient::AppendE + ChromeBrowserMainExtraPartsViews* extra_parts_views = +@@ -1552,7 +1552,7 @@ void ChromeContentBrowserClient::AppendE 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 = -@@ -2834,7 +2834,7 @@ void ChromeContentBrowserClient::GetAddi - PathService::Get(base::DIR_ANDROID_APP_DATA, &app_data_path); - DCHECK(!app_data_path.empty()); +@@ -2808,7 +2808,7 @@ void ChromeContentBrowserClient::GetAddi + } } --#elif defined(OS_POSIX) && !defined(OS_MACOSX) -+#elif defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD) + +-#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, +@@ -2837,7 +2837,7 @@ void ChromeContentBrowserClient::GetAddi + } + #endif // defined(OS_ANDROID) + } +-#endif // defined(OS_POSIX) && !defined(OS_MACOSX) ++#endif // defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD) + + #if defined(OS_WIN) + base::string16 ChromeContentBrowserClient::GetAppContainerSidForSandboxType( Index: head/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.h =================================================================== --- head/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.h (revision 436364) +++ head/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.h (revision 436365) @@ -1,11 +1,17 @@ ---- chrome/browser/chrome_content_browser_client.h.orig 2017-01-26 00:49:08 UTC +--- chrome/browser/chrome_content_browser_client.h.orig 2017-03-09 20:04:28 UTC +++ chrome/browser/chrome_content_browser_client.h -@@ -271,7 +271,7 @@ class ChromeContentBrowserClient : publi - int child_process_id, - content::FileDescriptorInfo* mappings, - std::map* regions) override; --#elif defined(OS_POSIX) && !defined(OS_MACOSX) -+#elif defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD) +@@ -259,12 +259,12 @@ class ChromeContentBrowserClient : publi + content::RenderFrameHost* render_frame_host, + blink::WebPageVisibilityState* visibility_state) override; + +-#if defined(OS_POSIX) && !defined(OS_MACOSX) ++#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD) void GetAdditionalMappedFilesForChildProcess( const base::CommandLine& command_line, int child_process_id, + content::FileDescriptorInfo* mappings) override; +-#endif // defined(OS_POSIX) && !defined(OS_MACOSX) ++#endif // defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD) + #if defined(OS_WIN) + bool PreSpawnRenderer(sandbox::TargetPolicy* policy) override; + base::string16 GetAppContainerSidForSandboxType( Index: head/www/chromium/files/patch-chrome_browser_download_chrome__download__manager__delegate.cc =================================================================== --- head/www/chromium/files/patch-chrome_browser_download_chrome__download__manager__delegate.cc (revision 436364) +++ head/www/chromium/files/patch-chrome_browser_download_chrome__download__manager__delegate.cc (revision 436365) @@ -1,20 +1,20 @@ ---- chrome/browser/download/chrome_download_manager_delegate.cc.orig 2017-01-26 00:49:08 UTC +--- chrome/browser/download/chrome_download_manager_delegate.cc.orig 2017-03-09 20:04:28 UTC +++ chrome/browser/download/chrome_download_manager_delegate.cc -@@ -778,7 +778,7 @@ void ChromeDownloadManagerDelegate::OnDo +@@ -777,7 +777,7 @@ void ChromeDownloadManagerDelegate::OnDo target_info->is_filetype_handled_safely) DownloadItemModel(item).SetShouldPreferOpeningInBrowser(true); -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) if (item->GetOriginalMimeType() == "application/x-x509-user-cert") DownloadItemModel(item).SetShouldPreferOpeningInBrowser(true); #endif -@@ -793,7 +793,7 @@ void ChromeDownloadManagerDelegate::OnDo +@@ -792,7 +792,7 @@ void ChromeDownloadManagerDelegate::OnDo bool ChromeDownloadManagerDelegate::IsOpenInBrowserPreferreredForFile( const base::FilePath& path) { -#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) +#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) if (path.MatchesExtension(FILE_PATH_LITERAL(".pdf"))) { return !download_prefs_->ShouldOpenPdfInSystemReader(); } Index: head/www/chromium/files/patch-chrome_browser_download_download__commands.cc =================================================================== --- head/www/chromium/files/patch-chrome_browser_download_download__commands.cc (revision 436364) +++ head/www/chromium/files/patch-chrome_browser_download_download__commands.cc (revision 436365) @@ -1,38 +1,38 @@ ---- chrome/browser/download/download_commands.cc.orig 2017-01-26 00:49:08 UTC +--- chrome/browser/download/download_commands.cc.orig 2017-03-09 20:04:28 UTC +++ chrome/browser/download/download_commands.cc -@@ -217,7 +217,7 @@ bool DownloadCommands::IsCommandChecked( +@@ -218,7 +218,7 @@ bool DownloadCommands::IsCommandChecked( 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( download_item_->GetBrowserContext()); -@@ -261,7 +261,7 @@ void DownloadCommands::ExecuteCommand(Co +@@ -262,7 +262,7 @@ void DownloadCommands::ExecuteCommand(Co bool is_checked = IsCommandChecked(ALWAYS_OPEN_TYPE); DownloadPrefs* prefs = DownloadPrefs::FromBrowserContext( download_item_->GetBrowserContext()); -#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_) -@@ -374,7 +374,7 @@ Browser* DownloadCommands::GetBrowser() +@@ -375,7 +375,7 @@ Browser* DownloadCommands::GetBrowser() 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(); return path.MatchesExtension(FILE_PATH_LITERAL(".pdf")); -@@ -391,7 +391,7 @@ bool DownloadCommands::CanOpenPdfInSyste +@@ -392,7 +392,7 @@ bool DownloadCommands::CanOpenPdfInSyste 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_download_download__prefs.cc =================================================================== --- head/www/chromium/files/patch-chrome_browser_download_download__prefs.cc (revision 436364) +++ head/www/chromium/files/patch-chrome_browser_download_download__prefs.cc (revision 436365) @@ -1,65 +1,65 @@ ---- chrome/browser/download/download_prefs.cc.orig 2017-01-26 00:49:08 UTC +--- chrome/browser/download/download_prefs.cc.orig 2017-03-09 20:04:28 UTC +++ chrome/browser/download/download_prefs.cc @@ -56,7 +56,7 @@ namespace { // Consider downloads 'dangerous' if they go to the home directory on Linux and // to the desktop on any platform. bool DownloadPathIsDangerous(const base::FilePath& download_path) { -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) base::FilePath home_dir = base::GetHomeDir(); if (download_path == home_dir) { return true; @@ -136,7 +136,7 @@ DownloadPrefs::DownloadPrefs(Profile* pr GetDefaultDownloadDirectoryForProfile())); #endif // defined(OS_CHROMEOS) -#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) +#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) should_open_pdf_in_system_reader_ = - prefs->GetBoolean(prefs::kOpenPdfDownloadInSystemReader) || - prefs->GetBoolean(prefs::kPluginsAlwaysOpenPdfExternally); -@@ -215,7 +215,7 @@ void DownloadPrefs::RegisterProfilePrefs + prefs->GetBoolean(prefs::kOpenPdfDownloadInSystemReader); + #endif +@@ -213,7 +213,7 @@ void DownloadPrefs::RegisterProfilePrefs default_download_path); registry->RegisterFilePathPref(prefs::kSaveFileDefaultDirectory, default_download_path); -#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) +#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) registry->RegisterBooleanPref(prefs::kOpenPdfDownloadInSystemReader, false); #endif } -@@ -292,7 +292,7 @@ bool DownloadPrefs::IsDownloadPathManage +@@ -290,7 +290,7 @@ bool DownloadPrefs::IsDownloadPathManage } bool DownloadPrefs::IsAutoOpenUsed() const { -#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) +#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) if (ShouldOpenPdfInSystemReader()) return true; #endif -@@ -306,7 +306,7 @@ bool DownloadPrefs::IsAutoOpenEnabledBas +@@ -304,7 +304,7 @@ bool DownloadPrefs::IsAutoOpenEnabledBas return false; DCHECK(extension[0] == base::FilePath::kExtensionSeparator); extension.erase(0, 1); -#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) +#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) if (extension == FILE_PATH_LITERAL("pdf") && ShouldOpenPdfInSystemReader()) return true; #endif -@@ -340,7 +340,7 @@ void DownloadPrefs::DisableAutoOpenBased +@@ -338,7 +338,7 @@ void DownloadPrefs::DisableAutoOpenBased SaveAutoOpenState(); } -#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) +#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) void DownloadPrefs::SetShouldOpenPdfInSystemReader(bool should_open) { - should_open_pdf_in_system_reader_ = should_open || - profile_->GetPrefs()->GetBoolean(prefs::kPluginsAlwaysOpenPdfExternally); -@@ -365,7 +365,7 @@ void DownloadPrefs::DisableAdobeVersionC + if (should_open_pdf_in_system_reader_ == should_open) + return; +@@ -359,7 +359,7 @@ bool DownloadPrefs::ShouldOpenPdfInSyste #endif void DownloadPrefs::ResetAutoOpen() { -#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) +#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) SetShouldOpenPdfInSystemReader(false); #endif auto_open_.clear(); Index: head/www/chromium/files/patch-chrome_browser_download_download__prefs.h =================================================================== --- head/www/chromium/files/patch-chrome_browser_download_download__prefs.h (revision 436364) +++ head/www/chromium/files/patch-chrome_browser_download_download__prefs.h (revision 436365) @@ -1,20 +1,20 @@ ---- chrome/browser/download/download_prefs.h.orig 2017-01-26 00:49:08 UTC +--- chrome/browser/download/download_prefs.h.orig 2017-03-09 20:04:28 UTC +++ chrome/browser/download/download_prefs.h -@@ -80,7 +80,7 @@ class DownloadPrefs { +@@ -78,7 +78,7 @@ class DownloadPrefs { // Disables auto-open based on file extension. void DisableAutoOpenBasedOnExtension(const base::FilePath& file_name); -#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) +#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) // Store the user preference to disk. If |should_open| is true, also disable // the built-in PDF plugin. If |should_open| is false, enable the PDF plugin. void SetShouldOpenPdfInSystemReader(bool should_open); -@@ -115,7 +115,7 @@ class DownloadPrefs { +@@ -109,7 +109,7 @@ class DownloadPrefs { AutoOpenCompareFunctor> AutoOpenSet; AutoOpenSet auto_open_; -#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) +#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) bool should_open_pdf_in_system_reader_; - bool disable_adobe_version_check_for_tests_; #endif + Index: head/www/chromium/files/patch-chrome_browser_extensions_BUILD.gn =================================================================== --- head/www/chromium/files/patch-chrome_browser_extensions_BUILD.gn (revision 436364) +++ head/www/chromium/files/patch-chrome_browser_extensions_BUILD.gn (revision 436365) @@ -1,24 +1,24 @@ ---- chrome/browser/extensions/BUILD.gn.orig 2017-01-26 00:49:08 UTC +--- chrome/browser/extensions/BUILD.gn.orig 2017-03-09 20:04:28 UTC +++ chrome/browser/extensions/BUILD.gn -@@ -1024,7 +1024,7 @@ static_library("extensions") { +@@ -1034,7 +1034,7 @@ static_library("extensions") { sources -= [ "global_shortcut_listener_ozone.cc" ] } - if (is_linux) { + if (is_linux || is_bsd) { deps += [ "//build/linux:fontconfig" ] if (use_dbus) { -@@ -1115,6 +1115,12 @@ static_library("extensions") { +@@ -1127,6 +1127,12 @@ static_library("extensions") { defines += [ "ENABLE_HOTWORDING" ] } + if (is_bsd) { + sources -= [ + "api/image_writer_private/removable_storage_provider_linux.cc", + ] + } + if (enable_service_discovery) { sources += [ "api/gcd_private/gcd_private_api.cc", Index: head/www/chromium/files/patch-chrome_browser_extensions_api_messaging_message__service.cc =================================================================== --- head/www/chromium/files/patch-chrome_browser_extensions_api_messaging_message__service.cc (revision 436364) +++ head/www/chromium/files/patch-chrome_browser_extensions_api_messaging_message__service.cc (revision 436365) @@ -1,35 +1,35 @@ ---- chrome/browser/extensions/api/messaging/message_service.cc.orig 2017-01-26 00:49:08 UTC +--- chrome/browser/extensions/api/messaging/message_service.cc.orig 2017-03-09 20:04:28 UTC +++ chrome/browser/extensions/api/messaging/message_service.cc -@@ -119,7 +119,7 @@ MessageService::PolicyPermission Message +@@ -106,7 +106,7 @@ MessageService::PolicyPermission Message const char kReceivingEndDoesntExistError[] = "Could not establish connection. Receiving end does not exist."; -#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) +#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) const char kMissingPermissionError[] = "Access to native messaging requires nativeMessaging permission."; const char kProhibitedByPoliciesError[] = -@@ -414,7 +414,7 @@ void MessageService::OpenChannelToNative +@@ -383,7 +383,7 @@ void MessageService::OpenChannelToNative if (!source) return; -#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) +#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) content::WebContents* web_contents = content::WebContents::FromRenderFrameHost(source); ExtensionWebContentsObserver* extension_web_contents_observer = -@@ -477,12 +477,12 @@ void MessageService::OpenChannelToNative +@@ -447,12 +447,12 @@ void MessageService::OpenChannelToNative channel->opener->IncrementLazyKeepaliveCount(); AddChannel(std::move(channel), receiver_port_id); -#else // !(defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)) +#else // !(defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD)) const char kNativeMessagingNotSupportedError[] = "Native Messaging is not supported on this platform."; DispatchOnDisconnect( source, receiver_port_id, kNativeMessagingNotSupportedError); -#endif // !(defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)) +#endif // !(defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD)) } void MessageService::OpenChannelToTab(int source_process_id, 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 436364) +++ head/www/chromium/files/patch-chrome_browser_extensions_bookmark__app__helper.cc (revision 436365) @@ -1,11 +1,11 @@ ---- chrome/browser/extensions/bookmark_app_helper.cc.orig 2017-01-26 00:49:08 UTC +--- chrome/browser/extensions/bookmark_app_helper.cc.orig 2017-03-09 20:04:28 UTC +++ chrome/browser/extensions/bookmark_app_helper.cc -@@ -707,7 +707,7 @@ void BookmarkAppHelper::FinishInstallati +@@ -716,7 +716,7 @@ void BookmarkAppHelper::FinishInstallati #if !defined(OS_MACOSX) #if !defined(USE_ASH) web_app::ShortcutLocations creation_locations; -#if defined(OS_LINUX) || defined(OS_WIN) +#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_BSD) creation_locations.on_desktop = true; #else creation_locations.on_desktop = false; Index: head/www/chromium/files/patch-chrome_browser_extensions_browser__context__keyed__service__factories.cc =================================================================== --- head/www/chromium/files/patch-chrome_browser_extensions_browser__context__keyed__service__factories.cc (revision 436364) +++ head/www/chromium/files/patch-chrome_browser_extensions_browser__context__keyed__service__factories.cc (revision 436365) @@ -1,20 +1,20 @@ ---- chrome/browser/extensions/browser_context_keyed_service_factories.cc.orig 2017-01-26 00:49:08 UTC +--- chrome/browser/extensions/browser_context_keyed_service_factories.cc.orig 2017-03-09 20:04:28 UTC +++ chrome/browser/extensions/browser_context_keyed_service_factories.cc -@@ -62,7 +62,7 @@ +@@ -63,7 +63,7 @@ #include "chrome/browser/chromeos/extensions/media_player_api.h" #include "chrome/browser/extensions/api/input_ime/input_ime_api.h" #include "chrome/browser/extensions/api/log_private/log_private_api.h" -#elif defined(OS_LINUX) || defined(OS_WIN) +#elif defined(OS_LINUX) || defined(OS_WIN) || defined(OS_BSD) #include "chrome/browser/extensions/api/input_ime/input_ime_api.h" #endif -@@ -110,7 +110,7 @@ void EnsureBrowserContextKeyedServiceFac +@@ -111,7 +111,7 @@ void EnsureBrowserContextKeyedServiceFac #if defined(OS_CHROMEOS) extensions::InputImeAPI::GetFactoryInstance(); extensions::InputMethodAPI::GetFactoryInstance(); -#elif defined(OS_LINUX) || defined(OS_WIN) +#elif defined(OS_LINUX) || defined(OS_WIN) && !defined(OS_BSD) extensions::InputImeAPI::GetFactoryInstance(); #endif extensions::LanguageSettingsPrivateDelegateFactory::GetInstance(); Index: head/www/chromium/files/patch-chrome_browser_interstitials_chrome__controller__client.cc =================================================================== --- head/www/chromium/files/patch-chrome_browser_interstitials_chrome__controller__client.cc (revision 436364) +++ head/www/chromium/files/patch-chrome_browser_interstitials_chrome__controller__client.cc (revision 436365) @@ -1,20 +1,20 @@ ---- chrome/browser/interstitials/chrome_controller_client.cc.orig 2017-01-26 00:49:08 UTC +--- chrome/browser/interstitials/chrome_controller_client.cc.orig 2017-03-09 20:04:28 UTC +++ chrome/browser/interstitials/chrome_controller_client.cc -@@ -49,7 +49,7 @@ void LaunchDateAndTimeSettingsOnFileThre +@@ -46,7 +46,7 @@ void LaunchDateAndTimeSettingsOnFileThre #if defined(OS_ANDROID) chrome::android::OpenDateAndTimeSettings(); -#elif defined(OS_LINUX) +#elif defined(OS_LINUX) || defined(OS_BSD) struct ClockCommand { const char* const pathname; const char* const argument; -@@ -136,7 +136,7 @@ void ChromeControllerClient::set_interst +@@ -131,7 +131,7 @@ ChromeControllerClient::~ChromeControlle bool ChromeControllerClient::CanLaunchDateAndTimeSettings() { #if defined(OS_ANDROID) || defined(OS_CHROMEOS) || defined(OS_LINUX) || \ - defined(OS_MACOSX) || defined(OS_WIN) + defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD) return true; #else return false; Index: head/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__log__uploader.cc =================================================================== --- head/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__log__uploader.cc (revision 436364) +++ head/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__log__uploader.cc (revision 436365) @@ -1,11 +1,11 @@ ---- chrome/browser/media/webrtc/webrtc_log_uploader.cc.orig 2017-01-26 00:49:08 UTC +--- chrome/browser/media/webrtc/webrtc_log_uploader.cc.orig 2017-03-09 20:04:28 UTC +++ chrome/browser/media/webrtc/webrtc_log_uploader.cc -@@ -344,6 +344,8 @@ void WebRtcLogUploader::SetupMultipart( +@@ -343,6 +343,8 @@ void WebRtcLogUploader::SetupMultipart( const char product[] = "Chrome_Android"; #elif defined(OS_CHROMEOS) const char product[] = "Chrome_ChromeOS"; +#elif defined(OS_FREEBSD) + const char product[] = "Chrome_FreeBSD"; #else #error Platform not supported. #endif Index: 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 436364) +++ head/www/chromium/files/patch-chrome_browser_notifications_message__center__notification__manager.cc (revision 436365) @@ -1,11 +1,11 @@ ---- chrome/browser/notifications/message_center_notification_manager.cc.orig 2017-01-26 00:49:08 UTC +--- chrome/browser/notifications/message_center_notification_manager.cc.orig 2017-03-09 20:04:28 UTC +++ chrome/browser/notifications/message_center_notification_manager.cc -@@ -67,7 +67,7 @@ MessageCenterNotificationManager::Messag +@@ -66,7 +66,7 @@ MessageCenterNotificationManager::Messag 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()); Index: head/www/chromium/files/patch-chrome_browser_password__manager_chrome__password__manager__client.cc =================================================================== --- head/www/chromium/files/patch-chrome_browser_password__manager_chrome__password__manager__client.cc (revision 436364) +++ head/www/chromium/files/patch-chrome_browser_password__manager_chrome__password__manager__client.cc (revision 436365) @@ -1,14 +1,14 @@ ---- chrome/browser/password_manager/chrome_password_manager_client.cc.orig 2017-01-26 00:49:08 UTC +--- chrome/browser/password_manager/chrome_password_manager_client.cc.orig 2017-03-09 20:04:28 UTC +++ chrome/browser/password_manager/chrome_password_manager_client.cc @@ -57,7 +57,11 @@ - #include "content/public/browser/web_contents.h" + #include "content/public/common/origin_util.h" #include "google_apis/gaia/gaia_urls.h" #include "net/base/url_util.h" +#if defined(OS_BSD) +#include +#else #include "third_party/re2/src/re2/re2.h" +#endif - #if BUILDFLAG(ANDROID_JAVA_UI) + #if defined(OS_ANDROID) #include "chrome/browser/android/tab_android.h" Index: head/www/chromium/files/patch-chrome_browser_policy_policy__prefs__browsertest.cc =================================================================== --- head/www/chromium/files/patch-chrome_browser_policy_policy__prefs__browsertest.cc (revision 436364) +++ head/www/chromium/files/patch-chrome_browser_policy_policy__prefs__browsertest.cc (revision 436365) @@ -1,11 +1,11 @@ ---- chrome/browser/policy/policy_prefs_browsertest.cc.orig 2017-01-26 00:49:08 UTC +--- chrome/browser/policy/policy_prefs_browsertest.cc.orig 2017-03-09 20:04:28 UTC +++ chrome/browser/policy/policy_prefs_browsertest.cc -@@ -175,6 +175,8 @@ class PolicyTestCase { +@@ -180,6 +180,8 @@ class PolicyTestCase { const std::string os("chromeos"); #elif defined(OS_LINUX) const std::string os("linux"); +#elif defined(OS_FREEBSD) + const std::string os("freebsd"); #else #error "Unknown platform" #endif Index: head/www/chromium/files/patch-chrome_browser_renderer__context__menu_render__view__context__menu.cc =================================================================== --- head/www/chromium/files/patch-chrome_browser_renderer__context__menu_render__view__context__menu.cc (revision 436364) +++ head/www/chromium/files/patch-chrome_browser_renderer__context__menu_render__view__context__menu.cc (revision 436365) @@ -1,29 +1,29 @@ ---- chrome/browser/renderer_context_menu/render_view_context_menu.cc.orig 2017-01-26 00:49:08 UTC +--- chrome/browser/renderer_context_menu/render_view_context_menu.cc.orig 2017-03-09 20:04:28 UTC +++ chrome/browser/renderer_context_menu/render_view_context_menu.cc -@@ -1367,7 +1367,7 @@ void RenderViewContextMenu::AppendEditab +@@ -1389,7 +1389,7 @@ void RenderViewContextMenu::AppendEditab // 'Undo' and 'Redo' for text input with no suggestions and no text selected. // We make an exception for OS X as context clicking will select the closest // word. In this case both items are always shown. -#if defined(OS_MACOSX) +#if defined(OS_MACOSX) || defined(OS_BSD) menu_model_.AddItemWithStringId(IDC_CONTENT_CONTEXT_UNDO, IDS_CONTENT_CONTEXT_UNDO); menu_model_.AddItemWithStringId(IDC_CONTENT_CONTEXT_REDO, -@@ -1403,7 +1403,7 @@ void RenderViewContextMenu::AppendLangua +@@ -1427,7 +1427,7 @@ void RenderViewContextMenu::AppendLangua if (!use_spelling) return; -#if defined(OS_MACOSX) +#if defined(OS_MACOSX) || defined(OS_BSD) menu_model_.AddItemWithStringId(IDC_CONTENT_CONTEXT_LANGUAGE_SETTINGS, IDS_CONTENT_CONTEXT_LANGUAGE_SETTINGS); #else -@@ -1645,7 +1645,7 @@ bool RenderViewContextMenu::IsCommandIdE +@@ -1665,7 +1665,7 @@ bool RenderViewContextMenu::IsCommandIdE case IDC_CHECK_SPELLING_WHILE_TYPING: return prefs->GetBoolean(spellcheck::prefs::kEnableSpellcheck); -#if !defined(OS_MACOSX) && defined(OS_POSIX) +#if !defined(OS_MACOSX) && !defined(OS_BSD) && defined(OS_POSIX) // TODO(suzhe): this should not be enabled for password fields. case IDC_INPUT_METHODS_MENU: return true; Index: head/www/chromium/files/patch-chrome_browser_renderer__preferences__util.cc =================================================================== --- head/www/chromium/files/patch-chrome_browser_renderer__preferences__util.cc (revision 436364) +++ head/www/chromium/files/patch-chrome_browser_renderer__preferences__util.cc (revision 436365) @@ -1,38 +1,38 @@ ---- chrome/browser/renderer_preferences_util.cc.orig 2017-01-26 00:49:08 UTC +--- chrome/browser/renderer_preferences_util.cc.orig 2017-03-09 20:04:28 UTC +++ chrome/browser/renderer_preferences_util.cc -@@ -19,7 +19,7 @@ +@@ -20,7 +20,7 @@ #include "third_party/WebKit/public/public_features.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 -@@ -31,7 +31,7 @@ +@@ -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" -@@ -133,7 +133,7 @@ void UpdateFromSystemSettings(content::R +@@ -134,7 +134,7 @@ void UpdateFromSystemSettings(content::R prefs->caret_blink_interval = interval.InSecondsF(); #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()) { -@@ -155,7 +155,7 @@ void UpdateFromSystemSettings(content::R +@@ -156,7 +156,7 @@ void UpdateFromSystemSettings(content::R } #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; Index: head/www/chromium/files/patch-chrome_browser_resources_safe__browsing_gen__file__type__proto.py =================================================================== --- head/www/chromium/files/patch-chrome_browser_resources_safe__browsing_gen__file__type__proto.py (revision 436364) +++ head/www/chromium/files/patch-chrome_browser_resources_safe__browsing_gen__file__type__proto.py (revision 436365) @@ -1,19 +1,19 @@ ---- chrome/browser/resources/safe_browsing/gen_file_type_proto.py.orig 2017-01-26 00:49:09 UTC +--- chrome/browser/resources/safe_browsing/gen_file_type_proto.py.orig 2017-03-09 20:04:28 UTC +++ chrome/browser/resources/safe_browsing/gen_file_type_proto.py -@@ -50,6 +50,7 @@ def PlatformTypes(): - "android": config_pb2.DownloadFileType.PLATFORM_ANDROID, - "chromeos": config_pb2.DownloadFileType.PLATFORM_CHROME_OS, - "linux": config_pb2.DownloadFileType.PLATFORM_LINUX, -+ "bsd": config_pb2.DownloadFileType.PLATFORM_LINUX, - "mac": config_pb2.DownloadFileType.PLATFORM_MAC, - "win": config_pb2.DownloadFileType.PLATFORM_WINDOWS, +@@ -31,6 +31,7 @@ def PlatformTypes(): + "android": download_file_types_pb2.DownloadFileType.PLATFORM_ANDROID, + "chromeos": download_file_types_pb2.DownloadFileType.PLATFORM_CHROME_OS, + "linux": download_file_types_pb2.DownloadFileType.PLATFORM_LINUX, ++ "bsd": download_file_types_pb2.DownloadFileType.PLATFORM_LINUX, + "mac": download_file_types_pb2.DownloadFileType.PLATFORM_MAC, + "win": download_file_types_pb2.DownloadFileType.PLATFORM_WINDOWS, } -@@ -201,7 +202,7 @@ def main(): - 'Outfile must have a %d for version and %s for platform.') - parser.add_option('-t', '--type', - help='The platform type. One of android, chromeos, ' + -- 'linux, mac, win') -+ 'linux, bsd, mac, win') - parser.add_option('-i', '--infile', - help='The ASCII DownloadFileType-proto file to read.') - parser.add_option('-d', '--outdir', +@@ -169,7 +170,7 @@ class DownloadFileTypeProtoGenerator(Bin + 'Outfile must have a %d for version and %s for platform.') + parser.add_option('-t', '--type', + help='The platform type. One of android, chromeos, ' + +- 'linux, mac, win') ++ 'linux, bsd, mac, win') + + def AddExtraCommandLineArgsForVirtualEnvRun(self, opts, command): + if opts.type is not None: Index: head/www/chromium/files/patch-chrome_browser_sync_chrome__sync__client.cc =================================================================== --- head/www/chromium/files/patch-chrome_browser_sync_chrome__sync__client.cc (revision 436364) +++ head/www/chromium/files/patch-chrome_browser_sync_chrome__sync__client.cc (revision 436365) @@ -1,11 +1,11 @@ ---- chrome/browser/sync/chrome_sync_client.cc.orig 2017-01-26 00:49:09 UTC +--- chrome/browser/sync/chrome_sync_client.cc.orig 2017-03-09 20:04:29 UTC +++ chrome/browser/sync/chrome_sync_client.cc -@@ -578,7 +578,7 @@ void ChromeSyncClient::RegisterDesktopDa +@@ -592,7 +592,7 @@ void ChromeSyncClient::RegisterDesktopDa } #endif -#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_CHROMEOS) || defined(OS_BSD) // Dictionary sync is enabled by default. if (!disabled_types.Has(syncer::DICTIONARY)) { sync_service->RegisterDataTypeController( Index: head/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group.cc =================================================================== --- head/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group.cc (revision 436364) +++ head/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group.cc (revision 436365) @@ -1,56 +1,56 @@ ---- chrome/browser/task_manager/sampling/task_group.cc.orig 2017-02-02 02:02:49 UTC +--- chrome/browser/task_manager/sampling/task_group.cc.orig 2017-03-09 20:04:29 UTC +++ chrome/browser/task_manager/sampling/task_group.cc -@@ -25,9 +25,9 @@ const int kBackgroundRefreshTypesMask = - REFRESH_TYPE_CPU | - REFRESH_TYPE_MEMORY | - REFRESH_TYPE_IDLE_WAKEUPS | +@@ -28,9 +28,9 @@ const int kBackgroundRefreshTypesMask = + #if defined(OS_WIN) + REFRESH_TYPE_START_TIME | REFRESH_TYPE_CPU_TIME | + #endif // defined(OS_WIN) -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) REFRESH_TYPE_FD_COUNT | -#endif // defined(OS_LINUX) +#endif // defined(OS_LINUX) || defined(OS_BSD) REFRESH_TYPE_PRIORITY; #if defined(OS_WIN) -@@ -88,9 +88,9 @@ TaskGroup::TaskGroup( +@@ -92,9 +92,9 @@ TaskGroup::TaskGroup( nacl_debug_stub_port_(-1), #endif // !defined(DISABLE_NACL) idle_wakeups_per_second_(-1), -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) open_fd_count_(-1), -#endif // defined(OS_LINUX) +#endif // defined(OS_LINUX) || defined(OS_BSD) gpu_memory_has_duplicates_(false), is_backgrounded_(false), weak_ptr_factory_(this) { -@@ -103,10 +103,10 @@ TaskGroup::TaskGroup( +@@ -107,10 +107,10 @@ TaskGroup::TaskGroup( weak_ptr_factory_.GetWeakPtr()), base::Bind(&TaskGroup::OnIdleWakeupsRefreshDone, weak_ptr_factory_.GetWeakPtr()), -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) base::Bind(&TaskGroup::OnOpenFdCountRefreshDone, weak_ptr_factory_.GetWeakPtr()), -#endif // defined(OS_LINUX) +#endif // defined(OS_LINUX) || defined(OS_BSD) base::Bind(&TaskGroup::OnProcessPriorityDone, weak_ptr_factory_.GetWeakPtr()))); worker_thread_sampler_.swap(sampler); -@@ -282,14 +282,14 @@ void TaskGroup::OnIdleWakeupsRefreshDone +@@ -313,14 +313,14 @@ void TaskGroup::OnIdleWakeupsRefreshDone OnBackgroundRefreshTypeFinished(REFRESH_TYPE_IDLE_WAKEUPS); } -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) void TaskGroup::OnOpenFdCountRefreshDone(int open_fd_count) { DCHECK_CURRENTLY_ON(content::BrowserThread::UI); open_fd_count_ = open_fd_count; OnBackgroundRefreshTypeFinished(REFRESH_TYPE_FD_COUNT); } -#endif // defined(OS_LINUX) +#endif // defined(OS_LINUX) || defined(OS_BSD) void TaskGroup::OnProcessPriorityDone(bool is_backgrounded) { DCHECK_CURRENTLY_ON(content::BrowserThread::UI); Index: head/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group.h =================================================================== --- head/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group.h (revision 436364) +++ head/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group.h (revision 436365) @@ -1,39 +1,39 @@ ---- chrome/browser/task_manager/sampling/task_group.h.orig 2017-02-02 02:02:49 UTC +--- chrome/browser/task_manager/sampling/task_group.h.orig 2017-03-09 20:04:29 UTC +++ chrome/browser/task_manager/sampling/task_group.h -@@ -91,9 +91,9 @@ class TaskGroup { +@@ -96,9 +96,9 @@ class TaskGroup { int nacl_debug_stub_port() const { return nacl_debug_stub_port_; } #endif // !defined(DISABLE_NACL) -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) int open_fd_count() const { return open_fd_count_; } -#endif // defined(OS_LINUX) +#endif // defined(OS_LINUX) || defined(OS_BSD) int idle_wakeups_per_second() const { return idle_wakeups_per_second_; } -@@ -112,9 +112,9 @@ class TaskGroup { +@@ -121,9 +121,9 @@ class TaskGroup { void OnIdleWakeupsRefreshDone(int idle_wakeups_per_second); -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) void OnOpenFdCountRefreshDone(int open_fd_count); -#endif // defined(OS_LINUX) +#endif // defined(OS_LINUX) || defined(OS_BSD) void OnProcessPriorityDone(bool is_backgrounded); -@@ -159,10 +159,10 @@ class TaskGroup { +@@ -171,10 +171,10 @@ class TaskGroup { int nacl_debug_stub_port_; #endif // !defined(DISABLE_NACL) int idle_wakeups_per_second_; -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) // The number of file descriptors currently open by the process. int open_fd_count_; -#endif // defined(OS_LINUX) +#endif // defined(OS_LINUX) || defined(OS_BSD) bool gpu_memory_has_duplicates_; bool is_backgrounded_; Index: head/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__manager__impl.cc =================================================================== --- head/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__manager__impl.cc (revision 436364) +++ head/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__manager__impl.cc (revision 436365) @@ -1,16 +1,16 @@ ---- chrome/browser/task_manager/sampling/task_manager_impl.cc.orig 2017-02-02 02:02:49 UTC +--- chrome/browser/task_manager/sampling/task_manager_impl.cc.orig 2017-03-09 20:04:29 UTC +++ chrome/browser/task_manager/sampling/task_manager_impl.cc -@@ -160,11 +160,11 @@ void TaskManagerImpl::GetUSERHandles(Tas +@@ -184,11 +184,11 @@ void TaskManagerImpl::GetUSERHandles(Tas } int TaskManagerImpl::GetOpenFdCount(TaskId task_id) const { -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) return GetTaskGroupByTaskId(task_id)->open_fd_count(); #else return -1; -#endif // defined(OS_LINUX) +#endif // defined(OS_LINUX) || defined(OS_BSD) } bool TaskManagerImpl::IsTaskOnBackgroundedProcess(TaskId task_id) const { Index: head/www/chromium/files/patch-chrome_browser_task__manager_task__manager__observer.h =================================================================== --- head/www/chromium/files/patch-chrome_browser_task__manager_task__manager__observer.h (revision 436364) +++ head/www/chromium/files/patch-chrome_browser_task__manager_task__manager__observer.h (revision 436365) @@ -1,16 +1,16 @@ ---- chrome/browser/task_manager/task_manager_observer.h.orig 2017-02-02 02:02:49 UTC +--- chrome/browser/task_manager/task_manager_observer.h.orig 2017-03-09 20:04:29 UTC +++ chrome/browser/task_manager/task_manager_observer.h -@@ -40,11 +40,11 @@ enum RefreshType { +@@ -42,11 +42,11 @@ enum RefreshType { // or backgrounded. - REFRESH_TYPE_PRIORITY = 1 << 11, + REFRESH_TYPE_PRIORITY = 1 << 13, -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) // For observers interested in getting the number of open file descriptors of // processes. - REFRESH_TYPE_FD_COUNT = 1 << 12, + REFRESH_TYPE_FD_COUNT = 1 << 14, -#endif // defined(OS_LINUX) +#endif // defined(OS_LINUX) || defined(OS_BSD) - REFRESH_TYPE_MEMORY = REFRESH_TYPE_PHYSICAL_MEMORY | - REFRESH_TYPE_MEMORY_DETAILS, + REFRESH_TYPE_MEMORY_STATE = 1 << 15, + Index: head/www/chromium/files/patch-chrome_browser_tracing_crash__service__uploader.cc =================================================================== --- head/www/chromium/files/patch-chrome_browser_tracing_crash__service__uploader.cc (revision 436364) +++ head/www/chromium/files/patch-chrome_browser_tracing_crash__service__uploader.cc (revision 436365) @@ -1,11 +1,11 @@ ---- chrome/browser/tracing/crash_service_uploader.cc.orig 2017-01-26 00:49:09 UTC +--- chrome/browser/tracing/crash_service_uploader.cc.orig 2017-03-09 20:04:29 UTC +++ chrome/browser/tracing/crash_service_uploader.cc -@@ -156,6 +156,8 @@ void TraceCrashServiceUploader::DoUpload +@@ -155,6 +155,8 @@ void TraceCrashServiceUploader::DoUpload const char product[] = "Chrome_Android"; #elif defined(OS_CHROMEOS) const char product[] = "Chrome_ChromeOS"; +#elif defined(OS_FREEBSD) + const char product[] = "Chrome_FreeBSD"; #else #error Platform not supported. #endif Index: head/www/chromium/files/patch-chrome_browser_ui_BUILD.gn =================================================================== --- head/www/chromium/files/patch-chrome_browser_ui_BUILD.gn (revision 436364) +++ head/www/chromium/files/patch-chrome_browser_ui_BUILD.gn (revision 436365) @@ -1,11 +1,11 @@ ---- chrome/browser/ui/BUILD.gn.orig 2017-01-26 00:49:09 UTC +--- chrome/browser/ui/BUILD.gn.orig 2017-03-09 20:04:29 UTC +++ chrome/browser/ui/BUILD.gn -@@ -3090,7 +3090,7 @@ split_static_library("ui") { +@@ -3122,7 +3122,7 @@ split_static_library("ui") { ] } } - if (is_linux) { # Both desktop Linux and ChromeOS. + if (is_linux || is_bsd) { # Both desktop Linux and ChromeOS. sources += [ "certificate_dialogs.cc", "certificate_dialogs.h", Index: head/www/chromium/files/patch-chrome_browser_ui_browser__command__controller.cc =================================================================== --- head/www/chromium/files/patch-chrome_browser_ui_browser__command__controller.cc (revision 436364) +++ head/www/chromium/files/patch-chrome_browser_ui_browser__command__controller.cc (revision 436365) @@ -1,38 +1,38 @@ ---- chrome/browser/ui/browser_command_controller.cc.orig 2017-01-26 00:49:09 UTC +--- chrome/browser/ui/browser_command_controller.cc.orig 2017-03-09 20:04:29 UTC +++ chrome/browser/ui/browser_command_controller.cc -@@ -81,7 +81,7 @@ +@@ -80,7 +80,7 @@ #include "chrome/browser/ui/browser_commands_chromeos.h" #endif -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) #include "ui/base/ime/linux/text_edit_key_bindings_delegate_auralinux.h" #endif -@@ -203,7 +203,7 @@ bool BrowserCommandController::IsReserve +@@ -202,7 +202,7 @@ bool BrowserCommandController::IsReserve if (window()->IsFullscreen() && command_id == IDC_FULLSCREEN) return true; -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) // If this key was registered by the user as a content editing hotkey, then // it is not reserved. ui::TextEditKeyBindingsDelegateAuraLinux* delegate = -@@ -406,7 +406,7 @@ void BrowserCommandController::ExecuteCo +@@ -405,7 +405,7 @@ void BrowserCommandController::ExecuteCo break; #endif -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) case IDC_USE_SYSTEM_TITLE_BAR: { PrefService* prefs = browser_->profile()->GetPrefs(); prefs->SetBoolean(prefs::kUseCustomChromeFrame, -@@ -766,7 +766,7 @@ void BrowserCommandController::InitComma +@@ -765,7 +765,7 @@ void BrowserCommandController::InitComma command_updater_.UpdateCommandEnabled(IDC_VISIT_DESKTOP_OF_LRU_USER_2, true); command_updater_.UpdateCommandEnabled(IDC_VISIT_DESKTOP_OF_LRU_USER_3, true); #endif -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) command_updater_.UpdateCommandEnabled(IDC_USE_SYSTEM_TITLE_BAR, true); #endif Index: head/www/chromium/files/patch-chrome_browser_ui_input__method_input__method__engine__base.cc =================================================================== --- head/www/chromium/files/patch-chrome_browser_ui_input__method_input__method__engine__base.cc (revision 436364) +++ head/www/chromium/files/patch-chrome_browser_ui_input__method_input__method__engine__base.cc (revision 436365) @@ -1,11 +1,11 @@ ---- chrome/browser/ui/input_method/input_method_engine_base.cc.orig 2017-01-26 00:49:09 UTC +--- chrome/browser/ui/input_method/input_method_engine_base.cc.orig 2017-03-09 20:04:29 UTC +++ chrome/browser/ui/input_method/input_method_engine_base.cc -@@ -37,7 +37,7 @@ +@@ -35,7 +35,7 @@ + #include "ui/base/ime/chromeos/ime_keymap.h" #elif defined(OS_WIN) - #include "ui/events/keycodes/dom/keycode_converter.h" #include "ui/events/keycodes/keyboard_codes_win.h" -#elif defined(OS_LINUX) +#elif defined(OS_LINUX) || defined(OS_BSD) - #include "ui/events/keycodes/dom/keycode_converter.h" #include "ui/events/keycodes/keyboard_codes_posix.h" #endif + Index: head/www/chromium/files/patch-chrome_browser_ui_libgtkui_BUILD.gn =================================================================== --- head/www/chromium/files/patch-chrome_browser_ui_libgtkui_BUILD.gn (revision 436364) +++ head/www/chromium/files/patch-chrome_browser_ui_libgtkui_BUILD.gn (revision 436365) @@ -1,11 +1,11 @@ ---- chrome/browser/ui/libgtkui/BUILD.gn.orig 2017-01-26 00:49:09 UTC +--- chrome/browser/ui/libgtkui/BUILD.gn.orig 2017-03-09 20:04:29 UTC +++ chrome/browser/ui/libgtkui/BUILD.gn @@ -2,7 +2,7 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -assert(is_linux, "This file should only be referenced on Linux") +assert(is_linux || is_bsd, "This file should only be referenced on Linux") import("//build/config/features.gni") - import("//build/config/ui.gni") + import("//build/config/linux/gtk/gtk.gni") Index: head/www/chromium/files/patch-chrome_browser_ui_libgtkui_print__dialog__gtk.cc =================================================================== --- head/www/chromium/files/patch-chrome_browser_ui_libgtkui_print__dialog__gtk.cc (revision 436364) +++ head/www/chromium/files/patch-chrome_browser_ui_libgtkui_print__dialog__gtk.cc (revision 436365) @@ -1,10 +1,10 @@ ---- chrome/browser/ui/libgtkui/print_dialog_gtk.cc.orig 2017-01-26 00:49:09 UTC +--- chrome/browser/ui/libgtkui/print_dialog_gtk.cc.orig 2017-03-09 20:04:29 UTC +++ chrome/browser/ui/libgtkui/print_dialog_gtk.cc -@@ -348,6 +348,7 @@ void PrintDialogGtk2::ShowDialog( +@@ -347,6 +347,7 @@ void PrintDialogGtk2::ShowDialog( // Since we only generate PDF, only show printers that support PDF. // TODO(thestig) Add more capabilities to support? GtkPrintCapabilities cap = static_cast( + GTK_PRINT_CAPABILITY_GENERATE_PS | GTK_PRINT_CAPABILITY_GENERATE_PDF | GTK_PRINT_CAPABILITY_PAGE_SET | GTK_PRINT_CAPABILITY_COPIES | Index: head/www/chromium/files/patch-chrome_browser_ui_startup_bad__flags__prompt.cc =================================================================== --- head/www/chromium/files/patch-chrome_browser_ui_startup_bad__flags__prompt.cc (revision 436364) +++ head/www/chromium/files/patch-chrome_browser_ui_startup_bad__flags__prompt.cc (revision 436365) @@ -1,11 +1,11 @@ ---- chrome/browser/ui/startup/bad_flags_prompt.cc.orig 2017-01-26 00:49:09 UTC +--- chrome/browser/ui/startup/bad_flags_prompt.cc.orig 2017-03-09 20:04:29 UTC +++ chrome/browser/ui/startup/bad_flags_prompt.cc -@@ -71,7 +71,7 @@ void ShowBadFlagsPrompt(Browser* browser +@@ -72,7 +72,7 @@ void ShowBadFlagsPrompt(Browser* browser // This flag gives extensions more powers. extensions::switches::kExtensionsOnChromeURLs, -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) // Speech dispatcher is buggy, it can crash and it can make Chrome freeze. // http://crbug.com/327295 switches::kEnableSpeechDispatcher, Index: head/www/chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator.cc =================================================================== --- head/www/chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator.cc (revision 436364) +++ head/www/chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator.cc (revision 436365) @@ -1,23 +1,23 @@ ---- chrome/browser/ui/startup/startup_browser_creator.cc.orig 2017-02-02 02:02:50 UTC +--- chrome/browser/ui/startup/startup_browser_creator.cc.orig 2017-03-09 20:04:29 UTC +++ chrome/browser/ui/startup/startup_browser_creator.cc @@ -95,7 +95,7 @@ #include "components/user_manager/user_manager.h" #endif -#if defined(TOOLKIT_VIEWS) && defined(OS_LINUX) +#if defined(TOOLKIT_VIEWS) && (defined(OS_LINUX) || defined(OS_BSD)) #include "ui/events/devices/x11/touch_factory_x11.h" // nogncheck #endif -@@ -651,9 +651,11 @@ bool StartupBrowserCreator::ProcessCmdLi +@@ -657,9 +657,11 @@ bool StartupBrowserCreator::ProcessCmdLi } #endif // OS_CHROMEOS +#if 0 /* XXX */ #if defined(TOOLKIT_VIEWS) && defined(USE_X11) ui::TouchFactory::SetTouchDeviceListFromCommandLine(); #endif +#endif #if defined(OS_MACOSX) if (web_app::MaybeRebuildShortcut(command_line)) Index: head/www/chromium/files/patch-chrome_browser_ui_task__manager_task__manager__columns.cc =================================================================== --- head/www/chromium/files/patch-chrome_browser_ui_task__manager_task__manager__columns.cc (revision 436364) +++ head/www/chromium/files/patch-chrome_browser_ui_task__manager_task__manager__columns.cc (revision 436365) @@ -1,15 +1,15 @@ ---- chrome/browser/ui/task_manager/task_manager_columns.cc.orig 2017-02-02 02:02:50 UTC +--- chrome/browser/ui/task_manager/task_manager_columns.cc.orig 2017-03-09 20:04:29 UTC +++ chrome/browser/ui/task_manager/task_manager_columns.cc -@@ -74,10 +74,10 @@ const TableColumnData kColumns[] = { +@@ -80,10 +80,10 @@ const TableColumnData kColumns[] = { { IDS_TASK_MANAGER_IDLE_WAKEUPS_COLUMN, ui::TableColumn::RIGHT, -1, 0, arraysize("idlewakeups") * kCharWidth, -1, true, false, false }, -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) { IDS_TASK_MANAGER_OPEN_FD_COUNT_COLUMN, ui::TableColumn::RIGHT, -1, 0, arraysize("999") * kCharWidth, -1, true, false, false }, -#endif // defined(OS_LINUX) +#endif // defined(OS_LINUX) || defined(OS_BSD) { IDS_TASK_MANAGER_PROCESS_PRIORITY_COLUMN, ui::TableColumn::LEFT, -1, 0, arraysize("background") * kCharWidth, -1, true, true, false }, - }; + { IDS_TASK_MANAGER_MEMORY_STATE_COLUMN, ui::TableColumn::LEFT, -1, 0, Index: head/www/chromium/files/patch-chrome_browser_ui_task__manager_task__manager__table__model.cc =================================================================== --- head/www/chromium/files/patch-chrome_browser_ui_task__manager_task__manager__table__model.cc (revision 436364) +++ head/www/chromium/files/patch-chrome_browser_ui_task__manager_task__manager__table__model.cc (revision 436365) @@ -1,50 +1,50 @@ ---- chrome/browser/ui/task_manager/task_manager_table_model.cc.orig 2017-02-02 02:02:50 UTC +--- chrome/browser/ui/task_manager/task_manager_table_model.cc.orig 2017-03-09 20:04:29 UTC +++ chrome/browser/ui/task_manager/task_manager_table_model.cc -@@ -390,13 +390,13 @@ base::string16 TaskManagerTableModel::Ge +@@ -443,13 +443,13 @@ base::string16 TaskManagerTableModel::Ge ? stringifier_->backgrounded_string() : stringifier_->foregrounded_string(); -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) case IDS_TASK_MANAGER_OPEN_FD_COUNT_COLUMN: { const int fd_count = observed_task_manager()->GetOpenFdCount(tasks_[row]); return fd_count >= 0 ? base::FormatNumber(fd_count) : stringifier_->n_a_string(); } -#endif // defined(OS_LINUX) +#endif // defined(OS_LINUX) || defined(OS_BSD) - default: - NOTREACHED(); -@@ -540,7 +540,7 @@ int TaskManagerTableModel::CompareValues + case IDS_TASK_MANAGER_MEMORY_STATE_COLUMN: { + return stringifier_->GetMemoryStateText( +@@ -607,7 +607,7 @@ int TaskManagerTableModel::CompareValues return BooleanCompare(is_proc1_bg, is_proc2_bg); } -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) case IDS_TASK_MANAGER_OPEN_FD_COUNT_COLUMN: { const int proc1_fd_count = observed_task_manager()->GetOpenFdCount(tasks_[row1]); -@@ -548,7 +548,7 @@ int TaskManagerTableModel::CompareValues +@@ -615,7 +615,7 @@ int TaskManagerTableModel::CompareValues observed_task_manager()->GetOpenFdCount(tasks_[row2]); return ValueCompare(proc1_fd_count, proc2_fd_count); } -#endif // defined(OS_LINUX) +#endif // defined(OS_LINUX) || defined(OS_BSD) default: NOTREACHED(); -@@ -699,11 +699,11 @@ void TaskManagerTableModel::UpdateRefres - type = REFRESH_TYPE_PRIORITY; +@@ -778,11 +778,11 @@ void TaskManagerTableModel::UpdateRefres + type = REFRESH_TYPE_MEMORY_STATE; break; -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) case IDS_TASK_MANAGER_OPEN_FD_COUNT_COLUMN: type = REFRESH_TYPE_FD_COUNT; break; -#endif // defined(OS_LINUX) +#endif // defined(OS_LINUX) || defined(OS_BSD) default: NOTREACHED(); Index: head/www/chromium/files/patch-chrome_browser_ui_views_accelerator__table.cc =================================================================== --- head/www/chromium/files/patch-chrome_browser_ui_views_accelerator__table.cc (revision 436364) +++ head/www/chromium/files/patch-chrome_browser_ui_views_accelerator__table.cc (revision 436365) @@ -1,29 +1,29 @@ ---- chrome/browser/ui/views/accelerator_table.cc.orig 2017-02-02 02:02:50 UTC +--- chrome/browser/ui/views/accelerator_table.cc.orig 2017-03-09 20:04:29 UTC +++ chrome/browser/ui/views/accelerator_table.cc -@@ -72,7 +72,7 @@ const AcceleratorMapping kAcceleratorMap - { ui::VKEY_S, ui::EF_CONTROL_DOWN, IDC_SAVE_PAGE }, +@@ -54,7 +54,7 @@ const AcceleratorMapping kAcceleratorMap + { ui::VKEY_S, kPlatformModifier, IDC_SAVE_PAGE }, { ui::VKEY_9, kPlatformModifier, IDC_SELECT_LAST_TAB }, { ui::VKEY_NUMPAD9, kPlatformModifier, IDC_SELECT_LAST_TAB }, -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) { ui::VKEY_9, ui::EF_ALT_DOWN, IDC_SELECT_LAST_TAB }, { ui::VKEY_NUMPAD9, ui::EF_ALT_DOWN, IDC_SELECT_LAST_TAB }, { ui::VKEY_NEXT, ui::EF_CONTROL_DOWN | ui::EF_SHIFT_DOWN, IDC_MOVE_TAB_NEXT }, -@@ -100,7 +100,7 @@ const AcceleratorMapping kAcceleratorMap +@@ -84,7 +84,7 @@ const AcceleratorMapping kAcceleratorMap { ui::VKEY_NUMPAD7, kPlatformModifier, IDC_SELECT_TAB_6 }, { ui::VKEY_8, kPlatformModifier, IDC_SELECT_TAB_7 }, { ui::VKEY_NUMPAD8, kPlatformModifier, IDC_SELECT_TAB_7 }, -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) { ui::VKEY_1, ui::EF_ALT_DOWN, IDC_SELECT_TAB_0 }, { ui::VKEY_NUMPAD1, ui::EF_ALT_DOWN, IDC_SELECT_TAB_0 }, { ui::VKEY_2, ui::EF_ALT_DOWN, IDC_SELECT_TAB_1 }, -@@ -149,7 +149,7 @@ const AcceleratorMapping kAcceleratorMap - { ui::VKEY_F11, ui::EF_NONE, IDC_FULLSCREEN }, +@@ -129,7 +129,7 @@ const AcceleratorMapping kAcceleratorMap + #endif // !OS_MACOSX // Platform-specific key maps. -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) { ui::VKEY_BROWSER_BACK, ui::EF_NONE, IDC_BACK }, { ui::VKEY_BROWSER_FORWARD, ui::EF_NONE, IDC_FORWARD }, { ui::VKEY_BROWSER_HOME, ui::EF_NONE, IDC_HOME }, 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 436364) +++ head/www/chromium/files/patch-chrome_browser_ui_views_apps_chrome__native__app__window__views__aura.cc (revision 436365) @@ -1,20 +1,20 @@ ---- chrome/browser/ui/views/apps/chrome_native_app_window_views_aura.cc.orig 2017-01-26 00:49:09 UTC +--- chrome/browser/ui/views/apps/chrome_native_app_window_views_aura.cc.orig 2017-03-09 20:04:29 UTC +++ chrome/browser/ui/views/apps/chrome_native_app_window_views_aura.cc @@ -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 -@@ -57,7 +57,7 @@ void ChromeNativeAppWindowViewsAura::OnB +@@ -58,7 +58,7 @@ void ChromeNativeAppWindowViewsAura::OnB const AppWindow::CreateParams& create_params, views::Widget::InitParams* init_params, views::Widget* widget) { -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_BSD) std::string app_name = web_app::GenerateApplicationNameFromExtensionId( app_window()->extension_id()); // Set up a custom WM_CLASS for app windows. This allows task switchers in Index: head/www/chromium/files/patch-chrome_browser_ui_views_chrome__browser__main__extra__parts__views.cc =================================================================== --- head/www/chromium/files/patch-chrome_browser_ui_views_chrome__browser__main__extra__parts__views.cc (revision 436364) +++ head/www/chromium/files/patch-chrome_browser_ui_views_chrome__browser__main__extra__parts__views.cc (revision 436365) @@ -1,28 +1,37 @@ ---- chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc.orig 2017-02-02 02:02:50 UTC +--- chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc.orig 2017-03-09 20:04:29 UTC +++ chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc -@@ -24,14 +24,14 @@ +@@ -26,14 +26,14 @@ #include "ui/wm/core/wm_state.h" #endif // defined(USE_AURA) -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) #include "base/command_line.h" #include "chrome/browser/ui/simple_message_box.h" #include "chrome/grit/chromium_strings.h" #include "chrome/grit/generated_resources.h" #include "content/public/common/content_switches.h" #include "ui/base/l10n/l10n_util.h" -#endif // defined(OS_LINUX) && !defined(OS_CHROMEOS) +#endif // (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) ChromeBrowserMainExtraPartsViews::ChromeBrowserMainExtraPartsViews() { } -@@ -62,7 +62,7 @@ void ChromeBrowserMainExtraPartsViews::P - } +@@ -70,7 +70,7 @@ void ChromeBrowserMainExtraPartsViews::P + IMEDriver::Register(); + #endif - void ChromeBrowserMainExtraPartsViews::PreProfileInit() { -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) // On the Linux desktop, we want to prevent the user from logging in as root, // so that we don't destroy the profile. Now that we have some minimal ui // initialized, check to see if we're running as root and bail if we are. +@@ -94,7 +94,7 @@ void ChromeBrowserMainExtraPartsViews::P + base::RunLoop().RunUntilIdle(); + + exit(EXIT_FAILURE); +-#endif // defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#endif // (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) + } + + void ChromeBrowserMainExtraPartsViews::ServiceManagerConnectionStarted( Index: head/www/chromium/files/patch-chrome_browser_ui_views_chrome__views__delegate.cc =================================================================== --- head/www/chromium/files/patch-chrome_browser_ui_views_chrome__views__delegate.cc (revision 436364) +++ head/www/chromium/files/patch-chrome_browser_ui_views_chrome__views__delegate.cc (revision 436365) @@ -1,29 +1,29 @@ ---- chrome/browser/ui/views/chrome_views_delegate.cc.orig 2017-01-26 00:49:09 UTC +--- chrome/browser/ui/views/chrome_views_delegate.cc.orig 2017-03-09 20:04:29 UTC +++ chrome/browser/ui/views/chrome_views_delegate.cc -@@ -57,7 +57,7 @@ +@@ -59,7 +59,7 @@ #include "ui/views/widget/native_widget_aura.h" #endif -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_BSD) #include "ui/views/linux_ui/linux_ui.h" #endif -@@ -308,7 +308,7 @@ HICON ChromeViewsDelegate::GetSmallWindo +@@ -329,7 +329,7 @@ HICON ChromeViewsDelegate::GetSmallWindo return GetSmallAppIcon(); } -#elif defined(OS_LINUX) && !defined(OS_CHROMEOS) +#elif defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_BSD) gfx::ImageSkia* ChromeViewsDelegate::GetDefaultWindowIcon() const { ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance(); return rb.GetImageSkiaNamed(IDR_PRODUCT_LOGO_64); -@@ -447,7 +447,7 @@ void ChromeViewsDelegate::OnBeforeWidget +@@ -468,7 +468,7 @@ void ChromeViewsDelegate::OnBeforeWidget #endif } -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_BSD) bool ChromeViewsDelegate::WindowManagerProvidesTitleBar(bool maximized) { // On Ubuntu Unity, the system always provides a title bar for maximized // windows. Index: head/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__view.cc =================================================================== --- head/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__view.cc (revision 436364) +++ head/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__view.cc (revision 436365) @@ -1,11 +1,11 @@ ---- chrome/browser/ui/views/frame/browser_view.cc.orig 2017-01-26 00:49:09 UTC +--- chrome/browser/ui/views/frame/browser_view.cc.orig 2017-03-09 20:04:29 UTC +++ chrome/browser/ui/views/frame/browser_view.cc -@@ -1913,7 +1913,7 @@ void BrowserView::OnThemeChanged() { +@@ -179,7 +179,7 @@ + #include "chrome/browser/ui/views/sync/one_click_signin_dialog_view.h" #endif - #if defined(OS_WIN) - ui::NativeThemeWin::instance()->NotifyObservers(); --#elif defined(OS_LINUX) -+#elif defined(OS_LINUX) || defined(OS_BSD) - ui::NativeThemeAura::instance()->NotifyObservers(); + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) #endif - } + + using base::TimeDelta; Index: head/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__drag__controller.cc =================================================================== --- head/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__drag__controller.cc (revision 436364) +++ head/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__drag__controller.cc (revision 436365) @@ -1,29 +1,29 @@ ---- chrome/browser/ui/views/tabs/tab_drag_controller.cc.orig 2017-01-26 00:49:09 UTC +--- chrome/browser/ui/views/tabs/tab_drag_controller.cc.orig 2017-03-09 20:04:29 UTC +++ chrome/browser/ui/views/tabs/tab_drag_controller.cc -@@ -270,7 +270,7 @@ void TabDragController::Init( +@@ -251,7 +251,7 @@ void TabDragController::Init( // synchronous on desktop Linux, so use that. // - Ash // Releasing capture on Ash cancels gestures so avoid it. -#if defined(OS_LINUX) || defined(USE_ASH) +#if defined(OS_LINUX) || defined(OS_BSD) || defined(USE_ASH) can_release_capture_ = false; #endif start_point_in_screen_ = gfx::Point(source_tab_offset, mouse_offset.y()); -@@ -620,7 +620,7 @@ TabDragController::DragBrowserToNewTabSt - // that to effect the position of any windows. - SetWindowPositionManaged(browser_widget->GetNativeWindow(), false); +@@ -597,7 +597,7 @@ TabDragController::DragBrowserToNewTabSt + else + target_tabstrip->GetWidget()->SetCapture(attached_tabstrip_); -#if !defined(OS_LINUX) || defined(OS_CHROMEOS) +#if (!defined(OS_LINUX) && !defined(OS_BSD)) || defined(OS_CHROMEOS) // EndMoveLoop is going to snap the window back to its original location. // Hide it so users don't see this. Hiding a window in Linux aura causes // it to lose capture so skip it. -@@ -1819,7 +1819,7 @@ TabDragController::Liveness TabDragContr +@@ -1787,7 +1787,7 @@ TabDragController::Liveness TabDragContr if (dragged_window) exclude.insert(dragged_window); } -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) // Exclude windows which are pending deletion via Browser::TabStripEmpty(). // These windows can be returned in the Linux Aura port because the browser // window which was used for dragging is not hidden once all of its tabs are Index: head/www/chromium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc =================================================================== --- head/www/chromium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc (revision 436364) +++ head/www/chromium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc (revision 436365) @@ -1,11 +1,11 @@ ---- chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig 2017-01-26 00:49:09 UTC +--- chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig 2017-03-09 20:04:29 UTC +++ chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc -@@ -286,7 +286,7 @@ bool IsAboutUI(const GURL& url) { +@@ -289,7 +289,7 @@ bool IsAboutUI(const GURL& url) { #if !defined(OS_ANDROID) || url.host_piece() == chrome::kChromeUITermsHost #endif -#if defined(OS_LINUX) || defined(OS_OPENBSD) +#if defined(OS_LINUX) || defined(OS_BSD) || url.host_piece() == chrome::kChromeUILinuxProxyConfigHost || url.host_piece() == chrome::kChromeUISandboxHost #endif Index: head/www/chromium/files/patch-chrome_browser_ui_webui_options_browser__options__handler.cc =================================================================== --- head/www/chromium/files/patch-chrome_browser_ui_webui_options_browser__options__handler.cc (revision 436364) +++ head/www/chromium/files/patch-chrome_browser_ui_webui_options_browser__options__handler.cc (revision 436365) @@ -1,45 +1,45 @@ ---- chrome/browser/ui/webui/options/browser_options_handler.cc.orig 2017-01-26 00:49:09 UTC +--- chrome/browser/ui/webui/options/browser_options_handler.cc.orig 2017-03-09 20:04:29 UTC +++ chrome/browser/ui/webui/options/browser_options_handler.cc -@@ -564,13 +564,13 @@ void BrowserOptionsHandler::GetLocalized +@@ -565,13 +565,13 @@ void BrowserOptionsHandler::GetLocalized { "syncButtonTextStart", IDS_SYNC_SETUP_BUTTON_LABEL }, #endif // defined(OS_CHROMEOS) -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if defined(OS_POSIX) && !defined(OS_CHROMEOS) { "showWindowDecorations", IDS_SHOW_WINDOW_DECORATIONS }, { "themesNativeButton", IDS_THEMES_GTK_BUTTON }, { "themesSetClassic", IDS_THEMES_SET_CLASSIC }, #else { "themes", IDS_THEMES_GROUP_NAME }, -#endif // defined(OS_LINUX) && !defined(OS_CHROMEOS) +#endif // defined(OS_POSIX) && !defined(OS_CHROMEOS) #if defined(OS_CHROMEOS) && defined(USE_ASH) { "setWallpaper", IDS_SET_WALLPAPER_BUTTON }, -@@ -813,7 +813,7 @@ void BrowserOptionsHandler::RegisterMess +@@ -814,7 +814,7 @@ void BrowserOptionsHandler::RegisterMess "requestProfilesInfo", base::Bind(&BrowserOptionsHandler::HandleRequestProfilesInfo, base::Unretained(this))); -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if defined(OS_POSIX) && !defined(OS_CHROMEOS) web_ui()->RegisterMessageCallback( "themesSetNative", base::Bind(&BrowserOptionsHandler::ThemesSetNative, @@ -1476,7 +1476,7 @@ void BrowserOptionsHandler::ObserveTheme ThemeService* theme_service = ThemeServiceFactory::GetForProfile(profile); bool is_system_theme = false; -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if defined(OS_POSIX) && !defined(OS_CHROMEOS) bool profile_is_supervised = profile->IsSupervised(); is_system_theme = theme_service->UsingSystemTheme(); base::FundamentalValue native_theme_enabled(!is_system_theme && @@ -1498,7 +1498,7 @@ void BrowserOptionsHandler::ThemesReset( ThemeServiceFactory::GetForProfile(profile)->UseDefaultTheme(); } -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if defined(OS_POSIX) && !defined(OS_CHROMEOS) void BrowserOptionsHandler::ThemesSetNative(const base::ListValue* args) { content::RecordAction(UserMetricsAction("Options_GtkThemeSet")); Profile* profile = Profile::FromWebUI(web_ui()); Index: head/www/chromium/files/patch-chrome_browser_ui_webui_options_browser__options__handler.h =================================================================== --- head/www/chromium/files/patch-chrome_browser_ui_webui_options_browser__options__handler.h (revision 436364) +++ head/www/chromium/files/patch-chrome_browser_ui_webui_options_browser__options__handler.h (revision 436365) @@ -1,11 +1,11 @@ ---- chrome/browser/ui/webui/options/browser_options_handler.h.orig 2017-01-26 00:49:09 UTC +--- chrome/browser/ui/webui/options/browser_options_handler.h.orig 2017-03-09 20:04:29 UTC +++ chrome/browser/ui/webui/options/browser_options_handler.h -@@ -208,7 +208,7 @@ class BrowserOptionsHandler +@@ -210,7 +210,7 @@ class BrowserOptionsHandler void ObserveThemeChanged(); void ThemesReset(const base::ListValue* args); -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if defined(OS_POSIX) && !defined(OS_CHROMEOS) void ThemesSetNative(const base::ListValue* args); #endif Index: head/www/chromium/files/patch-chrome_browser_ui_webui_settings_md__settings__localized__strings__provider.cc =================================================================== --- head/www/chromium/files/patch-chrome_browser_ui_webui_settings_md__settings__localized__strings__provider.cc (revision 436364) +++ head/www/chromium/files/patch-chrome_browser_ui_webui_settings_md__settings__localized__strings__provider.cc (revision 436365) @@ -1,20 +1,20 @@ ---- chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc.orig 2017-02-02 02:02:50 UTC +--- chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc.orig 2017-03-09 20:04:29 UTC +++ chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc -@@ -266,7 +266,7 @@ void AddAppearanceStrings(content::WebUI +@@ -287,7 +287,7 @@ void AddAppearanceStrings(content::WebUI {"appearancePageTitle", IDS_SETTINGS_APPEARANCE}, {"exampleDotCom", IDS_SETTINGS_EXAMPLE_DOT_COM}, {"themes", IDS_SETTINGS_THEMES}, -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) {"systemTheme", IDS_SETTINGS_SYSTEM_THEME}, {"useSystemTheme", IDS_SETTINGS_USE_SYSTEM_THEME}, {"classicTheme", IDS_SETTINGS_CLASSIC_THEME}, -@@ -286,7 +286,7 @@ void AddAppearanceStrings(content::WebUI +@@ -307,7 +307,7 @@ void AddAppearanceStrings(content::WebUI {"openWallpaperApp", IDS_SETTINGS_OPEN_WALLPAPER_APP}, {"setWallpaper", IDS_SETTINGS_SET_WALLPAPER}, #endif -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) {"showWindowDecorations", IDS_SHOW_WINDOW_DECORATIONS}, #endif }; Index: head/www/chromium/files/patch-chrome_common_BUILD.gn =================================================================== --- head/www/chromium/files/patch-chrome_common_BUILD.gn (revision 436364) +++ head/www/chromium/files/patch-chrome_common_BUILD.gn (revision 436365) @@ -1,16 +1,16 @@ ---- chrome/common/BUILD.gn.orig 2017-01-26 00:49:09 UTC +--- chrome/common/BUILD.gn.orig 2017-03-09 20:04:29 UTC +++ chrome/common/BUILD.gn -@@ -243,6 +243,13 @@ static_library("common") { +@@ -244,6 +244,13 @@ static_library("common") { public_deps += [ "//ppapi/shared_impl" ] } + if (is_bsd) { + sources -= [ + "component_flash_hint_file_linux.cc", + "component_flash_hint_file_linux.h", + ] + } + if (enable_extensions) { sources += [ "cast_messages.cc", Index: head/www/chromium/files/patch-chrome_common_chrome__paths.cc =================================================================== --- head/www/chromium/files/patch-chrome_common_chrome__paths.cc (revision 436364) +++ head/www/chromium/files/patch-chrome_common_chrome__paths.cc (revision 436365) @@ -1,53 +1,53 @@ ---- chrome/common/chrome_paths.cc.orig 2017-01-26 00:49:09 UTC +--- chrome/common/chrome_paths.cc.orig 2017-03-09 20:04:29 UTC +++ chrome/common/chrome_paths.cc @@ -197,7 +197,7 @@ bool PathProvider(int key, base::FilePat return false; break; case chrome::DIR_DEFAULT_DOWNLOADS_SAFE: -#if defined(OS_WIN) || defined(OS_LINUX) +#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) if (!GetUserDownloadsDirectorySafe(&cur)) return false; break; -@@ -480,10 +480,12 @@ bool PathProvider(int key, base::FilePat +@@ -474,10 +474,12 @@ bool PathProvider(int key, base::FilePat if (!base::PathExists(cur)) // We don't want to create this return false; break; -#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_OPENBSD) +#if defined(OS_POSIX) && !defined(OS_MACOSX) case chrome::DIR_POLICY_FILES: { #if defined(GOOGLE_CHROME_BUILD) cur = base::FilePath(FILE_PATH_LITERAL("/etc/opt/chrome/policies")); +#elif defined(OS_BSD) + cur = base::FilePath(FILE_PATH_LITERAL("/usr/local/etc/chrome/policies")); #else cur = base::FilePath(FILE_PATH_LITERAL("/etc/chromium/policies")); #endif -@@ -534,7 +536,7 @@ bool PathProvider(int key, base::FilePat +@@ -528,7 +530,7 @@ bool PathProvider(int key, base::FilePat #endif break; -#if defined(OS_LINUX) || defined(OS_MACOSX) +#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) case chrome::DIR_NATIVE_MESSAGING: #if defined(OS_MACOSX) #if defined(GOOGLE_CHROME_BUILD) -@@ -548,6 +550,9 @@ bool PathProvider(int key, base::FilePat +@@ -542,6 +544,9 @@ bool PathProvider(int key, base::FilePat #if defined(GOOGLE_CHROME_BUILD) cur = base::FilePath(FILE_PATH_LITERAL( "/etc/opt/chrome/native-messaging-hosts")); +#elif defined(OS_BSD) + cur = base::FilePath(FILE_PATH_LITERAL( + "/usr/local/etc/chrome/native-messaging-hosts")); #else cur = base::FilePath(FILE_PATH_LITERAL( "/etc/chromium/native-messaging-hosts")); -@@ -560,7 +565,7 @@ bool PathProvider(int key, base::FilePat +@@ -554,7 +559,7 @@ bool PathProvider(int key, base::FilePat return false; cur = cur.Append(FILE_PATH_LITERAL("NativeMessagingHosts")); break; -#endif // defined(OS_LINUX) || defined(OS_MACOSX) +#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) #if !defined(OS_ANDROID) case chrome::DIR_GLOBAL_GCM_STORE: if (!PathService::Get(chrome::DIR_USER_DATA, &cur)) Index: head/www/chromium/files/patch-chrome_common_chrome__paths.h =================================================================== --- head/www/chromium/files/patch-chrome_common_chrome__paths.h (revision 436364) +++ head/www/chromium/files/patch-chrome_common_chrome__paths.h (revision 436365) @@ -1,29 +1,29 @@ ---- chrome/common/chrome_paths.h.orig 2017-01-26 00:49:09 UTC +--- chrome/common/chrome_paths.h.orig 2017-03-09 20:04:29 UTC +++ chrome/common/chrome_paths.h @@ -49,7 +49,7 @@ enum { // to set policies for chrome. This directory // contains subdirectories. #endif -#if defined(OS_CHROMEOS) || (defined(OS_LINUX) && defined(CHROMIUM_BUILD)) || \ +#if defined(OS_CHROMEOS) || ((defined(OS_LINUX) || defined(OS_BSD)) && defined(CHROMIUM_BUILD)) || \ defined(OS_MACOSX) DIR_USER_EXTERNAL_EXTENSIONS, // Directory for per-user external extensions // on Chrome Mac and Chromium Linux. @@ -58,7 +58,7 @@ enum { // create it. #endif -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) DIR_STANDALONE_EXTERNAL_EXTENSIONS, // Directory for 'per-extension' // definition manifest files that // describe extensions which are to be -@@ -112,7 +112,7 @@ enum { +@@ -111,7 +111,7 @@ enum { DIR_SUPERVISED_USER_INSTALLED_WHITELISTS, // Directory where sanitized // supervised user whitelists are // installed. -#if defined(OS_LINUX) || defined(OS_MACOSX) +#if defined(OS_LINUX) || defined(OS_BSD) || defined(OS_MACOSX) DIR_NATIVE_MESSAGING, // System directory where native messaging host // manifest files are stored. DIR_USER_NATIVE_MESSAGING, // Directory with Native Messaging Hosts Index: head/www/chromium/files/patch-chrome_common_chrome__switches.cc =================================================================== --- head/www/chromium/files/patch-chrome_common_chrome__switches.cc (revision 436364) +++ head/www/chromium/files/patch-chrome_common_chrome__switches.cc (revision 436365) @@ -1,11 +1,11 @@ ---- chrome/common/chrome_switches.cc.orig 2017-01-26 00:49:09 UTC +--- chrome/common/chrome_switches.cc.orig 2017-03-09 20:04:29 UTC +++ chrome/common/chrome_switches.cc -@@ -1263,7 +1263,7 @@ const char kAllowNaClSocketAPI[] +@@ -1165,7 +1165,7 @@ const char kAllowNaClSocketAPI[] const char kEnableWaylandServer[] = "enable-wayland-server"; #endif -#if defined(OS_WIN) || defined(OS_LINUX) +#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) extern const char kDisableInputImeAPI[] = "disable-input-ime-api"; extern const char kEnableInputImeAPI[] = "enable-input-ime-api"; #endif Index: head/www/chromium/files/patch-chrome_common_chrome__switches.h =================================================================== --- head/www/chromium/files/patch-chrome_common_chrome__switches.h (revision 436364) +++ head/www/chromium/files/patch-chrome_common_chrome__switches.h (revision 436365) @@ -1,11 +1,11 @@ ---- chrome/common/chrome_switches.h.orig 2017-01-26 00:49:09 UTC +--- chrome/common/chrome_switches.h.orig 2017-03-09 20:04:29 UTC +++ chrome/common/chrome_switches.h -@@ -385,7 +385,7 @@ extern const char kAllowNaClSocketAPI[]; +@@ -355,7 +355,7 @@ extern const char kAllowNaClSocketAPI[]; extern const char kEnableWaylandServer[]; #endif -#if defined(OS_WIN) || defined(OS_LINUX) +#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) extern const char kDisableInputImeAPI[]; extern const char kEnableInputImeAPI[]; #endif 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 436364) +++ head/www/chromium/files/patch-chrome_common_extensions_chrome__extensions__client.cc (revision 436365) @@ -1,14 +1,14 @@ ---- chrome/common/extensions/chrome_extensions_client.cc.orig 2017-01-26 00:49:09 UTC +--- chrome/common/extensions/chrome_extensions_client.cc.orig 2017-03-09 20:04:29 UTC +++ chrome/common/extensions/chrome_extensions_client.cc -@@ -105,7 +105,10 @@ ChromeChannelForHistogram GetChromeChann +@@ -97,7 +97,10 @@ ChromeChannelForHistogram GetChromeChann static base::LazyInstance g_client = LAZY_INSTANCE_INITIALIZER; -ChromeExtensionsClient::ChromeExtensionsClient() {} +ChromeExtensionsClient::ChromeExtensionsClient() + : chrome_api_permissions_(ChromeAPIPermissions()), + extensions_api_permissions_(ExtensionsAPIPermissions()) { +} ChromeExtensionsClient::~ChromeExtensionsClient() { } Index: head/www/chromium/files/patch-chrome_common_features.gni =================================================================== --- head/www/chromium/files/patch-chrome_common_features.gni (revision 436364) +++ head/www/chromium/files/patch-chrome_common_features.gni (revision 436365) @@ -1,11 +1,11 @@ ---- chrome/common/features.gni.orig 2017-01-26 00:49:10 UTC +--- chrome/common/features.gni.orig 2017-03-09 20:04:29 UTC +++ chrome/common/features.gni -@@ -43,7 +43,7 @@ declare_args() { +@@ -40,7 +40,7 @@ declare_args() { enable_hotwording = is_chrome_branded && is_chromeos enable_one_click_signin = - is_win || is_mac || (is_linux && !is_chromeos && !is_chromecast) + is_win || is_mac || is_bsd || (is_linux && !is_chromeos && !is_chromecast) # Set to true to bundle all the mash related mojo services into chrome. # Specify --mash to chrome to have chrome start the mash environment. Index: head/www/chromium/files/patch-chrome_common_pref__names.cc =================================================================== --- head/www/chromium/files/patch-chrome_common_pref__names.cc (revision 436364) +++ head/www/chromium/files/patch-chrome_common_pref__names.cc (revision 436365) @@ -1,29 +1,29 @@ ---- chrome/common/pref_names.cc.orig 2017-01-26 00:49:10 UTC +--- chrome/common/pref_names.cc.orig 2017-03-09 20:04:29 UTC +++ chrome/common/pref_names.cc -@@ -964,7 +964,7 @@ const char kForceSessionSync[] = "settin +@@ -983,7 +983,7 @@ const char kForceSessionSync[] = "settin // only using an account that belongs to one of the domains from this pref. const char kAllowedDomainsForApps[] = "settings.allowed_domains_for_apps"; -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) // Linux specific preference on whether we should match the system theme. const char kUsesSystemTheme[] = "extensions.theme.use_system"; #endif -@@ -1051,7 +1051,7 @@ const char kShowUpdatePromotionInfoBar[] +@@ -1070,7 +1070,7 @@ const char kShowUpdatePromotionInfoBar[] "browser.show_update_promotion_info_bar"; #endif -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) // Boolean that is false if we should show window manager decorations. If // true, we draw a custom chrome frame (thicker title bar and blue border). const char kUseCustomChromeFrame[] = "browser.custom_chrome_frame"; -@@ -1438,7 +1438,7 @@ const char kDownloadDefaultDirectory[] = +@@ -1454,7 +1454,7 @@ const char kDownloadDefaultDirectory[] = // upgrade a unsafe location to a safe location. const char kDownloadDirUpgraded[] = "download.directory_upgrade"; -#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) +#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) const char kOpenPdfDownloadInSystemReader[] = "download.open_pdf_in_system_reader"; #endif Index: head/www/chromium/files/patch-chrome_common_pref__names.h =================================================================== --- head/www/chromium/files/patch-chrome_common_pref__names.h (revision 436364) +++ head/www/chromium/files/patch-chrome_common_pref__names.h (revision 436365) @@ -1,29 +1,29 @@ ---- chrome/common/pref_names.h.orig 2017-01-26 00:49:10 UTC +--- chrome/common/pref_names.h.orig 2017-03-09 20:04:29 UTC +++ chrome/common/pref_names.h -@@ -322,7 +322,7 @@ extern const char kForceGoogleSafeSearch +@@ -330,7 +330,7 @@ extern const char kForceGoogleSafeSearch extern const char kForceYouTubeRestrict[]; extern const char kForceSessionSync[]; extern const char kAllowedDomainsForApps[]; -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) extern const char kUsesSystemTheme[]; #endif extern const char kCurrentThemePackFilename[]; -@@ -355,7 +355,7 @@ extern const char kDefaultBrowserSetting +@@ -363,7 +363,7 @@ extern const char kDefaultBrowserSetting #if defined(OS_MACOSX) extern const char kShowUpdatePromotionInfoBar[]; #endif -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) extern const char kUseCustomChromeFrame[]; #endif extern const char kBackShortcutBubbleShownCount[]; -@@ -510,7 +510,7 @@ extern const char kAppWindowPlacement[]; +@@ -519,7 +519,7 @@ extern const char kAppWindowPlacement[]; extern const char kDownloadDefaultDirectory[]; extern const char kDownloadExtensionsToOpen[]; extern const char kDownloadDirUpgraded[]; -#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) +#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) extern const char kOpenPdfDownloadInSystemReader[]; #endif Index: head/www/chromium/files/patch-chrome_common_url__constants.cc =================================================================== --- head/www/chromium/files/patch-chrome_common_url__constants.cc (revision 436364) +++ head/www/chromium/files/patch-chrome_common_url__constants.cc (revision 436365) @@ -1,20 +1,20 @@ ---- chrome/common/url_constants.cc.orig 2017-02-02 02:02:50 UTC +--- chrome/common/url_constants.cc.orig 2017-03-09 20:04:29 UTC +++ chrome/common/url_constants.cc -@@ -139,7 +139,7 @@ const char kChromeUIMdCupsSettingsURL[] +@@ -143,7 +143,7 @@ const char kChromeUIMdCupsSettingsURL[] const char kChromeUIMetroFlowURL[] = "chrome://make-metro/"; #endif -#if (defined(OS_LINUX) && defined(TOOLKIT_VIEWS)) || defined(USE_AURA) +#if ((defined(OS_BSD) || defined(OS_LINUX)) && defined(TOOLKIT_VIEWS)) || defined(USE_AURA) const char kChromeUITabModalConfirmDialogURL[] = "chrome://tab-modal-confirm-dialog/"; #endif -@@ -332,7 +332,7 @@ const char kChromeOSAssetPath[] = "/usr/ +@@ -336,7 +336,7 @@ const char kChromeOSAssetPath[] = "/usr/ const char kChromeUIMetroFlowHost[] = "make-metro"; #endif -#if (defined(OS_LINUX) && defined(TOOLKIT_VIEWS)) || defined(USE_AURA) +#if ((defined(OS_BSD) || defined(OS_LINUX)) && defined(TOOLKIT_VIEWS)) || defined(USE_AURA) const char kChromeUITabModalConfirmDialogHost[] = "tab-modal-confirm-dialog"; #endif Index: head/www/chromium/files/patch-chrome_common_url__constants.h =================================================================== --- head/www/chromium/files/patch-chrome_common_url__constants.h (revision 436364) +++ head/www/chromium/files/patch-chrome_common_url__constants.h (revision 436365) @@ -1,20 +1,20 @@ ---- chrome/common/url_constants.h.orig 2017-02-02 02:02:50 UTC +--- chrome/common/url_constants.h.orig 2017-03-09 20:04:29 UTC +++ chrome/common/url_constants.h -@@ -125,7 +125,7 @@ extern const char kChromeUIMdCupsSetting +@@ -128,7 +128,7 @@ extern const char kChromeUIMdCupsSetting extern const char kChromeUIMetroFlowURL[]; #endif -#if (defined(OS_LINUX) && defined(TOOLKIT_VIEWS)) || defined(USE_AURA) +#if ((defined(OS_BSD) || defined(OS_LINUX)) && defined(TOOLKIT_VIEWS)) || defined(USE_AURA) extern const char kChromeUITabModalConfirmDialogURL[]; #endif -@@ -309,7 +309,7 @@ extern const char kChromeOSAssetPath[]; +@@ -313,7 +313,7 @@ extern const char kChromeOSAssetPath[]; extern const char kChromeUIMetroFlowHost[]; #endif -#if (defined(OS_LINUX) && defined(TOOLKIT_VIEWS)) || defined(USE_AURA) +#if ((defined(OS_BSD) || defined(OS_LINUX)) && defined(TOOLKIT_VIEWS)) || defined(USE_AURA) extern const char kChromeUITabModalConfirmDialogHost[]; #endif Index: head/www/chromium/files/patch-chrome_test_BUILD.gn =================================================================== --- head/www/chromium/files/patch-chrome_test_BUILD.gn (revision 436364) +++ head/www/chromium/files/patch-chrome_test_BUILD.gn (revision 436365) @@ -1,167 +1,167 @@ ---- chrome/test/BUILD.gn.orig 2017-01-26 00:49:10 UTC +--- chrome/test/BUILD.gn.orig 2017-03-09 20:04:30 UTC +++ chrome/test/BUILD.gn -@@ -186,7 +186,7 @@ static_library("test_support") { +@@ -193,7 +193,7 @@ static_library("test_support") { ] } - if (is_linux) { + if (is_linux || is_bsd) { public_deps += [ "//crypto:platform" ] } if (is_mac) { -@@ -461,7 +461,7 @@ if (!is_android) { +@@ -451,7 +451,7 @@ if (!is_android) { "$root_out_dir/test_page.css.mock-http-headers", "$root_out_dir/ui_test.pak", ] - if (is_linux || is_win) { + if (is_linux || is_bsd || is_win) { data += [ "$root_out_dir/chrome_100_percent.pak", "$root_out_dir/chrome_200_percent.pak", -@@ -470,7 +470,7 @@ if (!is_android) { +@@ -460,7 +460,7 @@ if (!is_android) { "$root_out_dir/resources.pak", ] } - if (is_linux) { + if (is_linux || is_bsd) { data += [ "$root_out_dir/libppapi_tests.so" ] } @@ -577,7 +577,7 @@ if (!is_android) { - "base/interactive_test_utils_views.cc", + "../browser/ui/views/payments/payment_request_interactive_uitest_base.h", ] } - if (is_linux) { + if (is_linux || is_bsd) { if (!is_chromeos) { # Desktop linux. sources -= [ -@@ -2010,14 +2010,14 @@ test("browser_tests") { +@@ -2041,14 +2041,14 @@ test("browser_tests") { sources += [ "//third_party/liblouis/nacl_wrapper/liblouis_wrapper_browsertest.cc" ] deps += [ "//chrome/browser/chromeos" ] data_deps += [ "//third_party/liblouis:liblouis_test_data" ] - } else if (is_linux || is_win) { + } else if (is_linux || is_bsd || is_win) { sources += [ "../browser/ui/views/ime/ime_warning_bubble_browsertest.cc", "../browser/ui/views/ime/ime_window_browsertest.cc", ] } - if (is_win || is_linux) { + if (is_win || is_linux || is_bsd) { sources += [ "../browser/nacl_host/test/nacl_gdb_browsertest.cc" ] data_deps += [ "//chrome/browser/nacl_host/test:mock_nacl_gdb" ] } -@@ -2029,7 +2029,7 @@ test("browser_tests") { +@@ -2060,7 +2060,7 @@ test("browser_tests") { configs += [ "//build/config/win:default_large_module_incremental_linking" ] } - if (is_linux) { + if (is_linux || is_bsd) { data_deps += [ "//components/nacl/loader:nacl_helper" ] if (enable_nacl_nonsfi) { -@@ -2136,7 +2136,7 @@ test("browser_tests") { +@@ -2170,7 +2170,7 @@ test("browser_tests") { } } - if (is_linux && !is_component_build) { + if ((is_linux || is_bsd) && !is_component_build) { # Set rpath to find the CDM adapter even in a non-component build. configs += [ "//build/config/gcc:rpath_for_built_shared_libraries" ] } -@@ -2363,7 +2363,7 @@ test("browser_tests") { +@@ -2391,7 +2391,7 @@ test("browser_tests") { if (toolkit_views) { sources -= [ "../browser/ui/views/select_file_dialog_extension_browsertest.cc" ] } - if (is_win || is_linux) { + if (is_win || is_linux || is_bsd) { sources += [ "../browser/ui/views/ime/input_ime_apitest_nonchromeos.cc" ] } -@@ -2558,7 +2558,7 @@ test("browser_tests") { +@@ -2568,7 +2568,7 @@ test("browser_tests") { "../browser/extensions/api/networking_private/networking_private_chromeos_apitest.cc", ] } - if (is_mac || is_win || (is_linux && !is_chromeos)) { + if (is_mac || is_win || is_bsd || (is_linux && !is_chromeos)) { sources += [ # Tests for non mobile and non CrOS (includes Linux, Win, Mac). "../browser/metrics/desktop_session_duration/audible_contents_tracker_browsertest.cc", @@ -2746,7 +2746,7 @@ if (!is_android) { "$root_out_dir/pyproto/", ] - if (is_linux || is_win) { + if (is_linux || is_bsd || is_win) { data += [ "$root_out_dir/chrome_100_percent.pak", "$root_out_dir/chrome_200_percent.pak", -@@ -3411,7 +3411,7 @@ test("unit_tests") { +@@ -3439,7 +3439,7 @@ test("unit_tests") { "$root_out_dir/resources.pak", ] } - if (is_linux || is_win) { + if (is_linux || is_bsd || is_win) { data += [ "$root_out_dir/chrome_200_percent.pak" ] } - -@@ -4111,7 +4111,7 @@ test("unit_tests") { + if (is_win) { +@@ -4177,7 +4177,7 @@ test("unit_tests") { "//ui/wm", ] } - if (!is_chromeos && is_linux) { + if (!is_chromeos && (is_linux || is_bsd)) { sources += [ "../browser/password_manager/native_backend_kwallet_x_unittest.cc", "../browser/shell_integration_linux_unittest.cc", -@@ -4131,7 +4131,7 @@ test("unit_tests") { +@@ -4197,7 +4197,7 @@ test("unit_tests") { if (use_gio) { deps += [ "//build/linux/libgio" ] } - if (!is_chromeos && !use_ozone && is_linux) { + if (!is_chromeos && !use_ozone && (is_linux || is_bsd)) { - if (use_gtk3) { - deps += [ "//chrome/browser/ui/libgtkui:libgtk3ui" ] - } else { -@@ -4424,18 +4424,18 @@ test("unit_tests") { + deps += [ "//chrome/browser/ui/libgtkui" ] + } + +@@ -4456,18 +4456,18 @@ test("unit_tests") { "//components/os_crypt:gnome_keyring_direct", ] } - if (is_linux && !is_chromeos && !use_ozone) { + if ((is_linux || is_bsd) && !is_chromeos && !use_ozone) { sources += [ "../browser/password_manager/native_backend_libsecret_unittest.cc" ] deps += [ "//third_party/libsecret" ] } - if (is_linux && use_aura) { + if ((is_linux || is_bsd) && use_aura) { deps += [ "//ui/aura:test_support" ] if (use_dbus) { deps += [ "//dbus:test_support" ] } } - if (is_linux && is_chrome_branded && current_cpu == "x86") { + if ((is_linux || is_bsd) && is_chrome_branded && current_cpu == "x86") { ldflags = [ "-Wl,--strip-debug" ] } if (is_mac) { -@@ -4941,7 +4941,7 @@ if (safe_browsing_mode == 1 && is_mac) { +@@ -4956,7 +4956,7 @@ if (safe_browsing_mode == 1 && is_mac) { } } -if (!is_android) { +if (!is_android && !is_bsd) { # TODO(609855): Make this compile on Android and run on the bots. test("chrome_app_unittests") { sources = [ -@@ -4967,7 +4967,7 @@ if (!is_android) { +@@ -4982,7 +4982,7 @@ if (!is_android) { } } -if (!is_android && !is_ios && !is_chromecast) { +if (!is_android && !is_ios && !is_chromecast && !is_bsd) { test("performance_browser_tests") { sources = [ "../app/chrome_version.rc.version", Index: head/www/chromium/files/patch-chromecast_browser_BUILD.gn =================================================================== --- head/www/chromium/files/patch-chromecast_browser_BUILD.gn (revision 436364) +++ head/www/chromium/files/patch-chromecast_browser_BUILD.gn (revision 436365) @@ -1,11 +1,11 @@ ---- chromecast/browser/BUILD.gn.orig 2017-01-26 00:49:11 UTC +--- chromecast/browser/BUILD.gn.orig 2017-03-09 20:04:31 UTC +++ chromecast/browser/BUILD.gn -@@ -120,7 +120,7 @@ source_set("browser") { +@@ -118,7 +118,7 @@ source_set("browser") { "//ui/gl", ] - if (is_linux) { + if (is_linux || is_bsd) { sources += [ - "cast_memory_pressure_monitor.cc", - "cast_memory_pressure_monitor.h", + "cast_content_window_linux.cc", + "cast_content_window_linux.h", Index: head/www/chromium/files/patch-chromecast_browser_cast__content__browser__client.cc =================================================================== --- head/www/chromium/files/patch-chromecast_browser_cast__content__browser__client.cc (revision 436364) +++ head/www/chromium/files/patch-chromecast_browser_cast__content__browser__client.cc (revision 436365) @@ -1,11 +1,11 @@ ---- chromecast/browser/cast_content_browser_client.cc.orig 2017-02-02 02:02:51 UTC +--- chromecast/browser/cast_content_browser_client.cc.orig 2017-03-09 20:04:31 UTC +++ chromecast/browser/cast_content_browser_client.cc -@@ -269,7 +269,7 @@ void CastContentBrowserClient::AppendExt +@@ -285,7 +285,7 @@ void CastContentBrowserClient::AppendExt command_line->AppendSwitch(switches::kAllowHiddenMediaPlayback); } -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) // Necessary for accelerated 2d canvas. By default on Linux, Chromium assumes // GLES2 contexts can be lost to a power-save mode, which breaks GPU canvas // apps. Index: head/www/chromium/files/patch-components_BUILD.gn =================================================================== --- head/www/chromium/files/patch-components_BUILD.gn (revision 436364) +++ head/www/chromium/files/patch-components_BUILD.gn (revision 436365) @@ -1,13 +1,13 @@ ---- components/BUILD.gn.orig 2017-01-26 00:49:11 UTC +--- components/BUILD.gn.orig 2017-03-09 20:04:31 UTC +++ components/BUILD.gn -@@ -168,8 +168,8 @@ test("components_unittests") { +@@ -174,8 +174,8 @@ test("components_unittests") { "//components/certificate_reporting:unit_tests", "//components/certificate_transparency:unit_tests", "//components/contextual_search:unit_tests", - "//components/crash/content/app:unit_tests", - "//components/crash/core/common:unit_tests", + #"//components/crash/content/app:unit_tests", + #"//components/crash/core/common:unit_tests", "//components/data_reduction_proxy/content/browser:unit_tests", "//components/data_reduction_proxy/core/browser:unit_tests", "//components/data_reduction_proxy/core/common:unit_tests", Index: head/www/chromium/files/patch-components_crash_content_app_BUILD.gn =================================================================== --- head/www/chromium/files/patch-components_crash_content_app_BUILD.gn (revision 436364) +++ head/www/chromium/files/patch-components_crash_content_app_BUILD.gn (revision 436365) @@ -1,11 +1,11 @@ ---- components/crash/content/app/BUILD.gn.orig 2017-01-26 00:49:11 UTC +--- components/crash/content/app/BUILD.gn.orig 2017-03-09 20:04:31 UTC +++ components/crash/content/app/BUILD.gn -@@ -145,7 +145,7 @@ source_set("app_non_mac_win") { +@@ -154,7 +154,7 @@ source_set("app_non_mac_win") { "//breakpad:breakpad_handler", "//sandbox", ] - } else if (is_posix && !is_ios) { + } else if (is_posix && !is_ios && !is_bsd) { deps += [ "//breakpad:client" ] } } Index: head/www/chromium/files/patch-components_gcm__driver_gcm__client.h =================================================================== --- head/www/chromium/files/patch-components_gcm__driver_gcm__client.h (revision 436364) +++ head/www/chromium/files/patch-components_gcm__driver_gcm__client.h (revision 436365) @@ -1,10 +1,10 @@ ---- components/gcm_driver/gcm_client.h.orig 2017-01-26 00:49:11 UTC +--- components/gcm_driver/gcm_client.h.orig 2017-03-09 20:04:31 UTC +++ components/gcm_driver/gcm_client.h -@@ -80,6 +80,7 @@ class GCMClient { +@@ -78,6 +78,7 @@ class GCMClient { PLATFORM_CROS, PLATFORM_IOS, PLATFORM_ANDROID, + PLATFORM_BSD, PLATFORM_UNKNOWN }; Index: head/www/chromium/files/patch-components_metrics_BUILD.gn =================================================================== --- head/www/chromium/files/patch-components_metrics_BUILD.gn (revision 436364) +++ head/www/chromium/files/patch-components_metrics_BUILD.gn (revision 436365) @@ -1,34 +1,34 @@ ---- components/metrics/BUILD.gn.orig 2017-01-26 00:49:12 UTC +--- components/metrics/BUILD.gn.orig 2017-03-09 20:04:31 UTC +++ components/metrics/BUILD.gn @@ -107,6 +107,13 @@ static_library("metrics") { if (is_win) { sources -= [ "machine_id_provider_stub.cc" ] } + + if (is_bsd) { + sources -= [ + "system_memory_stats_recorder_linux.cc" + ] + } + } if (!is_ios) { @@ -282,7 +289,7 @@ static_library("test_support") { ] } -if (is_linux) { +if (is_linux || is_bsd) { static_library("serialization") { sources = [ "serialization/metric_sample.cc", -@@ -341,7 +348,7 @@ source_set("unit_tests") { +@@ -342,7 +349,7 @@ source_set("unit_tests") { "//ui/gfx/geometry", ] - if (is_linux) { + if (is_linux || is_bsd) { sources += [ "serialization/serialization_utils_unittest.cc" ] deps += [ ":serialization" ] } Index: head/www/chromium/files/patch-components_neterror_resources_neterror.js =================================================================== --- head/www/chromium/files/patch-components_neterror_resources_neterror.js (revision 436364) +++ head/www/chromium/files/patch-components_neterror_resources_neterror.js (revision 436365) @@ -1,11 +1,11 @@ ---- components/neterror/resources/neterror.js.orig 2017-01-26 00:49:12 UTC +--- components/neterror/resources/neterror.js.orig 2017-03-09 20:04:31 UTC +++ components/neterror/resources/neterror.js @@ -150,7 +150,7 @@ function setUpCachedButton(buttonStrings } var primaryControlOnLeft = true; -- -+ +-// ++// primaryControlOnLeft = false; - + // Index: head/www/chromium/files/patch-components_plugins_renderer_BUILD.gn =================================================================== --- head/www/chromium/files/patch-components_plugins_renderer_BUILD.gn (revision 436364) +++ head/www/chromium/files/patch-components_plugins_renderer_BUILD.gn (revision 436365) @@ -1,17 +1,17 @@ ---- components/plugins/renderer/BUILD.gn.orig 2017-01-26 00:49:12 UTC +--- components/plugins/renderer/BUILD.gn.orig 2017-03-09 20:04:31 UTC +++ components/plugins/renderer/BUILD.gn -@@ -19,6 +19,7 @@ static_library("renderer") { +@@ -20,6 +20,7 @@ static_library("renderer") { } deps = [ + "//v8", "//content/public/child", "//content/public/common", "//content/public/renderer", -@@ -27,6 +28,5 @@ static_library("renderer") { +@@ -28,6 +29,5 @@ static_library("renderer") { "//third_party/WebKit/public:blink", "//third_party/re2", "//ui/base", - "//v8", ] } Index: head/www/chromium/files/patch-components_policy_BUILD.gn =================================================================== --- head/www/chromium/files/patch-components_policy_BUILD.gn (revision 436364) +++ head/www/chromium/files/patch-components_policy_BUILD.gn (revision 436365) @@ -1,19 +1,19 @@ ---- components/policy/BUILD.gn.orig 2017-01-26 00:49:12 UTC +--- components/policy/BUILD.gn.orig 2017-03-09 20:04:31 UTC +++ components/policy/BUILD.gn -@@ -14,6 +14,7 @@ import("//tools/grit/grit_rule.gni") +@@ -16,6 +16,7 @@ assert(!is_ios, "Policy should not be re gen_policy_templates_common = true gen_policy_templates_win = is_win gen_policy_templates_linux = is_linux +gen_policy_templates_bsd = is_bsd gen_policy_templates_android = is_android gen_policy_templates_mac = is_mac -@@ -126,7 +127,7 @@ if (enable_configuration_policy) { - outputs += policy_templates_android_outputs - defines += [ "gen_policy_templates_android" ] - } -- if (gen_policy_templates_linux) { -+ if (gen_policy_templates_linux || gen_policy_templates_bsd) { - outputs += policy_templates_linux_outputs - defines += [ "gen_policy_templates_linux" ] - } +@@ -128,7 +129,7 @@ grit("grit_policy_templates") { + outputs += policy_templates_android_outputs + defines += [ "gen_policy_templates_android" ] + } +- if (gen_policy_templates_linux) { ++ if (gen_policy_templates_linux || gen_policy_templates_bsd) { + outputs += policy_templates_linux_outputs + defines += [ "gen_policy_templates_linux" ] + } Index: head/www/chromium/files/patch-components_policy_resources_policy__templates.json =================================================================== --- head/www/chromium/files/patch-components_policy_resources_policy__templates.json (revision 436364) +++ head/www/chromium/files/patch-components_policy_resources_policy__templates.json (revision 436365) @@ -1,47 +1,47 @@ ---- components/policy/resources/policy_templates.json.orig 2017-01-26 00:49:12 UTC +--- components/policy/resources/policy_templates.json.orig 2017-03-09 20:04:31 UTC +++ components/policy/resources/policy_templates.json -@@ -932,7 +932,7 @@ +@@ -927,7 +927,7 @@ 'name': 'RemoteAccessHostMatchUsername', 'type': 'main', 'schema': { 'type': 'boolean' }, - 'supported_on': ['chrome.linux:25-', 'chrome.mac:25-', 'chrome_os:42-'], + 'supported_on': ['chrome.linux:25-', 'chrome.freebsd:25-', 'chrome.mac:25-', 'chrome_os:42-'], 'features': { 'dynamic_refresh': True, 'per_profile': False, -@@ -2065,7 +2065,7 @@ +@@ -2106,7 +2106,7 @@ 'name': 'GSSAPILibraryName', 'type': 'string', 'schema': { 'type': 'string' }, - 'supported_on': ['chrome.linux:9-'], + 'supported_on': ['chrome.linux:9-', 'chrome.freebsd:9-'], 'features': { 'dynamic_refresh': False, 'per_profile': False, -@@ -4742,7 +4742,7 @@ +@@ -4782,7 +4782,7 @@ 'name': 'RequireOnlineRevocationChecksForLocalAnchors', 'type': 'main', 'schema': { 'type': 'boolean' }, - 'supported_on': ['chrome_os:30-', 'chrome.linux:30-', 'chrome.win:30-'], + 'supported_on': ['chrome_os:30-', 'chrome.linux:30-', 'chrome.freebsd:30-', 'chrome.win:30-'], 'features': { 'dynamic_refresh': True, 'per_profile': False, -@@ -5627,7 +5627,7 @@ +@@ -5671,7 +5671,7 @@ 'name': 'BackgroundModeEnabled', 'type': 'main', 'schema': { 'type': 'boolean' }, - 'supported_on': ['chrome.win:19-', 'chrome.linux:19-'], + 'supported_on': ['chrome.win:19-', 'chrome.linux:19-', 'chrome.freebsd:19-'], 'features': { 'can_be_recommended': True, 'dynamic_refresh': True, -@@ -6156,7 +6156,7 @@ +@@ -6198,7 +6198,7 @@ 'name': 'FullscreenAllowed', 'type': 'main', 'schema': { 'type': 'boolean' }, - 'supported_on': ['chrome.win:31-', 'chrome.linux:31-', 'chrome_os:31-'], + 'supported_on': ['chrome.win:31-', 'chrome.linux:31-', 'chrome_os:31-', 'chrome.freebsd:31-'], 'features': { 'dynamic_refresh': True, 'per_profile': True, Index: head/www/chromium/files/patch-components_policy_tools_generate__policy__source.py =================================================================== --- head/www/chromium/files/patch-components_policy_tools_generate__policy__source.py (revision 436364) +++ head/www/chromium/files/patch-components_policy_tools_generate__policy__source.py (revision 436365) @@ -1,11 +1,11 @@ ---- components/policy/tools/generate_policy_source.py.orig 2017-01-26 00:49:12 UTC +--- components/policy/tools/generate_policy_source.py.orig 2017-03-09 20:04:31 UTC +++ components/policy/tools/generate_policy_source.py -@@ -102,7 +102,7 @@ class PolicyDetails: +@@ -103,7 +103,7 @@ class PolicyDetails: if platform.startswith('chrome.'): platform_sub = platform[7:] if platform_sub == '*': - self.platforms.extend(['win', 'mac', 'linux']) + self.platforms.extend(['win', 'mac', 'linux', 'bsd']) else: self.platforms.append(platform_sub) else: Index: head/www/chromium/files/patch-components_update__client_update__query__params.cc =================================================================== --- head/www/chromium/files/patch-components_update__client_update__query__params.cc (revision 436364) +++ head/www/chromium/files/patch-components_update__client_update__query__params.cc (revision 436365) @@ -1,11 +1,11 @@ ---- components/update_client/update_query_params.cc.orig 2017-01-26 00:49:13 UTC +--- components/update_client/update_query_params.cc.orig 2017-03-09 20:04:32 UTC +++ components/update_client/update_query_params.cc -@@ -31,6 +31,8 @@ const char kOs[] = +@@ -34,6 +34,8 @@ const char kOs[] = "linux"; #elif defined(OS_OPENBSD) "openbsd"; +#elif defined(OS_FREEBSD) + "freebsd"; #else #error "unknown os" #endif Index: head/www/chromium/files/patch-components_variations_proto_study.proto =================================================================== --- head/www/chromium/files/patch-components_variations_proto_study.proto (revision 436364) +++ head/www/chromium/files/patch-components_variations_proto_study.proto (revision 436365) @@ -1,10 +1,10 @@ ---- components/variations/proto/study.proto.orig 2017-01-26 00:49:13 UTC +--- components/variations/proto/study.proto.orig 2017-03-09 20:04:32 UTC +++ components/variations/proto/study.proto -@@ -186,6 +186,7 @@ message Study { +@@ -188,6 +188,7 @@ message Study { PLATFORM_CHROMEOS = 3; PLATFORM_ANDROID = 4; PLATFORM_IOS = 5; + PLATFORM_BSD = 6; } // Possible form factors Chrome is running on. Index: head/www/chromium/files/patch-content_app_BUILD.gn =================================================================== --- head/www/chromium/files/patch-content_app_BUILD.gn (revision 436364) +++ head/www/chromium/files/patch-content_app_BUILD.gn (revision 436365) @@ -1,11 +1,11 @@ ---- content/app/BUILD.gn.orig 2017-01-26 00:49:13 UTC +--- content/app/BUILD.gn.orig 2017-03-09 20:04:32 UTC +++ content/app/BUILD.gn -@@ -68,7 +68,7 @@ template("implement_content_app") { +@@ -70,7 +70,7 @@ template("implement_content_app") { ] } - if (is_linux && enable_plugins) { + if ((is_linux || is_bsd) && enable_plugins) { content_app_deps += [ "//content/ppapi_plugin:ppapi_plugin_sources" ] } Index: head/www/chromium/files/patch-content_app_content__main__runner.cc =================================================================== --- head/www/chromium/files/patch-content_app_content__main__runner.cc (revision 436364) +++ head/www/chromium/files/patch-content_app_content__main__runner.cc (revision 436365) @@ -1,42 +1,42 @@ ---- content/app/content_main_runner.cc.orig 2017-01-26 00:49:13 UTC +--- content/app/content_main_runner.cc.orig 2017-03-09 20:04:32 UTC +++ content/app/content_main_runner.cc -@@ -97,10 +97,10 @@ +@@ -98,10 +98,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 "content/public/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 "content/zygote/zygote_main.h" #endif -@@ -290,7 +290,7 @@ struct MainFunction { +@@ -298,7 +298,7 @@ struct MainFunction { int (*function)(const MainFunctionParams&); }; -#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) +#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD) // On platforms that use the zygote, we have a special subset of // subprocesses that are launched via the zygote. This function // fills in some process-launching bits around ZygoteMain(). -@@ -342,7 +342,7 @@ int RunZygote(const MainFunctionParams& +@@ -350,7 +350,7 @@ int RunZygote(const MainFunctionParams& NOTREACHED() << "Unknown zygote process type: " << process_type; return 1; } -#endif // defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) +#endif // defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD) static void RegisterMainThreadFactories() { #if !defined(CHROME_MULTIPLE_DLL_BROWSER) && !defined(CHROME_MULTIPLE_DLL_CHILD) -@@ -409,7 +409,7 @@ int RunNamedProcessTypeMain( +@@ -417,7 +417,7 @@ int RunNamedProcessTypeMain( } } -#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) +#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD) // Zygote startup is special -- see RunZygote comments above // for why we don't use ZygoteMain directly. if (process_type == switches::kZygoteProcess) Index: head/www/chromium/files/patch-content_browser_BUILD.gn =================================================================== --- head/www/chromium/files/patch-content_browser_BUILD.gn (revision 436364) +++ head/www/chromium/files/patch-content_browser_BUILD.gn (revision 436365) @@ -1,68 +1,63 @@ ---- content/browser/BUILD.gn.orig 2017-01-26 00:49:13 UTC +--- content/browser/BUILD.gn.orig 2017-03-09 20:04:32 UTC +++ content/browser/BUILD.gn -@@ -1421,10 +1421,11 @@ source_set("browser") { +@@ -1444,11 +1444,6 @@ source_set("browser") { "memory/memory_monitor_chromeos.cc", "memory/memory_monitor_chromeos.h", ] - } else { - sources += [ - "memory/memory_monitor_linux.cc", - "memory/memory_monitor_linux.h", -+ } -+ -+ if (is_bsd) { -+ sources -= [ -+ "download/quarantine_linux.cc", - ] +- ] } -@@ -1490,7 +1491,7 @@ source_set("browser") { - if (!is_ios) { - defines += [ "ENABLE_SCREEN_CAPTURE=1" ] + if (!is_win) { +@@ -1514,7 +1509,7 @@ source_set("browser") { + + # Desktop screen capture implementations, conditionally built depending on + # the available implementations for each platform. +- if (is_linux || is_mac || is_win) { ++ if (is_linux || is_bsd || is_mac || is_win) { + defines += [ "ENABLE_SCREEN_CAPTURE=1" ] + sources += [ + "media/capture/cursor_renderer.cc", +@@ -1703,7 +1698,7 @@ source_set("browser") { } -- if (is_linux || is_mac || is_win) { -+ if (is_linux || is_bsd || is_mac || is_win) { - sources += [ - "media/capture/desktop_capture_device.cc", - "media/capture/desktop_capture_device.h", -@@ -1657,7 +1658,7 @@ source_set("browser") { - } } - if (is_linux && use_aura) { + if ((is_linux || is_bsd) && use_aura) { deps += [ "//build/linux:fontconfig" ] } -@@ -1807,6 +1808,17 @@ source_set("browser") { +@@ -1862,6 +1857,17 @@ source_set("browser") { "//chromeos", "//chromeos:power_manager_proto", ] + } else if (is_bsd) { + sources -= [ + "zygote_host/zygote_communication_linux.cc", + "zygote_host/zygote_communication_linux.h", + "zygote_host/zygote_handle_linux.cc", + "zygote_host/zygote_host_impl_linux.cc", + "zygote_host/zygote_host_impl_linux.h", + "../zygote/zygote_linux.cc", + "../zygote/zygote_linux.h", + "../zygote/zygote_main_linux.cc", + ] } if (enable_mojo_media) { -@@ -1930,11 +1942,11 @@ source_set("browser") { - deps += [ "//third_party/flac" ] +@@ -1978,11 +1984,11 @@ source_set("browser") { + ] } - if (is_linux && use_dbus) { + if ((is_linux || is_bsd) && use_dbus) { deps += [ "//dbus" ] } - if (is_linux) { + if (is_linux || is_bsd) { deps += [ "//third_party/boringssl" ] } - Index: head/www/chromium/files/patch-content_browser_accessibility_browser__accessibility__manager.h =================================================================== --- head/www/chromium/files/patch-content_browser_accessibility_browser__accessibility__manager.h (revision 436364) +++ head/www/chromium/files/patch-content_browser_accessibility_browser__accessibility__manager.h (revision 436365) @@ -1,20 +1,20 @@ ---- content/browser/accessibility/browser_accessibility_manager.h.orig 2017-01-26 00:49:13 UTC +--- content/browser/accessibility/browser_accessibility_manager.h.orig 2017-03-09 20:04:32 UTC +++ content/browser/accessibility/browser_accessibility_manager.h @@ -34,7 +34,7 @@ class BrowserAccessibilityManager; class BrowserAccessibilityManagerAndroid; #elif defined(OS_WIN) class BrowserAccessibilityManagerWin; -#elif defined(OS_LINUX) && !defined(OS_CHROMEOS) && defined(USE_X11) +#elif (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) && defined(USE_X11) class BrowserAccessibilityManagerAuraLinux; #elif defined(OS_MACOSX) class BrowserAccessibilityManagerMac; -@@ -244,7 +244,7 @@ class CONTENT_EXPORT BrowserAccessibilit +@@ -246,7 +246,7 @@ class CONTENT_EXPORT BrowserAccessibilit BrowserAccessibilityManagerAndroid* ToBrowserAccessibilityManagerAndroid(); #endif -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && defined(USE_X11) +#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) && defined(USE_X11) BrowserAccessibilityManagerAuraLinux* ToBrowserAccessibilityManagerAuraLinux(); #endif Index: head/www/chromium/files/patch-content_browser_browser__main__loop.cc =================================================================== --- head/www/chromium/files/patch-content_browser_browser__main__loop.cc (revision 436364) +++ head/www/chromium/files/patch-content_browser_browser__main__loop.cc (revision 436365) @@ -1,39 +1,39 @@ ---- content/browser/browser_main_loop.cc.orig 2017-01-26 00:49:13 UTC +--- content/browser/browser_main_loop.cc.orig 2017-03-09 20:04:32 UTC +++ content/browser/browser_main_loop.cc -@@ -203,6 +203,10 @@ +@@ -210,6 +210,10 @@ #include "gpu/vulkan/vulkan_implementation.h" #endif +#if defined(OS_BSD) +#include "content/common/child_process_sandbox_support_impl_linux.h" +#endif + // One of the linux specific headers defines this as a macro. #ifdef DestroyAll #undef DestroyAll -@@ -211,7 +215,7 @@ +@@ -218,7 +222,7 @@ namespace content { namespace { -#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) +#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD) void SetupSandbox(const base::CommandLine& parsed_command_line) { TRACE_EVENT0("startup", "SetupSandbox"); if (parsed_command_line.HasSwitch(switches::kNoZygote)) { -@@ -482,10 +486,15 @@ void BrowserMainLoop::Init() { +@@ -582,10 +586,15 @@ void BrowserMainLoop::Init() { void BrowserMainLoop::EarlyInitialization() { TRACE_EVENT0("startup", "BrowserMainLoop::EarlyInitialization"); -#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) +#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD) // No thread should be created before this call, as SetupSandbox() // will end-up using fork(). SetupSandbox(parsed_command_line_); +#elif defined(OS_BSD) + RenderSandboxHostLinux::GetInstance()->Init(); + base::FileHandleMappingVector fds_to_map; + const int sfd = RenderSandboxHostLinux::GetInstance()->GetRendererSocket(); + fds_to_map.push_back(std::make_pair(sfd, GetSandboxFD())); #endif #if defined(USE_X11) Index: head/www/chromium/files/patch-content_browser_child__process__launcher__helper__linux.cc =================================================================== --- head/www/chromium/files/patch-content_browser_child__process__launcher__helper__linux.cc (nonexistent) +++ head/www/chromium/files/patch-content_browser_child__process__launcher__helper__linux.cc (revision 436365) @@ -0,0 +1,49 @@ +--- content/browser/child_process_launcher_helper_linux.cc.orig 2017-03-09 20:04:32 UTC ++++ content/browser/child_process_launcher_helper_linux.cc +@@ -95,6 +95,7 @@ ChildProcessLauncherHelper::LaunchProces + int* launch_result) { + *is_synchronous_launch = true; + ++#if !defined(OS_BSD) + ZygoteHandle* zygote_handle = + base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kNoZygote) ? + nullptr : delegate_->GetZygote(); +@@ -114,6 +115,7 @@ ChildProcessLauncherHelper::LaunchProces + process.zygote = *zygote_handle; + return process; + } ++#endif + + Process process; + process.process = base::LaunchProcess(*command_line(), options); +@@ -133,10 +135,12 @@ base::TerminationStatus ChildProcessLaun + const ChildProcessLauncherHelper::Process& process, + bool known_dead, + int* exit_code) { ++#if !defined(OS_BSD) + if (process.zygote) { + return process.zygote->GetTerminationStatus( + process.process.Handle(), known_dead, exit_code); + } ++#endif + if (known_dead) { + return base::GetKnownDeadTerminationStatus( + process.process.Handle(), exit_code); +@@ -155,13 +159,17 @@ void ChildProcessLauncherHelper::ForceNo + ChildProcessLauncherHelper::Process process) { + process.process.Terminate(RESULT_CODE_NORMAL_EXIT, false); + // On POSIX, we must additionally reap the child. ++#if !defined(OS_BSD) + if (process.zygote) { + // If the renderer was created via a zygote, we have to proxy the reaping + // through the zygote process. + process.zygote->EnsureProcessTerminated(process.process.Handle()); + } else { ++#endif + base::EnsureProcessTerminated(std::move(process.process)); ++#if !defined(OS_BSD) + } ++#endif + } + + // static Property changes on: head/www/chromium/files/patch-content_browser_child__process__launcher__helper__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-content_browser_devtools_protocol_color__picker.cc =================================================================== --- head/www/chromium/files/patch-content_browser_devtools_protocol_color__picker.cc (revision 436364) +++ head/www/chromium/files/patch-content_browser_devtools_protocol_color__picker.cc (revision 436365) @@ -1,11 +1,11 @@ ---- content/browser/devtools/protocol/color_picker.cc.orig 2017-01-26 00:49:13 UTC +--- content/browser/devtools/protocol/color_picker.cc.orig 2017-03-09 20:04:32 UTC +++ content/browser/devtools/protocol/color_picker.cc -@@ -151,7 +151,7 @@ void ColorPicker::UpdateCursor() { +@@ -150,7 +150,7 @@ void ColorPicker::UpdateCursor() { // magnified projection only with centered hotspot. // Mac Retina requires cursor to be > 120px in order to render smoothly. -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) const float kCursorSize = 63; const float kDiameter = 63; const float kHotspotOffset = 32; Index: head/www/chromium/files/patch-content_browser_download_base__file.cc =================================================================== --- head/www/chromium/files/patch-content_browser_download_base__file.cc (revision 436364) +++ head/www/chromium/files/patch-content_browser_download_base__file.cc (revision 436365) @@ -1,20 +1,20 @@ ---- content/browser/download/base_file.cc.orig 2017-01-26 00:49:13 UTC +--- content/browser/download/base_file.cc.orig 2017-03-09 20:04:32 UTC +++ content/browser/download/base_file.cc -@@ -373,7 +373,7 @@ DownloadInterruptReason BaseFile::LogInt +@@ -370,7 +370,7 @@ DownloadInterruptReason BaseFile::LogInt return reason; } -#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) +#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) namespace { -@@ -456,7 +456,7 @@ DownloadInterruptReason BaseFile::Annota +@@ -453,7 +453,7 @@ DownloadInterruptReason BaseFile::Annota } return DOWNLOAD_INTERRUPT_REASON_FILE_FAILED; } -#else // !OS_WIN && !OS_MACOSX && !OS_LINUX +#else // !OS_WIN && !OS_MACOSX && !OS_LINUX && !OS_BSD DownloadInterruptReason BaseFile::AnnotateWithSourceInformation( const std::string& client_guid, const GURL& source_url, Index: head/www/chromium/files/patch-content_browser_gpu_gpu__data__manager__impl__private.cc =================================================================== --- head/www/chromium/files/patch-content_browser_gpu_gpu__data__manager__impl__private.cc (revision 436364) +++ head/www/chromium/files/patch-content_browser_gpu_gpu__data__manager__impl__private.cc (revision 436365) @@ -1,45 +1,45 @@ ---- content/browser/gpu/gpu_data_manager_impl_private.cc.orig 2017-01-26 00:49:13 UTC +--- content/browser/gpu/gpu_data_manager_impl_private.cc.orig 2017-03-09 20:04:32 UTC +++ content/browser/gpu/gpu_data_manager_impl_private.cc -@@ -376,7 +376,7 @@ bool GpuDataManagerImplPrivate::GpuAcces +@@ -384,7 +384,7 @@ bool GpuDataManagerImplPrivate::GpuAcces // strings even if all features are blacklisted. If all GPU features are // disabled, the GPU process will only initialize GL bindings, create a GL // context, and collect full GPU info. -#if !defined(OS_LINUX) +#if !defined(OS_LINUX) || !defined(OS_BSD) if (reason) { *reason = "All GPU features are blacklisted."; } -@@ -493,8 +493,10 @@ void GpuDataManagerImplPrivate::SetGLStr +@@ -501,8 +501,10 @@ void GpuDataManagerImplPrivate::SetGLStr gpu_info.gl_renderer = gl_renderer; gpu_info.gl_version = gl_version; +#if !defined(OS_BSD) gpu::IdentifyActiveGPU(&gpu_info); gpu::CollectDriverInfoGL(&gpu_info); +#endif UpdateGpuInfo(gpu_info); UpdateGpuSwitchingManager(gpu_info); -@@ -549,10 +551,12 @@ void GpuDataManagerImplPrivate::Initiali +@@ -557,10 +559,12 @@ void GpuDataManagerImplPrivate::Initiali // Skip collecting the basic driver info if SetGpuInfo() is already called. if (IsCompleteGpuInfoAvailable()) { gpu_info = gpu_info_; +#ifndef OS_BSD } else { TRACE_EVENT0("startup", "GpuDataManagerImpl::Initialize:CollectBasicGraphicsInfo"); gpu::CollectBasicGraphicsInfo(&gpu_info); +#endif } if (command_line->HasSwitch(switches::kGpuTestingVendorId) && -@@ -664,7 +668,9 @@ void GpuDataManagerImplPrivate::UpdateGp +@@ -671,7 +675,9 @@ void GpuDataManagerImplPrivate::UpdateGp return; bool was_info_available = IsCompleteGpuInfoAvailable(); +#ifndef OS_BSD gpu::MergeGPUInfo(&gpu_info_, gpu_info); +#endif if (IsCompleteGpuInfoAvailable()) { complete_gpu_info_already_requested_ = true; } else if (was_info_available) { Index: head/www/chromium/files/patch-content_browser_gpu_gpu__internals__ui.cc =================================================================== --- head/www/chromium/files/patch-content_browser_gpu_gpu__internals__ui.cc (revision 436364) +++ head/www/chromium/files/patch-content_browser_gpu_gpu__internals__ui.cc (revision 436365) @@ -1,29 +1,29 @@ ---- content/browser/gpu/gpu_internals_ui.cc.orig 2017-01-26 00:49:13 UTC +--- content/browser/gpu/gpu_internals_ui.cc.orig 2017-03-09 20:04:32 UTC +++ content/browser/gpu/gpu_internals_ui.cc -@@ -42,7 +42,7 @@ +@@ -43,7 +43,7 @@ #include "third_party/skia/include/core/SkMilestone.h" #include "ui/gl/gpu_switching_manager.h" -#if defined(OS_LINUX) && defined(USE_X11) +#if (defined(OS_BSD) || defined(OS_LINUX)) && defined(USE_X11) #include #endif #if defined(OS_WIN) -@@ -50,7 +50,7 @@ +@@ -51,7 +51,7 @@ #include "ui/gfx/win/physical_size.h" #endif -#if defined(OS_LINUX) && defined(USE_X11) +#if (defined(OS_BSD) || defined(OS_LINUX)) && defined(USE_X11) #include "ui/base/x/x11_util.h" // nogncheck #include "ui/gfx/x/x11_atom_cache.h" // nogncheck #endif -@@ -206,7 +206,7 @@ base::DictionaryValue* GpuInfoAsDictiona +@@ -210,7 +210,7 @@ base::DictionaryValue* GpuInfoAsDictiona gpu_info.gl_ws_version)); basic_info->Append(NewDescriptionValuePair("Window system binding extensions", gpu_info.gl_ws_extensions)); -#if defined(OS_LINUX) && defined(USE_X11) +#if (defined(OS_BSD) || defined(OS_LINUX)) && defined(USE_X11) basic_info->Append(NewDescriptionValuePair("Window manager", ui::GuessWindowManagerName())); { Index: head/www/chromium/files/patch-content_browser_gpu_gpu__process__host.cc =================================================================== --- head/www/chromium/files/patch-content_browser_gpu_gpu__process__host.cc (revision 436364) +++ head/www/chromium/files/patch-content_browser_gpu_gpu__process__host.cc (revision 436365) @@ -1,11 +1,11 @@ ---- content/browser/gpu/gpu_process_host.cc.orig 2017-01-26 00:49:13 UTC +--- content/browser/gpu/gpu_process_host.cc.orig 2017-03-09 20:04:32 UTC +++ content/browser/gpu/gpu_process_host.cc -@@ -984,7 +984,7 @@ bool GpuProcessHost::LaunchGpuProcess(gp - base::CommandLine* cmd_line = - new base::CommandLine(base::CommandLine::NO_PROGRAM); +@@ -994,7 +994,7 @@ bool GpuProcessHost::LaunchGpuProcess(gp + std::unique_ptr cmd_line = + base::MakeUnique(base::CommandLine::NO_PROGRAM); #else -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) int child_flags = gpu_launcher.empty() ? ChildProcessHost::CHILD_ALLOW_SELF : ChildProcessHost::CHILD_NORMAL; #else Index: head/www/chromium/files/patch-content_browser_media_media__internals.cc =================================================================== --- head/www/chromium/files/patch-content_browser_media_media__internals.cc (revision 436364) +++ head/www/chromium/files/patch-content_browser_media_media__internals.cc (revision 436365) @@ -1,11 +1,11 @@ ---- content/browser/media/media_internals.cc.orig 2017-01-26 00:49:13 UTC +--- content/browser/media/media_internals.cc.orig 2017-03-09 20:04:32 UTC +++ content/browser/media/media_internals.cc -@@ -755,7 +755,7 @@ void MediaInternals::UpdateVideoCaptureD +@@ -776,7 +776,7 @@ void MediaInternals::UpdateVideoCaptureD device_dict->SetString("name", descriptor.GetNameAndModel()); device_dict->Set("formats", format_list); #if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \ - defined(OS_ANDROID) + defined(OS_ANDROID) || defined(OS_BSD) device_dict->SetString("captureApi", descriptor.GetCaptureApiTypeString()); #endif video_capture_capabilities_cached_data_.Append(std::move(device_dict)); Index: head/www/chromium/files/patch-content_browser_memory_memory__coordinator__impl.cc =================================================================== --- head/www/chromium/files/patch-content_browser_memory_memory__coordinator__impl.cc (revision 436364) +++ head/www/chromium/files/patch-content_browser_memory_memory__coordinator__impl.cc (revision 436365) @@ -1,15 +1,15 @@ ---- content/browser/memory/memory_coordinator_impl.cc.orig 2017-02-02 02:02:53 UTC +--- content/browser/memory/memory_coordinator_impl.cc.orig 2017-03-09 20:04:32 UTC +++ content/browser/memory/memory_coordinator_impl.cc -@@ -116,8 +116,12 @@ void RecordMetricsOnStateChange(base::Me - struct MemoryCoordinatorSingletonTraits - : public base::LeakySingletonTraits { - static MemoryCoordinator* New() { +@@ -148,8 +148,12 @@ void MemoryCoordinatorHandleImpl::AddChi + struct MemoryCoordinatorImplSingletonTraits + : public base::LeakySingletonTraits { + static MemoryCoordinatorImpl* New() { +#if defined(OS_BSD) + return nullptr; +#else return new MemoryCoordinatorImpl(base::ThreadTaskRunnerHandle::Get(), CreateMemoryMonitor()); +#endif } }; Index: head/www/chromium/files/patch-content_browser_ppapi__plugin__process__host.cc =================================================================== --- head/www/chromium/files/patch-content_browser_ppapi__plugin__process__host.cc (revision 436364) +++ head/www/chromium/files/patch-content_browser_ppapi__plugin__process__host.cc (revision 436365) @@ -1,48 +1,48 @@ ---- content/browser/ppapi_plugin_process_host.cc.orig 2017-01-26 00:49:13 UTC +--- content/browser/ppapi_plugin_process_host.cc.orig 2017-03-09 20:04:32 UTC +++ content/browser/ppapi_plugin_process_host.cc -@@ -53,9 +53,9 @@ +@@ -54,9 +54,9 @@ namespace content { -#if defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX) +#if defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX) && !defined(OS_BSD) ZygoteHandle g_ppapi_zygote; -#endif // defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX) +#endif // defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX) && !defined(OS_BSD) // NOTE: changes to this class need to be reviewed by the security team. class PpapiPluginSandboxedProcessLauncherDelegate -@@ -109,7 +109,7 @@ class PpapiPluginSandboxedProcessLaunche +@@ -110,7 +110,7 @@ class PpapiPluginSandboxedProcessLaunche return true; } -#elif defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) +#elif defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD) ZygoteHandle* GetZygote() override { const base::CommandLine& browser_command_line = *base::CommandLine::ForCurrentProcess(); -@@ -203,13 +203,13 @@ PpapiPluginProcessHost* PpapiPluginProce +@@ -204,13 +204,13 @@ PpapiPluginProcessHost* PpapiPluginProce return NULL; } -#if defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX) +#if defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX) && !defined(OS_BSD) // static void PpapiPluginProcessHost::EarlyZygoteLaunch() { DCHECK(!g_ppapi_zygote); g_ppapi_zygote = CreateZygote(); } -#endif // defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX) +#endif // defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX) && !defined(OS_BSD) // static void PpapiPluginProcessHost::DidCreateOutOfProcessInstance( -@@ -361,7 +361,7 @@ bool PpapiPluginProcessHost::Init(const +@@ -362,7 +362,7 @@ bool PpapiPluginProcessHost::Init(const base::CommandLine::StringType plugin_launcher = browser_command_line.GetSwitchValueNative(switches::kPpapiPluginLauncher); -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) int flags = plugin_launcher.empty() ? ChildProcessHost::CHILD_ALLOW_SELF : ChildProcessHost::CHILD_NORMAL; #else Index: head/www/chromium/files/patch-content_browser_renderer__host_media_video__capture__manager.cc =================================================================== --- head/www/chromium/files/patch-content_browser_renderer__host_media_video__capture__manager.cc (nonexistent) +++ head/www/chromium/files/patch-content_browser_renderer__host_media_video__capture__manager.cc (revision 436365) @@ -0,0 +1,20 @@ +--- content/browser/renderer_host/media/video_capture_manager.cc.orig 2017-03-09 20:04:32 UTC ++++ content/browser/renderer_host/media/video_capture_manager.cc +@@ -662,7 +662,7 @@ VideoCaptureManager::DoStartTabCaptureOn + DCHECK(IsOnDeviceThread()); + + std::unique_ptr video_capture_device; +-#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) ++#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD) + video_capture_device = WebContentsVideoCaptureDevice::Create(id); + #endif + +@@ -692,7 +692,7 @@ VideoCaptureManager::DoStartDesktopCaptu + } + + if (desktop_id.type == DesktopMediaID::TYPE_WEB_CONTENTS) { +-#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) ++#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD) + video_capture_device = WebContentsVideoCaptureDevice::Create(id); + IncrementDesktopCaptureCounter(TAB_VIDEO_CAPTURER_CREATED); + if (desktop_id.audio_share) { Property changes on: head/www/chromium/files/patch-content_browser_renderer__host_media_video__capture__manager.cc ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/chromium/files/patch-content_browser_renderer__host_render__message__filter.cc =================================================================== --- head/www/chromium/files/patch-content_browser_renderer__host_render__message__filter.cc (revision 436364) +++ head/www/chromium/files/patch-content_browser_renderer__host_render__message__filter.cc (revision 436365) @@ -1,11 +1,11 @@ ---- content/browser/renderer_host/render_message_filter.cc.orig 2017-02-02 02:02:53 UTC +--- content/browser/renderer_host/render_message_filter.cc.orig 2017-03-09 20:04:32 UTC +++ content/browser/renderer_host/render_message_filter.cc -@@ -92,7 +92,7 @@ +@@ -90,7 +90,7 @@ #include "ui/accelerated_widget_mac/window_resize_helper_mac.h" #endif -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) #include "base/linux_util.h" #include "base/threading/platform_thread.h" #endif Index: head/www/chromium/files/patch-content_browser_renderer__host_render__message__filter.h =================================================================== --- head/www/chromium/files/patch-content_browser_renderer__host_render__message__filter.h (revision 436364) +++ head/www/chromium/files/patch-content_browser_renderer__host_render__message__filter.h (revision 436365) @@ -1,11 +1,11 @@ ---- content/browser/renderer_host/render_message_filter.h.orig 2017-02-02 02:02:53 UTC +--- content/browser/renderer_host/render_message_filter.h.orig 2017-03-09 20:04:32 UTC +++ content/browser/renderer_host/render_message_filter.h -@@ -175,7 +175,7 @@ class CONTENT_EXPORT RenderMessageFilter - void OnDeletedDiscardableSharedMemory( - discardable_memory::DiscardableSharedMemoryId id); +@@ -132,7 +132,7 @@ class CONTENT_EXPORT RenderMessageFilter + const std::list& handles); + void OnResolveProxy(const GURL& url, IPC::Message* reply_msg); -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) void SetThreadPriorityOnFileThread(base::PlatformThreadId ns_tid, base::ThreadPriority priority); void OnSetThreadPriority(base::PlatformThreadId ns_tid, Index: head/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.cc =================================================================== --- head/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.cc (revision 436364) +++ head/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.cc (revision 436365) @@ -1,52 +1,52 @@ ---- content/browser/renderer_host/render_process_host_impl.cc.orig 2017-01-26 00:49:13 UTC +--- content/browser/renderer_host/render_process_host_impl.cc.orig 2017-03-09 20:04:32 UTC +++ content/browser/renderer_host/render_process_host_impl.cc -@@ -368,11 +368,11 @@ SiteProcessMap* GetSiteProcessMapForBrow +@@ -372,11 +372,11 @@ SiteProcessMap* GetSiteProcessMapForBrow return map; } -#if defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX) +#if defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX) && !defined(OS_BSD) // This static member variable holds the zygote communication information for // the renderer. ZygoteHandle g_render_zygote; -#endif // defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX) +#endif // defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX) && !defined(OS_BSD) // NOTE: changes to this class need to be reviewed by the security team. class RendererSandboxedProcessLauncherDelegate -@@ -395,7 +395,7 @@ class RendererSandboxedProcessLauncherDe +@@ -399,7 +399,7 @@ class RendererSandboxedProcessLauncherDe return GetContentClient()->browser()->PreSpawnRenderer(policy); } -#elif defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) +#elif defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD) ZygoteHandle* GetZygote() override { const base::CommandLine& browser_command_line = *base::CommandLine::ForCurrentProcess(); -@@ -635,7 +635,7 @@ void RenderProcessHost::SetMaxRendererPr +@@ -639,7 +639,7 @@ void RenderProcessHost::SetMaxRendererPr g_max_renderer_count_override = count; } -#if defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX) +#if defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX) && !defined(OS_BSD) // static void RenderProcessHostImpl::EarlyZygoteLaunch() { DCHECK(!g_render_zygote); -@@ -645,7 +645,7 @@ void RenderProcessHostImpl::EarlyZygoteL +@@ -649,7 +649,7 @@ void RenderProcessHostImpl::EarlyZygoteL ZygoteHostImpl::GetInstance()->SetRendererSandboxStatus( (*GetGenericZygote())->GetSandboxStatus()); } -#endif // defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX) +#endif // defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX) && !defined(OS_BSD) RenderProcessHostImpl::RenderProcessHostImpl( BrowserContext* browser_context, -@@ -788,7 +788,7 @@ bool RenderProcessHostImpl::Init() { +@@ -796,7 +796,7 @@ bool RenderProcessHostImpl::Init() { renderer_prefix = browser_command_line.GetSwitchValueNative(switches::kRendererCmdPrefix); -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) int flags = renderer_prefix.empty() ? ChildProcessHost::CHILD_ALLOW_SELF : ChildProcessHost::CHILD_NORMAL; #else Index: head/www/chromium/files/patch-content_browser_renderer__host_render__view__host__impl.cc =================================================================== --- head/www/chromium/files/patch-content_browser_renderer__host_render__view__host__impl.cc (revision 436364) +++ head/www/chromium/files/patch-content_browser_renderer__host_render__view__host__impl.cc (revision 436365) @@ -1,11 +1,11 @@ ---- content/browser/renderer_host/render_view_host_impl.cc.orig 2017-02-02 02:02:53 UTC +--- content/browser/renderer_host/render_view_host_impl.cc.orig 2017-03-09 20:04:32 UTC +++ content/browser/renderer_host/render_view_host_impl.cc -@@ -139,7 +139,7 @@ void GetPlatformSpecificPrefs(RendererPr +@@ -140,7 +140,7 @@ void GetPlatformSpecificPrefs(RendererPr display::win::ScreenWin::GetSystemMetricsInDIP(SM_CYVSCROLL); prefs->arrow_bitmap_width_horizontal_scroll_bar_in_dips = display::win::ScreenWin::GetSystemMetricsInDIP(SM_CXHSCROLL); -#elif defined(OS_LINUX) +#elif defined(OS_LINUX) || defined(OS_BSD) prefs->system_font_family_name = gfx::Font().GetFontName(); #endif } Index: head/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc =================================================================== --- head/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc (revision 436364) +++ head/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc (revision 436365) @@ -1,29 +1,29 @@ ---- content/browser/renderer_host/render_widget_host_view_aura.cc.orig 2017-02-02 02:02:53 UTC +--- content/browser/renderer_host/render_widget_host_view_aura.cc.orig 2017-03-09 20:04:32 UTC +++ content/browser/renderer_host/render_widget_host_view_aura.cc -@@ -107,7 +107,7 @@ +@@ -111,7 +111,7 @@ #include "ui/gfx/gdi_util.h" #endif -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) #include "ui/base/ime/linux/text_edit_command_auralinux.h" #include "ui/base/ime/linux/text_edit_key_bindings_delegate_auralinux.h" #endif -@@ -1961,7 +1961,7 @@ bool RenderWidgetHostViewAura::NeedsInpu +@@ -2018,7 +2018,7 @@ bool RenderWidgetHostViewAura::NeedsInpu } bool RenderWidgetHostViewAura::NeedsMouseCapture() { -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) return NeedsInputGrab(); #endif return false; -@@ -2158,7 +2158,7 @@ void RenderWidgetHostViewAura::ForwardKe +@@ -2218,7 +2218,7 @@ void RenderWidgetHostViewAura::ForwardKe if (!target_host) return; -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) ui::TextEditKeyBindingsDelegateAuraLinux* keybinding_delegate = ui::GetTextEditKeyBindingsDelegate(); std::vector commands; Index: head/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__event__handler.cc =================================================================== --- head/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__event__handler.cc (nonexistent) +++ head/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__event__handler.cc (revision 436365) @@ -0,0 +1,11 @@ +--- content/browser/renderer_host/render_widget_host_view_event_handler.cc.orig 2017-03-09 20:04:32 UTC ++++ content/browser/renderer_host/render_widget_host_view_event_handler.cc +@@ -545,7 +545,7 @@ bool RenderWidgetHostViewEventHandler::C + if (event->type() == ui::ET_MOUSE_EXITED) { + if (mouse_locked || selection_popup) + return false; +-#if defined(OS_WIN) || defined(OS_LINUX) ++#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) + // Don't forward the mouse leave message which is received when the context + // menu is displayed by the page. This confuses the page and causes state + // changes. Property changes on: head/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__event__handler.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_utility__process__host__impl.cc =================================================================== --- head/www/chromium/files/patch-content_browser_utility__process__host__impl.cc (revision 436364) +++ head/www/chromium/files/patch-content_browser_utility__process__host__impl.cc (revision 436365) @@ -1,94 +1,94 @@ ---- content/browser/utility_process_host_impl.cc.orig 2017-01-26 00:49:13 UTC +--- content/browser/utility_process_host_impl.cc.orig 2017-03-09 20:04:32 UTC +++ content/browser/utility_process_host_impl.cc -@@ -43,9 +43,9 @@ +@@ -44,9 +44,9 @@ #include "services/service_manager/public/cpp/interface_provider.h" #include "ui/base/ui_base_switches.h" -#if defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX) +#if defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX) && !defined(OS_BSD) #include "content/public/browser/zygote_handle_linux.h" -#endif // defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX) +#endif // defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX) && !defined(OS_BSD) #if defined(OS_WIN) #include "sandbox/win/src/sandbox_policy.h" -@@ -54,11 +54,11 @@ +@@ -55,11 +55,11 @@ namespace content { -#if defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX) +#if defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX) && !defined(OS_BSD) namespace { ZygoteHandle g_utility_zygote; } // namespace -#endif // defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX) +#endif // defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX) && !defined(OS_BSD) // NOTE: changes to this class need to be reviewed by the security team. class UtilitySandboxedProcessLauncherDelegate -@@ -73,10 +73,10 @@ class UtilitySandboxedProcessLauncherDel +@@ -74,10 +74,10 @@ class UtilitySandboxedProcessLauncherDel launch_elevated_(launch_elevated) #elif defined(OS_POSIX) env_(env) -#if !defined(OS_MACOSX) && !defined(OS_ANDROID) +#if !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD) , no_sandbox_(no_sandbox) -#endif // !defined(OS_MACOSX) && !defined(OS_ANDROID) +#endif // !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD) #endif // OS_WIN {} -@@ -105,13 +105,13 @@ class UtilitySandboxedProcessLauncherDel +@@ -106,13 +106,13 @@ class UtilitySandboxedProcessLauncherDel #elif defined(OS_POSIX) -#if !defined(OS_MACOSX) && !defined(OS_ANDROID) +#if !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD) ZygoteHandle* GetZygote() override { if (no_sandbox_ || !exposed_dir_.empty()) return nullptr; return GetGenericZygote(); } -#endif // !defined(OS_MACOSX) && !defined(OS_ANDROID) +#endif // !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD) base::EnvironmentMap GetEnvironment() override { return env_; } #endif // OS_WIN -@@ -126,9 +126,9 @@ class UtilitySandboxedProcessLauncherDel +@@ -127,9 +127,9 @@ class UtilitySandboxedProcessLauncherDel bool launch_elevated_; #elif defined(OS_POSIX) base::EnvironmentMap env_; -#if !defined(OS_MACOSX) && !defined(OS_ANDROID) +#if !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD) bool no_sandbox_; -#endif // !defined(OS_MACOSX) && !defined(OS_ANDROID) +#endif // !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD) #endif // OS_WIN }; -@@ -153,7 +153,7 @@ UtilityProcessHostImpl::UtilityProcessHo +@@ -154,7 +154,7 @@ UtilityProcessHostImpl::UtilityProcessHo is_batch_mode_(false), no_sandbox_(false), run_elevated_(false), -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) child_flags_(ChildProcessHost::CHILD_ALLOW_SELF), #else child_flags_(ChildProcessHost::CHILD_NORMAL), -@@ -235,13 +235,13 @@ void UtilityProcessHostImpl::SetName(con +@@ -236,13 +236,13 @@ void UtilityProcessHostImpl::SetName(con name_ = name; } -#if defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX) +#if defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX) && !defined(OS_BSD) // static void UtilityProcessHostImpl::EarlyZygoteLaunch() { DCHECK(!g_utility_zygote); g_utility_zygote = CreateZygote(); } -#endif // defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX) +#endif // defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX) && !defined(OS_BSD) bool UtilityProcessHostImpl::StartProcess() { if (started_) Index: head/www/chromium/files/patch-content_child_child__process.cc =================================================================== --- head/www/chromium/files/patch-content_child_child__process.cc (revision 436364) +++ head/www/chromium/files/patch-content_child_child__process.cc (revision 436365) @@ -1,11 +1,11 @@ ---- content/child/child_process.cc.orig 2017-02-02 02:02:53 UTC +--- content/child/child_process.cc.orig 2017-03-09 20:04:32 UTC +++ content/child/child_process.cc -@@ -103,7 +103,7 @@ void ChildProcess::ReleaseProcess() { +@@ -122,7 +122,7 @@ void ChildProcess::ReleaseProcess() { main_thread_->OnProcessFinalRelease(); } -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) void ChildProcess::SetIOThreadPriority( base::ThreadPriority io_thread_priority) { main_thread_->SetThreadPriority(io_thread_.GetThreadId(), io_thread_priority); Index: head/www/chromium/files/patch-content_child_child__thread__impl.cc =================================================================== --- head/www/chromium/files/patch-content_child_child__thread__impl.cc (revision 436364) +++ head/www/chromium/files/patch-content_child_child__thread__impl.cc (revision 436365) @@ -1,11 +1,11 @@ ---- content/child/child_thread_impl.cc.orig 2017-02-02 02:02:53 UTC +--- content/child/child_thread_impl.cc.orig 2017-03-09 20:04:32 UTC +++ content/child/child_thread_impl.cc -@@ -751,7 +751,7 @@ std::unique_ptr Chil +@@ -706,7 +706,7 @@ std::unique_ptr Chil return base::MakeUnique(shared_buf, false); } -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) void ChildThreadImpl::SetThreadPriority(base::PlatformThreadId id, base::ThreadPriority priority) { Send(new ChildProcessHostMsg_SetThreadPriority(id, priority)); Index: head/www/chromium/files/patch-content_child_child__thread__impl.h =================================================================== --- head/www/chromium/files/patch-content_child_child__thread__impl.h (revision 436364) +++ head/www/chromium/files/patch-content_child_child__thread__impl.h (revision 436365) @@ -1,11 +1,11 @@ ---- content/child/child_thread_impl.h.orig 2017-02-02 02:02:53 UTC +--- content/child/child_thread_impl.h.orig 2017-03-09 20:04:32 UTC +++ content/child/child_thread_impl.h -@@ -130,7 +130,7 @@ class CONTENT_EXPORT ChildThreadImpl - IPC::Sender* sender, - bool* out_of_memory); +@@ -116,7 +116,7 @@ class CONTENT_EXPORT ChildThreadImpl + static std::unique_ptr AllocateSharedMemory( + size_t buf_size); -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) void SetThreadPriority(base::PlatformThreadId id, base::ThreadPriority priority); #endif Index: head/www/chromium/files/patch-content_common_BUILD.gn =================================================================== --- head/www/chromium/files/patch-content_common_BUILD.gn (revision 436364) +++ head/www/chromium/files/patch-content_common_BUILD.gn (revision 436365) @@ -1,27 +1,28 @@ ---- content/common/BUILD.gn.orig 2017-01-26 00:49:13 UTC +--- content/common/BUILD.gn.orig 2017-03-09 20:04:32 UTC +++ content/common/BUILD.gn -@@ -500,7 +500,7 @@ source_set("common") { - if (use_seccomp_bpf) { - defines += [ "USE_SECCOMP_BPF" ] - } else { +@@ -498,7 +498,7 @@ source_set("common") { + } + + if (!use_seccomp_bpf) { - if (is_linux) { + if (is_linux || is_bsd) { sources -= [ "sandbox_linux/bpf_cros_arm_gpu_policy_linux.cc", "sandbox_linux/bpf_cros_arm_gpu_policy_linux.h", -@@ -514,6 +514,15 @@ source_set("common") { +@@ -512,6 +512,16 @@ source_set("common") { "sandbox_linux/bpf_utility_policy_linux.h", "sandbox_linux/sandbox_bpf_base_policy_linux.cc", "sandbox_linux/sandbox_bpf_base_policy_linux.h", + "sandbox_linux/sandbox_seccomp_bpf_linux.cc", + "sandbox_linux/sandbox_seccomp_bpf_linux.h", + ] + } + if (is_bsd) { + sources -= [ ++ "quarantine/quarantine_linux.cc", + "sandbox_linux/sandbox_linux.cc", + "sandbox_linux/sandbox_linux.h", + "sandbox_linux/sandbox_init_linux.cc", ] } if (is_android) { Index: head/www/chromium/files/patch-content_common_child__process__messages.h =================================================================== --- head/www/chromium/files/patch-content_common_child__process__messages.h (revision 436364) +++ head/www/chromium/files/patch-content_common_child__process__messages.h (revision 436365) @@ -1,29 +1,29 @@ ---- content/common/child_process_messages.h.orig 2017-02-02 02:02:53 UTC +--- content/common/child_process_messages.h.orig 2017-03-09 20:04:32 UTC +++ content/common/child_process_messages.h -@@ -27,7 +27,7 @@ +@@ -26,7 +26,7 @@ #include "ui/gfx/ipc/gfx_param_traits.h" #include "ui/gfx/ipc/skia/gfx_skia_param_traits.h" -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) #include "base/threading/platform_thread.h" #endif -@@ -70,7 +70,7 @@ IPC_STRUCT_TRAITS_BEGIN(tracked_objects: +@@ -75,7 +75,7 @@ IPC_STRUCT_TRAITS_BEGIN(tracked_objects: IPC_STRUCT_TRAITS_MEMBER(process_id) IPC_STRUCT_TRAITS_END() -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) IPC_ENUM_TRAITS_MAX_VALUE(base::ThreadPriority, base::ThreadPriority::REALTIME_AUDIO) #endif -@@ -218,7 +218,7 @@ IPC_SYNC_MESSAGE_CONTROL2_1( - IPC_MESSAGE_CONTROL1(ChildProcessHostMsg_DeletedDiscardableSharedMemory, - discardable_memory::DiscardableSharedMemoryId) +@@ -171,7 +171,7 @@ IPC_SYNC_MESSAGE_CONTROL1_0(ChildProcess + IPC_MESSAGE_CONTROL0(ChildProcessHostMsg_ReleaseCachedFonts) + #endif // defined(OS_WIN) -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) // Asks the browser to change the priority of thread. IPC_MESSAGE_CONTROL2(ChildProcessHostMsg_SetThreadPriority, base::PlatformThreadId, Index: head/www/chromium/files/patch-content_common_content__switches__internal.cc =================================================================== --- head/www/chromium/files/patch-content_common_content__switches__internal.cc (revision 436364) +++ head/www/chromium/files/patch-content_common_content__switches__internal.cc (revision 436365) @@ -1,11 +1,11 @@ ---- content/common/content_switches_internal.cc.orig 2017-02-02 02:02:53 UTC +--- content/common/content_switches_internal.cc.orig 2017-03-09 20:04:32 UTC +++ content/common/content_switches_internal.cc @@ -27,7 +27,7 @@ const base::Feature kUseZoomForDsfEnable #endif bool IsUseZoomForDSFEnabledByDefault() { -#if defined(OS_CHROMEOS) || defined(OS_LINUX) +#if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_BSD) return true; #elif defined(OS_WIN) return base::FeatureList::IsEnabled(kUseZoomForDsfEnabledByDefault); Index: head/www/chromium/files/patch-content_common_view__messages.h =================================================================== --- head/www/chromium/files/patch-content_common_view__messages.h (revision 436364) +++ head/www/chromium/files/patch-content_common_view__messages.h (revision 436365) @@ -1,11 +1,11 @@ ---- content/common/view_messages.h.orig 2017-02-02 02:02:53 UTC +--- content/common/view_messages.h.orig 2017-03-09 20:04:32 UTC +++ content/common/view_messages.h -@@ -245,7 +245,7 @@ IPC_STRUCT_TRAITS_BEGIN(content::Rendere +@@ -246,7 +246,7 @@ IPC_STRUCT_TRAITS_BEGIN(content::Rendere 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) Index: head/www/chromium/files/patch-content_gpu_BUILD.gn =================================================================== --- head/www/chromium/files/patch-content_gpu_BUILD.gn (revision 436364) +++ head/www/chromium/files/patch-content_gpu_BUILD.gn (revision 436365) @@ -1,10 +1,10 @@ ---- content/gpu/BUILD.gn.orig 2017-01-26 00:49:13 UTC +--- content/gpu/BUILD.gn.orig 2017-03-09 20:04:32 UTC +++ content/gpu/BUILD.gn -@@ -96,6 +96,7 @@ target(link_target_type, "gpu_sources") +@@ -97,6 +97,7 @@ target(link_target_type, "gpu_sources") if (use_x11) { deps += [ "//ui/events/platform/x11" ] + configs += [ "//build/config/linux:x11" ] } if (use_ozone) { Index: head/www/chromium/files/patch-content_gpu_gpu__child__thread.cc =================================================================== --- head/www/chromium/files/patch-content_gpu_gpu__child__thread.cc (revision 436364) +++ head/www/chromium/files/patch-content_gpu_gpu__child__thread.cc (revision 436365) @@ -1,18 +1,18 @@ ---- content/gpu/gpu_child_thread.cc.orig 2017-01-26 00:49:13 UTC +--- content/gpu/gpu_child_thread.cc.orig 2017-03-09 20:04:32 UTC +++ content/gpu/gpu_child_thread.cc -@@ -383,6 +383,7 @@ void GpuChildThread::OnCollectGraphicsIn +@@ -387,6 +387,7 @@ void GpuChildThread::OnCollectGraphicsIn if (dead_on_arrival_) return; +#if !defined(OS_BSD) #if defined(OS_WIN) // GPU full info collection should only happen on un-sandboxed GPU process // or single process/in-process gpu mode on Windows. -@@ -434,6 +435,7 @@ void GpuChildThread::OnCollectGraphicsIn +@@ -438,6 +439,7 @@ void GpuChildThread::OnCollectGraphicsIn base::MessageLoop::current()->QuitWhenIdle(); } #endif // OS_WIN +#endif // XXX(rene) !FreeBSD } void GpuChildThread::OnGetVideoMemoryUsageStats() { Index: head/www/chromium/files/patch-content_gpu_gpu__main.cc =================================================================== --- head/www/chromium/files/patch-content_gpu_gpu__main.cc (revision 436364) +++ head/www/chromium/files/patch-content_gpu_gpu__main.cc (revision 436365) @@ -1,29 +1,29 @@ ---- content/gpu/gpu_main.cc.orig 2017-01-26 00:49:13 UTC +--- content/gpu/gpu_main.cc.orig 2017-03-09 20:04:32 UTC +++ content/gpu/gpu_main.cc -@@ -92,7 +92,7 @@ namespace content { +@@ -94,7 +94,7 @@ namespace content { namespace { -#if defined(OS_LINUX) +#if defined(OS_LINUX) && !defined(OS_BSD) bool StartSandboxLinux(gpu::GpuWatchdogThread*); #elif defined(OS_WIN) bool StartSandboxWindows(const sandbox::SandboxInterfaceInfo*); -@@ -145,7 +145,7 @@ class ContentSandboxHelper : public gpu: +@@ -148,7 +148,7 @@ class ContentSandboxHelper : public gpu: bool EnsureSandboxInitialized( gpu::GpuWatchdogThread* watchdog_thread) override { -#if defined(OS_LINUX) +#if defined(OS_LINUX) && !defined(OS_BSD) return StartSandboxLinux(watchdog_thread); #elif defined(OS_WIN) return StartSandboxWindows(sandbox_info_); -@@ -292,7 +292,7 @@ int GpuMain(const MainFunctionParams& pa +@@ -310,7 +310,7 @@ int GpuMain(const MainFunctionParams& pa namespace { -#if defined(OS_LINUX) +#if defined(OS_LINUX) && !defined(OS_BSD) bool StartSandboxLinux(gpu::GpuWatchdogThread* watchdog_thread) { TRACE_EVENT0("gpu,startup", "Initialize sandbox"); Index: head/www/chromium/files/patch-content_public_common_content__switches.h =================================================================== --- head/www/chromium/files/patch-content_public_common_content__switches.h (revision 436364) +++ head/www/chromium/files/patch-content_public_common_content__switches.h (revision 436365) @@ -1,11 +1,11 @@ ---- content/public/common/content_switches.h.orig 2017-01-26 00:49:13 UTC +--- content/public/common/content_switches.h.orig 2017-03-09 20:04:32 UTC +++ content/public/common/content_switches.h -@@ -293,7 +293,7 @@ CONTENT_EXPORT extern const char kDisabl +@@ -296,7 +296,7 @@ CONTENT_EXPORT extern const char kDisabl CONTENT_EXPORT extern const char kDisableVaapiAcceleratedVideoEncode[]; #endif -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_FREEBSD) CONTENT_EXPORT extern const char kEnableSpeechDispatcher[]; #endif Index: head/www/chromium/files/patch-content_renderer_render__thread__impl.cc =================================================================== --- head/www/chromium/files/patch-content_renderer_render__thread__impl.cc (revision 436364) +++ head/www/chromium/files/patch-content_renderer_render__thread__impl.cc (revision 436365) @@ -1,34 +1,34 @@ ---- content/renderer/render_thread_impl.cc.orig 2017-01-26 00:49:13 UTC +--- content/renderer/render_thread_impl.cc.orig 2017-03-09 20:04:32 UTC +++ content/renderer/render_thread_impl.cc -@@ -206,11 +206,13 @@ +@@ -207,11 +207,13 @@ #include "content/common/external_ipc_dumper.h" #endif +#if !defined(OS_BSD) #if defined(OS_MACOSX) #include #else #include #endif +#endif using base::ThreadRestrictions; using blink::WebDocument; -@@ -1488,7 +1490,7 @@ media::GpuVideoAcceleratorFactories* Ren +@@ -1386,7 +1388,7 @@ media::GpuVideoAcceleratorFactories* Ren const bool enable_video_accelerator = !cmd_line->HasSwitch(switches::kDisableAcceleratedVideoDecode); const bool enable_gpu_memory_buffer_video_frames = -#if defined(OS_MACOSX) || defined(OS_LINUX) +#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) !cmd_line->HasSwitch(switches::kDisableGpuMemoryBufferVideoFrames) && !cmd_line->HasSwitch(switches::kDisableGpuCompositing) && !gpu_channel_host->gpu_info().software_rendering; -@@ -1846,6 +1848,8 @@ void RenderThreadImpl::RecordPurgeAndSus +@@ -1729,6 +1731,8 @@ void RenderThreadImpl::GetRendererMemory #else size_t malloc_usage = minfo.hblkhd + minfo.arena; #endif +#elif defined(OS_BSD) + size_t malloc_usage = 0; #else size_t malloc_usage = GetMallocUsage(); #endif 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 436364) +++ head/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.cc (revision 436365) @@ -1,56 +1,56 @@ ---- content/renderer/renderer_blink_platform_impl.cc.orig 2017-01-26 00:49:13 UTC +--- content/renderer/renderer_blink_platform_impl.cc.orig 2017-03-09 20:04:32 UTC +++ content/renderer/renderer_blink_platform_impl.cc @@ -111,7 +111,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 -@@ -201,7 +201,7 @@ class RendererBlinkPlatformImpl::FileUti +@@ -204,7 +204,7 @@ class RendererBlinkPlatformImpl::FileUti scoped_refptr thread_safe_sender_; }; -#if !defined(OS_ANDROID) && !defined(OS_WIN) +#if !defined(OS_ANDROID) && !defined(OS_WIN) && !defined(OS_BSD) class RendererBlinkPlatformImpl::SandboxSupport : public blink::WebSandboxSupport { public: -@@ -247,7 +247,7 @@ RendererBlinkPlatformImpl::RendererBlink +@@ -250,7 +250,7 @@ RendererBlinkPlatformImpl::RendererBlink renderer_scheduler_(renderer_scheduler), blink_interface_provider_( new BlinkInterfaceProviderImpl(remote_interfaces)) { -#if !defined(OS_ANDROID) && !defined(OS_WIN) +#if !defined(OS_ANDROID) && !defined(OS_WIN) && !defined(OS_BSD) if (g_sandbox_enabled && sandboxEnabled()) { sandbox_support_.reset(new RendererBlinkPlatformImpl::SandboxSupport); } else { -@@ -283,7 +283,7 @@ RendererBlinkPlatformImpl::~RendererBlin +@@ -286,7 +286,7 @@ RendererBlinkPlatformImpl::~RendererBlin } void RendererBlinkPlatformImpl::Shutdown() { -#if !defined(OS_ANDROID) && !defined(OS_WIN) +#if !defined(OS_ANDROID) && !defined(OS_WIN) && !defined(OS_BSD) // SandboxSupport contains a map of WebFontFamily objects, which hold // WebCStrings, which become invalidated when blink is shut down. Hence, we // need to clear that map now, just before blink::shutdown() is called. -@@ -331,7 +331,7 @@ blink::WebFileUtilities* RendererBlinkPl +@@ -334,7 +334,7 @@ blink::WebFileUtilities* RendererBlinkPl } blink::WebSandboxSupport* RendererBlinkPlatformImpl::sandboxSupport() { -#if defined(OS_ANDROID) || defined(OS_WIN) +#if defined(OS_ANDROID) || defined(OS_WIN) || defined(OS_BSD) // These platforms do not require sandbox support. return NULL; #else -@@ -539,7 +539,7 @@ bool RendererBlinkPlatformImpl::SandboxS +@@ -542,7 +542,7 @@ bool RendererBlinkPlatformImpl::SandboxS return FontLoader::CGFontRefFromBuffer(font_data, font_data_size, out); } -#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-content_renderer_renderer__blink__platform__impl.h =================================================================== --- head/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.h (revision 436364) +++ head/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.h (revision 436365) @@ -1,11 +1,11 @@ ---- content/renderer/renderer_blink_platform_impl.h.orig 2017-01-26 00:49:13 UTC +--- content/renderer/renderer_blink_platform_impl.h.orig 2017-03-09 20:04:32 UTC +++ content/renderer/renderer_blink_platform_impl.h -@@ -256,7 +256,7 @@ class CONTENT_EXPORT RendererBlinkPlatfo +@@ -252,7 +252,7 @@ class CONTENT_EXPORT RendererBlinkPlatfo class FileUtilities; std::unique_ptr file_utilities_; -#if !defined(OS_ANDROID) && !defined(OS_WIN) +#if !defined(OS_ANDROID) && !defined(OS_WIN) && !defined(OS_BSD) class SandboxSupport; std::unique_ptr sandbox_support_; #endif Index: head/www/chromium/files/patch-content_shell_BUILD.gn =================================================================== --- head/www/chromium/files/patch-content_shell_BUILD.gn (revision 436364) +++ head/www/chromium/files/patch-content_shell_BUILD.gn (revision 436365) @@ -1,38 +1,38 @@ ---- content/shell/BUILD.gn.orig 2017-01-26 00:49:13 UTC +--- content/shell/BUILD.gn.orig 2017-03-09 20:04:32 UTC +++ content/shell/BUILD.gn @@ -296,7 +296,7 @@ static_library("content_shell_lib") { ] } - if (is_linux) { + if (is_linux || is_bsd) { deps += [ "//build/linux:fontconfig", "//ui/gfx:test_support", -@@ -317,7 +317,7 @@ static_library("content_shell_lib") { - deps += [ "//content/shell/android:content_shell_jni_headers" ] +@@ -320,7 +320,7 @@ static_library("content_shell_lib") { + ] } - if (is_posix && !is_mac) { + if (is_posix && !is_mac && !is_bsd) { deps += [ "//components/crash/content/app", "//components/crash/content/browser", -@@ -366,7 +366,7 @@ static_library("content_shell_lib") { +@@ -369,7 +369,7 @@ static_library("content_shell_lib") { ] } - if (is_linux) { + if (is_linux || is_bsd) { deps += [ "//third_party/freetype2" ] } -@@ -532,7 +532,7 @@ if (is_android) { +@@ -539,7 +539,7 @@ if (is_android) { } } - if (is_linux && !is_component_build) { + if ((is_linux || is_bsd) && !is_component_build) { # Set rpath to find our own libfreetype even in a non-component build. configs += [ "//build/config/gcc:rpath_for_built_shared_libraries" ] } Index: head/www/chromium/files/patch-content_shell_browser_shell__browser__main__parts.cc =================================================================== --- head/www/chromium/files/patch-content_shell_browser_shell__browser__main__parts.cc (revision 436364) +++ head/www/chromium/files/patch-content_shell_browser_shell__browser__main__parts.cc (revision 436365) @@ -1,20 +1,20 @@ ---- content/shell/browser/shell_browser_main_parts.cc.orig 2017-01-26 00:49:13 UTC +--- content/shell/browser/shell_browser_main_parts.cc.orig 2017-03-09 20:04:32 UTC +++ content/shell/browser/shell_browser_main_parts.cc -@@ -44,7 +44,7 @@ +@@ -46,7 +46,7 @@ #if defined(USE_AURA) && defined(USE_X11) #include "ui/events/devices/x11/touch_factory_x11.h" // nogncheck #endif -#if !defined(OS_CHROMEOS) && defined(USE_AURA) && defined(OS_LINUX) +#if !defined(OS_CHROMEOS) && defined(USE_AURA) && (defined(OS_BSD) || defined(OS_LINUX)) #include "ui/base/ime/input_method_initializer.h" #endif #if defined(OS_CHROMEOS) -@@ -140,7 +140,7 @@ void ShellBrowserMainParts::PostMainMess +@@ -142,7 +142,7 @@ void ShellBrowserMainParts::PostMainMess } void ShellBrowserMainParts::PreEarlyInitialization() { -#if !defined(OS_CHROMEOS) && defined(USE_AURA) && defined(OS_LINUX) +#if !defined(OS_CHROMEOS) && defined(USE_AURA) && (defined(OS_BSD) || defined(OS_LINUX)) ui::InitializeInputMethodForTesting(); #endif #if defined(OS_ANDROID) Index: head/www/chromium/files/patch-content_test_BUILD.gn =================================================================== --- head/www/chromium/files/patch-content_test_BUILD.gn (revision 436364) +++ head/www/chromium/files/patch-content_test_BUILD.gn (revision 436365) @@ -1,38 +1,38 @@ ---- content/test/BUILD.gn.orig 2017-01-26 00:49:13 UTC +--- content/test/BUILD.gn.orig 2017-03-09 20:04:32 UTC +++ content/test/BUILD.gn -@@ -748,7 +748,7 @@ test("content_browsertests") { +@@ -771,7 +771,7 @@ test("content_browsertests") { } } - if (is_android || is_linux || is_mac || is_win) { + if (is_android || is_linux || is_bsd || is_mac || is_win) { data += [ "$root_out_dir/content_shell.pak", "data/", -@@ -1350,7 +1350,7 @@ test("content_unittests") { +@@ -1392,7 +1392,7 @@ test("content_unittests") { sources += [ "../browser/memory/memory_monitor_linux_unittest.cc" ] } - if (is_android || is_linux || is_mac || is_win) { + if (is_android || is_linux || is_bsd || is_mac || is_win) { data = [ "$root_out_dir/content_shell.pak", "data/", -@@ -1540,7 +1540,7 @@ test("content_unittests") { +@@ -1597,7 +1597,7 @@ test("content_unittests") { "//ui/shell_dialogs:shell_dialogs", ] - if (is_linux || is_mac || is_win) { + if (is_linux || is_bsd || is_mac || is_win) { sources += [ "../browser/media/capture/desktop_capture_device_unittest.cc" ] deps += [ "//third_party/webrtc/modules/desktop_capture" ] -@@ -1576,7 +1576,7 @@ test("content_unittests") { - ] +@@ -1631,7 +1631,7 @@ test("content_unittests") { + } } - if (is_linux) { + if (is_linux || is_bsd) { if (use_dbus) { deps += [ "//dbus:test_support" ] } Index: head/www/chromium/files/patch-device_BUILD.gn =================================================================== --- head/www/chromium/files/patch-device_BUILD.gn (revision 436364) +++ head/www/chromium/files/patch-device_BUILD.gn (revision 436365) @@ -1,11 +1,11 @@ ---- device/BUILD.gn.orig 2017-01-26 00:49:14 UTC +--- device/BUILD.gn.orig 2017-03-09 20:04:33 UTC +++ device/BUILD.gn -@@ -184,7 +184,7 @@ test("device_unittests") { +@@ -197,7 +197,7 @@ test("device_unittests") { ] } - if ((is_chromeos || is_linux) && use_dbus) { + if ((is_chromeos || is_linux || is_bsd) && use_dbus) { configs += [ "//build/config/linux/dbus" ] sources += [ Index: head/www/chromium/files/patch-device_bluetooth_BUILD.gn =================================================================== --- head/www/chromium/files/patch-device_bluetooth_BUILD.gn (revision 436364) +++ head/www/chromium/files/patch-device_bluetooth_BUILD.gn (revision 436365) @@ -1,11 +1,11 @@ ---- device/bluetooth/BUILD.gn.orig 2017-02-02 02:02:54 UTC +--- device/bluetooth/BUILD.gn.orig 2017-03-09 20:04:33 UTC +++ device/bluetooth/BUILD.gn -@@ -193,7 +193,7 @@ component("bluetooth") { +@@ -199,7 +199,7 @@ component("bluetooth") { ] } - if (is_chromeos || is_linux) { + if (is_chromeos || (is_linux && !is_bsd)) { if (use_dbus) { sources += [ "bluez/bluetooth_adapter_bluez.cc", Index: head/www/chromium/files/patch-device_gamepad_gamepad__provider.cc =================================================================== --- head/www/chromium/files/patch-device_gamepad_gamepad__provider.cc (revision 436364) +++ head/www/chromium/files/patch-device_gamepad_gamepad__provider.cc (revision 436365) @@ -1,11 +1,11 @@ ---- device/gamepad/gamepad_provider.cc.orig 2017-02-02 02:02:54 UTC +--- device/gamepad/gamepad_provider.cc.orig 2017-03-09 20:04:33 UTC +++ device/gamepad/gamepad_provider.cc -@@ -145,7 +145,7 @@ void GamepadProvider::Initialize(std::un +@@ -153,7 +153,7 @@ void GamepadProvider::Initialize(std::un monitor->AddDevicesChangedObserver(this); polling_thread_.reset(new base::Thread("Gamepad polling thread")); -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) // On Linux, the data fetcher needs to watch file descriptors, so the message // loop needs to be a libevent loop. const base::MessageLoop::Type kMessageLoopType = base::MessageLoop::TYPE_IO; Index: head/www/chromium/files/patch-device_usb_usb__service__impl.cc =================================================================== --- head/www/chromium/files/patch-device_usb_usb__service__impl.cc (revision 436364) +++ head/www/chromium/files/patch-device_usb_usb__service__impl.cc (revision 436365) @@ -1,59 +1,58 @@ ---- device/usb/usb_service_impl.cc.orig 2017-01-26 00:49:14 UTC +--- device/usb/usb_service_impl.cc.orig 2017-03-09 20:04:33 UTC +++ device/usb/usb_service_impl.cc @@ -26,7 +26,11 @@ #include "device/usb/usb_error.h" #include "device/usb/webusb_descriptors.h" #include "net/base/io_buffer.h" -#include "third_party/libusb/src/libusb/libusb.h" +#if defined(OS_FREEBSD) +# include +#else +# include "third_party/libusb/src/libusb/libusb.h" +#endif #if defined(OS_WIN) #include -@@ -213,6 +217,7 @@ UsbServiceImpl::UsbServiceImpl( - } - context_ = new UsbContext(platform_context); - -+#if !defined(OS_FREEBSD) - rv = libusb_hotplug_register_callback( - context_->context(), - static_cast(LIBUSB_HOTPLUG_EVENT_DEVICE_ARRIVED | -@@ -225,6 +230,8 @@ UsbServiceImpl::UsbServiceImpl( - } - - RefreshDevices(); -+#endif // !defined(OS_FREEBSD) -+ - #if defined(OS_WIN) - DeviceMonitorWin* device_monitor = DeviceMonitorWin::GetForAllInterfaces(); - if (device_monitor) { -@@ -234,8 +241,10 @@ UsbServiceImpl::UsbServiceImpl( +@@ -229,8 +233,10 @@ UsbServiceImpl::UsbServiceImpl( } UsbServiceImpl::~UsbServiceImpl() { +#if !defined(OS_FREEBSD) if (hotplug_enabled_) libusb_hotplug_deregister_callback(context_->context(), hotplug_handle_); +#endif // !defined(OS_FREEBSD) for (auto* platform_device : ignored_devices_) libusb_unref_device(platform_device); } -@@ -477,6 +486,7 @@ void UsbServiceImpl::RemoveDevice(scoped +@@ -287,6 +293,7 @@ void UsbServiceImpl::OnUsbContext(scoped + + context_ = std::move(context); + ++#if !defined(OS_FREEBSD) + int rv = libusb_hotplug_register_callback( + context_->context(), + static_cast(LIBUSB_HOTPLUG_EVENT_DEVICE_ARRIVED | +@@ -299,6 +306,7 @@ void UsbServiceImpl::OnUsbContext(scoped + + // This will call any enumeration callbacks queued while initializing. + RefreshDevices(); ++#endif // !defined(OS_FREEBSD) + + #if defined(OS_WIN) + DeviceMonitorWin* device_monitor = DeviceMonitorWin::GetForAllInterfaces(); +@@ -498,6 +506,7 @@ void UsbServiceImpl::RemoveDevice(scoped device->OnDisconnect(); } +#if !defined(OS_FREEBSD) // static int LIBUSB_CALL UsbServiceImpl::HotplugCallback(libusb_context* context, PlatformUsbDevice device, -@@ -514,6 +524,7 @@ int LIBUSB_CALL UsbServiceImpl::HotplugC +@@ -528,6 +537,7 @@ int LIBUSB_CALL UsbServiceImpl::HotplugC return 0; } +#endif // !defined(OS_FREEBSD) void UsbServiceImpl::OnPlatformDeviceAdded(PlatformUsbDevice platform_device) { DCHECK(CalledOnValidThread()); Index: head/www/chromium/files/patch-device_usb_usb__service__impl.h =================================================================== --- head/www/chromium/files/patch-device_usb_usb__service__impl.h (revision 436364) +++ head/www/chromium/files/patch-device_usb_usb__service__impl.h (revision 436365) @@ -1,40 +1,40 @@ ---- device/usb/usb_service_impl.h.orig 2017-01-26 00:49:14 UTC +--- device/usb/usb_service_impl.h.orig 2017-03-09 20:04:33 UTC +++ device/usb/usb_service_impl.h @@ -15,7 +15,13 @@ #include "build/build_config.h" #include "device/usb/usb_context.h" #include "device/usb/usb_device_impl.h" +#if defined(OS_FREEBSD) +#include "libusb.h" +#define LIBUSB_CALL +#else #include "third_party/libusb/src/libusb/libusb.h" +#endif + #if defined(OS_WIN) #include "base/scoped_observer.h" -@@ -70,11 +76,13 @@ class UsbServiceImpl : +@@ -71,11 +77,13 @@ class UsbServiceImpl : scoped_refptr device); void RemoveDevice(scoped_refptr device); +#if !defined(OS_FREEBSD) // Handle hotplug events from libusb. static int LIBUSB_CALL HotplugCallback(libusb_context* context, PlatformUsbDevice device, libusb_hotplug_event event, void* user_data); +#endif // These functions release a reference to the provided platform device. void OnPlatformDeviceAdded(PlatformUsbDevice platform_device); void OnPlatformDeviceRemoved(PlatformUsbDevice platform_device); -@@ -90,7 +98,9 @@ class UsbServiceImpl : +@@ -92,7 +100,9 @@ class UsbServiceImpl : // connected instead of only when a full enumeration is requested. // TODO(reillyg): Support this on all platforms. crbug.com/411715 bool hotplug_enabled_ = false; +#if !defined(OS_FREEBSD) libusb_hotplug_callback_handle hotplug_handle_; +#endif // Enumeration callbacks are queued until an enumeration completes. bool enumeration_ready_ = false; Index: head/www/chromium/files/patch-extensions_browser_api_serial_serial__api.cc =================================================================== --- head/www/chromium/files/patch-extensions_browser_api_serial_serial__api.cc (revision 436364) +++ head/www/chromium/files/patch-extensions_browser_api_serial_serial__api.cc (revision 436365) @@ -1,17 +1,16 @@ ---- extensions/browser/api/serial/serial_api.cc.orig 2017-01-26 00:49:14 UTC +--- extensions/browser/api/serial/serial_api.cc.orig 2017-03-09 20:04:33 UTC +++ extensions/browser/api/serial/serial_api.cc -@@ -85,12 +85,13 @@ bool SerialGetDevicesFunction::Prepare() - +@@ -86,11 +86,13 @@ bool SerialGetDevicesFunction::Prepare() void SerialGetDevicesFunction::Work() { DCHECK_CURRENTLY_ON(BrowserThread::FILE); -- + +#if !defined(OS_BSD) std::unique_ptr enumerator = device::SerialDeviceEnumerator::Create(); - mojo::Array devices = enumerator->GetDevices(); + std::vector devices = enumerator->GetDevices(); results_ = serial::GetDevices::Results::Create( - devices.To>()); + mojo::ConvertTo>(devices)); +#endif } SerialConnectFunction::SerialConnectFunction() { Index: head/www/chromium/files/patch-gpu_ipc_client_BUILD.gn =================================================================== --- head/www/chromium/files/patch-gpu_ipc_client_BUILD.gn (revision 436364) +++ head/www/chromium/files/patch-gpu_ipc_client_BUILD.gn (revision 436365) @@ -1,10 +1,10 @@ ---- gpu/ipc/client/BUILD.gn.orig 2017-01-26 00:49:14 UTC +--- gpu/ipc/client/BUILD.gn.orig 2017-03-09 20:04:33 UTC +++ gpu/ipc/client/BUILD.gn -@@ -51,6 +51,7 @@ source_set("ipc_client_sources") { +@@ -44,6 +44,7 @@ source_set("ipc_client_sources") { configs += [ "//build/config/compiler:no_size_t_to_int_warning", "//gpu:gpu_implementation", + "//build/config/linux:x11", ] deps = [ "//base", Index: head/www/chromium/files/patch-gpu_ipc_service_BUILD.gn =================================================================== --- head/www/chromium/files/patch-gpu_ipc_service_BUILD.gn (revision 436364) +++ head/www/chromium/files/patch-gpu_ipc_service_BUILD.gn (revision 436365) @@ -1,16 +1,16 @@ ---- gpu/ipc/service/BUILD.gn.orig 2017-01-26 00:49:14 UTC +--- gpu/ipc/service/BUILD.gn.orig 2017-03-09 20:04:33 UTC +++ gpu/ipc/service/BUILD.gn -@@ -104,11 +104,12 @@ target(link_target_type, "ipc_service_so +@@ -109,11 +109,12 @@ target(link_target_type, "ipc_service_so ] libs += [ "android" ] } - if (is_linux) { + if (is_linux || is_bsd) { sources += [ "image_transport_surface_linux.cc" ] } if (use_x11) { sources += [ "x_util.h" ] + configs += [ "//build/config/linux:x11" ] } if (use_ozone) { sources += [ Index: head/www/chromium/files/patch-gpu_ipc_service_gpu__init.cc =================================================================== --- head/www/chromium/files/patch-gpu_ipc_service_gpu__init.cc (revision 436364) +++ head/www/chromium/files/patch-gpu_ipc_service_gpu__init.cc (revision 436365) @@ -1,38 +1,38 @@ ---- gpu/ipc/service/gpu_init.cc.orig 2017-01-26 00:49:14 UTC +--- gpu/ipc/service/gpu_init.cc.orig 2017-03-09 20:04:33 UTC +++ gpu/ipc/service/gpu_init.cc -@@ -75,7 +75,7 @@ void GetGpuInfoFromCommandLine(gpu::GPUI +@@ -76,7 +76,7 @@ void GetGpuInfoFromCommandLine(gpu::GPUI } } -#if !defined(OS_MACOSX) +#if !defined(OS_MACOSX) && !defined(OS_BSD) void CollectGraphicsInfo(gpu::GPUInfo& gpu_info) { TRACE_EVENT0("gpu,startup", "Collect Graphics Info"); -@@ -94,7 +94,7 @@ void CollectGraphicsInfo(gpu::GPUInfo& g +@@ -95,7 +95,7 @@ void CollectGraphicsInfo(gpu::GPUInfo& g break; } } -#endif // defined(OS_MACOSX) +#endif // defined(OS_MACOSX) && defined(OS_BSD) #if defined(OS_LINUX) && !defined(OS_CHROMEOS) bool CanAccessNvidiaDeviceFile() { -@@ -189,7 +189,7 @@ bool GpuInit::InitializeAndStartSandbox( +@@ -194,7 +194,7 @@ bool GpuInit::InitializeAndStartSandbox( // By skipping the following code on Mac, we don't really lose anything, // because the basic GPU information is passed down from the host process. base::TimeTicks before_collect_context_graphics_info = base::TimeTicks::Now(); -#if !defined(OS_MACOSX) +#if !defined(OS_MACOSX) && !defined(OS_BSD) CollectGraphicsInfo(gpu_info_); if (gpu_info_.context_info_state == gpu::kCollectInfoFatalFailure) return false; -@@ -206,7 +206,7 @@ bool GpuInit::InitializeAndStartSandbox( +@@ -211,7 +211,7 @@ bool GpuInit::InitializeAndStartSandbox( gpu::ApplyGpuDriverBugWorkarounds( gpu_info_, const_cast(&command_line)); } -#endif // !defined(OS_MACOSX) +#endif // !defined(OS_MACOSX) && !defined(OS_BSD) base::TimeDelta collect_context_time = base::TimeTicks::Now() - before_collect_context_graphics_info; Index: head/www/chromium/files/patch-ipc_ipc__message__utils.h =================================================================== --- head/www/chromium/files/patch-ipc_ipc__message__utils.h (revision 436364) +++ head/www/chromium/files/patch-ipc_ipc__message__utils.h (revision 436365) @@ -1,11 +1,11 @@ ---- ipc/ipc_message_utils.h.orig 2017-01-26 00:49:15 UTC +--- ipc/ipc_message_utils.h.orig 2017-03-09 20:04:34 UTC +++ ipc/ipc_message_utils.h -@@ -210,7 +210,7 @@ struct ParamTraits { +@@ -209,7 +209,7 @@ struct ParamTraits { // 3) Android 64 bit also has int64_t typedef'd to long. // Since we want to support Android 32<>64 bit IPC, as long as we don't have // these traits for 32 bit ARM then that'll catch any errors. -#if defined(OS_WIN) || defined(OS_LINUX) || \ +#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) || \ (defined(OS_ANDROID) && defined(ARCH_CPU_64_BITS)) template <> struct ParamTraits { Index: head/www/chromium/files/patch-mash_package_mash__packaged__service.cc =================================================================== --- head/www/chromium/files/patch-mash_package_mash__packaged__service.cc (revision 436364) +++ head/www/chromium/files/patch-mash_package_mash__packaged__service.cc (revision 436365) @@ -1,20 +1,20 @@ ---- mash/package/mash_packaged_service.cc.orig 2017-02-02 02:02:55 UTC +--- mash/package/mash_packaged_service.cc.orig 2017-03-09 20:04:34 UTC +++ mash/package/mash_packaged_service.cc -@@ -19,7 +19,7 @@ - #include "services/ui/public/interfaces/constants.mojom.h" - #include "services/ui/service.h" +@@ -29,7 +29,7 @@ + #include "ash/touch_hud/mus/touch_hud_application.h" // nogncheck + #endif -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) #include "components/font_service/font_service_app.h" #endif -@@ -91,7 +91,7 @@ std::unique_ptrCardNext(&card) && card >= 0) { +#endif void** hints = NULL; int error = wrapper_->DeviceNameHint(card, kPcmInterfaceName, &hints); if (!error) { -@@ -147,7 +149,9 @@ void AudioManagerAlsa::GetAlsaAudioDevic +@@ -150,7 +152,9 @@ void AudioManagerAlsa::GetAlsaAudioDevic DLOG(WARNING) << "GetAlsaAudioDevices: unable to get device hints: " << wrapper_->StrError(error); } +#ifdef OS_LINUX } +#endif } - void AudioManagerAlsa::GetAlsaDevicesInfo( -@@ -230,7 +234,11 @@ bool AudioManagerAlsa::IsAlsaDeviceAvail + void AudioManagerAlsa::GetAlsaDevicesInfo(AudioManagerAlsa::StreamType type, +@@ -232,7 +236,11 @@ bool AudioManagerAlsa::IsAlsaDeviceAvail // goes through software conversion if needed (e.g. incompatible // sample rate). // TODO(joi): Should we prefer "hw" instead? +#ifdef OS_LINUX static const char kDeviceTypeDesired[] = "plughw"; +#else + static const char kDeviceTypeDesired[] = "plug"; +#endif return strncmp(kDeviceTypeDesired, device_name, arraysize(kDeviceTypeDesired) - 1) == 0; -@@ -254,7 +262,9 @@ bool AudioManagerAlsa::HasAnyAlsaAudioDe +@@ -256,7 +264,9 @@ bool AudioManagerAlsa::HasAnyAlsaAudioDe // Loop through the sound cards. // Don't use snd_device_name_hint(-1,..) since there is a access violation // inside this ALSA API with libasound.so.2.0.0. +#ifdef OS_LINUX while (!wrapper_->CardNext(&card) && (card >= 0) && !has_device) { +#endif int error = wrapper_->DeviceNameHint(card, kPcmInterfaceName, &hints); if (!error) { for (void** hint_iter = hints; *hint_iter != NULL; hint_iter++) { -@@ -278,7 +288,9 @@ bool AudioManagerAlsa::HasAnyAlsaAudioDe +@@ -280,7 +290,9 @@ bool AudioManagerAlsa::HasAnyAlsaAudioDe DLOG(WARNING) << "HasAnyAudioDevice: unable to get device hints: " << wrapper_->StrError(error); } +#ifdef OS_LINUX } +#endif return has_device; } Index: head/www/chromium/files/patch-media_audio_BUILD.gn =================================================================== --- head/www/chromium/files/patch-media_audio_BUILD.gn (revision 436364) +++ head/www/chromium/files/patch-media_audio_BUILD.gn (revision 436365) @@ -1,25 +1,25 @@ ---- media/audio/BUILD.gn.orig 2017-01-26 00:49:15 UTC +--- media/audio/BUILD.gn.orig 2017-03-09 20:04:34 UTC +++ media/audio/BUILD.gn -@@ -206,7 +206,7 @@ source_set("audio") { +@@ -207,7 +207,7 @@ source_set("audio") { deps += [ "//media/base/android:media_jni_headers" ] } - if (is_linux) { + if (is_linux || is_bsd) { sources += [ "linux/audio_manager_linux.cc" ] } -@@ -255,10 +255,12 @@ source_set("audio") { +@@ -256,10 +256,12 @@ source_set("audio") { configs += [ ":libpulse" ] } else { # TODO(ajwong): Technically, this dl should go in the action. - libs += [ "dl" ] deps += [ ":pulse_generate_stubs" ] sources += get_target_outputs(":pulse_generate_stubs") } + if (is_linux) { + libs += [ "dl" ] + } } configs += [ "//build/config/compiler:no_size_t_to_int_warning" ] Index: head/www/chromium/files/patch-media_audio_audio__manager.cc =================================================================== --- head/www/chromium/files/patch-media_audio_audio__manager.cc (revision 436364) +++ head/www/chromium/files/patch-media_audio_audio__manager.cc (revision 436365) @@ -1,29 +1,29 @@ ---- media/audio/audio_manager.cc.orig 2017-01-26 00:49:15 UTC +--- media/audio/audio_manager.cc.orig 2017-03-09 20:04:34 UTC +++ media/audio/audio_manager.cc @@ -95,7 +95,7 @@ class AudioManagerHelper : public base:: } #endif -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_FREEBSD) void set_app_name(const std::string& app_name) { app_name_ = app_name; } const std::string& app_name() const { return app_name_; } #endif @@ -253,7 +253,7 @@ class AudioManagerHelper : public base:: std::unique_ptr com_initializer_for_testing_; #endif -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_FREEBSD) std::string app_name_; #endif -@@ -365,7 +365,7 @@ void AudioManager::EnableCrashKeyLogging +@@ -369,7 +369,7 @@ void AudioManager::EnableCrashKeyLogging g_helper.Pointer()->enable_crash_key_logging(); } -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_FREEBSD) // static void AudioManager::SetGlobalAppName(const std::string& app_name) { g_helper.Pointer()->set_app_name(app_name); Index: head/www/chromium/files/patch-media_base_BUILD.gn =================================================================== --- head/www/chromium/files/patch-media_base_BUILD.gn (revision 436364) +++ head/www/chromium/files/patch-media_base_BUILD.gn (revision 436365) @@ -1,20 +1,20 @@ ---- media/base/BUILD.gn.orig 2017-01-26 00:49:15 UTC +--- media/base/BUILD.gn.orig 2017-03-09 20:04:34 UTC +++ media/base/BUILD.gn -@@ -309,7 +309,7 @@ target(link_target_type, "base") { +@@ -311,7 +311,7 @@ target(link_target_type, "base") { allow_circular_includes_from += [ "//media/base/android" ] } - if (is_linux && use_x11) { + if ((is_linux || is_bsd) && use_x11) { configs += [ "//build/config/linux:x11", "//build/config/linux:xext", -@@ -345,7 +345,7 @@ target(link_target_type, "base") { +@@ -347,7 +347,7 @@ target(link_target_type, "base") { deps += [ ":media_yasm" ] } - if (is_linux || is_win) { + if (is_linux || is_bsd || is_win) { sources += [ "keyboard_event_counter.cc", "keyboard_event_counter.h", Index: head/www/chromium/files/patch-media_base_video__frame.cc =================================================================== --- head/www/chromium/files/patch-media_base_video__frame.cc (revision 436364) +++ head/www/chromium/files/patch-media_base_video__frame.cc (revision 436365) @@ -1,47 +1,47 @@ ---- media/base/video_frame.cc.orig 2017-02-02 02:02:55 UTC +--- media/base/video_frame.cc.orig 2017-03-09 20:04:34 UTC +++ media/base/video_frame.cc @@ -53,7 +53,7 @@ static std::string StorageTypeToString( return "OWNED_MEMORY"; case VideoFrame::STORAGE_SHMEM: return "SHMEM"; -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) case VideoFrame::STORAGE_DMABUFS: return "DMABUFS"; #endif @@ -69,7 +69,7 @@ static std::string StorageTypeToString( // 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 && -@@ -323,7 +323,7 @@ scoped_refptr VideoFrame::Wr +@@ -324,7 +324,7 @@ scoped_refptr VideoFrame::Wr return frame; } -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) // static scoped_refptr VideoFrame::WrapExternalDmabufs( VideoPixelFormat format, -@@ -435,7 +435,7 @@ scoped_refptr VideoFrame::Wr +@@ -436,7 +436,7 @@ scoped_refptr VideoFrame::Wr 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; -@@ -720,7 +720,7 @@ size_t VideoFrame::shared_memory_offset( +@@ -722,7 +722,7 @@ size_t VideoFrame::shared_memory_offset( return shared_memory_offset_; } -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) int VideoFrame::dmabuf_fd(size_t plane) const { DCHECK_EQ(storage_type_, STORAGE_DMABUFS); DCHECK(IsValidPlane(plane, format_)); Index: head/www/chromium/files/patch-media_capture_BUILD.gn =================================================================== --- head/www/chromium/files/patch-media_capture_BUILD.gn (revision 436364) +++ head/www/chromium/files/patch-media_capture_BUILD.gn (revision 436365) @@ -1,19 +1,19 @@ ---- media/capture/BUILD.gn.orig 2017-01-26 00:49:15 UTC +--- media/capture/BUILD.gn.orig 2017-03-09 20:04:34 UTC +++ media/capture/BUILD.gn -@@ -127,6 +127,16 @@ component("capture") { +@@ -135,6 +135,16 @@ component("capture") { ] } + if (is_bsd) { + sources -= [ + "video/linux/video_capture_device_linux.cc", + "video/linux/video_capture_device_linux.h", + "video/linux/video_capture_device_factory_linux.cc", + "video/linux/video_capture_device_factory_linux.h", + "video/linux/v4l2_capture_delegate.cc", + ] + } + if (is_win) { deps += [ "//media/base", # For media_switches. Index: head/www/chromium/files/patch-media_capture_video_linux_v4l2__capture__delegate.cc =================================================================== --- head/www/chromium/files/patch-media_capture_video_linux_v4l2__capture__delegate.cc (revision 436364) +++ head/www/chromium/files/patch-media_capture_video_linux_v4l2__capture__delegate.cc (revision 436365) @@ -1,25 +1,26 @@ ---- media/capture/video/linux/v4l2_capture_delegate.cc.orig 2017-01-26 00:49:15 UTC +--- media/capture/video/linux/v4l2_capture_delegate.cc.orig 2017-03-09 20:04:34 UTC +++ media/capture/video/linux/v4l2_capture_delegate.cc -@@ -4,7 +4,9 @@ +@@ -4,8 +4,10 @@ #include "media/capture/video/linux/v4l2_capture_delegate.h" +#if !defined(OS_BSD) #include + #include +#endif #include #include #include -@@ -20,10 +22,10 @@ +@@ -21,10 +23,10 @@ #include "media/capture/video/blob_utils.h" #include "media/capture/video/linux/video_capture_device_linux.h" -#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 6, 0) +// #if LINUX_VERSION_CODE < KERNEL_VERSION(4, 6, 0) // 16 bit depth, Realsense F200. #define V4L2_PIX_FMT_Z16 v4l2_fourcc('Z', '1', '6', ' ') -#endif +// #endif // TODO(aleksandar.stojiljkovic): Wrap this with kernel version check once the // format is introduced to kernel. Index: 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 436364) +++ head/www/chromium/files/patch-media_capture_video_linux_video__capture__device__linux.cc (revision 436365) @@ -1,62 +1,62 @@ ---- media/capture/video/linux/video_capture_device_linux.cc.orig 2017-01-26 00:49:15 UTC +--- media/capture/video/linux/video_capture_device_linux.cc.orig 2017-03-09 20:04:34 UTC +++ media/capture/video/linux/video_capture_device_linux.cc @@ -21,6 +21,7 @@ namespace media { +#if !defined(OS_FREEBSD) // Translates Video4Linux pixel formats to Chromium pixel formats. // static VideoPixelFormat VideoCaptureDeviceLinux::V4l2FourCcToChromiumPixelFormat( @@ -34,6 +35,7 @@ std::list VideoCaptureDeviceLi bool favour_mjpeg) { return V4L2CaptureDelegate::GetListOfUsableFourCcs(favour_mjpeg); } +#endif // !defined(OS_FREEBSD) VideoCaptureDeviceLinux::VideoCaptureDeviceLinux( const VideoCaptureDeviceDescriptor& device_descriptor) @@ -47,6 +49,7 @@ VideoCaptureDeviceLinux::~VideoCaptureDe v4l2_thread_.Stop(); } +#if !defined(OS_FREEBSD) void VideoCaptureDeviceLinux::AllocateAndStart( const VideoCaptureParams& params, std::unique_ptr client) { -@@ -70,7 +73,13 @@ void VideoCaptureDeviceLinux::AllocateAn - params.requested_format.frame_size.height(), - params.requested_format.frame_rate, base::Passed(&client))); +@@ -74,7 +77,13 @@ void VideoCaptureDeviceLinux::AllocateAn + v4l2_thread_.task_runner()->PostTask(FROM_HERE, 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 (!v4l2_thread_.IsRunning()) return; // Wrong state. -@@ -110,7 +119,11 @@ void VideoCaptureDeviceLinux::SetPhotoOp - base::Bind(&V4L2CaptureDelegate::SetPhotoOptions, capture_impl_, - base::Passed(&settings), base::Passed(&callback))); +@@ -123,7 +132,11 @@ void VideoCaptureDeviceLinux::SetPhotoOp + } + v4l2_thread_.task_runner()->PostTask(FROM_HERE, std::move(functor)); } +#else // !defined(OS_FREEBSD) +void VideoCaptureDeviceLinux::StopAndDeAllocate() {} +#endif // !defined(OS_FREEBSD) +#if !defined(OS_FREEBSD) void VideoCaptureDeviceLinux::SetRotation(int rotation) { if (v4l2_thread_.IsRunning()) { v4l2_thread_.task_runner()->PostTask( -@@ -118,6 +131,9 @@ void VideoCaptureDeviceLinux::SetRotatio +@@ -131,6 +144,9 @@ void VideoCaptureDeviceLinux::SetRotatio base::Bind(&V4L2CaptureDelegate::SetRotation, capture_impl_, rotation)); } } +#else // !defined(OS_FREEBSD) +void VideoCaptureDeviceLinux::SetRotation(int rotation) {} +#endif // !defined(OS_FREEBSD) // static int VideoCaptureDeviceLinux::TranslatePowerLineFrequencyToV4L2( Index: head/www/chromium/files/patch-media_capture_video_video__capture__device__client.cc =================================================================== --- head/www/chromium/files/patch-media_capture_video_video__capture__device__client.cc (revision 436364) +++ head/www/chromium/files/patch-media_capture_video_video__capture__device__client.cc (revision 436365) @@ -1,11 +1,11 @@ ---- media/capture/video/video_capture_device_client.cc.orig 2017-01-26 00:49:15 UTC +--- media/capture/video/video_capture_device_client.cc.orig 2017-03-09 20:04:34 UTC +++ media/capture/video/video_capture_device_client.cc -@@ -193,7 +193,7 @@ void VideoCaptureDeviceClient::OnIncomin +@@ -220,7 +220,7 @@ void VideoCaptureDeviceClient::OnIncomin // see http://linuxtv.org/downloads/v4l-dvb-apis/packed-rgb.html. // Windows RGB24 defines blue at lowest byte, // see https://msdn.microsoft.com/en-us/library/windows/desktop/dd407253 -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) origin_colorspace = libyuv::FOURCC_RAW; #elif defined(OS_WIN) origin_colorspace = libyuv::FOURCC_24BG; Index: head/www/chromium/files/patch-media_cast_BUILD.gn =================================================================== --- head/www/chromium/files/patch-media_cast_BUILD.gn (revision 436364) +++ head/www/chromium/files/patch-media_cast_BUILD.gn (revision 436365) @@ -1,29 +1,29 @@ ---- media/cast/BUILD.gn.orig 2017-01-26 00:49:15 UTC +--- media/cast/BUILD.gn.orig 2017-03-09 20:04:34 UTC +++ media/cast/BUILD.gn -@@ -356,7 +356,7 @@ test("cast_unittests") { +@@ -358,7 +358,7 @@ test("cast_unittests") { } } -if (is_win || is_mac || (is_linux && !is_chromeos)) { +if (is_win || is_mac || (is_linux && !is_chromeos) || is_bsd) { # This is a target for the collection of cast development tools. They are # not built/linked into the Chromium browser. group("testing_tools") { -@@ -410,7 +410,7 @@ if (is_win || is_mac || (is_linux && !is +@@ -412,7 +412,7 @@ if (is_win || is_mac || (is_linux && !is "//ui/gfx/geometry", ] - if (is_linux && !is_chromeos && use_x11) { + if ((is_linux || is_bsd) && !is_chromeos && use_x11) { sources += [ "test/linux_output_window.cc", "test/linux_output_window.h", -@@ -513,7 +513,7 @@ if (is_win || is_mac || (is_linux && !is +@@ -515,7 +515,7 @@ if (is_win || is_mac || (is_linux && !is } } -if (is_linux && !is_chromeos) { +if ((is_linux || is_bsd) && !is_chromeos) { test("tap_proxy") { sources = [ "test/utility/tap_proxy.cc", Index: head/www/chromium/files/patch-media_filters_ffmpeg__demuxer.cc =================================================================== --- head/www/chromium/files/patch-media_filters_ffmpeg__demuxer.cc (revision 436364) +++ head/www/chromium/files/patch-media_filters_ffmpeg__demuxer.cc (revision 436365) @@ -1,27 +1,27 @@ ---- media/filters/ffmpeg_demuxer.cc.orig 2017-01-26 00:49:15 UTC +--- media/filters/ffmpeg_demuxer.cc.orig 2017-03-09 20:04:34 UTC +++ media/filters/ffmpeg_demuxer.cc -@@ -1198,24 +1198,6 @@ void FFmpegDemuxer::OnFindStreamInfoDone +@@ -1195,24 +1195,6 @@ void FFmpegDemuxer::OnFindStreamInfoDone // If no estimate is found, the stream entry will be kInfiniteDuration. std::vector start_time_estimates(format_context->nb_streams, kInfiniteDuration); - const AVFormatInternal* internal = format_context->internal; - if (internal && internal->packet_buffer && - format_context->start_time != static_cast(AV_NOPTS_VALUE)) { - struct AVPacketList* packet_buffer = internal->packet_buffer; - while (packet_buffer != internal->packet_buffer_end) { - DCHECK_LT(static_cast(packet_buffer->pkt.stream_index), - start_time_estimates.size()); - const AVStream* stream = - format_context->streams[packet_buffer->pkt.stream_index]; - if (packet_buffer->pkt.pts != static_cast(AV_NOPTS_VALUE)) { - const base::TimeDelta packet_pts = - ConvertFromTimeBase(stream->time_base, packet_buffer->pkt.pts); - if (packet_pts < start_time_estimates[stream->index]) - start_time_estimates[stream->index] = packet_pts; - } - packet_buffer = packet_buffer->next; - } - } std::unique_ptr media_tracks(new MediaTracks()); Index: head/www/chromium/files/patch-media_formats_mp2t_es__parser__adts.cc =================================================================== --- head/www/chromium/files/patch-media_formats_mp2t_es__parser__adts.cc (revision 436364) +++ head/www/chromium/files/patch-media_formats_mp2t_es__parser__adts.cc (revision 436365) @@ -1,26 +1,26 @@ ---- media/formats/mp2t/es_parser_adts.cc.orig 2017-01-26 00:49:15 UTC +--- media/formats/mp2t/es_parser_adts.cc.orig 2017-03-09 20:04:34 UTC +++ media/formats/mp2t/es_parser_adts.cc -@@ -54,11 +54,11 @@ bool EsParserAdts::LookForAdtsFrame(Adts +@@ -60,11 +60,11 @@ bool EsParserAdts::LookForAdtsFrame(Adts const uint8_t* es; es_queue_->Peek(&es, &es_size); - int max_offset = es_size - kADTSHeaderMinSize; - if (max_offset <= 0) + int _max_offset = es_size - kADTSHeaderMinSize; + if (_max_offset <= 0) return false; - for (int offset = 0; offset < max_offset; offset++) { + for (int offset = 0; offset < _max_offset; offset++) { const uint8_t* cur_buf = &es[offset]; if (!isAdtsSyncWord(cur_buf)) continue; -@@ -96,7 +96,7 @@ bool EsParserAdts::LookForAdtsFrame(Adts +@@ -104,7 +104,7 @@ bool EsParserAdts::LookForAdtsFrame(Adts return true; } - es_queue_->Pop(max_offset); + es_queue_->Pop(_max_offset); return false; } Index: head/www/chromium/files/patch-mojo_edk_test_BUILD.gn =================================================================== --- head/www/chromium/files/patch-mojo_edk_test_BUILD.gn (revision 436364) +++ head/www/chromium/files/patch-mojo_edk_test_BUILD.gn (revision 436365) @@ -1,20 +1,20 @@ ---- mojo/edk/test/BUILD.gn.orig 2017-01-26 00:49:15 UTC +--- mojo/edk/test/BUILD.gn.orig 2017-03-09 20:04:34 UTC +++ mojo/edk/test/BUILD.gn -@@ -48,7 +48,7 @@ source_set("run_all_unittests") { +@@ -46,7 +46,7 @@ source_set("run_all_unittests") { "//testing/gtest", ] - if (is_linux && !is_component_build) { + if ((is_linux || is_bsd) && !is_component_build) { public_configs = [ "//build/config/gcc:rpath_for_built_shared_libraries" ] } } -@@ -68,7 +68,7 @@ source_set("run_all_perftests") { +@@ -66,7 +66,7 @@ source_set("run_all_perftests") { "run_all_perftests.cc", ] - if (is_linux && !is_component_build) { + if ((is_linux || is_bsd) && !is_component_build) { public_configs = [ "//build/config/gcc:rpath_for_built_shared_libraries" ] } } Index: head/www/chromium/files/patch-net_BUILD.gn =================================================================== --- head/www/chromium/files/patch-net_BUILD.gn (revision 436364) +++ head/www/chromium/files/patch-net_BUILD.gn (revision 436365) @@ -1,96 +1,86 @@ ---- net/BUILD.gn.orig 2017-02-02 02:02:56 UTC +--- net/BUILD.gn.orig 2017-03-09 20:04:35 UTC +++ net/BUILD.gn @@ -82,7 +82,7 @@ if (use_glib && use_gconf && !is_chromeo net_configs += [ "//build/config/linux/gconf" ] } -if (is_linux) { +if (is_linux && !is_bsd) { net_configs += [ "//build/config/linux:libresolv" ] } -@@ -153,6 +153,11 @@ component("net") { - ] - if (is_android) { - sources -= [ "base/openssl_private_key_store_android.cc" ] -+ } else if (is_bsd) { -+ sources -= [ -+ "base/address_tracker_linux.cc", -+ "base/address_tracker_linux.h", -+ ] - } - } else { - if (is_android) { -@@ -278,6 +283,14 @@ component("net") { +@@ -281,6 +281,16 @@ component("net") { sources -= [ "disk_cache/blockfile/file_posix.cc" ] } + if (is_bsd) { + sources -= [ ++ "base/address_tracker_linux.cc", ++ "base/address_tracker_linux.h", + "base/network_change_notifier_linux.cc", + "base/network_change_notifier_linux.h", + "base/network_interfaces_linux.cc", + ] + } + if (is_ios || is_mac) { sources += gypi_values.net_base_mac_ios_sources } -@@ -966,7 +979,7 @@ if (!is_ios && !is_android) { +@@ -962,7 +972,7 @@ if (!is_ios && !is_android) { } } -if (is_linux || is_mac) { +if (is_linux || is_bsd || is_mac) { executable("cachetool") { testonly = true sources = [ -@@ -995,7 +1008,7 @@ if (is_linux || is_mac) { +@@ -991,7 +1001,7 @@ if (is_linux || is_mac) { } } -if (is_linux) { +if (is_linux || is_bsd) { static_library("epoll_server") { sources = [ "tools/epoll_server/epoll_server.cc", -@@ -1098,7 +1111,7 @@ if (is_android) { +@@ -1095,7 +1105,7 @@ if (is_android) { } } -if (is_android || is_linux) { +if (is_android || is_linux || is_bsd) { executable("disk_cache_memory_test") { testonly = true sources = [ -@@ -1276,7 +1289,7 @@ test("net_unittests") { +@@ -1276,7 +1286,7 @@ test("net_unittests") { "third_party/nist-pkits/", ] - if (is_linux || is_mac || is_win) { + if (is_linux || is_bsd || is_mac || is_win) { deps += [ "//third_party/pyftpdlib/", "//third_party/pywebsocket/", -@@ -1299,7 +1312,7 @@ test("net_unittests") { +@@ -1299,7 +1309,7 @@ test("net_unittests") { if (is_desktop_linux) { deps += [ ":epoll_quic_tools" ] } - if (is_linux) { + if (is_linux || is_bsd) { sources += gypi_values.net_linux_test_sources deps += [ ":epoll_quic_tools", -@@ -1319,6 +1332,12 @@ test("net_unittests") { +@@ -1319,6 +1329,12 @@ test("net_unittests") { sources -= [ "proxy/proxy_config_service_linux_unittest.cc" ] } + if (is_bsd) { + sources -= [ + "base/address_tracker_linux_unittest.cc", + ] + } + if (v8_use_external_startup_data) { deps += [ "//gin" ] } Index: head/www/chromium/files/patch-net_http_http__auth__gssapi__posix.cc =================================================================== --- head/www/chromium/files/patch-net_http_http__auth__gssapi__posix.cc (revision 436364) +++ head/www/chromium/files/patch-net_http_http__auth__gssapi__posix.cc (revision 436365) @@ -1,13 +1,13 @@ ---- net/http/http_auth_gssapi_posix.cc.orig 2017-01-26 00:49:16 UTC +--- net/http/http_auth_gssapi_posix.cc.orig 2017-03-09 20:04:35 UTC +++ net/http/http_auth_gssapi_posix.cc @@ -431,8 +431,8 @@ base::NativeLibrary GSSAPISharedLibrary: static const char* const kDefaultLibraryNames[] = { #if defined(OS_MACOSX) - "/System/Library/Frameworks/Kerberos.framework/Kerberos" + "/System/Library/Frameworks/GSS.framework/GSS" -#elif defined(OS_OPENBSD) - "libgssapi.so" // Heimdal - OpenBSD +#elif defined(OS_BSD) -+ "libgssapi.so" // Heimdal - OpenBSD / FreeBSD ++ "libgssapi.so" // Heimdal - OpenBSD, FreeBSD #else "libgssapi_krb5.so.2", // MIT Kerberos - FC, Suse10, Debian "libgssapi.so.4", // Heimdal - Suse10, MDK Index: head/www/chromium/files/patch-net_http_http__network__session.cc =================================================================== --- head/www/chromium/files/patch-net_http_http__network__session.cc (revision 436364) +++ head/www/chromium/files/patch-net_http_http__network__session.cc (revision 436365) @@ -1,12 +1,12 @@ ---- net/http/http_network_session.cc.orig 2017-01-26 00:49:16 UTC +--- net/http/http_network_session.cc.orig 2017-03-09 20:04:35 UTC +++ net/http/http_network_session.cc -@@ -17,7 +17,9 @@ - #include "base/strings/string_util.h" +@@ -20,7 +20,9 @@ + #include "base/trace_event/process_memory_dump.h" #include "base/values.h" - #include "net/base/network_throttle_manager.h" + #include "net/base/network_throttle_manager_impl.h" +#if defined(USE_KERBEROS) #include "net/http/http_auth_handler_factory.h" +#endif #include "net/http/http_response_body_drainer.h" #include "net/http/http_stream_factory_impl.h" #include "net/http/url_security_manager.h" Index: head/www/chromium/files/patch-net_quic_platform_impl_quic__ip__address__impl.cc =================================================================== --- head/www/chromium/files/patch-net_quic_platform_impl_quic__ip__address__impl.cc (nonexistent) +++ head/www/chromium/files/patch-net_quic_platform_impl_quic__ip__address__impl.cc (revision 436365) @@ -0,0 +1,10 @@ +--- net/quic/platform/impl/quic_ip_address_impl.cc.orig 2017-03-09 20:04:35 UTC ++++ net/quic/platform/impl/quic_ip_address_impl.cc +@@ -12,6 +12,7 @@ + #include + #elif defined(OS_POSIX) + #include ++#include + #endif + + using std::string; Property changes on: head/www/chromium/files/patch-net_quic_platform_impl_quic__ip__address__impl.cc ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/chromium/files/patch-net_socket_udp__socket__posix.cc =================================================================== --- head/www/chromium/files/patch-net_socket_udp__socket__posix.cc (revision 436364) +++ head/www/chromium/files/patch-net_socket_udp__socket__posix.cc (revision 436365) @@ -1,29 +1,29 @@ ---- net/socket/udp_socket_posix.cc.orig 2017-01-26 00:49:16 UTC +--- net/socket/udp_socket_posix.cc.orig 2017-03-09 20:04:35 UTC +++ net/socket/udp_socket_posix.cc -@@ -58,7 +58,7 @@ const int kBindRetries = 10; +@@ -59,7 +59,7 @@ const int kBindRetries = 10; const int kPortStart = 1024; const int kPortEnd = 65535; -#if defined(OS_MACOSX) +#if defined(OS_MACOSX) || defined(OS_BSD) // Returns IPv4 address in network order. int GetIPv4AddressFromIndex(int socket, uint32_t index, uint32_t* address) { -@@ -762,7 +762,7 @@ int UDPSocketPosix::SetMulticastOptions( +@@ -763,7 +763,7 @@ int UDPSocketPosix::SetMulticastOptions( if (multicast_interface_ != 0) { switch (addr_family_) { case AF_INET: { -#if !defined(OS_MACOSX) +#if !defined(OS_MACOSX) && !defined(OS_BSD) ip_mreqn mreq; mreq.imr_ifindex = multicast_interface_; mreq.imr_address.s_addr = htonl(INADDR_ANY); -@@ -837,7 +837,7 @@ int UDPSocketPosix::JoinGroup(const IPAd +@@ -838,7 +838,7 @@ int UDPSocketPosix::JoinGroup(const IPAd if (addr_family_ != AF_INET) return ERR_ADDRESS_INVALID; -#if !defined(OS_MACOSX) +#if !defined(OS_MACOSX) && !defined(OS_BSD) ip_mreqn mreq; mreq.imr_ifindex = multicast_interface_; mreq.imr_address.s_addr = htonl(INADDR_ANY); Index: head/www/chromium/files/patch-net_tools_cert__verify__tool_verify__using__path__builder.cc =================================================================== --- head/www/chromium/files/patch-net_tools_cert__verify__tool_verify__using__path__builder.cc (revision 436364) +++ head/www/chromium/files/patch-net_tools_cert__verify__tool_verify__using__path__builder.cc (revision 436365) @@ -1,20 +1,20 @@ ---- net/tools/cert_verify_tool/verify_using_path_builder.cc.orig 2017-02-02 02:02:56 UTC +--- net/tools/cert_verify_tool/verify_using_path_builder.cc.orig 2017-03-09 20:04:35 UTC +++ net/tools/cert_verify_tool/verify_using_path_builder.cc -@@ -29,7 +29,7 @@ +@@ -33,7 +33,7 @@ #include "net/cert/internal/trust_store_nss.h" #endif -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) #include "net/proxy/proxy_config.h" #include "net/proxy/proxy_config_service_fixed.h" #endif -@@ -226,7 +226,7 @@ bool VerifyUsingPathBuilder( +@@ -179,7 +179,7 @@ void SetUpOnNetworkThread(std::unique_pt // (similar to VERIFY_CERT_IO_ENABLED flag for CertVerifyProc). net::URLRequestContextBuilder url_request_context_builder; url_request_context_builder.set_user_agent(GetUserAgent()); -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) // On Linux, use a fixed ProxyConfigService, since the default one // depends on glib. // Index: head/www/chromium/files/patch-pdf_pdfium_pdfium__engine.cc =================================================================== --- head/www/chromium/files/patch-pdf_pdfium_pdfium__engine.cc (revision 436364) +++ head/www/chromium/files/patch-pdf_pdfium_pdfium__engine.cc (revision 436365) @@ -1,65 +1,65 @@ ---- pdf/pdfium/pdfium_engine.cc.orig 2017-01-26 00:49:16 UTC +--- pdf/pdfium/pdfium_engine.cc.orig 2017-03-09 20:04:35 UTC +++ pdf/pdfium/pdfium_engine.cc -@@ -127,7 +127,7 @@ std::vector GetPageNumbersFrom +@@ -129,7 +129,7 @@ std::vector GetPageNumbersFrom return page_numbers; } -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) PP_Instance g_last_instance_id; -@@ -629,7 +629,7 @@ bool InitializeSDK() { +@@ -642,7 +642,7 @@ bool InitializeSDK() { config.m_v8EmbedderSlot = gin::kEmbedderPDFium; FPDF_InitLibraryWithConfig(&config); -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) // Font loading doesn't work in the renderer sandbox in Linux. FPDF_SetSystemFontInfo(&g_font_info); #else -@@ -654,7 +654,7 @@ bool InitializeSDK() { +@@ -667,7 +667,7 @@ bool InitializeSDK() { void ShutdownSDK() { FPDF_DestroyLibrary(); -#if !defined(OS_LINUX) +#if !defined(OS_LINUX) && !defined(OS_BSD) delete g_font_info; #endif TearDownV8(); -@@ -758,7 +758,7 @@ PDFiumEngine::PDFiumEngine(PDFEngine::Cl +@@ -772,7 +772,7 @@ PDFiumEngine::PDFiumEngine(PDFEngine::Cl IFSDK_PAUSE::user = nullptr; IFSDK_PAUSE::NeedToPauseNow = Pause_NeedToPauseNow; -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) // PreviewModeClient does not know its pp::Instance. pp::Instance* instance = client_->GetPluginInstance(); if (instance) -@@ -1510,7 +1510,7 @@ pp::Buffer_Dev PDFiumEngine::PrintPagesA +@@ -1513,7 +1513,7 @@ pp::Buffer_Dev PDFiumEngine::PrintPagesA FPDF_ClosePage(pdf_page); } -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) g_last_instance_id = client_->GetPluginInstance()->pp_instance(); #endif -@@ -2919,7 +2919,7 @@ bool PDFiumEngine::ContinuePaint(int pro +@@ -2936,7 +2936,7 @@ bool PDFiumEngine::ContinuePaint(int pro DCHECK_LT(static_cast(progressive_index), progressive_paints_.size()); DCHECK(image_data); -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) g_last_instance_id = client_->GetPluginInstance()->pp_instance(); #endif -@@ -3377,7 +3377,7 @@ void PDFiumEngine::SetCurrentPage(int in +@@ -3394,7 +3394,7 @@ void PDFiumEngine::SetCurrentPage(int in FORM_DoPageAAction(old_page, form_, FPDFPAGE_AACTION_CLOSE); } most_visible_page_ = index; -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) g_last_instance_id = client_->GetPluginInstance()->pp_instance(); #endif if (most_visible_page_ != -1 && called_do_document_action_) { Index: head/www/chromium/files/patch-printing_BUILD.gn =================================================================== --- head/www/chromium/files/patch-printing_BUILD.gn (revision 436364) +++ head/www/chromium/files/patch-printing_BUILD.gn (revision 436365) @@ -1,20 +1,20 @@ ---- printing/BUILD.gn.orig 2017-01-26 00:49:17 UTC +--- printing/BUILD.gn.orig 2017-03-09 20:04:35 UTC +++ printing/BUILD.gn -@@ -129,7 +129,7 @@ component("printing") { +@@ -137,7 +137,7 @@ component("printing") { if (use_cups) { configs += [ ":cups" ] - if (is_linux) { + if (is_linux || is_bsd) { # rebase_path does not accept an empty string if (use_sysroot) { cups_sysroot = rebase_path(sysroot) -@@ -206,7 +206,7 @@ component("printing") { +@@ -214,7 +214,7 @@ component("printing") { "printing_context_no_system_dialog.cc", "printing_context_no_system_dialog.h", ] - } else if (is_linux) { # Non-ChromeOS Linux. + } else if (is_linux || is_bsd) { # Non-ChromeOS Linux/BSD. sources += [ "printed_document_linux.cc", "printing_context_linux.cc", Index: head/www/chromium/files/patch-remoting_host_BUILD.gn =================================================================== --- head/www/chromium/files/patch-remoting_host_BUILD.gn (revision 436364) +++ head/www/chromium/files/patch-remoting_host_BUILD.gn (revision 436365) @@ -1,47 +1,47 @@ ---- remoting/host/BUILD.gn.orig 2017-01-26 00:49:17 UTC +--- remoting/host/BUILD.gn.orig 2017-03-09 20:04:35 UTC +++ remoting/host/BUILD.gn -@@ -326,7 +326,7 @@ static_library("host") { +@@ -329,7 +329,7 @@ static_library("host") { deps += [ "//components/policy:generated" ] } - if (is_linux && !is_chromeos) { + if ((is_linux || is_bsd) && !is_chromeos) { libs += [ "pam" ] } -@@ -349,7 +349,7 @@ static_library("host") { +@@ -348,7 +348,7 @@ static_library("host") { "input_injector_x11.cc", "local_input_monitor_x11.cc", ] - if (is_linux) { + if (is_linux || is_bsd) { # These will already be filtered out on non-Linux. sources -= [ "linux/unicode_to_keysym.cc", @@ -538,7 +538,7 @@ source_set("unit_tests") { "touch_injector_win_unittest.cc", ] - if (!use_x11 && is_linux) { + if (!use_x11 && (is_linux || is_bsd)) { sources -= [ "linux/unicode_to_keysym_unittest.cc" ] } if (use_ozone || is_chromeos) { -@@ -755,7 +755,7 @@ if (enable_me2me_host) { - deps += [ "//build/config/linux/gtk2" ] - } +@@ -750,7 +750,7 @@ if (enable_me2me_host) { + if (is_desktop_linux) { + deps += [ "//build/config/linux/gtk" ] } - if ((is_linux && !is_chromeos) || is_mac) { + if ((is_linux && !is_chromeos) || is_mac || is_bsd) { libs = [ "pam" ] } -@@ -825,7 +825,7 @@ if (enable_me2me_host) { +@@ -820,7 +820,7 @@ if (enable_me2me_host) { } } } - if (is_chrome_branded && enable_me2me_host && is_linux && !is_chromeos) { + if (is_chrome_branded && enable_me2me_host && is_linux && is_bsd && !is_chromeos) { group("remoting_me2me_host_archive") { deps = [ "//remoting/host/installer/linux:remoting_me2me_host_archive", Index: head/www/chromium/files/patch-sandbox_features.gni =================================================================== --- head/www/chromium/files/patch-sandbox_features.gni (nonexistent) +++ head/www/chromium/files/patch-sandbox_features.gni (revision 436365) @@ -0,0 +1,10 @@ +--- sandbox/features.gni.orig 2017-03-09 20:04:36 UTC ++++ sandbox/features.gni +@@ -11,6 +11,6 @@ import("//build/config/nacl/config.gni") + use_seccomp_bpf = + (is_linux || is_android) && + (current_cpu == "x86" || current_cpu == "x64" || current_cpu == "arm" || +- current_cpu == "arm64" || current_cpu == "mipsel") ++ current_cpu == "arm64" || current_cpu == "mipsel") && !is_bsd + + use_seccomp_bpf = use_seccomp_bpf || is_nacl_nonsfi Property changes on: head/www/chromium/files/patch-sandbox_features.gni ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: 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 (nonexistent) +++ head/www/chromium/files/patch-services_service__manager_public_cpp_standalone__service_BUILD.gn (revision 436365) @@ -0,0 +1,11 @@ +--- services/service_manager/public/cpp/standalone_service/BUILD.gn.orig 2017-03-09 20:04:36 UTC ++++ services/service_manager/public/cpp/standalone_service/BUILD.gn +@@ -23,7 +23,7 @@ source_set("standalone_service") { + "//services/service_manager/public/interfaces", + ] + +- if (is_linux && !is_android) { ++ if (is_linux && !is_android && !is_bsd) { + sources += [ + "linux_sandbox.cc", + "linux_sandbox.h", Property changes on: head/www/chromium/files/patch-services_service__manager_public_cpp_standalone__service_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_service__manager_public_cpp_standalone__service_standalone__service.cc =================================================================== --- head/www/chromium/files/patch-services_service__manager_public_cpp_standalone__service_standalone__service.cc (nonexistent) +++ head/www/chromium/files/patch-services_service__manager_public_cpp_standalone__service_standalone__service.cc (revision 436365) @@ -0,0 +1,11 @@ +--- services/service_manager/public/cpp/standalone_service/standalone_service.cc.orig 2017-03-09 20:04:36 UTC ++++ services/service_manager/public/cpp/standalone_service/standalone_service.cc +@@ -70,6 +70,8 @@ void RunStandaloneService(const Standalo + *base::CommandLine::ForCurrentProcess(); + if (command_line.HasSwitch(switches::kEnableSandbox)) + sandbox = InitializeSandbox(); ++#elif defined(OS_BSD) ++ NOTIMPLEMENTED(); + #endif + + mojo::edk::Init(); Property changes on: head/www/chromium/files/patch-services_service__manager_public_cpp_standalone__service_standalone__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_service__manager_runner_host_BUILD.gn =================================================================== --- head/www/chromium/files/patch-services_service__manager_runner_host_BUILD.gn (revision 436364) +++ head/www/chromium/files/patch-services_service__manager_runner_host_BUILD.gn (revision 436365) @@ -1,11 +1,11 @@ ---- services/service_manager/runner/host/BUILD.gn.orig 2017-01-26 00:49:17 UTC +--- services/service_manager/runner/host/BUILD.gn.orig 2017-03-09 20:04:36 UTC +++ services/service_manager/runner/host/BUILD.gn -@@ -51,7 +51,7 @@ source_set("child_process_base") { - "//services/service_manager/runner/common", +@@ -28,7 +28,7 @@ source_set("lib") { + "//mojo/public/cpp/system", ] - if (is_linux && !is_android) { + if (is_linux && !is_android && !is_bsd) { - sources += [ - "linux_sandbox.cc", - "linux_sandbox.h", + deps += [ "//sandbox/linux:sandbox_services" ] + } + } Index: head/www/chromium/files/patch-services_service__manager_standalone_context.cc =================================================================== --- head/www/chromium/files/patch-services_service__manager_standalone_context.cc (revision 436364) +++ head/www/chromium/files/patch-services_service__manager_standalone_context.cc (revision 436365) @@ -1,11 +1,11 @@ ---- services/service_manager/standalone/context.cc.orig 2017-01-26 00:49:17 UTC +--- services/service_manager/standalone/context.cc.orig 2017-03-09 20:04:36 UTC +++ services/service_manager/standalone/context.cc -@@ -208,7 +208,7 @@ void Context::Init(std::unique_ptrSetServiceManagerProcessCreationTime( Index: head/www/chromium/files/patch-services_ui_BUILD.gn =================================================================== --- head/www/chromium/files/patch-services_ui_BUILD.gn (revision 436364) +++ head/www/chromium/files/patch-services_ui_BUILD.gn (revision 436365) @@ -1,18 +1,27 @@ ---- services/ui/BUILD.gn.orig 2017-01-26 00:49:17 UTC +--- services/ui/BUILD.gn.orig 2017-03-09 20:04:36 UTC +++ services/ui/BUILD.gn @@ -13,7 +13,6 @@ group("all") { testonly = true deps = [ ":ui", - "//services/ui/ime/test_ime_driver", "//services/ui/test_wm", ] } -@@ -38,7 +37,6 @@ service("ui") { - +@@ -36,7 +35,6 @@ service("ui") { data_deps = [ + ":copy_gl_libraries", ":manifest", - "//services/ui/ime/test_ime_driver", ] resources = [ +@@ -67,7 +65,7 @@ copy("copy_gl_libraries") { + "$root_shlib_dir/libGLESv2.dll", + "$root_shlib_dir/osmesa.dll", + ] +- } else if (is_android || is_linux) { ++ } else if (is_android || is_linux || is_bsd) { + sources = [ + "$root_shlib_dir/libosmesa.so", + ] Index: head/www/chromium/files/patch-services_ui_gpu_gpu__main.cc =================================================================== --- head/www/chromium/files/patch-services_ui_gpu_gpu__main.cc (revision 436364) +++ head/www/chromium/files/patch-services_ui_gpu_gpu__main.cc (revision 436365) @@ -1,11 +1,11 @@ ---- services/ui/gpu/gpu_main.cc.orig 2017-02-02 02:02:57 UTC +--- services/ui/gpu/gpu_main.cc.orig 2017-03-09 20:04:36 UTC +++ services/ui/gpu/gpu_main.cc -@@ -50,7 +50,7 @@ GpuMain::GpuMain() +@@ -52,7 +52,7 @@ GpuMain::GpuMain(mojom::GpuMainRequest r thread_options.message_pump_factory = base::Bind(&CreateMessagePumpX11); #elif defined(USE_OZONE) thread_options.message_loop_type = base::MessageLoop::TYPE_UI; -#elif defined(OS_LINUX) +#elif defined(OS_LINUX) || defined(OS_BSD) thread_options.message_loop_type = base::MessageLoop::TYPE_DEFAULT; #elif defined(OS_MACOSX) thread_options.message_pump_factory = base::Bind(&CreateMessagePumpMac); Index: head/www/chromium/files/patch-skia_BUILD.gn =================================================================== --- head/www/chromium/files/patch-skia_BUILD.gn (revision 436364) +++ head/www/chromium/files/patch-skia_BUILD.gn (revision 436365) @@ -1,46 +1,38 @@ ---- skia/BUILD.gn.orig 2017-01-26 00:49:17 UTC +--- skia/BUILD.gn.orig 2017-03-09 20:04:36 UTC +++ skia/BUILD.gn -@@ -135,7 +135,7 @@ config("skia_library_config") { +@@ -124,7 +124,7 @@ config("skia_library_config") { } # Settings for text blitting, chosen to approximate the system browser. - if (is_linux) { + if (is_linux || is_bsd) { defines += [ "SK_GAMMA_EXPONENT=1.2", "SK_GAMMA_CONTRAST=0.2", -@@ -363,7 +363,7 @@ component("skia") { +@@ -340,7 +340,7 @@ component("skia") { sources -= [ "//third_party/skia/src/ports/SkFontHost_mac.cpp" ] } - if (!is_linux) { + if (!is_linux && !is_bsd) { sources -= [ "//third_party/skia/src/ports/SkFontConfigInterface.cpp", "//third_party/skia/src/ports/SkFontConfigInterface_direct.cpp", -@@ -375,14 +375,14 @@ component("skia") { - - # Add the files for the SkFontMgr_Android. This is used to emulate android - # fonts on linux. See content/zygote/zygote_main_linux.cc -- if (is_linux) { -+ if (is_linux || is_bsd) { - sources += [ - "//third_party/skia/src/ports/SkFontMgr_android.cpp", - "//third_party/skia/src/ports/SkFontMgr_android_parser.cpp", +@@ -349,7 +349,7 @@ component("skia") { ] } - if (!is_linux && !is_android) { + if (!is_linux && !is_bsd && !is_android) { sources -= [ "//third_party/skia/src/ports/SkFontHost_FreeType.cpp", "//third_party/skia/src/ports/SkFontHost_FreeType_common.cpp", -@@ -421,7 +421,7 @@ component("skia") { +@@ -387,7 +387,7 @@ component("skia") { "//base/third_party/dynamic_annotations", ] - if (is_linux) { + if (is_linux || is_bsd) { if (use_pango) { configs += [ "//build/config/linux/pangocairo" ] } Index: head/www/chromium/files/patch-third__party_WebKit_Source_core_layout_BUILD.gn =================================================================== --- head/www/chromium/files/patch-third__party_WebKit_Source_core_layout_BUILD.gn (revision 436364) +++ head/www/chromium/files/patch-third__party_WebKit_Source_core_layout_BUILD.gn (revision 436365) @@ -1,11 +1,11 @@ ---- third_party/WebKit/Source/core/layout/BUILD.gn.orig 2017-01-26 00:49:28 UTC +--- third_party/WebKit/Source/core/layout/BUILD.gn.orig 2017-03-09 20:04:45 UTC +++ third_party/WebKit/Source/core/layout/BUILD.gn -@@ -361,7 +361,7 @@ blink_core_sources("layout") { +@@ -368,7 +368,7 @@ blink_core_sources("layout") { sources += [ "LayoutThemeFontProviderDefault.cpp" ] } - if (is_linux) { + if (is_linux || is_bsd) { sources += [ "LayoutThemeLinux.cpp", "LayoutThemeLinux.h", Index: head/www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_FontPlatformData.cpp =================================================================== --- head/www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_FontPlatformData.cpp (revision 436364) +++ head/www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_FontPlatformData.cpp (revision 436365) @@ -1,47 +1,47 @@ ---- third_party/WebKit/Source/platform/fonts/FontPlatformData.cpp.orig 2017-01-26 00:49:28 UTC +--- third_party/WebKit/Source/platform/fonts/FontPlatformData.cpp.orig 2017-03-09 20:04:45 UTC +++ third_party/WebKit/Source/platform/fonts/FontPlatformData.cpp @@ -99,7 +99,7 @@ FontPlatformData::FontPlatformData(const m_syntheticBold(source.m_syntheticBold), m_syntheticItalic(source.m_syntheticItalic), m_orientation(source.m_orientation), -#if OS(LINUX) || OS(ANDROID) +#if OS(LINUX) || OS(ANDROID) || OS(BSD) m_style(source.m_style), #endif m_harfBuzzFace(nullptr), @@ -122,7 +122,7 @@ FontPlatformData::FontPlatformData(const m_syntheticBold(src.m_syntheticBold), m_syntheticItalic(src.m_syntheticItalic), m_orientation(src.m_orientation), -#if OS(LINUX) || OS(ANDROID) +#if OS(LINUX) || OS(ANDROID) || OS(BSD) m_style(FontRenderStyle::querySystem(m_family, m_textSize, - m_typeface->style())), + m_typeface->fontStyle())), @@ -155,7 +155,7 @@ FontPlatformData::FontPlatformData(sk_sp m_syntheticBold(syntheticBold), m_syntheticItalic(syntheticItalic), m_orientation(orientation), -#if OS(LINUX) || OS(ANDROID) +#if OS(LINUX) || OS(ANDROID) | OS(BSD) m_style(FontRenderStyle::querySystem(m_family, m_textSize, - m_typeface->style())), + m_typeface->fontStyle())), @@ -200,7 +200,7 @@ const FontPlatformData& FontPlatformData m_syntheticItalic = other.m_syntheticItalic; m_harfBuzzFace = nullptr; m_orientation = other.m_orientation; -#if OS(LINUX) || OS(ANDROID) +#if OS(LINUX) || OS(ANDROID) | OS(BSD) m_style = other.m_style; #endif @@ -226,7 +226,7 @@ bool FontPlatformData::operator==(const m_isHashTableDeletedValue == a.m_isHashTableDeletedValue && m_syntheticBold == a.m_syntheticBold && m_syntheticItalic == a.m_syntheticItalic -#if OS(LINUX) || OS(ANDROID) +#if OS(LINUX) || OS(ANDROID) || OS(BSD) && m_style == a.m_style #endif && m_orientation == a.m_orientation; Index: head/www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_FontPlatformData.h =================================================================== --- head/www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_FontPlatformData.h (revision 436364) +++ head/www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_FontPlatformData.h (revision 436365) @@ -1,32 +1,32 @@ ---- third_party/WebKit/Source/platform/fonts/FontPlatformData.h.orig 2017-01-26 00:49:28 UTC +--- third_party/WebKit/Source/platform/fonts/FontPlatformData.h.orig 2017-03-09 20:04:45 UTC +++ third_party/WebKit/Source/platform/fonts/FontPlatformData.h @@ -47,9 +47,9 @@ #include "wtf/text/CString.h" #include "wtf/text/StringImpl.h" -#if OS(LINUX) || OS(ANDROID) +#if OS(LINUX) || OS(ANDROID) || OS(BSD) #include "platform/fonts/linux/FontRenderStyle.h" -#endif // OS(LINUX) || OS(ANDROID) +#endif // OS(LINUX) || OS(ANDROID) || OS(BSD) #if OS(MACOSX) OBJC_CLASS NSFont; -@@ -149,7 +149,7 @@ class PLATFORM_EXPORT FontPlatformData { +@@ -151,7 +151,7 @@ class PLATFORM_EXPORT FontPlatformData { PassRefPtr verticalData() const; PassRefPtr openTypeTable(SkFontTableTag) const; -#if OS(LINUX) || OS(ANDROID) +#if OS(LINUX) || OS(ANDROID) || OS(BSD) // The returned styles are all actual styles without // FontRenderStyle::NoPreference. const FontRenderStyle& getFontRenderStyle() const { return m_style; } -@@ -177,7 +177,7 @@ class PLATFORM_EXPORT FontPlatformData { +@@ -179,7 +179,7 @@ class PLATFORM_EXPORT FontPlatformData { FontOrientation m_orientation; private: -#if OS(LINUX) || OS(ANDROID) +#if OS(LINUX) || OS(ANDROID) || OS(BSD) FontRenderStyle m_style; #endif Index: head/www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_skia_FontCacheSkia.cpp =================================================================== --- head/www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_skia_FontCacheSkia.cpp (revision 436364) +++ head/www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_skia_FontCacheSkia.cpp (revision 436365) @@ -1,20 +1,20 @@ ---- third_party/WebKit/Source/platform/fonts/skia/FontCacheSkia.cpp.orig 2017-02-02 02:03:10 UTC +--- third_party/WebKit/Source/platform/fonts/skia/FontCacheSkia.cpp.orig 2017-03-09 20:04:45 UTC +++ third_party/WebKit/Source/platform/fonts/skia/FontCacheSkia.cpp -@@ -67,7 +67,7 @@ AtomicString toAtomicString(const SkStri +@@ -68,7 +68,7 @@ AtomicString toAtomicString(const SkStri return AtomicString::fromUTF8(str.c_str(), str.size()); } -#if OS(ANDROID) || OS(LINUX) +#if OS(ANDROID) || OS(LINUX) || OS(BSD) // Android special locale for retrieving the color emoji font // based on the proposed changes in UTR #51 for introducing // an Emoji script code: -@@ -234,7 +234,7 @@ sk_sp FontCache::createTypef +@@ -235,7 +235,7 @@ sk_sp FontCache::createTypef } #endif -#if OS(LINUX) || OS(WIN) +#if OS(LINUX) || OS(WIN) || OS(BSD) // On linux if the fontManager has been overridden then we should be calling // the embedder provided font Manager rather than calling // SkTypeface::CreateFromName which may redirect the call to the default font Index: head/www/chromium/files/patch-third__party_WebKit_Source_platform_heap_StackFrameDepth.cpp =================================================================== --- head/www/chromium/files/patch-third__party_WebKit_Source_platform_heap_StackFrameDepth.cpp (revision 436364) +++ head/www/chromium/files/patch-third__party_WebKit_Source_platform_heap_StackFrameDepth.cpp (revision 436365) @@ -1,11 +1,11 @@ ---- third_party/WebKit/Source/platform/heap/StackFrameDepth.cpp.orig 2017-01-26 00:49:28 UTC +--- third_party/WebKit/Source/platform/heap/StackFrameDepth.cpp.orig 2017-03-09 20:04:45 UTC +++ third_party/WebKit/Source/platform/heap/StackFrameDepth.cpp -@@ -6,6 +6,8 @@ - +@@ -7,6 +7,8 @@ #include "public/platform/Platform.h" + #include "wtf/StackUtil.h" +#include + #if OS(WIN) #include #include Index: head/www/chromium/files/patch-third__party_WebKit_Source_web_PopupMenuImpl.cpp =================================================================== --- head/www/chromium/files/patch-third__party_WebKit_Source_web_PopupMenuImpl.cpp (revision 436364) +++ head/www/chromium/files/patch-third__party_WebKit_Source_web_PopupMenuImpl.cpp (revision 436365) @@ -1,11 +1,11 @@ ---- third_party/WebKit/Source/web/PopupMenuImpl.cpp.orig 2017-01-26 00:49:28 UTC +--- third_party/WebKit/Source/web/PopupMenuImpl.cpp.orig 2017-03-09 20:04:46 UTC +++ third_party/WebKit/Source/web/PopupMenuImpl.cpp -@@ -154,7 +154,7 @@ class PopupMenuImpl::ItemIterationContex +@@ -155,7 +155,7 @@ class PopupMenuImpl::ItemIterationContex m_isInGroup(false), m_buffer(buffer) { DCHECK(m_buffer); -#if OS(LINUX) +#if OS(LINUX) || OS(BSD) // On other platforms, the