Index: branches/2016Q3/www/chromium/Makefile =================================================================== --- branches/2016Q3/www/chromium/Makefile (revision 420230) +++ branches/2016Q3/www/chromium/Makefile (revision 420231) @@ -1,415 +1,418 @@ # Created by: Florent Thoumie # $FreeBSD$ PORTNAME= chromium -PORTVERSION= 51.0.2704.106 +PORTVERSION= 52.0.2743.116 CATEGORIES= www MASTER_SITES= http://commondatastorage.googleapis.com/chromium-browser-official/ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} # default, but needed to get distinfo correct if TEST is on MAINTAINER= chromium@FreeBSD.org COMMENT= Google web browser based on WebKit LICENSE= BSD3CLAUSE LGPL21 MPL LICENSE_COMB= multi +BROKEN_FreeBSD_9=does not patch + CFLAGS+= -isystem${LOCALBASE}/include -I${PREFIX}/include/atk-1.0 BUILD_DEPENDS= ${LOCALBASE}/bin/gperf:devel/gperf \ bash:shells/bash \ yasm:devel/yasm \ flock:sysutils/flock \ ${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat \ ${LOCALBASE}/share/usbids/usb.ids:misc/usbids \ ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2 \ ${PYTHON_PKGNAMEPREFIX}ply>0:devel/py-ply \ ${PYTHON_PKGNAMEPREFIX}html5lib>0:www/py-html5lib LIB_DEPENDS= libasound.so:audio/alsa-lib \ libcairo.so:graphics/cairo \ libcups.so:print/cups \ libdbus-1.so:devel/dbus \ libdbus-glib-1.so:devel/dbus-glib \ libdrm.so:graphics/libdrm \ libexpat.so:textproc/expat2 \ libFLAC.so:audio/flac \ libfreetype.so:print/freetype2 \ libgnome-keyring.so:security/libgnome-keyring \ libharfbuzz.so:print/harfbuzz \ libevent.so:devel/libevent2 \ libexif.so:graphics/libexif \ libfontconfig.so:x11-fonts/fontconfig \ libgcrypt.so:security/libgcrypt \ libicuuc.so:devel/icu \ libjsoncpp.so:devel/jsoncpp \ libnspr4.so:devel/nspr \ libnss3.so:security/nss \ libpci.so:devel/libpci \ libpng.so:graphics/png \ libre2.so:devel/re2 \ libsnappy.so:archivers/snappy \ libspeechd.so:accessibility/speech-dispatcher \ libspeex.so:audio/speex \ libwebp.so:graphics/webp \ libxml2.so:textproc/libxml2 RUN_DEPENDS= ${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:audio/alsa-plugins \ alsa-lib>=1.1.1_1:audio/alsa-lib \ droid-fonts-ttf>0:x11-fonts/droid-fonts-ttf \ xdg-open:devel/xdg-utils ONLY_FOR_ARCHS= i386 amd64 USES= bison cpe desktop-file-utils execinfo jpeg \ ninja perl5 pkgconfig python:2,build shebangfix tar:xz # chromium requires a recent compiler (C++11 capable, but clang 3.4 is # not able to build chromium. OTOH clang36 on FreeBSD 9.3 cannot build # chromium as the libc++ includes are not up to the task. USES flags # have to be set before bsd.ports.pre.mk and thereby cannot depend on # bsd.ports.pre.mk's variables, so I'm using a hack here. .if exists(/usr/lib/libc++.a) USES+= compiler:c++14-lang .else USES+= compiler:c++11-lib .endif CPE_VENDOR= google CPE_PRODUCT= chrome USE_PERL5= build USE_XORG= scrnsaverproto x11 xcomposite xcursor xext xdamage xfixes xi \ xproto xrandr xrender xscrnsaver xtst USE_GNOME= atk glib20 gtk20 dconf libxslt MAKE_ARGS= -C out/${BUILDTYPE} SHEBANG_FILES= chrome/tools/build/linux/chrome-wrapper ALL_TARGET= chrome INSTALLS_ICONS= yes #TODO bz@ : install libwidevinecdm.so (see # third_party/widevine/cdm/widevine_cdm.gyp) # 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 \ use_aura=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=freebsd \ + OS=freebsd \ 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_nspr=1 \ use_system_protobuf=0 \ use_system_re2=1 \ use_system_snappy=1 \ use_system_speex=1 \ use_system_xdg_utils=1 \ use_system_yasm=1 \ v8_use_external_startup_data=0 # 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 KERBEROS DEBUG DRIVER CODECS_DESC= Compile and enable patented codecs like H.264 DRIVER_DESC= Install chromedriver OPTIONS_DEFAULT= CODECS GCONF KERBEROS OPTIONS_SUB= yes GCONF_USE= GNOME=gconf2 PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio DRIVER_MAKE_ARGS=chromedriver 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 empty(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 # pointed out by "Tomek" on freebsd-chromium@ .if !exists(/usr/lib/libexecinfo.so) CFLAGS+= -fno-omit-frame-pointer EXTRA_PATCHES+= ${FILESDIR}/extra-patch-fixup-ffmpeg .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" .include .if ${CHOSEN_COMPILER_TYPE} == gcc GYP_DEFINES+= gcc_version=${CXX:S/g++//} EXTRA_PATCHES+= ${FILESDIR}/extra-patch-gcc CFLAGS+= -fno-stack-protector # gcc 4.8 cannot find __stack_chk_fail_local .else GYP_DEFINES+= clang=1 CFLAGS+= -Wno-unknown-warning-option \ -D_LIBCPP_TRIVIAL_PAIR_COPY_CTOR=1 # work around base r261801 EXTRA_PATCHES+= ${FILESDIR}/extra-patch-clang CONFIGURE_ENV+= AR=/usr/bin/ar .endif .if ! ${PORT_OPTIONS:MKERBEROS} GYP_DEFINES+= use_kerberos=0 .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 2 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 + ${WRKSRC}/v8/src/v8.gyp \ + ${WRKSRC}/v8/gypfiles/toolchain.gypi @${REINPLACE_CMD} -e "s|/usr/local|${PREFIX}|" \ ${WRKSRC}/chrome/common/chrome_paths.cc \ ${WRKSRC}/base/base.gyp 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/analytics' \ 'third_party/angle' \ 'third_party/angle/src/third_party' \ 'third_party/blanketjs' \ 'third_party/brotli' \ 'third_party/boringssl' \ 'third_party/cacheinvalidation' \ 'third_party/catapult' \ - 'third_party/catapult/third_party/beautifulsoup' \ + 'third_party/catapult/third_party/beautifulsoup4' \ 'third_party/catapult/third_party/py_vulcanize' \ 'third_party/catapult/third_party/py_vulcanize/py_vulcanize' \ 'third_party/catapult/third_party/py_vulcanize/third_party/rcssmin' \ 'third_party/catapult/third_party/py_vulcanize/third_party/rjsmin' \ 'third_party/catapult/tracing' \ 'third_party/catapult/tracing/third_party' \ 'third_party/cld' \ 'third_party/cros_system_api' \ 'third_party/dom_distiller_js' \ 'third_party/dom_distiller_js/dist/proto_gen/third_party/dom_distiller_js' \ 'third_party/ffmpeg' \ 'third_party/gardiner_mod' \ 'third_party/fips181' \ 'third_party/flot' \ 'third_party/google_input_tools' \ 'third_party/google_input_tools/third_party/closure_library' \ 'third_party/google_input_tools/third_party/closure_library/third_party/closure' \ '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/openh264' \ 'third_party/openmax_dl' \ 'third_party/opus' \ 'third_party/ots' \ 'third_party/pdfium' \ 'third_party/pdfium/third_party' \ 'third_party/ply' \ 'third_party/polymer' \ 'third_party/protobuf' \ + 'third_party/protobuf/third_party' \ + 'third_party/protobuf/third_party/six' \ 'third_party/pywebsocket' \ 'third_party/qcms' \ 'third_party/qunit' \ 'third_party/sfntly' \ 'third_party/sinonjs' \ 'third_party/skia' \ 'third_party/smhasher' \ 'third_party/sqlite' \ 'third_party/tcmalloc' \ 'third_party/tlslite' \ 'third_party/usrsctp' \ 'third_party/web-animations-js' \ 'third_party/webdriver' \ 'third_party/webrtc' \ 'third_party/widevine' \ 'third_party/woff2' \ 'third_party/x86inc' \ 'third_party/yasm' \ 'third_party/zlib' \ 'url/third_party/mozilla' \ 'v8/src/third_party/valgrind' \ 'v8/src/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 # missing file: file is in -testdata only, but configure stage # will fail if it's not there. do not break TESTS build while # allowing regular build without pulling in -testdata. ${TOUCH} ${WRKSRC}/chrome/test/data/webui/i18n_process_css_test.html 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} cd ${WRKSRC}/out/${BUILDTYPE} && \ ${COPYTREE_SHARE} "locales pseudo_locales resources" ${STAGEDIR}${DATADIR} @${MKDIR} ${STAGEDIR}${DESKTOPDIR} ${INSTALL_DATA} ${WRKDIR}/chromium-browser.desktop \ ${STAGEDIR}${DESKTOPDIR} ${INSTALL_SCRIPT} ${WRKDIR}/chrome ${STAGEDIR}${PREFIX}/bin ${INSTALL_PROGRAM} ${WRKSRC}/out/${BUILDTYPE}/mksnapshot \ ${STAGEDIR}${DATADIR} .if ${PORT_OPTIONS:MDRIVER} ${INSTALL_PROGRAM} ${WRKSRC}/out/${BUILDTYPE}/chromedriver \ ${STAGEDIR}${PREFIX}/bin .endif .include Index: branches/2016Q3/www/chromium/distinfo =================================================================== --- branches/2016Q3/www/chromium/distinfo (revision 420230) +++ branches/2016Q3/www/chromium/distinfo (revision 420231) @@ -1,5 +1,5 @@ -TIMESTAMP = 1466791065 -SHA256 (chromium-51.0.2704.106.tar.xz) = fb97a6a3119ec2c8cc4ad9a0bd6c4d306516769039a2633633f7d0c770012cfd -SIZE (chromium-51.0.2704.106.tar.xz) = 448656636 -SHA256 (chromium-51.0.2704.106-testdata.tar.xz) = 926b44fd0020922ce50b4b838391ae0c531ba4ee3fc6915c4c8b7fd95db765e5 -SIZE (chromium-51.0.2704.106-testdata.tar.xz) = 121454396 +TIMESTAMP = 1470404034 +SHA256 (chromium-52.0.2743.116.tar.xz) = a194ae1edb041024b3d4b6ba438f32fefdb6f1ecb24a96c50248a486b237a101 +SIZE (chromium-52.0.2743.116.tar.xz) = 458156660 +SHA256 (chromium-52.0.2743.116-testdata.tar.xz) = d3d059e1215702d8665f02b47a10e14458f54f423c323a9fcc987e6e43767c0b +SIZE (chromium-52.0.2743.116-testdata.tar.xz) = 122423496 Index: branches/2016Q3/www/chromium/files/patch-third__party_WebKit_Source_platform_text_Character.cpp =================================================================== --- branches/2016Q3/www/chromium/files/patch-third__party_WebKit_Source_platform_text_Character.cpp (revision 420230) +++ branches/2016Q3/www/chromium/files/patch-third__party_WebKit_Source_platform_text_Character.cpp (nonexistent) @@ -1,22 +0,0 @@ ---- third_party/WebKit/Source/platform/text/Character.cpp.orig 2016-05-27 12:28:21.057082000 -0400 -+++ third_party/WebKit/Source/platform/text/Character.cpp 2016-05-27 18:52:20.104602000 -0400 -@@ -36,8 +36,8 @@ - #include - #include - --#if defined(USING_SYSTEM_ICU) --#include "platform/fonts/CharacterPropertyDataGenerator.h" -+#if defined(__FreeBSD__) -+#include "platform/text/CharacterPropertyDataGenerator.h" - #include - #else - #define MUTEX_H // Prevent compile failure of utrie2.h on Windows -@@ -49,7 +49,7 @@ - - namespace blink { - --#if defined(USING_SYSTEM_ICU) -+#if defined(__FreeBSD__) - static icu::UnicodeSet* createUnicodeSet( - const UChar32* characters, size_t charactersCount, - const UChar32* ranges, size_t rangesCount) Property changes on: branches/2016Q3/www/chromium/files/patch-third__party_WebKit_Source_platform_text_Character.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/2016Q3/www/chromium/files/patch-mojo_shell_runner_init.cc =================================================================== --- branches/2016Q3/www/chromium/files/patch-mojo_shell_runner_init.cc (revision 420230) +++ branches/2016Q3/www/chromium/files/patch-mojo_shell_runner_init.cc (nonexistent) @@ -1,19 +0,0 @@ ---- mojo/shell/runner/init.cc.orig 2016-05-21 17:23:12 UTC -+++ mojo/shell/runner/init.cc -@@ -68,6 +68,8 @@ void WaitForDebuggerIfNecessary() { - - void CallLibraryEarlyInitialization(base::NativeLibrary app_library) { - // Do whatever warming that the mojo application wants. -+ -+#if !defined(OS_FREEBSD) - typedef void (*LibraryEarlyInitFunction)(const uint8_t*); - LibraryEarlyInitFunction init_function = - reinterpret_cast( -@@ -79,6 +81,7 @@ void CallLibraryEarlyInitialization(base - const uint8_t* icu_data = base::i18n::GetRawIcuMemory(); - init_function(icu_data); - } -+#endif - - // TODO(erg): All chromium binaries load base. We might want to make a - // general system for other people. Property changes on: branches/2016Q3/www/chromium/files/patch-mojo_shell_runner_init.cc ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: branches/2016Q3/www/chromium/files/patch-third__party_libwebp_libwebp.gyp =================================================================== --- branches/2016Q3/www/chromium/files/patch-third__party_libwebp_libwebp.gyp (revision 420230) +++ branches/2016Q3/www/chromium/files/patch-third__party_libwebp_libwebp.gyp (nonexistent) @@ -1,311 +0,0 @@ ---- third_party/libwebp/libwebp.gyp.orig 2016-05-20 17:19:03 UTC -+++ third_party/libwebp/libwebp.gyp -@@ -1,298 +1,22 @@ --# Copyright (c) 2012 The Chromium Authors. All rights reserved. -+# Copyright 2013 The Chromium Authors. All rights reserved. - # Use of this source code is governed by a BSD-style license that can be - # found in the LICENSE file. - - { -- 'target_defaults': { -- 'conditions': [ -- ['os_posix==1 and (target_arch=="arm" or target_arch=="arm64")', { -- 'cflags!': [ '-Os' ], -- 'cflags': [ '-O2' ], -- }], -- ], -- }, - 'targets': [ - { -- 'target_name': 'libwebp_dec', -- 'type': 'static_library', -- 'dependencies' : [ -- 'libwebp_dsp', -- 'libwebp_dsp_neon', -- 'libwebp_utils', -- ], -- 'include_dirs': ['.'], -- 'sources': [ -- 'dec/alpha.c', -- 'dec/buffer.c', -- 'dec/frame.c', -- 'dec/idec.c', -- 'dec/io.c', -- 'dec/quant.c', -- 'dec/tree.c', -- 'dec/vp8.c', -- 'dec/vp8l.c', -- 'dec/webp.c', -- ], -- }, -- { -- 'target_name': 'libwebp_demux', -- 'type': 'static_library', -- 'include_dirs': ['.'], -- 'sources': [ -- 'demux/demux.c', -- ], -- 'dependencies' : [ -- 'libwebp_utils', -- ], -- }, -- { -- 'target_name': 'libwebp_dsp', -- 'type': 'static_library', -- 'include_dirs': ['.'], -- 'sources': [ -- 'dsp/alpha_processing.c', -- 'dsp/alpha_processing_mips_dsp_r2.c', -- 'dsp/argb.c', -- 'dsp/argb_mips_dsp_r2.c', -- 'dsp/cost.c', -- 'dsp/cost_mips32.c', -- 'dsp/cost_mips_dsp_r2.c', -- 'dsp/cpu.c', -- 'dsp/dec.c', -- 'dsp/dec_clip_tables.c', -- 'dsp/dec_mips32.c', -- 'dsp/dec_mips_dsp_r2.c', -- 'dsp/enc.c', -- 'dsp/enc_avx2.c', -- 'dsp/enc_mips32.c', -- 'dsp/enc_mips_dsp_r2.c', -- 'dsp/filters.c', -- 'dsp/filters_mips_dsp_r2.c', -- 'dsp/lossless.c', -- 'dsp/lossless_enc.c', -- 'dsp/lossless_enc_mips32.c', -- 'dsp/lossless_enc_mips_dsp_r2.c', -- 'dsp/lossless_mips_dsp_r2.c', -- 'dsp/rescaler.c', -- 'dsp/rescaler_mips32.c', -- 'dsp/rescaler_mips_dsp_r2.c', -- 'dsp/upsampling.c', -- 'dsp/upsampling_mips_dsp_r2.c', -- 'dsp/yuv.c', -- 'dsp/yuv_mips32.c', -- 'dsp/yuv_mips_dsp_r2.c', -- ], -- 'dependencies' : [ -- 'libwebp_dsp_sse2', -- 'libwebp_dsp_sse41', -- 'libwebp_utils', -- ], -- 'conditions': [ -- ['OS == "android"', { -- 'dependencies': [ '../../build/android/ndk.gyp:cpu_features' ], -- }], -- # iOS uses the same project to generate build project for both device -- # and simulator and do not use "target_arch" variable. Other platform -- # set it correctly. -- ['OS!="ios" and (target_arch=="ia32" or target_arch=="x64")', { -- 'defines': [ 'WEBP_HAVE_SSE2', 'WEBP_HAVE_SSE41' ], -- }], -- ['order_profiling != 0', { -- 'target_conditions' : [ -- ['_toolset=="target"', { -- 'cflags!': [ '-finstrument-functions' ], -- }], -- ], -- }], -- ], -- }, -- { -- 'target_name': 'libwebp_dsp_sse2', -- 'type': 'static_library', -- 'include_dirs': ['.'], -- 'sources': [ -- 'dsp/alpha_processing_sse2.c', -- 'dsp/argb_sse2.c', -- 'dsp/cost_sse2.c', -- 'dsp/dec_sse2.c', -- 'dsp/enc_sse2.c', -- 'dsp/filters_sse2.c', -- 'dsp/lossless_enc_sse2.c', -- 'dsp/lossless_sse2.c', -- 'dsp/rescaler_sse2.c', -- 'dsp/upsampling_sse2.c', -- 'dsp/yuv_sse2.c', -- ], -- 'conditions': [ -- # iOS uses the same project to generate build project for both device -- # and simulator and do not use "target_arch" variable. Other platform -- # set it correctly. -- ['OS!="ios" and (target_arch=="ia32" or target_arch=="x64") and msan==0', { -- 'cflags': [ '-msse2', ], -- 'xcode_settings': { 'OTHER_CFLAGS': [ '-msse2' ] }, -- }], -- ['order_profiling != 0', { -- 'target_conditions' : [ -- ['_toolset=="target"', { -- 'cflags!': [ '-finstrument-functions' ], -- }], -- ], -- }], -- ], -- }, -- { -- 'target_name': 'libwebp_dsp_sse41', -- 'type': 'static_library', -- 'include_dirs': ['.'], -- 'sources': [ -- 'dsp/alpha_processing_sse41.c', -- 'dsp/dec_sse41.c', -- 'dsp/enc_sse41.c', -- 'dsp/lossless_enc_sse41.c', -- ], -- 'conditions': [ -- ['OS=="win" and clang==1', { -- # cl.exe's /arch flag doesn't have a setting for SSSE3/4, and cl.exe -- # doesn't need it for intrinsics. clang-cl does need it, though. -- 'msvs_settings': { -- 'VCCLCompilerTool': { 'AdditionalOptions': [ '-msse4.1' ] }, -- }, -- }], -- # iOS uses the same project to generate build project for both device -- # and simulator and do not use "target_arch" variable. Other platform -- # set it correctly. -- ['OS!="ios" and (target_arch=="ia32" or target_arch=="x64") and msan==0', { -- 'cflags': [ '-msse4.1', ], -- 'xcode_settings': { 'OTHER_CFLAGS': [ '-msse4.1' ] }, -- }], -- ['order_profiling != 0', { -- 'target_conditions' : [ -- ['_toolset=="target"', { -- 'cflags!': [ '-finstrument-functions' ], -- }], -- ], -- }], -- ], -- }, -- { -- 'target_name': 'libwebp_dsp_neon', -- 'includes' : [ -- # Disable LTO due to Neon issues. -- # crbug.com/408997 -- '../../build/android/disable_gcc_lto.gypi', -- ], -- 'conditions': [ -- # iOS uses the same project to generate build project for both device -- # and simulator and do not use "target_arch" variable. Other platform -- # set it correctly. -- ['OS == "ios" or (target_arch == "arm" and arm_version >= 7 and (arm_neon == 1 or arm_neon_optional == 1)) or (target_arch == "arm64")', { -- 'type': 'static_library', -- 'include_dirs': ['.'], -- 'sources': [ -- 'dsp/dec_neon.c', -- 'dsp/enc_neon.c', -- 'dsp/lossless_enc_neon.c', -- 'dsp/lossless_neon.c', -- 'dsp/rescaler_neon.c', -- 'dsp/upsampling_neon.c', -- ], -- 'conditions': [ -- ['target_arch == "arm" and arm_version >= 7 and (arm_neon == 1 or arm_neon_optional == 1)', { -- # behavior similar to *.c.neon in an Android.mk -- 'cflags!': [ '-mfpu=vfpv3-d16' ], -- 'cflags': [ '-mfpu=neon' ], -- }], -- ['target_arch == "arm64"', { -- # avoid an ICE with gcc-4.9: b/15574841 -- 'cflags': [ '-frename-registers' ], -- }], -- ] -- }, { -- 'type': 'none', -- }], -- ['order_profiling != 0', { -- 'target_conditions' : [ -- ['_toolset=="target"', { -- 'cflags!': [ '-finstrument-functions' ], -- }], -- ], -- }], -- ], -- }, -- { -- 'target_name': 'libwebp_enc', -- 'type': 'static_library', -- 'include_dirs': ['.'], -- 'sources': [ -- 'enc/alpha.c', -- 'enc/analysis.c', -- 'enc/backward_references.c', -- 'enc/config.c', -- 'enc/cost.c', -- 'enc/delta_palettization.c', -- 'enc/filter.c', -- 'enc/frame.c', -- 'enc/histogram.c', -- 'enc/iterator.c', -- 'enc/near_lossless.c', -- 'enc/picture.c', -- 'enc/picture_csp.c', -- 'enc/picture_psnr.c', -- 'enc/picture_rescale.c', -- 'enc/picture_tools.c', -- 'enc/quant.c', -- 'enc/syntax.c', -- 'enc/token.c', -- 'enc/tree.c', -- 'enc/vp8l.c', -- 'enc/webpenc.c', -- ], -- 'dependencies' : [ -- 'libwebp_utils', -- ], -- }, -- { -- 'target_name': 'libwebp_utils', -- 'type': 'static_library', -- 'include_dirs': ['.'], -- 'sources': [ -- 'utils/bit_reader.c', -- 'utils/bit_writer.c', -- 'utils/color_cache.c', -- 'utils/filters.c', -- 'utils/huffman.c', -- 'utils/huffman_encode.c', -- 'utils/quant_levels.c', -- 'utils/quant_levels_dec.c', -- 'utils/random.c', -- 'utils/rescaler.c', -- 'utils/thread.c', -- 'utils/utils.c', -- ], -- 'variables': { -- 'clang_warning_flags': [ -- # See https://code.google.com/p/webp/issues/detail?id=253. -- '-Wno-incompatible-pointer-types', -- ] -- }, -- }, -- { - 'target_name': 'libwebp', - 'type': 'none', -- 'dependencies' : [ -- 'libwebp_dec', -- 'libwebp_demux', -- 'libwebp_dsp', -- 'libwebp_dsp_neon', -- 'libwebp_enc', -- 'libwebp_utils', -- ], - 'direct_dependent_settings': { -- 'include_dirs': ['.'], -+ 'defines': [ -+ 'ENABLE_WEBP', -+ ], - }, -- 'conditions': [ -- ['OS!="win"', {'product_name': 'webp'}], -- ], -- }, -+ 'link_settings': { -+ 'libraries': [ -+ '-lwebp -lwebpdemux', -+ ], -+ }, -+ } - ], - } Property changes on: branches/2016Q3/www/chromium/files/patch-third__party_libwebp_libwebp.gyp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,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/2016Q3/www/chromium/files/patch-third__party_pdfium_build_standalone.gypi =================================================================== --- branches/2016Q3/www/chromium/files/patch-third__party_pdfium_build_standalone.gypi (revision 420230) +++ branches/2016Q3/www/chromium/files/patch-third__party_pdfium_build_standalone.gypi (nonexistent) @@ -1,29 +0,0 @@ ---- third_party/pdfium/build/standalone.gypi.orig 2016-05-11 19:03:45 UTC -+++ third_party/pdfium/build/standalone.gypi -@@ -18,7 +18,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 -@@ -31,7 +31,7 @@ - s/aarch64/arm64/;\ - s/mips.*/mipsel/")', - }, { -- # OS!="linux" and OS!="mac" -+ # OS!="linux" and OS!="mac" and OS!="freebsd" - 'host_arch%': 'ia32', - }], - ], -@@ -264,7 +264,7 @@ - # means we have to turn off this warning (and be careful about how - # object destruction happens in such cases). - 4611, -- -+} - # TODO(thestig): These warnings are level 4. They will be slowly - # removed as code is fixed. - 4100, # Unreferenced formal parameter Property changes on: branches/2016Q3/www/chromium/files/patch-third__party_pdfium_build_standalone.gypi ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,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/2016Q3/www/chromium/files/patch-mojo_shell_public_cpp_initialize__base__and__icu.cc =================================================================== --- branches/2016Q3/www/chromium/files/patch-mojo_shell_public_cpp_initialize__base__and__icu.cc (revision 420230) +++ branches/2016Q3/www/chromium/files/patch-mojo_shell_public_cpp_initialize__base__and__icu.cc (nonexistent) @@ -1,16 +0,0 @@ ---- mojo/shell/public/cpp/initialize_base_and_icu.cc.orig 2016-05-21 17:21:25 UTC -+++ mojo/shell/public/cpp/initialize_base_and_icu.cc -@@ -33,11 +33,13 @@ InitializeBase(const uint8_t* icu_data) - base::SysInfo::MaxSharedMemorySize(); - #endif - -+#if !defined(OS_FREEBSD) - // Initialize core ICU. We must perform the full initialization before we - // initialize icu::TimeZone subsystem because otherwise ICU gets in a state - // where the timezone data is disconnected from the locale data which can - // cause crashes. - CHECK(base::i18n::InitializeICUFromRawMemory(icu_data)); -+#endif - - #if !defined(OS_ANDROID) - // ICU DateFormat class (used in base/time_format.cc) needs to get the Property changes on: branches/2016Q3/www/chromium/files/patch-mojo_shell_public_cpp_initialize__base__and__icu.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/2016Q3/www/chromium/files/patch-ui_message__center_views_message__center__view.cc =================================================================== --- branches/2016Q3/www/chromium/files/patch-ui_message__center_views_message__center__view.cc (revision 420230) +++ branches/2016Q3/www/chromium/files/patch-ui_message__center_views_message__center__view.cc (nonexistent) @@ -1,20 +0,0 @@ ---- ui/message_center/views/message_center_view.cc.orig 2016-05-11 19:02:35 UTC -+++ ui/message_center/views/message_center_view.cc -@@ -44,7 +44,7 @@ namespace message_center { - namespace { - - const SkColor kNoNotificationsTextColor = SkColorSetRGB(0xb4, 0xb4, 0xb4); --#if defined(OS_LINUX) && defined(OS_CHROMEOS) -+#if (defined(OS_LINUX) || defined(OS_BSD)) && defined(OS_CHROMEOS) - const SkColor kTransparentColor = SkColorSetARGB(0, 0, 0, 0); - #endif - -@@ -82,7 +82,7 @@ NoNotificationMessageView::NoNotificatio - label_->SetEnabledColor(kNoNotificationsTextColor); - // Set transparent background to ensure that subpixel rendering - // is disabled. See crbug.com/169056 --#if defined(OS_LINUX) && defined(OS_CHROMEOS) -+#if (defined(OS_LINUX) || defined(OS_BSD)) && defined(OS_CHROMEOS) - label_->SetBackgroundColor(kTransparentColor); - #endif - AddChildView(label_); Property changes on: branches/2016Q3/www/chromium/files/patch-ui_message__center_views_message__center__view.cc ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: branches/2016Q3/www/chromium/files/patch-ui_webui_resources_js_util.js =================================================================== --- branches/2016Q3/www/chromium/files/patch-ui_webui_resources_js_util.js (revision 420230) +++ branches/2016Q3/www/chromium/files/patch-ui_webui_resources_js_util.js (nonexistent) @@ -1,11 +0,0 @@ ---- ui/webui/resources/js/util.js.orig 2016-05-11 19:02:36 UTC -+++ ui/webui/resources/js/util.js -@@ -52,7 +52,7 @@ function announceAccessibleMessage(msg) - */ - function getSupportedScaleFactors() { - var supportedScaleFactors = []; -- if (cr.isMac || cr.isChromeOS || cr.isWindows || cr.isLinux) { -+ if (cr.isMac || cr.isChromeOS || cr.isWindows || cr.isLinux || cr.isBSD) { - // All desktop platforms support zooming which also updates the - // renderer's device scale factors (a.k.a devicePixelRatio), and - // these platforms has high DPI assets for 2.0x. Use 1x and 2x in Property changes on: branches/2016Q3/www/chromium/files/patch-ui_webui_resources_js_util.js ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: branches/2016Q3/www/chromium/files/patch-base_i18n_icu__util.cc =================================================================== --- branches/2016Q3/www/chromium/files/patch-base_i18n_icu__util.cc (revision 420230) +++ branches/2016Q3/www/chromium/files/patch-base_i18n_icu__util.cc (nonexistent) @@ -1,13 +0,0 @@ ---- base/i18n/icu_util.cc.orig 2016-05-21 17:18:09 UTC -+++ base/i18n/icu_util.cc -@@ -36,10 +36,6 @@ - #include "base/mac/foundation_util.h" - #endif - --#define ICU_UTIL_DATA_FILE 0 --#define ICU_UTIL_DATA_SHARED 1 --#define ICU_UTIL_DATA_STATIC 2 -- - namespace base { - namespace i18n { - Property changes on: branches/2016Q3/www/chromium/files/patch-base_i18n_icu__util.cc ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: branches/2016Q3/www/chromium/files/patch-third__party_flac_flac.gyp =================================================================== --- branches/2016Q3/www/chromium/files/patch-third__party_flac_flac.gyp (revision 420230) +++ branches/2016Q3/www/chromium/files/patch-third__party_flac_flac.gyp (nonexistent) @@ -1,116 +0,0 @@ ---- third_party/flac/flac.gyp.orig 2016-05-20 17:19:03 UTC -+++ third_party/flac/flac.gyp -@@ -1,4 +1,4 @@ --# Copyright (c) 2011 The Chromium Authors. All rights reserved. -+# Copyright 2013 The Chromium Authors. All rights reserved. - # Use of this source code is governed by a BSD-style license that can be - # found in the LICENSE file. - -@@ -6,85 +6,32 @@ - 'targets': [ - { - 'target_name': 'libflac', -- 'product_name': 'flac', -- 'type': 'static_library', -- 'sources': [ -- 'include/FLAC/all.h', -- 'include/FLAC/assert.h', -- 'include/FLAC/callback.h', -- 'include/FLAC/export.h', -- 'include/FLAC/format.h', -- 'include/FLAC/metadata.h', -- 'include/FLAC/ordinals.h', -- 'include/FLAC/stream_decoder.h', -- 'include/FLAC/stream_encoder.h', -- 'include/share/alloc.h', -- 'src/libFLAC/alloc.c', -- 'src/libFLAC/bitmath.c', -- 'src/libFLAC/bitreader.c', -- 'src/libFLAC/bitwriter.c', -- 'src/libFLAC/cpu.c', -- 'src/libFLAC/crc.c', -- 'src/libFLAC/fixed.c', -- 'src/libFLAC/float.c', -- 'src/libFLAC/format.c', -- 'src/libFLAC/lpc.c', -- 'src/libFLAC/md5.c', -- 'src/libFLAC/memory.c', -- 'src/libFLAC/stream_decoder.c', -- 'src/libFLAC/stream_encoder.c', -- 'src/libFLAC/stream_encoder_framing.c', -- 'src/libFLAC/window.c', -- 'src/libFLAC/include/private/all.h', -- 'src/libFLAC/include/private/bitmath.h', -- 'src/libFLAC/include/private/bitreader.h', -- 'src/libFLAC/include/private/bitwriter.h', -- 'src/libFLAC/include/private/cpu.h', -- 'src/libFLAC/include/private/crc.h', -- 'src/libFLAC/include/private/fixed.h', -- 'src/libFLAC/include/private/float.h', -- 'src/libFLAC/include/private/format.h', -- 'src/libFLAC/include/private/lpc.h', -- 'src/libFLAC/include/private/md5.h', -- 'src/libFLAC/include/private/memory.h', -- 'src/libFLAC/include/private/metadata.h', -- 'src/libFLAC/include/private/stream_encoder_framing.h', -- 'src/libFLAC/include/private/window.h', -- 'src/libFLAC/include/protected/all.h', -- 'src/libFLAC/include/protected/stream_decoder.h', -- 'src/libFLAC/include/protected/stream_encoder.h', -- ], -- 'defines': [ -- 'FLAC__NO_DLL', -- 'FLAC__OVERFLOW_DETECT', -- 'VERSION="1.2.1"', -- ], -- 'include_dirs': [ -- 'include', -- 'src/libFLAC/include', -- ], -- 'direct_dependent_settings': { -- 'defines': [ -- 'FLAC__NO_DLL', -+ 'type': 'none', -+ 'variables': { -+ 'headers_root_path': 'include', -+ 'header_filenames': [ -+ 'FLAC/callback.h', -+ 'FLAC/metadata.h', -+ 'FLAC/assert.h', -+ 'FLAC/export.h', -+ 'FLAC/format.h', -+ 'FLAC/stream_decoder.h', -+ 'FLAC/stream_encoder.h', -+ 'FLAC/ordinals.h', -+ 'FLAC/all.h', - ], - }, -- 'variables': { -- 'clang_warning_flags': [ -- # libflac converts between FLAC__StreamDecoderState and -- # FLAC__StreamDecoderInitStatus a lot in stream_decoder.c. -- '-Wno-conversion', -- # libflac contains constants that are only used in certain -- # compile-time cases, which triggers unused-const-variable warnings in -- # other cases. -- '-Wno-unused-const-variable', -+ 'includes': [ -+ '../../build/shim_headers.gypi', -+ ], -+ 'link_settings': { -+ 'ldflags': [ -+ 'SetBackgroundColor(theme->GetSystemColor( Property changes on: branches/2016Q3/www/chromium/files/patch-ui_views_controls_button_label__button.cc ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: branches/2016Q3/www/chromium/files/patch-base_i18n_icu__util.h =================================================================== --- branches/2016Q3/www/chromium/files/patch-base_i18n_icu__util.h (revision 420230) +++ branches/2016Q3/www/chromium/files/patch-base_i18n_icu__util.h (nonexistent) @@ -1,13 +0,0 @@ ---- base/i18n/icu_util.h.orig 2016-05-21 17:19:29 UTC -+++ base/i18n/icu_util.h -@@ -11,6 +11,10 @@ - #include "base/i18n/base_i18n_export.h" - #include "build/build_config.h" - -+#define ICU_UTIL_DATA_FILE 0 -+#define ICU_UTIL_DATA_SHARED 1 -+#define ICU_UTIL_DATA_STATIC 2 -+ - namespace base { - namespace i18n { - Property changes on: branches/2016Q3/www/chromium/files/patch-base_i18n_icu__util.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/2016Q3/www/chromium/files/patch-content_renderer_media_webrtc__audio__capturer.cc =================================================================== --- branches/2016Q3/www/chromium/files/patch-content_renderer_media_webrtc__audio__capturer.cc (revision 420230) +++ branches/2016Q3/www/chromium/files/patch-content_renderer_media_webrtc__audio__capturer.cc (nonexistent) @@ -1,13 +0,0 @@ ---- content/renderer/media/webrtc_audio_capturer.cc.orig 2016-05-11 19:02:21 UTC -+++ content/renderer/media/webrtc_audio_capturer.cc -@@ -476,8 +476,8 @@ void WebRtcAudioCapturer::Capture(const - // 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 Property changes on: branches/2016Q3/www/chromium/files/patch-content_renderer_media_webrtc__audio__capturer.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/2016Q3/www/chromium/files/patch-ui_views_controls_scrollbar_base__scroll__bar.cc =================================================================== --- branches/2016Q3/www/chromium/files/patch-ui_views_controls_scrollbar_base__scroll__bar.cc (revision 420230) +++ branches/2016Q3/www/chromium/files/patch-ui_views_controls_scrollbar_base__scroll__bar.cc (nonexistent) @@ -1,11 +0,0 @@ ---- ui/views/controls/scrollbar/base_scroll_bar.cc.orig 2016-05-11 19:02:36 UTC -+++ ui/views/controls/scrollbar/base_scroll_bar.cc -@@ -24,7 +24,7 @@ - #include "ui/views/controls/scrollbar/base_scroll_bar_thumb.h" - #include "ui/views/widget/widget.h" - --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) - #include "ui/gfx/screen.h" - #endif - Property changes on: branches/2016Q3/www/chromium/files/patch-ui_views_controls_scrollbar_base__scroll__bar.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/2016Q3/www/chromium/files/patch-ui_message__center_views_notification__view.cc =================================================================== --- branches/2016Q3/www/chromium/files/patch-ui_message__center_views_notification__view.cc (revision 420230) +++ branches/2016Q3/www/chromium/files/patch-ui_message__center_views_notification__view.cc (nonexistent) @@ -1,11 +0,0 @@ ---- ui/message_center/views/notification_view.cc.orig 2016-05-11 19:02:35 UTC -+++ ui/message_center/views/notification_view.cc -@@ -199,7 +199,7 @@ NotificationView* NotificationView::Crea - NotificationView* notification_view = - new NotificationView(controller, notification); - --#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) - // Don't create shadows for notification toasts on linux wih aura. - if (top_level) - return notification_view; Property changes on: branches/2016Q3/www/chromium/files/patch-ui_message__center_views_notification__view.cc ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: branches/2016Q3/www/chromium/files/patch-ui_views_bubble_bubble__delegate.cc =================================================================== --- branches/2016Q3/www/chromium/files/patch-ui_views_bubble_bubble__delegate.cc (revision 420230) +++ branches/2016Q3/www/chromium/files/patch-ui_views_bubble_bubble__delegate.cc (nonexistent) @@ -1,11 +0,0 @@ ---- ui/views/bubble/bubble_delegate.cc.orig 2016-05-11 19:02:36 UTC -+++ ui/views/bubble/bubble_delegate.cc -@@ -96,7 +96,7 @@ Widget* BubbleDelegateView::CreateBubble - // the parent frame and let DWM handle compositing. If not, then we don't - // want to allow the bubble to extend the frame because it will be clipped. - bubble_delegate->set_adjust_if_offscreen(ui::win::IsAeroGlassEnabled()); --#elif (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_MACOSX) -+#elif (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_MACOSX) || defined(OS_BSD) - // Linux clips bubble windows that extend outside their parent window bounds. - // Mac never adjusts. - bubble_delegate->set_adjust_if_offscreen(false); Property changes on: branches/2016Q3/www/chromium/files/patch-ui_views_bubble_bubble__delegate.cc ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: branches/2016Q3/www/chromium/files/extra-patch-clang =================================================================== --- branches/2016Q3/www/chromium/files/extra-patch-clang (revision 420230) +++ branches/2016Q3/www/chromium/files/extra-patch-clang (revision 420231) @@ -1,180 +1,153 @@ --- base/strings/safe_sprintf_unittest.cc 2015-04-15 00:18:48.000000000 +0200 +++ base/strings/safe_sprintf_unittest.cc 2015-04-18 22:08:45.000000000 +0200 @@ -729,12 +729,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 --- base/threading/thread_local_storage_unittest.cc 2015-04-15 00:18:48.000000000 +0200 +++ base/threading/thread_local_storage_unittest.cc 2015-04-18 21:45:40.000000000 +0200 @@ -60,7 +60,7 @@ void ThreadLocalStorageCleanup(void *value) { int *ptr = reinterpret_cast(value); // Destructors should never be called with a NULL. - ASSERT_NE(reinterpret_cast(NULL), ptr); + ASSERT_NE(static_cast(NULL), ptr); if (*ptr == kFinalTlsValue) return; // We've been called enough times. ASSERT_LT(kFinalTlsValue, *ptr); --- base/tracked_objects.cc 2015-04-15 00:31:20.000000000 +0200 +++ base/tracked_objects.cc 2015-04-18 21:57:33.000000000 +0200 @@ -425,7 +425,7 @@ } // We must NOT do any allocations during this callback. // Using the simple linked lists avoids all allocations. - DCHECK_EQ(this->next_retired_worker_, reinterpret_cast(NULL)); + DCHECK_EQ(this->next_retired_worker_, static_cast(NULL)); this->next_retired_worker_ = first_retired_worker_; first_retired_worker_ = this; } --- base/tracked_objects_unittest.cc.orig 2015-08-22 15:01:51.000000000 -0400 +++ base/tracked_objects_unittest.cc 2015-09-03 09:20:53.370191000 -0400 @@ -58,9 +58,9 @@ Births* birth = ThreadData::TallyABirthIfActive(location); if (ThreadData::status() == ThreadData::DEACTIVATED) - EXPECT_EQ(reinterpret_cast(NULL), birth); + EXPECT_EQ(static_cast(NULL), birth); else - EXPECT_NE(reinterpret_cast(NULL), birth); + EXPECT_NE(static_cast(NULL), birth); } // Helper function to verify the most common test expectations. --- components/sync_sessions/synced_session_tracker.cc.orig 2016-01-21 13:04:41.772845558 +0100 +++ components/sync_sessions/synced_session_tracker.cc 2016-01-21 13:05:17.652842509 +0100 @@ -286,7 +286,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; } ---- content/browser/frame_host/render_widget_host_view_guest.cc 2015-04-15 00:31:22.000000000 +0200 -+++ content/browser/frame_host/render_widget_host_view_guest.cc 2015-04-18 22:10:28.000000000 +0200 -@@ -315,11 +315,11 @@ - - gfx::NativeViewId RenderWidgetHostViewGuest::GetNativeViewId() const { - if (!guest_) -- return static_cast(NULL); -+ return reinterpret_cast(NULL); - - RenderWidgetHostView* rwhv = guest_->GetOwnerRenderWidgetHostView(); - if (!rwhv) -- return static_cast(NULL); -+ return reinterpret_cast(NULL); - return rwhv->GetNativeViewId(); - } - --- media/audio/audio_output_proxy_unittest.cc 2015-04-15 00:18:55.000000000 +0200 +++ media/audio/audio_output_proxy_unittest.cc 2015-04-18 22:02:38.000000000 +0200 @@ -387,7 +387,7 @@ // |stream| is closed at this point. Start() should reopen it again. EXPECT_CALL(manager(), MakeAudioOutputStream(_, _)) .Times(2) - .WillRepeatedly(Return(reinterpret_cast(NULL))); + .WillRepeatedly(Return(static_cast(NULL))); EXPECT_CALL(callback_, OnError(_)) .Times(2); --- third_party/hunspell/src/hunspell/affentry.hxx.orig 2015-07-21 18:46:37.322427000 -0400 +++ third_party/hunspell/src/hunspell/affentry.hxx 2015-07-21 18:48:02.034251000 -0400 @@ -27,7 +27,7 @@ struct hentry * checkword(const char * word, int len, char in_compound, const FLAG needflag = FLAG_NULL); - struct hentry * check_twosfx(const char * word, int len, char in_compound, const FLAG needflag = NULL); + struct hentry * check_twosfx(const char * word, int len, char in_compound, const FLAG needflag = 0); char * check_morph(const char * word, int len, char in_compound, const FLAG needflag = FLAG_NULL); @@ -90,7 +90,7 @@ // const FLAG cclass = FLAG_NULL, const FLAG needflag = FLAG_NULL, char in_compound=IN_CPD_NOT); const FLAG cclass = FLAG_NULL, const FLAG needflag = FLAG_NULL, const FLAG badflag = 0); - struct hentry * check_twosfx(const char * word, int len, int optflags, PfxEntry* ppfx, const FLAG needflag = NULL); + struct hentry * check_twosfx(const char * word, int len, int optflags, PfxEntry* ppfx, const FLAG needflag = 0); char * check_twosfx_morph(const char * word, int len, int optflags, PfxEntry* ppfx, const FLAG needflag = FLAG_NULL); --- third_party/sfntly/src/cpp/src/sfntly/table/core/cmap_table.cc 2015-04-15 00:31:48.000000000 +0200 +++ third_party/sfntly/src/cpp/src/sfntly/table/core/cmap_table.cc 2015-04-18 22:05:41.000000000 +0200 @@ -439,7 +439,7 @@ } CMapTable::CMapFormat0::Builder::Builder(const CMapId& cmap_id) - : CMap::Builder(reinterpret_cast(NULL), + : CMap::Builder(static_cast(NULL), CMapFormat::kFormat0, cmap_id) { } @@ -563,7 +563,7 @@ : CMapTable::CMap::Builder(data ? down_cast( data->Slice(offset, data->ReadUShort( offset + Offset::kFormat0Length))) - : reinterpret_cast(NULL), + : static_cast(NULL), CMapFormat::kFormat2, cmap_id) { // TODO(arthurhsu): FIXIT: heavy lifting and leak, need fix. } @@ -574,7 +574,7 @@ : CMapTable::CMap::Builder(data ? down_cast( data->Slice(offset, data->ReadUShort( offset + Offset::kFormat0Length))) - : reinterpret_cast(NULL), + : static_cast(NULL), CMapFormat::kFormat2, cmap_id) { // TODO(arthurhsu): FIXIT: heavy lifting and leak, need fix. } @@ -958,7 +958,7 @@ CMapTable::CMapFormat4::Builder::Builder(SegmentList* segments, IntegerList* glyph_id_array, const CMapId& cmap_id) - : CMap::Builder(reinterpret_cast(NULL), + : CMap::Builder(static_cast(NULL), CMapFormat::kFormat4, cmap_id), segments_(segments->begin(), segments->end()), glyph_id_array_(glyph_id_array->begin(), glyph_id_array->end()) { @@ -966,7 +966,7 @@ } CMapTable::CMapFormat4::Builder::Builder(const CMapId& cmap_id) - : CMap::Builder(reinterpret_cast(NULL), + : CMap::Builder(static_cast(NULL), CMapFormat::kFormat4, cmap_id) { } --- third_party/webrtc/base/taskrunner.cc 2015-04-15 00:32:17.000000000 +0200 +++ third_party/webrtc/base/taskrunner.cc 2015-04-18 22:10:53.000000000 +0200 @@ -102,7 +102,7 @@ std::vector::iterator it; it = std::remove(tasks_.begin(), tasks_.end(), - reinterpret_cast(NULL)); + static_cast(NULL)); tasks_.erase(it, tasks_.end()); ---- third_party/WebKit/Source/platform/fonts/FontPlatformData.cpp.orig 2015-10-14 22:17:57.580250000 +0200 -+++ third_party/WebKit/Source/platform/fonts/FontPlatformData.cpp 2015-10-14 22:18:13.766229000 +0200 -@@ -358,7 +358,7 @@ - { - RefPtr buffer; - -- SkFontTableTag tag = WTF::bswap32(table); -+ SkFontTableTag tag = bswap32(table); - const size_t tableSize = m_typeface->getTableSize(tag); - if (tableSize) { - Vector tableBuffer(tableSize); Index: branches/2016Q3/www/chromium/files/patch-base_base.gyp =================================================================== --- branches/2016Q3/www/chromium/files/patch-base_base.gyp (revision 420230) +++ branches/2016Q3/www/chromium/files/patch-base_base.gyp (revision 420231) @@ -1,23 +1,40 @@ ---- base/base.gyp.orig 2016-05-11 19:02:11 UTC -+++ base/base.gyp -@@ -113,7 +113,7 @@ +--- ./base/base.gyp.orig 2016-07-22 00:06:49.000000000 -0400 ++++ ./base/base.gyp 2016-08-05 08:28:39.441243000 -0400 +@@ -114,7 +114,7 @@ ], 'link_settings': { 'libraries': [ - '-L/usr/local/lib -lexecinfo', + '-L/usr/local/lib -lexecinfo -lkvm', ], }, }], -@@ -748,6 +748,11 @@ +@@ -286,13 +286,13 @@ + ], + }], + ['icu_use_data_file_flag==1', { +- 'defines': ['ICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_FILE'], ++ 'defines': ['ICU_UTIL_DATA_IMPL=0'], + }, { # else icu_use_data_file_flag !=1 + 'conditions': [ + ['OS=="win"', { +- 'defines': ['ICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_SHARED'], ++ 'defines': ['ICU_UTIL_DATA_IMPL=1'], + }, { +- 'defines': ['ICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_STATIC'], ++ 'defines': ['ICU_UTIL_DATA_IMPL=2'], + }], + ], + }], +@@ -773,6 +773,11 @@ 'sync_socket_unittest.cc', ], }], + ['OS == "freebsd"', { + 'sources!': [ + 'debug/proc_maps_linux_unittest.cc', + ], + }], ], # target_conditions }, { Index: branches/2016Q3/www/chromium/files/patch-build_common.gypi =================================================================== --- branches/2016Q3/www/chromium/files/patch-build_common.gypi (revision 420230) +++ branches/2016Q3/www/chromium/files/patch-build_common.gypi (revision 420231) @@ -1,92 +1,40 @@ ---- build/common.gypi.orig 2016-05-11 19:02:12 UTC -+++ build/common.gypi -@@ -112,7 +112,7 @@ - - 'conditions': [ - # Windows and Linux use Aura, but not Ash. -- ['OS=="win" or OS=="linux"', { -+ ['OS=="win" or OS=="linux" or OS=="freebsd" or OS=="openbsd"', { - 'use_aura%': 1, - }], - -@@ -254,13 +254,13 @@ - }], - - # Enable HiDPI on Mac OS, Windows and Linux (including Chrome OS). -- ['OS=="mac" or OS=="win" or OS=="linux"', { -+ ['OS=="mac" or OS=="win" or OS=="linux" or OS=="freebsd" or OS=="openbsd"', { - 'enable_hidpi%': 1, - }], - - # Enable Top Chrome Material Design on Chrome OS, Windows, and Linux, - # and Mac. -- ['chromeos==1 or OS=="win" or OS=="linux" or OS=="mac"', { -+ ['chromeos==1 or OS=="win" or OS=="linux" or OS=="mac" or OS=="freebsd" or OS=="openbsd"', { - 'enable_topchrome_md%': 1, - }], - -@@ -733,6 +733,12 @@ +--- build/common.gypi.orig 2016-07-22 00:06:49.000000000 -0400 ++++ build/common.gypi 2016-08-03 11:18:18.437811000 -0400 +@@ -726,6 +726,12 @@ 'os_bsd%': 0, }], + ['OS=="freebsd" or OS=="openbsd"', { + 'icu_use_data_file_flag%': 0, + }, { + 'icu_use_data_file_flag%': 1, + }], + # NSS usage. ['(OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris")', { 'use_nss_certs%': 1, -@@ -778,7 +784,7 @@ - }], - - # DBus usage. -- ['OS=="linux" and embedded==0', { -+ ['(OS=="linux" or OS=="freebsd") and embedded==0', { - 'use_dbus%': 1, - }, { - 'use_dbus%': 0, -@@ -881,7 +887,7 @@ - - # Use GPU accelerated cross process image transport by default - # on linux builds with the Aura window manager -- ['use_aura==1 and OS=="linux"', { -+ ['use_aura==1 and (OS=="linux" or OS=="freebsd" or OS=="openbsd")', { - 'ui_compositor_image_transport%': 1, - }, { - 'ui_compositor_image_transport%': 0, -@@ -1003,7 +1009,7 @@ - }, { - 'use_openmax_dl_fft%': 0, - }], -- ['OS=="win" or OS=="linux"', { -+ ['OS=="win" or OS=="linux" or OS=="freebsd"', { - 'enable_mdns%' : 1, - }], - -@@ -1300,6 +1306,10 @@ +@@ -1303,6 +1309,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, + # 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. -@@ -4715,6 +4725,13 @@ +@@ -4709,6 +4719,13 @@ 'ldflags': [ '-Wl,--no-keep-memory', ], + 'ldflags!': [ + '-ldl', + '-pie' + ], + 'libraries!': [ + '-ldl', + ], }, }], # Android-specific options; note that most are set above with Linux. Index: branches/2016Q3/www/chromium/files/patch-chrome_browser_extensions_api_messaging_message__service.cc =================================================================== --- branches/2016Q3/www/chromium/files/patch-chrome_browser_extensions_api_messaging_message__service.cc (revision 420230) +++ branches/2016Q3/www/chromium/files/patch-chrome_browser_extensions_api_messaging_message__service.cc (revision 420231) @@ -1,20 +1,20 @@ ---- chrome/browser/extensions/api/messaging/message_service.cc.orig 2016-05-21 16:16:28 UTC -+++ chrome/browser/extensions/api/messaging/message_service.cc -@@ -118,7 +118,7 @@ MessageService::PolicyPermission Message +--- chrome/browser/extensions/api/messaging/message_service.cc.orig 2016-07-22 00:06:51.000000000 -0400 ++++ chrome/browser/extensions/api/messaging/message_service.cc 2016-08-03 11:20:56.579570000 -0400 +@@ -119,7 +119,7 @@ const char kReceivingEndDoesntExistError[] = "Could not establish connection. Receiving end does not exist."; -#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) +#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) const char kMissingPermissionError[] = "Access to native messaging requires nativeMessaging permission."; const char kProhibitedByPoliciesError[] = -@@ -415,7 +415,7 @@ void MessageService::OpenChannelToNative +@@ -415,7 +415,7 @@ if (!source) return; -#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) +#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) - Profile* profile = - Profile::FromBrowserContext(source->GetProcess()->GetBrowserContext()); - ExtensionService* extension_service = + content::WebContents* web_contents = + content::WebContents::FromRenderFrameHost(source); + ExtensionWebContentsObserver* extension_web_contents_observer = Index: branches/2016Q3/www/chromium/files/patch-chrome_browser_platform__util.h =================================================================== --- branches/2016Q3/www/chromium/files/patch-chrome_browser_platform__util.h (nonexistent) +++ branches/2016Q3/www/chromium/files/patch-chrome_browser_platform__util.h (revision 420231) @@ -0,0 +1,11 @@ +--- chrome/browser/platform_util.h.orig 2016-08-04 11:19:03.775212000 -0400 ++++ chrome/browser/platform_util.h 2016-08-04 11:19:15.839097000 -0400 +@@ -40,7 +40,7 @@ + enum OpenItemType { + OPEN_FILE, + OPEN_FOLDER, +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + SHOW_ITEM_IN_FOLDER + #endif + }; Property changes on: branches/2016Q3/www/chromium/files/patch-chrome_browser_platform__util.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/2016Q3/www/chromium/files/patch-chrome_browser_resources_safe__browsing_gen__file__type__proto.py =================================================================== --- branches/2016Q3/www/chromium/files/patch-chrome_browser_resources_safe__browsing_gen__file__type__proto.py (nonexistent) +++ branches/2016Q3/www/chromium/files/patch-chrome_browser_resources_safe__browsing_gen__file__type__proto.py (revision 420231) @@ -0,0 +1,19 @@ +--- chrome/browser/resources/safe_browsing/gen_file_type_proto.py.orig 2016-08-04 11:13:17.290964000 -0400 ++++ chrome/browser/resources/safe_browsing/gen_file_type_proto.py 2016-08-04 11:13:54.901432000 -0400 +@@ -39,6 +39,7 @@ + "android": config_pb2.DownloadFileType.PLATFORM_ANDROID, + "chromeos": config_pb2.DownloadFileType.PLATFORM_CHROME_OS, + "linux": config_pb2.DownloadFileType.PLATFORM_LINUX, ++ "freebsd": config_pb2.DownloadFileType.PLATFORM_LINUX, + "mac": config_pb2.DownloadFileType.PLATFORM_MAC, + "win": config_pb2.DownloadFileType.PLATFORM_WINDOWS, + } +@@ -157,7 +158,7 @@ + 'fix for http://crbug.com/605592') + parser.add_option('-t', '--type', + help='The platform type. One of android, chromeos, ' + +- 'linux, mac, win') ++ 'linux, freebsd, mac, win') + parser.add_option('-i', '--infile', + help='The ASCII DownloadFileType-proto file to read.') + parser.add_option('-o', '--outfile', Property changes on: branches/2016Q3/www/chromium/files/patch-chrome_browser_resources_safe__browsing_gen__file__type__proto.py ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2016Q3/www/chromium/files/patch-chrome_chrome__resources.gyp =================================================================== --- branches/2016Q3/www/chromium/files/patch-chrome_chrome__resources.gyp (nonexistent) +++ branches/2016Q3/www/chromium/files/patch-chrome_chrome__resources.gyp (revision 420231) @@ -0,0 +1,11 @@ +--- chrome/chrome_resources.gyp.orig 2016-08-04 11:15:29.707642000 -0400 ++++ chrome/chrome_resources.gyp 2016-08-04 11:17:02.866434000 -0400 +@@ -321,6 +321,8 @@ + 'platform': 'chromeos' + }, 'OS=="linux"', { + 'platform': 'linux' ++ }, 'OS=="freebsd"', { ++ 'platform': 'freebsd' + }, 'OS=="mac"', { + 'platform': 'mac' + }, 'OS=="win"', { Property changes on: branches/2016Q3/www/chromium/files/patch-chrome_chrome__resources.gyp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2016Q3/www/chromium/files/patch-components_dom__distiller_core_page__features.cc =================================================================== --- branches/2016Q3/www/chromium/files/patch-components_dom__distiller_core_page__features.cc (revision 420230) +++ branches/2016Q3/www/chromium/files/patch-components_dom__distiller_core_page__features.cc (revision 420231) @@ -1,15 +1,15 @@ ---- components/dom_distiller/core/page_features.cc.orig 2016-05-25 15:00:59.000000000 -0400 -+++ components/dom_distiller/core/page_features.cc 2016-05-27 10:13:11.588307000 -0400 +--- components/dom_distiller/core/page_features.cc.orig 2016-07-22 00:06:53.000000000 -0400 ++++ components/dom_distiller/core/page_features.cc 2016-08-03 11:25:37.908892000 -0400 @@ -10,7 +10,11 @@ + #include #include "base/json/json_reader.h" - #include "base/memory/scoped_ptr.h" -#include "third_party/re2/src/re2/re2.h" -+#if defined(OS_BSD) ++#if defined(OS_FREEBSD) +# include +#else +# include "third_party/re2/src/re2/re2.h" -+#endif // defined(OS_BSD) ++#endif // defined(OS_FREEBSD) #include "url/gurl.h" namespace dom_distiller { Index: branches/2016Q3/www/chromium/files/patch-components_storage__monitor_storage__monitor__freebsd.h =================================================================== --- branches/2016Q3/www/chromium/files/patch-components_storage__monitor_storage__monitor__freebsd.h (revision 420230) +++ branches/2016Q3/www/chromium/files/patch-components_storage__monitor_storage__monitor__freebsd.h (revision 420231) @@ -1,49 +1,48 @@ ---- components/storage_monitor/storage_monitor_freebsd.h.orig 2016-05-20 17:18:26 UTC -+++ components/storage_monitor/storage_monitor_freebsd.h -@@ -0,0 +1,46 @@ +--- components/storage_monitor/storage_monitor_freebsd.h.orig 2016-08-04 10:46:30.556442000 -0400 ++++ components/storage_monitor/storage_monitor_freebsd.h 2016-08-04 14:57:59.255434000 -0400 +@@ -0,0 +1,45 @@ +// Copyright 2014 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +// StorageMonitorFreeBSD processes mount point change events, notifies listeners +// about the addition and deletion of media devices, and answers queries about +// mounted devices. +// StorageMonitorFreeBSD lives on the UI thread, and uses ??? +// the FILE thread to get mount point change events. + +#ifndef COMPONENTS_STORAGE_MONITOR_STORAGE_MONITOR_FREEBSD_H_ +#define COMPONENTS_STORAGE_MONITOR_STORAGE_MONITOR_FREEBSD_H_ + +#include +#include + +#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/2016Q3/www/chromium/files/patch-content_browser_geolocation_wifi__data__provider__freebsd.cc =================================================================== --- branches/2016Q3/www/chromium/files/patch-content_browser_geolocation_wifi__data__provider__freebsd.cc (revision 420230) +++ branches/2016Q3/www/chromium/files/patch-content_browser_geolocation_wifi__data__provider__freebsd.cc (revision 420231) @@ -1,204 +1,204 @@ ---- content/browser/geolocation/wifi_data_provider_freebsd.cc.orig 2016-05-20 17:18:26 UTC -+++ content/browser/geolocation/wifi_data_provider_freebsd.cc +--- content/browser/geolocation/wifi_data_provider_freebsd.cc.orig 2016-08-04 10:46:30.800769000 -0400 ++++ content/browser/geolocation/wifi_data_provider_freebsd.cc 2016-08-04 21:41:58.417450000 -0400 @@ -0,0 +1,201 @@ +// 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" +#include "content/browser/geolocation/wifi_data_provider_manager.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 AccessPointDataFreeBSD : public WifiDataProviderCommon::WlanApiInterface { +public: + AccessPointDataFreeBSD(); + ~AccessPointDataFreeBSD(); + + // this does nothing + bool Init(); + + // get the AP data + virtual bool GetAccessPointData(WifiData::AccessPointDataSet* data); + +private: + DISALLOW_COPY_AND_ASSIGN(AccessPointDataFreeBSD); +}; + +AccessPointDataFreeBSD::AccessPointDataFreeBSD() { +} + +AccessPointDataFreeBSD::~AccessPointDataFreeBSD() { +} + +bool AccessPointDataFreeBSD::Init() { + return true; +} + +bool AccessPointDataFreeBSD::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 +WifiDataProvider* WifiDataProviderManager::DefaultFactoryFunction() { + return new WifiDataProviderFreeBSD(); +} + +WifiDataProviderFreeBSD::WifiDataProviderFreeBSD() { +} + +WifiDataProviderFreeBSD::~WifiDataProviderFreeBSD() { +} + +WifiDataProviderCommon::WlanApiInterface* WifiDataProviderFreeBSD::NewWlanApi() { + -+ scoped_ptr wlan_api(new AccessPointDataFreeBSD); ++ std::unique_ptr wlan_api(new AccessPointDataFreeBSD); + if (wlan_api->Init()) + return wlan_api.release(); + + return NULL; +} + +WifiPollingPolicy* WifiDataProviderFreeBSD::NewPollingPolicy() { + return new GenericWifiPollingPolicy; +} + +} // namespace content Index: branches/2016Q3/www/chromium/files/patch-content_browser_gpu_gpu__internals__ui.cc =================================================================== --- branches/2016Q3/www/chromium/files/patch-content_browser_gpu_gpu__internals__ui.cc (revision 420230) +++ branches/2016Q3/www/chromium/files/patch-content_browser_gpu_gpu__internals__ui.cc (revision 420231) @@ -1,29 +1,29 @@ ---- content/browser/gpu/gpu_internals_ui.cc.orig 2016-05-11 19:02:20 UTC -+++ content/browser/gpu/gpu_internals_ui.cc -@@ -37,7 +37,7 @@ +--- content/browser/gpu/gpu_internals_ui.cc.orig 2016-07-22 00:06:54.000000000 -0400 ++++ content/browser/gpu/gpu_internals_ui.cc 2016-08-03 12:29:59.399353000 -0400 +@@ -39,7 +39,7 @@ #include "third_party/angle/src/common/version.h" #include "ui/gl/gpu_switching_manager.h" -#if defined(OS_LINUX) && defined(USE_X11) +#if (defined(OS_BSD) || defined(OS_LINUX)) && defined(USE_X11) #include #endif #if defined(OS_WIN) -@@ -45,7 +45,7 @@ +@@ -47,7 +47,7 @@ #include "ui/gfx/win/physical_size.h" #endif -#if defined(OS_LINUX) && defined(USE_X11) +#if (defined(OS_BSD) || defined(OS_LINUX)) && defined(USE_X11) - #include "ui/base/x/x11_util.h" - #include "ui/gfx/x/x11_atom_cache.h" + #include "ui/base/x/x11_util.h" // nogncheck + #include "ui/gfx/x/x11_atom_cache.h" // nogncheck #endif -@@ -198,7 +198,7 @@ base::DictionaryValue* GpuInfoAsDictiona +@@ -200,7 +200,7 @@ gpu_info.gl_ws_version)); basic_info->Append(NewDescriptionValuePair("Window system binding extensions", gpu_info.gl_ws_extensions)); -#if defined(OS_LINUX) && defined(USE_X11) +#if (defined(OS_BSD) || defined(OS_LINUX)) && defined(USE_X11) basic_info->Append(NewDescriptionValuePair("Window manager", ui::GuessWindowManagerName())); { Index: branches/2016Q3/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc =================================================================== --- branches/2016Q3/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc (revision 420230) +++ branches/2016Q3/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc (revision 420231) @@ -1,38 +1,29 @@ ---- content/browser/renderer_host/render_widget_host_view_aura.cc.orig 2016-05-11 19:02:20 UTC -+++ content/browser/renderer_host/render_widget_host_view_aura.cc -@@ -107,7 +107,7 @@ - #include "ui/gfx/win/dpi.h" +--- content/browser/renderer_host/render_widget_host_view_aura.cc.orig 2016-07-22 00:06:54.000000000 -0400 ++++ content/browser/renderer_host/render_widget_host_view_aura.cc 2016-08-03 12:34:00.357612000 -0400 +@@ -105,7 +105,7 @@ + #include "ui/gfx/gdi_util.h" #endif -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_BSD) #include "content/common/input_messages.h" #include "ui/events/linux/text_edit_command_auralinux.h" #include "ui/events/linux/text_edit_key_bindings_delegate_auralinux.h" -@@ -734,7 +734,7 @@ gfx::NativeViewId RenderWidgetHostViewAu - if (host) - return reinterpret_cast(host->GetAcceleratedWidget()); - #endif -- return static_cast(NULL); -+ return static_cast(0); +@@ -2376,7 +2376,7 @@ } - gfx::NativeViewAccessible RenderWidgetHostViewAura::GetNativeViewAccessible() { -@@ -2626,7 +2626,7 @@ bool RenderWidgetHostViewAura::NeedsInpu - } - bool RenderWidgetHostViewAura::NeedsMouseCapture() { -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) return NeedsInputGrab(); #endif return false; -@@ -2859,7 +2859,7 @@ void RenderWidgetHostViewAura::ForwardKe +@@ -2608,7 +2608,7 @@ if (!target_host) return; -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) ui::TextEditKeyBindingsDelegateAuraLinux* keybinding_delegate = ui::GetTextEditKeyBindingsDelegate(); std::vector commands; Index: branches/2016Q3/www/chromium/files/patch-content_gpu_gpu__main.cc =================================================================== --- branches/2016Q3/www/chromium/files/patch-content_gpu_gpu__main.cc (revision 420230) +++ branches/2016Q3/www/chromium/files/patch-content_gpu_gpu__main.cc (revision 420231) @@ -1,45 +1,45 @@ ---- content/gpu/gpu_main.cc.orig 2016-05-11 19:02:21 UTC -+++ content/gpu/gpu_main.cc -@@ -99,7 +99,7 @@ void GetGpuInfoFromCommandLine(gpu::GPUI +--- content/gpu/gpu_main.cc.orig 2016-07-22 00:06:54.000000000 -0400 ++++ content/gpu/gpu_main.cc 2016-08-03 12:37:05.590978000 -0400 +@@ -102,7 +102,7 @@ const base::CommandLine& command_line); bool WarmUpSandbox(const base::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 -@@ -187,13 +187,13 @@ int GpuMain(const MainFunctionParams& pa +@@ -192,13 +192,13 @@ // Use a UI message loop because ANGLE and the desktop GL platform can // create child windows to render to. base::MessageLoop main_message_loop(base::MessageLoop::TYPE_UI); -#elif defined(OS_LINUX) && defined(USE_X11) +#elif (defined(OS_LINUX) || defined(OS_BSD)) && defined(USE_X11) // We need a UI loop so that we can grab the Expose events. See GLSurfaceGLX // and https://crbug.com/326995. base::MessageLoop main_message_loop(base::MessageLoop::TYPE_UI); - scoped_ptr event_source = + std::unique_ptr event_source = ui::PlatformEventSource::CreateDefault(); -#elif defined(OS_LINUX) -+#elif defined(OS_LINUX) || defined(OS_BSD) ++#elif (defined(OS_LINUX) || defined(OS_BSD)) base::MessageLoop main_message_loop(base::MessageLoop::TYPE_DEFAULT); #elif defined(OS_MACOSX) // This is necessary for CoreAnimation layers hosted in the GPU process to be -@@ -304,7 +304,7 @@ int GpuMain(const MainFunctionParams& pa +@@ -309,7 +309,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; -@@ -467,7 +467,7 @@ bool WarmUpSandbox(const base::CommandLi +@@ -491,7 +491,7 @@ return true; } -#if !defined(OS_MACOSX) +#if !defined(OS_MACOSX) && !defined(OS_FREEBSD)//XXX(rene) added !FreeBSD bool CollectGraphicsInfo(gpu::GPUInfo& gpu_info) { TRACE_EVENT0("gpu,startup", "Collect Graphics Info"); Index: branches/2016Q3/www/chromium/files/patch-content_renderer_media_webrtc__audio__renderer.cc =================================================================== --- branches/2016Q3/www/chromium/files/patch-content_renderer_media_webrtc__audio__renderer.cc (nonexistent) +++ branches/2016Q3/www/chromium/files/patch-content_renderer_media_webrtc__audio__renderer.cc (revision 420231) @@ -0,0 +1,11 @@ +--- content/renderer/media/webrtc_audio_renderer.cc.orig 2016-06-08 12:04:14.328279000 -0400 ++++ content/renderer/media/webrtc_audio_renderer.cc 2016-06-08 12:04:28.210758000 -0400 +@@ -162,7 +162,7 @@ + // Windows below. + int frames_per_buffer = hardware_buffer_size; + +-#if defined(OS_LINUX) || defined(OS_MACOSX) ++#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) + // On Linux and MacOS, the low level IO implementations on the browser side + // supports all buffer size the clients want. We use the native peer + // connection buffer size (10ms) to achieve best possible performance. Property changes on: branches/2016Q3/www/chromium/files/patch-content_renderer_media_webrtc__audio__renderer.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/2016Q3/www/chromium/files/patch-content_renderer_media_webrtc_processed__local__audio__source.cc =================================================================== --- branches/2016Q3/www/chromium/files/patch-content_renderer_media_webrtc_processed__local__audio__source.cc (nonexistent) +++ branches/2016Q3/www/chromium/files/patch-content_renderer_media_webrtc_processed__local__audio__source.cc (revision 420231) @@ -0,0 +1,11 @@ +--- ./content/renderer/media/webrtc/processed_local_audio_source.cc.orig 2016-08-03 12:48:04.721257000 -0400 ++++ ./content/renderer/media/webrtc/processed_local_audio_source.cc 2016-08-03 12:48:34.201210000 -0400 +@@ -269,7 +269,7 @@ + bool key_pressed) { + #if defined(OS_WIN) || defined(OS_MACOSX) + DCHECK_LE(volume, 1.0); +-#elif (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_OPENBSD) ++#elif (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + // We have a special situation on Linux where the microphone volume can be + // "higher than maximum". The input volume slider in the sound preference + // allows the user to set a scaling that is higher than 100%. It means that Property changes on: branches/2016Q3/www/chromium/files/patch-content_renderer_media_webrtc_processed__local__audio__source.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/2016Q3/www/chromium/files/patch-content_renderer_render__thread__impl.cc =================================================================== --- branches/2016Q3/www/chromium/files/patch-content_renderer_render__thread__impl.cc (revision 420230) +++ branches/2016Q3/www/chromium/files/patch-content_renderer_render__thread__impl.cc (revision 420231) @@ -1,11 +1,11 @@ ---- content/renderer/render_thread_impl.cc.orig 2016-05-25 15:01:02.000000000 -0400 -+++ content/renderer/render_thread_impl.cc 2016-05-27 11:01:14.634236000 -0400 -@@ -1468,7 +1468,7 @@ - const bool enable_video_accelerator = - !cmd_line->HasSwitch(switches::kDisableAcceleratedVideoDecode); - const bool enable_gpu_memory_buffer_video_frames = +--- content/renderer/render_thread_impl.cc.orig 2016-07-22 00:06:54.000000000 -0400 ++++ content/renderer/render_thread_impl.cc 2016-08-03 14:17:16.736255000 -0400 +@@ -1424,7 +1424,7 @@ + const bool enable_video_accelerator = + !cmd_line->HasSwitch(switches::kDisableAcceleratedVideoDecode); + const bool enable_gpu_memory_buffer_video_frames = -#if defined(OS_MACOSX) || defined(OS_LINUX) +#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) - !cmd_line->HasSwitch(switches::kDisableGpuMemoryBufferVideoFrames) && - !cmd_line->HasSwitch(switches::kDisableGpuCompositing) && - !gpu_channel_host->gpu_info().software_rendering; + !cmd_line->HasSwitch(switches::kDisableGpuMemoryBufferVideoFrames) && + !cmd_line->HasSwitch(switches::kDisableGpuCompositing) && + !gpu_channel_host->gpu_info().software_rendering; Index: branches/2016Q3/www/chromium/files/patch-content_shell_browser_shell__browser__context.cc =================================================================== --- branches/2016Q3/www/chromium/files/patch-content_shell_browser_shell__browser__context.cc (revision 420230) +++ branches/2016Q3/www/chromium/files/patch-content_shell_browser_shell__browser__context.cc (revision 420231) @@ -1,20 +1,20 @@ ---- content/shell/browser/shell_browser_context.cc.orig 2016-05-11 19:02:22 UTC -+++ content/shell/browser/shell_browser_context.cc +--- content/shell/browser/shell_browser_context.cc.orig 2016-07-22 00:06:54.000000000 -0400 ++++ content/shell/browser/shell_browser_context.cc 2016-08-03 15:17:20.501518000 -0400 @@ -24,7 +24,7 @@ #if defined(OS_WIN) #include "base/base_paths_win.h" -#elif defined(OS_LINUX) +#elif defined(OS_LINUX) || defined(OS_BSD) #include "base/nix/xdg_util.h" #elif defined(OS_MACOSX) #include "base/base_paths_mac.h" -@@ -79,7 +79,7 @@ void ShellBrowserContext::InitWhileIOAll +@@ -80,7 +80,7 @@ #if defined(OS_WIN) CHECK(PathService::Get(base::DIR_LOCAL_APP_DATA, &path_)); path_ = path_.Append(std::wstring(L"content_shell")); -#elif defined(OS_LINUX) +#elif defined(OS_LINUX) || defined(OS_BSD) - scoped_ptr env(base::Environment::Create()); + std::unique_ptr env(base::Environment::Create()); base::FilePath config_dir( base::nix::GetXDGDirectory(env.get(), Index: branches/2016Q3/www/chromium/files/patch-extensions_browser_api_serial_serial__api.cc =================================================================== --- branches/2016Q3/www/chromium/files/patch-extensions_browser_api_serial_serial__api.cc (revision 420230) +++ branches/2016Q3/www/chromium/files/patch-extensions_browser_api_serial_serial__api.cc (revision 420231) @@ -1,16 +1,16 @@ ---- extensions/browser/api/serial/serial_api.cc.orig 2016-05-25 15:01:02.000000000 -0400 -+++ extensions/browser/api/serial/serial_api.cc 2016-05-27 11:12:01.060235000 -0400 +--- extensions/browser/api/serial/serial_api.cc.orig 2016-07-22 00:06:55.000000000 -0400 ++++ extensions/browser/api/serial/serial_api.cc 2016-08-03 15:23:41.022195000 -0400 @@ -86,11 +86,13 @@ void SerialGetDevicesFunction::Work() { DCHECK_CURRENTLY_ON(BrowserThread::FILE); +#if !defined(OS_BSD) - scoped_ptr enumerator = + std::unique_ptr enumerator = device::SerialDeviceEnumerator::Create(); mojo::Array devices = enumerator->GetDevices(); results_ = serial::GetDevices::Results::Create( devices.To>()); +#endif } SerialConnectFunction::SerialConnectFunction() { Index: branches/2016Q3/www/chromium/files/patch-media_audio_audio__manager.cc =================================================================== --- branches/2016Q3/www/chromium/files/patch-media_audio_audio__manager.cc (revision 420230) +++ branches/2016Q3/www/chromium/files/patch-media_audio_audio__manager.cc (revision 420231) @@ -1,29 +1,29 @@ ---- media/audio/audio_manager.cc.orig 2016-05-11 19:02:23 UTC -+++ media/audio/audio_manager.cc -@@ -193,7 +193,7 @@ class AudioManagerHelper : public base:: +--- media/audio/audio_manager.cc.orig 2016-07-22 00:06:55.000000000 -0400 ++++ media/audio/audio_manager.cc 2016-08-03 15:25:47.683860000 -0400 +@@ -92,7 +92,7 @@ } #endif -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_FREEBSD) - void set_app_name(const std::string& app_name) { - app_name_ = app_name; - } -@@ -243,7 +243,7 @@ class AudioManagerHelper : public base:: - scoped_ptr com_initializer_for_testing_; + void set_app_name(const std::string& app_name) { app_name_ = app_name; } + const std::string& app_name() const { return app_name_; } #endif +@@ -250,7 +250,7 @@ + std::unique_ptr com_initializer_for_testing_; + #endif -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_FREEBSD) std::string app_name_; #endif -@@ -321,7 +321,7 @@ void AudioManager::EnableCrashKeyLogging +@@ -359,7 +359,7 @@ g_helper.Pointer()->enable_crash_key_logging(); } -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_FREEBSD) // static void AudioManager::SetGlobalAppName(const std::string& app_name) { g_helper.Pointer()->set_app_name(app_name); Index: branches/2016Q3/www/chromium/files/patch-media_capture_video_linux_video__capture__device__linux.cc =================================================================== --- branches/2016Q3/www/chromium/files/patch-media_capture_video_linux_video__capture__device__linux.cc (revision 420230) +++ branches/2016Q3/www/chromium/files/patch-media_capture_video_linux_video__capture__device__linux.cc (revision 420231) @@ -1,62 +1,62 @@ ---- media/capture/video/linux/video_capture_device_linux.cc.orig 2016-05-11 19:02:23 UTC -+++ media/capture/video/linux/video_capture_device_linux.cc -@@ -44,6 +44,7 @@ static bool ReadIdFile(const std::string +--- media/capture/video/linux/video_capture_device_linux.cc.orig 2016-07-22 00:06:55.000000000 -0400 ++++ media/capture/video/linux/video_capture_device_linux.cc 2016-08-04 15:59:29.808311000 -0400 +@@ -44,6 +44,7 @@ return true; } +#if !defined(OS_FREEBSD) // Translates Video4Linux pixel formats to Chromium pixel formats. // static VideoPixelFormat VideoCaptureDeviceLinux::V4l2FourCcToChromiumPixelFormat( -@@ -57,6 +58,7 @@ std::list VideoCaptureDeviceLi +@@ -57,6 +58,7 @@ bool favour_mjpeg) { return V4L2CaptureDelegate::GetListOfUsableFourCcs(favour_mjpeg); } +#endif // !defined(OS_FREEBSD) const std::string VideoCaptureDevice::Name::GetModel() const { // |unique_id| is of the form "/dev/video2". |file_name| is "video2". -@@ -90,6 +92,7 @@ VideoCaptureDeviceLinux::~VideoCaptureDe +@@ -90,6 +92,7 @@ v4l2_thread_.Stop(); } +#if !defined(OS_FREEBSD) void VideoCaptureDeviceLinux::AllocateAndStart( const VideoCaptureParams& params, - scoped_ptr client) { -@@ -113,7 +116,13 @@ void VideoCaptureDeviceLinux::AllocateAn + std::unique_ptr client) { +@@ -113,7 +116,13 @@ params.requested_format.frame_size.height(), params.requested_format.frame_rate, base::Passed(&client))); } +#else // !defined(OS_FREEBSD) +void VideoCaptureDeviceLinux::AllocateAndStart( + const VideoCaptureParams& params, -+ scoped_ptr client) {} ++ std::unique_ptr client) {} +#endif // !defined(OS_FREEBSD) +#if !defined(OS_FREEBSD) void VideoCaptureDeviceLinux::StopAndDeAllocate() { if (!v4l2_thread_.IsRunning()) return; // Wrong state. -@@ -124,7 +133,11 @@ void VideoCaptureDeviceLinux::StopAndDeA +@@ -124,7 +133,11 @@ capture_impl_ = NULL; } +#else // !defined(OS_FREEBSD) +void VideoCaptureDeviceLinux::StopAndDeAllocate() {} +#endif // !defined(OS_FREEBSD) +#if !defined(OS_FREEBSD) void VideoCaptureDeviceLinux::SetRotation(int rotation) { if (v4l2_thread_.IsRunning()) { v4l2_thread_.message_loop()->PostTask( -@@ -132,6 +145,9 @@ void VideoCaptureDeviceLinux::SetRotatio +@@ -132,6 +145,9 @@ base::Bind(&V4L2CaptureDelegate::SetRotation, capture_impl_, rotation)); } } +#else // !defined(OS_FREEBSD) +void VideoCaptureDeviceLinux::SetRotation(int rotation) {} +#endif // !defined(OS_FREEBSD) // static int VideoCaptureDeviceLinux::TranslatePowerLineFrequencyToV4L2( Index: branches/2016Q3/www/chromium/files/patch-media_capture_video_video__capture__device__factory.cc =================================================================== --- branches/2016Q3/www/chromium/files/patch-media_capture_video_video__capture__device__factory.cc (revision 420230) +++ branches/2016Q3/www/chromium/files/patch-media_capture_video_video__capture__device__factory.cc (revision 420231) @@ -1,21 +1,21 @@ ---- media/capture/video/video_capture_device_factory.cc.orig 2016-05-11 19:02:23 UTC -+++ media/capture/video/video_capture_device_factory.cc -@@ -17,6 +17,10 @@ namespace media { - // static - scoped_ptr VideoCaptureDeviceFactory::CreateFactory( +--- media/capture/video/video_capture_device_factory.cc.orig 2016-07-22 00:06:55.000000000 -0400 ++++ media/capture/video/video_capture_device_factory.cc 2016-08-04 16:01:12.907434000 -0400 +@@ -18,6 +18,10 @@ + std::unique_ptr + VideoCaptureDeviceFactory::CreateFactory( scoped_refptr ui_task_runner) { +#if defined(OS_BSD) -+ return scoped_ptr(new ++ return std::unique_ptr(new + media::FakeVideoCaptureDeviceFactory()); +#else const base::CommandLine* command_line = base::CommandLine::ForCurrentProcess(); // Use a Fake or File Video Device Factory if the command line flags are -@@ -35,6 +39,7 @@ scoped_ptr Vi - return scoped_ptr( +@@ -36,6 +40,7 @@ + return std::unique_ptr( CreateVideoCaptureDeviceFactory(ui_task_runner)); } +#endif } VideoCaptureDeviceFactory::VideoCaptureDeviceFactory() { Index: branches/2016Q3/www/chromium/files/patch-net_base_address__tracker__linux.h =================================================================== --- branches/2016Q3/www/chromium/files/patch-net_base_address__tracker__linux.h (revision 420230) +++ branches/2016Q3/www/chromium/files/patch-net_base_address__tracker__linux.h (revision 420231) @@ -1,28 +1,28 @@ ---- net/base/address_tracker_linux.h.orig 2016-05-25 15:01:03.000000000 -0400 -+++ net/base/address_tracker_linux.h 2016-05-27 11:17:51.228810000 -0400 +--- net/base/address_tracker_linux.h.orig 2016-07-22 00:06:56.000000000 -0400 ++++ net/base/address_tracker_linux.h 2016-08-04 16:22:00.122898000 -0400 @@ -6,10 +6,12 @@ #define NET_BASE_ADDRESS_TRACKER_LINUX_H_ #include // Needed to include netlink. -+#if !defined(OS_FREEBSD) ++#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 #include @@ -33,8 +35,11 @@ class NET_EXPORT_PRIVATE AddressTrackerLinux : public base::MessageLoopForIO::Watcher { public: -+#if !defined(OS_FREEBSD) ++#if !defined(__FreeBSD__) typedef std::map AddressMap; - +#else + typedef void* AddressMap; +#endif // Non-tracking version constructor: it takes a snapshot of the // current system configuration. Once Init() returns, the // configuration is available through GetOnlineLinks() and Index: branches/2016Q3/www/chromium/files/patch-net_proxy_proxy__service.cc =================================================================== --- branches/2016Q3/www/chromium/files/patch-net_proxy_proxy__service.cc (revision 420230) +++ branches/2016Q3/www/chromium/files/patch-net_proxy_proxy__service.cc (revision 420231) @@ -1,20 +1,20 @@ ---- net/proxy/proxy_service.cc.orig 2016-05-11 19:02:24 UTC -+++ net/proxy/proxy_service.cc -@@ -47,7 +47,7 @@ +--- net/proxy/proxy_service.cc.orig 2016-07-22 00:06:56.000000000 -0400 ++++ net/proxy/proxy_service.cc 2016-08-03 15:29:21.017256000 -0400 +@@ -48,7 +48,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" -@@ -1503,7 +1503,7 @@ scoped_ptr ProxyServ +@@ -1542,7 +1542,7 @@ << "profile_io_data.cc::CreateProxyConfigService and this should " << "be used only for examples."; - return make_scoped_ptr(new UnsetProxyConfigService); + return base::WrapUnique(new UnsetProxyConfigService); -#elif defined(OS_LINUX) +#elif defined(OS_LINUX) || defined(OS_FREEBSD) - scoped_ptr linux_config_service( + std::unique_ptr linux_config_service( new ProxyConfigServiceLinux()); Index: branches/2016Q3/www/chromium/files/patch-services_shell_public_cpp_lib_initialize__base__and__icu.cc =================================================================== --- branches/2016Q3/www/chromium/files/patch-services_shell_public_cpp_lib_initialize__base__and__icu.cc (nonexistent) +++ branches/2016Q3/www/chromium/files/patch-services_shell_public_cpp_lib_initialize__base__and__icu.cc (revision 420231) @@ -0,0 +1,18 @@ +--- services/shell/public/cpp/lib/initialize_base_and_icu.cc.orig 2016-08-05 14:07:55.178818000 -0400 ++++ services/shell/public/cpp/lib/initialize_base_and_icu.cc 2016-08-05 14:08:22.862094000 -0400 +@@ -35,6 +35,7 @@ + base::SysInfo::MaxSharedMemorySize(); + #endif + ++#if !defined(__FreeBSD__) + #if ICU_UTIL_DATA_IMPL == ICU_UTIL_DATA_FILE + // Initialize core ICU. We must perform the full initialization before we + // initialize icu::TimeZone subsystem because otherwise ICU gets in a state +@@ -42,6 +43,7 @@ + // cause crashes. + CHECK(base::i18n::InitializeICUFromRawMemory(icu_data)); + #endif // ICU_UTIL_DATA_IMPL == ICU_UTIL_DATA_FILE ++#endif + + #if !defined(OS_ANDROID) + // ICU DateFormat class (used in base/time_format.cc) needs to get the Property changes on: branches/2016Q3/www/chromium/files/patch-services_shell_public_cpp_lib_initialize__base__and__icu.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/2016Q3/www/chromium/files/patch-services_shell_runner_init.cc =================================================================== --- branches/2016Q3/www/chromium/files/patch-services_shell_runner_init.cc (nonexistent) +++ branches/2016Q3/www/chromium/files/patch-services_shell_runner_init.cc (revision 420231) @@ -0,0 +1,18 @@ +--- services/shell/runner/init.cc.orig 2016-08-05 14:09:25.990401000 -0400 ++++ services/shell/runner/init.cc 2016-08-05 14:09:42.644514000 -0400 +@@ -77,6 +77,7 @@ + void CallLibraryEarlyInitialization(base::NativeLibrary app_library) { + // Do whatever warming that the mojo application wants. + ++#if !defined(__FreeBSD__) + #if ICU_UTIL_DATA_IMPL == ICU_UTIL_DATA_FILE + typedef void (*LibraryEarlyInitFunction)(const uint8_t*); + LibraryEarlyInitFunction init_function = +@@ -90,6 +91,7 @@ + init_function(icu_data); + } + #endif // ICU_UTIL_DATA_IMPL == ICU_UTIL_DATA_FILE ++#endif + + // TODO(erg): All chromium binaries load base. We might want to make a + // general system for other people. Property changes on: branches/2016Q3/www/chromium/files/patch-services_shell_runner_init.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/2016Q3/www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_FontPlatformData.cpp =================================================================== --- branches/2016Q3/www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_FontPlatformData.cpp (nonexistent) +++ branches/2016Q3/www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_FontPlatformData.cpp (revision 420231) @@ -0,0 +1,47 @@ +--- third_party/WebKit/Source/platform/fonts/FontPlatformData.cpp.orig 2016-08-04 11:20:01.382167000 -0400 ++++ third_party/WebKit/Source/platform/fonts/FontPlatformData.cpp 2016-08-04 11:21:00.605035000 -0400 +@@ -93,7 +93,7 @@ + , m_syntheticBold(source.m_syntheticBold) + , m_syntheticItalic(source.m_syntheticItalic) + , m_orientation(source.m_orientation) +-#if OS(LINUX) || OS(ANDROID) ++#if OS(LINUX) || OS(ANDROID) || OS(FREEBSD) + , m_style(source.m_style) + #endif + , m_harfBuzzFace(nullptr) +@@ -115,7 +115,7 @@ + , m_syntheticBold(src.m_syntheticBold) + , m_syntheticItalic(src.m_syntheticItalic) + , m_orientation(src.m_orientation) +-#if OS(LINUX) || OS(ANDROID) ++#if OS(LINUX) || OS(ANDROID) || OS(FREEBSD) + , m_style(FontRenderStyle::querySystem(m_family, m_textSize, m_typeface->style())) + #endif + , m_harfBuzzFace(nullptr) +@@ -142,7 +142,7 @@ + , m_syntheticBold(syntheticBold) + , m_syntheticItalic(syntheticItalic) + , m_orientation(orientation) +-#if OS(LINUX) || OS(ANDROID) ++#if OS(LINUX) || OS(ANDROID) || OS(FREEBSD) + , m_style(FontRenderStyle::querySystem(m_family, m_textSize, m_typeface->style())) + #endif + , m_isHashTableDeletedValue(false) +@@ -188,7 +188,7 @@ + m_syntheticItalic = other.m_syntheticItalic; + m_harfBuzzFace = nullptr; + m_orientation = other.m_orientation; +-#if OS(LINUX) || OS(ANDROID) ++#if OS(LINUX) || OS(ANDROID) || OS(FREEBSD) + m_style = other.m_style; + #endif + +@@ -216,7 +216,7 @@ + && m_isHashTableDeletedValue == a.m_isHashTableDeletedValue + && m_syntheticBold == a.m_syntheticBold + && m_syntheticItalic == a.m_syntheticItalic +-#if OS(LINUX) || OS(ANDROID) ++#if OS(LINUX) || OS(ANDROID) || OS(FREEBSD) + && m_style == a.m_style + #endif + && m_orientation == a.m_orientation; Property changes on: branches/2016Q3/www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_FontPlatformData.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2016Q3/www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_FontPlatformData.h =================================================================== --- branches/2016Q3/www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_FontPlatformData.h (nonexistent) +++ branches/2016Q3/www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_FontPlatformData.h (revision 420231) @@ -0,0 +1,32 @@ +--- third_party/WebKit/Source/platform/fonts/FontPlatformData.h.orig 2016-08-04 11:21:45.907982000 -0400 ++++ third_party/WebKit/Source/platform/fonts/FontPlatformData.h 2016-08-04 11:22:32.571069000 -0400 +@@ -46,9 +46,9 @@ + #include "wtf/text/CString.h" + #include "wtf/text/StringImpl.h" + +-#if OS(LINUX) || OS(ANDROID) ++#if OS(LINUX) || OS(ANDROID) || OS(FREEBSD) + #include "platform/fonts/linux/FontRenderStyle.h" +-#endif // OS(LINUX) || OS(ANDROID) ++#endif // OS(LINUX) || OS(ANDROID) || OS(FREEBSD) + + #if OS(MACOSX) + OBJC_CLASS NSFont; +@@ -126,7 +126,7 @@ + PassRefPtr verticalData() const; + PassRefPtr openTypeTable(SkFontTableTag) const; + +-#if OS(LINUX) || OS(ANDROID) ++#if OS(LINUX) || OS(ANDROID) || OS(FREEBSD) + // The returned styles are all actual styles without FontRenderStyle::NoPreference. + const FontRenderStyle& getFontRenderStyle() const { return m_style; } + #endif +@@ -152,7 +152,7 @@ + bool m_syntheticItalic; + FontOrientation m_orientation; + private: +-#if OS(LINUX) || OS(ANDROID) ++#if OS(LINUX) || OS(ANDROID) || OS(FREEBSD) + FontRenderStyle m_style; + #endif + Property changes on: branches/2016Q3/www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_FontPlatformData.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/2016Q3/www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_skia_FontCacheSkia.cpp =================================================================== --- branches/2016Q3/www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_skia_FontCacheSkia.cpp (revision 420230) +++ branches/2016Q3/www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_skia_FontCacheSkia.cpp (revision 420231) @@ -1,29 +1,20 @@ ---- third_party/WebKit/Source/platform/fonts/skia/FontCacheSkia.cpp.orig 2016-05-25 15:01:11.000000000 -0400 -+++ third_party/WebKit/Source/platform/fonts/skia/FontCacheSkia.cpp 2016-05-27 11:26:01.202711000 -0400 +--- third_party/WebKit/Source/platform/fonts/skia/FontCacheSkia.cpp.orig 2016-07-22 00:07:09.000000000 -0400 ++++ third_party/WebKit/Source/platform/fonts/skia/FontCacheSkia.cpp 2016-08-03 15:39:36.482884000 -0400 @@ -60,7 +60,7 @@ namespace blink { -#if OS(ANDROID) || OS(LINUX) +#if OS(ANDROID) || OS(LINUX) || OS(FREEBSD) // Android special locale for retrieving the color emoji font // based on the proposed changes in UTR #51 for introducing // an Emoji script code: -@@ -171,7 +171,7 @@ - return fontDataFromFontPlatformData(fontPlatformData, shouldRetain); - } - --#if OS(WIN) || OS(LINUX) -+#if OS(WIN) || OS(LINUX) || OS(FREEBSD) - static inline SkFontStyle fontStyle(const FontDescription& fontDescription) - { - int width = static_cast(fontDescription.stretch()); -@@ -232,7 +232,7 @@ +@@ -183,7 +183,7 @@ } #endif --#if OS(LINUX) -+#if OS(LINUX) || OS(FREEBSD) +-#if OS(LINUX) || OS(WIN) ++#if OS(LINUX) || OS(WIN) || OS(FREEBSD) // On linux if the fontManager has been overridden then we should be calling the embedder // provided font Manager rather than calling SkTypeface::CreateFromName which may redirect the // call to the default font Manager. Index: branches/2016Q3/www/chromium/files/patch-third__party_pdfium_build__gyp_standalone.gypi =================================================================== --- branches/2016Q3/www/chromium/files/patch-third__party_pdfium_build__gyp_standalone.gypi (nonexistent) +++ branches/2016Q3/www/chromium/files/patch-third__party_pdfium_build__gyp_standalone.gypi (revision 420231) @@ -0,0 +1,38 @@ +--- third_party/pdfium/build_gyp/standalone.gypi.orig 2016-08-03 16:25:54.875923000 -0400 ++++ third_party/pdfium/build_gyp/standalone.gypi 2016-08-03 16:28:57.583883000 -0400 +@@ -19,7 +19,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 +@@ -32,7 +32,7 @@ + s/aarch64/arm64/;\ + s/mips.*/mipsel/")', + }, { +- # OS!="linux" and OS!="mac" ++ # OS!="linux" and OS!="mac" and OS!="freebsd" + 'host_arch%': 'ia32', + }], + ], +@@ -59,7 +59,7 @@ + }, { + 'os_posix%': 1, + }], +- ['OS=="linux" or OS=="mac"', { ++ ['OS=="linux" or OS=="mac" or OS=="freebsd"', { + 'clang%': 1, + 'host_clang%': 1, + }, { +@@ -141,7 +141,7 @@ + }, + }, + 'conditions': [ +- ['OS=="linux"', { ++ ['OS=="linux" or OS=="freebsd"', { + 'cflags': [ + '-fdata-sections', + '-ffunction-sections', Property changes on: branches/2016Q3/www/chromium/files/patch-third__party_pdfium_build__gyp_standalone.gypi ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2016Q3/www/chromium/files/patch-third__party_pdfium_fpdfsdk_javascript_PublicMethods.cpp =================================================================== --- branches/2016Q3/www/chromium/files/patch-third__party_pdfium_fpdfsdk_javascript_PublicMethods.cpp (revision 420230) +++ branches/2016Q3/www/chromium/files/patch-third__party_pdfium_fpdfsdk_javascript_PublicMethods.cpp (revision 420231) @@ -1,106 +1,106 @@ ---- third_party/pdfium/fpdfsdk/javascript/PublicMethods.cpp.orig 2016-05-27 13:05:16.571632000 -0400 -+++ third_party/pdfium/fpdfsdk/javascript/PublicMethods.cpp 2016-05-27 13:32:36.441412000 -0400 -@@ -61,6 +61,103 @@ - L"May", L"June", L"July", L"August", - L"September", L"October", L"November", L"December"}; +--- third_party/pdfium/fpdfsdk/javascript/PublicMethods.cpp.orig 2016-07-22 00:09:02.000000000 -0400 ++++ third_party/pdfium/fpdfsdk/javascript/PublicMethods.cpp 2016-08-03 16:33:48.931305000 -0400 +@@ -62,6 +62,103 @@ + L"July", L"August", L"September", + L"October", L"November", L"December"}; +#if defined(__FreeBSD__) +/* + * cvt.c - IEEE floating point formatting routines for FreeBSD + * from GNU libc-4.6.27 + */ + +/* + * ap_ecvt converts to decimal + * the number of digits is specified by ndigit + * decpt is set to the position of the decimal point + * sign is set to 0 for positive, 1 for negative + */ + +#define NDIG 80 + +static char * + ap_cvt(double arg, int ndigits, int *decpt, int *sign, int eflag) +{ + register int r2; + double fi, fj; + register char *p, *p1; + static char buf[NDIG]; + + if (ndigits >= NDIG - 1) + ndigits = NDIG - 2; + r2 = 0; + *sign = 0; + p = &buf[0]; + if (arg < 0) { + *sign = 1; + arg = -arg; + } + arg = modf(arg, &fi); + p1 = &buf[NDIG]; + /* + * Do integer part + */ + if (fi != 0) { + p1 = &buf[NDIG]; + while (fi != 0) { + fj = modf(fi / 10, &fi); + *--p1 = (int) ((fj + .03) * 10) + '0'; + r2++; + } + while (p1 < &buf[NDIG]) + *p++ = *p1++; + } + else if (arg > 0) { + while ((fj = arg * 10) < 1) { + arg = fj; + r2--; + } + } + p1 = &buf[ndigits]; + if (eflag == 0) + p1 += r2; + *decpt = r2; + if (p1 < &buf[0]) { + buf[0] = '\0'; + return (buf); + } + while (p <= p1 && p < &buf[NDIG]) { + arg *= 10; + arg = modf(arg, &fj); + *p++ = (int) fj + '0'; + } + if (p1 >= &buf[NDIG]) { + buf[NDIG - 1] = '\0'; + return (buf); + } + p = p1; + *p1 += 5; + while (*p1 > '9') { + *p1 = '0'; + if (p1 > buf) + ++ * --p1; + else { + *p1 = '1'; + (*decpt)++; + if (eflag == 0) { + if (p > buf) + *p = '0'; + p++; + } + } + } + *p = '\0'; + return (buf); +} + +static char * + fcvt(double arg, int ndigits, int *decpt, int *sign) +{ + return (ap_cvt(arg, ndigits, decpt, sign, 0)); +} +#endif // defined(__FreeBSD__) + - bool CJS_PublicMethods::IsNumber(const FX_WCHAR* str) { - CFX_WideString sTrim = StrTrim(str); - const FX_WCHAR* pTrim = sTrim.c_str(); + CFX_ByteString StrTrim(const CFX_ByteString& pStr) { + CFX_ByteString result(pStr); + result.TrimLeft(' '); Index: branches/2016Q3/www/chromium/files/patch-third__party_protobuf_src_google_protobuf_stubs_platform__macros.h =================================================================== --- branches/2016Q3/www/chromium/files/patch-third__party_protobuf_src_google_protobuf_stubs_platform__macros.h (nonexistent) +++ branches/2016Q3/www/chromium/files/patch-third__party_protobuf_src_google_protobuf_stubs_platform__macros.h (revision 420231) @@ -0,0 +1,11 @@ +--- third_party/protobuf/src/google/protobuf/stubs/platform_macros.h.orig 2016-08-04 11:23:35.218593000 -0400 ++++ third_party/protobuf/src/google/protobuf/stubs/platform_macros.h 2016-08-04 11:24:32.984837000 -0400 +@@ -111,7 +111,7 @@ + + #undef GOOGLE_PROTOBUF_PLATFORM_ERROR + +-#if defined(GOOGLE_PROTOBUF_OS_ANDROID) || defined(GOOGLE_PROTOBUF_OS_APPLE) ++#if defined(GOOGLE_PROTOBUF_OS_ANDROID) || defined(GOOGLE_PROTOBUF_OS_APPLE) || defined(__OpenBSD__) || defined(__FreeBSD__) + // Android ndk does not support the __thread keyword very well yet. Here + // we use pthread_key_create()/pthread_getspecific()/... methods for + // TLS support on android. Property changes on: branches/2016Q3/www/chromium/files/patch-third__party_protobuf_src_google_protobuf_stubs_platform__macros.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2016Q3/www/chromium/files/patch-ui_base_ime_input__method__factory.cc =================================================================== --- branches/2016Q3/www/chromium/files/patch-ui_base_ime_input__method__factory.cc (revision 420230) +++ branches/2016Q3/www/chromium/files/patch-ui_base_ime_input__method__factory.cc (revision 420231) @@ -1,20 +1,20 @@ ---- ui/base/ime/input_method_factory.cc.orig 2016-05-11 19:02:35 UTC -+++ ui/base/ime/input_method_factory.cc -@@ -14,7 +14,7 @@ +--- ui/base/ime/input_method_factory.cc.orig 2016-07-22 00:07:12.000000000 -0400 ++++ ui/base/ime/input_method_factory.cc 2016-08-03 16:35:19.855521000 -0400 +@@ -15,7 +15,7 @@ #elif defined(OS_MACOSX) #include "ui/base/ime/input_method_mac.h" #elif defined(USE_AURA) && defined(OS_LINUX) && defined(USE_X11) && \ - !defined(OS_CHROMEOS) + !defined(OS_CHROMEOS) || defined(OS_BSD) #include "ui/base/ime/input_method_auralinux.h" #elif defined(OS_ANDROID) #include "ui/base/ime/input_method_android.h" -@@ -56,7 +56,7 @@ scoped_ptr CreateInputMetho +@@ -57,7 +57,7 @@ #elif defined(OS_MACOSX) - return make_scoped_ptr(new InputMethodMac(delegate)); + return base::WrapUnique(new InputMethodMac(delegate)); #elif defined(USE_AURA) && defined(OS_LINUX) && defined(USE_X11) && \ - !defined(OS_CHROMEOS) + !defined(OS_CHROMEOS) || defined(OS_BSD) - return make_scoped_ptr(new InputMethodAuraLinux(delegate)); + return base::WrapUnique(new InputMethodAuraLinux(delegate)); #elif defined(OS_ANDROID) - return make_scoped_ptr(new InputMethodAndroid(delegate)); + return base::WrapUnique(new InputMethodAndroid(delegate)); Index: branches/2016Q3/www/chromium/files/patch-ui_base_resource_resource__bundle.cc =================================================================== --- branches/2016Q3/www/chromium/files/patch-ui_base_resource_resource__bundle.cc (revision 420230) +++ branches/2016Q3/www/chromium/files/patch-ui_base_resource_resource__bundle.cc (revision 420231) @@ -1,20 +1,20 @@ ---- ui/base/resource/resource_bundle.cc.orig 2016-05-11 19:02:35 UTC -+++ ui/base/resource/resource_bundle.cc -@@ -612,7 +612,7 @@ void ResourceBundle::ReloadFonts() { +--- ui/base/resource/resource_bundle.cc.orig 2016-07-22 00:07:12.000000000 -0400 ++++ ui/base/resource/resource_bundle.cc 2016-08-03 16:45:43.939993000 -0400 +@@ -626,7 +626,7 @@ } ScaleFactor ResourceBundle::GetMaxScaleFactor() const { -#if defined(OS_CHROMEOS) || defined(OS_WIN) || defined(OS_LINUX) +#if defined(OS_CHROMEOS) || defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) return max_scale_factor_; #else return GetSupportedScaleFactors().back(); -@@ -674,7 +674,7 @@ void ResourceBundle::InitSharedInstance( - #elif defined(OS_MACOSX) - if (base::mac::IsOSLionOrLater()) - supported_scale_factors.push_back(SCALE_FACTOR_200P); --#elif defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_WIN) -+#elif defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_WIN) || defined(OS_BSD) +@@ -686,7 +686,7 @@ + supported_scale_factors.push_back(SCALE_FACTOR_100P); + } + #elif defined(OS_MACOSX) || defined(OS_CHROMEOS) || defined(OS_LINUX) || \ +- defined(OS_WIN) ++ defined(OS_WIN) || defined(OS_BSD) supported_scale_factors.push_back(SCALE_FACTOR_200P); #endif ui::SetSupportedScaleFactors(supported_scale_factors); Index: branches/2016Q3/www/chromium/files/patch-ui_gl_sync__control__vsync__provider.cc =================================================================== --- branches/2016Q3/www/chromium/files/patch-ui_gl_sync__control__vsync__provider.cc (revision 420230) +++ branches/2016Q3/www/chromium/files/patch-ui_gl_sync__control__vsync__provider.cc (revision 420231) @@ -1,29 +1,38 @@ ---- ui/gl/sync_control_vsync_provider.cc.orig 2016-05-11 19:02:35 UTC -+++ ui/gl/sync_control_vsync_provider.cc +--- ui/gl/sync_control_vsync_provider.cc.orig 2016-07-22 00:07:12.000000000 -0400 ++++ ui/gl/sync_control_vsync_provider.cc 2016-08-04 11:26:39.590057000 -0400 @@ -11,7 +11,7 @@ #include "base/trace_event/trace_event.h" #include "build/build_config.h" -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) // These constants define a reasonable range for a calculated refresh interval. // Calculating refreshes out of this range will be considered a fatal error. const int64_t kMinVsyncIntervalUs = base::Time::kMicrosecondsPerSecond / 400; -@@ -38,7 +38,7 @@ SyncControlVSyncProvider::~SyncControlVS +@@ -26,7 +26,7 @@ + namespace gfx { + + SyncControlVSyncProvider::SyncControlVSyncProvider() : VSyncProvider() { +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + // On platforms where we can't get an accurate reading on the refresh + // rate we fall back to the assumption that we're displaying 60 frames + // per second. +@@ -39,7 +39,7 @@ void SyncControlVSyncProvider::GetVSyncParameters( const UpdateVSyncCallback& callback) { TRACE_EVENT0("gpu", "SyncControlVSyncProvider::GetVSyncParameters"); -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) base::TimeTicks timebase; // The actual clock used for the system time returned by glXGetSyncValuesOML -@@ -154,7 +154,7 @@ void SyncControlVSyncProvider::GetVSyncP +@@ -155,7 +155,7 @@ last_timebase_ = timebase; last_media_stream_counter_ = media_stream_counter; callback.Run(timebase, last_good_interval_); -#endif // defined(OS_LINUX) +#endif // defined(OS_LINUX) || defined(OS_BSD) } } // namespace gfx Index: branches/2016Q3/www/chromium/files/patch-ui_gl_sync__control__vsync__provider.h =================================================================== --- branches/2016Q3/www/chromium/files/patch-ui_gl_sync__control__vsync__provider.h (nonexistent) +++ branches/2016Q3/www/chromium/files/patch-ui_gl_sync__control__vsync__provider.h (revision 420231) @@ -0,0 +1,11 @@ +--- ui/gl/sync_control_vsync_provider.h.orig 2016-08-04 11:25:35.143308000 -0400 ++++ ui/gl/sync_control_vsync_provider.h 2016-08-04 11:25:53.646783000 -0400 +@@ -31,7 +31,7 @@ + virtual bool GetMscRate(int32_t* numerator, int32_t* denominator) = 0; + + private: +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + base::TimeTicks last_timebase_; + uint64_t last_media_stream_counter_ = 0; + base::TimeDelta last_good_interval_; Property changes on: branches/2016Q3/www/chromium/files/patch-ui_gl_sync__control__vsync__provider.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2016Q3/www/chromium/files/patch-ui_message__center_views_message__view__factory.cc =================================================================== --- branches/2016Q3/www/chromium/files/patch-ui_message__center_views_message__view__factory.cc (nonexistent) +++ branches/2016Q3/www/chromium/files/patch-ui_message__center_views_message__view__factory.cc (revision 420231) @@ -0,0 +1,11 @@ +--- ui/message_center/views/message_view_factory.cc.orig 2016-08-03 16:51:43.884486000 -0400 ++++ ui/message_center/views/message_view_factory.cc 2016-08-03 16:51:59.171721000 -0400 +@@ -43,7 +43,7 @@ + notification_view = new NotificationView(controller, notification); + } + +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) + // Don't create shadows for notification toasts on linux wih aura. + if (top_level) + return notification_view; Property changes on: branches/2016Q3/www/chromium/files/patch-ui_message__center_views_message__view__factory.cc ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2016Q3/www/chromium/files/patch-ui_views_bubble_bubble__dialog__delegate.cc =================================================================== --- branches/2016Q3/www/chromium/files/patch-ui_views_bubble_bubble__dialog__delegate.cc (nonexistent) +++ branches/2016Q3/www/chromium/files/patch-ui_views_bubble_bubble__dialog__delegate.cc (revision 420231) @@ -0,0 +1,11 @@ +--- ui/views/bubble/bubble_dialog_delegate.cc.orig 2016-08-03 16:59:43.426393000 -0400 ++++ ui/views/bubble/bubble_dialog_delegate.cc 2016-08-03 17:00:10.585958000 -0400 +@@ -72,7 +72,7 @@ + // the parent frame and let DWM handle compositing. If not, then we don't + // want to allow the bubble to extend the frame because it will be clipped. + bubble_delegate->set_adjust_if_offscreen(ui::win::IsAeroGlassEnabled()); +-#elif (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_MACOSX) ++#elif (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_MACOSX) || defined(OS_BSD) + // Linux clips bubble windows that extend outside their parent window bounds. + // Mac never adjusts. + bubble_delegate->set_adjust_if_offscreen(false); Property changes on: branches/2016Q3/www/chromium/files/patch-ui_views_bubble_bubble__dialog__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/2016Q3/www/chromium/files/patch-ui_views_controls_textfield_textfield.cc =================================================================== --- branches/2016Q3/www/chromium/files/patch-ui_views_controls_textfield_textfield.cc (revision 420230) +++ branches/2016Q3/www/chromium/files/patch-ui_views_controls_textfield_textfield.cc (revision 420231) @@ -1,83 +1,82 @@ ---- ui/views/controls/textfield/textfield.cc.orig 2016-05-11 19:02:36 UTC -+++ ui/views/controls/textfield/textfield.cc -@@ -47,7 +47,7 @@ +--- ui/views/controls/textfield/textfield.cc.orig 2016-08-04 09:54:43.724487000 -0400 ++++ ui/views/controls/textfield/textfield.cc 2016-08-04 09:57:23.923660000 -0400 +@@ -48,7 +48,7 @@ #include "base/win/win_util.h" #endif -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) #include "base/strings/utf_string_conversions.h" #include "ui/events/linux/text_edit_command_auralinux.h" #include "ui/events/linux/text_edit_key_bindings_delegate_auralinux.h" -@@ -130,7 +130,7 @@ int GetCommandForKeyEvent(const ui::KeyE +@@ -131,14 +131,14 @@ case ui::VKEY_BACK: - if (!control || has_selection) + if (!control) return IDS_DELETE_BACKWARD; -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) // Only erase by line break on Linux and ChromeOS. if (shift) return IDS_DELETE_TO_BEGINNING_OF_LINE; -@@ -139,7 +139,7 @@ int GetCommandForKeyEvent(const ui::KeyE + #endif + return IDS_DELETE_WORD_BACKWARD; case ui::VKEY_DELETE: - if (!control || has_selection) - return (shift && has_selection) ? IDS_APP_CUT : IDS_DELETE_FORWARD; -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) // Only erase by line break on Linux and ChromeOS. - if (shift) + if (shift && control) return IDS_DELETE_TO_END_OF_LINE; -@@ -154,7 +154,7 @@ int GetCommandForKeyEvent(const ui::KeyE +@@ -155,7 +155,7 @@ } } -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) // Convert a custom text edit |command| to the equivalent views command ID. int GetViewsCommand(const ui::TextEditCommandAuraLinux& command, bool rtl) { const bool select = command.extend_selection(); -@@ -642,7 +642,7 @@ bool Textfield::OnMousePressed(const ui: +@@ -643,7 +643,7 @@ OnAfterUserAction(); } -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) if (event.IsOnlyMiddleMouseButton()) { if (GetRenderText()->IsPointInSelection(event.location())) { OnBeforeUserAction(); -@@ -711,7 +711,7 @@ bool Textfield::OnKeyPressed(const ui::K +@@ -712,7 +712,7 @@ if (!textfield) return handled; -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) ui::TextEditKeyBindingsDelegateAuraLinux* delegate = ui::GetTextEditKeyBindingsDelegate(); std::vector commands; -@@ -846,7 +846,7 @@ void Textfield::AboutToRequestFocusFromT +@@ -847,7 +847,7 @@ } bool Textfield::SkipDefaultKeyEventProcessing(const ui::KeyEvent& event) { -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) // Skip any accelerator handling that conflicts with custom keybindings. ui::TextEditKeyBindingsDelegateAuraLinux* delegate = ui::GetTextEditKeyBindingsDelegate(); -@@ -1105,7 +1105,7 @@ void Textfield::WriteDragDataForView(Vie - scoped_ptr canvas( +@@ -1106,7 +1106,7 @@ + std::unique_ptr canvas( GetCanvasForDragImage(GetWidget(), label.size())); label.SetEnabledColor(GetTextColor()); -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) // Desktop Linux Aura does not yet support transparency in drag images. canvas->DrawColor(GetBackgroundColor()); #endif -@@ -1880,7 +1880,7 @@ void Textfield::CreateTouchSelectionCont +@@ -1908,7 +1908,7 @@ } void Textfield::UpdateSelectionClipboard() const { -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) if (performing_user_action_ && HasSelection()) { ui::ScopedClipboardWriter( ui::CLIPBOARD_TYPE_SELECTION).WriteText(GetSelectedText()); Index: branches/2016Q3/www/chromium/files/patch-ui_views_style_platform__style.cc =================================================================== --- branches/2016Q3/www/chromium/files/patch-ui_views_style_platform__style.cc (revision 420230) +++ branches/2016Q3/www/chromium/files/patch-ui_views_style_platform__style.cc (revision 420231) @@ -1,11 +1,11 @@ ---- ui/views/style/platform_style.cc.orig 2016-05-11 19:02:36 UTC -+++ ui/views/style/platform_style.cc -@@ -34,7 +34,7 @@ scoped_ptr PlatformStyle::Cre +--- ui/views/style/platform_style.cc.orig 2016-07-22 00:07:12.000000000 -0400 ++++ ui/views/style/platform_style.cc 2016-08-04 10:02:49.187133000 -0400 +@@ -17,7 +17,7 @@ + #include "ui/views/controls/focusable_border.h" + #include "ui/views/controls/scrollbar/native_scroll_bar.h" +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) + #define DESKTOP_LINUX #endif --#if !defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if (!defined(OS_LINUX) && !defined(OS_BSD)) || defined(OS_CHROMEOS) - // static - scoped_ptr PlatformStyle::CreateThemedLabelButtonBorder( - LabelButton* button) { Index: branches/2016Q3/www/chromium/files/patch-ui_webui_resources_js_icon.js =================================================================== --- branches/2016Q3/www/chromium/files/patch-ui_webui_resources_js_icon.js (nonexistent) +++ branches/2016Q3/www/chromium/files/patch-ui_webui_resources_js_icon.js (revision 420231) @@ -0,0 +1,11 @@ +--- ui/webui/resources/js/icon.js.orig 2016-08-04 10:04:19.233504000 -0400 ++++ ui/webui/resources/js/icon.js 2016-08-04 10:04:37.016751000 -0400 +@@ -9,7 +9,7 @@ + */ + function getSupportedScaleFactors() { + var supportedScaleFactors = []; +- if (cr.isMac || cr.isChromeOS || cr.isWindows || cr.isLinux) { ++ if (cr.isMac || cr.isChromeOS || cr.isWindows || cr.isLinux || cr.isBSD) { + // All desktop platforms support zooming which also updates the + // renderer's device scale factors (a.k.a devicePixelRatio), and + // these platforms has high DPI assets for 2.0x. Use 1x and 2x in Property changes on: branches/2016Q3/www/chromium/files/patch-ui_webui_resources_js_icon.js ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2016Q3/www/chromium/files/patch-v8_src_profiler_sampler.cc =================================================================== --- branches/2016Q3/www/chromium/files/patch-v8_src_profiler_sampler.cc (nonexistent) +++ branches/2016Q3/www/chromium/files/patch-v8_src_profiler_sampler.cc (revision 420231) @@ -0,0 +1,11 @@ +--- v8/src/profiler/sampler.cc.orig 2016-08-04 11:28:06.738852000 -0400 ++++ v8/src/profiler/sampler.cc 2016-08-04 11:28:29.356607000 -0400 +@@ -210,7 +210,7 @@ + + // Returns hash value for hash map. + uint32_t ThreadHash(pthread_t thread_id) { +-#if V8_OS_MACOSX ++#if defined(V8_OS_MACOSX) || defined(__OpenBSD__) || defined(__FreeBSD__) + return static_cast(reinterpret_cast(thread_id)); + #else + return static_cast(thread_id); Property changes on: branches/2016Q3/www/chromium/files/patch-v8_src_profiler_sampler.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/2016Q3/www/chromium/pkg-plist =================================================================== --- branches/2016Q3/www/chromium/pkg-plist (revision 420230) +++ branches/2016Q3/www/chromium/pkg-plist (revision 420231) @@ -1,229 +1,241 @@ bin/chrome man/man1/chrome.1.gz %%DRIVER%%bin/chromedriver share/applications/chromium-browser.desktop %%DATADIR%%/chrome %%DATADIR%%/chrome-wrapper %%DATADIR%%/chrome_100_percent.pak %%DATADIR%%/content_resources.pak %%DATADIR%%/keyboard_resources.pak %%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%%/pseudo_locales/fake-bidi.pak %%DATADIR%%/resources.pak %%DATADIR%%/resources/extension/demo/library.js +%%DATADIR%%/resources/inspector/Images/accelerometer-back.png +%%DATADIR%%/resources/inspector/Images/accelerometer-bottom.png +%%DATADIR%%/resources/inspector/Images/accelerometer-front.png +%%DATADIR%%/resources/inspector/Images/accelerometer-left.png +%%DATADIR%%/resources/inspector/Images/accelerometer-right.png +%%DATADIR%%/resources/inspector/Images/accelerometer-top.png %%DATADIR%%/resources/inspector/Images/applicationCache.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/chromeLeft.png %%DATADIR%%/resources/inspector/Images/chromeMiddle.png %%DATADIR%%/resources/inspector/Images/chromeRight.png %%DATADIR%%/resources/inspector/Images/chromeSelect.png %%DATADIR%%/resources/inspector/Images/chromeSelect_2x.png -%%DATADIR%%/resources/inspector/Images/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/ic_info_black_18dp.svg %%DATADIR%%/resources/inspector/Images/ic_warning_black_18dp.svg -%%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/paneFilterButtons.png %%DATADIR%%/resources/inspector/Images/paneRefreshButtons.png %%DATADIR%%/resources/inspector/Images/popoverArrows.png %%DATADIR%%/resources/inspector/Images/profileGroupIcon.png %%DATADIR%%/resources/inspector/Images/profileIcon.png %%DATADIR%%/resources/inspector/Images/profileSmallIcon.png %%DATADIR%%/resources/inspector/Images/radioDot.png %%DATADIR%%/resources/inspector/Images/resizeDiagonal.png %%DATADIR%%/resources/inspector/Images/resizeDiagonal_2x.png %%DATADIR%%/resources/inspector/Images/resizeHorizontal.png %%DATADIR%%/resources/inspector/Images/resizeHorizontal_2x.png %%DATADIR%%/resources/inspector/Images/resizeVertical.png %%DATADIR%%/resources/inspector/Images/resizeVertical_2x.png %%DATADIR%%/resources/inspector/Images/resourceCSSIcon.png %%DATADIR%%/resources/inspector/Images/resourceDocumentIcon.png %%DATADIR%%/resources/inspector/Images/resourceDocumentIconSmall.png +%%DATADIR%%/resources/inspector/Images/resourceGlyphs.png +%%DATADIR%%/resources/inspector/Images/resourceGlyphs_2x.png %%DATADIR%%/resources/inspector/Images/resourceJSIcon.png %%DATADIR%%/resources/inspector/Images/resourcePlainIcon.png %%DATADIR%%/resources/inspector/Images/resourcePlainIconSmall.png %%DATADIR%%/resources/inspector/Images/resourcesTimeGraphIcon.png %%DATADIR%%/resources/inspector/Images/searchNext.png %%DATADIR%%/resources/inspector/Images/searchPrev.png %%DATADIR%%/resources/inspector/Images/securityPropertyInfo.svg %%DATADIR%%/resources/inspector/Images/securityPropertyInsecure.svg %%DATADIR%%/resources/inspector/Images/securityPropertySecure.svg %%DATADIR%%/resources/inspector/Images/securityPropertyUnknown.svg %%DATADIR%%/resources/inspector/Images/securityPropertyWarning.svg %%DATADIR%%/resources/inspector/Images/securityStateInsecure.svg %%DATADIR%%/resources/inspector/Images/securityStateNeutral.svg %%DATADIR%%/resources/inspector/Images/securityStateSecure.svg -%%DATADIR%%/resources/inspector/Images/serviceWorker.svg -%%DATADIR%%/resources/inspector/Images/sessionStorage.png %%DATADIR%%/resources/inspector/Images/settingsListRemove.png %%DATADIR%%/resources/inspector/Images/settingsListRemove_2x.png %%DATADIR%%/resources/inspector/Images/speech.png %%DATADIR%%/resources/inspector/Images/toolbarButtonGlyphs.png %%DATADIR%%/resources/inspector/Images/toolbarButtonGlyphs_2x.png %%DATADIR%%/resources/inspector/Images/toolbarItemSelected.png %%DATADIR%%/resources/inspector/Images/toolbarResizerHorizontal.png %%DATADIR%%/resources/inspector/Images/toolbarResizerVertical.png %%DATADIR%%/resources/inspector/Images/touchCursor.png %%DATADIR%%/resources/inspector/Images/touchCursor_2x.png %%DATADIR%%/resources/inspector/InspectorBackendCommands.js %%DATADIR%%/resources/inspector/SupportedCSSProperties.js %%DATADIR%%/resources/inspector/Tests.js %%DATADIR%%/resources/inspector/accessibility_module.js %%DATADIR%%/resources/inspector/animation_module.js %%DATADIR%%/resources/inspector/audits_module.js %%DATADIR%%/resources/inspector/cm_modes_module.js %%DATADIR%%/resources/inspector/components_lazy_module.js %%DATADIR%%/resources/inspector/console_module.js %%DATADIR%%/resources/inspector/devices_module.js %%DATADIR%%/resources/inspector/devtools.js %%DATADIR%%/resources/inspector/devtools_extension_api.js %%DATADIR%%/resources/inspector/diff_module.js %%DATADIR%%/resources/inspector/elements_module.js %%DATADIR%%/resources/inspector/emulated_devices_module.js %%DATADIR%%/resources/inspector/es_tree_module.js -%%DATADIR%%/resources/inspector/formatter_worker_module.js +%%DATADIR%%/resources/inspector/emulated_devices/Nexus5X-landscape.svg +%%DATADIR%%/resources/inspector/emulated_devices/Nexus5X-portrait.svg +%%DATADIR%%/resources/inspector/emulated_devices/Nexus6P-landscape.svg +%%DATADIR%%/resources/inspector/emulated_devices/Nexus6P-portrait.svg %%DATADIR%%/resources/inspector/emulated_devices/google-nexus-5-horizontal-default-1x.png %%DATADIR%%/resources/inspector/emulated_devices/google-nexus-5-horizontal-default-2x.png %%DATADIR%%/resources/inspector/emulated_devices/google-nexus-5-horizontal-keyboard-1x.png %%DATADIR%%/resources/inspector/emulated_devices/google-nexus-5-horizontal-keyboard-2x.png %%DATADIR%%/resources/inspector/emulated_devices/google-nexus-5-horizontal-navigation-1x.png %%DATADIR%%/resources/inspector/emulated_devices/google-nexus-5-horizontal-navigation-2x.png %%DATADIR%%/resources/inspector/emulated_devices/google-nexus-5-vertical-default-1x.png %%DATADIR%%/resources/inspector/emulated_devices/google-nexus-5-vertical-default-2x.png %%DATADIR%%/resources/inspector/emulated_devices/google-nexus-5-vertical-keyboard-1x.png %%DATADIR%%/resources/inspector/emulated_devices/google-nexus-5-vertical-keyboard-2x.png %%DATADIR%%/resources/inspector/emulated_devices/google-nexus-5-vertical-navigation-1x.png %%DATADIR%%/resources/inspector/emulated_devices/google-nexus-5-vertical-navigation-2x.png %%DATADIR%%/resources/inspector/emulated_devices/google-nexus-5x-horizontal-default-1x.png %%DATADIR%%/resources/inspector/emulated_devices/google-nexus-5x-horizontal-default-2x.png %%DATADIR%%/resources/inspector/emulated_devices/google-nexus-5x-horizontal-keyboard-1x.png %%DATADIR%%/resources/inspector/emulated_devices/google-nexus-5x-horizontal-keyboard-2x.png %%DATADIR%%/resources/inspector/emulated_devices/google-nexus-5x-horizontal-navigation-1x.png %%DATADIR%%/resources/inspector/emulated_devices/google-nexus-5x-horizontal-navigation-2x.png %%DATADIR%%/resources/inspector/emulated_devices/google-nexus-5x-vertical-default-1x.png %%DATADIR%%/resources/inspector/emulated_devices/google-nexus-5x-vertical-default-2x.png %%DATADIR%%/resources/inspector/emulated_devices/google-nexus-5x-vertical-keyboard-1x.png %%DATADIR%%/resources/inspector/emulated_devices/google-nexus-5x-vertical-keyboard-2x.png %%DATADIR%%/resources/inspector/emulated_devices/google-nexus-5x-vertical-navigation-1x.png %%DATADIR%%/resources/inspector/emulated_devices/google-nexus-5x-vertical-navigation-2x.png -%%DATADIR%%/resources/inspector/heap_snapshot_worker_module.js +%%DATADIR%%/resources/inspector/emulated_devices/iPad-landscape.svg +%%DATADIR%%/resources/inspector/emulated_devices/iPad-portrait.svg +%%DATADIR%%/resources/inspector/emulated_devices/iPhone5-landscape.svg +%%DATADIR%%/resources/inspector/emulated_devices/iPhone5-portrait.svg +%%DATADIR%%/resources/inspector/emulated_devices/iPhone6-landscape.svg +%%DATADIR%%/resources/inspector/emulated_devices/iPhone6-portrait.svg +%%DATADIR%%/resources/inspector/emulated_devices/iPhone6Plus-landscape.svg +%%DATADIR%%/resources/inspector/emulated_devices/iPhone6Plus-portrait.svg +%%DATADIR%%/resources/inspector/formatter_worker.js +%%DATADIR%%/resources/inspector/gonzales_module.js +%%DATADIR%%/resources/inspector/heap_snapshot_worker.js %%DATADIR%%/resources/inspector/inspector.html %%DATADIR%%/resources/inspector/inspector.js %%DATADIR%%/resources/inspector/layers_module.js %%DATADIR%%/resources/inspector/network_module.js %%DATADIR%%/resources/inspector/profiler_module.js %%DATADIR%%/resources/inspector/resources_module.js %%DATADIR%%/resources/inspector/sass_module.js %%DATADIR%%/resources/inspector/screencast_module.js %%DATADIR%%/resources/inspector/security_module.js %%DATADIR%%/resources/inspector/settings_module.js %%DATADIR%%/resources/inspector/snippets_module.js %%DATADIR%%/resources/inspector/source_frame_module.js %%DATADIR%%/resources/inspector/sources_module.js -%%DATADIR%%/resources/inspector/temp_storage_shared_worker_module.js +%%DATADIR%%/resources/inspector/temp_storage_shared_worker.js %%DATADIR%%/resources/inspector/timeline_module.js %%DATADIR%%/resources/inspector/toolbox.html %%DATADIR%%/resources/inspector/toolbox.js %%DATADIR%%/resources/inspector/ui_lazy_module.js 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 @dir %%DATADIR%%/locales @dir %%DATADIR%%/resources/extension/demo @dir %%DATADIR%%/resources/extension @dir %%DATADIR%%/resources/inspector/Images @dir %%DATADIR%%/resources/inspector @dir %%DATADIR%%/resources @dir %%DATADIR%% @dir share/icons/hicolor/128x128/apps @dir share/icons/hicolor/128x128 @dir share/icons/hicolor/22x22/apps @dir share/icons/hicolor/22x22 @dir share/icons/hicolor/24x24/apps @dir share/icons/hicolor/24x24 @dir share/icons/hicolor/256x256/apps @dir share/icons/hicolor/256x256 @dir share/icons/hicolor/48x48/apps @dir share/icons/hicolor/48x48 @dir share/icons/hicolor/64x64/apps @dir share/icons/hicolor/64x64 @dir share/icons/hicolor @dir share/icons Index: branches/2016Q3 =================================================================== --- branches/2016Q3 (revision 420230) +++ branches/2016Q3 (revision 420231) Property changes on: branches/2016Q3 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r420138