Index: branches/2014Q4/www/chromium/Makefile =================================================================== --- branches/2014Q4/www/chromium/Makefile (revision 370436) +++ branches/2014Q4/www/chromium/Makefile (revision 370437) @@ -1,364 +1,362 @@ # Created by: Florent Thoumie # $FreeBSD$ PORTNAME= chromium -PORTVERSION= 37.0.2062.124 +PORTVERSION= 38.0.2125.101 CATEGORIES= www MASTER_SITES= http://commondatastorage.googleapis.com/chromium-browser-official/ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= chromium@FreeBSD.org -COMMENT= Mostly BSD-licensed web browser based on WebKit and Gtk+ +COMMENT= Google web browser based on WebKit LICENSE= BSD3CLAUSE LGPL21 MPL LICENSE_COMB= multi CFLAGS+= -fno-stack-protector -isystem${LOCALBASE}/include BUILD_DEPENDS= ${LOCALBASE}/bin/gperf:${PORTSDIR}/devel/gperf \ bash:${PORTSDIR}/shells/bash \ yasm:${PORTSDIR}/devel/yasm \ flock:${PORTSDIR}/sysutils/flock \ ${LOCALBASE}/include/linux/videodev2.h:${PORTSDIR}/multimedia/v4l_compat \ ${LOCALBASE}/share/usbids/usb.ids:${PORTSDIR}/misc/usbids LIB_DEPENDS= libcairo.so:${PORTSDIR}/graphics/cairo \ libdbus-1.so:${PORTSDIR}/devel/dbus \ libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \ libasound.so:${PORTSDIR}/audio/alsa-lib \ libfreetype.so:${PORTSDIR}/print/freetype2 \ libnss3.so:${PORTSDIR}/security/nss \ libFLAC.so:${PORTSDIR}/audio/flac \ libgnome-keyring.so:${PORTSDIR}/security/libgnome-keyring \ libharfbuzz.so:${PORTSDIR}/print/harfbuzz \ libcups.so:${PORTSDIR}/print/cups-client \ libevent.so:${PORTSDIR}/devel/libevent2 \ libexif.so:${PORTSDIR}/graphics/libexif \ libgcrypt.so:${PORTSDIR}/security/libgcrypt \ libpci.so:${PORTSDIR}/devel/libpci \ libdrm.so:${PORTSDIR}/graphics/libdrm \ libicuuc.so:${PORTSDIR}/devel/icu \ libjpeg.so:${PORTSDIR}/graphics/jpeg \ libjsoncpp.so:${PORTSDIR}/devel/jsoncpp \ - libminizip.so:${PORTSDIR}/archivers/minizip \ libnspr4.so:${PORTSDIR}/devel/nspr \ libprotobuf.so:${PORTSDIR}/devel/protobuf \ libpng.so:${PORTSDIR}/graphics/png \ libre2.so:${PORTSDIR}/devel/re2 \ libsnappy.so:${PORTSDIR}/archivers/snappy \ libspeechd.so:${PORTSDIR}/accessibility/speech-dispatcher \ libspeex.so:${PORTSDIR}/audio/speex \ libxml2.so:${PORTSDIR}/textproc/libxml2 \ libwebp.so:${PORTSDIR}/graphics/webp RUN_DEPENDS= ${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:${PORTSDIR}/audio/alsa-plugins \ ${LOCALBASE}/lib/X11/fonts/Droid/fonts.dir:${PORTSDIR}/x11-fonts/droid-fonts-ttf \ xdg-open:${PORTSDIR}/devel/xdg-utils ONLY_FOR_ARCHS= i386 amd64 USES= bison compiler:c++11-lib cpe desktop-file-utils pkgconfig \ perl5 shebangfix ninja tar:xz python:2,build execinfo CPE_VENDOR= google CPE_PRODUCT= chrome USE_PERL5= build USE_XORG= scrnsaverproto x11 xproto xscrnsaver xtst USE_GNOME= glib20 gtk20 dconf libxslt -USE_OPENSSL= yes # must be from base to prevent a link failure against cups SHEBANG_FILES= chrome/tools/build/linux/chrome-wrapper ALL_TARGET= chrome INSTALLS_ICONS= yes # See build/common.gypi for all the available variables. GYP_DEFINES+= \ clang_use_chrome_plugins=0 \ linux_breakpad=0 \ linux_use_heapchecker=0 \ linux_strip_binary=1 \ test_isolation_mode=noop \ disable_nacl=1 \ + enable_extensions=1 \ enable_one_click_signin=1 \ enable_openmax=1 \ enable_webrtc=1 \ werror= \ no_gc_sections=1 \ os_ver=${OSVERSION} \ prefix_dir=${LOCALBASE} \ python_ver=${PYTHON_VER} \ use_allocator=none \ use_cups=1 \ linux_link_gsettings=1 \ linux_link_libpci=1 \ linux_link_libspeechd=1 \ libspeechd_h_prefix=speech-dispatcher/ \ usb_ids_path=${LOCALBASE}/share/usbids/usb.ids \ want_separate_host_toolset=0 \ use_system_bzip2=1 \ use_system_flac=1 \ use_system_harfbuzz=1 \ use_system_icu=1 \ use_system_jsoncpp=1 \ use_system_libevent=1 \ use_system_libexif=1 \ use_system_libjpeg=1 \ use_system_libpng=1 \ use_system_libusb=1 \ use_system_libwebp=1 \ use_system_libxml=1 \ use_system_libxslt=1 \ - use_system_minizip=1 \ use_system_nspr=1 \ - use_system_openssl=1 \ use_system_protobuf=1 \ use_system_re2=1 \ use_system_snappy=1 \ use_system_speex=1 \ use_system_xdg_utils=1 \ - use_system_yasm=1 \ - use_system_zlib=1 + use_system_yasm=1 # allow removal of third_party/adobe GYP_DEFINES+= flapper_version_h_file='${WRKSRC}/flapper_version.h' # 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. GYP_DEFINES+= 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 PULSEAUDIO TEST DEBUG CODECS_DESC= Compile and enable patented codecs like H.264 OPTIONS_DEFAULT= CODECS GCONF GCONF_USE= GNOME=gconf2 PULSEAUDIO_LIB_DEPENDS= libpulse.so:${PORTSDIR}/audio/pulseaudio TEST_DISTFILES= ${PORTNAME}-${DISTVERSION}-testdata${EXTRACT_SUFX} .include .if ${PORT_OPTIONS:MCODECS} GYP_DEFINES+= ffmpeg_branding=Chrome GYP_DEFINES+= proprietary_codecs=1 .else GYP_DEFINES+= ffmpeg_branding=Chromium GYP_DEFINES+= proprietary_codecs=0 .endif .if ${PORT_OPTIONS:MGCONF} GYP_DEFINES+= use_gconf=1 .else GYP_DEFINES+= use_gconf=0 .endif .if ${PORT_OPTIONS:MPULSEAUDIO} GYP_DEFINES+= use_pulseaudio=1 .else GYP_DEFINES+= use_pulseaudio=0 .endif .if ! ${MACHINE_CPU:Msse2} GYP_DEFINES+= disable_sse2=1 .endif .if !exists(/usr/libdata/pkgconfig/libusb-1.0.pc) EXTRA_PATCHES+= ${FILESDIR}/extra-patch-libusb-pc .endif -.if ${OSVERSION} >= 1000052 && !exists(${LOCALBASE}/include/execinfo.h) -EXTRA_PATCHES+= ${FILESDIR}/extra-patch-fixup-execinfo -.endif .if ${PORT_OPTIONS:MTEST} .include "Makefile.tests" ALL_TARGET+= ${TEST_TARGETS} .endif DEBUG_MAKE_ENV= V=1 .if ${PORT_OPTIONS:MDEBUG} BUILDTYPE= Debug .else BUILDTYPE= Release .endif CONFIGURE_ENV+= CC="${CC}" \ CXX="${CXX}" \ GYP_GENERATORS=ninja \ GYP_DEFINES="${GYP_DEFINES}" MAKE_ENV+= BUILDTYPE=${BUILDTYPE} \ GPERF="${LOCALBASE}/bin/gperf" +MAKE_ARGS= -C out/${BUILDTYPE} .include -#XXX redefine MAKE_ARGS after bsd.port.pre.mk to avoid OPENSSL flags -# leaking in which confuses ninja -MAKE_ARGS= -C out/${BUILDTYPE} - .if ${CHOSEN_COMPILER_TYPE} == gcc GYP_DEFINES+= gcc_version=${CXX:S/g++//} EXTRA_PATCHES+= ${FILESDIR}/extra-patch-gcc .else GYP_DEFINES+= clang=1 CFLAGS+= -Wno-unknown-warning-option EXTRA_PATCHES+= ${FILESDIR}/extra-patch-clang CONFIGURE_ENV+= AR=/usr/bin/ar .endif # according to portlint the below is passed via bsd.port.mk, # but 'make -V CONFIGURE_ENV' does not show it: CONFIGURE_ENV+= CFLAGS="${CFLAGS}" \ CPPFLAGS="${CPPFLAGS}" \ CXXFLAGS="${CXXFLAGS}" \ LDFLAGS="${LDFLAGS}" pre-everything:: @${ECHO_MSG} @${ECHO_MSG} "To build Chromium, you should have around 1 GB of memory" .if ${PORT_OPTIONS:MDEBUG} @${ECHO_MSG} "and lots of free diskspace (~ 8.5GB)." .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)" post-patch: @${REINPLACE_CMD} -e "s|/usr/local|${LOCALBASE}|" \ ${WRKSRC}/crypto/crypto.gyp \ ${WRKSRC}/v8/tools/gyp/v8.gyp \ ${WRKSRC}/v8/build/toolchain.gypi @${REINPLACE_CMD} -e "s|/usr/local|${PREFIX}|" \ ${WRKSRC}/chrome/common/chrome_paths.cc \ ${WRKSRC}/base/base.gyp - @${REINPLACE_CMD} -e "s|/usr/bin/gcc|${CC}|" \ - ${WRKSRC}/third_party/WebKit/Source/build/scripts/preprocessor.pm \ - ${WRKSRC}/third_party/WebKit/Source/build/scripts/scripts.gypi - @${REINPLACE_CMD} -e "s|g++|${CXX}|" \ - ${WRKSRC}/tools/compile_test/compile_test.py pre-configure: # phajdan-jr: list of things *not* to remove, so maybe the script # should be called "keep_bundled_libraries.py" cd ${WRKSRC} && ${PYTHON_CMD} \ ./build/linux/unbundle/remove_bundled_libraries.py \ 'base/third_party/dmg_fp' \ 'base/third_party/dynamic_annotations' \ 'base/third_party/icu' \ 'base/third_party/nspr' \ 'base/third_party/superfasthash' \ 'base/third_party/symbolize' \ 'base/third_party/valgrind' \ 'base/third_party/xdg_mime' \ 'base/third_party/xdg_user_dirs' \ 'breakpad/src/third_party/curl' \ + 'chrome/third_party/mock4js' \ 'chrome/third_party/mozilla_security_manager' \ 'courgette/third_party' \ 'crypto/third_party/nss' \ 'net/third_party/mozilla_security_manager' \ 'net/third_party/nss' \ 'third_party/WebKit' \ 'third_party/angle' \ + 'third_party/angle/src/third_party' \ + 'third_party/blanketjs' \ 'third_party/brotli' \ + 'third_party/boringssl' \ 'third_party/cacheinvalidation' \ 'third_party/cld' \ 'third_party/cros_system_api' \ 'third_party/dom_distiller_js' \ + 'third_party/dom_distiller_js/package/proto_gen/third_party/dom_distiller_js' \ 'third_party/ffmpeg' \ 'third_party/fips181' \ 'third_party/flot' \ 'third_party/hunspell' \ 'third_party/iccjpeg' \ 'third_party/icu/icu.isolate' \ 'third_party/jinja2' \ 'third_party/jstemplate' \ 'third_party/khronos' \ 'third_party/leveldatabase' \ 'third_party/libaddressinput' \ 'third_party/libjingle' \ 'third_party/libphonenumber' \ 'third_party/libsrtp' \ 'third_party/libvpx' \ + 'third_party/libvpx/source/libvpx/third_party/x86inc' \ 'third_party/libwebm' \ 'third_party/libxml/chromium' \ 'third_party/libXNVCtrl' \ 'third_party/libyuv' \ 'third_party/lss' \ 'third_party/lzma_sdk' \ 'third_party/markupsafe' \ 'third_party/mesa' \ 'third_party/modp_b64' \ 'third_party/mt19937ar' \ 'third_party/npapi' \ 'third_party/opus' \ 'third_party/ots' \ 'third_party/pdfium' \ + 'third_party/pdfium/third_party' \ 'third_party/ply' \ 'third_party/polymer' \ 'third_party/pywebsocket' \ 'third_party/qcms' \ + 'third_party/qunit' \ 'third_party/readability' \ 'third_party/sfntly' \ + 'third_party/sinonjs' \ 'third_party/skia' \ 'third_party/smhasher' \ 'third_party/sqlite' \ 'third_party/tcmalloc' \ 'third_party/tlslite' \ 'third_party/trace-viewer' \ + 'third_party/trace-viewer/third_party' \ + 'third_party/trace-viewer/third_party/tvcm/third_party' \ 'third_party/undoview' \ 'third_party/usrsctp' \ 'third_party/webdriver' \ 'third_party/webrtc' \ 'third_party/widevine' \ 'third_party/x86inc' \ - 'third_party/zlib/google' \ + 'third_party/yasm' \ + 'third_party/zlib' \ 'url/third_party/mozilla' \ 'v8/src/third_party/valgrind' \ + 'v8/third_party/fdlibm' \ --do-remove || ${FALSE} cd ${WRKSRC} && ${PYTHON_CMD} \ ./build/linux/unbundle/replace_gyp_files.py \ ${GYP_DEFINES:C/^/-D/} || ${FALSE} # allow removal of third_party/adobe ${ECHO_CMD} > ${WRKSRC}/flapper_version.h do-configure: cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${PYTHON_CMD} \ ./build/gyp_chromium chrome/chrome.gyp --depth . 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 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 content_resources keyboard_resources resources ${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/${p}.pak \ ${STAGEDIR}${DATADIR} .endfor ${INSTALL_PROGRAM} ${WRKSRC}/out/${BUILDTYPE}/chrome \ ${STAGEDIR}${DATADIR} ${INSTALL_LIB} ${WRKSRC}/out/${BUILDTYPE}/libffmpegsumo.so \ ${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}/mksnapshot .include Index: branches/2014Q4/www/chromium/distinfo =================================================================== --- branches/2014Q4/www/chromium/distinfo (revision 370436) +++ branches/2014Q4/www/chromium/distinfo (revision 370437) @@ -1,4 +1,4 @@ -SHA256 (chromium-37.0.2062.124.tar.xz) = 5a7ca0b1e9b4c51555cf82d8bebf5a8cc5b5810ccacd1087ba82a17b8ac830d8 -SIZE (chromium-37.0.2062.124.tar.xz) = 223325856 -SHA256 (chromium-37.0.2062.124-testdata.tar.xz) = 08a9febabe4995b88ccb99203057fac2056615e35fe5e8907604a1e07e1a9794 -SIZE (chromium-37.0.2062.124-testdata.tar.xz) = 114485636 +SHA256 (chromium-38.0.2125.101.tar.xz) = d3303519ab471a3bc831e9b366e64dc2fe651894e52ae5d1e74de60ee2a1198a +SIZE (chromium-38.0.2125.101.tar.xz) = 248192100 +SHA256 (chromium-38.0.2125.101-testdata.tar.xz) = aca97e1f3d1e4018ef24d7f53c9273b5efde4496f73dc82622184409e9b3076e +SIZE (chromium-38.0.2125.101-testdata.tar.xz) = 115331828 Index: branches/2014Q4/www/chromium/files/patch-v8__src__platform-freebsd.cc =================================================================== --- branches/2014Q4/www/chromium/files/patch-v8__src__platform-freebsd.cc (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-v8__src__platform-freebsd.cc (nonexistent) @@ -1,34 +0,0 @@ ---- ./v8/src/platform-freebsd.cc.orig 2014-08-20 21:04:33.000000000 +0200 -+++ ./v8/src/platform-freebsd.cc 2014-08-22 18:16:57.000000000 +0200 -@@ -130,14 +130,14 @@ - addr_buffer[0] = '0'; - addr_buffer[1] = 'x'; - addr_buffer[10] = 0; -- int result = read(fd, addr_buffer + 2, 8); -- if (result < 8) break; -+ int resultread = read(fd, addr_buffer + 2, 8); -+ if (resultread < 8) break; - unsigned start = StringToLong(addr_buffer); -- result = read(fd, addr_buffer + 2, 1); -- if (result < 1) break; -+ resultread = read(fd, addr_buffer + 2, 1); -+ if (resultread < 1) break; - if (addr_buffer[2] != '-') break; -- result = read(fd, addr_buffer + 2, 8); -- if (result < 8) break; -+ resultread = read(fd, addr_buffer + 2, 8); -+ if (resultread < 8) break; - unsigned end = StringToLong(addr_buffer); - char buffer[MAP_LENGTH]; - int bytes_read = -1; -@@ -145,8 +145,8 @@ - bytes_read++; - if (bytes_read >= MAP_LENGTH - 1) - break; -- result = read(fd, buffer + bytes_read, 1); -- if (result < 1) break; -+ resultread = read(fd, buffer + bytes_read, 1); -+ if (resultread < 1) break; - } while (buffer[bytes_read] != '\n'); - buffer[bytes_read] = 0; - // Ignore mappings that are not executable. Property changes on: branches/2014Q4/www/chromium/files/patch-v8__src__platform-freebsd.cc ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: branches/2014Q4/www/chromium/files/patch-third_party__WebKit__Source__web__linux__WebFontRendering.cpp =================================================================== --- branches/2014Q4/www/chromium/files/patch-third_party__WebKit__Source__web__linux__WebFontRendering.cpp (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-third_party__WebKit__Source__web__linux__WebFontRendering.cpp (nonexistent) @@ -1,20 +0,0 @@ ---- ./third_party/WebKit/Source/web/linux/WebFontRendering.cpp.orig 2014-08-20 21:07:56.000000000 +0200 -+++ ./third_party/WebKit/Source/web/linux/WebFontRendering.cpp 2014-08-22 15:06:26.000000000 +0200 -@@ -34,7 +34,7 @@ - #include "platform/fonts/FontDescription.h" - #include "platform/fonts/FontPlatformData.h" - --#if OS(LINUX) -+#if OS(LINUX) || OS(FREEBSD) - #include "public/platform/linux/WebFontInfo.h" - #endif - -@@ -77,7 +77,7 @@ - void WebFontRendering::setSubpixelPositioning(bool useSubpixelPositioning) - { - FontDescription::setSubpixelPositioning(useSubpixelPositioning); --#if OS(LINUX) -+#if OS(LINUX) || OS(FREEBSD) - WebFontInfo::setSubpixelPositioning(useSubpixelPositioning); - #endif - } Property changes on: branches/2014Q4/www/chromium/files/patch-third_party__WebKit__Source__web__linux__WebFontRendering.cpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -LF \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: branches/2014Q4/www/chromium/files/patch-third_party__libjingle__source__talk__base__systeminfo.cc =================================================================== --- branches/2014Q4/www/chromium/files/patch-third_party__libjingle__source__talk__base__systeminfo.cc (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-third_party__libjingle__source__talk__base__systeminfo.cc (nonexistent) @@ -1,43 +0,0 @@ ---- ./third_party/libjingle/source/talk/base/systeminfo.cc.orig 2014-08-20 21:03:47.000000000 +0200 -+++ ./third_party/libjingle/source/talk/base/systeminfo.cc 2014-08-22 15:06:27.000000000 +0200 -@@ -36,8 +36,12 @@ - #elif defined(OSX) - #include - #include --#elif defined(LINUX) || defined(ANDROID) -+#elif defined(LINUX) || defined(ANDROID) || defined(BSD) - #include -+#if defined(OS_FREEBSD) -+#include -+#include -+#endif - #endif - #if defined(OSX) || defined(IOS) - #include -@@ -48,7 +52,7 @@ - #include "talk/base/win32.h" - #elif defined(OSX) - #include "talk/base/macconversion.h" --#elif defined(LINUX) || defined(ANDROID) -+#elif defined(LINUX) || defined(ANDROID) || defined(BSD) - #include "talk/base/linux.h" - #endif - #include "talk/base/common.h" -@@ -185,6 +189,17 @@ - } - #elif defined(__native_client__) - // TODO(ryanpetrie): Implement this via PPAPI when it's available. -+#elif defined(OS_FREEBSD) -+ void* sysctl_value; -+ size_t length = sizeof(sysctl_value); -+ if (!sysctlbyname("hw.ncpu", &sysctl_value, &length, NULL, 0)) { -+ physical_cpus_ = *static_cast(sysctl_value); -+ } -+ if (!sysctlbyname("kern.smp.cpus", &sysctl_value, &length, NULL, 0)) { -+ logical_cpus_ = *static_cast(sysctl_value); -+ } -+ // L3 / L2 cache size? -+ // CPU family/model/stepping (available in dmesg, kernel only TODO) - #else // LINUX || ANDROID - ProcCpuInfo proc_info; - if (proc_info.LoadFromSystem()) { Property changes on: branches/2014Q4/www/chromium/files/patch-third_party__libjingle__source__talk__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: branches/2014Q4/www/chromium/files/patch-content__renderer__media__webrtc_audio_renderer.cc =================================================================== --- branches/2014Q4/www/chromium/files/patch-content__renderer__media__webrtc_audio_renderer.cc (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-content__renderer__media__webrtc_audio_renderer.cc (nonexistent) @@ -1,11 +0,0 @@ ---- ./content/renderer/media/webrtc_audio_renderer.cc.orig 2014-08-20 21:02:43.000000000 +0200 -+++ ./content/renderer/media/webrtc_audio_renderer.cc 2014-08-22 15:06:26.000000000 +0200 -@@ -34,7 +34,7 @@ - // rates below adds restrictions and Initialize() will fail if the user selects - // any rate outside these ranges. - const int kValidOutputRates[] = {96000, 48000, 44100, 32000, 16000}; --#elif defined(OS_LINUX) || defined(OS_OPENBSD) -+#elif defined(OS_LINUX) || defined(OS_BSD) - const int kValidOutputRates[] = {48000, 44100}; - #elif defined(OS_ANDROID) - // TODO(leozwang): We want to use native sampling rate on Android to achieve Property changes on: branches/2014Q4/www/chromium/files/patch-content__renderer__media__webrtc_audio_renderer.cc ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: branches/2014Q4/www/chromium/files/patch-third_party__libjingle__source__talk__base__network.h =================================================================== --- branches/2014Q4/www/chromium/files/patch-third_party__libjingle__source__talk__base__network.h (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-third_party__libjingle__source__talk__base__network.h (nonexistent) @@ -1,13 +0,0 @@ ---- ./third_party/libjingle/source/talk/base/network.h.orig 2014-08-20 21:03:47.000000000 +0200 -+++ ./third_party/libjingle/source/talk/base/network.h 2014-08-22 15:06:27.000000000 +0200 -@@ -38,6 +38,10 @@ - #include "talk/base/messagehandler.h" - #include "talk/base/sigslot.h" - -+#if defined(OS_FREEBSD) -+#include -+#endif -+ - #if defined(POSIX) - struct ifaddrs; - #endif // defined(POSIX) Property changes on: branches/2014Q4/www/chromium/files/patch-third_party__libjingle__source__talk__base__network.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: branches/2014Q4/www/chromium/files/patch-chrome__browser__browser_process_impl.cc =================================================================== --- branches/2014Q4/www/chromium/files/patch-chrome__browser__browser_process_impl.cc (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-chrome__browser__browser_process_impl.cc (nonexistent) @@ -1,11 +0,0 @@ ---- ./chrome/browser/browser_process_impl.cc.orig 2014-08-20 21:02:13.000000000 +0200 -+++ ./chrome/browser/browser_process_impl.cc 2014-08-22 15:06:24.000000000 +0200 -@@ -248,7 +248,7 @@ - - ExtensionRendererState::GetInstance()->Shutdown(); - --#if !defined(OS_ANDROID) && !defined(OS_IOS) -+#if !defined(OS_ANDROID) && !defined(OS_IOS) && !defined(OS_BSD) - media_file_system_registry_.reset(); - // Remove the global instance of the Storage Monitor now. Otherwise the - // FILE thread would be gone when we try to release it in the dtor and Property changes on: branches/2014Q4/www/chromium/files/patch-chrome__browser__browser_process_impl.cc ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: branches/2014Q4/www/chromium/files/patch-third_party__libjingle__source__talk__base__cpumonitor.cc =================================================================== --- branches/2014Q4/www/chromium/files/patch-third_party__libjingle__source__talk__base__cpumonitor.cc (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-third_party__libjingle__source__talk__base__cpumonitor.cc (nonexistent) @@ -1,48 +0,0 @@ ---- ./third_party/libjingle/source/talk/base/cpumonitor.cc.orig 2014-08-20 21:03:47.000000000 +0200 -+++ ./third_party/libjingle/source/talk/base/cpumonitor.cc 2014-08-22 15:06:26.000000000 +0200 -@@ -53,13 +53,13 @@ - #include - #endif // defined(IOS) || defined(OSX) - --#if defined(LINUX) || defined(ANDROID) -+#if defined(LINUX) || defined(ANDROID) || defined(BSD) - #include - #include - #include - #include "talk/base/fileutils.h" - #include "talk/base/pathutils.h" --#endif // defined(LINUX) || defined(ANDROID) -+#endif // defined(LINUX) || defined(ANDROID) || defined(BSD) - - #if defined(IOS) || defined(OSX) - static uint64 TimeValueTToInt64(const time_value_t &time_value) { -@@ -285,6 +285,11 @@ - const uint64 cpu_times = nice + system + user; - const uint64 total_times = cpu_times + idle; - #endif // defined(LINUX) || defined(ANDROID) -+#if defined(BSD) -+ const uint64 cpu_times = 0; -+ const uint64 total_times = 0; -+ return 0.f; -+#endif - - #if defined(__native_client__) - // TODO(ryanpetrie): Implement this via PPAPI when it's available. -@@ -359,7 +364,7 @@ - TimeValueTToInt64(task_term_info.system_time)); - #endif // defined(IOS) || defined(OSX) - --#if defined(LINUX) || defined(ANDROID) -+#if defined(LINUX) || defined(ANDROID) || defined(BSD) - rusage usage; - if (getrusage(RUSAGE_SELF, &usage) < 0) { - LOG_ERR(LS_ERROR) << "getrusage failed"; -@@ -369,7 +374,7 @@ - const uint64 cpu_times = - (usage.ru_utime.tv_sec + usage.ru_stime.tv_sec) * kNumMicrosecsPerSec + - usage.ru_utime.tv_usec + usage.ru_stime.tv_usec; --#endif // defined(LINUX) || defined(ANDROID) -+#endif // defined(LINUX) || defined(ANDROID) || defined(BSD) - - #if defined(__native_client__) - // TODO(ryanpetrie): Implement this via PPAPI when it's available. Property changes on: branches/2014Q4/www/chromium/files/patch-third_party__libjingle__source__talk__base__cpumonitor.cc ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: branches/2014Q4/www/chromium/files/patch-third_party__libjingle__source__talk__base__linux.h =================================================================== --- branches/2014Q4/www/chromium/files/patch-third_party__libjingle__source__talk__base__linux.h (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-third_party__libjingle__source__talk__base__linux.h (nonexistent) @@ -1,18 +0,0 @@ ---- ./third_party/libjingle/source/talk/base/linux.h.orig 2014-08-20 21:03:46.000000000 +0200 -+++ ./third_party/libjingle/source/talk/base/linux.h 2014-08-22 15:06:27.000000000 +0200 -@@ -28,7 +28,7 @@ - #ifndef TALK_BASE_LINUX_H_ - #define TALK_BASE_LINUX_H_ - --#if defined(LINUX) || defined(ANDROID) -+#if defined(LINUX) || defined(ANDROID) || defined(BSD) - #include - #include - #include -@@ -136,5 +136,5 @@ - - } // namespace talk_base - --#endif // defined(LINUX) || defined(ANDROID) -+#endif // defined(LINUX) || defined(ANDROID) || defined(BSD) - #endif // TALK_BASE_LINUX_H_ Property changes on: branches/2014Q4/www/chromium/files/patch-third_party__libjingle__source__talk__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: branches/2014Q4/www/chromium/files/patch-ui__resources__ui_resources.grd =================================================================== --- branches/2014Q4/www/chromium/files/patch-ui__resources__ui_resources.grd (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-ui__resources__ui_resources.grd (nonexistent) @@ -1,11 +0,0 @@ ---- ui/resources/ui_resources.grd.orig 2014-09-10 01:47:14.000000000 +0200 -+++ ui/resources/ui_resources.grd 2014-09-17 13:51:43.000000000 +0200 -@@ -39,7 +39,7 @@ - - - -- -+ - - - Property changes on: branches/2014Q4/www/chromium/files/patch-ui__resources__ui_resources.grd ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: branches/2014Q4/www/chromium/files/patch-third_party__WebKit__Source__wtf__Assertions.cpp =================================================================== --- branches/2014Q4/www/chromium/files/patch-third_party__WebKit__Source__wtf__Assertions.cpp (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-third_party__WebKit__Source__wtf__Assertions.cpp (nonexistent) @@ -1,10 +0,0 @@ ---- ./third_party/WebKit/Source/wtf/Assertions.cpp.orig 2014-08-20 21:08:05.000000000 +0200 -+++ ./third_party/WebKit/Source/wtf/Assertions.cpp 2014-08-22 15:06:26.000000000 +0200 -@@ -38,6 +38,7 @@ - #include "OwnPtr.h" - #include "PassOwnPtr.h" - -+#include - #include - #include - #include Property changes on: branches/2014Q4/www/chromium/files/patch-third_party__WebKit__Source__wtf__Assertions.cpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: branches/2014Q4/www/chromium/files/extra-patch-fixup-execinfo =================================================================== --- branches/2014Q4/www/chromium/files/extra-patch-fixup-execinfo (revision 370436) +++ branches/2014Q4/www/chromium/files/extra-patch-fixup-execinfo (nonexistent) @@ -1,11 +0,0 @@ ---- v8/src/checks.cc.orig 2014-03-07 23:57:27.000000000 +0100 -+++ v8/src/checks.cc 2014-03-08 00:04:14.000000000 +0100 -@@ -44,7 +44,7 @@ - static V8_INLINE void DumpBacktrace() { - #if V8_LIBC_GLIBC || V8_OS_BSD - void* trace[100]; -- int size = backtrace(trace, ARRAY_SIZE(trace)); -+ size_t size = backtrace(trace, ARRAY_SIZE((size_t**)trace)); - char** symbols = backtrace_symbols(trace, size); - i::OS::PrintError("\n==== C stack trace ===============================\n\n"); - if (size == 0) { Property changes on: branches/2014Q4/www/chromium/files/extra-patch-fixup-execinfo ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: branches/2014Q4/www/chromium/files/patch-third_party__libjingle__source__talk__base__ipaddress.h =================================================================== --- branches/2014Q4/www/chromium/files/patch-third_party__libjingle__source__talk__base__ipaddress.h (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-third_party__libjingle__source__talk__base__ipaddress.h (nonexistent) @@ -1,12 +0,0 @@ ---- ./third_party/libjingle/source/talk/base/ipaddress.h.orig 2014-08-20 21:03:47.000000000 +0200 -+++ ./third_party/libjingle/source/talk/base/ipaddress.h 2014-08-22 15:06:26.000000000 +0200 -@@ -34,6 +34,9 @@ - #include - #include - #endif -+#ifdef BSD -+#include -+#endif - #ifdef WIN32 - #include - #include Property changes on: branches/2014Q4/www/chromium/files/patch-third_party__libjingle__source__talk__base__ipaddress.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: branches/2014Q4/www/chromium/files/patch-third_party__WebKit__Source__wtf__DateMath.cpp =================================================================== --- branches/2014Q4/www/chromium/files/patch-third_party__WebKit__Source__wtf__DateMath.cpp (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-third_party__WebKit__Source__wtf__DateMath.cpp (nonexistent) @@ -1,28 +0,0 @@ ---- ./third_party/WebKit/Source/wtf/DateMath.cpp.orig 2014-08-20 21:08:05.000000000 +0200 -+++ ./third_party/WebKit/Source/wtf/DateMath.cpp 2014-08-22 15:06:26.000000000 +0200 -@@ -80,6 +80,7 @@ - #include "StringExtras.h" - - #include -+#include - #include - #include - #include -@@ -785,7 +786,7 @@ - return std::numeric_limits::quiet_NaN(); - - int sgn = (o < 0) ? -1 : 1; -- o = abs(o); -+ o = std::abs(o); - if (*dateString != ':') { - if (o >= 24) - offset = ((o / 100) * 60 + (o % 100)) * sgn; -@@ -874,7 +875,7 @@ - stringBuilder.append(' '); - - stringBuilder.append(utcOffset > 0 ? '+' : '-'); -- int absoluteUTCOffset = abs(utcOffset); -+ int absoluteUTCOffset = std::abs(utcOffset); - stringBuilder.append(twoDigitStringFromNumber(absoluteUTCOffset / 60)); - stringBuilder.append(twoDigitStringFromNumber(absoluteUTCOffset % 60)); - Property changes on: branches/2014Q4/www/chromium/files/patch-third_party__WebKit__Source__wtf__DateMath.cpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: branches/2014Q4/www/chromium/files/patch-chrome__browser__extensions__api__serial__serial_api.cc =================================================================== --- branches/2014Q4/www/chromium/files/patch-chrome__browser__extensions__api__serial__serial_api.cc (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-chrome__browser__extensions__api__serial__serial_api.cc (nonexistent) @@ -1,16 +0,0 @@ ---- ./chrome/browser/extensions/api/serial/serial_api.cc.orig 2014-08-20 21:01:58.000000000 +0200 -+++ ./chrome/browser/extensions/api/serial/serial_api.cc 2014-08-22 15:06:24.000000000 +0200 -@@ -85,11 +85,13 @@ - void SerialGetDevicesFunction::Work() { - DCHECK_CURRENTLY_ON(BrowserThread::FILE); - -+#if !defined(OS_FREEBSD) //XXX(rene) quick hack - scoped_ptr enumerator = - device::SerialDeviceEnumerator::Create(); - mojo::Array devices = enumerator->GetDevices(); - results_ = serial::GetDevices::Results::Create( - devices.To > >()); -+#endif - } - - SerialConnectFunction::SerialConnectFunction() {} Property changes on: branches/2014Q4/www/chromium/files/patch-chrome__browser__extensions__api__serial__serial_api.cc ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: branches/2014Q4/www/chromium/files/patch-chrome__browser__notifications__message_center_notification_manager.cc =================================================================== --- branches/2014Q4/www/chromium/files/patch-chrome__browser__notifications__message_center_notification_manager.cc (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-chrome__browser__notifications__message_center_notification_manager.cc (nonexistent) @@ -1,11 +0,0 @@ ---- chrome/browser/notifications/message_center_notification_manager.cc.orig 2014-09-10 01:47:12.000000000 +0200 -+++ chrome/browser/notifications/message_center_notification_manager.cc 2014-09-18 14:21:16.000000000 +0200 -@@ -78,7 +78,7 @@ - blockers_.push_back(new FullscreenNotificationBlocker(message_center)); - - #if defined(OS_WIN) || defined(OS_MACOSX) \ -- || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) -+ || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) - // On Windows, Linux and Mac, the notification manager owns the tray icon and - // views.Other platforms have global ownership and Create will return NULL. - tray_.reset(message_center::CreateMessageCenterTray()); Property changes on: branches/2014Q4/www/chromium/files/patch-chrome__browser__notifications__message_center_notification_manager.cc ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -LF \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: branches/2014Q4/www/chromium/files/patch-chrome__browser__extensions__api__serial__serial_connection_posix.cc =================================================================== --- branches/2014Q4/www/chromium/files/patch-chrome__browser__extensions__api__serial__serial_connection_posix.cc (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-chrome__browser__extensions__api__serial__serial_connection_posix.cc (nonexistent) @@ -1,20 +0,0 @@ ---- ./chrome/browser/extensions/api/serial/serial_connection_posix.cc.orig 2014-08-20 21:01:58.000000000 +0200 -+++ ./chrome/browser/extensions/api/serial/serial_connection_posix.cc 2014-08-22 15:06:24.000000000 +0200 -@@ -36,7 +36,7 @@ - BITRATE_TO_SPEED_CASE(9600) - BITRATE_TO_SPEED_CASE(19200) - BITRATE_TO_SPEED_CASE(38400) --#if defined(OS_POSIX) && !defined(OS_MACOSX) -+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD) - BITRATE_TO_SPEED_CASE(57600) - BITRATE_TO_SPEED_CASE(115200) - BITRATE_TO_SPEED_CASE(230400) -@@ -71,7 +71,7 @@ - SPEED_TO_BITRATE_CASE(9600) - SPEED_TO_BITRATE_CASE(19200) - SPEED_TO_BITRATE_CASE(38400) --#if defined(OS_POSIX) && !defined(OS_MACOSX) -+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD) - SPEED_TO_BITRATE_CASE(57600) - SPEED_TO_BITRATE_CASE(115200) - SPEED_TO_BITRATE_CASE(230400) Property changes on: branches/2014Q4/www/chromium/files/patch-chrome__browser__extensions__api__serial__serial_connection_posix.cc ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: branches/2014Q4/www/chromium/files/patch-third_party__WebKit__Source__config.h =================================================================== --- branches/2014Q4/www/chromium/files/patch-third_party__WebKit__Source__config.h (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-third_party__WebKit__Source__config.h (nonexistent) @@ -1,10 +0,0 @@ ---- ./third_party/WebKit/Source/config.h.orig 2014-08-20 21:08:07.000000000 +0200 -+++ ./third_party/WebKit/Source/config.h 2014-08-22 15:06:26.000000000 +0200 -@@ -155,6 +155,6 @@ - #define SKIP_STATIC_CONSTRUCTORS_ON_GCC 1 - #endif - --#if OS(LINUX) || OS(ANDROID) || OS(WIN) -+#if OS(LINUX) || OS(ANDROID) || OS(FREEBSD) || OS(WIN) - #define WTF_USE_HARFBUZZ 1 - #endif Property changes on: branches/2014Q4/www/chromium/files/patch-third_party__WebKit__Source__config.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: branches/2014Q4/www/chromium/files/patch-chrome__browser__omaha_query_params__omaha_query_params.cc =================================================================== --- branches/2014Q4/www/chromium/files/patch-chrome__browser__omaha_query_params__omaha_query_params.cc (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-chrome__browser__omaha_query_params__omaha_query_params.cc (nonexistent) @@ -1,11 +0,0 @@ ---- ./chrome/browser/omaha_query_params/omaha_query_params.cc.orig 2014-08-20 21:02:00.000000000 +0200 -+++ ./chrome/browser/omaha_query_params/omaha_query_params.cc 2014-08-22 15:06:25.000000000 +0200 -@@ -29,6 +29,8 @@ - "linux"; - #elif defined(OS_OPENBSD) - "openbsd"; -+#elif defined(OS_FREEBSD) -+ "freebsd"; - #else - #error "unknown os" - #endif Property changes on: branches/2014Q4/www/chromium/files/patch-chrome__browser__omaha_query_params__omaha_query_params.cc ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: branches/2014Q4/www/chromium/files/patch-third_party__libjingle__source__talk__base__linux.cc =================================================================== --- branches/2014Q4/www/chromium/files/patch-third_party__libjingle__source__talk__base__linux.cc (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-third_party__libjingle__source__talk__base__linux.cc (nonexistent) @@ -1,17 +0,0 @@ ---- ./third_party/libjingle/source/talk/base/linux.cc.orig 2014-08-20 21:03:47.000000000 +0200 -+++ ./third_party/libjingle/source/talk/base/linux.cc 2014-08-22 15:06:27.000000000 +0200 -@@ -25,7 +25,7 @@ - * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - --#if defined(LINUX) || defined(ANDROID) -+#if defined(LINUX) || defined(ANDROID) || defined(BSD) - #include "talk/base/linux.h" - - #include -@@ -362,4 +362,4 @@ - - } // namespace talk_base - --#endif // defined(LINUX) || defined(ANDROID) -+#endif // defined(LINUX) || defined(ANDROID) || defined(BSD) Property changes on: branches/2014Q4/www/chromium/files/patch-third_party__libjingle__source__talk__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: branches/2014Q4/www/chromium/files/chromium-browser.desktop.in =================================================================== --- branches/2014Q4/www/chromium/files/chromium-browser.desktop.in (revision 370436) +++ branches/2014Q4/www/chromium/files/chromium-browser.desktop.in (revision 370437) @@ -1,11 +1,11 @@ [Desktop Entry] Type=Application Version=1.0 Encoding=UTF-8 Name=Chromium Comment=%%COMMENT%% -Icon=chrome +Icon=%%DATADIR%%/product_logo_48.png Exec=chrome %U Categories=Application;Network;WebBrowser; MimeType=text/html;text/xml;application/xhtml+xml;x-scheme-handler/http;x-scheme-handler/https;x-scheme-handler/ftp; StartupNotify=true Index: branches/2014Q4/www/chromium/files/extra-patch-clang =================================================================== --- branches/2014Q4/www/chromium/files/extra-patch-clang (revision 370436) +++ branches/2014Q4/www/chromium/files/extra-patch-clang (revision 370437) @@ -1,280 +1,269 @@ --- base/allocator/allocator_extension.cc 2013-07-03 23:39:54.000000000 -0400 +++ base/allocator/allocator_extension.cc 2013-07-19 00:39:26.000000000 -0400 @@ -35,20 +35,20 @@ void SetGetAllocatorWasteSizeFunction( thunks::GetAllocatorWasteSizeFunction get_allocator_waste_size_function) { DCHECK_EQ(thunks::GetGetAllocatorWasteSizeFunction(), - reinterpret_cast(NULL)); + static_cast(NULL)); thunks::SetGetAllocatorWasteSizeFunction(get_allocator_waste_size_function); } void SetGetStatsFunction(thunks::GetStatsFunction get_stats_function) { DCHECK_EQ(thunks::GetGetStatsFunction(), - reinterpret_cast(NULL)); + static_cast(NULL)); thunks::SetGetStatsFunction(get_stats_function); } void SetReleaseFreeMemoryFunction( thunks::ReleaseFreeMemoryFunction release_free_memory_function) { DCHECK_EQ(thunks::GetReleaseFreeMemoryFunction(), - reinterpret_cast(NULL)); + static_cast(NULL)); thunks::SetReleaseFreeMemoryFunction(release_free_memory_function); } --- base/profiler/alternate_timer.cc 2013-07-03 23:39:54.000000000 -0400 +++ base/profiler/alternate_timer.cc 2013-07-19 00:41:06.000000000 -0400 @@ -21,7 +21,7 @@ // Set an alternate timer function to replace the OS time function when // profiling. void SetAlternateTimeSource(NowFunction* now_function, TimeSourceType type) { - DCHECK_EQ(reinterpret_cast(NULL), g_time_function); + DCHECK_EQ(static_cast(NULL), g_time_function); g_time_function = now_function; g_time_source_type = type; } --- base/threading/thread_local_storage_unittest.cc.orig 2013-08-30 23:06:21.000000000 +0300 +++ base/threading/thread_local_storage_unittest.cc 2013-08-30 23:06:50.000000000 +0300 @@ -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 2013-07-03 23:39:54.000000000 -0400 +++ base/tracked_objects.cc 2013-07-19 00:42:10.000000000 -0400 @@ -378,7 +378,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 2013-08-30 23:09:01.000000000 +0300 +++ base/tracked_objects_unittest.cc 2013-08-30 23:10:14.000000000 +0300 @@ -53,9 +53,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. @@ -234,7 +234,7 @@ return; scoped_ptr data(new DeathData()); - ASSERT_NE(data, reinterpret_cast(NULL)); + ASSERT_NE(data, static_cast(NULL)); EXPECT_EQ(data->run_duration_sum(), 0); EXPECT_EQ(data->run_duration_sample(), 0); EXPECT_EQ(data->queue_duration_sum(), 0); @@ -435,7 +435,7 @@ Location location(kFunction, kFile, kLineNumber, NULL); // Do not delete |birth|. We don't own it. Births* birth = ThreadData::TallyABirthIfActive(location); - EXPECT_NE(reinterpret_cast(NULL), birth); + EXPECT_NE(static_cast(NULL), birth); const TrackedTime kTimePosted = TrackedTime() + Duration::FromMilliseconds(1); const TrackedTime kStartOfRun = TrackedTime() + ---- chrome/browser/metrics/thread_watcher.cc 2013-07-03 23:45:55.000000000 -0400 -+++ chrome/browser/metrics/thread_watcher.cc 2013-07-19 01:38:45.000000000 -0400 -@@ -41,7 +41,7 @@ - MSVC_PUSH_DISABLE_WARNING(4748) - - int* NullPointer() { -- return reinterpret_cast(NULL); -+ return static_cast(NULL); - } - - void NullPointerCrash(int line_number) { --- chrome/browser/sync/glue/synced_session_tracker.cc 2013-07-03 23:46:07.000000000 -0400 +++ chrome/browser/sync/glue/synced_session_tracker.cc 2013-07-19 01:50:13.000000000 -0400 @@ -260,7 +260,7 @@ } DCHECK(window_ptr); DCHECK_EQ(window_ptr->window_id.id(), window_id); - DCHECK_EQ(reinterpret_cast(NULL), + DCHECK_EQ(static_cast(NULL), GetSession(session_tag)->windows[window_id]); GetSession(session_tag)->windows[window_id] = window_ptr; } --- media/audio/audio_output_proxy_unittest.cc.orig 2013-08-30 23:23:03.000000000 +0300 +++ media/audio/audio_output_proxy_unittest.cc 2013-08-30 23:23:54.000000000 +0300 @@ -392,7 +392,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); ---- media/filters/decrypting_video_decoder_unittest.cc.orig 2013-08-30 23:27:39.000000000 +0300 -+++ media/filters/decrypting_video_decoder_unittest.cc 2013-08-30 23:28:27.000000000 +0300 -@@ -417,7 +417,7 @@ - // callback to cancel the |decryptor_ready_cb|. - EXPECT_CALL(*this, RequestDecryptorNotification(IsNullCallback())) - .WillOnce(ResetAndRunCallback(&decryptor_ready_cb, -- reinterpret_cast(NULL))); -+ static_cast(NULL))); - Stop(); - } - +--- media/filters/decrypting_video_decoder_unittest.cc.orig 2014-09-04 02:04:17.000000000 +0200 ++++ media/filters/decrypting_video_decoder_unittest.cc 2014-09-08 20:51:21.000000000 +0200 +@@ -420,7 +420,7 @@ + // NULL callback to cancel the |decryptor_ready_cb|. + EXPECT_CALL(*this, RequestDecryptorNotification(IsNullCallback())).WillOnce( + ResetAndRunCallback(&decryptor_ready_cb, +- reinterpret_cast(NULL), ++ static_cast(NULL), + base::Bind(&DecryptingVideoDecoderTest::DecryptorSet, + base::Unretained(this)))); + EXPECT_CALL(*this, DecryptorSet(_)).Times(0); --- third_party/hunspell/src/hunspell/affentry.hxx 2013-07-03 23:52:32.000000000 -0400 +++ third_party/hunspell/src/hunspell/affentry.hxx 2013-07-19 01:31:57.000000000 -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/libjingle/source/talk/base/taskrunner.cc 2013-07-03 23:54:05.000000000 -0400 -+++ third_party/libjingle/source/talk/base/taskrunner.cc 2013-07-19 00:46:25.000000000 -0400 -@@ -119,7 +119,7 @@ - std::vector::iterator it; - it = std::remove(tasks_.begin(), - tasks_.end(), -- reinterpret_cast(NULL)); -+ static_cast(NULL)); - - tasks_.erase(it, tasks_.end()); - --- third_party/sfntly/cpp/src/sfntly/table/core/cmap_table.cc 2013-07-03 23:54:15.000000000 -0400 +++ third_party/sfntly/cpp/src/sfntly/table/core/cmap_table.cc 2013-07-19 00:44:09.000000000 -0400 @@ -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) { } --- v8/src/runtime.cc.orig 2013-11-08 08:01:04.000000000 +0100 +++ v8/src/runtime.cc 2013-11-15 13:17:39.000000000 +0100 @@ -14043,7 +14043,7 @@ local_object->SetInternalField(0, reinterpret_cast(break_iterator)); // Make sure that the pointer to adopted text is NULL. - local_object->SetInternalField(1, reinterpret_cast(NULL)); + local_object->SetInternalField(1, static_cast(NULL)); RETURN_IF_EMPTY_HANDLE(isolate, JSObject::SetLocalPropertyIgnoreAttributes( --- base/strings/safe_sprintf_unittest.cc.orig 2013-11-08 07:42:08.000000000 +0100 +++ base/strings/safe_sprintf_unittest.cc 2013-11-15 15:04:45.000000000 +0100 @@ -721,12 +721,14 @@ #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wconversion-null" #endif +/* Avoid compiler error: http://pastebin.com/1edWUE84 EXPECT_EQ(1, SafeSPrintf(buf, "%d", NULL)); EXPECT_EQ("0", std::string(buf)); EXPECT_EQ(3, SafeSPrintf(buf, "%p", NULL)); 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 --- v8/src/unique.h.orig 2014-01-07 21:03:55.000000000 +0100 +++ v8/src/unique.h 2014-01-13 00:41:59.000000000 +0100 @@ -130,7 +130,7 @@ // TODO(titzer): this is a hack to migrate to Unique incrementally. static Unique CreateUninitialized(Handle handle) { - return Unique(reinterpret_cast
(NULL), handle); + return Unique(static_cast
(NULL), handle); } static Unique CreateImmovable(Handle handle) { --- content/browser/frame_host/render_widget_host_view_guest.cc.orig 2014-03-05 22:24:07.000000000 +0100 +++ content/browser/frame_host/render_widget_host_view_guest.cc 2014-03-09 20:01:20.000000000 +0100 @@ -258,11 +258,11 @@ gfx::NativeViewId RenderWidgetHostViewGuest::GetNativeViewId() const { if (!guest_) - return static_cast(NULL); + return reinterpret_cast(NULL); RenderWidgetHostView* rwhv = guest_->GetEmbedderRenderWidgetHostView(); if (!rwhv) - return static_cast(NULL); + return reinterpret_cast(NULL); return rwhv->GetNativeViewId(); } - --- ./third_party/webrtc/base/taskrunner.cc.orig 2014-08-20 21:04:28.000000000 +0200 +++ ./third_party/webrtc/base/taskrunner.cc 2014-08-22 18:55:46.000000000 +0200 @@ -102,7 +102,7 @@ std::vector::iterator it; it = std::remove(tasks_.begin(), tasks_.end(), - reinterpret_cast(NULL)); + static_cast(NULL)); tasks_.erase(it, tasks_.end()); +--- v8/src/unique.h.orig 2014-09-04 02:30:24.000000000 +0200 ++++ v8/src/unique.h 2014-09-10 16:19:37.000000000 +0200 +@@ -167,7 +167,7 @@ + + // TODO(titzer): this is a hack to migrate to Unique incrementally. + static PrintableUnique CreateUninitialized(Zone* zone, Handle handle) { +- return PrintableUnique(zone, reinterpret_cast
(NULL), handle); ++ return PrintableUnique(zone, static_cast
(NULL), handle); + } + + static PrintableUnique CreateImmovable(Zone* zone, Handle handle) { Index: branches/2014Q4/www/chromium/files/extra-patch-gcc =================================================================== --- branches/2014Q4/www/chromium/files/extra-patch-gcc (revision 370436) +++ branches/2014Q4/www/chromium/files/extra-patch-gcc (revision 370437) @@ -1,98 +1,78 @@ ---- base/memory/shared_memory.h.orig 2011-04-01 21:54:26.066717848 +0300 -+++ base/memory/shared_memory.h 2011-04-01 21:55:14.292717813 +0300 -@@ -12,6 +12,7 @@ - - #if defined(OS_POSIX) - #include -+#include - #include - #include "base/file_descriptor_posix.h" - #endif ---- third_party/libjingle/source/talk/base/stream.h.orig 2011-04-01 22:16:30.129717654 +0300 -+++ third_party/libjingle/source/talk/base/stream.h 2011-04-01 22:16:48.245715495 +0300 -@@ -30,6 +30,7 @@ - #ifndef TALK_BASE_STREAM_H__ - #define TALK_BASE_STREAM_H__ - -+#include - #include "talk/base/basictypes.h" - #include "talk/base/criticalsection.h" - #include "talk/base/logging.h" --- media/filters/file_data_source.h.orig 2011-09-14 10:01:06.000000000 +0200 +++ media/filters/file_data_source.h 2011-09-26 19:08:17.000000000 +0200 @@ -5,6 +5,7 @@ #ifndef MEDIA_FILTERS_FILE_DATA_SOURCE_H_ #define MEDIA_FILTERS_FILE_DATA_SOURCE_H_ +#include #include - #include "base/gtest_prod_util.h" + #include "base/files/file.h" --- content/public/common/child_process_sandbox_support_linux.h.orig 2013-10-11 19:30:28.000000000 +0200 +++ content/public/common/child_process_sandbox_support_linux.h 2013-10-16 15:29:00.000000000 +0200 @@ -7,6 +7,7 @@ #include #include +#include #include "content/common/content_export.h" --- third_party/ffmpeg/libavutil/cpu.c.orig 2013-11-16 01:26:14.000000000 +0100 +++ third_party/ffmpeg/libavutil/cpu.c 2013-11-19 00:24:53.000000000 +0100 @@ -24,6 +24,9 @@ #include "opt.h" #include "common.h" +/* TODO(rene) work around a compile error with GCC 4.6.4 on FreeBSD */ +#define __BSD_VISIBLE 1 + #if HAVE_SCHED_GETAFFINITY #ifndef _GNU_SOURCE # define _GNU_SOURCE --- content/browser/browser_shutdown_profile_dumper.cc.orig 2014-02-20 15:28:24.000000000 -0500 +++ content/browser/browser_shutdown_profile_dumper.cc 2014-03-03 15:36:33.000000000 -0500 @@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include + #include "content/browser/browser_shutdown_profile_dumper.h" #include "base/base_switches.h" --- testing/perf/perf_test.cc 2014-03-03 12:59:30.000000000 -0500 +++ testing/perf/perf_test.cc.orig 2014-02-20 15:28:27.000000000 -0500 @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include + #include "testing/perf/perf_test.h" -#include - #include "base/logging.h" #include "base/strings/string_number_conversions.h" #include "base/strings/stringprintf.h" ---- ui/gfx/codec/jpeg_codec.cc.orig 2014-02-20 15:27:56.000000000 -0500 -+++ ui/gfx/codec/jpeg_codec.cc 2014-03-03 14:33:42.000000000 -0500 -@@ -15,6 +15,7 @@ - #if defined(USE_SYSTEM_LIBJPEG) - #include - #elif defined(USE_LIBJPEG_TURBO) -+#include - #include "third_party/libjpeg_turbo/jpeglib.h" - #else - #include "third_party/libjpeg/jpeglib.h" ---- ui/gfx/codec/jpeg_codec.cc.orig 2014-08-12 21:02:29.000000000 +0200 -+++ ui/gfx/codec/jpeg_codec.cc 2014-08-17 19:32:18.000000000 +0200 +--- ui/gfx/codec/jpeg_codec.cc.orig 2014-10-02 19:19:03.000000000 +0200 ++++ ui/gfx/codec/jpeg_codec.cc 2014-10-05 22:38:28.000000000 +0200 @@ -13,6 +13,7 @@ extern "C" { #if defined(USE_SYSTEM_LIBJPEG) +#include #include #elif defined(USE_LIBJPEG_TURBO) #include "third_party/libjpeg_turbo/jpeglib.h" +--- media/cast/logging/encoding_event_subscriber.cc.orig 2014-10-02 19:39:47.000000000 +0200 ++++ media/cast/logging/encoding_event_subscriber.cc 2014-10-06 10:38:30.000000000 +0200 +@@ -4,6 +4,7 @@ + + #include "media/cast/logging/encoding_event_subscriber.h" + ++#include + #include + #include + Index: branches/2014Q4/www/chromium/files/patch-base__base.gyp =================================================================== --- branches/2014Q4/www/chromium/files/patch-base__base.gyp (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-base__base.gyp (revision 370437) @@ -1,11 +1,23 @@ ---- ./base/base.gyp.orig 2014-08-20 21:02:42.000000000 +0200 -+++ ./base/base.gyp 2014-08-22 15:06:27.000000000 +0200 +--- base/base.gyp.orig 2014-10-02 21:05:31 UTC ++++ base/base.gyp @@ -129,7 +129,7 @@ ], 'link_settings': { 'libraries': [ - '-L/usr/local/lib -lexecinfo', + '-L/usr/local/lib -lexecinfo -lkvm', ], }, }], +@@ -784,6 +784,11 @@ + ['include', '^debug/proc_maps_linux_unittest\\.cc$'], + ], + }], ++ ['OS == "freebsd"', { ++ 'sources!': [ ++ 'debug/proc_maps_linux_unittest.cc', ++ ], ++ }], + ], # target_conditions + }, + { Index: branches/2014Q4/www/chromium/files/patch-base__base.gypi =================================================================== --- branches/2014Q4/www/chromium/files/patch-base__base.gypi (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-base__base.gypi (revision 370437) @@ -1,20 +1,20 @@ ---- ./base/base.gypi.orig 2014-08-20 21:02:42.000000000 +0200 -+++ ./base/base.gypi 2014-08-22 18:33:25.000000000 +0200 -@@ -942,11 +942,16 @@ +--- base/base.gypi.orig 2014-10-02 17:39:45 UTC ++++ base/base.gypi +@@ -945,11 +945,16 @@ 'process/memory_stubs.cc', ], 'sources/': [ + ['exclude', '^debug/proc_maps_linux\\.cc$'], ['exclude', '^files/file_path_watcher_linux\\.cc$'], - ['exclude', '^files/file_path_watcher_stub\\.cc$'], - ['exclude', '^file_util_linux\\.cc$'], + ['exclude', '^files/file_util_linux\\.cc$'], + ['exclude', '^process/memory_linux\\.cc$'], ['exclude', '^process/process_linux\\.cc$'], ['exclude', '^sys_info_linux\\.cc$'], + ['exclude', '^process/process_iterator_linux\\.cc$'], + ['exclude', '^process/process_metrics_linux\\.cc$'], + ['exclude', '^files/file_path_watcher_fsevents\\.cc$'], + ['exclude', '^files/file_path_watcher_fsevents\\.h$'], ], }], # Remove all unnecessary files for build_nexe.py to avoid exceeding Index: branches/2014Q4/www/chromium/files/patch-base__debug__stack_trace_posix.cc =================================================================== --- branches/2014Q4/www/chromium/files/patch-base__debug__stack_trace_posix.cc (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-base__debug__stack_trace_posix.cc (revision 370437) @@ -1,21 +1,21 @@ ---- ./base/debug/stack_trace_posix.cc.orig 2014-08-20 21:02:42.000000000 +0200 -+++ ./base/debug/stack_trace_posix.cc 2014-08-22 15:06:24.000000000 +0200 -@@ -590,6 +590,10 @@ +--- base/debug/stack_trace_posix.cc.orig 2014-10-02 17:18:52 UTC ++++ base/debug/stack_trace_posix.cc +@@ -588,6 +588,10 @@ // 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)) { -@@ -605,6 +609,7 @@ +@@ -603,6 +607,7 @@ is_initialized_ = true; return true; +#endif } // Opens all object files and caches their file descriptors. Index: branches/2014Q4/www/chromium/files/patch-base__files__file_path_watcher_kqueue.h =================================================================== --- branches/2014Q4/www/chromium/files/patch-base__files__file_path_watcher_kqueue.h (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-base__files__file_path_watcher_kqueue.h (revision 370437) @@ -1,13 +1,13 @@ ---- ./base/files/file_path_watcher_kqueue.h.orig 2014-08-20 21:02:41.000000000 +0200 -+++ ./base/files/file_path_watcher_kqueue.h 2014-08-23 19:32:36.000000000 +0200 +--- base/files/file_path_watcher_kqueue.h.orig 2014-10-02 17:18:52 UTC ++++ base/files/file_path_watcher_kqueue.h @@ -5,6 +5,10 @@ #ifndef BASE_FILES_FILE_PATH_WATCHER_KQUEUE_H_ #define BASE_FILES_FILE_PATH_WATCHER_KQUEUE_H_ +#ifdef __FreeBSD__ +#include +#include +#endif #include #include Index: branches/2014Q4/www/chromium/files/patch-base__posix__unix_domain_socket_linux.cc =================================================================== --- branches/2014Q4/www/chromium/files/patch-base__posix__unix_domain_socket_linux.cc (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-base__posix__unix_domain_socket_linux.cc (revision 370437) @@ -1,44 +1,44 @@ ---- ./base/posix/unix_domain_socket_linux.cc.orig 2014-08-20 21:02:41.000000000 +0200 -+++ ./base/posix/unix_domain_socket_linux.cc 2014-08-22 15:06:24.000000000 +0200 +--- base/posix/unix_domain_socket_linux.cc.orig 2014-10-02 17:18:52 UTC ++++ base/posix/unix_domain_socket_linux.cc @@ -18,6 +18,15 @@ #include "base/posix/eintr_wrapper.h" #include "base/stl_util.h" +#if defined(__FreeBSD__) +// Port over Linux ucred structure +struct ucred { + pid_t pid; // process ID of the sending process + uid_t uid; // user ID of the sending process + gid_t gid; // group ID of the sending process +}; +#endif + const size_t UnixDomainSocket::kMaxFileDescriptors = 16; // Creates a connected pair of UNIX-domain SOCK_SEQPACKET sockets, and passes @@ -35,7 +44,13 @@ // static bool UnixDomainSocket::EnableReceiveProcessId(int fd) { const int enable = 1; +#if defined(__FreeBSD__) + // XXX(rene) do this? : + // taken from dbus, Academic Free License 2.1 / GPL 2+ + return 0; // fake OK +#else return setsockopt(fd, SOL_SOCKET, SO_PASSCRED, &enable, sizeof(enable)) == 0; +#endif } // static @@ -131,7 +146,11 @@ wire_fds_len = payload_len / sizeof(int); } if (cmsg->cmsg_level == SOL_SOCKET && +#if defined(__FreeBSD__) + 1) { // XXX(rene) carpet getting full ... +#else cmsg->cmsg_type == SCM_CREDENTIALS) { +#endif DCHECK(payload_len == sizeof(struct ucred)); DCHECK(pid == -1); pid = reinterpret_cast(CMSG_DATA(cmsg))->pid; Index: branches/2014Q4/www/chromium/files/patch-base__posix__unix_domain_socket_linux_unittest.cc =================================================================== --- branches/2014Q4/www/chromium/files/patch-base__posix__unix_domain_socket_linux_unittest.cc (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-base__posix__unix_domain_socket_linux_unittest.cc (revision 370437) @@ -1,16 +1,16 @@ ---- ./base/posix/unix_domain_socket_linux_unittest.cc.orig 2014-08-20 21:02:41.000000000 +0200 -+++ ./base/posix/unix_domain_socket_linux_unittest.cc 2014-08-22 15:06:24.000000000 +0200 +--- base/posix/unix_domain_socket_linux_unittest.cc.orig 2014-10-02 17:18:52 UTC ++++ base/posix/unix_domain_socket_linux_unittest.cc @@ -2,8 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "build/build_config.h" + #include #include +#if defined(OS_BSD) +#include +#endif #include #include "base/bind.h" Index: branches/2014Q4/www/chromium/files/patch-base__process__internal_linux.h =================================================================== --- branches/2014Q4/www/chromium/files/patch-base__process__internal_linux.h (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-base__process__internal_linux.h (revision 370437) @@ -1,11 +1,11 @@ ---- ./base/process/internal_linux.h.orig 2014-08-20 21:02:41.000000000 +0200 -+++ ./base/process/internal_linux.h 2014-08-22 15:06:24.000000000 +0200 +--- base/process/internal_linux.h.orig 2014-10-02 17:18:52 UTC ++++ base/process/internal_linux.h @@ -12,6 +12,8 @@ #include "base/files/file_path.h" +#include /* pid_t */ + namespace base { class Time; Index: branches/2014Q4/www/chromium/files/patch-base__process__launch.cc =================================================================== --- branches/2014Q4/www/chromium/files/patch-base__process__launch.cc (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-base__process__launch.cc (revision 370437) @@ -1,15 +1,15 @@ ---- ./base/process/launch.cc.orig 2014-08-20 21:02:41.000000000 +0200 -+++ ./base/process/launch.cc 2014-08-22 15:06:24.000000000 +0200 +--- base/process/launch.cc.orig 2014-10-02 17:18:52 UTC ++++ base/process/launch.cc @@ -24,10 +24,10 @@ fds_to_remap(NULL), maximize_rlimits(NULL), new_process_group(false) -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_FREEBSD) , clone_flags(0) , allow_new_privs(false) -#endif // OS_LINUX +#endif // OS_LINUX || OS_FREEBSD #if defined(OS_CHROMEOS) , ctrl_terminal_fd(-1) #endif // OS_CHROMEOS Index: branches/2014Q4/www/chromium/files/patch-base__process__launch.h =================================================================== --- branches/2014Q4/www/chromium/files/patch-base__process__launch.h (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-base__process__launch.h (revision 370437) @@ -1,19 +1,19 @@ ---- ./base/process/launch.h.orig 2014-08-20 21:02:41.000000000 +0200 -+++ ./base/process/launch.h 2014-08-22 15:06:24.000000000 +0200 +--- base/process/launch.h.orig 2014-10-02 17:18:52 UTC ++++ base/process/launch.h @@ -113,14 +113,14 @@ // will be the same as its pid. bool new_process_group; -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_FREEBSD) // If non-zero, start the process using clone(), using flags as provided. int clone_flags; // By default, child processes will have the PR_SET_NO_NEW_PRIVS bit set. If // true, then this bit will not be set in the new child process. bool allow_new_privs; -#endif // defined(OS_LINUX) +#endif // defined(OS_LINUX) || defined(OS_FREEBSD) #if defined(OS_CHROMEOS) // If non-negative, the specified file descriptor will be set as the launched Index: branches/2014Q4/www/chromium/files/patch-base__process__memory_unittest.cc =================================================================== --- branches/2014Q4/www/chromium/files/patch-base__process__memory_unittest.cc (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-base__process__memory_unittest.cc (revision 370437) @@ -1,20 +1,20 @@ ---- ./base/process/memory_unittest.cc.orig 2014-08-20 21:02:41.000000000 +0200 -+++ ./base/process/memory_unittest.cc 2014-08-22 15:06:24.000000000 +0200 -@@ -151,9 +151,9 @@ +--- base/process/memory_unittest.cc.orig 2014-10-02 17:18:52 UTC ++++ base/process/memory_unittest.cc +@@ -160,9 +160,9 @@ // Android doesn't implement set_new_handler, so we can't use the // OutOfMemoryTest cases. -// OpenBSD does not support these tests either. +// OpenBSD and FreeBSD do not support these tests either. // TODO(vandebo) make this work on Windows too. -#if !defined(OS_ANDROID) && !defined(OS_OPENBSD) && \ +#if !defined(OS_ANDROID) && !defined(OS_BSD) && \ !defined(OS_WIN) #if defined(USE_TCMALLOC) -@@ -425,4 +425,4 @@ +@@ -448,4 +448,4 @@ EXPECT_TRUE(value_ == NULL); } #endif // !defined(MEMORY_TOOL_REPLACES_ALLOCATOR) -#endif // !defined(OS_ANDROID) && !defined(OS_OPENBSD) && !defined(OS_WIN) +#endif // !defined(OS_ANDROID) && !defined(OS_BSD) && !defined(OS_WIN) Index: branches/2014Q4/www/chromium/files/patch-base__process__process_iterator_freebsd.cc =================================================================== --- branches/2014Q4/www/chromium/files/patch-base__process__process_iterator_freebsd.cc (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-base__process__process_iterator_freebsd.cc (revision 370437) @@ -1,13 +1,13 @@ ---- ./base/process/process_iterator_freebsd.cc.orig 2014-08-20 21:02:41.000000000 +0200 -+++ ./base/process/process_iterator_freebsd.cc 2014-08-22 15:06:24.000000000 +0200 +--- base/process/process_iterator_freebsd.cc.orig 2014-10-02 17:18:52 UTC ++++ base/process/process_iterator_freebsd.cc @@ -8,6 +8,10 @@ #include #include +/* getuid() */ +#include +#include + #include "base/logging.h" #include "base/strings/string_util.h" Index: branches/2014Q4/www/chromium/files/patch-base__process__process_metrics.h =================================================================== --- branches/2014Q4/www/chromium/files/patch-base__process__process_metrics.h (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-base__process__process_metrics.h (revision 370437) @@ -1,34 +1,34 @@ ---- ./base/process/process_metrics.h.orig 2014-08-20 21:02:41.000000000 +0200 -+++ ./base/process/process_metrics.h 2014-08-22 15:06:24.000000000 +0200 +--- base/process/process_metrics.h.orig 2014-10-02 17:39:45 UTC ++++ base/process/process_metrics.h @@ -17,6 +17,13 @@ #include "base/time/time.h" #include "base/values.h" +#if defined(OS_BSD) +#include +#include +#include +#include +#endif + #if defined(OS_MACOSX) #include #endif -@@ -246,13 +253,17 @@ +@@ -240,13 +247,17 @@ // 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: branches/2014Q4/www/chromium/files/patch-base__process__process_metrics_freebsd.cc =================================================================== --- branches/2014Q4/www/chromium/files/patch-base__process__process_metrics_freebsd.cc (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-base__process__process_metrics_freebsd.cc (revision 370437) @@ -1,36 +1,36 @@ ---- ./base/process/process_metrics_freebsd.cc.orig 2014-08-20 21:02:41.000000000 +0200 -+++ ./base/process/process_metrics_freebsd.cc 2014-08-22 15:06:24.000000000 +0200 +--- base/process/process_metrics_freebsd.cc.orig 2014-10-02 17:18:52 UTC ++++ base/process/process_metrics_freebsd.cc @@ -10,6 +10,9 @@ #include "base/sys_info.h" +#include /* getpagesize() */ +#include /* O_RDONLY */ + namespace base { ProcessMetrics::ProcessMetrics(ProcessHandle process) @@ -119,4 +122,23 @@ return mem_total - (mem_free*pagesize) - (mem_inactive*pagesize); } +int GetNumberOfThreads(ProcessHandle process) { + // Taken from FreeBSD top (usr.bin/top/machine.c) + + kvm_t* kd = kvm_open(NULL, "/dev/null", NULL, O_RDONLY, "kvm_open"); + if (kd == NULL) + return 0; + + struct kinfo_proc* pbase; + int nproc; + pbase = kvm_getprocs(kd, KERN_PROC_PID, process, &nproc); + if (pbase == NULL) + return 0; + + if (kvm_close(kd) == -1) + return 0; + + return nproc; +} + } // namespace base Index: branches/2014Q4/www/chromium/files/patch-base__security_unittest.cc =================================================================== --- branches/2014Q4/www/chromium/files/patch-base__security_unittest.cc (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-base__security_unittest.cc (revision 370437) @@ -1,11 +1,11 @@ ---- ./base/security_unittest.cc.orig 2014-08-20 21:02:42.000000000 +0200 -+++ ./base/security_unittest.cc 2014-08-22 15:06:24.000000000 +0200 +--- base/security_unittest.cc.orig 2014-10-02 17:18:52 UTC ++++ base/security_unittest.cc @@ -160,7 +160,7 @@ // FAILS_ is too clunky. void OverflowTestsSoftExpectTrue(bool overflow_detected) { if (!overflow_detected) { -#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_MACOSX) +#if defined(OS_POSIX) && !defined(OS_NACL) // Sadly, on Linux, Android, and OSX we don't have a good story yet. Don't // fail the test, but report. printf("Platform has overflow: %s\n", Index: branches/2014Q4/www/chromium/files/patch-base__strings__safe_sprintf.cc =================================================================== --- branches/2014Q4/www/chromium/files/patch-base__strings__safe_sprintf.cc (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-base__strings__safe_sprintf.cc (revision 370437) @@ -1,19 +1,26 @@ ---- ./base/strings/safe_sprintf.cc.orig 2014-08-20 21:02:42.000000000 +0200 -+++ ./base/strings/safe_sprintf.cc 2014-08-22 15:06:24.000000000 +0200 -@@ -107,11 +107,11 @@ +--- base/strings/safe_sprintf.cc.orig 2014-10-02 17:18:52 UTC ++++ base/strings/safe_sprintf.cc +@@ -107,15 +107,16 @@ : buffer_(buffer), size_(size - 1), // Account for trailing NUL byte count_(0) { -// The following assertion does not build on Mac and Android. This is because -// static_assert only works with compile-time constants, but mac uses -// libstdc++4.2 and android uses stlport, which both don't mark --// numeric_limits::max() as constexp. --#if __cplusplus >= 201103 && !defined(OS_ANDROID) && !defined(OS_MACOSX) && !defined(OS_IOS) +-// numeric_limits::max() as constexp. Likewise, MSVS2013's standard library +-// also doesn't mark max() as constexpr yet. cl.exe supports static_cast but +-// doesn't really implement constexpr yet so it doesn't complain, but clang +// The following assertion does not build on Mac and Android and older FreeBSD. +// This is because static_assert only works with compile-time constants, but +// mac and FreeBSD < 10 use libstdc++4.2 and android uses stlport, which both -+// don't mark numeric_limits::max() as constexp. -+#if __cplusplus >= 201103 && !defined(OS_ANDROID) && !defined(OS_MACOSX) && !defined(OS_IOS) && !(defined(OS_FREEBSD) && __FreeBSD_version > 1000054) ++// don't mark numeric_limits::max() as constexp. Likewise, MSVS2013's standard ++// library also doesn't mark max() as constexpr yet. cl.exe supports static_cast ++// but doesn't really implement constexpr yet so it doesn't complain, but clang + // does. + #if __cplusplus >= 201103 && !defined(OS_ANDROID) && !defined(OS_MACOSX) && \ +- !defined(OS_IOS) && !(defined(__clang__) && defined(OS_WIN)) ++ !defined(OS_IOS) && !(defined(OS_FREEBSD) && __FreeBSD_version > 1000054) \ ++ && !(defined(__clang__) && defined(OS_WIN)) COMPILE_ASSERT(kSSizeMaxConst == \ static_cast(std::numeric_limits::max()), kSSizeMax_is_the_max_value_of_an_ssize_t); Index: branches/2014Q4/www/chromium/files/patch-base__sys_info_freebsd.cc =================================================================== --- branches/2014Q4/www/chromium/files/patch-base__sys_info_freebsd.cc (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-base__sys_info_freebsd.cc (revision 370437) @@ -1,56 +1,56 @@ ---- ./base/sys_info_freebsd.cc.orig 2014-08-20 21:02:42.000000000 +0200 -+++ ./base/sys_info_freebsd.cc 2014-08-22 15:06:24.000000000 +0200 +--- base/sys_info_freebsd.cc.orig 2014-10-02 17:18:52 UTC ++++ base/sys_info_freebsd.cc @@ -4,6 +4,7 @@ #include "base/sys_info.h" +#include #include #include "base/logging.h" @@ -23,6 +24,19 @@ } // static +int64 SysInfo::AmountOfAvailablePhysicalMemory() { + int available_pages, page_size; + size_t size = sizeof(available_pages); + sysctlbyname("vm.stats.vm.v_free_count", &available_pages, &size, NULL, 0); + sysctlbyname("vm.stats.vm.v_page_size", &page_size, &size, NULL, 0); + if (available_pages == -1 || page_size == -1) { + NOTREACHED(); + return 0; + } + return static_cast(available_pages) * page_size; +} + +// static size_t SysInfo::MaxSharedMemorySize() { size_t limit; size_t size = sizeof(limit); @@ -33,4 +47,25 @@ return limit; } +// static +std::string SysInfo::CPUModelName() { + int mib[] = { CTL_HW, HW_MODEL }; + char name[256]; + size_t size = arraysize(name); + if (sysctl(mib, arraysize(mib), &name, &size, NULL, 0) == 0) + return name; + return std::string(); +} + +int SysInfo::NumberOfProcessors() { + int mib[] = { CTL_HW, HW_NCPU }; + int ncpu; + size_t size = sizeof(ncpu); + if (sysctl(mib, arraysize(mib), &ncpu, &size, NULL, 0) == -1) { + NOTREACHED(); + return 1; + } + return ncpu; +} + } // namespace base Index: branches/2014Q4/www/chromium/files/patch-base__sys_info_posix.cc =================================================================== --- branches/2014Q4/www/chromium/files/patch-base__sys_info_posix.cc (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-base__sys_info_posix.cc (revision 370437) @@ -1,11 +1,11 @@ ---- ./base/sys_info_posix.cc.orig 2014-08-20 21:02:42.000000000 +0200 -+++ ./base/sys_info_posix.cc 2014-08-22 15:06:24.000000000 +0200 +--- base/sys_info_posix.cc.orig 2014-10-02 17:39:45 UTC ++++ base/sys_info_posix.cc @@ -64,7 +64,7 @@ namespace base { -#if !defined(OS_OPENBSD) +#if !defined(OS_OPENBSD) && !defined(OS_FREEBSD) int SysInfo::NumberOfProcessors() { return g_lazy_number_of_processors.Get().value(); } Index: branches/2014Q4/www/chromium/files/patch-base__test__expectations__expectation.cc =================================================================== --- branches/2014Q4/www/chromium/files/patch-base__test__expectations__expectation.cc (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-base__test__expectations__expectation.cc (revision 370437) @@ -1,19 +1,19 @@ ---- ./base/test/expectations/expectation.cc.orig 2014-08-20 21:02:41.000000000 +0200 -+++ ./base/test/expectations/expectation.cc 2014-08-22 15:06:24.000000000 +0200 +--- base/test/expectations/expectation.cc.orig 2014-10-02 17:18:52 UTC ++++ base/test/expectations/expectation.cc @@ -60,6 +60,7 @@ variant != "64") { return false; } + } else if (name == "FreeBSD") { } else if (name == "ChromeOS") { // TODO(rsesek): Figure out what ChromeOS needs. } else if (name == "iOS") { @@ -125,6 +126,8 @@ platform.variant = "32"; else if (arch == "x86_64") platform.variant = "64"; +#elif defined(OS_FREEBSD) + platform.name = "FreeBSD"; #else NOTREACHED(); #endif Index: branches/2014Q4/www/chromium/files/patch-base__test__launcher__test_launcher.cc =================================================================== --- branches/2014Q4/www/chromium/files/patch-base__test__launcher__test_launcher.cc (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-base__test__launcher__test_launcher.cc (revision 370437) @@ -1,13 +1,13 @@ ---- ./base/test/launcher/test_launcher.cc.orig 2014-08-20 21:02:41.000000000 +0200 -+++ ./base/test/launcher/test_launcher.cc 2014-08-22 15:06:24.000000000 +0200 -@@ -41,6 +41,10 @@ - #include "base/mac/scoped_nsautorelease_pool.h" +--- base/test/launcher/test_launcher.cc.orig 2014-10-02 17:39:45 UTC ++++ base/test/launcher/test_launcher.cc +@@ -45,6 +45,10 @@ + #include "base/win/windows_version.h" #endif +#if defined(OS_FREEBSD) +#include +#endif + namespace base { // Launches a child process using |command_line|. If the child process is still Index: branches/2014Q4/www/chromium/files/patch-base__threading__platform_thread_linux.cc =================================================================== --- branches/2014Q4/www/chromium/files/patch-base__threading__platform_thread_linux.cc (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-base__threading__platform_thread_linux.cc (revision 370437) @@ -1,21 +1,21 @@ ---- ./base/threading/platform_thread_linux.cc.orig 2014-08-20 21:02:41.000000000 +0200 -+++ ./base/threading/platform_thread_linux.cc 2014-08-22 15:06:24.000000000 +0200 +--- base/threading/platform_thread_linux.cc.orig 2014-10-02 17:39:45 UTC ++++ base/threading/platform_thread_linux.cc @@ -16,7 +16,9 @@ #include "base/tracked_objects.h" #if !defined(OS_NACL) +#if !defined(OS_BSD) #include +#endif #include #include #include @@ -50,7 +52,7 @@ ThreadIdNameManager::GetInstance()->SetName(CurrentId(), name); tracked_objects::ThreadData::InitializeThreadContext(name); -#if !defined(OS_NACL) +#if !defined(OS_NACL) && !defined(OS_BSD) // On linux we can get the thread names to show up in the debugger by setting // the process name for the LWP. We don't want to do this for the main // thread because that would rename the process, causing tools like killall Index: branches/2014Q4/www/chromium/files/patch-breakpad__breakpad.gyp =================================================================== --- branches/2014Q4/www/chromium/files/patch-breakpad__breakpad.gyp (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-breakpad__breakpad.gyp (revision 370437) @@ -1,11 +1,11 @@ ---- ./breakpad/breakpad.gyp.orig 2014-08-20 21:02:30.000000000 +0200 -+++ ./breakpad/breakpad.gyp 2014-08-22 15:06:24.000000000 +0200 -@@ -340,7 +340,7 @@ +--- breakpad/breakpad.gyp.orig 2014-10-02 17:39:45 UTC ++++ breakpad/breakpad.gyp +@@ -349,7 +349,7 @@ }, ], }], - [ 'OS=="linux" or OS=="android" or OS=="freebsd"', { + [ 'OS=="linux" or OS=="android" or os_bsd==1', { 'conditions': [ ['OS=="android"', { 'defines': [ Index: branches/2014Q4/www/chromium/files/patch-build__common.gypi =================================================================== --- branches/2014Q4/www/chromium/files/patch-build__common.gypi (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-build__common.gypi (revision 370437) @@ -1,54 +1,63 @@ ---- ./build/common.gypi.orig 2014-08-20 21:02:29.000000000 +0200 -+++ ./build/common.gypi 2014-08-22 15:06:24.000000000 +0200 -@@ -87,7 +87,7 @@ +--- build/common.gypi.orig 2014-10-02 17:39:45 UTC ++++ build/common.gypi +@@ -91,7 +91,7 @@ 'conditions': [ # ChromeOS and Windows use Aura and Ash. - ['chromeos==1 or OS=="win" or OS=="linux"', { + ['chromeos==1 or OS=="win" or OS=="linux" or OS=="freebsd"', { 'use_ash%': 1, 'use_aura%': 1, }], -@@ -645,7 +645,7 @@ +@@ -676,7 +676,7 @@ }], # DBus usage. - ['OS=="linux" and embedded==0', { + ['(OS=="linux" or OS=="freebsd") and embedded==0', { 'use_dbus%': 1, }, { 'use_dbus%': 0, -@@ -926,7 +926,7 @@ - # except when building Android WebView. +@@ -931,7 +931,7 @@ + }, { + 'use_openmax_dl_fft%': 0, + }], +- ['OS=="win" or OS=="linux"', { ++ ['OS=="win" or OS=="linux" or OS=="freebsd"', { + 'enable_mdns%' : 1, + }], + +@@ -954,7 +954,7 @@ + # except when building Android WebView or Chromecast. # TODO(jshin): Handle 'use_system_icu' on Linux (Chromium). # Set the data reduction proxy origin for Android Webview. -- ['android_webview_build==0', { -+ ['android_webview_build==0 and OS!="freebsd" and OS!="openbsd"', { +- ['android_webview_build==0 and android_webview_telemetry_build==0 and chromecast==0', { ++ ['android_webview_build==0 and OS!="freebsd" and OS!="openbsd" and android_webview_telemetry_build==0 and chromecast==0', { 'icu_use_data_file_flag%' : 1, 'spdy_proxy_auth_origin%': '', 'data_reduction_proxy_probe_url%': '', -@@ -1153,6 +1153,10 @@ +@@ -1193,6 +1193,10 @@ # able to turn it off for various reasons. 'linux_disable_pie%': 0, + # XXX(rene) More options, keep them? + 'os_ver%': 0, -+ 'use_system_libjpeg%': 0, ++ 'use_system_libjpeg%': 0, + # The release channel that this build targets. This is used to restrict # channel-specific build options, like which installer packages to create. # The default is 'all', which does no channel-specific filtering. -@@ -4150,6 +4154,13 @@ +@@ -4280,6 +4284,13 @@ 'ldflags': [ '-Wl,--no-keep-memory', ], + 'ldflags!': [ + '-ldl', + '-pie', + ], + 'libraries!': [ + '-ldl', + ], }, }], # Android-specific options; note that most are set above with Linux. Index: branches/2014Q4/www/chromium/files/patch-build__filename_rules.gypi =================================================================== --- branches/2014Q4/www/chromium/files/patch-build__filename_rules.gypi (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-build__filename_rules.gypi (revision 370437) @@ -1,11 +1,11 @@ ---- ./build/filename_rules.gypi.orig 2014-08-20 21:02:29.000000000 +0200 -+++ ./build/filename_rules.gypi 2014-08-22 15:06:24.000000000 +0200 +--- build/filename_rules.gypi.orig 2014-10-02 17:18:52 UTC ++++ build/filename_rules.gypi @@ -85,7 +85,7 @@ ['<(use_aura)==0 or OS!="win" or >(nacl_untrusted_build)==1', { 'sources/': [ ['exclude', '_aurawin\\.(h|cc)$'] ] }], - ['<(use_aura)==0 or OS!="linux" or >(nacl_untrusted_build)==1', { + ['<(use_aura)==0 or (OS!="linux" and OS!="openbsd" and OS!="freebsd") or >(nacl_untrusted_build)==1', { 'sources/': [ ['exclude', '_auralinux\\.(h|cc)$'] ] }], ['<(use_ash)==0 or >(nacl_untrusted_build)==1', { Index: branches/2014Q4/www/chromium/files/patch-build__linux__system.gyp =================================================================== --- branches/2014Q4/www/chromium/files/patch-build__linux__system.gyp (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-build__linux__system.gyp (revision 370437) @@ -1,16 +1,16 @@ ---- ./build/linux/system.gyp.orig 2014-08-20 21:02:29.000000000 +0200 -+++ ./build/linux/system.gyp 2014-08-22 15:06:24.000000000 +0200 -@@ -881,6 +881,13 @@ +--- build/linux/system.gyp.orig 2014-10-02 17:39:45 UTC ++++ build/linux/system.gyp +@@ -890,6 +890,13 @@ 'include_dirs': [ '../..', ], + 'conditions' : [ + ['OS=="freebsd"', { + 'include_dirs': [ + '<(prefix_dir)/include', + ], + }], + ], 'hard_dependency': 1, 'actions': [ { Index: branches/2014Q4/www/chromium/files/patch-build__linux__unbundle__libwebp.gyp =================================================================== --- branches/2014Q4/www/chromium/files/patch-build__linux__unbundle__libwebp.gyp (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-build__linux__unbundle__libwebp.gyp (revision 370437) @@ -1,17 +1,17 @@ ---- ./build/linux/unbundle/libwebp.gyp.orig 2014-08-20 21:02:29.000000000 +0200 -+++ ./build/linux/unbundle/libwebp.gyp 2014-08-22 15:06:24.000000000 +0200 +--- build/linux/unbundle/libwebp.gyp.orig 2014-10-02 17:18:52 UTC ++++ build/linux/unbundle/libwebp.gyp @@ -14,13 +14,7 @@ }, 'link_settings': { 'libraries': [ - # Check for presence of webpdemux library, use it if present. - 'bounds().width(), scaled_scroll_bounds.height() - scroll_clip_layer_->bounds().height()); // We need the final scroll offset to be in CSS coords. - max_offset.Scale(1 / scale_factor); - max_offset.SetToMax(gfx::Vector2dF()); - return gfx::ToFlooredVector2d(max_offset); + _max_offset.Scale(1 / scale_factor); + _max_offset.SetToMax(gfx::Vector2dF()); + return gfx::ToFlooredVector2d(_max_offset); } gfx::Vector2dF LayerImpl::ClampScrollToMaxScrollOffset() { - gfx::Vector2dF max_offset = MaxScrollOffset(); + gfx::Vector2dF _max_offset = MaxScrollOffset(); gfx::Vector2dF old_offset = TotalScrollOffset(); gfx::Vector2dF clamped_offset = old_offset; - clamped_offset.SetToMin(max_offset); + clamped_offset.SetToMin(_max_offset); clamped_offset.SetToMax(gfx::Vector2d()); gfx::Vector2dF delta = clamped_offset - old_offset; if (!delta.IsZero()) Index: branches/2014Q4/www/chromium/files/patch-chrome__app__chrome_main_delegate.cc =================================================================== --- branches/2014Q4/www/chromium/files/patch-chrome__app__chrome_main_delegate.cc (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-chrome__app__chrome_main_delegate.cc (revision 370437) @@ -1,83 +1,83 @@ ---- ./chrome/app/chrome_main_delegate.cc.orig 2014-08-20 21:01:26.000000000 +0200 -+++ ./chrome/app/chrome_main_delegate.cc 2014-08-22 15:06:24.000000000 +0200 -@@ -96,7 +96,7 @@ +--- chrome/app/chrome_main_delegate.cc.orig 2014-10-02 17:39:45 UTC ++++ chrome/app/chrome_main_delegate.cc +@@ -94,7 +94,7 @@ #include "ui/base/x/x11_util.h" #endif -#if defined(OS_POSIX) && !defined(OS_MACOSX) +#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD) #include "components/breakpad/app/breakpad_linux.h" #endif -@@ -122,7 +122,7 @@ +@@ -124,7 +124,7 @@ g_chrome_content_plugin_client = LAZY_INSTANCE_INITIALIZER; #endif -#if defined(OS_POSIX) +#if defined(OS_POSIX) && !defined(OS_BSD) base::LazyInstance::Leaky g_chrome_breakpad_client = LAZY_INSTANCE_INITIALIZER; #endif -@@ -226,7 +226,7 @@ - // Needed for scrollbar related images. - process_type == switches::kWorkerProcess || +@@ -225,7 +225,7 @@ + // Mac needs them for the plugin process name. + process_type == switches::kPluginProcess || #endif -#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 -@@ -440,7 +440,7 @@ +@@ -441,7 +441,7 @@ std::string format_str = command_line.GetSwitchValueASCII(switches::kDiagnosticsFormat); if (format_str == "machine") { - format = diagnostics::DiagnosticsWriter::MACHINE; + format = diagnostics::DiagnosticsWriter::THEMACHINE; } else if (format_str == "log") { format = diagnostics::DiagnosticsWriter::LOG; } else { -@@ -491,7 +491,7 @@ +@@ -492,7 +492,7 @@ std::string format_str = command_line.GetSwitchValueASCII(switches::kDiagnosticsFormat); if (format_str == "machine") { - format = diagnostics::DiagnosticsWriter::MACHINE; + format = diagnostics::DiagnosticsWriter::THEMACHINE; } else if (format_str == "human") { format = diagnostics::DiagnosticsWriter::HUMAN; } else { -@@ -621,7 +621,7 @@ +@@ -632,7 +632,7 @@ std::string process_type = command_line.GetSwitchValueASCII(switches::kProcessType); -#if defined(OS_POSIX) +#if defined(OS_POSIX) && !defined(OS_BSD) breakpad::SetBreakpadClient(g_chrome_breakpad_client.Pointer()); #endif -@@ -743,7 +743,7 @@ +@@ -759,7 +759,7 @@ #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) -@@ -755,7 +755,7 @@ +@@ -771,7 +771,7 @@ breakpad::InitCrashReporter(process_type); #endif // defined(OS_ANDROID) } -#endif // defined(OS_POSIX) && !defined(OS_MACOSX) +#endif // defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD) // After all the platform Breakpads have been initialized, store the command // line for crash reporting. -@@ -840,7 +840,7 @@ - return process_type == switches::kNaClLoaderProcess || - process_type == switches::kRelauncherProcess; +@@ -863,7 +863,7 @@ + #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(DISABLE_NACL) Index: branches/2014Q4/www/chromium/files/patch-chrome__app__chrome_main_delegate.h =================================================================== --- branches/2014Q4/www/chromium/files/patch-chrome__app__chrome_main_delegate.h (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-chrome__app__chrome_main_delegate.h (revision 370437) @@ -1,11 +1,11 @@ ---- ./chrome/app/chrome_main_delegate.h.orig 2014-08-20 21:01:26.000000000 +0200 -+++ ./chrome/app/chrome_main_delegate.h 2014-08-22 15:06:24.000000000 +0200 +--- chrome/app/chrome_main_delegate.h.orig 2014-10-02 17:18:53 UTC ++++ chrome/app/chrome_main_delegate.h @@ -38,7 +38,7 @@ virtual bool ShouldSendMachPort(const std::string& process_type) OVERRIDE; virtual bool DelaySandboxInitialization( const std::string& process_type) OVERRIDE; -#elif defined(OS_POSIX) && !defined(OS_ANDROID) +#elif defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_BSD) virtual void ZygoteStarting( ScopedVector* delegates) OVERRIDE; virtual void ZygoteForked() OVERRIDE; Index: branches/2014Q4/www/chromium/files/patch-chrome__app__chromium_strings.grd =================================================================== --- branches/2014Q4/www/chromium/files/patch-chrome__app__chromium_strings.grd (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-chrome__app__chromium_strings.grd (revision 370437) @@ -1,11 +1,11 @@ ---- ./chrome/app/chromium_strings.grd.orig 2014-08-20 21:01:26.000000000 +0200 -+++ ./chrome/app/chromium_strings.grd 2014-08-22 15:06:24.000000000 +0200 -@@ -1102,7 +1102,7 @@ +--- chrome/app/chromium_strings.grd.orig 2014-10-02 17:39:45 UTC ++++ chrome/app/chromium_strings.grd +@@ -1115,7 +1115,7 @@ - + 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: branches/2014Q4/www/chromium/files/patch-chrome__app__resources__locale_settings.grd =================================================================== --- branches/2014Q4/www/chromium/files/patch-chrome__app__resources__locale_settings.grd (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-chrome__app__resources__locale_settings.grd (revision 370437) @@ -1,11 +1,11 @@ ---- ./chrome/app/resources/locale_settings.grd.orig 2014-08-20 21:01:26.000000000 +0200 -+++ ./chrome/app/resources/locale_settings.grd 2014-08-23 15:49:37.000000000 +0200 +--- chrome/app/resources/locale_settings.grd.orig 2014-10-02 17:39:45 UTC ++++ chrome/app/resources/locale_settings.grd @@ -264,7 +264,7 @@ 55 - + 300 Index: branches/2014Q4/www/chromium/files/patch-chrome__browser__about_flags.cc =================================================================== --- branches/2014Q4/www/chromium/files/patch-chrome__browser__about_flags.cc (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-chrome__browser__about_flags.cc (revision 370437) @@ -1,11 +1,11 @@ ---- ./chrome/browser/about_flags.cc.orig 2014-08-20 21:02:13.000000000 +0200 -+++ ./chrome/browser/about_flags.cc 2014-08-22 15:06:24.000000000 +0200 -@@ -2263,7 +2263,7 @@ +--- chrome/browser/about_flags.cc.orig 2014-10-02 17:39:45 UTC ++++ chrome/browser/about_flags.cc +@@ -2278,7 +2278,7 @@ return kOsWin; #elif defined(OS_CHROMEOS) // Needs to be before the OS_LINUX check. return kOsCrOS; -#elif defined(OS_LINUX) || defined(OS_OPENBSD) +#elif defined(OS_LINUX) || defined(OS_BSD) return kOsLinux; #elif defined(OS_ANDROID) return kOsAndroid; Index: branches/2014Q4/www/chromium/files/patch-chrome__browser__chrome_browser_main.cc =================================================================== --- branches/2014Q4/www/chromium/files/patch-chrome__browser__chrome_browser_main.cc (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-chrome__browser__chrome_browser_main.cc (revision 370437) @@ -1,11 +1,11 @@ ---- ./chrome/browser/chrome_browser_main.cc.orig 2014-08-20 21:02:13.000000000 +0200 -+++ ./chrome/browser/chrome_browser_main.cc 2014-08-22 15:06:24.000000000 +0200 -@@ -925,7 +925,7 @@ +--- chrome/browser/chrome_browser_main.cc.orig 2014-10-02 17:39:45 UTC ++++ chrome/browser/chrome_browser_main.cc +@@ -947,7 +947,7 @@ } #endif -#if defined(OS_LINUX) || defined(OS_OPENBSD) || defined(OS_MACOSX) +#if defined(OS_LINUX) || defined(OS_BSD) || defined(OS_MACOSX) // Set the product channel for crash reports. base::debug::SetCrashKeyValue(crash_keys::kChannel, chrome::VersionInfo::GetVersionStringModifier()); Index: branches/2014Q4/www/chromium/files/patch-chrome__browser__chrome_browser_main_posix.cc =================================================================== --- branches/2014Q4/www/chromium/files/patch-chrome__browser__chrome_browser_main_posix.cc (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-chrome__browser__chrome_browser_main_posix.cc (revision 370437) @@ -1,22 +1,22 @@ ---- ./chrome/browser/chrome_browser_main_posix.cc.orig 2014-08-20 21:02:13.000000000 +0200 -+++ ./chrome/browser/chrome_browser_main_posix.cc 2014-08-22 15:06:24.000000000 +0200 +--- chrome/browser/chrome_browser_main_posix.cc.orig 2014-10-02 17:18:53 UTC ++++ chrome/browser/chrome_browser_main_posix.cc @@ -270,6 +270,11 @@ g_pipe_pid = getpid(); g_shutdown_pipe_read_fd = pipefd[0]; g_shutdown_pipe_write_fd = pipefd[1]; +#if defined(OS_FREEBSD) + // PTHREAD_STACK_MIN causes chromium to crash under FreeBSD, + // we request the default pthread stack size by specifying 0 here. + const size_t kShutdownDetectorThreadStackSize = 0; +#else #if !defined(ADDRESS_SANITIZER) && !defined(KEEP_SHADOW_STACKS) const size_t kShutdownDetectorThreadStackSize = PTHREAD_STACK_MIN * 2; #else @@ -278,6 +283,7 @@ // size to avoid hitting the guard page. const size_t kShutdownDetectorThreadStackSize = PTHREAD_STACK_MIN * 4; #endif +#endif // OS_FREEBSD // TODO(viettrungluu,willchan): crbug.com/29675 - This currently leaks, so // if you change this, you'll probably need to change the suppression. if (!base::PlatformThread::CreateNonJoinable( Index: branches/2014Q4/www/chromium/files/patch-chrome__browser__chrome_content_browser_client.cc =================================================================== --- branches/2014Q4/www/chromium/files/patch-chrome__browser__chrome_content_browser_client.cc (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-chrome__browser__chrome_content_browser_client.cc (revision 370437) @@ -1,47 +1,56 @@ ---- ./chrome/browser/chrome_content_browser_client.cc.orig 2014-08-20 21:02:13.000000000 +0200 -+++ ./chrome/browser/chrome_content_browser_client.cc 2014-08-22 15:06:24.000000000 +0200 -@@ -509,7 +509,7 @@ - } +--- chrome/browser/chrome_content_browser_client.cc.orig 2014-10-02 17:39:45 UTC ++++ chrome/browser/chrome_content_browser_client.cc +@@ -430,7 +430,7 @@ + return false; } --#if defined(OS_POSIX) && !defined(OS_MACOSX) -+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD) +-#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; -@@ -566,7 +566,7 @@ +@@ -487,7 +487,7 @@ return -1; } --#endif // defined(OS_POSIX) && !defined(OS_MACOSX) -+#endif // defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD) - #endif // !defined(OS_ANDROID) +-#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_CHROMEOS) -@@ -1533,7 +1533,7 @@ + GURL GetEffectiveURLForSignin(const GURL& url) { +@@ -1196,7 +1196,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLineSwitches( CommandLine* command_line, int child_process_id) { -#if defined(OS_POSIX) +#if defined(OS_POSIX) && !defined(OS_BSD) if (breakpad::IsCrashReporterEnabled()) { - std::string enable_crash_reporter; - GoogleUpdateSettings::GetMetricsId(&enable_crash_reporter); -@@ -2683,7 +2683,7 @@ - #endif + scoped_ptr client_info = + GoogleUpdateSettings::LoadMetricsClientInfo(); +@@ -1204,7 +1204,7 @@ + client_info ? client_info->client_id + : std::string()); + } +-#endif // defined(OS_POSIX) ++#endif // defined(OS_POSIX) && !defined(OS_BSD) + + if (logging::DialogsAreSuppressed()) + command_line->AppendSwitch(switches::kNoErrorDialogs); +@@ -2447,7 +2447,7 @@ + } } -#if defined(OS_POSIX) && !defined(OS_MACOSX) +#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD) void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess( const CommandLine& command_line, int child_process_id, -@@ -2749,7 +2749,7 @@ +@@ -2513,7 +2513,7 @@ } #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) const wchar_t* ChromeContentBrowserClient::GetResourceDllName() { Index: branches/2014Q4/www/chromium/files/patch-chrome__browser__chrome_content_browser_client.h =================================================================== --- branches/2014Q4/www/chromium/files/patch-chrome__browser__chrome_content_browser_client.h (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-chrome__browser__chrome_content_browser_client.h (revision 370437) @@ -1,11 +1,11 @@ ---- ./chrome/browser/chrome_content_browser_client.h.orig 2014-08-20 21:02:13.000000000 +0200 -+++ ./chrome/browser/chrome_content_browser_client.h 2014-08-22 15:06:24.000000000 +0200 -@@ -288,7 +288,7 @@ +--- chrome/browser/chrome_content_browser_client.h.orig 2014-10-02 17:39:45 UTC ++++ chrome/browser/chrome_content_browser_client.h +@@ -287,7 +287,7 @@ virtual net::CookieStore* OverrideCookieStoreForRenderProcess( int render_process_id) OVERRIDE; -#if defined(OS_POSIX) && !defined(OS_MACOSX) +#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD) virtual void GetAdditionalMappedFilesForChildProcess( const base::CommandLine& command_line, int child_process_id, Index: branches/2014Q4/www/chromium/files/patch-chrome__browser__diagnostics__diagnostics_writer.cc =================================================================== --- branches/2014Q4/www/chromium/files/patch-chrome__browser__diagnostics__diagnostics_writer.cc (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-chrome__browser__diagnostics__diagnostics_writer.cc (revision 370437) @@ -1,11 +1,11 @@ ---- ./chrome/browser/diagnostics/diagnostics_writer.cc.orig 2014-08-20 21:02:00.000000000 +0200 -+++ ./chrome/browser/diagnostics/diagnostics_writer.cc 2014-08-22 15:06:24.000000000 +0200 -@@ -268,7 +268,7 @@ +--- chrome/browser/diagnostics/diagnostics_writer.cc.orig 2014-10-02 17:18:53 UTC ++++ chrome/browser/diagnostics/diagnostics_writer.cc +@@ -266,7 +266,7 @@ console_->SetColor(color); console_->Write(base::ASCIIToUTF16(result)); } - if (format_ == MACHINE) { + if (format_ == THEMACHINE) { return WriteInfoLine(base::StringPrintf( "%03d %s (%s)", outcome_code, id.c_str(), extra.c_str())); } else { Index: branches/2014Q4/www/chromium/files/patch-chrome__browser__diagnostics__diagnostics_writer.h =================================================================== --- branches/2014Q4/www/chromium/files/patch-chrome__browser__diagnostics__diagnostics_writer.h (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-chrome__browser__diagnostics__diagnostics_writer.h (revision 370437) @@ -1,11 +1,11 @@ ---- ./chrome/browser/diagnostics/diagnostics_writer.h.orig 2014-08-20 21:02:00.000000000 +0200 -+++ ./chrome/browser/diagnostics/diagnostics_writer.h 2014-08-22 15:06:24.000000000 +0200 +--- chrome/browser/diagnostics/diagnostics_writer.h.orig 2014-10-02 17:18:53 UTC ++++ chrome/browser/diagnostics/diagnostics_writer.h @@ -18,7 +18,7 @@ public: // The type of formatting done by this writer. enum FormatType { - MACHINE, + THEMACHINE, LOG, HUMAN }; Index: branches/2014Q4/www/chromium/files/patch-chrome__browser__extensions__api__image_writer_private__image_writer_private_api.cc =================================================================== --- branches/2014Q4/www/chromium/files/patch-chrome__browser__extensions__api__image_writer_private__image_writer_private_api.cc (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-chrome__browser__extensions__api__image_writer_private__image_writer_private_api.cc (revision 370437) @@ -1,15 +1,15 @@ ---- ./chrome/browser/extensions/api/image_writer_private/image_writer_private_api.cc.orig 2014-08-20 21:01:58.000000000 +0200 -+++ ./chrome/browser/extensions/api/image_writer_private/image_writer_private_api.cc 2014-08-22 15:06:24.000000000 +0200 +--- chrome/browser/extensions/api/image_writer_private/image_writer_private_api.cc.orig 2014-10-02 17:18:53 UTC ++++ chrome/browser/extensions/api/image_writer_private/image_writer_private_api.cc @@ -167,10 +167,12 @@ } bool ImageWriterPrivateListRemovableStorageDevicesFunction::RunAsync() { +#if !defined(OS_FREEBSD) RemovableStorageProvider::GetAllDevices( base::Bind( &ImageWriterPrivateListRemovableStorageDevicesFunction::OnDeviceListReady, this)); +#endif return true; } Index: branches/2014Q4/www/chromium/files/patch-chrome__browser__extensions__api__music_manager_private__device_id_linux.cc =================================================================== --- branches/2014Q4/www/chromium/files/patch-chrome__browser__extensions__api__music_manager_private__device_id_linux.cc (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-chrome__browser__extensions__api__music_manager_private__device_id_linux.cc (revision 370437) @@ -1,66 +1,66 @@ ---- ./chrome/browser/extensions/api/music_manager_private/device_id_linux.cc.orig 2014-08-20 21:01:57.000000000 +0200 -+++ ./chrome/browser/extensions/api/music_manager_private/device_id_linux.cc 2014-08-22 15:06:24.000000000 +0200 +--- chrome/browser/extensions/api/music_manager_private/device_id_linux.cc.orig 2014-10-02 17:39:45 UTC ++++ chrome/browser/extensions/api/music_manager_private/device_id_linux.cc @@ -4,6 +4,10 @@ #include "chrome/browser/extensions/api/music_manager_private/device_id.h" +#if defined(OS_FREEBSD) +#include +#include +#endif #include // Must be included before ifaddrs.h. #include #include @@ -102,11 +106,33 @@ const char* prefixes[], size_t prefixes_count) { const int MAC_LENGTH = 6; +#if defined(OS_FREEBSD) + struct ifaddrs *ifap, *ifinfo; +#else struct ifreq ifinfo; +#endif memset(&ifinfo, 0, sizeof(ifinfo)); - strncpy(ifinfo.ifr_name, ifaddr->ifa_name, sizeof(ifinfo.ifr_name) - 1); +#if defined(OS_FREEBSD) + int result = getifaddrs(&ifap); + if (result != 0) + return true; + result = 1; // no MAC found yet + for (ifinfo = ifap; ifinfo != NULL; ifinfo = ifinfo->ifa_next) { + struct sockaddr* sa = ifinfo->ifa_addr; + if (sa->sa_family == AF_LINK && + !strncmp(ifinfo->ifa_name, ifaddr->ifa_name, + sizeof(ifinfo->ifa_name) - 1)) { + result = 0; + break; + } + } + + char mac_address[6]; + strncpy(mac_address, (const char*)LLADDR((struct sockaddr_dl*)ifinfo->ifa_addr), sizeof(mac_address)); +#else + strncpy(ifinfo.ifr_name, ifaddr->ifa_name, sizeof(ifinfo.ifr_name) - 1); int sd = socket(AF_INET, SOCK_DGRAM, 0); int result = ioctl(sd, SIOCGIFHWADDR, &ifinfo); close(sd); @@ -116,11 +142,17 @@ const char* mac_address = static_cast(ifinfo.ifr_hwaddr.sa_data); +#endif if (!is_valid_mac_address_.Run(mac_address, MAC_LENGTH)) return true; +#if defined(OS_FREEBSD) + if (!IsValidPrefix(ifinfo->ifa_name, prefixes, prefixes_count)) + return true; +#else if (!IsValidPrefix(ifinfo.ifr_name, prefixes, prefixes_count)) return true; +#endif // Got one! found_mac_address_ = Index: branches/2014Q4/www/chromium/files/patch-chrome__browser__gpu__gl_string_manager.cc =================================================================== --- branches/2014Q4/www/chromium/files/patch-chrome__browser__gpu__gl_string_manager.cc (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-chrome__browser__gpu__gl_string_manager.cc (revision 370437) @@ -1,11 +1,11 @@ ---- ./chrome/browser/gpu/gl_string_manager.cc.orig 2014-08-20 21:02:06.000000000 +0200 -+++ ./chrome/browser/gpu/gl_string_manager.cc 2014-08-22 15:06:24.000000000 +0200 +--- chrome/browser/gpu/gl_string_manager.cc.orig 2014-10-02 17:18:53 UTC ++++ chrome/browser/gpu/gl_string_manager.cc @@ -25,7 +25,7 @@ void GLStringManager::Initialize() { // On MacOSX or Windows, preliminary GPUInfo is enough. -#if defined(OS_LINUX) +#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) // We never remove this observer from GpuDataManager. content::GpuDataManager::GetInstance()->AddObserver(this); Index: branches/2014Q4/www/chromium/files/patch-chrome__browser__gpu__gpu_feature_checker.cc =================================================================== --- branches/2014Q4/www/chromium/files/patch-chrome__browser__gpu__gpu_feature_checker.cc (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-chrome__browser__gpu__gpu_feature_checker.cc (revision 370437) @@ -1,11 +1,11 @@ ---- ./chrome/browser/gpu/gpu_feature_checker.cc.orig 2014-08-20 21:02:06.000000000 +0200 -+++ ./chrome/browser/gpu/gpu_feature_checker.cc 2014-08-22 15:06:24.000000000 +0200 +--- chrome/browser/gpu/gpu_feature_checker.cc.orig 2014-10-02 17:39:45 UTC ++++ chrome/browser/gpu/gpu_feature_checker.cc @@ -33,7 +33,7 @@ CHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI)); bool finalized = true; -#if defined(OS_LINUX) +#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) // On Windows and Mac, so far we can always make the final WebGL blacklisting // decision based on partial GPU info; on Linux, we need to launch the GPU // process to collect full GPU info and make the final decision. Index: branches/2014Q4/www/chromium/files/patch-chrome__browser__media__webrtc_log_uploader.cc =================================================================== --- branches/2014Q4/www/chromium/files/patch-chrome__browser__media__webrtc_log_uploader.cc (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-chrome__browser__media__webrtc_log_uploader.cc (revision 370437) @@ -1,11 +1,11 @@ ---- ./chrome/browser/media/webrtc_log_uploader.cc.orig 2014-08-20 21:02:12.000000000 +0200 -+++ ./chrome/browser/media/webrtc_log_uploader.cc 2014-08-22 15:06:24.000000000 +0200 +--- chrome/browser/media/webrtc_log_uploader.cc.orig 2014-10-02 17:39:46 UTC ++++ chrome/browser/media/webrtc_log_uploader.cc @@ -233,6 +233,8 @@ const char product[] = "Chrome_Android"; #elif defined(OS_CHROMEOS) const char product[] = "Chrome_ChromeOS"; +#elif defined(OS_FREEBSD) + const char product[] = "Chrome_FreeBSD"; #else #error Platform not supported. #endif Index: branches/2014Q4/www/chromium/files/patch-chrome__browser__media_galleries__fileapi__mtp_device_map_service.cc =================================================================== --- branches/2014Q4/www/chromium/files/patch-chrome__browser__media_galleries__fileapi__mtp_device_map_service.cc (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-chrome__browser__media_galleries__fileapi__mtp_device_map_service.cc (revision 370437) @@ -1,14 +1,14 @@ ---- ./chrome/browser/media_galleries/fileapi/mtp_device_map_service.cc.orig 2014-08-20 21:01:59.000000000 +0200 -+++ ./chrome/browser/media_galleries/fileapi/mtp_device_map_service.cc 2014-08-22 15:06:24.000000000 +0200 +--- chrome/browser/media_galleries/fileapi/mtp_device_map_service.cc.orig 2014-10-02 17:39:46 UTC ++++ chrome/browser/media_galleries/fileapi/mtp_device_map_service.cc @@ -33,9 +33,11 @@ // Note that this initializes the delegate asynchronously, but since // the delegate will only be used from the IO thread, it is guaranteed // to be created before use of it expects it to be there. +#if !defined(OS_FREEBSD) CreateMTPDeviceAsyncDelegate(device_location, base::Bind(&MTPDeviceMapService::AddAsyncDelegate, base::Unretained(this), device_location)); +#endif mtp_device_usage_map_[device_location] = 0; } Index: branches/2014Q4/www/chromium/files/patch-chrome__browser__media_galleries__media_file_system_registry.cc =================================================================== --- branches/2014Q4/www/chromium/files/patch-chrome__browser__media_galleries__media_file_system_registry.cc (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-chrome__browser__media_galleries__media_file_system_registry.cc (revision 370437) @@ -1,14 +1,14 @@ ---- ./chrome/browser/media_galleries/media_file_system_registry.cc.orig 2014-08-20 21:01:59.000000000 +0200 -+++ ./chrome/browser/media_galleries/media_file_system_registry.cc 2014-08-22 15:06:24.000000000 +0200 -@@ -724,7 +724,10 @@ +--- chrome/browser/media_galleries/media_file_system_registry.cc.orig 2014-10-02 17:39:46 UTC ++++ chrome/browser/media_galleries/media_file_system_registry.cc +@@ -734,7 +734,10 @@ // Constructor in 'private' section because depends on private class definition. MediaFileSystemRegistry::MediaFileSystemRegistry() : file_system_context_(new MediaFileSystemContextImpl) { - StorageMonitor::GetInstance()->AddObserver(this); + // This conditional is needed for shutdown. Destructors + // try to get the media file system registry. + if (StorageMonitor::GetInstance()) + StorageMonitor::GetInstance()->AddObserver(this); } MediaFileSystemRegistry::~MediaFileSystemRegistry() { Index: branches/2014Q4/www/chromium/files/patch-chrome__browser__media_galleries__media_folder_finder.cc =================================================================== --- branches/2014Q4/www/chromium/files/patch-chrome__browser__media_galleries__media_folder_finder.cc (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-chrome__browser__media_galleries__media_folder_finder.cc (revision 370437) @@ -1,15 +1,15 @@ ---- ./chrome/browser/media_galleries/media_folder_finder.cc.orig 2014-08-20 21:01:59.000000000 +0200 -+++ ./chrome/browser/media_galleries/media_folder_finder.cc 2014-08-22 15:06:24.000000000 +0200 +--- chrome/browser/media_galleries/media_folder_finder.cc.orig 2014-10-02 17:39:46 UTC ++++ chrome/browser/media_galleries/media_folder_finder.cc @@ -50,10 +50,10 @@ chrome::DIR_USER_APPLICATIONS, chrome::DIR_USER_LIBRARY, #endif -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) base::DIR_CACHE, #endif -#if defined(OS_WIN) || defined(OS_LINUX) +#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) base::DIR_TEMP, #endif }; Index: branches/2014Q4/www/chromium/files/patch-chrome__browser__memory_details.cc =================================================================== --- branches/2014Q4/www/chromium/files/patch-chrome__browser__memory_details.cc (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-chrome__browser__memory_details.cc (revision 370437) @@ -1,29 +1,29 @@ ---- ./chrome/browser/memory_details.cc.orig 2014-08-20 21:02:13.000000000 +0200 -+++ ./chrome/browser/memory_details.cc 2014-08-22 15:06:25.000000000 +0200 -@@ -32,7 +32,7 @@ +--- chrome/browser/memory_details.cc.orig 2014-10-02 17:39:46 UTC ++++ chrome/browser/memory_details.cc +@@ -27,7 +27,7 @@ #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" -#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) +#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD) #include "content/public/browser/zygote_host_linux.h" #endif -@@ -202,7 +202,7 @@ +@@ -248,7 +248,7 @@ void MemoryDetails::CollectChildInfoOnUIThread() { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); -#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) +#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD) const pid_t zygote_pid = content::ZygoteHost::GetInstance()->GetPid(); #endif -@@ -334,7 +334,7 @@ +@@ -390,7 +390,7 @@ } } -#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) +#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD) if (process.pid == zygote_pid) { process.process_type = content::PROCESS_TYPE_ZYGOTE; } Index: branches/2014Q4/www/chromium/files/patch-chrome__browser__net__connection_tester.cc =================================================================== --- branches/2014Q4/www/chromium/files/patch-chrome__browser__net__connection_tester.cc (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-chrome__browser__net__connection_tester.cc (revision 370437) @@ -1,11 +1,11 @@ ---- ./chrome/browser/net/connection_tester.cc.orig 2014-08-20 21:02:09.000000000 +0200 -+++ ./chrome/browser/net/connection_tester.cc 2014-08-22 15:06:25.000000000 +0200 -@@ -217,7 +217,7 @@ +--- chrome/browser/net/connection_tester.cc.orig 2014-10-02 17:18:53 UTC ++++ chrome/browser/net/connection_tester.cc +@@ -219,7 +219,7 @@ // Otherwise returns a network error code. int CreateSystemProxyConfigService( scoped_ptr* config_service) { -#if defined(OS_LINUX) || defined(OS_OPENBSD) +#if defined(OS_LINUX) || defined(OS_BSD) // TODO(eroman): This is not supported on Linux yet, because of how // construction needs ot happen on the UI thread. return net::ERR_NOT_IMPLEMENTED; Index: branches/2014Q4/www/chromium/files/patch-chrome__browser__plugins__plugins_resource_service.cc =================================================================== --- branches/2014Q4/www/chromium/files/patch-chrome__browser__plugins__plugins_resource_service.cc (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-chrome__browser__plugins__plugins_resource_service.cc (revision 370437) @@ -1,11 +1,11 @@ ---- ./chrome/browser/plugins/plugins_resource_service.cc.orig 2014-08-20 21:02:13.000000000 +0200 -+++ ./chrome/browser/plugins/plugins_resource_service.cc 2014-08-22 15:06:25.000000000 +0200 +--- chrome/browser/plugins/plugins_resource_service.cc.orig 2014-10-02 17:18:54 UTC ++++ chrome/browser/plugins/plugins_resource_service.cc @@ -33,7 +33,7 @@ std::string filename; #if defined(OS_WIN) filename = "plugins_win.json"; -#elif defined(OS_LINUX) +#elif defined(OS_LINUX) || defined(OS_BSD) filename = "plugins_linux.json"; #elif defined(OS_MACOSX) filename = "plugins_mac.json"; Index: branches/2014Q4/www/chromium/files/patch-chrome__browser__policy__policy_prefs_browsertest.cc =================================================================== --- branches/2014Q4/www/chromium/files/patch-chrome__browser__policy__policy_prefs_browsertest.cc (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-chrome__browser__policy__policy_prefs_browsertest.cc (revision 370437) @@ -1,11 +1,11 @@ ---- ./chrome/browser/policy/policy_prefs_browsertest.cc.orig 2014-08-20 21:02:01.000000000 +0200 -+++ ./chrome/browser/policy/policy_prefs_browsertest.cc 2014-08-22 15:06:25.000000000 +0200 +--- chrome/browser/policy/policy_prefs_browsertest.cc.orig 2014-10-02 17:39:46 UTC ++++ chrome/browser/policy/policy_prefs_browsertest.cc @@ -169,6 +169,8 @@ const std::string os("chromeos"); #elif defined(OS_LINUX) const std::string os("linux"); +#elif defined(OS_FREEBSD) + const std::string os("freebsd"); #else #error "Unknown platform" #endif Index: branches/2014Q4/www/chromium/files/patch-chrome__browser__safe_browsing__incident_reporting__incident_handler_util.cc =================================================================== --- branches/2014Q4/www/chromium/files/patch-chrome__browser__safe_browsing__incident_reporting__incident_handler_util.cc (nonexistent) +++ branches/2014Q4/www/chromium/files/patch-chrome__browser__safe_browsing__incident_reporting__incident_handler_util.cc (revision 370437) @@ -0,0 +1,15 @@ +--- chrome/browser/safe_browsing/incident_reporting/incident_handler_util.cc.orig 2014-10-02 17:18:54 UTC ++++ chrome/browser/safe_browsing/incident_reporting/incident_handler_util.cc +@@ -8,7 +8,12 @@ + + #include "base/hash.h" + #include "base/logging.h" ++//XXX(rene) needs shim headers? ++#if defined(USE_SYSTEM_PROTOBUF) ++#include ++#else + #include "third_party/protobuf/src/google/protobuf/message_lite.h" ++#endif + + namespace safe_browsing { + Property changes on: branches/2014Q4/www/chromium/files/patch-chrome__browser__safe_browsing__incident_reporting__incident_handler_util.cc ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2014Q4/www/chromium/files/patch-chrome__browser__ssl__ssl_blocking_page.cc =================================================================== --- branches/2014Q4/www/chromium/files/patch-chrome__browser__ssl__ssl_blocking_page.cc (nonexistent) +++ branches/2014Q4/www/chromium/files/patch-chrome__browser__ssl__ssl_blocking_page.cc (revision 370437) @@ -0,0 +1,20 @@ +--- chrome/browser/ssl/ssl_blocking_page.cc.orig 2014-10-02 17:39:46 UTC ++++ chrome/browser/ssl/ssl_blocking_page.cc +@@ -260,7 +260,7 @@ + // settings. Weird. TODO(palmer): Do something more graceful than ignoring + // the user's click! crbug.com/394993 + return; +-#elif defined(OS_LINUX) ++#elif defined(OS_LINUX) || defined(OS_BSD) + struct ClockCommand { + const char* pathname; + const char* argument; +@@ -310,7 +310,7 @@ + #if !defined(OS_CHROMEOS) + base::LaunchOptions options; + options.wait = false; +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + options.allow_new_privs = true; + #endif + base::LaunchProcess(command, options, NULL); Property changes on: branches/2014Q4/www/chromium/files/patch-chrome__browser__ssl__ssl_blocking_page.cc ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +LF \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2014Q4/www/chromium/files/patch-chrome__browser__ui__browser_view_prefs.cc =================================================================== --- branches/2014Q4/www/chromium/files/patch-chrome__browser__ui__browser_view_prefs.cc (nonexistent) +++ branches/2014Q4/www/chromium/files/patch-chrome__browser__ui__browser_view_prefs.cc (revision 370437) @@ -0,0 +1,20 @@ +--- chrome/browser/ui/browser_view_prefs.cc.orig 2014-10-06 09:19:40.000000000 +0200 ++++ chrome/browser/ui/browser_view_prefs.cc 2014-10-06 09:24:45.000000000 +0200 +@@ -9,7 +9,7 @@ + #include "chrome/common/pref_names.h" + #include "components/pref_registry/pref_registry_syncable.h" + +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_BSD) + #include "ui/base/x/x11_util.h" + #endif + +@@ -42,7 +42,7 @@ + void RegisterBrowserViewProfilePrefs( + user_prefs::PrefRegistrySyncable* registry) { + bool custom_frame_default = false; +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_BSD) + custom_frame_default = ui::GetCustomFramePrefDefault(); + #endif + Property changes on: branches/2014Q4/www/chromium/files/patch-chrome__browser__ui__browser_view_prefs.cc ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2014Q4/www/chromium/files/patch-chrome__browser__ui__startup__startup_browser_creator.cc =================================================================== --- branches/2014Q4/www/chromium/files/patch-chrome__browser__ui__startup__startup_browser_creator.cc (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-chrome__browser__ui__startup__startup_browser_creator.cc (revision 370437) @@ -1,11 +1,11 @@ ---- ./chrome/browser/ui/startup/startup_browser_creator.cc.orig 2014-08-20 21:02:04.000000000 +0200 -+++ ./chrome/browser/ui/startup/startup_browser_creator.cc 2014-08-22 15:06:25.000000000 +0200 -@@ -81,7 +81,7 @@ - #include "chromeos/chromeos_switches.h" +--- chrome/browser/ui/startup/startup_browser_creator.cc.orig 2014-10-02 17:39:46 UTC ++++ chrome/browser/ui/startup/startup_browser_creator.cc +@@ -79,7 +79,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_FREEBSD)) #include "ui/events/x/touch_factory_x11.h" #endif Index: branches/2014Q4/www/chromium/files/patch-chrome__browser__ui__views__apps__chrome_native_app_window_views.cc =================================================================== --- branches/2014Q4/www/chromium/files/patch-chrome__browser__ui__views__apps__chrome_native_app_window_views.cc (nonexistent) +++ branches/2014Q4/www/chromium/files/patch-chrome__browser__ui__views__apps__chrome_native_app_window_views.cc (revision 370437) @@ -0,0 +1,20 @@ +--- chrome/browser/ui/views/apps/chrome_native_app_window_views.cc.orig 2014-10-06 09:32:59.000000000 +0200 ++++ chrome/browser/ui/views/apps/chrome_native_app_window_views.cc 2014-10-06 09:40:11.000000000 +0200 +@@ -29,7 +29,7 @@ + #include "ui/wm/core/easy_resize_window_targeter.h" + #include "ui/wm/core/shadow_types.h" + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) || defined(OS_BSD) + #include "chrome/browser/shell_integration_linux.h" + #endif + +@@ -217,7 +217,7 @@ + init_params.opacity = views::Widget::InitParams::TRANSLUCENT_WINDOW; + init_params.keep_on_top = create_params.always_on_top; + +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_BSD) + // Set up a custom WM_CLASS for app windows. This allows task switchers in + // X11 environments to distinguish them from main browser windows. + init_params.wm_class_name = web_app::GetWMClassFromAppName(app_name); Property changes on: branches/2014Q4/www/chromium/files/patch-chrome__browser__ui__views__apps__chrome_native_app_window_views.cc ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +LF \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2014Q4/www/chromium/files/patch-chrome__browser__ui__views__chrome_views_delegate.cc =================================================================== --- branches/2014Q4/www/chromium/files/patch-chrome__browser__ui__views__chrome_views_delegate.cc (nonexistent) +++ branches/2014Q4/www/chromium/files/patch-chrome__browser__ui__views__chrome_views_delegate.cc (revision 370437) @@ -0,0 +1,29 @@ +--- chrome/browser/ui/views/chrome_views_delegate.cc.orig 2014-10-06 09:19:23.000000000 +0200 ++++ chrome/browser/ui/views/chrome_views_delegate.cc 2014-10-06 09:22:54.000000000 +0200 +@@ -44,7 +44,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 + +@@ -234,7 +234,7 @@ + return chrome::IsNativeViewInAsh(window); + } + +-#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); +@@ -373,7 +373,7 @@ + #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. Property changes on: branches/2014Q4/www/chromium/files/patch-chrome__browser__ui__views__chrome_views_delegate.cc ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2014Q4/www/chromium/files/patch-chrome__browser__ui__views__chrome_views_delegate.h =================================================================== --- branches/2014Q4/www/chromium/files/patch-chrome__browser__ui__views__chrome_views_delegate.h (nonexistent) +++ branches/2014Q4/www/chromium/files/patch-chrome__browser__ui__views__chrome_views_delegate.h (revision 370437) @@ -0,0 +1,20 @@ +--- chrome/browser/ui/views/chrome_views_delegate.h.orig 2014-10-06 09:19:31.000000000 +0200 ++++ chrome/browser/ui/views/chrome_views_delegate.h 2014-10-06 09:23:19.000000000 +0200 +@@ -36,7 +36,7 @@ + #if defined(OS_WIN) + virtual HICON GetDefaultWindowIcon() const OVERRIDE; + virtual bool IsWindowInMetro(gfx::NativeWindow window) const OVERRIDE; +-#elif defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#elif defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_BSD) + virtual gfx::ImageSkia* GetDefaultWindowIcon() const OVERRIDE; + #endif + +@@ -49,7 +49,7 @@ + virtual void OnBeforeWidgetInit( + views::Widget::InitParams* params, + views::internal::NativeWidgetDelegate* delegate) OVERRIDE; +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_BSD) + virtual bool WindowManagerProvidesTitleBar(bool maximized) OVERRIDE; + #endif + #if defined(USE_AURA) Property changes on: branches/2014Q4/www/chromium/files/patch-chrome__browser__ui__views__chrome_views_delegate.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2014Q4/www/chromium/files/patch-chrome__browser__ui__views__first_run_dialog.cc =================================================================== --- branches/2014Q4/www/chromium/files/patch-chrome__browser__ui__views__first_run_dialog.cc (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-chrome__browser__ui__views__first_run_dialog.cc (revision 370437) @@ -1,20 +1,20 @@ ---- ./chrome/browser/ui/views/first_run_dialog.cc.orig 2014-08-20 21:02:04.000000000 +0200 -+++ ./chrome/browser/ui/views/first_run_dialog.cc 2014-08-22 15:06:25.000000000 +0200 +--- chrome/browser/ui/views/first_run_dialog.cc.orig 2014-10-02 17:39:46 UTC ++++ chrome/browser/ui/views/first_run_dialog.cc @@ -124,12 +124,16 @@ bool FirstRunDialog::Accept() { GetWidget()->Hide(); +#if !defined(OS_BSD) if (report_crashes_ && report_crashes_->checked()) { if (GoogleUpdateSettings::SetCollectStatsConsent(true)) breakpad::InitCrashReporter(std::string()); - } else { + } else +#else + { GoogleUpdateSettings::SetCollectStatsConsent(false); } +#endif if (make_default_ && make_default_->checked()) ShellIntegration::SetAsDefaultBrowser(); Index: branches/2014Q4/www/chromium/files/patch-chrome__browser__ui__views__frame__browser_frame.cc =================================================================== --- branches/2014Q4/www/chromium/files/patch-chrome__browser__ui__views__frame__browser_frame.cc (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-chrome__browser__ui__views__frame__browser_frame.cc (revision 370437) @@ -1,20 +1,20 @@ ---- chrome/browser/ui/views/frame/browser_frame.cc.orig 2014-09-10 01:47:12.000000000 +0200 -+++ chrome/browser/ui/views/frame/browser_frame.cc 2014-09-17 13:49:30.000000000 +0200 +--- chrome/browser/ui/views/frame/browser_frame.cc.orig 2014-10-06 09:37:47.000000000 +0200 ++++ chrome/browser/ui/views/frame/browser_frame.cc 2014-10-06 09:37:33.000000000 +0200 @@ -36,7 +36,7 @@ #include "ui/views/controls/menu/menu_runner.h" #include "ui/views/widget/native_widget.h" -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) ++#if defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_BSD) #include "chrome/browser/shell_integration_linux.h" #endif @@ -110,7 +110,7 @@ #endif } -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) ++#if defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_BSD) // Set up a custom WM_CLASS for some sorts of window types. This allows // task switchers in X11 environments to distinguish between main browser // windows and e.g app windows. Index: branches/2014Q4/www/chromium/files/patch-chrome__browser__ui__views__frame__opaque_browser_frame_view.cc =================================================================== --- branches/2014Q4/www/chromium/files/patch-chrome__browser__ui__views__frame__opaque_browser_frame_view.cc (nonexistent) +++ branches/2014Q4/www/chromium/files/patch-chrome__browser__ui__views__frame__opaque_browser_frame_view.cc (revision 370437) @@ -0,0 +1,47 @@ +--- chrome/browser/ui/views/frame/opaque_browser_frame_view.cc.orig 2014-10-06 09:39:10.000000000 +0200 ++++ chrome/browser/ui/views/frame/opaque_browser_frame_view.cc 2014-10-06 09:39:57.000000000 +0200 +@@ -53,7 +53,7 @@ + #include "ui/views/window/frame_background.h" + #include "ui/views/window/window_shape.h" + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + #include "ui/views/controls/menu/menu_runner.h" + #endif + +@@ -78,7 +78,7 @@ + // The icon never shrinks below 16 px on a side. + const int kIconMinimumSize = 16; + +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_BSD) + // The number of pixels to move the frame background image upwards when using + // the GTK+ theme and the titlebar is condensed. + const int kGTKThemeCondensedFrameTopInset = 15; +@@ -316,7 +316,7 @@ + + void OpaqueBrowserFrameView::OnMenuButtonClicked(views::View* source, + const gfx::Point& point) { +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + views::MenuRunner menu_runner(frame()->GetSystemMenuModel(), + views::MenuRunner::HAS_MNEMONICS); + ignore_result(menu_runner.RunMenuAt(browser_view()->GetWidget(), +@@ -569,7 +569,7 @@ + } + + bool OpaqueBrowserFrameView::ShouldShowWindowTitleBar() const { +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_BSD) + // Do not show the custom title bar if the system title bar option is enabled. + if (!frame()->UseCustomFrame()) + return false; +@@ -614,7 +614,7 @@ + frame_background_->set_theme_image(GetFrameImage()); + frame_background_->set_theme_overlay_image(GetFrameOverlayImage()); + frame_background_->set_top_area_height(GetTopAreaHeight()); +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_BSD) + // The window manager typically shows a gradient in the native title bar (when + // the system title bar pref is set, or when maximized on Ubuntu). Hide the + // gradient in the tab strip (by shifting it up vertically) to avoid a Property changes on: branches/2014Q4/www/chromium/files/patch-chrome__browser__ui__views__frame__opaque_browser_frame_view.cc ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +LF \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2014Q4/www/chromium/files/patch-chrome__browser__ui__views__frame__opaque_browser_frame_view_layout.cc =================================================================== --- branches/2014Q4/www/chromium/files/patch-chrome__browser__ui__views__frame__opaque_browser_frame_view_layout.cc (nonexistent) +++ branches/2014Q4/www/chromium/files/patch-chrome__browser__ui__views__frame__opaque_browser_frame_view_layout.cc (revision 370437) @@ -0,0 +1,11 @@ +--- chrome/browser/ui/views/frame/opaque_browser_frame_view_layout.cc.orig 2014-10-06 09:41:06.000000000 +0200 ++++ chrome/browser/ui/views/frame/opaque_browser_frame_view_layout.cc 2014-10-06 09:40:51.000000000 +0200 +@@ -81,7 +81,7 @@ + // is no avatar icon. + const int kTabStripIndent = -6; + +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_BSD) + // Default extra space between the top of the frame and the top of the window + // caption buttons. + const int kExtraCaption = 2; Property changes on: branches/2014Q4/www/chromium/files/patch-chrome__browser__ui__views__frame__opaque_browser_frame_view_layout.cc ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +LF \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2014Q4/www/chromium/files/patch-chrome__browser__ui__views__tabs__tab_strip.cc =================================================================== --- branches/2014Q4/www/chromium/files/patch-chrome__browser__ui__views__tabs__tab_strip.cc (nonexistent) +++ branches/2014Q4/www/chromium/files/patch-chrome__browser__ui__views__tabs__tab_strip.cc (revision 370437) @@ -0,0 +1,11 @@ +--- chrome/browser/ui/views/tabs/tab_strip.cc.orig 2014-10-06 09:33:35.000000000 +0200 ++++ chrome/browser/ui/views/tabs/tab_strip.cc 2014-10-06 09:31:58.000000000 +0200 +@@ -281,7 +281,7 @@ + : views::ImageButton(listener), + tab_strip_(tab_strip), + destroyed_(NULL) { +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_BSD) + set_triggerable_event_flags(triggerable_event_flags() | + ui::EF_MIDDLE_MOUSE_BUTTON); + #endif Property changes on: branches/2014Q4/www/chromium/files/patch-chrome__browser__ui__views__tabs__tab_strip.cc ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2014Q4/www/chromium/files/patch-chrome__browser__ui__webui__about_ui.cc =================================================================== --- branches/2014Q4/www/chromium/files/patch-chrome__browser__ui__webui__about_ui.cc (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-chrome__browser__ui__webui__about_ui.cc (revision 370437) @@ -1,36 +1,36 @@ ---- ./chrome/browser/ui/webui/about_ui.cc.orig 2014-08-20 21:02:03.000000000 +0200 -+++ ./chrome/browser/ui/webui/about_ui.cc 2014-08-22 15:06:25.000000000 +0200 +--- chrome/browser/ui/webui/about_ui.cc.orig 2014-10-02 17:39:46 UTC ++++ chrome/browser/ui/webui/about_ui.cc @@ -761,7 +761,7 @@ return data; } -#if defined(OS_LINUX) || defined(OS_OPENBSD) +#if defined(OS_LINUX) || defined(OS_BSD) std::string AboutLinuxProxyConfig() { std::string data; AppendHeader(&data, 0, @@ -777,6 +777,7 @@ return data; } +#if !defined(OS_BSD) void AboutSandboxRow(std::string* data, const std::string& prefix, int name_id, bool good) { data->append(""); @@ -847,6 +848,7 @@ return data; } #endif +#endif // AboutMemoryHandler ---------------------------------------------------------- -@@ -1017,7 +1019,7 @@ +@@ -1019,7 +1021,7 @@ } else if (source_name_ == chrome::kChromeUIDNSHost) { AboutDnsHandler::Start(profile(), callback); return; -#if defined(OS_LINUX) || defined(OS_OPENBSD) +#if defined(OS_LINUX) || defined(OS_BSD) } else if (source_name_ == chrome::kChromeUILinuxProxyConfigHost) { response = AboutLinuxProxyConfig(); #endif Index: branches/2014Q4/www/chromium/files/patch-chrome__browser__ui__webui__chrome_web_ui_controller_factory.cc =================================================================== --- branches/2014Q4/www/chromium/files/patch-chrome__browser__ui__webui__chrome_web_ui_controller_factory.cc (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-chrome__browser__ui__webui__chrome_web_ui_controller_factory.cc (revision 370437) @@ -1,11 +1,11 @@ ---- ./chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig 2014-08-20 21:02:03.000000000 +0200 -+++ ./chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc 2014-08-22 15:06:25.000000000 +0200 -@@ -493,7 +493,7 @@ +--- chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig 2014-10-02 17:39:46 UTC ++++ chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc +@@ -512,7 +512,7 @@ url.host() == chrome::kChromeUIMemoryRedirectHost || url.host() == chrome::kChromeUIStatsHost || url.host() == chrome::kChromeUITermsHost -#if defined(OS_LINUX) || defined(OS_OPENBSD) +#if defined(OS_LINUX) || defined(OS_BSD) || url.host() == chrome::kChromeUILinuxProxyConfigHost || url.host() == chrome::kChromeUISandboxHost #endif Index: branches/2014Q4/www/chromium/files/patch-chrome__browser__ui__webui__options__browser_options_handler.cc =================================================================== --- branches/2014Q4/www/chromium/files/patch-chrome__browser__ui__webui__options__browser_options_handler.cc (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-chrome__browser__ui__webui__options__browser_options_handler.cc (revision 370437) @@ -1,42 +1,42 @@ ---- ./chrome/browser/ui/webui/options/browser_options_handler.cc.orig 2014-08-20 21:02:02.000000000 +0200 -+++ ./chrome/browser/ui/webui/options/browser_options_handler.cc 2014-08-22 15:06:25.000000000 +0200 -@@ -332,7 +332,8 @@ +--- chrome/browser/ui/webui/options/browser_options_handler.cc.orig 2014-10-02 17:39:46 UTC ++++ chrome/browser/ui/webui/options/browser_options_handler.cc +@@ -356,7 +356,8 @@ { "toolbarShowHomeButton", IDS_OPTIONS_TOOLBAR_SHOW_HOME_BUTTON }, { "translateEnableTranslate", IDS_OPTIONS_TRANSLATE_ENABLE_TRANSLATE }, -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if defined(OS_POSIX) && !defined(OS_CHROMEOS) && !defined(OS_MACOSX) && \ + !defined(OS_ANDROID) { "showWindowDecorations", IDS_SHOW_WINDOW_DECORATIONS }, { "themesNativeButton", IDS_THEMES_GTK_BUTTON }, { "themesSetClassic", IDS_THEMES_SET_CLASSIC }, -@@ -647,7 +648,8 @@ +@@ -685,7 +686,8 @@ "requestProfilesInfo", base::Bind(&BrowserOptionsHandler::HandleRequestProfilesInfo, base::Unretained(this))); -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if defined(OS_POSIX) && !defined(OS_CHROMEOS) && !defined(OS_MACOSX) && \ + !defined(OS_ANDROID) web_ui()->RegisterMessageCallback( "themesSetNative", base::Bind(&BrowserOptionsHandler::ThemesSetNative, -@@ -1272,7 +1274,8 @@ +@@ -1316,7 +1318,8 @@ 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) && !defined(OS_MACOSX) && \ + !defined(OS_ANDROID) bool profile_is_supervised = profile->IsSupervised(); is_system_theme = theme_service->UsingSystemTheme(); base::FundamentalValue native_theme_enabled(!is_system_theme && -@@ -1294,7 +1297,8 @@ +@@ -1338,7 +1341,8 @@ ThemeServiceFactory::GetForProfile(profile)->UseDefaultTheme(); } -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if defined(OS_POSIX) && !defined(OS_CHROMEOS) && !defined(OS_MACOSX) && \ + !defined(OS_ANDROID) void BrowserOptionsHandler::ThemesSetNative(const base::ListValue* args) { content::RecordAction(UserMetricsAction("Options_GtkThemeSet")); Profile* profile = Profile::FromWebUI(web_ui()); Index: branches/2014Q4/www/chromium/files/patch-chrome__browser__ui__webui__options__browser_options_handler.h =================================================================== --- branches/2014Q4/www/chromium/files/patch-chrome__browser__ui__webui__options__browser_options_handler.h (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-chrome__browser__ui__webui__options__browser_options_handler.h (revision 370437) @@ -1,12 +1,12 @@ ---- ./chrome/browser/ui/webui/options/browser_options_handler.h.orig 2014-08-20 21:02:02.000000000 +0200 -+++ ./chrome/browser/ui/webui/options/browser_options_handler.h 2014-08-22 15:06:25.000000000 +0200 +--- chrome/browser/ui/webui/options/browser_options_handler.h.orig 2014-10-02 17:39:46 UTC ++++ chrome/browser/ui/webui/options/browser_options_handler.h @@ -197,7 +197,8 @@ void ObserveThemeChanged(); void ThemesReset(const base::ListValue* args); -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if defined(OS_POSIX) && !defined(OS_CHROMEOS) && !defined(OS_MACOSX) && \ + !defined(OS_ANDROID) void ThemesSetNative(const base::ListValue* args); #endif Index: branches/2014Q4/www/chromium/files/patch-chrome__browser__web_applications__web_app.cc =================================================================== --- branches/2014Q4/www/chromium/files/patch-chrome__browser__web_applications__web_app.cc (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-chrome__browser__web_applications__web_app.cc (revision 370437) @@ -1,11 +1,11 @@ ---- ./chrome/browser/web_applications/web_app.cc.orig 2014-08-20 21:02:13.000000000 +0200 -+++ ./chrome/browser/web_applications/web_app.cc 2014-08-22 15:06:25.000000000 +0200 -@@ -441,7 +441,7 @@ +--- chrome/browser/web_applications/web_app.cc.orig 2014-10-02 17:39:46 UTC ++++ chrome/browser/web_applications/web_app.cc +@@ -424,7 +424,7 @@ } #endif -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_FREEBSD) std::string GetWMClassFromAppName(std::string app_name) { - file_util::ReplaceIllegalCharactersInPath(&app_name, '_'); + base::i18n::ReplaceIllegalCharactersInPath(&app_name, '_'); base::TrimString(app_name, "_", &app_name); Index: branches/2014Q4/www/chromium/files/patch-chrome__browser__web_applications__web_app.h =================================================================== --- branches/2014Q4/www/chromium/files/patch-chrome__browser__web_applications__web_app.h (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-chrome__browser__web_applications__web_app.h (revision 370437) @@ -1,11 +1,11 @@ ---- ./chrome/browser/web_applications/web_app.h.orig 2014-08-20 21:02:13.000000000 +0200 -+++ ./chrome/browser/web_applications/web_app.h 2014-08-22 15:06:25.000000000 +0200 -@@ -193,7 +193,7 @@ +--- chrome/browser/web_applications/web_app.h.orig 2014-10-02 17:18:54 UTC ++++ chrome/browser/web_applications/web_app.h +@@ -208,7 +208,7 @@ void GetIconsInfo(const WebApplicationInfo& app_info, IconInfoList* icons); #endif -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_FREEBSD) // Windows that correspond to web apps need to have a deterministic (and // different) WMClass than normal chrome windows so the window manager groups // them as a separate application. Index: branches/2014Q4/www/chromium/files/patch-chrome__chrome_browser.gypi =================================================================== --- branches/2014Q4/www/chromium/files/patch-chrome__chrome_browser.gypi (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-chrome__chrome_browser.gypi (revision 370437) @@ -1,43 +1,43 @@ ---- ./chrome/chrome_browser.gypi.orig 2014-08-20 21:02:14.000000000 +0200 -+++ ./chrome/chrome_browser.gypi 2014-08-22 15:06:25.000000000 +0200 -@@ -2979,7 +2979,7 @@ +--- chrome/chrome_browser.gypi.orig 2014-10-02 17:39:46 UTC ++++ chrome/chrome_browser.gypi +@@ -3173,7 +3173,7 @@ '../device/media_transfer_protocol/media_transfer_protocol.gyp:device_media_transfer_protocol', ], }], - ['OS=="linux" and chromeos==0', { + ['(OS=="linux" and chromeos==0) or os_bsd==1', { 'dependencies': [ '../build/linux/system.gyp:libspeechd', ], -@@ -3106,7 +3106,7 @@ - '../build/linux/system.gyp:xscrnsaver', +@@ -3230,7 +3230,7 @@ + }], ], }], - ['os_posix == 1 and OS != "mac" and OS != "ios"', { + ['os_posix == 1 and OS != "mac" and OS != "ios" and os_bsd != 1', { 'sources': [ 'app/chrome_breakpad_client.cc', 'app/chrome_breakpad_client.h', -@@ -3365,6 +3365,13 @@ - ['exclude', '^third_party/mozilla_security_manager/'], - ], +@@ -3313,6 +3313,13 @@ + }, { # Non-Android. + 'sources': [ '<@(chrome_browser_non_android_sources)' ], }], + ['os_bsd==1', { + 'sources/': [ + ['exclude', '^browser/chrome_browser_main_linux.cc'], + ['exclude', '^browser/chrome_browser_main_linux.h'], + ['exclude', '^browser/media_galleries/linux/'], + ], -+ }], ++ }], ['OS=="mac"', { 'dependencies': [ '../third_party/google_toolbox_for_mac/google_toolbox_for_mac.gyp:google_toolbox_for_mac', -@@ -3465,7 +3472,7 @@ +@@ -3389,7 +3396,7 @@ }], ], }], - ['OS=="linux"', { + ['OS=="linux" or os_bsd==1', { + 'sources': [ '<@(chrome_browser_linux_sources)' ], 'conditions': [ ['use_aura==1', { - 'dependencies': [ Index: branches/2014Q4/www/chromium/files/patch-chrome__chrome_browser_extensions.gypi =================================================================== --- branches/2014Q4/www/chromium/files/patch-chrome__chrome_browser_extensions.gypi (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-chrome__chrome_browser_extensions.gypi (revision 370437) @@ -1,14 +1,14 @@ ---- ./chrome/chrome_browser_extensions.gypi.orig 2014-08-20 21:02:14.000000000 +0200 -+++ ./chrome/chrome_browser_extensions.gypi 2014-08-22 15:06:25.000000000 +0200 -@@ -958,6 +958,11 @@ - 'browser/extensions/window_controller_list_observer.h', +--- chrome/chrome_browser_extensions.gypi.orig 2014-10-02 17:39:46 UTC ++++ chrome/chrome_browser_extensions.gypi +@@ -1023,6 +1023,11 @@ + '<@(chrome_browser_extensions_enabled_sources)', ], 'conditions': [ + ['os_bsd==1', { + 'sources/': [ + ['exclude', '^browser/extensions/api/image_writer_private/removable_storage_provider_linux.cc'], + ], + }], ['chromeos==1', { 'dependencies': [ '../build/linux/system.gyp:dbus', Index: branches/2014Q4/www/chromium/files/patch-chrome__chrome_browser_ui.gypi =================================================================== --- branches/2014Q4/www/chromium/files/patch-chrome__chrome_browser_ui.gypi (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-chrome__chrome_browser_ui.gypi (revision 370437) @@ -1,38 +1,38 @@ ---- ./chrome/chrome_browser_ui.gypi.orig 2014-08-20 21:02:14.000000000 +0200 -+++ ./chrome/chrome_browser_ui.gypi 2014-08-22 15:06:25.000000000 +0200 -@@ -2673,7 +2673,7 @@ - 'browser/ui/views/message_center/web_notification_tray.cc', +--- chrome/chrome_browser_ui.gypi.orig 2014-10-02 17:39:46 UTC ++++ chrome/chrome_browser_ui.gypi +@@ -2729,7 +2729,7 @@ + }], ], }], - ['use_aura==1 and chromeos==0 and use_ozone==0 and OS=="linux"', { + ['use_aura==1 and chromeos==0 and use_ozone==0 and (OS=="linux" or os_bsd==1)', { 'dependencies': [ # gtk2 is the only component that can interact with gtk2 in our new # world. -@@ -2681,7 +2681,7 @@ +@@ -2737,7 +2737,7 @@ '../build/linux/system.gyp:gio', ], }], -- ['use_aura==0 or chromeos==1 or OS!="linux"', { -+ ['use_aura==0 or chromeos==1 or (OS!="linux" and os_bsd!=1)', { - 'sources!': [ - 'browser/ui/views/first_run_dialog.cc', - 'browser/ui/views/first_run_dialog.h', -@@ -3047,7 +3047,7 @@ - }], - ], +- ['OS=="win" or OS=="mac" or desktop_linux==1', { ++ ['OS=="win" or OS=="mac" or desktop_linux==1 or os_bsd==1', { + 'sources': [ '<@(chrome_browser_ui_desktop_sources)' ], }], -- ['OS=="linux"', { -+ ['OS=="linux" or os_bsd==1', { - 'conditions': [ - ['use_aura==1', { - 'dependencies': [ -@@ -3140,7 +3140,7 @@ - 'browser/ui/webui/local_discovery/local_discovery_ui_handler.h', - ], + ['use_aura==1', { +@@ -2772,7 +2772,7 @@ + ['enable_printing==1', { + 'sources': [ '<@(chrome_browser_ui_print_preview_sources)' ], }], -- ['OS!="linux" and OS!="win"', { -+ ['OS!="linux" and OS!="win" and os_bsd!=1', { - 'sources': [ - 'browser/ui/startup/session_crashed_bubble.cc' - ], +- ['OS=="linux" or OS=="android"', { ++ ['OS=="linux" or OS=="android" or OS=="freebsd"', { + 'sources': [ '<@(chrome_browser_ui_android_linux_sources)' ], + }], + ['OS=="android"', { +@@ -2891,7 +2891,7 @@ + ['desktop_linux==1', { + 'sources': [ '<@(chrome_browser_ui_desktop_linux_sources)' ], + }], +- ['OS=="linux"', { # Both desktop Linux and ChromeOS. ++ ['OS=="linux" or OS=="freebsd"', { # Both desktop Linux and ChromeOS. + 'sources': [ '<@(chrome_browser_ui_linux_sources)' ], + 'dependencies': [ + '../build/linux/system.gyp:udev', Index: branches/2014Q4/www/chromium/files/patch-chrome__common__chrome_paths.cc =================================================================== --- branches/2014Q4/www/chromium/files/patch-chrome__common__chrome_paths.cc (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-chrome__common__chrome_paths.cc (revision 370437) @@ -1,44 +1,44 @@ ---- ./chrome/common/chrome_paths.cc.orig 2014-08-20 21:01:56.000000000 +0200 -+++ ./chrome/common/chrome_paths.cc 2014-08-22 15:06:27.000000000 +0200 -@@ -469,10 +469,12 @@ +--- chrome/common/chrome_paths.cc.orig 2014-10-02 21:05:31 UTC ++++ chrome/common/chrome_paths.cc +@@ -461,10 +461,12 @@ if (!base::PathExists(cur)) // We don't want to create this return false; break; -#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_OPENBSD) +#if defined(OS_POSIX) && !defined(OS_MACOSX) case chrome::DIR_POLICY_FILES: { #if defined(GOOGLE_CHROME_BUILD) cur = base::FilePath(FILE_PATH_LITERAL("/etc/opt/chrome/policies")); +#elif defined(OS_BSD) + cur = base::FilePath(FILE_PATH_LITERAL("/usr/local/etc/chrome/policies")); #else cur = base::FilePath(FILE_PATH_LITERAL("/etc/chromium/policies")); #endif -@@ -550,7 +552,7 @@ +@@ -542,7 +544,7 @@ #endif break; -#if defined(OS_LINUX) || (defined(OS_MACOSX) && !defined(OS_IOS)) +#if defined(OS_LINUX) || defined(OS_BSD) || (defined(OS_MACOSX) && !defined(OS_IOS)) case chrome::DIR_NATIVE_MESSAGING: #if defined(OS_MACOSX) #if defined(GOOGLE_CHROME_BUILD) -@@ -564,6 +566,9 @@ +@@ -556,6 +558,9 @@ #if defined(GOOGLE_CHROME_BUILD) cur = base::FilePath(FILE_PATH_LITERAL( "/etc/opt/chrome/native-messaging-hosts")); +#elif defined(OS_BSD) + cur = base::FilePath(FILE_PATH_LITERAL( + "/usr/local/etc/chrome/native-messaging-hosts")); #else cur = base::FilePath(FILE_PATH_LITERAL( "/etc/chromium/native-messaging-hosts")); -@@ -576,7 +581,7 @@ +@@ -568,7 +573,7 @@ return false; cur = cur.Append(FILE_PATH_LITERAL("NativeMessagingHosts")); break; -#endif // defined(OS_LINUX) || (defined(OS_MACOSX) && !defined(OS_IOS)) +#endif // defined(OS_LINUX) || defined(OS_BSD) || (defined(OS_MACOSX) && !defined(OS_IOS)) #if !defined(OS_ANDROID) case chrome::DIR_GLOBAL_GCM_STORE: if (!PathService::Get(chrome::DIR_USER_DATA, &cur)) Index: branches/2014Q4/www/chromium/files/patch-chrome__common__chrome_paths.h =================================================================== --- branches/2014Q4/www/chromium/files/patch-chrome__common__chrome_paths.h (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-chrome__common__chrome_paths.h (revision 370437) @@ -1,11 +1,11 @@ ---- ./chrome/common/chrome_paths.h.orig 2014-08-20 21:01:56.000000000 +0200 -+++ ./chrome/common/chrome_paths.h 2014-08-22 15:06:25.000000000 +0200 -@@ -115,7 +115,7 @@ +--- chrome/common/chrome_paths.h.orig 2014-10-02 17:18:54 UTC ++++ chrome/common/chrome_paths.h +@@ -112,7 +112,7 @@ DIR_SUPERVISED_USERS_DEFAULT_APPS, // Directory where installer places .crx // files to be installed when managed user // session starts. -#if defined(OS_LINUX) || (defined(OS_MACOSX) && !defined(OS_IOS)) +#if defined(OS_LINUX) || defined(OS_BSD) || (defined(OS_MACOSX) && !defined(OS_IOS)) DIR_NATIVE_MESSAGING, // System directory where native messaging host // manifest files are stored. DIR_USER_NATIVE_MESSAGING, // Directory with Native Messaging Hosts Index: branches/2014Q4/www/chromium/files/patch-chrome__common__chrome_switches.cc =================================================================== --- branches/2014Q4/www/chromium/files/patch-chrome__common__chrome_switches.cc (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-chrome__common__chrome_switches.cc (revision 370437) @@ -1,20 +1,18 @@ ---- ./chrome/common/chrome_switches.cc.orig 2014-08-20 21:01:56.000000000 +0200 -+++ ./chrome/common/chrome_switches.cc 2014-08-22 15:06:25.000000000 +0200 -@@ -1319,7 +1319,7 @@ +--- chrome/common/chrome_switches.cc.orig 2014-10-02 17:39:46 UTC ++++ chrome/common/chrome_switches.cc +@@ -1277,13 +1277,13 @@ const char kPasswordStore[] = "password-store"; #endif -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if (defined(OS_LINUX) || defined(OS_FREEBSD)) && !defined(OS_CHROMEOS) // Triggers migration of user data directory to another directory // specified as a parameter. The migration is done under singleton lock, // and sanity checks are made to avoid corrupting the profile. -@@ -1330,7 +1330,7 @@ - // Linux speech service. Because it's buggy, the user must explicitly - // enable it so that visiting a random webpage can't cause instability. - const char kEnableSpeechDispatcher[] = "enable-speech-dispatcher"; + // The browser exits after migration is complete. + const char kMigrateDataDirForSxS[] = "migrate-data-dir-for-sxs"; -#endif // defined(OS_LINUX) && !defined(OS_CHROMEOS) +#endif // (defined(OS_LINUX) || defined(OS_FREEBSD)) && !defined(OS_CHROMEOS) #if defined(OS_MACOSX) // Prevents Chrome from quitting when Chrome Apps are open. Index: branches/2014Q4/www/chromium/files/patch-chrome__common__chrome_switches.h =================================================================== --- branches/2014Q4/www/chromium/files/patch-chrome__common__chrome_switches.h (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-chrome__common__chrome_switches.h (revision 370437) @@ -1,11 +1,11 @@ ---- ./chrome/common/chrome_switches.h.orig 2014-08-20 21:01:56.000000000 +0200 -+++ ./chrome/common/chrome_switches.h 2014-08-22 15:06:25.000000000 +0200 -@@ -378,7 +378,7 @@ +--- chrome/common/chrome_switches.h.orig 2014-10-02 17:39:46 UTC ++++ chrome/common/chrome_switches.h +@@ -362,7 +362,7 @@ extern const char kPasswordStore[]; #endif -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if (defined(OS_LINUX) || defined(OS_FREEBSD)) && !defined(OS_CHROMEOS) - extern const char kEnableSpeechDispatcher[]; extern const char kMigrateDataDirForSxS[]; #endif + Index: branches/2014Q4/www/chromium/files/patch-chrome__common__pref_names.cc =================================================================== --- branches/2014Q4/www/chromium/files/patch-chrome__common__pref_names.cc (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-chrome__common__pref_names.cc (revision 370437) @@ -1,11 +1,11 @@ ---- ./chrome/common/pref_names.cc.orig 2014-08-20 21:01:56.000000000 +0200 -+++ ./chrome/common/pref_names.cc 2014-08-22 15:06:25.000000000 +0200 -@@ -957,7 +957,7 @@ +--- chrome/common/pref_names.cc.orig 2014-10-02 17:39:46 UTC ++++ chrome/common/pref_names.cc +@@ -898,7 +898,7 @@ // Boolean controlling whether SafeSearch is mandatory for Google Web Searches. const char kForceSafeSearch[] = "settings.force_safesearch"; -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) // Linux specific preference on whether we should match the system theme. const char kUsesSystemTheme[] = "extensions.theme.use_system"; #endif Index: branches/2014Q4/www/chromium/files/patch-chrome__common__pref_names.h =================================================================== --- branches/2014Q4/www/chromium/files/patch-chrome__common__pref_names.h (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-chrome__common__pref_names.h (revision 370437) @@ -1,11 +1,11 @@ ---- ./chrome/common/pref_names.h.orig 2014-08-20 21:01:56.000000000 +0200 -+++ ./chrome/common/pref_names.h 2014-08-22 15:06:25.000000000 +0200 -@@ -304,7 +304,7 @@ +--- chrome/common/pref_names.h.orig 2014-10-02 17:39:46 UTC ++++ chrome/common/pref_names.h +@@ -291,7 +291,7 @@ extern const char kForceSafeSearch[]; extern const char kDeleteTimePeriod[]; extern const char kLastClearBrowsingDataTime[]; -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) extern const char kUsesSystemTheme[]; #endif extern const char kCurrentThemePackFilename[]; Index: branches/2014Q4/www/chromium/files/patch-chrome__renderer__pepper__pepper_flash_font_file_host.cc =================================================================== --- branches/2014Q4/www/chromium/files/patch-chrome__renderer__pepper__pepper_flash_font_file_host.cc (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-chrome__renderer__pepper__pepper_flash_font_file_host.cc (revision 370437) @@ -1,46 +1,46 @@ ---- ./chrome/renderer/pepper/pepper_flash_font_file_host.cc.orig 2014-08-20 21:02:14.000000000 +0200 -+++ ./chrome/renderer/pepper/pepper_flash_font_file_host.cc 2014-08-22 15:06:25.000000000 +0200 +--- chrome/renderer/pepper/pepper_flash_font_file_host.cc.orig 2014-10-02 17:18:55 UTC ++++ chrome/renderer/pepper/pepper_flash_font_file_host.cc @@ -13,7 +13,7 @@ #include "ppapi/proxy/ppapi_messages.h" #include "ppapi/proxy/serialized_structs.h" -#if defined(OS_LINUX) || defined(OS_OPENBSD) +#if defined(OS_LINUX) || defined(OS_BSD) #include "content/public/common/child_process_sandbox_support_linux.h" #endif -@@ -26,14 +26,14 @@ +@@ -25,14 +25,14 @@ + PP_PrivateFontCharset charset) : ResourceHost(host->GetPpapiHost(), instance, resource), - renderer_ppapi_host_(host), - fd_(-1) { + renderer_ppapi_host_(host) { -#if defined(OS_LINUX) || defined(OS_OPENBSD) +#if defined(OS_LINUX) || defined(OS_BSD) - fd_ = content::MatchFontWithFallback( + fd_.reset(content::MatchFontWithFallback( description.face.c_str(), description.weight >= PP_BROWSERFONT_TRUSTED_WEIGHT_BOLD, description.italic, charset, - PP_BROWSERFONT_TRUSTED_FAMILY_DEFAULT); + PP_BROWSERFONT_TRUSTED_FAMILY_DEFAULT)); -#endif // defined(OS_LINUX) || defined(OS_OPENBSD) +#endif // defined(OS_LINUX) || defined(OS_BSD) } PepperFlashFontFileHost::~PepperFlashFontFileHost() {} -@@ -53,7 +53,7 @@ +@@ -52,7 +52,7 @@ uint32_t table) { std::string contents; int32_t result = PP_ERROR_FAILED; -#if defined(OS_LINUX) || defined(OS_OPENBSD) +#if defined(OS_LINUX) || defined(OS_BSD) - if (fd_ != -1) { + int fd = fd_.get(); + if (fd != -1) { size_t length = 0; - if (content::GetFontTable(fd_, table, 0 /* offset */, NULL, &length)) { @@ -68,7 +68,7 @@ } } } -#endif // defined(OS_LINUX) || defined(OS_OPENBSD) +#endif // defined(OS_LINUX) || defined(OS_BSD) context->reply_msg = PpapiPluginMsg_FlashFontFile_GetFontTableReply(contents); return result; Index: branches/2014Q4/www/chromium/files/patch-chrome__renderer__pepper__pepper_flash_font_file_host.h =================================================================== --- branches/2014Q4/www/chromium/files/patch-chrome__renderer__pepper__pepper_flash_font_file_host.h (nonexistent) +++ branches/2014Q4/www/chromium/files/patch-chrome__renderer__pepper__pepper_flash_font_file_host.h (revision 370437) @@ -0,0 +1,20 @@ +--- chrome/renderer/pepper/pepper_flash_font_file_host.h.orig 2014-10-02 17:18:55 UTC ++++ chrome/renderer/pepper/pepper_flash_font_file_host.h +@@ -10,7 +10,7 @@ + #include "ppapi/c/private/pp_private_font_charset.h" + #include "ppapi/host/resource_host.h" + +-#if defined(OS_LINUX) || defined(OS_OPENBSD) ++#if defined(OS_LINUX) || defined(OS_BSD) + #include "base/files/scoped_file.h" + #endif + +@@ -45,7 +45,7 @@ + // Non-owning pointer. + content::RendererPpapiHost* renderer_ppapi_host_; + +-#if defined(OS_LINUX) || defined(OS_OPENBSD) ++#if defined(OS_LINUX) || defined(OS_BSD) + base::ScopedFD fd_; + #endif + Property changes on: branches/2014Q4/www/chromium/files/patch-chrome__renderer__pepper__pepper_flash_font_file_host.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2014Q4/www/chromium/files/patch-chrome__renderer__printing__print_web_view_helper.h =================================================================== --- branches/2014Q4/www/chromium/files/patch-chrome__renderer__printing__print_web_view_helper.h (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-chrome__renderer__printing__print_web_view_helper.h (revision 370437) @@ -1,11 +1,11 @@ ---- ./chrome/renderer/printing/print_web_view_helper.h.orig 2014-08-20 21:02:13.000000000 +0200 -+++ ./chrome/renderer/printing/print_web_view_helper.h 2014-08-22 15:06:25.000000000 +0200 -@@ -201,7 +201,7 @@ +--- chrome/renderer/printing/print_web_view_helper.h.orig 2014-10-02 17:39:46 UTC ++++ chrome/renderer/printing/print_web_view_helper.h +@@ -207,7 +207,7 @@ void FinishFramePrinting(); // Prints the page listed in |params|. -#if defined(OS_LINUX) || defined(OS_ANDROID) +#if defined(OS_POSIX) && !defined(OS_MACOSX) void PrintPageInternal(const PrintMsg_PrintPage_Params& params, const gfx::Size& canvas_size, blink::WebFrame* frame, Index: branches/2014Q4/www/chromium/files/patch-chrome__test__base__in_process_browser_test.cc =================================================================== --- branches/2014Q4/www/chromium/files/patch-chrome__test__base__in_process_browser_test.cc (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-chrome__test__base__in_process_browser_test.cc (revision 370437) @@ -1,13 +1,13 @@ ---- ./chrome/test/base/in_process_browser_test.cc.orig 2014-08-20 21:01:48.000000000 +0200 -+++ ./chrome/test/base/in_process_browser_test.cc 2014-08-22 15:06:25.000000000 +0200 -@@ -72,6 +72,10 @@ +--- chrome/test/base/in_process_browser_test.cc.orig 2014-10-02 17:39:46 UTC ++++ chrome/test/base/in_process_browser_test.cc +@@ -76,6 +76,10 @@ namespace { +#if defined(OS_FREEBSD) +#include +#endif + // Passed as value of kTestType. const char kBrowserTestType[] = "browser"; Index: branches/2014Q4/www/chromium/files/patch-chrome__test__base__testing_browser_process.h =================================================================== --- branches/2014Q4/www/chromium/files/patch-chrome__test__base__testing_browser_process.h (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-chrome__test__base__testing_browser_process.h (revision 370437) @@ -1,13 +1,13 @@ ---- ./chrome/test/base/testing_browser_process.h.orig 2014-08-20 21:01:48.000000000 +0200 -+++ ./chrome/test/base/testing_browser_process.h 2014-08-22 15:06:25.000000000 +0200 +--- chrome/test/base/testing_browser_process.h.orig 2014-10-02 17:39:46 UTC ++++ chrome/test/base/testing_browser_process.h @@ -105,8 +105,8 @@ virtual DownloadStatusUpdater* download_status_updater() OVERRIDE; virtual DownloadRequestLimiter* download_request_limiter() OVERRIDE; -#if (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) - virtual void StartAutoupdateTimer() OVERRIDE {} +#if (defined(OS_WIN) || defined(OS_LINUX) || defined(OS_FREEBSD)) && !defined(OS_CHROMEOS) + virtual void StartAutoupdateTimer() /*OVERRIDE*/ {} #endif virtual ChromeNetLog* net_log() OVERRIDE; Index: branches/2014Q4/www/chromium/files/patch-chrome__test__chromedriver__chrome__chrome_finder.cc =================================================================== --- branches/2014Q4/www/chromium/files/patch-chrome__test__chromedriver__chrome__chrome_finder.cc (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-chrome__test__chromedriver__chrome__chrome_finder.cc (revision 370437) @@ -1,20 +1,20 @@ ---- ./chrome/test/chromedriver/chrome/chrome_finder.cc.orig 2014-08-20 21:01:27.000000000 +0200 -+++ ./chrome/test/chromedriver/chrome/chrome_finder.cc 2014-08-22 15:06:25.000000000 +0200 +--- chrome/test/chromedriver/chrome/chrome_finder.cc.orig 2014-10-02 17:39:46 UTC ++++ chrome/test/chromedriver/chrome/chrome_finder.cc @@ -42,7 +42,7 @@ installation_locations[i].Append(L"Chromium\\Application")); } } -#elif defined(OS_LINUX) +#elif defined(OS_LINUX) || defined(OS_FREEBSD) void GetApplicationDirs(std::vector* locations) { locations->push_back(base::FilePath("/opt/google/chrome")); locations->push_back(base::FilePath("/usr/local/bin")); @@ -91,7 +91,7 @@ base::FilePath("Google Chrome.app/Contents/MacOS/Google Chrome"), base::FilePath("Chromium.app/Contents/MacOS/Chromium") }; -#elif defined(OS_LINUX) +#elif defined(OS_LINUX) || defined(OS_FREEBSD) base::FilePath browser_exes_array[] = { base::FilePath("google-chrome"), base::FilePath("chrome"), Index: branches/2014Q4/www/chromium/files/patch-chrome__test__perf__perf_test.cc =================================================================== --- branches/2014Q4/www/chromium/files/patch-chrome__test__perf__perf_test.cc (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-chrome__test__perf__perf_test.cc (revision 370437) @@ -1,11 +1,11 @@ ---- ./chrome/test/perf/perf_test.cc.orig 2014-08-20 21:01:27.000000000 +0200 -+++ ./chrome/test/perf/perf_test.cc 2014-08-22 15:06:25.000000000 +0200 +--- chrome/test/perf/perf_test.cc.orig 2014-10-02 17:18:56 UTC ++++ chrome/test/perf/perf_test.cc @@ -352,7 +352,7 @@ AppendResult(output, "ws_final_t", "", "ws_f_t" + trace_name, total_working_set_size, "bytes", false /* not important */); -#elif defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_ANDROID) +#elif defined(OS_POSIX) && !defined(OS_NACL) AppendResult(output, "vm_size_final_b", std::string(), Index: branches/2014Q4/www/chromium/files/patch-chrome__tools__build__linux__sed.sh =================================================================== --- branches/2014Q4/www/chromium/files/patch-chrome__tools__build__linux__sed.sh (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-chrome__tools__build__linux__sed.sh (revision 370437) @@ -1,8 +1,8 @@ ---- ./chrome/tools/build/linux/sed.sh.orig 2014-08-20 21:01:27.000000000 +0200 -+++ ./chrome/tools/build/linux/sed.sh 2014-08-22 15:06:25.000000000 +0200 +--- chrome/tools/build/linux/sed.sh.orig 2014-10-02 17:18:56 UTC ++++ chrome/tools/build/linux/sed.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/env bash # Copyright (c) 2011 The Chromium Authors. All rights reserved. # Use of this source code is governed by a BSD-style license that can be Index: branches/2014Q4/www/chromium/files/patch-components__omaha_query_params__omaha_query_params.cc =================================================================== --- branches/2014Q4/www/chromium/files/patch-components__omaha_query_params__omaha_query_params.cc (nonexistent) +++ branches/2014Q4/www/chromium/files/patch-components__omaha_query_params__omaha_query_params.cc (revision 370437) @@ -0,0 +1,11 @@ +--- components/omaha_query_params/omaha_query_params.cc.orig 2014-10-02 17:18:56 UTC ++++ components/omaha_query_params/omaha_query_params.cc +@@ -31,6 +31,8 @@ + "linux"; + #elif defined(OS_OPENBSD) + "openbsd"; ++#elif defined(OS_FREEBSD) ++ "freebsd"; + #else + #error "unknown os" + #endif Property changes on: branches/2014Q4/www/chromium/files/patch-components__omaha_query_params__omaha_query_params.cc ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2014Q4/www/chromium/files/patch-components__policy__resources__policy_templates.json =================================================================== --- branches/2014Q4/www/chromium/files/patch-components__policy__resources__policy_templates.json (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-components__policy__resources__policy_templates.json (revision 370437) @@ -1,29 +1,29 @@ ---- ./components/policy/resources/policy_templates.json.orig 2014-08-20 21:02:55.000000000 +0200 -+++ ./components/policy/resources/policy_templates.json 2014-08-22 15:06:25.000000000 +0200 -@@ -1513,7 +1513,7 @@ +--- components/policy/resources/policy_templates.json.orig 2014-10-02 17:39:46 UTC ++++ components/policy/resources/policy_templates.json +@@ -1556,7 +1556,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, -@@ -3697,7 +3697,7 @@ +@@ -3741,7 +3741,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, -@@ -4377,7 +4377,7 @@ +@@ -4420,7 +4420,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, Index: branches/2014Q4/www/chromium/files/patch-components__policy__tools__generate_policy_source.py =================================================================== --- branches/2014Q4/www/chromium/files/patch-components__policy__tools__generate_policy_source.py (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-components__policy__tools__generate_policy_source.py (revision 370437) @@ -1,11 +1,11 @@ ---- ./components/policy/tools/generate_policy_source.py.orig 2014-08-20 21:02:53.000000000 +0200 -+++ ./components/policy/tools/generate_policy_source.py 2014-08-22 15:06:25.000000000 +0200 -@@ -66,7 +66,7 @@ +--- components/policy/tools/generate_policy_source.py.orig 2014-10-02 17:39:46 UTC ++++ components/policy/tools/generate_policy_source.py +@@ -67,7 +67,7 @@ if platform.startswith('chrome.'): platform_sub = platform[7:] if platform_sub == '*': - self.platforms.extend(['win', 'mac', 'linux']) + self.platforms.extend(['win', 'mac', 'linux', 'freebsd']) else: self.platforms.append(platform_sub) else: Index: branches/2014Q4/www/chromium/files/patch-components__storage_monitor.gypi =================================================================== --- branches/2014Q4/www/chromium/files/patch-components__storage_monitor.gypi (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-components__storage_monitor.gypi (revision 370437) @@ -1,27 +1,29 @@ ---- ./components/storage_monitor.gypi.orig 2014-08-20 21:02:56.000000000 +0200 -+++ ./components/storage_monitor.gypi 2014-08-22 15:06:25.000000000 +0200 -@@ -49,6 +49,24 @@ +--- components/storage_monitor.gypi.orig 2014-10-02 17:18:56 UTC ++++ components/storage_monitor.gypi +@@ -50,6 +50,26 @@ 'storage_monitor/volume_mount_watcher_win.h', ], 'conditions': [ + ['os_bsd == 1', { + 'sources!': [ + 'storage_monitor/media_transfer_protocol_device_observer_linux.cc', + 'storage_monitor/media_transfer_protocol_device_observer_linux.h', ++ 'storage_monitor/test_media_transfer_protocol_manager_linux.cc', ++ 'storage_monitor/test_media_transfer_protocol_manager_linux.h', + 'storage_monitor/mtab_watcher_linux.cc', + 'storage_monitor/mtab_watcher_linux.h', + 'storage_monitor/storage_monitor_linux.cc', + 'storage_monitor/storage_monitor_linux.h', + 'storage_monitor/udev_util_linux.cc', + 'storage_monitor/udev_util_linux.h', + ], + }], + ['OS == "freebsd"', { + 'sources': [ + 'storage_monitor/storage_monitor_freebsd.cc', + 'storage_monitor/storage_monitor_freebsd.h', + ], + }], ['OS == "mac"', { 'link_settings': { 'libraries': [ Index: branches/2014Q4/www/chromium/files/patch-components__storage_monitor__storage_monitor.cc =================================================================== --- branches/2014Q4/www/chromium/files/patch-components__storage_monitor__storage_monitor.cc (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-components__storage_monitor__storage_monitor.cc (revision 370437) @@ -1,18 +1,18 @@ ---- ./components/storage_monitor/storage_monitor.cc.orig 2014-08-20 21:02:53.000000000 +0200 -+++ ./components/storage_monitor/storage_monitor.cc 2014-08-22 15:06:25.000000000 +0200 +--- components/storage_monitor/storage_monitor.cc.orig 2014-10-02 17:18:56 UTC ++++ components/storage_monitor/storage_monitor.cc @@ -85,6 +85,7 @@ void StorageMonitor::EnsureInitialized(base::Closure callback) { DCHECK(thread_checker_.CalledOnValidThread()); +//#if !defined(OS_BSD) //XXX(rene) why disabled? if (initialized_) { if (!callback.is_null()) callback.Run(); @@ -100,6 +101,7 @@ initializing_ = true; Init(); +//#endif } bool StorageMonitor::IsInitialized() const { Index: branches/2014Q4/www/chromium/files/patch-components__storage_monitor__storage_monitor_freebsd.cc =================================================================== --- branches/2014Q4/www/chromium/files/patch-components__storage_monitor__storage_monitor_freebsd.cc (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-components__storage_monitor__storage_monitor_freebsd.cc (revision 370437) @@ -1,105 +1,105 @@ ---- ./components/storage_monitor/storage_monitor_freebsd.cc.orig 2014-08-22 15:06:25.000000000 +0200 -+++ ./components/storage_monitor/storage_monitor_freebsd.cc 2014-08-22 15:06:25.000000000 +0200 +--- components/storage_monitor/storage_monitor_freebsd.cc.orig 2014-10-02 21:05:41 UTC ++++ components/storage_monitor/storage_monitor_freebsd.cc @@ -0,0 +1,102 @@ +// Copyright 2014 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +// StorageMonitorFreeBSD implementation. + +#include "components/storage_monitor/storage_monitor_freebsd.h" + +#include + +#include + +#include "base/basictypes.h" +#include "base/bind.h" +#include "base/metrics/histogram.h" +#include "base/process/kill.h" +#include "base/process/launch.h" +#include "base/stl_util.h" +#include "base/strings/string_number_conversions.h" +#include "base/strings/string_util.h" +#include "base/strings/utf_string_conversions.h" +#include "components/storage_monitor/media_storage_util.h" +#include "components/storage_monitor/removable_device_constants.h" +#include "components/storage_monitor/storage_info.h" + +using content::BrowserThread; + +namespace storage_monitor { + +namespace { + +// udev device property constants. +const char kBlockSubsystemKey[] = "block"; +const char kDiskDeviceTypeKey[] = "disk"; +const char kFsUUID[] = "ID_FS_UUID"; +const char kLabel[] = "ID_FS_LABEL"; +const char kModel[] = "ID_MODEL"; +const char kModelID[] = "ID_MODEL_ID"; +const char kRemovableSysAttr[] = "removable"; +const char kSerialShort[] = "ID_SERIAL_SHORT"; +const char kSizeSysAttr[] = "size"; +const char kVendor[] = "ID_VENDOR"; +const char kVendorID[] = "ID_VENDOR_ID"; + +StorageMonitor::EjectStatus EjectPathOnFileThread( + const base::FilePath& path, + const base::FilePath& device) { + DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE)); + + static const char kUmountBinary[] = "/sbin/umount"; + std::vector command; + command.push_back(kUmountBinary); + command.push_back(path.value()); + + base::LaunchOptions options; + base::ProcessHandle handle; + if (!base::LaunchProcess(command, options, &handle)) + return StorageMonitor::EJECT_FAILURE; + + int exit_code = -1; + if (!base::WaitForExitCodeWithTimeout(handle, &exit_code, + base::TimeDelta::FromMilliseconds(3000))) { + base::KillProcess(handle, -1, false); + base::EnsureProcessTerminated(handle); + return StorageMonitor::EJECT_FAILURE; + } + + // TODO(gbillock): Make sure this is found in documentation + // somewhere. Experimentally it seems to hold that exit code + // 1 means device is in use. + if (exit_code == 1) + return StorageMonitor::EJECT_IN_USE; + if (exit_code != 0) + return StorageMonitor::EJECT_FAILURE; + + return StorageMonitor::EJECT_OK; +} + +} // namespace + +StorageMonitorFreeBSD::StorageMonitorFreeBSD() { + DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); +} + +StorageMonitorFreeBSD::~StorageMonitorFreeBSD() { + DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); +} + +void StorageMonitorFreeBSD::Init() { +} + +bool StorageMonitorFreeBSD::GetStorageInfoForPath( + const base::FilePath& path, + StorageInfo* device_info) const { + return false; // TODO +} + +StorageMonitor* StorageMonitor::CreateInternal() { + return new StorageMonitorFreeBSD(); +} + +} // namespace storage_monitor Index: branches/2014Q4/www/chromium/files/patch-components__storage_monitor__storage_monitor_freebsd.h =================================================================== --- branches/2014Q4/www/chromium/files/patch-components__storage_monitor__storage_monitor_freebsd.h (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-components__storage_monitor__storage_monitor_freebsd.h (revision 370437) @@ -1,50 +1,50 @@ ---- ./components/storage_monitor/storage_monitor_freebsd.h.orig 2014-08-22 15:06:25.000000000 +0200 -+++ ./components/storage_monitor/storage_monitor_freebsd.h 2014-08-22 15:06:25.000000000 +0200 +--- components/storage_monitor/storage_monitor_freebsd.h.orig 2014-10-02 21:05:41 UTC ++++ components/storage_monitor/storage_monitor_freebsd.h @@ -0,0 +1,47 @@ +// Copyright 2014 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +// StorageMonitorFreeBSD processes mount point change events, notifies listeners +// about the addition and deletion of media devices, and answers queries about +// mounted devices. +// StorageMonitorFreeBSD lives on the UI thread, and uses ??? +// the FILE thread to get mount point change events. + +#ifndef COMPONENTS_STORAGE_MONITOR_STORAGE_MONITOR_FREEBSD_H_ +#define COMPONENTS_STORAGE_MONITOR_STORAGE_MONITOR_FREEBSD_H_ + +#include +#include + +#include "base/basictypes.h" +#include "base/compiler_specific.h" +#include "base/files/file_path.h" +#include "base/files/file_path_watcher.h" +#include "base/memory/scoped_ptr.h" +#include "base/memory/weak_ptr.h" +#include "components/storage_monitor/storage_monitor.h" +#include "content/public/browser/browser_thread.h" + +namespace storage_monitor { + +class StorageMonitorFreeBSD : public StorageMonitor { + public: + // Should only be called by browser start up code. + // Use StorageMonitor::GetInstance() instead. + explicit StorageMonitorFreeBSD(); + virtual ~StorageMonitorFreeBSD(); + + // Must be called for StorageMonitorFreeBSD to work. + virtual void Init() OVERRIDE; + private: + // StorageMonitor implementation. + virtual bool GetStorageInfoForPath(const base::FilePath& path, + StorageInfo* device_info) const OVERRIDE; + + DISALLOW_COPY_AND_ASSIGN(StorageMonitorFreeBSD); +}; + +} // namespace storage_monitor + +#endif // COMPONENTS_STORAGE_MONITOR_STORAGE_MONITOR_FREEBSD_H_ Index: branches/2014Q4/www/chromium/files/patch-components__usb_service.gypi =================================================================== --- branches/2014Q4/www/chromium/files/patch-components__usb_service.gypi (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-components__usb_service.gypi (revision 370437) @@ -1,14 +1,14 @@ ---- ./components/usb_service.gypi.orig 2014-08-20 21:02:56.000000000 +0200 -+++ ./components/usb_service.gypi 2014-08-22 15:06:25.000000000 +0200 -@@ -41,6 +41,11 @@ - 'dependencies': [ +--- components/usb_service.gypi.orig 2014-10-02 17:39:47 UTC ++++ components/usb_service.gypi +@@ -46,6 +46,11 @@ '../build/linux/system.gyp:udev', ], -+ }], + }], + ['OS == "freebsd"', { + 'dependencies!': [ + '../third_party/libusb/libusb.gyp:libusb', + ], - }] - ] - }], ++ }], + ['chromeos==1', { + 'dependencies': [ + '../chromeos/chromeos.gyp:chromeos', Index: branches/2014Q4/www/chromium/files/patch-components__usb_service__usb_context.cc =================================================================== --- branches/2014Q4/www/chromium/files/patch-components__usb_service__usb_context.cc (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-components__usb_service__usb_context.cc (revision 370437) @@ -1,26 +1,26 @@ ---- ./components/usb_service/usb_context.cc.orig 2014-08-20 21:02:55.000000000 +0200 -+++ ./components/usb_service/usb_context.cc 2014-08-22 15:06:25.000000000 +0200 +--- components/usb_service/usb_context.cc.orig 2014-10-02 17:39:47 UTC ++++ components/usb_service/usb_context.cc @@ -8,8 +8,13 @@ #include "base/synchronization/waitable_event.h" #include "base/threading/platform_thread.h" #include "components/usb_service/usb_error.h" +#if defined(OS_FREEBSD) +#include "libusb.h" +#define LIBUSB_CALL +#else #include "third_party/libusb/src/libusb/interrupt.h" #include "third_party/libusb/src/libusb/libusb.h" +#endif namespace usb_service { @@ -46,7 +51,9 @@ running_ = false; // Spreading running_ to the UsbEventHandler thread. base::subtle::MemoryBarrier(); +#if !defined(OS_FREEBSD) // XXX(rene) only available in bundled version libusb_interrupt_handle_event(context_); +#endif base::PlatformThread::Join(thread_handle_); } Index: branches/2014Q4/www/chromium/files/patch-components__usb_service__usb_context_unittest.cc =================================================================== --- branches/2014Q4/www/chromium/files/patch-components__usb_service__usb_context_unittest.cc (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-components__usb_service__usb_context_unittest.cc (revision 370437) @@ -1,14 +1,14 @@ ---- ./components/usb_service/usb_context_unittest.cc.orig 2014-08-20 21:02:55.000000000 +0200 -+++ ./components/usb_service/usb_context_unittest.cc 2014-08-22 15:06:25.000000000 +0200 +--- components/usb_service/usb_context_unittest.cc.orig 2014-10-02 17:39:47 UTC ++++ components/usb_service/usb_context_unittest.cc @@ -6,7 +6,11 @@ #include "build/build_config.h" #include "components/usb_service/usb_context.h" #include "testing/gtest/include/gtest/gtest.h" +#if defined(OS_FREEBSD) +#include "libusb.h" +#else #include "third_party/libusb/src/libusb/libusb.h" +#endif using usb_service::UsbContext; using usb_service::PlatformUsbContext; Index: branches/2014Q4/www/chromium/files/patch-components__usb_service__usb_device_handle_impl.cc =================================================================== --- branches/2014Q4/www/chromium/files/patch-components__usb_service__usb_device_handle_impl.cc (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-components__usb_service__usb_device_handle_impl.cc (revision 370437) @@ -1,28 +1,28 @@ ---- ./components/usb_service/usb_device_handle_impl.cc.orig 2014-08-20 21:02:55.000000000 +0200 -+++ ./components/usb_service/usb_device_handle_impl.cc 2014-08-22 15:06:25.000000000 +0200 +--- components/usb_service/usb_device_handle_impl.cc.orig 2014-10-02 17:39:47 UTC ++++ components/usb_service/usb_device_handle_impl.cc @@ -17,8 +17,25 @@ #include "components/usb_service/usb_interface.h" #include "components/usb_service/usb_service.h" #include "content/public/browser/browser_thread.h" +#if defined(OS_FREEBSD) +#include "libusb.h" +#define LIBUSB_CALL +#else #include "third_party/libusb/src/libusb/libusb.h" +#endif +/* Define for FreeBSD < 9.3, thanks to db@freebsd.org */ +#if defined(OS_FREEBSD) && __FreeBSD_version < 903000 +int libusb_get_string_descriptor(libusb_device_handle *dev, + uint8_t descriptor_index, uint16_t lang_id, unsigned char* data, int length) { + return libusb_control_transfer(dev, + LIBUSB_ENDPOINT_IN | 0x0, /* Endpoint 0 IN */ + LIBUSB_REQUEST_GET_DESCRIPTOR, + (LIBUSB_DT_STRING << 8) | descriptor_index, + lang_id, data, (uint16_t)length, 1000); +} +#endif + using content::BrowserThread; namespace usb_service { Index: branches/2014Q4/www/chromium/files/patch-components__usb_service__usb_device_impl.cc =================================================================== --- branches/2014Q4/www/chromium/files/patch-components__usb_service__usb_device_impl.cc (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-components__usb_service__usb_device_impl.cc (revision 370437) @@ -1,14 +1,14 @@ ---- ./components/usb_service/usb_device_impl.cc.orig 2014-08-20 21:02:55.000000000 +0200 -+++ ./components/usb_service/usb_device_impl.cc 2014-08-22 15:06:25.000000000 +0200 +--- components/usb_service/usb_device_impl.cc.orig 2014-10-02 17:39:47 UTC ++++ components/usb_service/usb_device_impl.cc @@ -12,7 +12,11 @@ #include "components/usb_service/usb_error.h" #include "components/usb_service/usb_interface_impl.h" #include "content/public/browser/browser_thread.h" +#if defined(OS_FREEBSD) +#include "libusb.h" +#else #include "third_party/libusb/src/libusb/libusb.h" +#endif #if defined(OS_CHROMEOS) #include "base/sys_info.h" Index: branches/2014Q4/www/chromium/files/patch-components__usb_service__usb_error.cc =================================================================== --- branches/2014Q4/www/chromium/files/patch-components__usb_service__usb_error.cc (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-components__usb_service__usb_error.cc (revision 370437) @@ -1,14 +1,14 @@ ---- ./components/usb_service/usb_error.cc.orig 2014-08-20 21:02:55.000000000 +0200 -+++ ./components/usb_service/usb_error.cc 2014-08-23 00:55:43.000000000 +0200 +--- components/usb_service/usb_error.cc.orig 2014-10-02 17:39:47 UTC ++++ components/usb_service/usb_error.cc @@ -4,7 +4,11 @@ #include "components/usb_service/usb_error.h" +#if defined(__FreeBSD__) +#include "libusb.h" +#else #include "third_party/libusb/src/libusb/libusb.h" +#endif namespace usb_service { Index: branches/2014Q4/www/chromium/files/patch-components__usb_service__usb_interface_impl.cc =================================================================== --- branches/2014Q4/www/chromium/files/patch-components__usb_service__usb_interface_impl.cc (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-components__usb_service__usb_interface_impl.cc (revision 370437) @@ -1,14 +1,14 @@ ---- ./components/usb_service/usb_interface_impl.cc.orig 2014-08-20 21:02:55.000000000 +0200 -+++ ./components/usb_service/usb_interface_impl.cc 2014-08-22 15:06:25.000000000 +0200 +--- components/usb_service/usb_interface_impl.cc.orig 2014-10-02 17:39:47 UTC ++++ components/usb_service/usb_interface_impl.cc @@ -5,7 +5,11 @@ #include "components/usb_service/usb_interface_impl.h" #include "base/logging.h" +#if defined(OS_FREEBSD) +#include "libusb.h" +#else #include "third_party/libusb/src/libusb/libusb.h" +#endif namespace usb_service { Index: branches/2014Q4/www/chromium/files/patch-components__usb_service__usb_service_impl.cc =================================================================== --- branches/2014Q4/www/chromium/files/patch-components__usb_service__usb_service_impl.cc (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-components__usb_service__usb_service_impl.cc (revision 370437) @@ -1,14 +1,14 @@ ---- ./components/usb_service/usb_service_impl.cc.orig 2014-08-20 21:02:55.000000000 +0200 -+++ ./components/usb_service/usb_service_impl.cc 2014-08-22 15:06:25.000000000 +0200 +--- components/usb_service/usb_service_impl.cc.orig 2014-10-02 17:39:47 UTC ++++ components/usb_service/usb_service_impl.cc @@ -14,7 +14,11 @@ #include "components/usb_service/usb_device_impl.h" #include "components/usb_service/usb_error.h" #include "content/public/browser/browser_thread.h" +#if defined(OS_FREEBSD) +#include "libusb.h" +#else #include "third_party/libusb/src/libusb/libusb.h" +#endif namespace usb_service { Index: branches/2014Q4/www/chromium/files/patch-content__app__content_main_runner.cc =================================================================== --- branches/2014Q4/www/chromium/files/patch-content__app__content_main_runner.cc (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-content__app__content_main_runner.cc (revision 370437) @@ -1,35 +1,35 @@ ---- ./content/app/content_main_runner.cc.orig 2014-08-20 21:02:47.000000000 +0200 -+++ ./content/app/content_main_runner.cc 2014-08-22 15:06:25.000000000 +0200 +--- content/app/content_main_runner.cc.orig 2014-10-02 17:39:47 UTC ++++ content/app/content_main_runner.cc @@ -95,10 +95,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 -@@ -287,7 +287,8 @@ +@@ -286,7 +286,8 @@ 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(). -@@ -417,7 +418,8 @@ +@@ -416,7 +417,8 @@ } } -#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: branches/2014Q4/www/chromium/files/patch-content__browser__browser_main_loop.cc =================================================================== --- branches/2014Q4/www/chromium/files/patch-content__browser__browser_main_loop.cc (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-content__browser__browser_main_loop.cc (revision 370437) @@ -1,32 +1,32 @@ ---- ./content/browser/browser_main_loop.cc.orig 2014-08-20 21:02:49.000000000 +0200 -+++ ./content/browser/browser_main_loop.cc 2014-08-22 15:06:25.000000000 +0200 -@@ -133,7 +133,7 @@ +--- content/browser/browser_main_loop.cc.orig 2014-10-02 17:39:47 UTC ++++ content/browser/browser_main_loop.cc +@@ -134,7 +134,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 CommandLine& parsed_command_line) { + void SetupSandbox(const base::CommandLine& parsed_command_line) { TRACE_EVENT0("startup", "SetupSandbox"); base::FilePath sandbox_binary; -@@ -334,7 +334,7 @@ +@@ -376,7 +376,7 @@ 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_); -@@ -764,9 +764,9 @@ +@@ -809,9 +809,9 @@ } #endif -#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) +#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD) ZygoteHostImpl::GetInstance()->TearDownAfterLastChild(); -#endif // defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) +#endif // defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD) // The device monitors are using |system_monitor_| as dependency, so delete // them before |system_monitor_| goes away. Index: branches/2014Q4/www/chromium/files/patch-content__browser__child_process_launcher.cc =================================================================== --- branches/2014Q4/www/chromium/files/patch-content__browser__child_process_launcher.cc (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-content__browser__child_process_launcher.cc (revision 370437) @@ -1,126 +1,126 @@ ---- ./content/browser/child_process_launcher.cc.orig 2014-08-20 21:02:49.000000000 +0200 -+++ ./content/browser/child_process_launcher.cc 2014-08-22 15:06:25.000000000 +0200 +--- content/browser/child_process_launcher.cc.orig 2014-10-02 17:39:47 UTC ++++ content/browser/child_process_launcher.cc @@ -68,7 +68,7 @@ #else terminate_child_on_shutdown_(true) #endif -#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) +#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD) , zygote_(false) #endif { @@ -234,7 +234,7 @@ // child termination. base::ScopedFD ipcfd_closer(ipcfd); -#if !defined(OS_MACOSX) +#if !defined(OS_MACOSX) && !defined(OS_BSD) GetContentClient()->browser()-> GetAdditionalMappedFilesForChildProcess(*cmd_line, child_process_id, &files_to_register); @@ -244,7 +244,7 @@ process_type); } 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; @@ -255,7 +255,7 @@ base::GlobalDescriptors::kBaseDescriptor)); } -#if !defined(OS_MACOSX) +#if !defined(OS_MACOSX) && !defined(OS_BSD) if (process_type == switches::kRendererProcess) { const int sandbox_fd = RenderSandboxHostLinux::GetInstance()->GetRendererSocket(); @@ -263,7 +263,7 @@ sandbox_fd, GetSandboxFD())); } -#endif // defined(OS_MACOSX) +#endif // defined(OS_MACOSX) && !defined(OS_BSD) // Actually launch the app. base::LaunchOptions options; @@ -322,7 +322,7 @@ base::Bind( &Context::Notify, this_object.get(), -#if defined(OS_POSIX) && !defined(OS_MACOSX) +#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD) use_zygote, #endif handle)); @@ -330,7 +330,7 @@ } void Notify( -#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) +#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD) bool zygote, #endif base::ProcessHandle handle) { @@ -343,7 +343,7 @@ if (!handle) LOG(ERROR) << "Failed to launch child process"; -#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 (client_) { @@ -370,7 +370,7 @@ BrowserThread::PROCESS_LAUNCHER, FROM_HERE, base::Bind( &Context::TerminateInternal, -#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) +#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD) zygote_, #endif process_.handle())); @@ -387,7 +387,7 @@ } static void TerminateInternal( -#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) +#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD) bool zygote, #endif base::ProcessHandle handle) { @@ -401,13 +401,13 @@ process.Terminate(RESULT_CODE_NORMAL_EXIT); // 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. ZygoteHostImpl::GetInstance()->EnsureProcessTerminated(handle); } else -#endif // !OS_MACOSX +#endif // !OS_MACOSX && !OS_BSD { base::EnsureProcessTerminated(handle); } @@ -428,7 +428,7 @@ #if defined(OS_ANDROID) // The fd to close after creating the process. int ipcfd_; -#elif defined(OS_POSIX) && !defined(OS_MACOSX) +#elif defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD) bool zygote_; #endif }; @@ -470,7 +470,7 @@ *exit_code = context_->exit_code_; return context_->termination_status_; } -#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) +#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD) if (context_->zygote_) { context_->termination_status_ = ZygoteHostImpl::GetInstance()-> GetTerminationStatus(handle, known_dead, &context_->exit_code_); Index: branches/2014Q4/www/chromium/files/patch-content__browser__download__base_file.cc =================================================================== --- branches/2014Q4/www/chromium/files/patch-content__browser__download__base_file.cc (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-content__browser__download__base_file.cc (revision 370437) @@ -1,12 +1,12 @@ ---- ./content/browser/download/base_file.cc.orig 2014-08-20 21:02:49.000000000 +0200 -+++ ./content/browser/download/base_file.cc 2014-08-22 15:06:25.000000000 +0200 +--- content/browser/download/base_file.cc.orig 2014-10-02 17:39:47 UTC ++++ content/browser/download/base_file.cc @@ -205,7 +205,8 @@ } // OS_WIN, OS_MACOSX and OS_LINUX have specialized implementations. -#if !defined(OS_WIN) && !defined(OS_MACOSX) && !defined(OS_LINUX) +#if !defined(OS_WIN) && !defined(OS_MACOSX) && !defined(OS_LINUX) && \ + !defined(OS_BSD) DownloadInterruptReason BaseFile::AnnotateWithSourceInformation() { return DOWNLOAD_INTERRUPT_REASON_NONE; } Index: branches/2014Q4/www/chromium/files/patch-content__browser__download__base_file_linux.cc =================================================================== --- branches/2014Q4/www/chromium/files/patch-content__browser__download__base_file_linux.cc (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-content__browser__download__base_file_linux.cc (revision 370437) @@ -1,12 +1,12 @@ ---- ./content/browser/download/base_file_linux.cc.orig 2014-08-20 21:02:49.000000000 +0200 -+++ ./content/browser/download/base_file_linux.cc 2014-08-22 15:06:25.000000000 +0200 +--- content/browser/download/base_file_linux.cc.orig 2014-10-02 17:18:57 UTC ++++ content/browser/download/base_file_linux.cc @@ -13,7 +13,9 @@ DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE)); DCHECK(!detached_); +#if !defined(OS_BSD) AddOriginMetadataToFile(full_path_, source_url_, referrer_url_); +#endif return DOWNLOAD_INTERRUPT_REASON_NONE; } Index: branches/2014Q4/www/chromium/files/patch-content__browser__geolocation__location_arbitrator_impl.cc =================================================================== --- branches/2014Q4/www/chromium/files/patch-content__browser__geolocation__location_arbitrator_impl.cc (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-content__browser__geolocation__location_arbitrator_impl.cc (revision 370437) @@ -1,11 +1,11 @@ ---- ./content/browser/geolocation/location_arbitrator_impl.cc.orig 2014-08-20 21:02:48.000000000 +0200 -+++ ./content/browser/geolocation/location_arbitrator_impl.cc 2014-08-22 15:06:25.000000000 +0200 -@@ -160,7 +160,7 @@ +--- content/browser/geolocation/location_arbitrator_impl.cc.orig 2014-10-02 17:18:57 UTC ++++ content/browser/geolocation/location_arbitrator_impl.cc +@@ -159,7 +159,7 @@ } LocationProvider* LocationArbitratorImpl::NewSystemLocationProvider() { -#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) +#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_FREEBSD) return NULL; #else return content::NewSystemLocationProvider(); Index: branches/2014Q4/www/chromium/files/patch-content__browser__geolocation__wifi_data_provider_freebsd.cc =================================================================== --- branches/2014Q4/www/chromium/files/patch-content__browser__geolocation__wifi_data_provider_freebsd.cc (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-content__browser__geolocation__wifi_data_provider_freebsd.cc (revision 370437) @@ -1,203 +1,203 @@ ---- ./content/browser/geolocation/wifi_data_provider_freebsd.cc.orig 2014-08-22 15:06:25.000000000 +0200 -+++ ./content/browser/geolocation/wifi_data_provider_freebsd.cc 2014-08-22 15:06:25.000000000 +0200 +--- content/browser/geolocation/wifi_data_provider_freebsd.cc.orig 2014-10-02 21:05:41 UTC ++++ content/browser/geolocation/wifi_data_provider_freebsd.cc @@ -0,0 +1,200 @@ +// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +// For FreeBSD we use the getifaddrs(3) to obtain the list of interfaces +// and then check for those with an 802.11 media type and able to return +// a list of stations. This is similar to ifconfig(8). + +#include "content/browser/geolocation/wifi_data_provider_freebsd.h" + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "base/strings/utf_string_conversions.h" +#include "content/browser/geolocation/wifi_data_provider_common.h" + +namespace content { +namespace { +// The time periods, in milliseconds, between successive polls of the wifi data. +const int kDefaultPollingInterval = 10000; // 10s +const int kNoChangePollingInterval = 120000; // 2 mins +const int kTwoNoChangePollingInterval = 600000; // 10 mins +const int kNoWifiPollingIntervalMilliseconds = 20 * 1000; // 20s + +// Convert a wifi frequency to the corresponding channel. +// Taken from wifi_data_provider_linux.cc where it says this was +// adapted from geolocaiton/wifilib.cc in googleclient (internal to google). +int frquency_to_channel(int frequency_Mhz) { + if (frequency_Mhz >= 2412 && frequency_Mhz <= 2472) // Channels 1-13. + return (frequency_Mhz - 2407) / 5; + if (frequency_Mhz == 2484) + return 14; + if (frequency_Mhz > 5000 && frequency_Mhz < 6000) // .11a bands. + return (frequency_Mhz - 5000) / 5; + // Ignore everything else. + return AccessPointData().channel; // invalid channel +} + +// Provides the wifi API binding for FreeBSD. +class FreeBSDAccessPointData : public WifiDataProviderCommon::WlanApiInterface { +public: + FreeBSDAccessPointData(); + ~FreeBSDAccessPointData(); + + // this does nothing + bool Init(); + + // get the AP data + virtual bool GetAccessPointData(WifiData::AccessPointDataSet* data); + +private: + DISALLOW_COPY_AND_ASSIGN(FreeBSDAccessPointData); +}; + +FreeBSDAccessPointData::FreeBSDAccessPointData() { +} + +FreeBSDAccessPointData::~FreeBSDAccessPointData() { +} + +bool FreeBSDAccessPointData::Init() { + return true; +} + +bool FreeBSDAccessPointData::GetAccessPointData(WifiData::AccessPointDataSet* data) { + bool res; + char *dupn; + struct ifaddrs *ifal, *ifa; + struct ifreq ifr; + struct ifmediareq ifmr; + struct ieee80211req i802r; + int s; + char iscanbuf[32*1024], *vsr; + unsigned len; + AccessPointData apd; + + res = false; + if (getifaddrs(&ifal) < 0) + return res; + + dupn = NULL; + for (ifa = ifal; ifa; ifa = ifa->ifa_next) { + memset(&ifr, 0, sizeof(ifr)); + + if (dupn != NULL && strcmp(dupn, ifa->ifa_name) == 0) + continue; + dupn = ifa->ifa_name; + + strncpy(ifr.ifr_name, ifa->ifa_name, sizeof(ifr.ifr_name)); + ifr.ifr_addr.sa_family = AF_LOCAL; + + if ((s = socket(ifr.ifr_addr.sa_family, SOCK_DGRAM, 0)) < 0) + continue; + + (void) memset(&ifmr, 0, sizeof(ifmr)); + (void) strncpy(ifmr.ifm_name, ifa->ifa_name, sizeof(ifmr.ifm_name)); + + if (ioctl(s, SIOCGIFMEDIA, (caddr_t)&ifmr) < 0) { + close(s); + continue; + } + if (IFM_TYPE(ifmr.ifm_active) != IFM_IEEE80211) { + close(s); + continue; + } + + (void) memset(&i802r, 0, sizeof(i802r)); + (void) strncpy(i802r.i_name, ifa->ifa_name, sizeof(i802r.i_name)); + i802r.i_type = IEEE80211_IOC_SCAN_RESULTS; + i802r.i_data = iscanbuf; + i802r.i_len = sizeof(iscanbuf); + if (ioctl(s, SIOCG80211, &i802r) < 0) { + close(s); + continue; + } + + close(s); + + vsr = (char *) i802r.i_data; + len = i802r.i_len; + while (len >= sizeof(struct ieee80211req_scan_result)) { + struct ieee80211req_scan_result *isr; + char *id; + int idlen; + char ssid[IEEE80211_NWID_LEN+1]; + + isr = (struct ieee80211req_scan_result *) vsr; + + if (isr->isr_meshid_len) { + id = vsr + isr->isr_ie_off + isr->isr_ssid_len; + idlen = isr->isr_meshid_len; + } + else { + id = vsr + isr->isr_ie_off; + idlen = isr->isr_ssid_len; + } + strncpy(ssid, id, idlen); + ssid[idlen] = '\0'; + apd.ssid = base::UTF8ToUTF16(ssid); + apd.mac_address = MacAddressAsString16(isr->isr_bssid); + apd.radio_signal_strength = (isr->isr_rssi/2) + isr->isr_noise; + apd.signal_to_noise = apd.radio_signal_strength - isr->isr_noise; + apd.channel = frquency_to_channel(isr->isr_freq); + VLOG(1) << "FreeBSD access point: " + << "SSID: " << apd.ssid << ", " + << "MAC: " << apd.mac_address << ", " + << "Strength: " << apd.radio_signal_strength << ":" + << apd.signal_to_noise << ", " + << "Channel: " << apd.channel; + data->insert(apd); + res = true; + len -= isr->isr_len; + vsr += isr->isr_len; + } + } + + freeifaddrs(ifal); + + return res; +} + +} // namespace + +// static +WifiDataProviderImplBase* WifiDataProvider::DefaultFactoryFunction() { + return new FreeBSDWifiDataProvider(); +} + +FreeBSDWifiDataProvider::FreeBSDWifiDataProvider() { +} + +FreeBSDWifiDataProvider::~FreeBSDWifiDataProvider() { +} + +WifiDataProviderCommon::WlanApiInterface* FreeBSDWifiDataProvider::NewWlanApi() { + + scoped_ptr wlan_api(new FreeBSDAccessPointData); + if (wlan_api->Init()) + return wlan_api.release(); + + return NULL; +} + +WifiPollingPolicy* FreeBSDWifiDataProvider::NewPollingPolicy() { + return new GenericWifiPollingPolicy; +} + +} // namespace content Index: branches/2014Q4/www/chromium/files/patch-content__browser__geolocation__wifi_data_provider_freebsd.h =================================================================== --- branches/2014Q4/www/chromium/files/patch-content__browser__geolocation__wifi_data_provider_freebsd.h (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-content__browser__geolocation__wifi_data_provider_freebsd.h (revision 370437) @@ -1,34 +1,34 @@ ---- ./content/browser/geolocation/wifi_data_provider_freebsd.h.orig 2014-08-22 15:06:25.000000000 +0200 -+++ ./content/browser/geolocation/wifi_data_provider_freebsd.h 2014-08-22 15:06:25.000000000 +0200 +--- content/browser/geolocation/wifi_data_provider_freebsd.h.orig 2014-10-02 21:05:41 UTC ++++ content/browser/geolocation/wifi_data_provider_freebsd.h @@ -0,0 +1,31 @@ +// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#ifndef CONTENT_BROWSER_GEOLOCATION_WIFI_DATA_PROVIDER_FREEBSD_H_ +#define CONTENT_BROWSER_GEOLOCATION_WIFI_DATA_PROVIDER_FREEBSD_H_ + +#include "base/compiler_specific.h" +#include "content/browser/geolocation/wifi_data_provider_common.h" +#include "content/common/content_export.h" + +namespace content { + +// Implementation of the wifi data provider for FreeBSD. +class CONTENT_EXPORT FreeBSDWifiDataProvider : public WifiDataProviderCommon { +public: + FreeBSDWifiDataProvider(); + +private: + virtual ~FreeBSDWifiDataProvider(); + + // WifiDataProviderCommon + virtual WlanApiInterface* NewWlanApi() OVERRIDE; + virtual WifiPollingPolicy* NewPollingPolicy() OVERRIDE; + + DISALLOW_COPY_AND_ASSIGN(FreeBSDWifiDataProvider); +}; + +} // namespace content + +#endif // CONTENT_BROWSER_GEOLOCATION_WIFI_DATA_PROVIDER_FREEBSD_H_ Index: branches/2014Q4/www/chromium/files/patch-content__browser__gpu__gpu_data_manager_impl_private.cc =================================================================== --- branches/2014Q4/www/chromium/files/patch-content__browser__gpu__gpu_data_manager_impl_private.cc (nonexistent) +++ branches/2014Q4/www/chromium/files/patch-content__browser__gpu__gpu_data_manager_impl_private.cc (revision 370437) @@ -0,0 +1,38 @@ +--- content/browser/gpu/gpu_data_manager_impl_private.cc.orig 2014-10-02 17:39:47 UTC ++++ content/browser/gpu/gpu_data_manager_impl_private.cc +@@ -454,7 +454,9 @@ + gpu_info.gl_renderer = gl_renderer; + gpu_info.gl_version = gl_version; + ++#if !defined(OS_FREEBSD) //XXX(rene) hack + gpu::CollectDriverInfoGL(&gpu_info); ++#endif + + UpdateGpuInfo(gpu_info); + UpdateGpuSwitchingManager(gpu_info); +@@ -497,10 +499,13 @@ + // Also declare the driver_vendor to be osmesa to be able to specify + // exceptions based on driver_vendor==osmesa for some blacklist rules. + gpu_info.driver_vendor = gfx::kGLImplementationOSMesaName; ++#ifndef __FreeBSD__ + } else { ++ //XXX(rene) hack + TRACE_EVENT0("startup", + "GpuDataManagerImpl::Initialize:CollectBasicGraphicsInfo"); + gpu::CollectBasicGraphicsInfo(&gpu_info); ++#endif + } + #if defined(ARCH_CPU_X86_FAMILY) + if (!gpu_info.gpu.vendor_id || !gpu_info.gpu.device_id) +@@ -547,8 +552,10 @@ + // No further update of gpu_info if falling back to SwiftShader. + if (use_swiftshader_) + return; +- ++#ifndef __FreeBSD__ ++ // XXX(rene) hack + gpu::MergeGPUInfo(&gpu_info_, gpu_info); ++#endif + complete_gpu_info_already_requested_ = + complete_gpu_info_already_requested_ || gpu_info_.finalized; + Property changes on: branches/2014Q4/www/chromium/files/patch-content__browser__gpu__gpu_data_manager_impl_private.cc ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2014Q4/www/chromium/files/patch-content__browser__indexed_db__indexed_db_backing_store.cc =================================================================== --- branches/2014Q4/www/chromium/files/patch-content__browser__indexed_db__indexed_db_backing_store.cc (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-content__browser__indexed_db__indexed_db_backing_store.cc (revision 370437) @@ -1,11 +1,11 @@ ---- ./content/browser/indexed_db/indexed_db_backing_store.cc.orig 2014-08-20 21:02:48.000000000 +0200 -+++ ./content/browser/indexed_db/indexed_db_backing_store.cc 2014-08-24 10:58:24.000000000 +0200 -@@ -2329,7 +2329,7 @@ +--- content/browser/indexed_db/indexed_db_backing_store.cc.orig 2014-10-02 17:39:47 UTC ++++ content/browser/indexed_db/indexed_db_backing_store.cc +@@ -2375,7 +2375,7 @@ // The round-trip can be lossy; round to nearest millisecond. int64 delta = (descriptor.last_modified() - info.last_modified).InMilliseconds(); - if (std::abs(delta) > 1) + if (std::labs(delta) > 1) return false; } if (!base::TouchFile(path, info.last_accessed, info.last_modified)) { Index: branches/2014Q4/www/chromium/files/patch-content__browser__renderer_host__render_widget_host_view_aura.cc =================================================================== --- branches/2014Q4/www/chromium/files/patch-content__browser__renderer_host__render_widget_host_view_aura.cc (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-content__browser__renderer_host__render_widget_host_view_aura.cc (revision 370437) @@ -1,11 +1,11 @@ ---- ./content/browser/renderer_host/render_widget_host_view_aura.cc.orig 2014-08-20 21:02:48.000000000 +0200 -+++ ./content/browser/renderer_host/render_widget_host_view_aura.cc 2014-08-22 15:06:25.000000000 +0200 -@@ -631,7 +631,7 @@ +--- content/browser/renderer_host/render_widget_host_view_aura.cc.orig 2014-10-02 17:39:47 UTC ++++ content/browser/renderer_host/render_widget_host_view_aura.cc +@@ -653,7 +653,7 @@ if (host) return reinterpret_cast(host->GetAcceleratedWidget()); #endif - return static_cast(NULL); + return static_cast(0); } gfx::NativeViewAccessible RenderWidgetHostViewAura::GetNativeViewAccessible() { Index: branches/2014Q4/www/chromium/files/patch-content__browser__tracing__tracing_ui.cc =================================================================== --- branches/2014Q4/www/chromium/files/patch-content__browser__tracing__tracing_ui.cc (nonexistent) +++ branches/2014Q4/www/chromium/files/patch-content__browser__tracing__tracing_ui.cc (revision 370437) @@ -0,0 +1,11 @@ +--- content/browser/tracing/tracing_ui.cc.orig 2014-10-02 17:39:47 UTC ++++ content/browser/tracing/tracing_ui.cc +@@ -358,6 +358,8 @@ + const char product[] = "Chrome_Android"; + #elif defined(OS_CHROMEOS) + const char product[] = "Chrome_ChromeOS"; ++#elif defined(OS_BSD) ++ const char product[] = "Chrome_BSD"; + #else + #error Platform not supported. + #endif Property changes on: branches/2014Q4/www/chromium/files/patch-content__browser__tracing__tracing_ui.cc ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +LF \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2014Q4/www/chromium/files/patch-content__common__set_process_title_linux.cc =================================================================== --- branches/2014Q4/www/chromium/files/patch-content__common__set_process_title_linux.cc (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-content__common__set_process_title_linux.cc (revision 370437) @@ -1,19 +1,19 @@ ---- ./content/common/set_process_title_linux.cc.orig 2014-08-20 21:02:50.000000000 +0200 -+++ ./content/common/set_process_title_linux.cc 2014-08-22 15:06:25.000000000 +0200 +--- content/common/set_process_title_linux.cc.orig 2014-10-02 17:18:57 UTC ++++ content/common/set_process_title_linux.cc @@ -48,6 +48,8 @@ extern char** environ; static char** g_main_argv = NULL; + +#if !defined(OS_FREEBSD) static char* g_orig_argv0 = NULL; void setproctitle(const char* fmt, ...) { @@ -100,6 +102,7 @@ va_end(ap); g_main_argv[1] = NULL; } +#endif // A version of this built into glibc would not need this function, since // it could stash the argv pointer in __libc_start_main(). But we need it. Index: branches/2014Q4/www/chromium/files/patch-content__common__set_process_title_linux.h =================================================================== --- branches/2014Q4/www/chromium/files/patch-content__common__set_process_title_linux.h (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-content__common__set_process_title_linux.h (revision 370437) @@ -1,20 +1,20 @@ ---- ./content/common/set_process_title_linux.h.orig 2014-08-20 21:02:50.000000000 +0200 -+++ ./content/common/set_process_title_linux.h 2014-08-22 15:06:25.000000000 +0200 +--- content/common/set_process_title_linux.h.orig 2014-10-02 17:18:57 UTC ++++ content/common/set_process_title_linux.h @@ -5,6 +5,9 @@ #ifndef CONTENT_COMMON_SET_PROCESS_TITLE_LINUX_H_ #define CONTENT_COMMON_SET_PROCESS_TITLE_LINUX_H_ +#include "build/build_config.h" + +#if !defined(OS_FREEBSD) // Set the process title that will show in "ps" and similar tools. Takes // printf-style format string and arguments. After calling setproctitle() // the original main() argv[] array should not be used. By default, the @@ -14,6 +17,7 @@ // This signature and naming is to be compatible with most other Unix // implementations of setproctitle(). void setproctitle(const char* fmt, ...); +#endif // Initialize state needed for setproctitle() on Linux. Pass the argv pointer // from main() to setproctitle_init() before calling setproctitle(). Index: branches/2014Q4/www/chromium/files/patch-content__content_browser.gypi =================================================================== --- branches/2014Q4/www/chromium/files/patch-content__content_browser.gypi (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-content__content_browser.gypi (revision 370437) @@ -1,41 +1,41 @@ ---- ./content/content_browser.gypi.orig 2014-08-20 21:02:50.000000000 +0200 -+++ ./content/content_browser.gypi 2014-08-22 15:06:25.000000000 +0200 -@@ -615,6 +615,8 @@ +--- content/content_browser.gypi.orig 2014-10-02 17:39:47 UTC ++++ content/content_browser.gypi +@@ -679,6 +679,8 @@ 'browser/geolocation/wifi_data_provider_common_win.cc', 'browser/geolocation/wifi_data_provider_common_win.h', 'browser/geolocation/wifi_data_provider_corewlan_mac.mm', + 'browser/geolocation/wifi_data_provider_freebsd.cc', + 'browser/geolocation/wifi_data_provider_freebsd.h', 'browser/geolocation/wifi_data_provider_linux.cc', 'browser/geolocation/wifi_data_provider_linux.h', 'browser/geolocation/wifi_data_provider_mac.cc', -@@ -1709,8 +1711,18 @@ +@@ -1806,8 +1808,18 @@ ], }], ['os_bsd==1', { - 'sources/': [ - ['exclude', '^browser/gamepad/gamepad_platform_data_fetcher_linux\\.cc$'], + 'sources!': [ + 'public/browser/zygote_host_linux.h', + 'browser/zygote_host/zygote_host_impl_linux.cc', + 'browser/zygote_host/zygote_host_impl_linux.h', + 'zygote/zygote_linux.cc', + 'zygote/zygote_linux.h', + 'zygote/zygote_main_linux.cc', + 'browser/device_monitor_linux.cc', + 'browser/download/file_metadata_linux.cc', + 'browser/gamepad/gamepad_platform_data_fetcher_linux.cc', + 'browser/geolocation/wifi_data_provider_linux.cc', + 'browser/udev_linux.cc', ], }], ['use_aura==1', { -@@ -1758,7 +1770,7 @@ +@@ -1855,7 +1867,7 @@ 'browser/geolocation/empty_wifi_data_provider.cc', ], }], - ['OS == "linux" and use_dbus==1', { + ['(OS == "linux" or os_bsd==1) and use_dbus==1', { 'sources!': [ + 'browser/battery_status/battery_status_manager_default.cc', 'browser/geolocation/empty_wifi_data_provider.cc', - ], Index: branches/2014Q4/www/chromium/files/patch-content__content_common.gypi =================================================================== --- branches/2014Q4/www/chromium/files/patch-content__content_common.gypi (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-content__content_common.gypi (revision 370437) @@ -1,24 +1,24 @@ ---- ./content/content_common.gypi.orig 2014-08-20 21:02:50.000000000 +0200 -+++ ./content/content_common.gypi 2014-08-22 15:06:25.000000000 +0200 -@@ -598,6 +598,21 @@ +--- content/content_common.gypi.orig 2014-10-02 17:39:47 UTC ++++ content/content_common.gypi +@@ -668,6 +668,21 @@ 'content.gyp:common_aidl', ], }], + ['os_bsd==1', { + 'sources!': [ + 'common/sandbox_linux.cc', + 'common/sandbox_linux.h', + 'common/sandbox_init_linux.cc', + 'common/sandbox_seccomp_bpf_linux.cc', + 'common/sandbox_seccomp_bpf_linux.h', + 'common/sandbox_linux/bpf_cros_arm_gpu_policy_linux.cc', + 'common/sandbox_linux/bpf_gpu_policy_linux.cc', + 'common/sandbox_linux/bpf_ppapi_policy_linux.cc', + 'common/sandbox_linux/bpf_renderer_policy_linux.cc', + 'common/sandbox_linux/sandbox_bpf_base_policy_linux.cc', + 'common/sandbox_linux/sandbox_seccomp_bpf_linux.cc', + ], + }], ['use_pango == 1', { 'dependencies': [ '../build/linux/system.gyp:pangocairo', Index: branches/2014Q4/www/chromium/files/patch-content__content_tests.gypi =================================================================== --- branches/2014Q4/www/chromium/files/patch-content__content_tests.gypi (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-content__content_tests.gypi (revision 370437) @@ -1,18 +1,18 @@ ---- ./content/content_tests.gypi.orig 2014-08-20 21:02:50.000000000 +0200 -+++ ./content/content_tests.gypi 2014-08-22 15:06:25.000000000 +0200 -@@ -889,6 +889,15 @@ +--- content/content_tests.gypi.orig 2014-10-02 17:39:47 UTC ++++ content/content_tests.gypi +@@ -916,6 +916,15 @@ 'browser/geolocation/wifi_data_provider_linux_unittest.cc', ], }], + ['OS == "freebsd"', { + 'sources!': [ + 'browser/download/file_metadata_unittest_linux.cc', + 'browser/geolocation/wifi_data_provider_linux_unittest.cc', + 'browser/renderer_host/media/media_stream_dispatcher_host_unittest.cc', + 'browser/renderer_host/media/media_stream_manager_unittest.cc', + 'browser/renderer_host/media/media_stream_ui_controller_unittest.cc', + ], + }], ['OS != "android" and OS != "ios"', { 'dependencies': [ '../third_party/libvpx/libvpx.gyp:libvpx', Index: branches/2014Q4/www/chromium/files/patch-content__gpu__gpu_child_thread.cc =================================================================== --- branches/2014Q4/www/chromium/files/patch-content__gpu__gpu_child_thread.cc (nonexistent) +++ branches/2014Q4/www/chromium/files/patch-content__gpu__gpu_child_thread.cc (revision 370437) @@ -0,0 +1,18 @@ +--- content/gpu/gpu_child_thread.cc.orig 2014-10-02 17:39:47 UTC ++++ content/gpu/gpu_child_thread.cc +@@ -179,6 +179,7 @@ + } + + void GpuChildThread::OnCollectGraphicsInfo() { ++#if !defined(OS_FREEBSD) + #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. +@@ -218,6 +219,7 @@ + base::MessageLoop::current()->Quit(); + } + #endif // OS_WIN ++#endif // XXX(rene) !FreeBSD + } + + void GpuChildThread::OnGetVideoMemoryUsageStats() { Property changes on: branches/2014Q4/www/chromium/files/patch-content__gpu__gpu_child_thread.cc ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +LF \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2014Q4/www/chromium/files/patch-content__gpu__gpu_main.cc =================================================================== --- branches/2014Q4/www/chromium/files/patch-content__gpu__gpu_main.cc (nonexistent) +++ branches/2014Q4/www/chromium/files/patch-content__gpu__gpu_main.cc (revision 370437) @@ -0,0 +1,29 @@ +--- content/gpu/gpu_main.cc.orig 2014-10-02 17:39:47 UTC ++++ content/gpu/gpu_main.cc +@@ -71,7 +71,7 @@ + const CommandLine& command_line); + bool WarmUpSandbox(const CommandLine& command_line); + +-#if !defined(OS_MACOSX) ++#if !defined(OS_MACOSX) && !defined(OS_FREEBSD) //XXX(rene) added !FreeBSD + bool CollectGraphicsInfo(gpu::GPUInfo& gpu_info); + #endif + +@@ -265,7 +265,7 @@ + // and we already registered them through SetGpuInfo() above. + base::TimeTicks before_collect_context_graphics_info = + base::TimeTicks::Now(); +-#if !defined(OS_MACOSX) ++#if !defined(OS_MACOSX) && !defined(OS_FREEBSD) //XXX(rene) added !FreeBSD + if (!CollectGraphicsInfo(gpu_info)) + dead_on_arrival = true; + +@@ -393,7 +393,7 @@ + return true; + } + +-#if !defined(OS_MACOSX) ++#if !defined(OS_MACOSX) && !defined(OS_FREEBSD)//XXX(rene) added !FreeBSD + bool CollectGraphicsInfo(gpu::GPUInfo& gpu_info) { + bool res = true; + gpu::CollectInfoResult result = gpu::CollectContextGraphicsInfo(&gpu_info); Property changes on: branches/2014Q4/www/chromium/files/patch-content__gpu__gpu_main.cc ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2014Q4/www/chromium/files/patch-content__public__common__content_switches.cc =================================================================== --- branches/2014Q4/www/chromium/files/patch-content__public__common__content_switches.cc (nonexistent) +++ branches/2014Q4/www/chromium/files/patch-content__public__common__content_switches.cc (revision 370437) @@ -0,0 +1,11 @@ +--- content/public/common/content_switches.cc.orig 2014-10-02 17:39:47 UTC ++++ content/public/common/content_switches.cc +@@ -920,7 +920,7 @@ + "disable-vaapi-accelerated-video-encode"; + #endif + +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_FREEBSD) + // Allows sending text-to-speech requests to speech-dispatcher, a common + // Linux speech service. Because it's buggy, the user must explicitly + // enable it so that visiting a random webpage can't cause instability. Property changes on: branches/2014Q4/www/chromium/files/patch-content__public__common__content_switches.cc ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +LF \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2014Q4/www/chromium/files/patch-content__public__common__content_switches.h =================================================================== --- branches/2014Q4/www/chromium/files/patch-content__public__common__content_switches.h (nonexistent) +++ branches/2014Q4/www/chromium/files/patch-content__public__common__content_switches.h (revision 370437) @@ -0,0 +1,11 @@ +--- content/public/common/content_switches.h.orig 2014-10-02 17:39:47 UTC ++++ content/public/common/content_switches.h +@@ -266,7 +266,7 @@ + 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 + Property changes on: branches/2014Q4/www/chromium/files/patch-content__public__common__content_switches.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +LF \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2014Q4/www/chromium/files/patch-content__public__test__browser_test_base.cc =================================================================== --- branches/2014Q4/www/chromium/files/patch-content__public__test__browser_test_base.cc (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-content__public__test__browser_test_base.cc (revision 370437) @@ -1,13 +1,13 @@ ---- ./content/public/test/browser_test_base.cc.orig 2014-08-20 21:02:44.000000000 +0200 -+++ ./content/public/test/browser_test_base.cc 2014-08-22 15:06:25.000000000 +0200 +--- content/public/test/browser_test_base.cc.orig 2014-10-02 17:39:47 UTC ++++ content/public/test/browser_test_base.cc @@ -4,6 +4,10 @@ #include "content/public/test/browser_test_base.h" +#if defined(OS_FREEBSD) +#include +#endif + #include "base/bind.h" #include "base/command_line.h" #include "base/debug/stack_trace.h" Index: branches/2014Q4/www/chromium/files/patch-content__renderer__accessibility__blink_ax_tree_source.cc =================================================================== --- branches/2014Q4/www/chromium/files/patch-content__renderer__accessibility__blink_ax_tree_source.cc (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-content__renderer__accessibility__blink_ax_tree_source.cc (revision 370437) @@ -1,24 +1,24 @@ ---- ./content/renderer/accessibility/blink_ax_tree_source.cc.orig 2014-08-20 21:02:43.000000000 +0200 -+++ ./content/renderer/accessibility/blink_ax_tree_source.cc 2014-08-22 15:06:26.000000000 +0200 -@@ -441,13 +441,15 @@ +--- content/renderer/accessibility/blink_ax_tree_source.cc.orig 2014-10-02 17:39:47 UTC ++++ content/renderer/accessibility/blink_ax_tree_source.cc +@@ -443,13 +443,15 @@ dst->AddIntAttribute(ui::AX_ATTR_SCROLL_X, scroll_offset.width()); dst->AddIntAttribute(ui::AX_ATTR_SCROLL_Y, scroll_offset.height()); - const gfx::Size& min_offset = document.frame()->minimumScrollOffset(); - dst->AddIntAttribute(ui::AX_ATTR_SCROLL_X_MIN, min_offset.width()); - dst->AddIntAttribute(ui::AX_ATTR_SCROLL_Y_MIN, min_offset.height()); + // Prefix {min|max}_offset with '_' to avoid collision with + // FreeBSD namespace + const gfx::Size& _min_offset = document.frame()->minimumScrollOffset(); + dst->AddIntAttribute(ui::AX_ATTR_SCROLL_X_MIN, _min_offset.width()); + dst->AddIntAttribute(ui::AX_ATTR_SCROLL_Y_MIN, _min_offset.height()); - const gfx::Size& max_offset = document.frame()->maximumScrollOffset(); - dst->AddIntAttribute(ui::AX_ATTR_SCROLL_X_MAX, max_offset.width()); - dst->AddIntAttribute(ui::AX_ATTR_SCROLL_Y_MAX, max_offset.height()); + const gfx::Size& _max_offset = document.frame()->maximumScrollOffset(); + dst->AddIntAttribute(ui::AX_ATTR_SCROLL_X_MAX, _max_offset.width()); + dst->AddIntAttribute(ui::AX_ATTR_SCROLL_Y_MAX, _max_offset.height()); } if (dst->role == ui::AX_ROLE_TABLE) { Index: branches/2014Q4/www/chromium/files/patch-content__renderer__media__webrtc_audio_capturer.cc =================================================================== --- branches/2014Q4/www/chromium/files/patch-content__renderer__media__webrtc_audio_capturer.cc (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-content__renderer__media__webrtc_audio_capturer.cc (revision 370437) @@ -1,24 +1,13 @@ ---- ./content/renderer/media/webrtc_audio_capturer.cc.orig 2014-08-20 21:02:43.000000000 +0200 -+++ ./content/renderer/media/webrtc_audio_capturer.cc 2014-08-22 15:06:26.000000000 +0200 -@@ -31,9 +31,7 @@ - // will fail if the user selects any rate outside these ranges. - const int kValidInputRates[] = - {192000, 96000, 48000, 44100, 32000, 16000, 8000}; --#elif defined(OS_LINUX) || defined(OS_OPENBSD) --const int kValidInputRates[] = {48000, 44100}; --#elif defined(OS_ANDROID) -+#elif defined(OS_POSIX) - const int kValidInputRates[] = {48000, 44100}; - #else - const int kValidInputRates[] = {44100}; -@@ -457,8 +455,8 @@ +--- content/renderer/media/webrtc_audio_capturer.cc.orig 2014-10-02 17:39:47 UTC ++++ content/renderer/media/webrtc_audio_capturer.cc +@@ -430,8 +430,8 @@ // CaptureCallback. #if defined(OS_WIN) || defined(OS_MACOSX) DCHECK_LE(volume, 1.0); -#elif (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_OPENBSD) - // We have a special situation on Linux where the microphone volume can be +#elif defined(OS_POSIX) && !defined(OS_CHROMEOS) && !defined(OS_ANDROID) + // We have a special situation on POSIX where the microphone volume can be // "higher than maximum". The input volume slider in the sound preference // allows the user to set a scaling that is higher than 100%. It means that // even if the reported maximum levels is N, the actual microphone level can Index: branches/2014Q4/www/chromium/files/patch-content__renderer__pepper__usb_key_code_conversion.cc =================================================================== --- branches/2014Q4/www/chromium/files/patch-content__renderer__pepper__usb_key_code_conversion.cc (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-content__renderer__pepper__usb_key_code_conversion.cc (revision 370437) @@ -1,11 +1,11 @@ ---- ./content/renderer/pepper/usb_key_code_conversion.cc.orig 2014-08-20 21:02:43.000000000 +0200 -+++ ./content/renderer/pepper/usb_key_code_conversion.cc 2014-08-22 15:06:26.000000000 +0200 +--- content/renderer/pepper/usb_key_code_conversion.cc.orig 2014-10-02 17:18:57 UTC ++++ content/renderer/pepper/usb_key_code_conversion.cc @@ -10,7 +10,7 @@ namespace content { -#if !defined(OS_LINUX) && !defined(OS_MACOSX) && !defined(OS_WIN) +#if !((defined(OS_POSIX) && !defined(OS_ANDROID)) || defined(OS_WIN)) uint32_t UsbKeyCodeForKeyboardEvent(const WebKeyboardEvent& key_event) { return 0; Index: branches/2014Q4/www/chromium/files/patch-content__renderer__renderer_main_platform_delegate_linux.cc =================================================================== --- branches/2014Q4/www/chromium/files/patch-content__renderer__renderer_main_platform_delegate_linux.cc (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-content__renderer__renderer_main_platform_delegate_linux.cc (revision 370437) @@ -1,19 +1,19 @@ ---- ./content/renderer/renderer_main_platform_delegate_linux.cc.orig 2014-08-20 21:02:43.000000000 +0200 -+++ ./content/renderer/renderer_main_platform_delegate_linux.cc 2014-08-22 15:06:26.000000000 +0200 +--- content/renderer/renderer_main_platform_delegate_linux.cc.orig 2014-10-02 17:39:47 UTC ++++ content/renderer/renderer_main_platform_delegate_linux.cc @@ -40,6 +40,7 @@ } bool RendererMainPlatformDelegate::EnableSandbox() { +#if !defined(OS_BSD) // The setuid sandbox is started in the zygote process: zygote_main_linux.cc // http://code.google.com/p/chromium/wiki/LinuxSUIDSandbox // @@ -70,7 +71,7 @@ CHECK_EQ(errno, EPERM); } #endif // __x86_64__ - +#endif // ! OS_BSD return true; } Index: branches/2014Q4/www/chromium/files/patch-content__renderer__renderer_webkitplatformsupport_impl.cc =================================================================== --- branches/2014Q4/www/chromium/files/patch-content__renderer__renderer_webkitplatformsupport_impl.cc (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-content__renderer__renderer_webkitplatformsupport_impl.cc (revision 370437) @@ -1,38 +1,38 @@ ---- ./content/renderer/renderer_webkitplatformsupport_impl.cc.orig 2014-08-20 21:02:43.000000000 +0200 -+++ ./content/renderer/renderer_webkitplatformsupport_impl.cc 2014-08-22 15:06:26.000000000 +0200 -@@ -92,7 +92,7 @@ +--- content/renderer/renderer_webkitplatformsupport_impl.cc.orig 2014-10-02 17:39:47 UTC ++++ content/renderer/renderer_webkitplatformsupport_impl.cc +@@ -93,7 +93,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 -@@ -183,7 +183,7 @@ +@@ -187,7 +187,7 @@ scoped_refptr thread_safe_sender_; }; -#if defined(OS_ANDROID) +#if defined(OS_ANDROID) || defined(OS_BSD) // WebKit doesn't use WebSandboxSupport on android so we don't need to // implement anything here. class RendererWebKitPlatformSupportImpl::SandboxSupport { -@@ -277,7 +277,7 @@ +@@ -281,7 +281,7 @@ } blink::WebSandboxSupport* RendererWebKitPlatformSupportImpl::sandboxSupport() { -#if defined(OS_ANDROID) +#if defined(OS_ANDROID) || defined(OS_BSD) // WebKit doesn't use WebSandboxSupport on android. return NULL; #else -@@ -595,7 +595,7 @@ +@@ -577,7 +577,7 @@ return FontLoader::CGFontRefFromBuffer(font_data, font_data_size, out); } -#elif defined(OS_ANDROID) +#elif defined(OS_ANDROID) || defined(OS_BSD) // WebKit doesn't use WebSandboxSupport on android so we don't need to // implement anything here. This is cleaner to support than excluding the Index: branches/2014Q4/www/chromium/files/patch-crypto__nss_util.cc =================================================================== --- branches/2014Q4/www/chromium/files/patch-crypto__nss_util.cc (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-crypto__nss_util.cc (revision 370437) @@ -1,33 +1,33 @@ ---- ./crypto/nss_util.cc.orig 2014-08-20 21:03:15.000000000 +0200 -+++ ./crypto/nss_util.cc 2014-08-22 15:06:26.000000000 +0200 +--- crypto/nss_util.cc.orig 2014-10-02 17:39:47 UTC ++++ crypto/nss_util.cc @@ -13,7 +13,7 @@ #include #include -#if defined(OS_OPENBSD) +#if defined(OS_BSD) #include #include #endif -@@ -141,7 +141,7 @@ +@@ -143,7 +143,7 @@ // detection when database_dir is on NFS. See http://crbug.com/48585. // // TODO(wtc): port this function to other USE_NSS platforms. It is defined -// only for OS_LINUX and OS_OPENBSD simply because the statfs structure +// only for OS_LINUX and OS_BSD simply because the statfs structure // is OS-specific. // // Because this function sets an environment variable it must be run before we -@@ -152,10 +152,10 @@ +@@ -154,10 +154,10 @@ base::FileSystemType fs_type = base::FILE_SYSTEM_UNKNOWN; if (base::GetFileSystemType(database_dir, &fs_type)) db_on_nfs = (fs_type == base::FILE_SYSTEM_NFS); -#elif defined(OS_OPENBSD) +#elif defined(OS_BSD) struct statfs buf; if (statfs(database_dir.value().c_str(), &buf) == 0) - db_on_nfs = (strcmp(buf.f_fstypename, MOUNT_NFS) == 0); + db_on_nfs = (strcmp(buf.f_fstypename, "nfs") == 0); #else NOTIMPLEMENTED(); #endif Index: branches/2014Q4/www/chromium/files/patch-device__hid__hid.gyp =================================================================== --- branches/2014Q4/www/chromium/files/patch-device__hid__hid.gyp (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-device__hid__hid.gyp (revision 370437) @@ -1,21 +1,21 @@ ---- ./device/hid/hid.gyp.orig 2014-08-20 21:03:08.000000000 +0200 -+++ ./device/hid/hid.gyp 2014-08-22 15:06:26.000000000 +0200 +--- device/hid/hid.gyp.orig 2014-10-02 17:39:47 UTC ++++ device/hid/hid.gyp @@ -61,6 +61,18 @@ 'input_service_linux.h', ], }], + ['os_bsd==1', { + 'sources!': [ + 'device_monitor_linux.cc', + 'device_monitor_linux.h', + 'hid_connection_linux.cc', + 'hid_connection_linux.h', + 'hid_service_linux.cc', + 'hid_service_linux.h', + 'input_service_linux.cc', + 'input_service_linux.h', + ], + }], ], }, ], Index: branches/2014Q4/www/chromium/files/patch-device__serial__serial.gyp =================================================================== --- branches/2014Q4/www/chromium/files/patch-device__serial__serial.gyp (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-device__serial__serial.gyp (revision 370437) @@ -1,15 +1,15 @@ ---- ./device/serial/serial.gyp.orig 2014-08-20 21:03:08.000000000 +0200 -+++ ./device/serial/serial.gyp 2014-08-22 15:06:26.000000000 +0200 -@@ -20,6 +20,12 @@ +--- device/serial/serial.gyp.orig 2014-10-02 17:39:47 UTC ++++ device/serial/serial.gyp +@@ -32,6 +32,12 @@ '../../build/linux/system.gyp:udev', ], }], + ['os_bsd==1', { + 'sources!': [ + 'serial_device_enumerator_linux.cc', + 'serial_device_enumerator_linux.h', + ], + }], ], - 'variables': { - 'mojom_base_output_dir': 'device/serial', + 'dependencies': [ + 'device_serial_mojo', Index: branches/2014Q4/www/chromium/files/patch-device__serial__serial_io_handler_posix.cc =================================================================== --- branches/2014Q4/www/chromium/files/patch-device__serial__serial_io_handler_posix.cc (nonexistent) +++ branches/2014Q4/www/chromium/files/patch-device__serial__serial_io_handler_posix.cc (revision 370437) @@ -0,0 +1,20 @@ +--- device/serial/serial_io_handler_posix.cc.orig 2014-10-02 17:18:57 UTC ++++ device/serial/serial_io_handler_posix.cc +@@ -39,7 +39,7 @@ + BITRATE_TO_SPEED_CASE(9600) + BITRATE_TO_SPEED_CASE(19200) + BITRATE_TO_SPEED_CASE(38400) +-#if defined(OS_POSIX) && !defined(OS_MACOSX) ++#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD) + BITRATE_TO_SPEED_CASE(57600) + BITRATE_TO_SPEED_CASE(115200) + BITRATE_TO_SPEED_CASE(230400) +@@ -77,7 +77,7 @@ + SPEED_TO_BITRATE_CASE(9600) + SPEED_TO_BITRATE_CASE(19200) + SPEED_TO_BITRATE_CASE(38400) +-#if defined(OS_POSIX) && !defined(OS_MACOSX) ++#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD) + SPEED_TO_BITRATE_CASE(57600) + SPEED_TO_BITRATE_CASE(115200) + SPEED_TO_BITRATE_CASE(230400) Property changes on: branches/2014Q4/www/chromium/files/patch-device__serial__serial_io_handler_posix.cc ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +LF \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2014Q4/www/chromium/files/patch-extensions__browser__api__serial__serial_api.cc =================================================================== --- branches/2014Q4/www/chromium/files/patch-extensions__browser__api__serial__serial_api.cc (nonexistent) +++ branches/2014Q4/www/chromium/files/patch-extensions__browser__api__serial__serial_api.cc (revision 370437) @@ -0,0 +1,16 @@ +--- extensions/browser/api/serial/serial_api.cc.orig 2014-10-02 17:39:47 UTC ++++ extensions/browser/api/serial/serial_api.cc +@@ -85,11 +85,13 @@ + void SerialGetDevicesFunction::Work() { + DCHECK_CURRENTLY_ON(BrowserThread::FILE); + ++#if !defined(OS_FREEBSD) //XXX(rene) quick hack + scoped_ptr enumerator = + device::SerialDeviceEnumerator::Create(); + mojo::Array devices = enumerator->GetDevices(); + results_ = serial::GetDevices::Results::Create( + devices.To > >()); ++#endif + } + + SerialConnectFunction::SerialConnectFunction() { Property changes on: branches/2014Q4/www/chromium/files/patch-extensions__browser__api__serial__serial_api.cc ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +LF \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2014Q4/www/chromium/files/patch-gpu__config__gpu_control_list.cc =================================================================== --- branches/2014Q4/www/chromium/files/patch-gpu__config__gpu_control_list.cc (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-gpu__config__gpu_control_list.cc (revision 370437) @@ -1,15 +1,15 @@ ---- ./gpu/config/gpu_control_list.cc.orig 2014-08-20 21:02:37.000000000 +0200 -+++ ./gpu/config/gpu_control_list.cc 2014-08-22 15:06:26.000000000 +0200 -@@ -1539,10 +1539,10 @@ +--- gpu/config/gpu_control_list.cc.orig 2014-10-02 17:39:47 UTC ++++ gpu/config/gpu_control_list.cc +@@ -1480,10 +1480,10 @@ return kOsWin; #elif defined(OS_ANDROID) return kOsAndroid; -#elif defined(OS_LINUX) || defined(OS_OPENBSD) - return kOsLinux; #elif defined(OS_MACOSX) return kOsMacosx; +#elif defined(OS_POSIX) + return kOsLinux; #else return kOsUnknown; #endif Index: branches/2014Q4/www/chromium/files/patch-gpu__config__gpu_control_list_unittest.cc =================================================================== --- branches/2014Q4/www/chromium/files/patch-gpu__config__gpu_control_list_unittest.cc (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-gpu__config__gpu_control_list_unittest.cc (revision 370437) @@ -1,12 +1,12 @@ ---- ./gpu/config/gpu_control_list_unittest.cc.orig 2014-08-20 21:02:37.000000000 +0200 -+++ ./gpu/config/gpu_control_list_unittest.cc 2014-08-22 15:06:26.000000000 +0200 +--- gpu/config/gpu_control_list_unittest.cc.orig 2014-10-02 17:39:47 UTC ++++ gpu/config/gpu_control_list_unittest.cc @@ -177,8 +177,7 @@ features = control_list->MakeDecision( GpuControlList::kOsLinux, kOsVersion, gpu_info()); EXPECT_SINGLE_FEATURE(features, TEST_FEATURE_0); -#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) || \ - defined(OS_OPENBSD) +#if defined(OS_WIN) || (defined(OS_POSIX) && !defined(OS_ANDROID)) // ControlList entries will be filtered to the current OS only upon loading. EXPECT_TRUE(control_list->LoadList( vendor_json, GpuControlList::kCurrentOsOnly)); Index: branches/2014Q4/www/chromium/files/patch-gpu__config__gpu_info_collector.cc =================================================================== --- branches/2014Q4/www/chromium/files/patch-gpu__config__gpu_info_collector.cc (nonexistent) +++ branches/2014Q4/www/chromium/files/patch-gpu__config__gpu_info_collector.cc (revision 370437) @@ -0,0 +1,12 @@ +--- gpu/config/gpu_info_collector.cc.orig 2014-10-02 17:39:47 UTC ++++ gpu/config/gpu_info_collector.cc +@@ -126,7 +126,9 @@ + gpu_info->pixel_shader_version = glsl_version; + gpu_info->vertex_shader_version = glsl_version; + ++#ifndef __FreeBSD__ + return CollectDriverInfoGL(gpu_info); ++#endif + } + + void MergeGPUInfoGL(GPUInfo* basic_gpu_info, Property changes on: branches/2014Q4/www/chromium/files/patch-gpu__config__gpu_info_collector.cc ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +LF \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2014Q4/www/chromium/files/patch-gpu__config__gpu_test_config.cc =================================================================== --- branches/2014Q4/www/chromium/files/patch-gpu__config__gpu_test_config.cc (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-gpu__config__gpu_test_config.cc (revision 370437) @@ -1,20 +1,39 @@ ---- ./gpu/config/gpu_test_config.cc.orig 2014-08-20 21:02:37.000000000 +0200 -+++ ./gpu/config/gpu_test_config.cc 2014-08-22 15:06:26.000000000 +0200 +--- gpu/config/gpu_test_config.cc.orig 2014-10-02 17:39:47 UTC ++++ gpu/config/gpu_test_config.cc @@ -23,8 +23,6 @@ GPUTestConfig::OS GetCurrentOS() { #if defined(OS_CHROMEOS) return GPUTestConfig::kOsChromeOS; -#elif defined(OS_LINUX) || defined(OS_OPENBSD) - return GPUTestConfig::kOsLinux; #elif defined(OS_WIN) int32 major_version = 0; int32 minor_version = 0; @@ -61,6 +59,8 @@ } #elif defined(OS_ANDROID) return GPUTestConfig::kOsAndroid; +#elif defined(OS_POSIX) + return GPUTestConfig::kOsLinux; #endif return GPUTestConfig::kOsUnknown; } +@@ -234,6 +234,10 @@ + if (gpu_info == NULL) { + GPUInfo my_gpu_info; + GpuIDResult result; ++#if defined(OS_FREEBSD) ++ rt = false; ++ LOG(WARNING) << "CollectGpuID not present on FreeBSD"; ++#else + result = CollectGpuID(&my_gpu_info.gpu.vendor_id, + &my_gpu_info.gpu.device_id); + if (result == kGpuIDNotSupported) { +@@ -243,6 +247,7 @@ + } else { + rt = SetGPUInfo(my_gpu_info); + } ++#endif + } else { + rt = SetGPUInfo(*gpu_info); + } Index: branches/2014Q4/www/chromium/files/patch-gpu__config__gpu_util.cc =================================================================== --- branches/2014Q4/www/chromium/files/patch-gpu__config__gpu_util.cc (nonexistent) +++ branches/2014Q4/www/chromium/files/patch-gpu__config__gpu_util.cc (revision 370437) @@ -0,0 +1,15 @@ +--- gpu/config/gpu_util.cc.orig 2014-10-02 17:18:58 UTC ++++ gpu/config/gpu_util.cc +@@ -54,10 +54,12 @@ + } + + void ApplyGpuDriverBugWorkarounds(CommandLine* command_line) { ++#ifndef __FreeBSD__ + GPUInfo gpu_info; + CollectBasicGraphicsInfo(&gpu_info); + + ApplyGpuDriverBugWorkarounds(gpu_info, command_line); ++#endif + } + + void ApplyGpuDriverBugWorkarounds( Property changes on: branches/2014Q4/www/chromium/files/patch-gpu__config__gpu_util.cc ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2014Q4/www/chromium/files/patch-gpu__gpu_config.gypi =================================================================== --- branches/2014Q4/www/chromium/files/patch-gpu__gpu_config.gypi (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-gpu__gpu_config.gypi (revision 370437) @@ -1,11 +1,22 @@ ---- ./gpu/gpu_config.gypi.orig 2014-08-20 21:02:38.000000000 +0200 -+++ ./gpu/gpu_config.gypi 2014-08-22 15:06:26.000000000 +0200 -@@ -63,7 +63,7 @@ - '../third_party/amd/amd_videocard_info_win.cc', +--- gpu/gpu_config.gypi.orig 2014-10-02 17:18:58 UTC ++++ gpu/gpu_config.gypi +@@ -70,12 +70,18 @@ + '../build/linux/system.gyp:libpci', ], }], - ['OS=="linux" and use_x11==1', { + ['(OS=="linux" or os_bsd==1) and use_x11==1', { 'dependencies': [ '../build/linux/system.gyp:x11', '../build/linux/system.gyp:xext', + '../third_party/libXNVCtrl/libXNVCtrl.gyp:libXNVCtrl', + ], + }], ++ ['os_bsd==1', { ++ 'sources!': [ ++ 'config/gpu_info_collector_linux.cc', ++ 'config/gpu_info_collector_linux.h', ++ ], ++ }], + ], + } Index: branches/2014Q4/www/chromium/files/patch-media__audio__audio_input_volume_unittest.cc =================================================================== --- branches/2014Q4/www/chromium/files/patch-media__audio__audio_input_volume_unittest.cc (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-media__audio__audio_input_volume_unittest.cc (revision 370437) @@ -1,11 +1,11 @@ ---- ./media/audio/audio_input_volume_unittest.cc.orig 2014-08-20 21:03:15.000000000 +0200 -+++ ./media/audio/audio_input_volume_unittest.cc 2014-08-22 15:06:26.000000000 +0200 +--- media/audio/audio_input_volume_unittest.cc.orig 2014-10-02 17:39:47 UTC ++++ media/audio/audio_input_volume_unittest.cc @@ -74,7 +74,7 @@ params, device_id); EXPECT_TRUE(NULL != ais); -#if defined(OS_LINUX) || defined(OS_OPENBSD) +#if defined(OS_LINUX) || defined(OS_BSD) // Some linux devices do not support our settings, we may fail to open // those devices. if (!ais->Open()) { Index: branches/2014Q4/www/chromium/files/patch-media__base__audio_splicer.cc =================================================================== --- branches/2014Q4/www/chromium/files/patch-media__base__audio_splicer.cc (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-media__base__audio_splicer.cc (revision 370437) @@ -1,20 +1,20 @@ ---- ./media/base/audio_splicer.cc.orig 2014-08-20 21:03:11.000000000 +0200 -+++ ./media/base/audio_splicer.cc 2014-08-22 15:06:26.000000000 +0200 +--- media/base/audio_splicer.cc.orig 2014-10-02 17:39:47 UTC ++++ media/base/audio_splicer.cc @@ -137,7 +137,7 @@ output_timestamp_helper_.GetTimestamp(); const base::TimeDelta delta = timestamp - expected_timestamp; - if (std::abs(delta.InMilliseconds()) > + if (std::labs(delta.InMilliseconds()) > AudioSplicer::kMaxTimeDeltaInMilliseconds) { DVLOG(1) << "Timestamp delta too large: " << delta.InMicroseconds() << "us"; return false; @@ -147,7 +147,7 @@ if (delta != base::TimeDelta()) frames_to_fill = output_timestamp_helper_.GetFramesToTarget(timestamp); - if (frames_to_fill == 0 || std::abs(frames_to_fill) < kMinGapSize) { + if (frames_to_fill == 0 || std::labs(frames_to_fill) < kMinGapSize) { AddOutputBuffer(input); return true; } Index: branches/2014Q4/www/chromium/files/patch-media__filters__decrypting_audio_decoder.cc =================================================================== --- branches/2014Q4/www/chromium/files/patch-media__filters__decrypting_audio_decoder.cc (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-media__filters__decrypting_audio_decoder.cc (revision 370437) @@ -1,11 +1,11 @@ ---- ./media/filters/decrypting_audio_decoder.cc.orig 2014-08-20 21:03:15.000000000 +0200 -+++ ./media/filters/decrypting_audio_decoder.cc 2014-08-22 15:06:26.000000000 +0200 +--- media/filters/decrypting_audio_decoder.cc.orig 2014-10-02 17:39:47 UTC ++++ media/filters/decrypting_audio_decoder.cc @@ -30,7 +30,7 @@ // Out of sync of 100ms would be pretty noticeable and we should keep any // drift below that. const int64 kOutOfSyncThresholdInMilliseconds = 100; - return std::abs(timestamp_1.InMilliseconds() - timestamp_2.InMilliseconds()) > + return std::labs(timestamp_1.InMilliseconds() - timestamp_2.InMilliseconds()) > kOutOfSyncThresholdInMilliseconds; } Index: branches/2014Q4/www/chromium/files/patch-media__media.gyp =================================================================== --- branches/2014Q4/www/chromium/files/patch-media__media.gyp (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-media__media.gyp (revision 370437) @@ -1,20 +1,20 @@ ---- ./media/media.gyp.orig 2014-08-20 21:03:15.000000000 +0200 -+++ ./media/media.gyp 2014-08-22 15:06:26.000000000 +0200 -@@ -683,7 +683,7 @@ +--- media/media.gyp.orig 2014-10-02 17:39:47 UTC ++++ media/media.gyp +@@ -678,7 +678,7 @@ 'audio/openbsd/audio_manager_openbsd.h', ], }], - ['OS=="linux"', { + ['OS=="linux" or os_bsd==1', { 'conditions': [ ['use_x11==1', { 'dependencies': [ -@@ -984,7 +984,7 @@ +@@ -986,7 +986,7 @@ 'base/simd/convert_yuv_to_rgb_x86.cc', ], }], - ['OS!="linux" and OS!="win"', { + ['OS!="linux" and OS!="win" and os_bsd!=1', { 'sources!': [ 'base/keyboard_event_counter.cc', 'base/keyboard_event_counter.h', Index: branches/2014Q4/www/chromium/files/patch-media__video__capture__video_capture_device_factory.cc =================================================================== --- branches/2014Q4/www/chromium/files/patch-media__video__capture__video_capture_device_factory.cc (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-media__video__capture__video_capture_device_factory.cc (revision 370437) @@ -1,20 +1,20 @@ ---- ./media/video/capture/video_capture_device_factory.cc.orig 2014-08-20 21:03:15.000000000 +0200 -+++ ./media/video/capture/video_capture_device_factory.cc 2014-08-22 22:39:36.000000000 +0200 +--- media/video/capture/video_capture_device_factory.cc.orig 2014-10-02 17:18:58 UTC ++++ media/video/capture/video_capture_device_factory.cc @@ -11,7 +11,7 @@ #if defined(OS_MACOSX) #include "media/video/capture/mac/video_capture_device_factory_mac.h" -#elif defined(OS_LINUX) +#elif defined(OS_LINUX) || defined(OS_FREEBSD) || defined(OS_OPENBSD) #include "media/video/capture/linux/video_capture_device_factory_linux.h" #elif defined(OS_ANDROID) #include "media/video/capture/android/video_capture_device_factory_android.h" @@ -41,7 +41,7 @@ #if defined(OS_MACOSX) return scoped_ptr(new VideoCaptureDeviceFactoryMac(ui_task_runner)); -#elif defined(OS_LINUX) +#elif defined(OS_LINUX) || defined(OS_FREEBSD) || defined(OS_OPENBSD) return scoped_ptr(new VideoCaptureDeviceFactoryLinux(ui_task_runner)); #elif defined(OS_ANDROID) Index: branches/2014Q4/www/chromium/files/patch-native_client__build__common.gypi =================================================================== --- branches/2014Q4/www/chromium/files/patch-native_client__build__common.gypi (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-native_client__build__common.gypi (revision 370437) @@ -1,11 +1,11 @@ ---- ./native_client/build/common.gypi.orig 2014-08-20 21:03:22.000000000 +0200 -+++ ./native_client/build/common.gypi 2014-08-22 15:06:26.000000000 +0200 -@@ -286,7 +286,7 @@ +--- native_client/build/common.gypi.orig 2014-10-02 17:40:29 UTC ++++ native_client/build/common.gypi +@@ -290,7 +290,7 @@ ], }, 'conditions': [ - ['OS=="linux" or OS=="android"', { + ['OS=="linux" or OS=="android" or OS=="freebsd"', { 'target_defaults': { # Enable -Werror by default, but put it in a variable so it can # be disabled in ~/.gyp/include.gypi on the valgrind builders. Index: branches/2014Q4/www/chromium/files/patch-native_client__src__shared__platform__platform.gyp =================================================================== --- branches/2014Q4/www/chromium/files/patch-native_client__src__shared__platform__platform.gyp (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-native_client__src__shared__platform__platform.gyp (revision 370437) @@ -1,11 +1,11 @@ ---- ./native_client/src/shared/platform/platform.gyp.orig 2014-08-20 21:03:23.000000000 +0200 -+++ ./native_client/src/shared/platform/platform.gyp 2014-08-22 15:06:26.000000000 +0200 +--- native_client/src/shared/platform/platform.gyp.orig 2014-10-02 17:40:30 UTC ++++ native_client/src/shared/platform/platform.gyp @@ -36,7 +36,7 @@ 'refcount_base.cc', ], 'conditions': [ - ['OS=="linux" or OS=="android"', { + ['OS=="linux" or OS=="android" or OS=="freebsd"', { 'platform_sources': [ 'linux/nacl_clock.c', 'linux/nacl_host_dir.c', Index: branches/2014Q4/www/chromium/files/patch-net__base__address_tracker_linux.h =================================================================== --- branches/2014Q4/www/chromium/files/patch-net__base__address_tracker_linux.h (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-net__base__address_tracker_linux.h (revision 370437) @@ -1,15 +1,15 @@ ---- ./net/base/address_tracker_linux.h.orig 2014-08-20 21:02:28.000000000 +0200 -+++ ./net/base/address_tracker_linux.h 2014-08-22 15:06:26.000000000 +0200 +--- net/base/address_tracker_linux.h.orig 2014-10-02 17:39:47 UTC ++++ net/base/address_tracker_linux.h @@ -6,10 +6,12 @@ #define NET_BASE_ADDRESS_TRACKER_LINUX_H_ #include // Needed to include netlink. +#if !defined(__FreeBSD__) // Mask superfluous definition of |struct net|. This is fixed in Linux 2.6.38. #define net net_kernel #include #undef net +#endif #include Index: branches/2014Q4/www/chromium/files/patch-net__base__address_tracker_linux_unittest.cc =================================================================== --- branches/2014Q4/www/chromium/files/patch-net__base__address_tracker_linux_unittest.cc (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-net__base__address_tracker_linux_unittest.cc (revision 370437) @@ -1,14 +1,14 @@ ---- ./net/base/address_tracker_linux_unittest.cc.orig 2014-08-20 21:02:28.000000000 +0200 -+++ ./net/base/address_tracker_linux_unittest.cc 2014-08-22 15:06:26.000000000 +0200 +--- net/base/address_tracker_linux_unittest.cc.orig 2014-10-02 17:39:47 UTC ++++ net/base/address_tracker_linux_unittest.cc @@ -4,7 +4,11 @@ #include "net/base/address_tracker_linux.h" +#if defined(__linux__) #include +#else +#include +#endif #include Index: branches/2014Q4/www/chromium/files/patch-net__base__dns_reloader.cc =================================================================== --- branches/2014Q4/www/chromium/files/patch-net__base__dns_reloader.cc (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-net__base__dns_reloader.cc (revision 370437) @@ -1,12 +1,12 @@ ---- ./net/base/dns_reloader.cc.orig 2014-08-20 21:02:28.000000000 +0200 -+++ ./net/base/dns_reloader.cc 2014-08-22 15:06:26.000000000 +0200 +--- net/base/dns_reloader.cc.orig 2014-10-02 17:18:59 UTC ++++ net/base/dns_reloader.cc @@ -7,6 +7,9 @@ #if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_OPENBSD) && \ !defined(OS_ANDROID) +#if defined(OS_FREEBSD) +#include +#endif #include #include "base/basictypes.h" Index: branches/2014Q4/www/chromium/files/patch-net__base__mime_util_unittest.cc =================================================================== --- branches/2014Q4/www/chromium/files/patch-net__base__mime_util_unittest.cc (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-net__base__mime_util_unittest.cc (revision 370437) @@ -1,11 +1,11 @@ ---- ./net/base/mime_util_unittest.cc.orig 2014-08-20 21:02:28.000000000 +0200 -+++ ./net/base/mime_util_unittest.cc 2014-08-22 15:06:26.000000000 +0200 -@@ -385,7 +385,7 @@ +--- net/base/mime_util_unittest.cc.orig 2014-10-02 17:39:47 UTC ++++ net/base/mime_util_unittest.cc +@@ -383,7 +383,7 @@ { "MeSsAge/*", 1, "eml" }, { "image/bmp", 1, "bmp" }, { "video/*", 6, "mp4" }, -#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_IOS) +#if (defined(OS_POSIX) && !defined(OS_MACOSX)) || defined(OS_IOS) { "video/*", 6, "mpg" }, #else { "video/*", 6, "mpeg" }, Index: branches/2014Q4/www/chromium/files/patch-net__base__net_util.h =================================================================== --- branches/2014Q4/www/chromium/files/patch-net__base__net_util.h (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-net__base__net_util.h (revision 370437) @@ -1,12 +1,12 @@ ---- ./net/base/net_util.h.orig 2014-08-20 21:02:28.000000000 +0200 -+++ ./net/base/net_util.h 2014-08-22 15:06:26.000000000 +0200 +--- net/base/net_util.h.orig 2014-10-02 17:39:47 UTC ++++ net/base/net_util.h @@ -13,6 +13,9 @@ #elif defined(OS_POSIX) #include #include +#if defined(OS_BSD) +#include +#endif #endif #include Index: branches/2014Q4/www/chromium/files/patch-net__base__network_change_notifier.cc =================================================================== --- branches/2014Q4/www/chromium/files/patch-net__base__network_change_notifier.cc (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-net__base__network_change_notifier.cc (revision 370437) @@ -1,10 +1,10 @@ ---- ./net/base/network_change_notifier.cc.orig 2014-08-20 21:02:28.000000000 +0200 -+++ ./net/base/network_change_notifier.cc 2014-08-22 15:06:26.000000000 +0200 +--- net/base/network_change_notifier.cc.orig 2014-10-02 17:39:47 UTC ++++ net/base/network_change_notifier.cc @@ -521,7 +521,6 @@ #elif defined(OS_MACOSX) return new NetworkChangeNotifierMac(); #else - NOTIMPLEMENTED(); return NULL; #endif } Index: branches/2014Q4/www/chromium/files/patch-net__dns__address_sorter_posix.cc =================================================================== --- branches/2014Q4/www/chromium/files/patch-net__dns__address_sorter_posix.cc (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-net__dns__address_sorter_posix.cc (revision 370437) @@ -1,10 +1,10 @@ ---- ./net/dns/address_sorter_posix.cc.orig 2014-08-20 21:02:28.000000000 +0200 -+++ ./net/dns/address_sorter_posix.cc 2014-08-22 15:06:26.000000000 +0200 +--- net/dns/address_sorter_posix.cc.orig 2014-10-02 17:18:59 UTC ++++ net/dns/address_sorter_posix.cc @@ -10,6 +10,7 @@ #include // Must be included before ifaddrs.h. #include #include +#include #include #include #include Index: branches/2014Q4/www/chromium/files/patch-net__dns__dns_config_service_posix_unittest.cc =================================================================== --- branches/2014Q4/www/chromium/files/patch-net__dns__dns_config_service_posix_unittest.cc (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-net__dns__dns_config_service_posix_unittest.cc (revision 370437) @@ -1,11 +1,11 @@ ---- ./net/dns/dns_config_service_posix_unittest.cc.orig 2014-08-20 21:02:28.000000000 +0200 -+++ ./net/dns/dns_config_service_posix_unittest.cc 2014-08-22 15:06:26.000000000 +0200 +--- net/dns/dns_config_service_posix_unittest.cc.orig 2014-10-02 17:18:59 UTC ++++ net/dns/dns_config_service_posix_unittest.cc @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include - #include "base/sys_byteorder.h" #include "net/dns/dns_config_service_posix.h" Index: branches/2014Q4/www/chromium/files/patch-net__dns__dns_session.cc =================================================================== --- branches/2014Q4/www/chromium/files/patch-net__dns__dns_session.cc (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-net__dns__dns_session.cc (revision 370437) @@ -1,11 +1,11 @@ ---- ./net/dns/dns_session.cc.orig 2014-08-20 21:02:28.000000000 +0200 -+++ ./net/dns/dns_session.cc 2014-08-22 15:06:26.000000000 +0200 +--- net/dns/dns_session.cc.orig 2014-10-02 17:39:47 UTC ++++ net/dns/dns_session.cc @@ -178,7 +178,7 @@ base::TimeDelta current_error = rtt - estimate; estimate += current_error / 8; // * alpha base::TimeDelta abs_error = base::TimeDelta::FromInternalValue( - std::abs(current_error.ToInternalValue())); + std::labs(current_error.ToInternalValue())); deviation += (abs_error - deviation) / 4; // * delta // Histogram-based method. Index: branches/2014Q4/www/chromium/files/patch-net__http__http_auth_gssapi_posix.cc =================================================================== --- branches/2014Q4/www/chromium/files/patch-net__http__http_auth_gssapi_posix.cc (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-net__http__http_auth_gssapi_posix.cc (revision 370437) @@ -1,13 +1,13 @@ ---- ./net/http/http_auth_gssapi_posix.cc.orig 2014-08-20 21:02:28.000000000 +0200 -+++ ./net/http/http_auth_gssapi_posix.cc 2014-08-22 15:06:26.000000000 +0200 +--- net/http/http_auth_gssapi_posix.cc.orig 2014-10-02 17:18:59 UTC ++++ net/http/http_auth_gssapi_posix.cc @@ -431,8 +431,8 @@ static const char* const kDefaultLibraryNames[] = { #if defined(OS_MACOSX) "libgssapi_krb5.dylib" // MIT Kerberos -#elif defined(OS_OPENBSD) - "libgssapi.so" // Heimdal - OpenBSD +#elif defined(OS_BSD) + "libgssapi.so" // Heimdal - OpenBSD / FreeBSD #else "libgssapi_krb5.so.2", // MIT Kerberos - FC, Suse10, Debian "libgssapi.so.4", // Heimdal - Suse10, MDK Index: branches/2014Q4/www/chromium/files/patch-net__http__http_auth_gssapi_posix.h =================================================================== --- branches/2014Q4/www/chromium/files/patch-net__http__http_auth_gssapi_posix.h (nonexistent) +++ branches/2014Q4/www/chromium/files/patch-net__http__http_auth_gssapi_posix.h (revision 370437) @@ -0,0 +1,12 @@ +--- net/http/http_auth_gssapi_posix.h.orig 2014-10-02 17:18:59 UTC ++++ net/http/http_auth_gssapi_posix.h +@@ -16,6 +16,9 @@ + MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_9 + // Including gssapi.h directly is deprecated in the 10.9 SDK. + #include ++#elif defined(OS_FREEBSD) ++// Including gssapi.h is deprecated since at least FreeBSD 9 ++#include + #else + #include + #endif Property changes on: branches/2014Q4/www/chromium/files/patch-net__http__http_auth_gssapi_posix.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +LF \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2014Q4/www/chromium/files/patch-net__http__mock_gssapi_library_posix.h =================================================================== --- branches/2014Q4/www/chromium/files/patch-net__http__mock_gssapi_library_posix.h (nonexistent) +++ branches/2014Q4/www/chromium/files/patch-net__http__mock_gssapi_library_posix.h (revision 370437) @@ -0,0 +1,12 @@ +--- net/http/mock_gssapi_library_posix.h.orig 2014-10-02 17:18:59 UTC ++++ net/http/mock_gssapi_library_posix.h +@@ -15,6 +15,9 @@ + MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_9 + // Including gssapi.h directly is deprecated in the 10.9 SDK. + #include ++#elif defined(OS_FREEBSD) ++// Including gssapi.h is deprecated since at least FreeBSD 9 ++#include + #else + #include + #endif Property changes on: branches/2014Q4/www/chromium/files/patch-net__http__mock_gssapi_library_posix.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2014Q4/www/chromium/files/patch-net__net.gyp =================================================================== --- branches/2014Q4/www/chromium/files/patch-net__net.gyp (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-net__net.gyp (revision 370437) @@ -1,35 +1,35 @@ ---- ./net/net.gyp.orig 2014-08-20 21:02:28.000000000 +0200 -+++ ./net/net.gyp 2014-08-22 15:06:26.000000000 +0200 -@@ -317,9 +317,10 @@ +--- net/net.gyp.orig 2014-10-02 17:39:47 UTC ++++ net/net.gyp +@@ -322,9 +322,10 @@ }], ['os_bsd==1', { 'sources!': [ + 'base/address_tracker_linux.cc', 'base/network_change_notifier_linux.cc', 'base/network_change_notifier_netlink_linux.cc', - 'proxy/proxy_config_service_linux.cc', +# 'proxy/proxy_config_service_linux.cc', ], },{ 'dependencies': [ -@@ -551,7 +552,7 @@ +@@ -556,7 +557,7 @@ '<@(net_test_sources)', ], 'conditions': [ - ['os_posix == 1 and OS != "mac" and OS != "ios" and OS != "android"', { + ['os_posix == 1 and OS != "mac" and OS != "ios" and OS != "android" and os_bsd != 1', { 'dependencies': [ 'epoll_server', 'flip_in_mem_edsm_server_base', -@@ -1016,6 +1017,11 @@ - 'dns/mock_mdns_socket_factory.h' - ] +@@ -1028,6 +1029,11 @@ + 'test/cert_test_util_nss.cc', + ], }], + [ 'os_bsd == 1', { + 'sources!': [ + 'base/address_tracker_linux_unittest.cc', + ], + }], ], # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. 'msvs_disabled_warnings': [4267, ], Index: branches/2014Q4/www/chromium/files/patch-net__net.gypi =================================================================== --- branches/2014Q4/www/chromium/files/patch-net__net.gypi (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-net__net.gypi (revision 370437) @@ -1,22 +1,22 @@ ---- ./net/net.gypi.orig 2014-08-20 21:02:28.000000000 +0200 -+++ ./net/net.gypi 2014-08-22 15:06:26.000000000 +0200 -@@ -171,8 +171,8 @@ +--- net/net.gypi.orig 2014-10-02 17:39:47 UTC ++++ net/net.gypi +@@ -177,8 +177,8 @@ 'android/network_change_notifier_factory_android.h', 'android/network_library.cc', 'android/network_library.h', - 'base/address_tracker_linux.cc', - 'base/address_tracker_linux.h', + #'base/address_tracker_linux.cc', + #'base/address_tracker_linux.h', 'base/backoff_entry.cc', 'base/backoff_entry.h', 'base/bandwidth_metrics.cc', -@@ -1221,7 +1221,7 @@ +@@ -1250,7 +1250,7 @@ 'android/keystore_unittest.cc', 'android/network_change_notifier_android_unittest.cc', 'base/address_list_unittest.cc', - 'base/address_tracker_linux_unittest.cc', + #'base/address_tracker_linux_unittest.cc', 'base/backoff_entry_unittest.cc', 'base/data_url_unittest.cc', 'base/directory_lister_unittest.cc', Index: branches/2014Q4/www/chromium/files/patch-net__proxy__proxy_config_service_linux.cc =================================================================== --- branches/2014Q4/www/chromium/files/patch-net__proxy__proxy_config_service_linux.cc (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-net__proxy__proxy_config_service_linux.cc (revision 370437) @@ -1,160 +1,160 @@ ---- ./net/proxy/proxy_config_service_linux.cc.orig 2014-08-20 21:02:28.000000000 +0200 -+++ ./net/proxy/proxy_config_service_linux.cc 2014-08-22 15:06:26.000000000 +0200 +--- net/proxy/proxy_config_service_linux.cc.orig 2014-10-02 17:39:47 UTC ++++ net/proxy/proxy_config_service_linux.cc @@ -21,7 +21,13 @@ #include #include #include +#if defined(OS_FREEBSD) +#include +#include +#include +#else #include +#endif #include #include @@ -861,9 +867,10 @@ public base::MessagePumpLibevent::Watcher { public: explicit SettingGetterImplKDE(base::Environment* env_var_getter) - : inotify_fd_(-1), notify_delegate_(NULL), indirect_manual_(false), - auto_no_pac_(false), reversed_bypass_list_(false), - env_var_getter_(env_var_getter), file_loop_(NULL) { + : inotify_fd_(-1), config_fd_(-1), notify_delegate_(NULL), + indirect_manual_(false), auto_no_pac_(false), + reversed_bypass_list_(false), env_var_getter_(env_var_getter), + file_loop_(NULL) { // This has to be called on the UI thread (http://crbug.com/69057). base::ThreadRestrictions::ScopedAllowIO allow_io; @@ -927,9 +934,10 @@ // and pending tasks may then be deleted without being run. // Here in the KDE version, we can safely close the file descriptor // anyway. (Not that it really matters; the process is exiting.) - if (inotify_fd_ >= 0) + if (inotify_fd_ >= 0 || config_fd_ >= 0) ShutDown(); DCHECK(inotify_fd_ < 0); + DCHECK(config_fd_ < 0); } virtual bool Init(base::SingleThreadTaskRunner* glib_thread_task_runner, @@ -937,11 +945,21 @@ // This has to be called on the UI thread (http://crbug.com/69057). base::ThreadRestrictions::ScopedAllowIO allow_io; DCHECK(inotify_fd_ < 0); +#if defined(OS_FREEBSD) + inotify_fd_ = kqueue(); +#else inotify_fd_ = inotify_init(); +#endif if (inotify_fd_ < 0) { +#if defined(OS_FREEBSD) + PLOG(ERROR) << "kqueue failed"; +#else PLOG(ERROR) << "inotify_init failed"; +#endif return false; } + +#if !defined(OS_FREEBSD) int flags = fcntl(inotify_fd_, F_GETFL); if (fcntl(inotify_fd_, F_SETFL, flags | O_NONBLOCK) < 0) { PLOG(ERROR) << "fcntl failed"; @@ -949,6 +967,7 @@ inotify_fd_ = -1; return false; } +#endif file_loop_ = file_loop; // The initial read is done on the current thread, not |file_loop_|, // since we will need to have it for SetUpAndFetchInitialConfig(). @@ -963,20 +982,38 @@ close(inotify_fd_); inotify_fd_ = -1; } + if (config_fd_ >= 0) { + close(config_fd_); + config_fd_ = -1; + } } virtual bool SetUpNotifications( ProxyConfigServiceLinux::Delegate* delegate) OVERRIDE { DCHECK(inotify_fd_ >= 0); + DCHECK(config_fd_ >= 0); DCHECK(base::MessageLoop::current() == file_loop_); // We can't just watch the kioslaverc file directly, since KDE will write // a new copy of it and then rename it whenever settings are changed and // inotify watches inodes (so we'll be watching the old deleted file after // the first change, and it will never change again). So, we watch the // directory instead. We then act only on changes to the kioslaverc entry. +#if defined(OS_FREEBSD) + config_fd_ = HANDLE_EINTR(open(kde_config_dir_.value().c_str(), O_RDONLY)); + + if (config_fd_ == -1) + return false; + + struct kevent ev; + EV_SET(&ev, config_fd_, EVFILT_VNODE, EV_ADD | EV_CLEAR, NOTE_WRITE, + 0, NULL); + if (kevent(inotify_fd_, &ev, 1, NULL, 0, NULL) == -1) + return false; +#else if (inotify_add_watch(inotify_fd_, kde_config_dir_.value().c_str(), IN_MODIFY | IN_MOVED_TO) < 0) return false; +#endif notify_delegate_ = delegate; if (!file_loop_->WatchFileDescriptor(inotify_fd_, true, @@ -997,7 +1034,19 @@ virtual void OnFileCanReadWithoutBlocking(int fd) OVERRIDE { DCHECK_EQ(fd, inotify_fd_); DCHECK(base::MessageLoop::current() == file_loop_); +#if defined(OS_FREEBSD) + struct kevent ev; + int rv = kevent(inotify_fd_, NULL, 0, &ev, 1, NULL); + + if (rv != -1 && (ev.flags & EV_ERROR) == 0) { + OnChangeNotification(); + } else { + LOG(ERROR) << "kevent() failure; no longer watching kioslaverc!"; + ShutDown(); + } +#else OnChangeNotification(); +#endif } virtual void OnFileCanWriteWithoutBlocking(int fd) OVERRIDE { NOTREACHED(); @@ -1276,8 +1325,11 @@ void OnChangeNotification() { DCHECK_GE(inotify_fd_, 0); DCHECK(base::MessageLoop::current() == file_loop_); - char event_buf[(sizeof(inotify_event) + NAME_MAX + 1) * 4]; bool kioslaverc_touched = false; +#if defined(OS_BSD) + kioslaverc_touched = true; +#else + char event_buf[(sizeof(inotify_event) + NAME_MAX + 1) * 4]; ssize_t r; while ((r = read(inotify_fd_, event_buf, sizeof(event_buf))) > 0) { // inotify returns variable-length structures, which is why we have @@ -1314,6 +1366,7 @@ inotify_fd_ = -1; } } +#endif if (kioslaverc_touched) { // We don't use Reset() because the timer may not yet be running. // (In that case Stop() is a no-op.) @@ -1329,6 +1382,7 @@ std::vector > strings_map_type; int inotify_fd_; + int config_fd_; base::MessagePumpLibevent::FileDescriptorWatcher inotify_watcher_; ProxyConfigServiceLinux::Delegate* notify_delegate_; base::OneShotTimer debounce_timer_; Index: branches/2014Q4/www/chromium/files/patch-net__proxy__proxy_service.cc =================================================================== --- branches/2014Q4/www/chromium/files/patch-net__proxy__proxy_service.cc (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-net__proxy__proxy_service.cc (revision 370437) @@ -1,20 +1,20 @@ ---- ./net/proxy/proxy_service.cc.orig 2014-08-20 21:02:28.000000000 +0200 -+++ ./net/proxy/proxy_service.cc 2014-08-22 15:06:26.000000000 +0200 -@@ -41,7 +41,7 @@ +--- net/proxy/proxy_service.cc.orig 2014-10-02 17:39:47 UTC ++++ net/proxy/proxy_service.cc +@@ -40,7 +40,7 @@ #elif defined(OS_MACOSX) #include "net/proxy/proxy_config_service_mac.h" #include "net/proxy/proxy_resolver_mac.h" -#elif defined(OS_LINUX) && !defined(OS_CHROMEOS) +#elif (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_FREEBSD) #include "net/proxy/proxy_config_service_linux.h" #elif defined(OS_ANDROID) #include "net/proxy/proxy_config_service_android.h" -@@ -1379,7 +1379,7 @@ +@@ -1412,7 +1412,7 @@ << "profile_io_data.cc::CreateProxyConfigService and this should " << "be used only for examples."; return new UnsetProxyConfigService; -#elif defined(OS_LINUX) +#elif defined(OS_LINUX) || defined(OS_FREEBSD) ProxyConfigServiceLinux* linux_config_service = new ProxyConfigServiceLinux(); Index: branches/2014Q4/www/chromium/files/patch-net__quic__congestion_control__rtt_stats.cc =================================================================== --- branches/2014Q4/www/chromium/files/patch-net__quic__congestion_control__rtt_stats.cc (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-net__quic__congestion_control__rtt_stats.cc (revision 370437) @@ -1,11 +1,11 @@ ---- ./net/quic/congestion_control/rtt_stats.cc.orig 2014-08-20 21:02:27.000000000 +0200 -+++ ./net/quic/congestion_control/rtt_stats.cc 2014-08-22 15:06:26.000000000 +0200 -@@ -73,7 +73,7 @@ +--- net/quic/congestion_control/rtt_stats.cc.orig 2014-10-02 17:18:59 UTC ++++ net/quic/congestion_control/rtt_stats.cc +@@ -85,7 +85,7 @@ } else { mean_deviation_ = QuicTime::Delta::FromMicroseconds( kOneMinusBeta * mean_deviation_.ToMicroseconds() + - kBeta * std::abs(smoothed_rtt_.Subtract(rtt_sample).ToMicroseconds())); + kBeta * std::labs(smoothed_rtt_.Subtract(rtt_sample).ToMicroseconds())); smoothed_rtt_ = smoothed_rtt_.Multiply(kOneMinusAlpha).Add( rtt_sample.Multiply(kAlpha)); - DVLOG(1) << "Cubic; smoothed_rtt(us):" << smoothed_rtt_.ToMicroseconds() + DVLOG(1) << " smoothed_rtt(us):" << smoothed_rtt_.ToMicroseconds() Index: branches/2014Q4/www/chromium/files/patch-net__socket__socks5_client_socket.cc =================================================================== --- branches/2014Q4/www/chromium/files/patch-net__socket__socks5_client_socket.cc (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-net__socket__socks5_client_socket.cc (revision 370437) @@ -1,13 +1,13 @@ ---- ./net/socket/socks5_client_socket.cc.orig 2014-08-20 21:02:27.000000000 +0200 -+++ ./net/socket/socks5_client_socket.cc 2014-08-22 15:06:26.000000000 +0200 +--- net/socket/socks5_client_socket.cc.orig 2014-10-02 17:18:59 UTC ++++ net/socket/socks5_client_socket.cc @@ -4,6 +4,10 @@ #include "net/socket/socks5_client_socket.h" +#if defined(OS_BSD) +#include +#endif + #include "base/basictypes.h" #include "base/callback_helpers.h" #include "base/compiler_specific.h" Index: branches/2014Q4/www/chromium/files/patch-net__socket__tcp_listen_socket_unittest.h =================================================================== --- branches/2014Q4/www/chromium/files/patch-net__socket__tcp_listen_socket_unittest.h (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-net__socket__tcp_listen_socket_unittest.h (revision 370437) @@ -1,12 +1,12 @@ ---- ./net/socket/tcp_listen_socket_unittest.h.orig 2014-08-20 21:02:27.000000000 +0200 -+++ ./net/socket/tcp_listen_socket_unittest.h 2014-08-22 15:06:26.000000000 +0200 +--- net/socket/tcp_listen_socket_unittest.h.orig 2014-10-02 17:19:00 UTC ++++ net/socket/tcp_listen_socket_unittest.h @@ -13,6 +13,9 @@ #include #include #include +#if defined(OS_BSD) +#include +#endif #endif #include "base/basictypes.h" Index: branches/2014Q4/www/chromium/files/patch-net__udp__udp_socket_unittest.cc =================================================================== --- branches/2014Q4/www/chromium/files/patch-net__udp__udp_socket_unittest.cc (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-net__udp__udp_socket_unittest.cc (revision 370437) @@ -1,11 +1,11 @@ ---- ./net/udp/udp_socket_unittest.cc.orig 2014-08-20 21:02:28.000000000 +0200 -+++ ./net/udp/udp_socket_unittest.cc 2014-08-22 15:06:26.000000000 +0200 -@@ -202,7 +202,7 @@ +--- net/udp/udp_socket_unittest.cc.orig 2014-10-02 17:19:00 UTC ++++ net/udp/udp_socket_unittest.cc +@@ -204,7 +204,7 @@ client_entries, 5, NetLog::TYPE_SOCKET_ALIVE)); } -#if defined(OS_MACOSX) +#if defined(OS_MACOSX) || defined(OS_BSD) // UDPSocketPrivate_Broadcast is disabled for OSX because it requires // root permissions on OSX 10.7+. TEST_F(UDPSocketTest, DISABLED_Broadcast) { Index: branches/2014Q4/www/chromium/files/patch-ppapi__proxy__file_io_resource.cc =================================================================== --- branches/2014Q4/www/chromium/files/patch-ppapi__proxy__file_io_resource.cc (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-ppapi__proxy__file_io_resource.cc (revision 370437) @@ -1,46 +1,46 @@ ---- ./ppapi/proxy/file_io_resource.cc.orig 2014-08-20 21:02:40.000000000 +0200 -+++ ./ppapi/proxy/file_io_resource.cc 2014-08-22 15:06:26.000000000 +0200 +--- ppapi/proxy/file_io_resource.cc.orig 2014-10-02 17:39:47 UTC ++++ ppapi/proxy/file_io_resource.cc @@ -283,15 +283,17 @@ if (check_quota_) { int64_t increase = 0; - uint64_t max_offset = 0; + // (rene) avoid name collission with /usr/include/vm/vm_map.h on FreeBSD + // which also defines max_offset + uint64_t _max_offset = 0; bool append = (open_flags_ & PP_FILEOPENFLAG_APPEND) != 0; if (append) { increase = bytes_to_write; } else { - uint64_t max_offset = offset + bytes_to_write; - if (max_offset > static_cast(kint64max)) + uint64_t _max_offset = offset + bytes_to_write; + if (_max_offset > static_cast(kint64max)) return PP_ERROR_FAILED; // amount calculation would overflow. - increase = static_cast(max_offset) - max_written_offset_; + increase = static_cast(_max_offset) - max_written_offset_; } if (increase > 0) { @@ -315,7 +317,7 @@ if (append) append_mode_write_amount_ += bytes_to_write; else - max_written_offset_ = max_offset; + max_written_offset_ = _max_offset; } } return WriteValidated(offset, buffer, bytes_to_write, callback); @@ -593,9 +595,9 @@ } else { DCHECK_LE(offset + bytes_to_write - max_written_offset_, granted); - int64_t max_offset = offset + bytes_to_write; - if (max_written_offset_ < max_offset) - max_written_offset_ = max_offset; + int64_t _max_offset = offset + bytes_to_write; + if (max_written_offset_ < _max_offset) + max_written_offset_ = _max_offset; } if (callback->is_blocking()) { Index: branches/2014Q4/www/chromium/files/patch-ppapi__shared_impl__private__net_address_private_impl.cc =================================================================== --- branches/2014Q4/www/chromium/files/patch-ppapi__shared_impl__private__net_address_private_impl.cc (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-ppapi__shared_impl__private__net_address_private_impl.cc (revision 370437) @@ -1,22 +1,22 @@ ---- ./ppapi/shared_impl/private/net_address_private_impl.cc.orig 2014-08-20 21:02:39.000000000 +0200 -+++ ./ppapi/shared_impl/private/net_address_private_impl.cc 2014-08-22 15:06:26.000000000 +0200 +--- ppapi/shared_impl/private/net_address_private_impl.cc.orig 2014-10-02 17:19:00 UTC ++++ ppapi/shared_impl/private/net_address_private_impl.cc @@ -14,6 +14,10 @@ #include #endif +#if defined(OS_BSD) +#include +#endif + #include #include @@ -28,7 +32,7 @@ #include "ppapi/shared_impl/var.h" #include "ppapi/thunk/thunk.h" -#if defined(OS_MACOSX) +#if defined(OS_MACOSX) || defined(OS_BSD) // This is a bit evil, but it's standard operating procedure for |s6_addr|.... #define s6_addr16 __u6_addr.__u6_addr16 #endif Index: branches/2014Q4/www/chromium/files/patch-printing__printing.gyp =================================================================== --- branches/2014Q4/www/chromium/files/patch-printing__printing.gyp (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-printing__printing.gyp (revision 370437) @@ -1,11 +1,11 @@ ---- ./printing/printing.gyp.orig 2014-08-20 21:03:08.000000000 +0200 -+++ ./printing/printing.gyp 2014-08-22 15:06:26.000000000 +0200 +--- printing/printing.gyp.orig 2014-10-02 17:39:47 UTC ++++ printing/printing.gyp @@ -187,7 +187,7 @@ 'backend/print_backend_chromeos.cc', ], }], - ['OS=="linux" and chromeos==0', { + ['(OS=="linux" or os_bsd == 1) and chromeos==0', { 'sources': [ 'printing_context_linux.cc', 'printing_context_linux.h', Index: branches/2014Q4/www/chromium/files/patch-remoting__remoting_host.gypi =================================================================== --- branches/2014Q4/www/chromium/files/patch-remoting__remoting_host.gypi (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-remoting__remoting_host.gypi (revision 370437) @@ -1,20 +1,20 @@ ---- ./remoting/remoting_host.gypi.orig 2014-08-20 21:02:52.000000000 +0200 -+++ ./remoting/remoting_host.gypi 2014-08-22 15:06:26.000000000 +0200 +--- remoting/remoting_host.gypi.orig 2014-10-02 17:39:48 UTC ++++ remoting/remoting_host.gypi @@ -12,7 +12,7 @@ 'variables': { 'conditions': [ # Remoting host is supported only on Windows, OSX and Linux (with X11). - ['OS=="win" or OS=="mac" or (OS=="linux" and chromeos==0 and use_x11==1)', { + ['OS=="win" or OS=="mac" or os_bsd==1 or (OS=="linux" and chromeos==0 and use_x11==1)', { 'enable_remoting_host': 1, }, { 'enable_remoting_host': 0, -@@ -270,7 +270,7 @@ +@@ -285,7 +285,7 @@ 'host/win/wts_terminal_observer.h', ], 'conditions': [ - ['OS=="linux"', { + ['OS=="linux" or os_bsd==1', { 'dependencies': [ # Always use GTK on Linux, even for Aura builds. '../build/linux/system.gyp:gtk', Index: branches/2014Q4/www/chromium/files/patch-skia__skia_chrome.gypi =================================================================== --- branches/2014Q4/www/chromium/files/patch-skia__skia_chrome.gypi (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-skia__skia_chrome.gypi (revision 370437) @@ -1,14 +1,14 @@ ---- ./skia/skia_chrome.gypi.orig 2014-08-20 21:03:15.000000000 +0200 -+++ ./skia/skia_chrome.gypi 2014-08-22 15:06:26.000000000 +0200 -@@ -80,6 +80,11 @@ +--- skia/skia_chrome.gypi.orig 2014-10-02 17:39:48 UTC ++++ skia/skia_chrome.gypi +@@ -87,6 +87,11 @@ 'ext/vector_platform_device_skia.h', ], 'conditions': [ + [ 'use_cairo == 1', { + 'dependencies': [ + '../build/linux/system.gyp:pangocairo', + ], + }], [ 'OS == "android" and enable_printing == 0', { 'sources!': [ 'ext/skia_utils_base.cc', Index: branches/2014Q4/www/chromium/files/patch-skia__skia_common.gypi =================================================================== --- branches/2014Q4/www/chromium/files/patch-skia__skia_common.gypi (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-skia__skia_common.gypi (revision 370437) @@ -1,11 +1,11 @@ ---- ./skia/skia_common.gypi.orig 2014-08-20 21:03:15.000000000 +0200 -+++ ./skia/skia_common.gypi 2014-08-22 15:06:26.000000000 +0200 -@@ -66,7 +66,7 @@ +--- skia/skia_common.gypi.orig 2014-10-02 17:39:48 UTC ++++ skia/skia_common.gypi +@@ -61,7 +61,7 @@ }], #Settings for text blitting, chosen to approximate the system browser. - [ 'OS == "linux"', { + [ 'OS == "linux" or os_bsd == 1', { 'defines': [ 'SK_GAMMA_EXPONENT=1.2', 'SK_GAMMA_CONTRAST=0.2', Index: branches/2014Q4/www/chromium/files/patch-sync__util__get_session_name.cc =================================================================== --- branches/2014Q4/www/chromium/files/patch-sync__util__get_session_name.cc (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-sync__util__get_session_name.cc (revision 370437) @@ -1,20 +1,20 @@ ---- ./sync/util/get_session_name.cc.orig 2014-08-20 21:02:30.000000000 +0200 -+++ ./sync/util/get_session_name.cc 2014-08-22 15:06:26.000000000 +0200 +--- sync/util/get_session_name.cc.orig 2014-10-02 17:39:48 UTC ++++ sync/util/get_session_name.cc @@ -11,7 +11,7 @@ #include "base/sys_info.h" #include "base/task_runner.h" -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) #include "sync/util/get_session_name_linux.h" #elif defined(OS_IOS) #include "sync/util/get_session_name_ios.h" @@ -36,7 +36,7 @@ // like "stumpy-signed-mp-v2keys" etc. The information can be checked on // "CHROMEOS_RELEASE_BOARD" line in chrome://system. session_name = board.substr(0, 6) == "stumpy" ? "Chromebox" : "Chromebook"; -#elif defined(OS_LINUX) +#elif defined(OS_LINUX) || defined(OS_BSD) session_name = internal::GetHostname(); #elif defined(OS_IOS) session_name = internal::GetComputerName(); Index: branches/2014Q4/www/chromium/files/patch-sync__util__get_session_name_linux.cc =================================================================== --- branches/2014Q4/www/chromium/files/patch-sync__util__get_session_name_linux.cc (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-sync__util__get_session_name_linux.cc (revision 370437) @@ -1,14 +1,14 @@ ---- ./sync/util/get_session_name_linux.cc.orig 2014-08-20 21:02:30.000000000 +0200 -+++ ./sync/util/get_session_name_linux.cc 2014-08-22 15:06:26.000000000 +0200 +--- sync/util/get_session_name_linux.cc.orig 2014-10-02 17:19:01 UTC ++++ sync/util/get_session_name_linux.cc @@ -13,8 +13,9 @@ namespace internal { std::string GetHostname() { - char hostname[HOST_NAME_MAX]; - if (gethostname(hostname, HOST_NAME_MAX) == 0) // Success. + int len = sysconf(_SC_HOST_NAME_MAX); + char hostname[len]; + if (gethostname(hostname, len) == 0) // Success. return hostname; return base::GetLinuxDistro(); } Index: branches/2014Q4/www/chromium/files/patch-testing__gtest__include__gtest__internal__gtest-port.h =================================================================== --- branches/2014Q4/www/chromium/files/patch-testing__gtest__include__gtest__internal__gtest-port.h (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-testing__gtest__include__gtest__internal__gtest-port.h (revision 370437) @@ -1,29 +1,29 @@ ---- ./testing/gtest/include/gtest/internal/gtest-port.h.orig 2014-08-20 21:03:23.000000000 +0200 -+++ ./testing/gtest/include/gtest/internal/gtest-port.h 2014-08-22 15:06:26.000000000 +0200 -@@ -265,6 +265,8 @@ +--- testing/gtest/include/gtest/internal/gtest-port.h.orig 2014-10-02 17:39:53 UTC ++++ testing/gtest/include/gtest/internal/gtest-port.h +@@ -343,6 +343,8 @@ # define GTEST_OS_NACL 1 #elif defined __OpenBSD__ # define GTEST_OS_OPENBSD 1 +#elif defined __FreeBSD__ +# define GTEST_OS_FREEBSD 1 #elif defined __QNX__ # define GTEST_OS_QNX 1 #endif // __CYGWIN__ -@@ -477,7 +479,7 @@ +@@ -611,7 +613,7 @@ // To disable threading support in Google Test, add -DGTEST_HAS_PTHREAD=0 // to your compiler flags. # define GTEST_HAS_PTHREAD (GTEST_OS_LINUX || GTEST_OS_MAC || GTEST_OS_HPUX \ - || GTEST_OS_QNX) + || GTEST_OS_QNX || GTEST_OS_FREEBSD) #endif // GTEST_HAS_PTHREAD #if GTEST_HAS_PTHREAD -@@ -646,7 +648,7 @@ +@@ -791,7 +793,7 @@ (GTEST_OS_MAC && !GTEST_OS_IOS) || GTEST_OS_IOS_SIMULATOR || \ (GTEST_OS_WINDOWS_DESKTOP && _MSC_VER >= 1400) || \ GTEST_OS_WINDOWS_MINGW || GTEST_OS_AIX || GTEST_OS_HPUX || \ - GTEST_OS_OPENBSD || GTEST_OS_QNX) + GTEST_OS_OPENBSD || GTEST_OS_FREEBSD || GTEST_OS_QNX) # define GTEST_HAS_DEATH_TEST 1 # include // NOLINT #endif Index: branches/2014Q4/www/chromium/files/patch-testing__gtest__src__gtest.cc =================================================================== --- branches/2014Q4/www/chromium/files/patch-testing__gtest__src__gtest.cc (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-testing__gtest__src__gtest.cc (revision 370437) @@ -1,22 +1,22 @@ ---- ./testing/gtest/src/gtest.cc.orig 2014-08-20 21:03:23.000000000 +0200 -+++ ./testing/gtest/src/gtest.cc 2014-08-22 15:06:26.000000000 +0200 -@@ -117,6 +117,10 @@ +--- testing/gtest/src/gtest.cc.orig 2014-10-02 17:39:53 UTC ++++ testing/gtest/src/gtest.cc +@@ -121,6 +121,10 @@ #endif // GTEST_OS_LINUX +#if GTEST_OS_FREEBSD +# include +#endif + #if GTEST_HAS_EXCEPTIONS # include #endif -@@ -1592,7 +1596,7 @@ +@@ -1891,7 +1895,7 @@ #if GTEST_OS_WINDOWS return _wcsicmp(lhs, rhs) == 0; -#elif GTEST_OS_LINUX && !GTEST_OS_LINUX_ANDROID +#elif GTEST_OS_LINUX && !GTEST_OS_LINUX_ANDROID && !GTEST_OS_FREEBSD return wcscasecmp(lhs, rhs) == 0; #else // Android, Mac OS X and Cygwin don't define wcscasecmp. Index: branches/2014Q4/www/chromium/files/patch-third_party__WebKit__Source__core__core.gyp =================================================================== --- branches/2014Q4/www/chromium/files/patch-third_party__WebKit__Source__core__core.gyp (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-third_party__WebKit__Source__core__core.gyp (revision 370437) @@ -1,20 +1,20 @@ ---- ./third_party/WebKit/Source/core/core.gyp.orig 2014-08-20 21:08:03.000000000 +0200 -+++ ./third_party/WebKit/Source/core/core.gyp 2014-08-22 15:06:26.000000000 +0200 -@@ -650,7 +650,7 @@ +--- third_party/WebKit/Source/core/core.gyp.orig 2014-10-02 18:00:36 UTC ++++ third_party/WebKit/Source/core/core.gyp +@@ -589,7 +589,7 @@ # Due to a bug in gcc 4.6 in android NDK, we get warnings about uninitialized variable. 'cflags': ['-Wno-uninitialized'], }], - ['OS != "linux"', { + ['OS != "linux" and os_bsd != 1', { 'sources/': [ ['exclude', 'Linux\\.cpp$'], ], -@@ -690,7 +690,7 @@ +@@ -627,7 +627,7 @@ ['OS=="win" and buildtype=="Official"', { 'msvs_shard': 19, }], - ['OS != "linux"', { + ['OS != "linux" and os_bsd != 1', { 'sources/': [ ['exclude', 'Linux\\.cpp$'], ], Index: branches/2014Q4/www/chromium/files/patch-third_party__WebKit__Source__platform__blink_platform.gyp =================================================================== --- branches/2014Q4/www/chromium/files/patch-third_party__WebKit__Source__platform__blink_platform.gyp (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-third_party__WebKit__Source__platform__blink_platform.gyp (revision 370437) @@ -1,48 +1,48 @@ ---- ./third_party/WebKit/Source/platform/blink_platform.gyp.orig 2014-08-20 21:07:58.000000000 +0200 -+++ ./third_party/WebKit/Source/platform/blink_platform.gyp 2014-08-22 15:06:26.000000000 +0200 +--- third_party/WebKit/Source/platform/blink_platform.gyp.orig 2014-10-02 18:00:37 UTC ++++ third_party/WebKit/Source/platform/blink_platform.gyp @@ -38,6 +38,9 @@ 'targets': [{ 'target_name': 'blink_common', 'type': '<(component)', + 'include_dirs': [ + '<(prefix_dir)/include', + ], 'variables': { 'enable_wexit_time_destructors': 1 }, 'dependencies': [ '../config.gyp:config', -@@ -249,7 +252,7 @@ +@@ -248,7 +251,7 @@ # compiler optimizations, see crbug.com/237063 'msvs_disabled_warnings': [ 4267, 4334, 4724 ], 'conditions': [ - ['OS=="linux" or OS=="android" or OS=="win"', { + ['OS=="linux" or OS=="android" or OS=="win" or os_bsd==1', { 'sources/': [ # Cherry-pick files excluded by the broader regular expressions above. ['include', 'fonts/harfbuzz/FontHarfBuzz\\.cpp$'], -@@ -269,7 +272,7 @@ +@@ -268,7 +271,7 @@ ['exclude', 'Harfbuzz[^/]+\\.(cpp|h)$'], ], }], - ['OS=="linux" or OS=="android"', { + ['OS=="linux" or OS=="android" or os_bsd==1', { 'sources/': [ - ['include', 'fonts/linux/FontPlatformDataLinuxHarfBuzz\\.cpp$'], + ['include', 'fonts/linux/FontPlatformDataLinux\\.cpp$'], ] -@@ -366,7 +369,7 @@ +@@ -367,7 +370,7 @@ ['exclude', 'fonts/harfbuzz/HarfBuzzFaceCoreText\\.cpp$'], ], }], - ['OS != "linux" and OS != "mac" and OS != "win"', { + ['OS != "linux" and OS != "mac" and OS != "win" and os_bsd != 1', { 'sources/': [ ['exclude', 'VDMX[^/]+\\.(cpp|h)$'], ], -@@ -412,7 +415,7 @@ +@@ -413,7 +416,7 @@ ['exclude', 'Android\\.cpp$'], ], }], - ['OS=="linux"', { + ['OS=="linux" or os_bsd==1', { 'dependencies': [ '<(DEPTH)/build/linux/system.gyp:fontconfig', ], Index: branches/2014Q4/www/chromium/files/patch-third_party__WebKit__Source__platform__heap__ThreadState.cpp =================================================================== --- branches/2014Q4/www/chromium/files/patch-third_party__WebKit__Source__platform__heap__ThreadState.cpp (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-third_party__WebKit__Source__platform__heap__ThreadState.cpp (revision 370437) @@ -1,36 +1,36 @@ ---- ./third_party/WebKit/Source/platform/heap/ThreadState.cpp.orig 2014-08-20 21:07:57.000000000 +0200 -+++ ./third_party/WebKit/Source/platform/heap/ThreadState.cpp 2014-08-22 15:06:26.000000000 +0200 -@@ -50,13 +50,22 @@ +--- third_party/WebKit/Source/platform/heap/ThreadState.cpp.orig 2014-10-02 18:00:37 UTC ++++ third_party/WebKit/Source/platform/heap/ThreadState.cpp +@@ -54,13 +54,22 @@ #include #endif +#if OS(FREEBSD) +#include +#endif + - namespace WebCore { + namespace blink { static void* getStackStart() { -#if defined(__GLIBC__) || OS(ANDROID) +#if defined(__GLIBC__) || OS(ANDROID) || OS(FREEBSD) pthread_attr_t attr; +#if OS(FREEBSD) + pthread_attr_init(&attr); + if (!pthread_attr_get_np(pthread_self(), &attr)) { +#else if (!pthread_getattr_np(pthread_self(), &attr)) { +#endif void* base; size_t size; int error = pthread_attr_getstack(&attr, &base, &size); -@@ -64,6 +73,9 @@ +@@ -68,6 +77,9 @@ pthread_attr_destroy(&attr); return reinterpret_cast
(base) + size; } +#if OS(FREEBSD) -+ pthread_attr_destroy(&attr); ++ pthread_attr_destroy(&attr); +#endif #if defined(__GLIBC__) // pthread_getattr_np can fail for the main thread. In this case // just like NaCl we rely on the __libc_stack_end to give us Index: branches/2014Q4/www/chromium/files/patch-third_party__WebKit__Source__web__web.gyp =================================================================== --- branches/2014Q4/www/chromium/files/patch-third_party__WebKit__Source__web__web.gyp (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-third_party__WebKit__Source__web__web.gyp (revision 370437) @@ -1,11 +1,11 @@ ---- ./third_party/WebKit/Source/web/web.gyp.orig 2014-08-20 21:07:57.000000000 +0200 -+++ ./third_party/WebKit/Source/web/web.gyp 2014-08-22 15:06:26.000000000 +0200 -@@ -142,7 +142,7 @@ +--- third_party/WebKit/Source/web/web.gyp.orig 2014-10-02 18:00:38 UTC ++++ third_party/WebKit/Source/web/web.gyp +@@ -145,7 +145,7 @@ }, }, }], - ['OS == "linux"', { + ['OS == "linux" or os_bsd == 1', { 'dependencies': [ '<(DEPTH)/build/linux/system.gyp:fontconfig', ], Index: branches/2014Q4/www/chromium/files/patch-third_party__WebKit__Source__wtf__ByteSwap.h =================================================================== --- branches/2014Q4/www/chromium/files/patch-third_party__WebKit__Source__wtf__ByteSwap.h (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-third_party__WebKit__Source__wtf__ByteSwap.h (revision 370437) @@ -1,23 +1,23 @@ ---- ./third_party/WebKit/Source/wtf/ByteSwap.h.orig 2014-08-20 21:08:05.000000000 +0200 -+++ ./third_party/WebKit/Source/wtf/ByteSwap.h 2014-08-22 15:06:26.000000000 +0200 +--- third_party/WebKit/Source/wtf/ByteSwap.h.orig 2014-10-02 18:00:38 UTC ++++ third_party/WebKit/Source/wtf/ByteSwap.h @@ -52,14 +52,20 @@ #else +#ifndef bswap64 ALWAYS_INLINE uint64_t bswap64(uint64_t x) { return __builtin_bswap64(x); } +#endif +#ifndef bswap32 ALWAYS_INLINE uint32_t bswap32(uint32_t x) { return __builtin_bswap32(x); } +#endif // GCC 4.6 lacks __builtin_bswap16. Newer versions have it but we support 4.6. +#ifndef bswap16 #if COMPILER(CLANG) ALWAYS_INLINE uint16_t bswap16(uint16_t x) { return __builtin_bswap16(x); } #else inline uint16_t bswap16(uint16_t x) { return ((x & 0xff00) >> 8) | ((x & 0x00ff) << 8); } #endif +#endif #endif Index: branches/2014Q4/www/chromium/files/patch-third_party__WebKit__Source__wtf__wtf.gyp =================================================================== --- branches/2014Q4/www/chromium/files/patch-third_party__WebKit__Source__wtf__wtf.gyp (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-third_party__WebKit__Source__wtf__wtf.gyp (revision 370437) @@ -1,11 +1,11 @@ ---- ./third_party/WebKit/Source/wtf/wtf.gyp.orig 2014-08-20 21:08:05.000000000 +0200 -+++ ./third_party/WebKit/Source/wtf/wtf.gyp 2014-08-22 15:06:26.000000000 +0200 +--- third_party/WebKit/Source/wtf/wtf.gyp.orig 2014-10-02 18:00:38 UTC ++++ third_party/WebKit/Source/wtf/wtf.gyp @@ -70,7 +70,7 @@ 'target_name': 'wtf', 'type': '<(component)', 'include_dirs': [ - '..', + '..', '<(prefix_dir)/include', ], 'dependencies': [ 'wtf_config', Index: branches/2014Q4/www/chromium/files/patch-third_party__ffmpeg__chromium__config__Chromium__linux__ia32__config.h =================================================================== --- branches/2014Q4/www/chromium/files/patch-third_party__ffmpeg__chromium__config__Chromium__linux__ia32__config.h (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-third_party__ffmpeg__chromium__config__Chromium__linux__ia32__config.h (revision 370437) @@ -1,11 +1,11 @@ ---- ./third_party/ffmpeg/chromium/config/Chromium/linux/ia32/config.h.orig 2014-08-20 21:04:24.000000000 +0200 -+++ ./third_party/ffmpeg/chromium/config/Chromium/linux/ia32/config.h 2014-08-22 15:06:26.000000000 +0200 +--- third_party/ffmpeg/chromium/config/Chromium/linux/ia32/config.h.orig 2014-10-02 17:40:34 UTC ++++ third_party/ffmpeg/chromium/config/Chromium/linux/ia32/config.h @@ -1,7 +1,7 @@ /* Automatically generated by configure - do not modify! */ #ifndef FFMPEG_CONFIG_H #define FFMPEG_CONFIG_H -#define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-shared --disable-bzlib --disable-error-resilience --disable-iconv --disable-lzo --disable-network --disable-symver --disable-xlib --disable-zlib --disable-dxva2 --disable-vaapi --disable-vda --disable-vdpau --enable-decoder='theora,vorbis,vp8' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_f32le' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav' --enable-parser='opus,vp3,vorbis,vp8' --optflags='\"-O2\"' --arch=i686 --enable-yasm --extra-cflags='\"-m32\"' --extra-ldflags='\"-m32\"' --enable-pic" +#define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-shared --disable-bzlib --disable-error-resilience --disable-iconv --disable-lzo --disable-network --disable-symver --disable-xlib --disable-zlib --disable-dxva2 --disable-vaapi --disable-vda --disable-vdpau --enable-decoder='theora,vorbis,vp8' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_f32le' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav' --enable-parser='opus,vp3,vorbis,vp8' --optflags='\"-O2\"' --arch=i686 --enable-yasm --extra-cflags='\"-m32,-mstack-alignment=16,-mstackrealign\"' --extra-ldflags='\"-m32\"' --enable-pic" #define FFMPEG_LICENSE "LGPL version 2.1 or later" #define CONFIG_THIS_YEAR 2014 #define FFMPEG_DATADIR "/usr/local/share/ffmpeg" Index: branches/2014Q4/www/chromium/files/patch-third_party__ffmpeg__libavutil__mem.c =================================================================== --- branches/2014Q4/www/chromium/files/patch-third_party__ffmpeg__libavutil__mem.c (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-third_party__ffmpeg__libavutil__mem.c (revision 370437) @@ -1,11 +1,11 @@ ---- ./third_party/ffmpeg/libavutil/mem.c.orig 2014-08-20 21:04:28.000000000 +0200 -+++ ./third_party/ffmpeg/libavutil/mem.c 2014-08-22 15:06:26.000000000 +0200 +--- third_party/ffmpeg/libavutil/mem.c.orig 2014-10-02 17:40:35 UTC ++++ third_party/ffmpeg/libavutil/mem.c @@ -32,7 +32,7 @@ #include #include #include -#if HAVE_MALLOC_H +#if HAVE_MALLOC_H && !defined(__FreeBSD__) #include #endif Index: branches/2014Q4/www/chromium/files/patch-third_party__khronos__khronos.gyp =================================================================== --- branches/2014Q4/www/chromium/files/patch-third_party__khronos__khronos.gyp (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-third_party__khronos__khronos.gyp (revision 370437) @@ -1,10 +1,10 @@ ---- ./third_party/khronos/khronos.gyp.orig 2014-08-20 21:03:05.000000000 +0200 -+++ ./third_party/khronos/khronos.gyp 2014-08-22 15:06:26.000000000 +0200 +--- third_party/khronos/khronos.gyp.orig 2014-10-02 17:19:02 UTC ++++ third_party/khronos/khronos.gyp @@ -11,6 +11,7 @@ 'include_dirs': [ '.', '../../gpu', # Contains GLES2/gl2chromium.h + '<(prefix_dir)/include', ], }, }, Index: branches/2014Q4/www/chromium/files/patch-third_party__libXNVCtrl__libXNVCtrl.gyp =================================================================== --- branches/2014Q4/www/chromium/files/patch-third_party__libXNVCtrl__libXNVCtrl.gyp (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-third_party__libXNVCtrl__libXNVCtrl.gyp (revision 370437) @@ -1,12 +1,12 @@ ---- ./third_party/libXNVCtrl/libXNVCtrl.gyp.orig 2014-08-20 21:03:03.000000000 +0200 -+++ ./third_party/libXNVCtrl/libXNVCtrl.gyp 2014-08-22 15:06:26.000000000 +0200 +--- third_party/libXNVCtrl/libXNVCtrl.gyp.orig 2014-10-02 17:19:02 UTC ++++ third_party/libXNVCtrl/libXNVCtrl.gyp @@ -13,6 +13,9 @@ 'NVCtrlLib.h', 'nv_control.h', ], + 'include_dirs': [ + '<(prefix_dir)/include', + ], }, ], } Index: branches/2014Q4/www/chromium/files/patch-third_party__libexif__libexif.gyp =================================================================== --- branches/2014Q4/www/chromium/files/patch-third_party__libexif__libexif.gyp (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-third_party__libexif__libexif.gyp (revision 370437) @@ -1,14 +1,14 @@ ---- ./third_party/libexif/libexif.gyp.orig 2014-08-20 21:03:07.000000000 +0200 -+++ ./third_party/libexif/libexif.gyp 2014-08-21 23:18:11.000000000 +0200 +--- third_party/libexif/libexif.gyp.orig 2014-09-04 00:04:19 UTC ++++ third_party/libexif/libexif.gyp @@ -5,9 +5,9 @@ { 'variables': { 'conditions': [ - ['OS == "linux" and chromeos==0', { + ['(OS == "linux" or OS == "freebsd") and chromeos==0', { 'use_system_libexif%': 1, - }, { # OS != "linux" and chromeos==0 + }, { # (OS != "linux" and OS != "freebsd") or chromeos==0 'use_system_libexif%': 0, }], ], Index: branches/2014Q4/www/chromium/files/patch-third_party__libjingle__libjingle.gyp =================================================================== --- branches/2014Q4/www/chromium/files/patch-third_party__libjingle__libjingle.gyp (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-third_party__libjingle__libjingle.gyp (revision 370437) @@ -1,11 +1,11 @@ ---- ./third_party/libjingle/libjingle.gyp.orig 2014-08-20 21:03:06.000000000 +0200 -+++ ./third_party/libjingle/libjingle.gyp 2014-08-22 15:06:26.000000000 +0200 -@@ -477,7 +477,7 @@ +--- third_party/libjingle/libjingle.gyp.orig 2014-10-02 17:39:48 UTC ++++ third_party/libjingle/libjingle.gyp +@@ -484,7 +484,7 @@ ], }], # TODO(mallinath) - Enable SCTP for iOS. - ['OS!="ios"', { + ['OS!="ios" and os_bsd!=1', { 'defines': [ 'HAVE_SCTP', ], Index: branches/2014Q4/www/chromium/files/patch-third_party__libjpeg_turbo__libjpeg.gyp =================================================================== --- branches/2014Q4/www/chromium/files/patch-third_party__libjpeg_turbo__libjpeg.gyp (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-third_party__libjpeg_turbo__libjpeg.gyp (revision 370437) @@ -1,11 +1,11 @@ ---- ./third_party/libjpeg_turbo/libjpeg.gyp.orig 2014-08-20 21:03:45.000000000 +0200 -+++ ./third_party/libjpeg_turbo/libjpeg.gyp 2014-08-21 23:18:11.000000000 +0200 -@@ -245,7 +245,7 @@ +--- third_party/libjpeg_turbo/libjpeg.gyp.orig 2014-09-04 00:29:24 UTC ++++ third_party/libjpeg_turbo/libjpeg.gyp +@@ -246,7 +246,7 @@ ], }, }], -- [ 'OS=="linux" or OS=="freebsd" or (OS=="android" and target_arch!="arm")', { -+ [ 'OS=="linux" or os_bsd==1 or (OS=="android" and target_arch!="arm")', { +- [ 'OS=="linux" or OS=="freebsd" or (OS=="android" and (target_arch=="ia32" or target_arch=="x64"))', { ++ [ 'OS=="linux" or os_bsd==1 or (OS=="android" and (target_arch=="ia32" or target_arch=="x64"))', { 'conditions': [ [ 'use_system_yasm==0', { 'dependencies': [ Index: branches/2014Q4/www/chromium/files/patch-third_party__libphonenumber__libphonenumber.gyp =================================================================== --- branches/2014Q4/www/chromium/files/patch-third_party__libphonenumber__libphonenumber.gyp (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-third_party__libphonenumber__libphonenumber.gyp (revision 370437) @@ -1,10 +1,10 @@ ---- ./third_party/libphonenumber/libphonenumber.gyp.orig 2014-08-20 21:02:59.000000000 +0200 -+++ ./third_party/libphonenumber/libphonenumber.gyp 2014-08-22 15:06:27.000000000 +0200 +--- third_party/libphonenumber/libphonenumber.gyp.orig 2014-10-02 17:19:02 UTC ++++ third_party/libphonenumber/libphonenumber.gyp @@ -11,6 +11,7 @@ # generated protocol headers to be available with "phonenumbers" include # path, e.g. #include "phonenumbers/foo.pb.h". '<(SHARED_INTERMEDIATE_DIR)/protoc_out/third_party/libphonenumber', + '<(prefix_dir)/include', ], 'defines': [ 'I18N_PHONENUMBERS_USE_ICU_REGEXP=1', Index: branches/2014Q4/www/chromium/files/patch-third_party__libvpx__unpack_lib_posix.sh =================================================================== --- branches/2014Q4/www/chromium/files/patch-third_party__libvpx__unpack_lib_posix.sh (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-third_party__libvpx__unpack_lib_posix.sh (revision 370437) @@ -1,26 +1,26 @@ ---- ./third_party/libvpx/unpack_lib_posix.sh.orig 2014-08-20 21:03:55.000000000 +0200 -+++ ./third_party/libvpx/unpack_lib_posix.sh 2014-08-22 15:06:27.000000000 +0200 +--- third_party/libvpx/unpack_lib_posix.sh.orig 2014-10-02 17:40:17 UTC ++++ third_party/libvpx/unpack_lib_posix.sh @@ -1,4 +1,4 @@ -#!/bin/bash -e +#!/usr/bin/env bash # # Copyright (c) 2012 The Chromium Authors. All rights reserved. # Use of this source code is governed by a BSD-style license that can be @@ -54,16 +54,12 @@ fi fi -obj_list="$($ar t $lib_file | grep '\.o$')" +obj_list="$($ar t $lib_file)" function extract_object { for f in $obj_list; do filename="${f##*/}" - if [ -z "$(echo $filename | grep $1)" ]; then - continue - fi - # Only echo this if debugging. # echo "Extract $filename from archive to $out_dir/$1." $ar p $lib_file $filename > $out_dir/$1 Index: branches/2014Q4/www/chromium/files/patch-third_party__ots__include__opentype-sanitiser.h =================================================================== --- branches/2014Q4/www/chromium/files/patch-third_party__ots__include__opentype-sanitiser.h (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-third_party__ots__include__opentype-sanitiser.h (revision 370437) @@ -1,10 +1,10 @@ ---- ./third_party/ots/include/opentype-sanitiser.h.orig 2014-08-20 21:03:55.000000000 +0200 -+++ ./third_party/ots/include/opentype-sanitiser.h 2014-08-22 15:06:27.000000000 +0200 +--- third_party/ots/include/opentype-sanitiser.h.orig 2014-10-02 17:40:20 UTC ++++ third_party/ots/include/opentype-sanitiser.h @@ -22,6 +22,7 @@ #else #include #include +#include #endif #include // for std::min Index: branches/2014Q4/www/chromium/files/patch-third_party__pdfium__build__standalone.gypi =================================================================== --- branches/2014Q4/www/chromium/files/patch-third_party__pdfium__build__standalone.gypi (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-third_party__pdfium__build__standalone.gypi (revision 370437) @@ -1,27 +1,27 @@ ---- ./third_party/pdfium/build/standalone.gypi.orig 2014-08-20 21:03:59.000000000 +0200 -+++ ./third_party/pdfium/build/standalone.gypi 2014-08-22 17:00:23.000000000 +0200 +--- third_party/pdfium/build/standalone.gypi.orig 2014-10-02 17:40:24 UTC ++++ third_party/pdfium/build/standalone.gypi @@ -13,7 +13,7 @@ 'variables': { 'variables': { 'conditions': [ - ['OS=="linux" or OS=="mac"', { + ['OS=="linux" or OS=="mac" or OS=="freebsd"', { # This handles the Unix platforms we generally deal with. # Anything else gets passed through, which probably won't work # very well; such hosts should pass an explicit target_arch @@ -26,7 +26,7 @@ s/aarch64/arm64/;\ s/mips.*/mipsel/")', }, { - # OS!="linux" and OS!="mac" + # OS!="linux" and OS!="mac" and OS!="freebsd" 'host_arch%': 'ia32', }], ], -@@ -250,4 +250,4 @@ +@@ -259,4 +259,4 @@ # See comment in Chromium's common.gypi for why this is needed. 'SYMROOT': '<(DEPTH)/xcodebuild', } -} \ No newline at end of file +} Index: branches/2014Q4/www/chromium/files/patch-third_party__pdfium__core__include__fxcrt__fx_system.h =================================================================== --- branches/2014Q4/www/chromium/files/patch-third_party__pdfium__core__include__fxcrt__fx_system.h (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-third_party__pdfium__core__include__fxcrt__fx_system.h (revision 370437) @@ -1,11 +1,11 @@ ---- ./third_party/pdfium/core/include/fxcrt/fx_system.h.orig 2014-08-20 21:03:59.000000000 +0200 -+++ ./third_party/pdfium/core/include/fxcrt/fx_system.h 2014-08-22 15:13:48.000000000 +0200 +--- third_party/pdfium/core/include/fxcrt/fx_system.h.orig 2014-10-02 17:40:24 UTC ++++ third_party/pdfium/core/include/fxcrt/fx_system.h @@ -21,7 +21,7 @@ #elif defined(_WIN32) || defined(_WIN64) #define _FX_OS_ _FX_WIN32_DESKTOP_ #define _FXM_PLATFORM_ _FXM_PLATFORM_WINDOWS_ -#elif defined(__linux__) +#elif defined(__linux__) || defined(__FreeBSD__) #define _FX_OS_ _FX_LINUX_DESKTOP_ #define _FXM_PLATFORM_ _FXM_PLATFORM_LINUX_ #elif defined(__APPLE__) Index: branches/2014Q4/www/chromium/files/patch-third_party__pdfium__fpdfsdk__src__javascript__PublicMethods.cpp =================================================================== --- branches/2014Q4/www/chromium/files/patch-third_party__pdfium__fpdfsdk__src__javascript__PublicMethods.cpp (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-third_party__pdfium__fpdfsdk__src__javascript__PublicMethods.cpp (revision 370437) @@ -1,20 +1,20 @@ ---- ./third_party/pdfium/fpdfsdk/src/javascript/PublicMethods.cpp.orig 2014-08-20 21:04:00.000000000 +0200 -+++ ./third_party/pdfium/fpdfsdk/src/javascript/PublicMethods.cpp 2014-08-22 22:27:31.000000000 +0200 -@@ -1062,7 +1062,7 @@ +--- third_party/pdfium/fpdfsdk/src/javascript/PublicMethods.cpp.orig 2014-10-02 17:40:24 UTC ++++ third_party/pdfium/fpdfsdk/src/javascript/PublicMethods.cpp +@@ -1052,7 +1052,7 @@ //function AFNumber_Format(nDec, sepStyle, negStyle, currStyle, strCurrency, bCurrencyPrepend) FX_BOOL CJS_PublicMethods::AFNumber_Format(OBJ_METHOD_PARAMS) { -#if _FX_OS_ != _FX_ANDROID_ +#if _FX_OS_ != _FX_ANDROID_ && _FX_OS_ != _FX_LINUX_DESKTOP_ v8::Isolate* isolate = ::GetIsolate(cc); CJS_Context* pContext = (CJS_Context *)cc; ASSERT(pContext != NULL); -@@ -1403,7 +1403,7 @@ +@@ -1393,7 +1393,7 @@ //function AFPercent_Format(nDec, sepStyle) FX_BOOL CJS_PublicMethods::AFPercent_Format(OBJ_METHOD_PARAMS) { -#if _FX_OS_ != _FX_ANDROID_ +#if _FX_OS_ != _FX_ANDROID_ && _FX_OS_ != _FX_LINUX_DESKTOP_ CJS_Context* pContext = (CJS_Context *)cc; ASSERT(pContext != NULL); CJS_EventHandler* pEvent = pContext->GetEventHandler(); Index: branches/2014Q4/www/chromium/files/patch-third_party__pdfium__fpdfsdk__src__jsapi__fxjs_v8.cpp =================================================================== --- branches/2014Q4/www/chromium/files/patch-third_party__pdfium__fpdfsdk__src__jsapi__fxjs_v8.cpp (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-third_party__pdfium__fpdfsdk__src__jsapi__fxjs_v8.cpp (revision 370437) @@ -1,21 +1,21 @@ ---- ./third_party/pdfium/fpdfsdk/src/jsapi/fxjs_v8.cpp.orig 2014-08-20 21:04:00.000000000 +0200 -+++ ./third_party/pdfium/fpdfsdk/src/jsapi/fxjs_v8.cpp 2014-08-22 19:48:05.000000000 +0200 +--- third_party/pdfium/fpdfsdk/src/jsapi/fxjs_v8.cpp.orig 2014-10-02 17:40:24 UTC ++++ third_party/pdfium/fpdfsdk/src/jsapi/fxjs_v8.cpp @@ -753,12 +753,17 @@ double _getLocalTZA() { + struct tm *lt; if(!FSDK_IsSandBoxPolicyEnabled(FPDF_POLICY_MACHINETIME_ACCESS)) return 0; time_t t = 0; time(&t); - localtime(&t); + lt = localtime(&t); +#ifdef __FreeBSD__ + return (double)(-(lt->tm_gmtoff * 1000)); +#else return (double)(-(timezone * 1000)); +#endif } int _getDaylightSavingTA(double d) Index: branches/2014Q4/www/chromium/files/patch-third_party__pdfium__pdfium.gyp =================================================================== --- branches/2014Q4/www/chromium/files/patch-third_party__pdfium__pdfium.gyp (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-third_party__pdfium__pdfium.gyp (revision 370437) @@ -1,11 +1,11 @@ ---- ./third_party/pdfium/pdfium.gyp.orig 2014-08-20 21:04:00.000000000 +0200 -+++ ./third_party/pdfium/pdfium.gyp 2014-08-22 16:59:52.000000000 +0200 -@@ -14,7 +14,7 @@ +--- third_party/pdfium/pdfium.gyp.orig 2014-10-02 17:40:24 UTC ++++ third_party/pdfium/pdfium.gyp +@@ -13,7 +13,7 @@ ['pdf_use_skia==1', { 'defines': ['_SKIA_SUPPORT_'], }], - ['OS=="linux"', { + ['OS=="linux" or OS=="freebsd"', { - 'cflags!': [ - '-fno-exceptions', - ], + 'conditions': [ + ['target_arch=="x64"', { + 'defines' : [ '_FX_CPU_=_FX_X64_', ], Index: branches/2014Q4/www/chromium/files/patch-third_party__pdfium__third_party__logging.h =================================================================== --- branches/2014Q4/www/chromium/files/patch-third_party__pdfium__third_party__logging.h (nonexistent) +++ branches/2014Q4/www/chromium/files/patch-third_party__pdfium__third_party__logging.h (revision 370437) @@ -0,0 +1,11 @@ +--- third_party/pdfium/third_party/logging.h.orig 2014-10-02 17:40:24 UTC ++++ third_party/pdfium/third_party/logging.h +@@ -10,7 +10,7 @@ + #define CHECK(condition) \ + if (!(condition)) { \ + abort(); \ +- *(reinterpret_cast(NULL) + 42) = 0x42; \ ++ *(reinterpret_cast(__null) + 42) = 0x42; \ + } + + #define NOTREACHED() abort() Property changes on: branches/2014Q4/www/chromium/files/patch-third_party__pdfium__third_party__logging.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2014Q4/www/chromium/files/patch-third_party__sfntly__sfntly.gyp =================================================================== --- branches/2014Q4/www/chromium/files/patch-third_party__sfntly__sfntly.gyp (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-third_party__sfntly__sfntly.gyp (revision 370437) @@ -1,11 +1,11 @@ ---- ./third_party/sfntly/sfntly.gyp.orig 2014-08-20 21:03:05.000000000 +0200 -+++ ./third_party/sfntly/sfntly.gyp 2014-08-22 15:06:27.000000000 +0200 +--- third_party/sfntly/sfntly.gyp.orig 2014-10-02 17:19:02 UTC ++++ third_party/sfntly/sfntly.gyp @@ -126,7 +126,7 @@ 'cpp/src/sample/chromium/subsetter_impl.h', ], 'include_dirs': [ - 'cpp/src', '../..', + 'cpp/src', '../..', '<(prefix_dir)/include', ], # This macro must be define to suppress the use of exception 'defines': [ Index: branches/2014Q4/www/chromium/files/patch-third_party__sqlite__sqlite.gyp =================================================================== --- branches/2014Q4/www/chromium/files/patch-third_party__sqlite__sqlite.gyp (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-third_party__sqlite__sqlite.gyp (revision 370437) @@ -1,11 +1,11 @@ ---- ./third_party/sqlite/sqlite.gyp.orig 2014-08-20 21:03:05.000000000 +0200 -+++ ./third_party/sqlite/sqlite.gyp 2014-08-22 15:06:27.000000000 +0200 +--- third_party/sqlite/sqlite.gyp.orig 2014-10-02 17:39:48 UTC ++++ third_party/sqlite/sqlite.gyp @@ -105,6 +105,8 @@ 'amalgamation', # Needed for fts2 to build. 'src/src', + # FreeBSD ... + '<(prefix_dir)/include', ], 'dependencies': [ '../icu/icu.gyp:icui18n', Index: branches/2014Q4/www/chromium/files/patch-third_party__webrtc__base__cpumonitor.cc =================================================================== --- branches/2014Q4/www/chromium/files/patch-third_party__webrtc__base__cpumonitor.cc (nonexistent) +++ branches/2014Q4/www/chromium/files/patch-third_party__webrtc__base__cpumonitor.cc (revision 370437) @@ -0,0 +1,36 @@ +--- third_party/webrtc/base/cpumonitor.cc.orig 2014-10-02 17:40:33 UTC ++++ third_party/webrtc/base/cpumonitor.cc +@@ -36,13 +36,13 @@ + #include + #endif // defined(WEBRTC_MAC) + +-#if defined(WEBRTC_LINUX) ++#if defined(WEBRTC_LINUX) || defined(WEBRTC_BSD) + #include + #include + #include + #include "webrtc/base/fileutils.h" + #include "webrtc/base/pathutils.h" +-#endif // defined(WEBRTC_LINUX) ++#endif // defined(WEBRTC_LINUX) || defined(WEBRTC_BSD) + + #if defined(WEBRTC_MAC) + static uint64 TimeValueTToInt64(const time_value_t &time_value) { +@@ -342,7 +342,7 @@ + TimeValueTToInt64(task_term_info.system_time)); + #endif // defined(WEBRTC_MAC) + +-#if defined(WEBRTC_LINUX) ++#if defined(WEBRTC_LINUX) || defined(WEBRTC_BSD) + rusage usage; + if (getrusage(RUSAGE_SELF, &usage) < 0) { + LOG_ERR(LS_ERROR) << "getrusage failed"; +@@ -352,7 +352,7 @@ + const uint64 cpu_times = + (usage.ru_utime.tv_sec + usage.ru_stime.tv_sec) * kNumMicrosecsPerSec + + usage.ru_utime.tv_usec + usage.ru_stime.tv_usec; +-#endif // defined(WEBRTC_LINUX) ++#endif // defined(WEBRTC_LINUX) || defined(WEBRTC_BSD) + + #if defined(__native_client__) + // TODO(ryanpetrie): Implement this via PPAPI when it's available. Property changes on: branches/2014Q4/www/chromium/files/patch-third_party__webrtc__base__cpumonitor.cc ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2014Q4/www/chromium/files/patch-third_party__webrtc__base__httpcommon.cc =================================================================== --- branches/2014Q4/www/chromium/files/patch-third_party__webrtc__base__httpcommon.cc (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-third_party__webrtc__base__httpcommon.cc (revision 370437) @@ -1,11 +1,11 @@ ---- ./third_party/webrtc/base/httpcommon.cc.orig 2014-08-20 21:04:28.000000000 +0200 -+++ ./third_party/webrtc/base/httpcommon.cc 2014-08-22 18:44:03.000000000 +0200 +--- third_party/webrtc/base/httpcommon.cc.orig 2014-10-02 17:40:33 UTC ++++ third_party/webrtc/base/httpcommon.cc @@ -382,7 +382,7 @@ gmt = non_gmt + kTimeZoneOffsets[zindex] * 60 * 60; } // TODO: Android should support timezone, see b/2441195 -#if defined(WEBRTC_MAC) && !defined(WEBRTC_IOS) || defined(WEBRTC_ANDROID) || defined(BSD) +#if defined(WEBRTC_MAC) && !defined(WEBRTC_IOS) || defined(WEBRTC_ANDROID) || defined(WEBRTC_BSD) tm *tm_for_timezone = localtime((time_t *)&gmt); *seconds = gmt + tm_for_timezone->tm_gmtoff; #else Index: branches/2014Q4/www/chromium/files/patch-third_party__webrtc__base__ipaddress.h =================================================================== --- branches/2014Q4/www/chromium/files/patch-third_party__webrtc__base__ipaddress.h (nonexistent) +++ branches/2014Q4/www/chromium/files/patch-third_party__webrtc__base__ipaddress.h (revision 370437) @@ -0,0 +1,12 @@ +--- third_party/webrtc/base/ipaddress.h.orig 2014-10-02 17:40:33 UTC ++++ third_party/webrtc/base/ipaddress.h +@@ -17,6 +17,9 @@ + #include + #include + #endif ++#if defined(WEBRTC_BSD) ++#include ++#endif + #if defined(WEBRTC_WIN) + #include + #include Property changes on: branches/2014Q4/www/chromium/files/patch-third_party__webrtc__base__ipaddress.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +LF \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2014Q4/www/chromium/files/patch-third_party__webrtc__base__linux.cc =================================================================== --- branches/2014Q4/www/chromium/files/patch-third_party__webrtc__base__linux.cc (nonexistent) +++ branches/2014Q4/www/chromium/files/patch-third_party__webrtc__base__linux.cc (revision 370437) @@ -0,0 +1,17 @@ +--- third_party/webrtc/base/linux.cc.orig 2014-10-02 17:40:33 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 +@@ -345,4 +345,4 @@ + + } // namespace rtc + +-#endif // defined(WEBRTC_LINUX) ++#endif // defined(WEBRTC_LINUX) || defined(WEBRTC_BSD) Property changes on: branches/2014Q4/www/chromium/files/patch-third_party__webrtc__base__linux.cc ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +LF \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2014Q4/www/chromium/files/patch-third_party__webrtc__base__linux.h =================================================================== --- branches/2014Q4/www/chromium/files/patch-third_party__webrtc__base__linux.h (nonexistent) +++ branches/2014Q4/www/chromium/files/patch-third_party__webrtc__base__linux.h (revision 370437) @@ -0,0 +1,18 @@ +--- third_party/webrtc/base/linux.h.orig 2014-10-02 17:40:33 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 +@@ -119,5 +119,5 @@ + + } // namespace rtc + +-#endif // defined(WEBRTC_LINUX) ++#endif // defined(WEBRTC_LINUX) || defined(WEBRTC_BSD) + #endif // WEBRTC_BASE_LINUX_H_ Property changes on: branches/2014Q4/www/chromium/files/patch-third_party__webrtc__base__linux.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +LF \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2014Q4/www/chromium/files/patch-third_party__webrtc__base__network.cc =================================================================== --- branches/2014Q4/www/chromium/files/patch-third_party__webrtc__base__network.cc (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-third_party__webrtc__base__network.cc (revision 370437) @@ -1,29 +1,29 @@ ---- ./third_party/webrtc/base/network.cc.orig 2014-08-20 21:04:28.000000000 +0200 -+++ ./third_party/webrtc/base/network.cc 2014-08-22 18:51:07.000000000 +0200 +--- third_party/webrtc/base/network.cc.orig 2014-10-02 17:40:33 UTC ++++ third_party/webrtc/base/network.cc @@ -18,7 +18,7 @@ // linux/if.h can't be included at the same time as the posix sys/if.h, and // it's transitively required by linux/route.h, so include that version on // linux instead of the standard posix one. -#if defined(WEBRTC_LINUX) +#if defined(WEBRTC_LINUX) && !defined(WEBRTC_BSD) #include #include #elif !defined(__native_client__) @@ -462,7 +462,7 @@ } #endif // WEBRTC_WIN -#if defined(WEBRTC_LINUX) +#if defined(WEBRTC_LINUX) && !defined(WEBRTC_BSD) bool IsDefaultRoute(const std::string& network_name) { FileStream fs; if (!fs.Open("/proc/net/route", "r", NULL)) { @@ -502,7 +502,7 @@ strncmp(network.name().c_str(), "vnic", 4) == 0) { return true; } -#if defined(WEBRTC_LINUX) +#if defined(WEBRTC_LINUX) && !defined(WEBRTC_BSD) // Make sure this is a default route, if we're ignoring non-defaults. if (ignore_non_default_routes_ && !IsDefaultRoute(network.name())) { return true; Index: branches/2014Q4/www/chromium/files/patch-third_party__webrtc__base__network.h =================================================================== --- branches/2014Q4/www/chromium/files/patch-third_party__webrtc__base__network.h (nonexistent) +++ branches/2014Q4/www/chromium/files/patch-third_party__webrtc__base__network.h (revision 370437) @@ -0,0 +1,13 @@ +--- third_party/webrtc/base/network.h.orig 2014-10-02 17:40:33 UTC ++++ third_party/webrtc/base/network.h +@@ -21,6 +21,10 @@ + #include "webrtc/base/messagehandler.h" + #include "webrtc/base/sigslot.h" + ++#if defined(WEBRTC_BSD) ++#include ++#endif ++ + #if defined(WEBRTC_POSIX) + struct ifaddrs; + #endif // defined(WEBRTC_POSIX) Property changes on: branches/2014Q4/www/chromium/files/patch-third_party__webrtc__base__network.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +LF \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2014Q4/www/chromium/files/patch-third_party__webrtc__base__physicalsocketserver.cc =================================================================== --- branches/2014Q4/www/chromium/files/patch-third_party__webrtc__base__physicalsocketserver.cc (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-third_party__webrtc__base__physicalsocketserver.cc (revision 370437) @@ -1,33 +1,33 @@ ---- ./third_party/webrtc/base/physicalsocketserver.cc.orig 2014-08-20 21:04:28.000000000 +0200 -+++ ./third_party/webrtc/base/physicalsocketserver.cc 2014-08-22 18:54:07.000000000 +0200 +--- third_party/webrtc/base/physicalsocketserver.cc.orig 2014-10-02 17:40:33 UTC ++++ third_party/webrtc/base/physicalsocketserver.cc @@ -240,7 +240,7 @@ socklen_t optlen = sizeof(*value); int ret = ::getsockopt(s_, slevel, sopt, (SockOptArg)value, &optlen); if (ret != -1 && opt == OPT_DONTFRAGMENT) { -#if defined(WEBRTC_LINUX) && !defined(WEBRTC_ANDROID) +#if defined(WEBRTC_LINUX) && !defined(WEBRTC_ANDROID) && !defined(WEBRTC_BSD) *value = (*value != IP_PMTUDISC_DONT) ? 1 : 0; #endif } @@ -253,7 +253,7 @@ if (TranslateOption(opt, &slevel, &sopt) == -1) return -1; if (opt == OPT_DONTFRAGMENT) { -#if defined(WEBRTC_LINUX) && !defined(WEBRTC_ANDROID) +#if defined(WEBRTC_LINUX) && !defined(WEBRTC_ANDROID) && !defined(WEBRTC_BSD) value = (value) ? IP_PMTUDISC_DO : IP_PMTUDISC_DONT; #endif } @@ -503,10 +503,10 @@ *slevel = IPPROTO_IP; *sopt = IP_DONTFRAGMENT; break; -#elif defined(WEBRTC_MAC) || defined(BSD) || defined(__native_client__) +#elif defined(WEBRTC_MAC) || defined(WEBRTC_BSD) || defined(__native_client__) LOG(LS_WARNING) << "Socket::OPT_DONTFRAGMENT not supported."; return -1; -#elif defined(WEBRTC_POSIX) +#elif defined(WEBRTC_POSIX) && !defined(WEBRTC_BSD) *slevel = IPPROTO_IP; *sopt = IP_MTU_DISCOVER; break; Index: branches/2014Q4/www/chromium/files/patch-third_party__webrtc__base__stringutils.h =================================================================== --- branches/2014Q4/www/chromium/files/patch-third_party__webrtc__base__stringutils.h (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-third_party__webrtc__base__stringutils.h (revision 370437) @@ -1,17 +1,17 @@ ---- ./third_party/webrtc/base/stringutils.h.orig 2014-08-20 21:04:28.000000000 +0200 -+++ ./third_party/webrtc/base/stringutils.h 2014-08-22 18:44:28.000000000 +0200 +--- third_party/webrtc/base/stringutils.h.orig 2014-10-02 17:40:33 UTC ++++ third_party/webrtc/base/stringutils.h @@ -23,11 +23,11 @@ #endif // WEBRTC_WIN #if defined(WEBRTC_POSIX) -#ifdef BSD -+#ifdef WEBRTC_BSD ++#if defined(WEBRTC_BSD) || defined(BSD) #include -#else // BSD +#else // WEBRTC_BSD #include -#endif // !BSD +#endif // !WEBRTC_BSD #endif // WEBRTC_POSIX #include Index: branches/2014Q4/www/chromium/files/patch-third_party__webrtc__base__systeminfo.cc =================================================================== --- branches/2014Q4/www/chromium/files/patch-third_party__webrtc__base__systeminfo.cc (nonexistent) +++ branches/2014Q4/www/chromium/files/patch-third_party__webrtc__base__systeminfo.cc (revision 370437) @@ -0,0 +1,43 @@ +--- third_party/webrtc/base/systeminfo.cc.orig 2014-10-02 17:40:33 UTC ++++ third_party/webrtc/base/systeminfo.cc +@@ -19,8 +19,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 +@@ -31,7 +35,7 @@ + #include "webrtc/base/win32.h" + #elif defined(WEBRTC_MAC) && !defined(WEBRTC_IOS) + #include "webrtc/base/macconversion.h" +-#elif defined(WEBRTC_LINUX) ++#elif defined(WEBRTC_LINUX) || defined(WEBRT_BSD) + #include "webrtc/base/linux.h" + #endif + #include "webrtc/base/common.h" +@@ -168,6 +172,17 @@ + } + #elif defined(__native_client__) + // TODO(ryanpetrie): Implement this via PPAPI when it's available. ++#elif defined(OS_FREEBSD) ++ void* sysctl_value; ++ size_t length = sizeof(sysctl_value); ++ if (!sysctlbyname("hw.ncpu", &sysctl_value, &length, NULL, 0)) { ++ physical_cpus_ = *static_cast(sysctl_value); ++ } ++ if (!sysctlbyname("kern.smp.cpus", &sysctl_value, &length, NULL, 0)) { ++ logical_cpus_ = *static_cast(sysctl_value); ++ } ++ // L3 / L2 cache size? ++ // CPU family/model/stepping (available in dmesg, kernel only TODO) + #else // WEBRTC_LINUX + ProcCpuInfo proc_info; + if (proc_info.LoadFromSystem()) { Property changes on: branches/2014Q4/www/chromium/files/patch-third_party__webrtc__base__systeminfo.cc ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +LF \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2014Q4/www/chromium/files/patch-third_party__webrtc__build__common.gypi =================================================================== --- branches/2014Q4/www/chromium/files/patch-third_party__webrtc__build__common.gypi (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-third_party__webrtc__build__common.gypi (revision 370437) @@ -1,16 +1,16 @@ ---- ./third_party/webrtc/build/common.gypi.orig 2014-08-20 21:04:25.000000000 +0200 -+++ ./third_party/webrtc/build/common.gypi 2014-08-23 16:42:44.000000000 +0200 +--- third_party/webrtc/build/common.gypi.orig 2014-10-02 17:40:33 UTC ++++ third_party/webrtc/build/common.gypi @@ -321,6 +321,13 @@ 'WEBRTC_LINUX', ], }], + ['os_bsd==1', { + 'defines': [ + 'WEBRTC_BSD', + 'WEBRTC_LINUX', + 'WEBRTC_THREAD_RR', + ], + }], ['OS=="mac"', { 'defines': [ 'WEBRTC_MAC', Index: branches/2014Q4/www/chromium/files/patch-third_party__webrtc__modules__audio_device__audio_device.gypi =================================================================== --- branches/2014Q4/www/chromium/files/patch-third_party__webrtc__modules__audio_device__audio_device.gypi (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-third_party__webrtc__modules__audio_device__audio_device.gypi (revision 370437) @@ -1,20 +1,20 @@ ---- ./third_party/webrtc/modules/audio_device/audio_device.gypi.orig 2014-08-20 21:04:06.000000000 +0200 -+++ ./third_party/webrtc/modules/audio_device/audio_device.gypi 2014-08-22 15:06:27.000000000 +0200 +--- third_party/webrtc/modules/audio_device/audio_device.gypi.orig 2014-10-02 17:40:34 UTC ++++ third_party/webrtc/modules/audio_device/audio_device.gypi @@ -49,7 +49,7 @@ 'dummy/file_audio_device.h', ], 'conditions': [ - ['OS=="linux"', { + ['OS=="linux" or os_bsd==1', { 'include_dirs': [ 'linux', ], @@ -150,7 +150,7 @@ ], }, }], - ['OS=="linux"', { + ['OS=="linux" or OS=="freebsd"', { 'defines': [ 'LINUX_ALSA', ], Index: branches/2014Q4/www/chromium/files/patch-third_party__webrtc__modules__desktop_capture__desktop_capture.gypi =================================================================== --- branches/2014Q4/www/chromium/files/patch-third_party__webrtc__modules__desktop_capture__desktop_capture.gypi (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-third_party__webrtc__modules__desktop_capture__desktop_capture.gypi (revision 370437) @@ -1,14 +1,14 @@ ---- ./third_party/webrtc/modules/desktop_capture/desktop_capture.gypi.orig 2014-08-20 21:04:19.000000000 +0200 -+++ ./third_party/webrtc/modules/desktop_capture/desktop_capture.gypi 2014-08-22 15:06:27.000000000 +0200 -@@ -107,6 +107,11 @@ +--- third_party/webrtc/modules/desktop_capture/desktop_capture.gypi.orig 2014-10-02 17:40:34 UTC ++++ third_party/webrtc/modules/desktop_capture/desktop_capture.gypi +@@ -109,6 +109,11 @@ ], }, }], + ['os_bsd==1', { + 'include_dirs': [ + '<(prefix_dir)/include', + ], + }], ['OS!="win" and OS!="mac" and use_x11==0', { 'sources': [ "mouse_cursor_monitor_null.cc", Index: branches/2014Q4/www/chromium/files/patch-third_party__webrtc__modules__rtp_rtcp__source__forward_error_correction.cc =================================================================== --- branches/2014Q4/www/chromium/files/patch-third_party__webrtc__modules__rtp_rtcp__source__forward_error_correction.cc (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-third_party__webrtc__modules__rtp_rtcp__source__forward_error_correction.cc (revision 370437) @@ -1,10 +1,10 @@ ---- ./third_party/webrtc/modules/rtp_rtcp/source/forward_error_correction.cc.orig 2014-08-20 21:04:19.000000000 +0200 -+++ ./third_party/webrtc/modules/rtp_rtcp/source/forward_error_correction.cc 2014-08-22 15:06:27.000000000 +0200 +--- third_party/webrtc/modules/rtp_rtcp/source/forward_error_correction.cc.orig 2014-10-02 17:40:34 UTC ++++ third_party/webrtc/modules/rtp_rtcp/source/forward_error_correction.cc @@ -15,6 +15,7 @@ #include #include +#include #include #include "webrtc/modules/rtp_rtcp/interface/rtp_rtcp_defines.h" Index: branches/2014Q4/www/chromium/files/patch-third_party__webrtc__modules__video_coding__main__source__receiver.cc =================================================================== --- branches/2014Q4/www/chromium/files/patch-third_party__webrtc__modules__video_coding__main__source__receiver.cc (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-third_party__webrtc__modules__video_coding__main__source__receiver.cc (revision 370437) @@ -1,13 +1,13 @@ ---- ./third_party/webrtc/modules/video_coding/main/source/receiver.cc.orig 2014-08-20 21:04:18.000000000 +0200 -+++ ./third_party/webrtc/modules/video_coding/main/source/receiver.cc 2014-08-22 15:06:27.000000000 +0200 +--- third_party/webrtc/modules/video_coding/main/source/receiver.cc.orig 2014-10-02 17:40:34 UTC ++++ third_party/webrtc/modules/video_coding/main/source/receiver.cc @@ -134,8 +134,8 @@ // Assume that render timing errors are due to changes in the video stream. if (next_render_time_ms < 0) { timing_error = true; - } else if (std::abs(next_render_time_ms - now_ms) > max_video_delay_ms_) { - int frame_delay = static_cast(std::abs(next_render_time_ms - now_ms)); + } else if (std::labs(next_render_time_ms - now_ms) > max_video_delay_ms_) { + int frame_delay = static_cast(std::labs(next_render_time_ms - now_ms)); LOG(LS_WARNING) << "A frame about to be decoded is out of the configured " << "delay bounds (" << frame_delay << " > " << max_video_delay_ms_ Index: branches/2014Q4/www/chromium/files/patch-third_party__webrtc__system_wrappers__source__atomic32_posix.cc =================================================================== --- branches/2014Q4/www/chromium/files/patch-third_party__webrtc__system_wrappers__source__atomic32_posix.cc (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-third_party__webrtc__system_wrappers__source__atomic32_posix.cc (revision 370437) @@ -1,14 +1,14 @@ ---- ./third_party/webrtc/system_wrappers/source/atomic32_posix.cc.orig 2014-08-20 21:04:27.000000000 +0200 -+++ ./third_party/webrtc/system_wrappers/source/atomic32_posix.cc 2014-08-22 15:06:27.000000000 +0200 +--- third_party/webrtc/system_wrappers/source/atomic32_posix.cc.orig 2014-10-02 17:40:34 UTC ++++ third_party/webrtc/system_wrappers/source/atomic32_posix.cc @@ -12,7 +12,11 @@ #include #include +#if defined(WEBRTC_BSD) +#include +#else #include +#endif #include "webrtc/common_types.h" Index: branches/2014Q4/www/chromium/files/patch-third_party__webrtc__system_wrappers__source__cpu_info.cc =================================================================== --- branches/2014Q4/www/chromium/files/patch-third_party__webrtc__system_wrappers__source__cpu_info.cc (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-third_party__webrtc__system_wrappers__source__cpu_info.cc (revision 370437) @@ -1,34 +1,34 @@ ---- ./third_party/webrtc/system_wrappers/source/cpu_info.cc.orig 2014-08-20 21:04:27.000000000 +0200 -+++ ./third_party/webrtc/system_wrappers/source/cpu_info.cc 2014-08-22 15:06:27.000000000 +0200 +--- third_party/webrtc/system_wrappers/source/cpu_info.cc.orig 2014-10-02 17:40:34 UTC ++++ third_party/webrtc/system_wrappers/source/cpu_info.cc @@ -12,7 +12,10 @@ #if defined(_WIN32) #include -#elif defined(WEBRTC_MAC) +#elif defined(WEBRTC_MAC) || defined(WEBRTC_BSD) +#if defined(WEBRTC_BSD) +#include +#endif #include #include #else // defined(WEBRTC_LINUX) or defined(WEBRTC_ANDROID) @@ -34,13 +37,17 @@ WEBRTC_TRACE(kTraceStateInfo, kTraceUtility, -1, "Available number of cores:%d", number_of_cores_); -#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)); WEBRTC_TRACE(kTraceStateInfo, kTraceUtility, -1, "Available number of cores:%d", number_of_cores_); -#elif defined(WEBRTC_MAC) +#elif defined(WEBRTC_MAC) || defined(WEBRTC_BSD) +#if defined(WEBRTC_BSD) + int name[] = {CTL_HW, HW_NCPU}; +#else int name[] = {CTL_HW, HW_AVAILCPU}; +#endif int ncpu; size_t size = sizeof(ncpu); if (0 == sysctl(name, 2, &ncpu, &size, NULL, 0)) { Index: branches/2014Q4/www/chromium/files/patch-third_party__webrtc__system_wrappers__source__thread_posix.cc =================================================================== --- branches/2014Q4/www/chromium/files/patch-third_party__webrtc__system_wrappers__source__thread_posix.cc (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-third_party__webrtc__system_wrappers__source__thread_posix.cc (revision 370437) @@ -1,59 +1,59 @@ ---- ./third_party/webrtc/system_wrappers/source/thread_posix.cc.orig 2014-08-20 21:04:27.000000000 +0200 -+++ ./third_party/webrtc/system_wrappers/source/thread_posix.cc 2014-08-22 15:06:27.000000000 +0200 +--- third_party/webrtc/system_wrappers/source/thread_posix.cc.orig 2014-10-02 17:40:34 UTC ++++ third_party/webrtc/system_wrappers/source/thread_posix.cc @@ -51,9 +51,11 @@ #include // strncpy #include #ifdef WEBRTC_LINUX +#if !defined(WEBRTC_BSD) #include -#include #include +#endif +#include #include #include #endif @@ -136,12 +138,12 @@ } uint32_t ThreadWrapper::GetThreadId() { -#if defined(WEBRTC_ANDROID) || defined(WEBRTC_LINUX) +#if (defined(WEBRTC_ANDROID) || defined(WEBRTC_LINUX)) && !defined(WEBRTC_BSD) return static_cast(syscall(__NR_gettid)); #elif defined(WEBRTC_MAC) || defined(WEBRTC_IOS) return pthread_mach_thread_np(pthread_self()); #else - return reinterpret_cast(pthread_self()); + return reinterpret_cast(pthread_self()); #endif } @@ -171,7 +173,8 @@ delete crit_state_; } -#define HAS_THREAD_ID !defined(WEBRTC_IOS) && !defined(WEBRTC_MAC) +#define HAS_THREAD_ID !defined(WEBRTC_IOS) && !defined(WEBRTC_MAC) && \ + !defined(WEBRTC_BSD) bool ThreadPosix::Start(unsigned int& thread_id) { @@ -235,7 +238,8 @@ // CPU_ZERO and CPU_SET are not available in NDK r7, so disable // SetAffinity on Android for now. -#if (defined(WEBRTC_LINUX) && (!defined(WEBRTC_ANDROID))) +#if (defined(WEBRTC_LINUX) && (!defined(WEBRTC_ANDROID) && \ + !defined(WEBRTC_BSD))) bool ThreadPosix::SetAffinity(const int* processor_numbers, const unsigned int amount_of_processors) { if (!processor_numbers || (amount_of_processors == 0)) { @@ -317,7 +321,7 @@ event_->Set(); if (set_thread_name_) { -#ifdef WEBRTC_LINUX +#if defined(WEBRTC_LINUX) && !defined(WEBRTC_BSD) prctl(PR_SET_NAME, (unsigned long)name_, 0, 0, 0); #endif WEBRTC_TRACE(kTraceStateInfo, kTraceUtility, -1, Index: branches/2014Q4/www/chromium/files/patch-third_party__webrtc__voice_engine__voice_engine_defines.h =================================================================== --- branches/2014Q4/www/chromium/files/patch-third_party__webrtc__voice_engine__voice_engine_defines.h (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-third_party__webrtc__voice_engine__voice_engine_defines.h (revision 370437) @@ -1,11 +1,11 @@ ---- ./third_party/webrtc/voice_engine/voice_engine_defines.h.orig 2014-08-20 21:04:25.000000000 +0200 -+++ ./third_party/webrtc/voice_engine/voice_engine_defines.h 2014-08-22 15:06:27.000000000 +0200 +--- third_party/webrtc/voice_engine/voice_engine_defines.h.orig 2014-10-02 17:40:34 UTC ++++ third_party/webrtc/voice_engine/voice_engine_defines.h @@ -237,7 +237,7 @@ #include #include #include -#ifndef QNX +#if !defined(QNX) && !defined(WEBRTC_BSD) #include #ifndef ANDROID #include Index: branches/2014Q4/www/chromium/files/patch-tools__gyp__pylib__gyp__generator__make.py =================================================================== --- branches/2014Q4/www/chromium/files/patch-tools__gyp__pylib__gyp__generator__make.py (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-tools__gyp__pylib__gyp__generator__make.py (revision 370437) @@ -1,50 +1,50 @@ ---- ./tools/gyp/pylib/gyp/generator/make.py.orig 2014-08-20 21:04:05.000000000 +0200 -+++ ./tools/gyp/pylib/gyp/generator/make.py 2014-08-22 15:06:27.000000000 +0200 -@@ -87,7 +87,7 @@ +--- tools/gyp/pylib/gyp/generator/make.py.orig 2014-10-02 17:40:30 UTC ++++ tools/gyp/pylib/gyp/generator/make.py +@@ -88,7 +88,7 @@ else: operating_system = flavor if flavor == 'android': - operating_system = 'linux' # Keep this legacy behavior for now. + operating_system = 'freebsd' # Keep this legacy behavior for now. default_variables.setdefault('OS', operating_system) default_variables.setdefault('SHARED_LIB_SUFFIX', '.so') default_variables.setdefault('SHARED_LIB_DIR','$(builddir)/lib.$(TOOLSET)') -@@ -275,7 +275,7 @@ +@@ -276,7 +276,7 @@ CFLAGS.target ?= $(CFLAGS) CXX.target ?= %(CXX.target)s CXXFLAGS.target ?= $(CXXFLAGS) -LINK.target ?= %(LINK.target)s +LINK.target ?= %(CXX.target)s LDFLAGS.target ?= $(LDFLAGS) AR.target ?= $(AR) -@@ -292,13 +292,13 @@ +@@ -293,13 +293,13 @@ # TODO(evan): move all cross-compilation logic to gyp-time so we don't need # to replicate this environment fallback in make as well. -CC.host ?= %(CC.host)s -CFLAGS.host ?= -CXX.host ?= %(CXX.host)s -CXXFLAGS.host ?= -LINK.host ?= %(LINK.host)s -LDFLAGS.host ?= -AR.host ?= %(AR.host)s +CC.host ?= $(CC) +CFLAGS.host ?= $(CFLAGS) +CXX.host ?= $(CXX) +CXXFLAGS.host ?= $(CXXFLAGS) +LINK.host ?= $(CXX) +LDFLAGS.host ?= $(LDFLAGS) +AR.host ?= $(AR) # Define a dir function that can handle spaces. # http://www.gnu.org/software/make/manual/make.html#Syntax-of-Functions -@@ -1787,7 +1787,7 @@ +@@ -1824,7 +1824,7 @@ return modules # Retrieve the default value of 'SHARED_LIB_SUFFIX' - params = {'flavor': 'linux'} + params = {'flavor': 'freebsd'} default_variables = {} CalculateVariables(default_variables, params) Index: branches/2014Q4/www/chromium/files/patch-tools__gyp__test__additional-targets__src__dir1__actions.gyp =================================================================== --- branches/2014Q4/www/chromium/files/patch-tools__gyp__test__additional-targets__src__dir1__actions.gyp (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-tools__gyp__test__additional-targets__src__dir1__actions.gyp (revision 370437) @@ -1,11 +1,11 @@ ---- ./tools/gyp/test/additional-targets/src/dir1/actions.gyp.orig 2014-08-20 21:04:18.000000000 +0200 -+++ ./tools/gyp/test/additional-targets/src/dir1/actions.gyp 2014-08-22 15:06:27.000000000 +0200 +--- tools/gyp/test/additional-targets/src/dir1/actions.gyp.orig 2014-10-02 17:40:30 UTC ++++ tools/gyp/test/additional-targets/src/dir1/actions.gyp @@ -47,7 +47,7 @@ }, ], 'conditions': [ - ['OS=="linux"', { + ['OS=="linux" or OS=="freebsd"', { 'target_defaults': { 'cflags': ['-fPIC'], }, Index: branches/2014Q4/www/chromium/files/patch-tools__gyp__test__library__src__library.gyp =================================================================== --- branches/2014Q4/www/chromium/files/patch-tools__gyp__test__library__src__library.gyp (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-tools__gyp__test__library__src__library.gyp (revision 370437) @@ -1,11 +1,11 @@ ---- ./tools/gyp/test/library/src/library.gyp.orig 2014-08-20 21:04:18.000000000 +0200 -+++ ./tools/gyp/test/library/src/library.gyp 2014-08-22 15:06:27.000000000 +0200 +--- tools/gyp/test/library/src/library.gyp.orig 2014-10-02 17:40:30 UTC ++++ tools/gyp/test/library/src/library.gyp @@ -48,7 +48,7 @@ }, ], 'conditions': [ - ['OS=="linux"', { + ['OS=="linux" or OS=="freebsd"', { 'target_defaults': { # Support 64-bit shared libs (also works fine for 32-bit). 'cflags': ['-fPIC'], Index: branches/2014Q4/www/chromium/files/patch-ui__app_list__app_list_constants.cc =================================================================== --- branches/2014Q4/www/chromium/files/patch-ui__app_list__app_list_constants.cc (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-ui__app_list__app_list_constants.cc (revision 370437) @@ -1,11 +1,11 @@ ---- ./ui/app_list/app_list_constants.cc.orig 2014-08-20 21:02:20.000000000 +0200 -+++ ./ui/app_list/app_list_constants.cc 2014-08-22 15:06:27.000000000 +0200 -@@ -88,7 +88,7 @@ +--- ui/app_list/app_list_constants.cc.orig 2014-10-02 17:39:48 UTC ++++ ui/app_list/app_list_constants.cc +@@ -95,7 +95,7 @@ const ui::ResourceBundle::FontStyle kItemTextFontStyle = ui::ResourceBundle::SmallBoldFont; -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_FREEBSD) #if defined(GOOGLE_CHROME_BUILD) const char kAppListWMClass[] = "chrome_app_list"; #else // CHROMIUM_BUILD Index: branches/2014Q4/www/chromium/files/patch-ui__app_list__app_list_constants.h =================================================================== --- branches/2014Q4/www/chromium/files/patch-ui__app_list__app_list_constants.h (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-ui__app_list__app_list_constants.h (revision 370437) @@ -1,13 +1,13 @@ ---- ./ui/app_list/app_list_constants.h.orig 2014-08-20 21:02:20.000000000 +0200 -+++ ./ui/app_list/app_list_constants.h 2014-08-22 15:06:27.000000000 +0200 -@@ -62,8 +62,8 @@ +--- ui/app_list/app_list_constants.h.orig 2014-10-02 17:39:48 UTC ++++ ui/app_list/app_list_constants.h +@@ -66,8 +66,8 @@ APP_LIST_EXPORT extern const ui::ResourceBundle::FontStyle kItemTextFontStyle; -#if defined(OS_LINUX) -// The WM_CLASS name for the app launcher window on Linux. +#if defined(OS_LINUX) || defined(OS_FREEBSD) +// The WM_CLASS name for the app launcher window on Linux/FreeBSD. APP_LIST_EXPORT extern const char kAppListWMClass[]; #endif Index: branches/2014Q4/www/chromium/files/patch-ui__base__ui_base.gyp =================================================================== --- branches/2014Q4/www/chromium/files/patch-ui__base__ui_base.gyp (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-ui__base__ui_base.gyp (revision 370437) @@ -1,11 +1,11 @@ ---- ./ui/base/ui_base.gyp.orig 2014-08-20 21:02:15.000000000 +0200 -+++ ./ui/base/ui_base.gyp 2014-08-22 15:06:27.000000000 +0200 -@@ -366,7 +366,7 @@ +--- ui/base/ui_base.gyp.orig 2014-10-02 17:39:48 UTC ++++ ui/base/ui_base.gyp +@@ -427,7 +427,7 @@ 'x/selection_utils.h', ] }], - ['use_aura==0 or OS!="linux"', { + ['use_aura==0 or (OS!="linux" and os_bsd!=1)', { 'sources!': [ 'resource/resource_bundle_auralinux.cc', ], Index: branches/2014Q4/www/chromium/files/patch-ui__events__event_switches.cc =================================================================== --- branches/2014Q4/www/chromium/files/patch-ui__events__event_switches.cc (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-ui__events__event_switches.cc (revision 370437) @@ -1,11 +1,11 @@ ---- ./ui/events/event_switches.cc.orig 2014-08-20 21:02:18.000000000 +0200 -+++ ./ui/events/event_switches.cc 2014-08-22 15:06:27.000000000 +0200 -@@ -32,7 +32,7 @@ - // disabled: Use the aura gesture detector. - const char kUnifiedGestureDetectorDisabled[] = "disabled"; +--- ui/events/event_switches.cc.orig 2014-10-02 17:39:48 UTC ++++ ui/events/event_switches.cc +@@ -39,7 +39,7 @@ + const char kCompensateForUnstablePinchZoom[] = + "compensate-for-unstable-pinch-zoom"; -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_FREEBSD) // Tells chrome to interpret events from these devices as touch events. Only // available with XInput 2 (i.e. X server 1.8 or above). The id's of the // devices can be retrieved from 'xinput list'. Index: branches/2014Q4/www/chromium/files/patch-ui__events__event_switches.h =================================================================== --- branches/2014Q4/www/chromium/files/patch-ui__events__event_switches.h (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-ui__events__event_switches.h (revision 370437) @@ -1,11 +1,11 @@ ---- ./ui/events/event_switches.h.orig 2014-08-20 21:02:18.000000000 +0200 -+++ ./ui/events/event_switches.h 2014-08-22 15:06:27.000000000 +0200 -@@ -20,7 +20,7 @@ - EVENTS_BASE_EXPORT extern const char kUnifiedGestureDetectorEnabled[]; +--- ui/events/event_switches.h.orig 2014-10-02 17:39:48 UTC ++++ ui/events/event_switches.h +@@ -21,7 +21,7 @@ EVENTS_BASE_EXPORT extern const char kUnifiedGestureDetectorDisabled[]; + EVENTS_BASE_EXPORT extern const char kCompensateForUnstablePinchZoom[]; -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_FREEBSD) EVENTS_BASE_EXPORT extern const char kTouchDevices[]; #endif Index: branches/2014Q4/www/chromium/files/patch-ui__gl__gl.gyp =================================================================== --- branches/2014Q4/www/chromium/files/patch-ui__gl__gl.gyp (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-ui__gl__gl.gyp (revision 370437) @@ -1,20 +1,20 @@ ---- ./ui/gl/gl.gyp.orig 2014-08-20 21:02:15.000000000 +0200 -+++ ./ui/gl/gl.gyp 2014-08-22 15:06:27.000000000 +0200 -@@ -171,7 +171,7 @@ +--- ui/gl/gl.gyp.orig 2014-10-02 17:39:48 UTC ++++ ui/gl/gl.gyp +@@ -174,7 +174,7 @@ }, ], 'conditions': [ - ['OS in ("win", "android", "linux")', { + ['OS in ("win", "android", "linux", "freebsd", "openbsd")', { 'sources': [ 'egl_util.cc', 'egl_util.h', -@@ -190,7 +190,7 @@ +@@ -195,7 +195,7 @@ '<(DEPTH)/third_party/khronos', ], }], - ['OS in ("android", "linux")', { + ['OS in ("android", "linux", "freebsd", "openbsd")', { 'sources': [ 'gl_implementation_osmesa.cc', 'gl_implementation_osmesa.h', Index: branches/2014Q4/www/chromium/files/patch-ui__shell_dialogs__select_file_dialog.cc =================================================================== --- branches/2014Q4/www/chromium/files/patch-ui__shell_dialogs__select_file_dialog.cc (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-ui__shell_dialogs__select_file_dialog.cc (revision 370437) @@ -1,20 +1,20 @@ ---- ./ui/shell_dialogs/select_file_dialog.cc.orig 2014-08-20 21:02:18.000000000 +0200 -+++ ./ui/shell_dialogs/select_file_dialog.cc 2014-08-22 15:06:27.000000000 +0200 -@@ -20,7 +20,7 @@ +--- ui/shell_dialogs/select_file_dialog.cc.orig 2014-10-02 17:19:03 UTC ++++ ui/shell_dialogs/select_file_dialog.cc +@@ -19,7 +19,7 @@ #include "ui/shell_dialogs/select_file_dialog_mac.h" #elif defined(OS_ANDROID) #include "ui/shell_dialogs/select_file_dialog_android.h" -#elif defined(USE_AURA) && defined(OS_LINUX) && !defined(OS_CHROMEOS) +#elif defined(USE_AURA) && (defined(OS_FREEBSD) || (defined(OS_LINUX) && !defined(OS_CHROMEOS))) #include "ui/shell_dialogs/linux_shell_dialog.h" #endif -@@ -76,7 +76,7 @@ +@@ -75,7 +75,7 @@ return dialog; } -#if defined(USE_AURA) && defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if defined(USE_AURA) && (defined(OS_FREEBSD) || (defined(OS_LINUX) && !defined(OS_CHROMEOS))) const ui::LinuxShellDialog* shell_dialogs = ui::LinuxShellDialog::instance(); if (shell_dialogs) return shell_dialogs->CreateSelectFileDialog(listener, policy); Index: branches/2014Q4/www/chromium/files/patch-ui__views__views.gyp =================================================================== --- branches/2014Q4/www/chromium/files/patch-ui__views__views.gyp (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-ui__views__views.gyp (revision 370437) @@ -1,11 +1,11 @@ ---- ./ui/views/views.gyp.orig 2014-08-20 21:02:18.000000000 +0200 -+++ ./ui/views/views.gyp 2014-08-22 15:06:27.000000000 +0200 -@@ -490,7 +490,7 @@ +--- ui/views/views.gyp.orig 2014-10-02 17:39:48 UTC ++++ ui/views/views.gyp +@@ -605,7 +605,7 @@ '../display/display.gyp:display_util', ], }], - ['OS=="linux" and chromeos==0', { + ['(OS=="linux" or os_bsd==1) and chromeos==0', { 'dependencies': [ '../shell_dialogs/shell_dialogs.gyp:shell_dialogs', ], Index: branches/2014Q4/www/chromium/files/patch-ui__views__views_delegate.cc =================================================================== --- branches/2014Q4/www/chromium/files/patch-ui__views__views_delegate.cc (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-ui__views__views_delegate.cc (revision 370437) @@ -1,11 +1,11 @@ ---- ./ui/views/views_delegate.cc.orig 2014-08-20 21:02:18.000000000 +0200 -+++ ./ui/views/views_delegate.cc 2014-08-22 15:06:27.000000000 +0200 +--- ui/views/views_delegate.cc.orig 2014-10-02 17:19:03 UTC ++++ ui/views/views_delegate.cc @@ -50,7 +50,7 @@ bool ViewsDelegate::IsWindowInMetro(gfx::NativeWindow window) const { return false; } -#elif defined(OS_LINUX) && !defined(OS_CHROMEOS) +#elif (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_FREEBSD) gfx::ImageSkia* ViewsDelegate::GetDefaultWindowIcon() const { return NULL; } Index: branches/2014Q4/www/chromium/files/patch-ui__views__views_delegate.h =================================================================== --- branches/2014Q4/www/chromium/files/patch-ui__views__views_delegate.h (revision 370436) +++ branches/2014Q4/www/chromium/files/patch-ui__views__views_delegate.h (revision 370437) @@ -1,11 +1,11 @@ ---- ./ui/views/views_delegate.h.orig 2014-08-20 21:02:18.000000000 +0200 -+++ ./ui/views/views_delegate.h 2014-08-22 15:06:27.000000000 +0200 +--- ui/views/views_delegate.h.orig 2014-10-02 17:19:03 UTC ++++ ui/views/views_delegate.h @@ -98,7 +98,7 @@ // Returns true if the window passed in is in the Windows 8 metro // environment. virtual bool IsWindowInMetro(gfx::NativeWindow window) const; -#elif defined(OS_LINUX) && !defined(OS_CHROMEOS) +#elif (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_FREEBSD) virtual gfx::ImageSkia* GetDefaultWindowIcon() const; #endif Index: branches/2014Q4/www/chromium/files/patch-ui__views__window__custom_frame_view.cc =================================================================== --- branches/2014Q4/www/chromium/files/patch-ui__views__window__custom_frame_view.cc (nonexistent) +++ branches/2014Q4/www/chromium/files/patch-ui__views__window__custom_frame_view.cc (revision 370437) @@ -0,0 +1,11 @@ +--- ui/views/window/custom_frame_view.cc.orig 2014-10-06 09:19:47.000000000 +0200 ++++ ui/views/window/custom_frame_view.cc 2014-10-06 09:20:31.000000000 +0200 +@@ -281,7 +281,7 @@ + int CustomFrameView::CaptionButtonY() const { + // Maximized buttons start at window top so that even if their images aren't + // drawn flush with the screen edge, they still obey Fitts' Law. +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_BSD) + return FrameBorderThickness(); + #else + return frame_->IsMaximized() ? FrameBorderThickness() : kFrameShadowThickness; Property changes on: branches/2014Q4/www/chromium/files/patch-ui__views__window__custom_frame_view.cc ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2014Q4/www/chromium/files/patch-v8__src__base__platform__platform-freebsd.cc =================================================================== --- branches/2014Q4/www/chromium/files/patch-v8__src__base__platform__platform-freebsd.cc (nonexistent) +++ branches/2014Q4/www/chromium/files/patch-v8__src__base__platform__platform-freebsd.cc (revision 370437) @@ -0,0 +1,34 @@ +--- v8/src/base/platform/platform-freebsd.cc.orig 2014-10-02 17:41:11 UTC ++++ v8/src/base/platform/platform-freebsd.cc +@@ -131,14 +131,14 @@ + addr_buffer[0] = '0'; + addr_buffer[1] = 'x'; + addr_buffer[10] = 0; +- int result = read(fd, addr_buffer + 2, 8); +- if (result < 8) break; ++ int resultread = read(fd, addr_buffer + 2, 8); ++ if (resultread < 8) break; + unsigned start = StringToLong(addr_buffer); +- result = read(fd, addr_buffer + 2, 1); +- if (result < 1) break; ++ resultread = read(fd, addr_buffer + 2, 1); ++ if (resultread < 1) break; + if (addr_buffer[2] != '-') break; +- result = read(fd, addr_buffer + 2, 8); +- if (result < 8) break; ++ resultread = read(fd, addr_buffer + 2, 8); ++ if (resultread < 8) break; + unsigned end = StringToLong(addr_buffer); + char buffer[MAP_LENGTH]; + int bytes_read = -1; +@@ -146,8 +146,8 @@ + bytes_read++; + if (bytes_read >= MAP_LENGTH - 1) + break; +- result = read(fd, buffer + bytes_read, 1); +- if (result < 1) break; ++ resultread = read(fd, buffer + bytes_read, 1); ++ if (resultread < 1) break; + } while (buffer[bytes_read] != '\n'); + buffer[bytes_read] = 0; + // Ignore mappings that are not executable. Property changes on: branches/2014Q4/www/chromium/files/patch-v8__src__base__platform__platform-freebsd.cc ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2014Q4/www/chromium/files/patch-v8__src__base__platform__platform-posix.cc =================================================================== --- branches/2014Q4/www/chromium/files/patch-v8__src__base__platform__platform-posix.cc (nonexistent) +++ branches/2014Q4/www/chromium/files/patch-v8__src__base__platform__platform-posix.cc (revision 370437) @@ -0,0 +1,12 @@ +--- v8/src/base/platform/platform-posix.cc.orig 2014-10-02 17:41:11 UTC ++++ v8/src/base/platform/platform-posix.cc +@@ -324,7 +324,9 @@ + #if defined(ANDROID) + return static_cast(syscall(__NR_gettid)); + #else ++#ifdef HAVE_SYSCALL_H + return static_cast(syscall(SYS_gettid)); ++#endif + #endif // defined(ANDROID) + } + Property changes on: branches/2014Q4/www/chromium/files/patch-v8__src__base__platform__platform-posix.cc ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2014Q4/www/chromium/files/patch-v8__src__preparser.h =================================================================== --- branches/2014Q4/www/chromium/files/patch-v8__src__preparser.h (nonexistent) +++ branches/2014Q4/www/chromium/files/patch-v8__src__preparser.h (revision 370437) @@ -0,0 +1,11 @@ +--- v8/src/preparser.h.orig 2014-10-02 17:41:11 UTC ++++ v8/src/preparser.h +@@ -437,7 +437,7 @@ + void ReportMessageAt(Scanner::Location location, const char* message, + bool is_reference_error = false) { + Traits::ReportMessageAt(location, message, +- reinterpret_cast(NULL), ++ reinterpret_cast(__null), + is_reference_error); + } + Property changes on: branches/2014Q4/www/chromium/files/patch-v8__src__preparser.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +LF \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2014Q4/www/chromium/pkg-plist =================================================================== --- branches/2014Q4/www/chromium/pkg-plist (revision 370436) +++ branches/2014Q4/www/chromium/pkg-plist (revision 370437) @@ -1,216 +1,191 @@ bin/chrome man/man1/chrome.1.gz share/applications/chromium-browser.desktop %%DATADIR%%/chrome %%DATADIR%%/chrome-wrapper %%DATADIR%%/chrome_100_percent.pak %%DATADIR%%/content_resources.pak %%DATADIR%%/keyboard_resources.pak %%DATADIR%%/libffmpegsumo.so %%DATADIR%%/locales/am.pak %%DATADIR%%/locales/ar.pak %%DATADIR%%/locales/bg.pak %%DATADIR%%/locales/bn.pak %%DATADIR%%/locales/ca.pak %%DATADIR%%/locales/cs.pak %%DATADIR%%/locales/da.pak %%DATADIR%%/locales/de.pak %%DATADIR%%/locales/el.pak %%DATADIR%%/locales/en-GB.pak %%DATADIR%%/locales/en-US.pak %%DATADIR%%/locales/es-419.pak %%DATADIR%%/locales/es.pak %%DATADIR%%/locales/et.pak %%DATADIR%%/locales/fa.pak %%DATADIR%%/locales/fi.pak %%DATADIR%%/locales/fil.pak %%DATADIR%%/locales/fr.pak %%DATADIR%%/locales/gu.pak %%DATADIR%%/locales/he.pak %%DATADIR%%/locales/hi.pak %%DATADIR%%/locales/hr.pak %%DATADIR%%/locales/hu.pak %%DATADIR%%/locales/id.pak %%DATADIR%%/locales/it.pak %%DATADIR%%/locales/ja.pak %%DATADIR%%/locales/kn.pak %%DATADIR%%/locales/ko.pak %%DATADIR%%/locales/lt.pak %%DATADIR%%/locales/lv.pak %%DATADIR%%/locales/ml.pak %%DATADIR%%/locales/mr.pak %%DATADIR%%/locales/ms.pak %%DATADIR%%/locales/nb.pak %%DATADIR%%/locales/nl.pak %%DATADIR%%/locales/pl.pak %%DATADIR%%/locales/pt-BR.pak %%DATADIR%%/locales/pt-PT.pak %%DATADIR%%/locales/ro.pak %%DATADIR%%/locales/ru.pak %%DATADIR%%/locales/sk.pak %%DATADIR%%/locales/sl.pak %%DATADIR%%/locales/sr.pak %%DATADIR%%/locales/sv.pak %%DATADIR%%/locales/sw.pak %%DATADIR%%/locales/ta.pak %%DATADIR%%/locales/te.pak %%DATADIR%%/locales/th.pak %%DATADIR%%/locales/tr.pak %%DATADIR%%/locales/uk.pak %%DATADIR%%/locales/vi.pak %%DATADIR%%/locales/zh-CN.pak %%DATADIR%%/locales/zh-TW.pak %%DATADIR%%/mksnapshot %%DATADIR%%/resources.pak %%DATADIR%%/resources/extension/demo/library.js -%%DATADIR%%/resources/inspector/Images/addIcon.png %%DATADIR%%/resources/inspector/Images/applicationCache.png %%DATADIR%%/resources/inspector/Images/back.png %%DATADIR%%/resources/inspector/Images/breakpoint.png %%DATADIR%%/resources/inspector/Images/breakpointConditional.png %%DATADIR%%/resources/inspector/Images/breakpointConditional_2x.png %%DATADIR%%/resources/inspector/Images/breakpoint_2x.png %%DATADIR%%/resources/inspector/Images/checker.png +%%DATADIR%%/resources/inspector/Images/chromeDisabledSelect.png +%%DATADIR%%/resources/inspector/Images/chromeDisabledSelect_2x.png +%%DATADIR%%/resources/inspector/Images/chromeSelect.png +%%DATADIR%%/resources/inspector/Images/chromeSelect_2x.png %%DATADIR%%/resources/inspector/Images/cookie.png %%DATADIR%%/resources/inspector/Images/database.png %%DATADIR%%/resources/inspector/Images/databaseTable.png %%DATADIR%%/resources/inspector/Images/deleteIcon.png %%DATADIR%%/resources/inspector/Images/domain.png +%%DATADIR%%/resources/inspector/Images/errorWave.png +%%DATADIR%%/resources/inspector/Images/errorWave_2x.png %%DATADIR%%/resources/inspector/Images/fileSystem.png %%DATADIR%%/resources/inspector/Images/forward.png %%DATADIR%%/resources/inspector/Images/frame.png %%DATADIR%%/resources/inspector/Images/graphLabelCalloutLeft.png %%DATADIR%%/resources/inspector/Images/graphLabelCalloutRight.png %%DATADIR%%/resources/inspector/Images/indexedDB.png %%DATADIR%%/resources/inspector/Images/indexedDBIndex.png %%DATADIR%%/resources/inspector/Images/indexedDBObjectStore.png %%DATADIR%%/resources/inspector/Images/localStorage.png %%DATADIR%%/resources/inspector/Images/navigationControls.png %%DATADIR%%/resources/inspector/Images/navigationControls_2x.png %%DATADIR%%/resources/inspector/Images/paneAddButtons.png %%DATADIR%%/resources/inspector/Images/paneElementStateButtons.png %%DATADIR%%/resources/inspector/Images/paneFilterButtons.png %%DATADIR%%/resources/inspector/Images/paneRefreshButtons.png -%%DATADIR%%/resources/inspector/Images/paneSettingsButtons.png %%DATADIR%%/resources/inspector/Images/popoverArrows.png %%DATADIR%%/resources/inspector/Images/popoverBackground.png %%DATADIR%%/resources/inspector/Images/profileGroupIcon.png %%DATADIR%%/resources/inspector/Images/profileIcon.png %%DATADIR%%/resources/inspector/Images/profileSmallIcon.png %%DATADIR%%/resources/inspector/Images/radioDot.png %%DATADIR%%/resources/inspector/Images/resourceCSSIcon.png %%DATADIR%%/resources/inspector/Images/resourceDocumentIcon.png %%DATADIR%%/resources/inspector/Images/resourceDocumentIconSmall.png %%DATADIR%%/resources/inspector/Images/resourceJSIcon.png %%DATADIR%%/resources/inspector/Images/resourcePlainIcon.png %%DATADIR%%/resources/inspector/Images/resourcePlainIconSmall.png %%DATADIR%%/resources/inspector/Images/resourcesTimeGraphIcon.png %%DATADIR%%/resources/inspector/Images/responsiveDesign.png %%DATADIR%%/resources/inspector/Images/responsiveDesign_2x.png %%DATADIR%%/resources/inspector/Images/searchNext.png %%DATADIR%%/resources/inspector/Images/searchPrev.png %%DATADIR%%/resources/inspector/Images/sessionStorage.png %%DATADIR%%/resources/inspector/Images/settingsListRemove.png %%DATADIR%%/resources/inspector/Images/settingsListRemove_2x.png %%DATADIR%%/resources/inspector/Images/statusbarButtonGlyphs.png %%DATADIR%%/resources/inspector/Images/statusbarButtonGlyphs_2x.png %%DATADIR%%/resources/inspector/Images/statusbarResizerHorizontal.png %%DATADIR%%/resources/inspector/Images/statusbarResizerVertical.png %%DATADIR%%/resources/inspector/Images/thumbActiveHoriz.png %%DATADIR%%/resources/inspector/Images/thumbActiveVert.png %%DATADIR%%/resources/inspector/Images/thumbHoriz.png %%DATADIR%%/resources/inspector/Images/thumbHoverHoriz.png %%DATADIR%%/resources/inspector/Images/thumbHoverVert.png %%DATADIR%%/resources/inspector/Images/thumbVert.png %%DATADIR%%/resources/inspector/Images/toolbarItemSelected.png -%%DATADIR%%/resources/inspector/Images/trackHoriz.png -%%DATADIR%%/resources/inspector/Images/trackVert.png %%DATADIR%%/resources/inspector/accelerometer.css -%%DATADIR%%/resources/inspector/audits/AuditsPanel.js +%%DATADIR%%/resources/inspector/audits/_module.js %%DATADIR%%/resources/inspector/auditsPanel.css -%%DATADIR%%/resources/inspector/breadcrumbList.css %%DATADIR%%/resources/inspector/breakpointsList.css %%DATADIR%%/resources/inspector/canvasProfiler.css -%%DATADIR%%/resources/inspector/cm/cmdevtools.css %%DATADIR%%/resources/inspector/cm/codemirror.css -%%DATADIR%%/resources/inspector/console/ConsolePanel.js +%%DATADIR%%/resources/inspector/cmdevtools.css +%%DATADIR%%/resources/inspector/console/_module.js %%DATADIR%%/resources/inspector/dataGrid.css -%%DATADIR%%/resources/inspector/devices/DevicesView.js +%%DATADIR%%/resources/inspector/devices/_module.js %%DATADIR%%/resources/inspector/devicesView.css %%DATADIR%%/resources/inspector/devtools.html %%DATADIR%%/resources/inspector/devtools_extension_api.js -%%DATADIR%%/resources/inspector/elements/ElementsPanel.js +%%DATADIR%%/resources/inspector/documentation/_module.js +%%DATADIR%%/resources/inspector/elements/_module.js %%DATADIR%%/resources/inspector/elementsPanel.css -%%DATADIR%%/resources/inspector/extensions/ExtensionServer.js +%%DATADIR%%/resources/inspector/extensions/_module.js %%DATADIR%%/resources/inspector/filter.css %%DATADIR%%/resources/inspector/filteredItemSelectionDialog.css %%DATADIR%%/resources/inspector/flameChart.css %%DATADIR%%/resources/inspector/heapProfiler.css +%%DATADIR%%/resources/inspector/heap_snapshot_worker/_module.js %%DATADIR%%/resources/inspector/helpScreen.css %%DATADIR%%/resources/inspector/indexedDBViews.css %%DATADIR%%/resources/inspector/inspector.css %%DATADIR%%/resources/inspector/inspectorCommon.css -%%DATADIR%%/resources/inspector/layers/LayersPanel.js +%%DATADIR%%/resources/inspector/layers/_module.js %%DATADIR%%/resources/inspector/layersPanel.css %%DATADIR%%/resources/inspector/main/Main.js %%DATADIR%%/resources/inspector/navigatorView.css -%%DATADIR%%/resources/inspector/network/NetworkPanel.js +%%DATADIR%%/resources/inspector/network/_module.js %%DATADIR%%/resources/inspector/networkLogView.css %%DATADIR%%/resources/inspector/networkPanel.css %%DATADIR%%/resources/inspector/overrides.css %%DATADIR%%/resources/inspector/panelEnablerView.css -%%DATADIR%%/resources/inspector/profiler/ProfilesPanel.js -%%DATADIR%%/resources/inspector/profiler/heap_snapshot_worker/HeapSnapshotWorker.js +%%DATADIR%%/resources/inspector/profiler/_module.js %%DATADIR%%/resources/inspector/profilesPanel.css +%%DATADIR%%/resources/inspector/requestCookiesView.css +%%DATADIR%%/resources/inspector/requestHeadersView.css %%DATADIR%%/resources/inspector/resourceView.css -%%DATADIR%%/resources/inspector/resources/ResourcesPanel.js +%%DATADIR%%/resources/inspector/resources/_module.js %%DATADIR%%/resources/inspector/resourcesPanel.css %%DATADIR%%/resources/inspector/responsiveDesignView.css %%DATADIR%%/resources/inspector/revisionHistory.css %%DATADIR%%/resources/inspector/screencastView.css -%%DATADIR%%/resources/inspector/script_formatter_worker/ScriptFormatterWorker.js -%%DATADIR%%/resources/inspector/search/AdvancedSearchView.js -%%DATADIR%%/resources/inspector/settings/SettingsScreen.js -%%DATADIR%%/resources/inspector/sidebarPane.css -%%DATADIR%%/resources/inspector/source_frame/SourceFrame.js -%%DATADIR%%/resources/inspector/sources/SourcesPanel.js +%%DATADIR%%/resources/inspector/script_formatter_worker/_module.js +%%DATADIR%%/resources/inspector/settings/_module.js +%%DATADIR%%/resources/inspector/source_frame/_module.js +%%DATADIR%%/resources/inspector/sources/_module.js %%DATADIR%%/resources/inspector/sourcesPanel.css %%DATADIR%%/resources/inspector/sourcesView.css %%DATADIR%%/resources/inspector/spectrum.css -%%DATADIR%%/resources/inspector/splitView.css -%%DATADIR%%/resources/inspector/suggestBox.css -%%DATADIR%%/resources/inspector/temp_storage_shared_worker/TempStorageSharedWorker.js -%%DATADIR%%/resources/inspector/timeline/TimelinePanel.js +%%DATADIR%%/resources/inspector/temp_storage_shared_worker/_module.js +%%DATADIR%%/resources/inspector/timeline/_module.js %%DATADIR%%/resources/inspector/timelinePanel.css +%%DATADIR%%/resources/inspector/webSocketFrameView.css share/icons/hicolor/128x128/apps/chrome.png share/icons/hicolor/22x22/apps/chrome.png share/icons/hicolor/24x24/apps/chrome.png share/icons/hicolor/256x256/apps/chrome.png share/icons/hicolor/48x48/apps/chrome.png share/icons/hicolor/64x64/apps/chrome.png -@dirrmtry %%DATADIR%%/locales -@dirrmtry %%DATADIR%%/resources/extension/demo -@dirrmtry %%DATADIR%%/resources/extension -@dirrmtry %%DATADIR%%/resources/inspector/Images -@dirrmtry %%DATADIR%%/resources/inspector/audits -@dirrmtry %%DATADIR%%/resources/inspector/cm -@dirrmtry %%DATADIR%%/resources/inspector/console -@dirrmtry %%DATADIR%%/resources/inspector/devices -@dirrmtry %%DATADIR%%/resources/inspector/elements -@dirrmtry %%DATADIR%%/resources/inspector/extensions -@dirrmtry %%DATADIR%%/resources/inspector/layers -@dirrmtry %%DATADIR%%/resources/inspector/main -@dirrmtry %%DATADIR%%/resources/inspector/network -@dirrmtry %%DATADIR%%/resources/inspector/profiler/heap_snapshot_worker -@dirrmtry %%DATADIR%%/resources/inspector/profiler -@dirrmtry %%DATADIR%%/resources/inspector/resources -@dirrmtry %%DATADIR%%/resources/inspector/script_formatter_worker -@dirrmtry %%DATADIR%%/resources/inspector/search -@dirrmtry %%DATADIR%%/resources/inspector/settings -@dirrmtry %%DATADIR%%/resources/inspector/source_frame -@dirrmtry %%DATADIR%%/resources/inspector/sources -@dirrmtry %%DATADIR%%/resources/inspector/temp_storage_shared_worker -@dirrmtry %%DATADIR%%/resources/inspector/timeline -@dirrmtry %%DATADIR%%/resources/inspector -@dirrmtry %%DATADIR%%/resources -@dirrmtry %%DATADIR%% Index: branches/2014Q4 =================================================================== --- branches/2014Q4 (revision 370436) +++ branches/2014Q4 (revision 370437) Property changes on: branches/2014Q4 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r370423