summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--www/chromium/Makefile35
-rw-r--r--www/chromium/distinfo8
-rw-r--r--www/chromium/files/extra-patch-clang19
-rw-r--r--www/chromium/files/extra-patch-gcc22
-rw-r--r--www/chromium/files/patch-base__process__memory_unittest.cc20
-rw-r--r--www/chromium/files/patch-base__process__process_info_linux.cc4
-rw-r--r--www/chromium/files/patch-base__process__process_posix.cc44
-rw-r--r--www/chromium/files/patch-chrome__app__chrome_main_delegate.cc31
-rw-r--r--www/chromium/files/patch-chrome__app__theme__theme_resources.grd11
-rw-r--r--www/chromium/files/patch-chrome__browser__browser_resources.grd11
-rw-r--r--www/chromium/files/patch-chrome__browser__chrome_browser_main.cc28
-rw-r--r--www/chromium/files/patch-chrome__browser__net__cookie_store_util.cc23
-rw-r--r--www/chromium/files/patch-chrome__browser__ssl__ssl_blocking_page.cc11
-rw-r--r--www/chromium/files/patch-chrome__browser__ui__browser.cc20
-rw-r--r--www/chromium/files/patch-chrome__browser__ui__views__message_center__message_center_widget_delegate.cc11
-rw-r--r--www/chromium/files/patch-chrome__browser__ui__views__message_center__web_notification_tray.cc20
-rw-r--r--www/chromium/files/patch-chrome__browser__ui__webui__chrome_web_ui_controller_factory.cc4
-rw-r--r--www/chromium/files/patch-chrome__chrome_browser.gypi14
-rw-r--r--www/chromium/files/patch-chrome__chrome_browser_ui.gypi4
-rw-r--r--www/chromium/files/patch-chrome__chrome_common.gypi13
-rw-r--r--www/chromium/files/patch-chrome__common__chrome_paths.h34
-rw-r--r--www/chromium/files/patch-chrome__common__component_flash_hint_file_linux.h14
-rw-r--r--www/chromium/files/patch-chrome__common__variations__fieldtrial_testing_config.gyp (renamed from www/chromium/files/patch-chrome__commin__variations__fieldtrial_testing_config.gyp)6
-rw-r--r--www/chromium/files/patch-components__metrics__drive_metrics_provider_linux.cc4
-rw-r--r--www/chromium/files/patch-components__metrics__system_memory_stats_recorder_linux.cc (renamed from www/chromium/files/patch-chrome__browser__memory__system_memory_stats_recorder_linux.cc)4
-rw-r--r--www/chromium/files/patch-content__browser__bluetooth__bluetooth_dispatcher_host.cc18
-rw-r--r--www/chromium/files/patch-content__browser__bluetooth__bluetooth_dispatcher_host.h18
-rw-r--r--www/chromium/files/patch-content__browser__renderer_host__renderer_process_host_impl.cc10
-rw-r--r--www/chromium/files/patch-content__renderer__renderer_blink_platform_impl.cc25
-rw-r--r--www/chromium/files/patch-device__serial__serial_io_handler_posix.cc4
-rw-r--r--www/chromium/files/patch-device__usb__usb_service_impl.cc26
-rw-r--r--www/chromium/files/patch-gpu__command_buffer__service__async_pixel_transfer_manager_share_group.cc11
-rw-r--r--www/chromium/files/patch-media__audio__audio_input_volume_unittest.cc11
-rw-r--r--www/chromium/files/patch-media__capture__video__fake_video_capture_device_factory.cc4
-rw-r--r--www/chromium/files/patch-media__capture__video__file_video_capture_device_factory.cc4
-rw-r--r--www/chromium/files/patch-media__capture__video__linux__video_capture_device_linux.cc49
-rw-r--r--www/chromium/files/patch-media__capture__video__linux__video_capture_device_linux.h13
-rw-r--r--www/chromium/files/patch-media__capture__video__video_capture_device.cc14
-rw-r--r--www/chromium/files/patch-media__capture__video__video_capture_device.h4
-rw-r--r--www/chromium/files/patch-media__capture__video__video_capture_device_factory.cc6
-rw-r--r--www/chromium/files/patch-media__filters__vp9_parser.h10
-rw-r--r--www/chromium/files/patch-media__media.gyp24
-rw-r--r--www/chromium/files/patch-net__net.gypi18
-rw-r--r--www/chromium/files/patch-net__proxy__proxy_service.cc14
-rw-r--r--www/chromium/files/patch-remoting__remoting_host.gypi21
-rw-r--r--www/chromium/files/patch-skia__skia_chrome.gypi16
-rw-r--r--www/chromium/files/patch-third_party__WebKit__Source__platform__fonts__FontPlatformData.cpp14
-rw-r--r--www/chromium/files/patch-third_party__ffmpeg__ffmpeg_generated.gypi82
-rw-r--r--www/chromium/files/patch-third_party__pdfium__fpdfsdk__src__javascript__JS_Value.cpp (renamed from www/chromium/files/patch-third_party__pdfium__fpdfsdk__src__jsapi__fxjs_v8.cpp)10
-rw-r--r--www/chromium/files/patch-third_party__pdfium__fpdfsdk__src__javascript__PublicMethods.cpp4
-rw-r--r--www/chromium/files/patch-third_party__sfntly__sfntly.gyp10
-rw-r--r--www/chromium/files/patch-third_party__webrtc__base__systeminfo.cc34
-rw-r--r--www/chromium/files/patch-ui__events__keycodes__dom__keycode_converter.cc12
-rw-r--r--www/chromium/files/patch-ui__gl__gl_surface_glx.cc4
-rw-r--r--www/chromium/files/patch-ui__gl__sync_control_vsync_provider.cc4
-rw-r--r--www/chromium/files/patch-ui__resources__ui_resources.grd4
-rw-r--r--www/chromium/files/patch-ui__views__bubble__bubble_delegate.cc4
-rw-r--r--www/chromium/files/patch-ui__views__controls__button__label_button.cc4
-rw-r--r--www/chromium/pkg-plist15
59 files changed, 439 insertions, 497 deletions
diff --git a/www/chromium/Makefile b/www/chromium/Makefile
index 752d75decd12..19ffdf98e1da 100644
--- a/www/chromium/Makefile
+++ b/www/chromium/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= chromium
-PORTVERSION= 46.0.2490.86
+PORTVERSION= 47.0.2526.73
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
@@ -22,7 +22,9 @@ BUILD_DEPENDS= ${LOCALBASE}/bin/gperf:${PORTSDIR}/devel/gperf \
${LOCALBASE}/include/linux/videodev2.h:${PORTSDIR}/multimedia/v4l_compat \
${LOCALBASE}/share/usbids/usb.ids:${PORTSDIR}/misc/usbids \
${PYTHON_PKGNAMEPREFIX}Jinja2>0:${PORTSDIR}/devel/py-Jinja2 \
- ${PYTHON_PKGNAMEPREFIX}ply>0:${PORTSDIR}/devel/py-ply
+ ${PYTHON_PKGNAMEPREFIX}ply>0:${PORTSDIR}/devel/py-ply \
+ ${PYTHON_PKGNAMEPREFIX}beautifulsoup>0:${PORTSDIR}/www/py-beautifulsoup \
+ ${PYTHON_PKGNAMEPREFIX}html5lib>0:${PORTSDIR}/www/py-html5lib
LIB_DEPENDS= libcairo.so:${PORTSDIR}/graphics/cairo \
libdbus-1.so:${PORTSDIR}/devel/dbus \
@@ -242,6 +244,9 @@ post-patch:
${WRKSRC}/base/base.gyp
pre-configure:
+.if ! ${PORT_OPTIONS:MTEST}
+ ${ECHO_CMD} > ${WRKSRC}/chrome/test/data/webui/i18n_process_css_test.html
+.endif
# phajdan-jr: list of things *not* to remove, so maybe the script
# should be called "keep_bundled_libraries.py"
cd ${WRKSRC} && ${PYTHON_CMD} \
@@ -270,13 +275,6 @@ pre-configure:
'third_party/brotli' \
'third_party/boringssl' \
'third_party/cacheinvalidation' \
- 'third_party/catapult' \
- 'third_party/catapult/tracing' \
- 'third_party/catapult/tracing/third_party' \
- 'third_party/catapult/tracing/third_party/tvcm' \
- 'third_party/catapult/tracing/third_party/tvcm/third_party/beautifulsoup' \
- 'third_party/catapult/tracing/third_party/tvcm/third_party/rcssmin' \
- 'third_party/catapult/tracing/third_party/tvcm/third_party/rjsmin' \
'third_party/cld' \
'third_party/cros_system_api' \
'third_party/dom_distiller_js' \
@@ -299,11 +297,13 @@ pre-configure:
'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/libvpx_new' \
+ 'third_party/libvpx_new/source/libvpx/third_party/x86inc' \
'third_party/libxml/chromium' \
'third_party/libXNVCtrl' \
+ 'third_party/libwebm' \
+ 'third_party/libwebm/source' \
+ 'third_party/libwebm/source/common' \
'third_party/libyuv' \
'third_party/lss' \
'third_party/lzma_sdk' \
@@ -332,6 +332,13 @@ pre-configure:
'third_party/sqlite' \
'third_party/tcmalloc' \
'third_party/tlslite' \
+ 'third_party/catapult' \
+ 'third_party/catapult/tracing' \
+ 'third_party/catapult/tracing/third_party' \
+ 'third_party/catapult/tracing/third_party/tvcm/third_party' \
+ 'third_party/catapult/tracing/third_party/tvcm/third_party/rcssmin' \
+ 'third_party/catapult/tracing/third_party/tvcm/third_party/rjsmin' \
+ 'third_party/catapult/tracing/third_party/tvcm/tvcm' \
'third_party/usrsctp' \
'third_party/web-animations-js' \
'third_party/webdriver' \
@@ -349,10 +356,6 @@ pre-configure:
${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} \
diff --git a/www/chromium/distinfo b/www/chromium/distinfo
index 700699a7f79f..33e5d3dee917 100644
--- a/www/chromium/distinfo
+++ b/www/chromium/distinfo
@@ -1,4 +1,4 @@
-SHA256 (chromium-46.0.2490.86.tar.xz) = ee18d28ac80ff958e8a6c770bfc0d7d770b55452ed91a87f731e1b432a7d1d92
-SIZE (chromium-46.0.2490.86.tar.xz) = 356008056
-SHA256 (chromium-46.0.2490.86-testdata.tar.xz) = 16f4dd0eb784f52b5ac7a297be2fe93a157d6d3c44082e7d4d2cd439f7f18a73
-SIZE (chromium-46.0.2490.86-testdata.tar.xz) = 116964688
+SHA256 (chromium-47.0.2526.73.tar.xz) = 6d66d01c8ddff6562ff13d30ed65ef0cdc2888d9e4924be615d576b7eb15f4f5
+SIZE (chromium-47.0.2526.73.tar.xz) = 394631144
+SHA256 (chromium-47.0.2526.73-testdata.tar.xz) = b7a3d7d77a2161f33728c357e62f746b29330d23920dc1b42dd86e3f1948805a
+SIZE (chromium-47.0.2526.73-testdata.tar.xz) = 117390036
diff --git a/www/chromium/files/extra-patch-clang b/www/chromium/files/extra-patch-clang
index c9b55a51824b..c085f95e9627 100644
--- a/www/chromium/files/extra-patch-clang
+++ b/www/chromium/files/extra-patch-clang
@@ -164,8 +164,8 @@
char * check_twosfx_morph(const char * word, int len, int optflags,
PfxEntry* ppfx, const FLAG needflag = FLAG_NULL);
---- third_party/sfntly/cpp/src/sfntly/table/core/cmap_table.cc 2015-04-15 00:31:48.000000000 +0200
-+++ third_party/sfntly/cpp/src/sfntly/table/core/cmap_table.cc 2015-04-18 22:05:41.000000000 +0200
+--- 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 @@
}
@@ -224,7 +224,7 @@
--- third_party/webrtc/modules/audio_coding/main/acm2/audio_coding_module_impl.cc.orig 2015-09-03 09:31:11.815462000 -0400
+++ third_party/webrtc/modules/audio_coding/main/acm2/audio_coding_module_impl.cc 2015-09-03 09:31:50.974163000 -0400
-@@ -1028,7 +1028,7 @@
+@@ -844,7 +844,7 @@
const AudioEncoder* AudioCodingImpl::GetSenderInfo() const {
FATAL() << "Not implemented yet.";
@@ -233,7 +233,7 @@
}
const CodecInst* AudioCodingImpl::GetSenderCodecInst() {
-@@ -1048,7 +1048,7 @@
+@@ -864,7 +864,7 @@
const ReceiverInfo* AudioCodingImpl::GetReceiverInfo() const {
FATAL() << "Not implemented yet.";
@@ -242,14 +242,3 @@
}
bool AudioCodingImpl::RegisterReceiveCodec(AudioDecoder* receive_codec) {
---- 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<SharedBuffer> buffer;
-
-- SkFontTableTag tag = WTF::bswap32(table);
-+ SkFontTableTag tag = bswap32(table);
- const size_t tableSize = m_typeface->getTableSize(tag);
- if (tableSize) {
- Vector<char> tableBuffer(tableSize);
diff --git a/www/chromium/files/extra-patch-gcc b/www/chromium/files/extra-patch-gcc
index df30aa08673c..e50403d345c7 100644
--- a/www/chromium/files/extra-patch-gcc
+++ b/www/chromium/files/extra-patch-gcc
@@ -135,25 +135,3 @@
const char* suffix, const char* mode);
struct AsDOT {
---- v8/src/log-utils.h.orig 2015-10-13 21:04:45.000000000 +0200
-+++ v8/src/log-utils.h 2015-10-17 10:17:35.535561000 +0200
-@@ -5,6 +5,9 @@
- #ifndef V8_LOG_UTILS_H_
- #define V8_LOG_UTILS_H_
-
-+#include <cstdarg>
-+#include <cstdio>
-+
- #include "src/allocation.h"
- #include "src/base/platform/mutex.h"
- #include "src/flags.h"
---- third_party/webrtc/modules/remote_bitrate_estimator/overuse_detector.cc.orig 2015-10-22 21:00:59.000000000 +0200
-+++ third_party/webrtc/modules/remote_bitrate_estimator/overuse_detector.cc 2015-11-01 11:32:36.293750000 +0100
-@@ -11,6 +11,7 @@
- #include "webrtc/modules/remote_bitrate_estimator/overuse_detector.h"
-
- #include <algorithm>
-+#include <cstdio>
- #include <sstream>
- #include <math.h>
- #include <stdlib.h>
diff --git a/www/chromium/files/patch-base__process__memory_unittest.cc b/www/chromium/files/patch-base__process__memory_unittest.cc
index 7f43897e33e8..fe56247c8d06 100644
--- a/www/chromium/files/patch-base__process__memory_unittest.cc
+++ b/www/chromium/files/patch-base__process__memory_unittest.cc
@@ -1,6 +1,6 @@
---- base/process/memory_unittest.cc.orig 2015-07-15 16:29:55.000000000 -0400
-+++ base/process/memory_unittest.cc 2015-07-21 19:03:40.407090000 -0400
-@@ -127,11 +127,11 @@
+--- base/process/memory_unittest.cc.orig 2015-10-14 03:01:18.000000000 -0400
++++ base/process/memory_unittest.cc 2015-10-23 11:11:40.281381000 -0400
+@@ -137,11 +137,11 @@
#endif // defined(OS_MACOSX)
// Android doesn't implement set_new_handler, so we can't use the
@@ -8,16 +8,16 @@
+// OutOfMemoryTest cases. OpenBSD and FreeBSD do not support these tests either.
// Don't test these on ASan/TSan/MSan configurations: only test the real
// allocator.
- // TODO(vandebo) make this work on Windows too.
--#if !defined(OS_ANDROID) && !defined(OS_OPENBSD) && !defined(OS_WIN) && \
-+#if !defined(OS_ANDROID) && !defined(OS_BSD) && !defined(OS_WIN) && \
+ // Windows only supports these tests with the allocator shim in place.
+-#if !defined(OS_ANDROID) && !defined(OS_OPENBSD) && \
++#if !defined(OS_ANDROID) && !defined(OS_BSD) && \
+ !(defined(OS_WIN) && !defined(ALLOCATOR_SHIM)) && \
!defined(MEMORY_TOOL_REPLACES_ALLOCATOR)
- #if defined(USE_TCMALLOC)
-@@ -415,5 +415,5 @@
+@@ -483,5 +483,5 @@
EXPECT_TRUE(value_ == NULL);
}
#endif // !defined(MEMORY_TOOL_REPLACES_ALLOCATOR)
--#endif // !defined(OS_ANDROID) && !defined(OS_OPENBSD) && !defined(OS_WIN) &&
+-#endif // !defined(OS_ANDROID) && !defined(OS_OPENBSD) && !(defined(OS_WIN) &&
+#endif // !defined(OS_ANDROID) && !defined(OS_BSD) && !defined(OS_WIN)
- // !defined(ADDRESS_SANITIZER)
+ // !defined(ALLOCATOR_SHIM)) && !defined(MEMORY_TOOL_REPLACES_ALLOCATOR)
diff --git a/www/chromium/files/patch-base__process__process_info_linux.cc b/www/chromium/files/patch-base__process__process_info_linux.cc
index 9ce09dad68e6..441b5104f472 100644
--- a/www/chromium/files/patch-base__process__process_info_linux.cc
+++ b/www/chromium/files/patch-base__process__process_info_linux.cc
@@ -1,5 +1,5 @@
---- base/process/process_info_linux.cc.orig 2015-10-14 16:18:44.939415000 +0200
-+++ base/process/process_info_linux.cc 2015-10-14 16:22:36.086176000 +0200
+--- base/process/process_info_linux.cc.orig 2015-10-06 22:42:06.000000000 -0400
++++ base/process/process_info_linux.cc 2015-10-14 08:06:38.761855000 -0400
@@ -10,10 +10,28 @@
#include "base/process/process_handle.h"
#include "base/time/time.h"
diff --git a/www/chromium/files/patch-base__process__process_posix.cc b/www/chromium/files/patch-base__process__process_posix.cc
index 3c121eeae7c1..400eb991fc1e 100644
--- a/www/chromium/files/patch-base__process__process_posix.cc
+++ b/www/chromium/files/patch-base__process__process_posix.cc
@@ -1,5 +1,5 @@
---- base/process/process_posix.cc.orig 2015-08-22 15:01:51.000000000 -0400
-+++ base/process/process_posix.cc 2015-09-05 09:44:45.526291000 -0400
+--- base/process/process_posix.cc.orig 2015-10-14 03:01:18.000000000 -0400
++++ base/process/process_posix.cc 2015-10-23 11:23:26.411838000 -0400
@@ -17,8 +17,18 @@
#include <sys/event.h>
#endif
@@ -37,29 +37,21 @@
// On Mac we can wait on non child processes.
return WaitForSingleNonChildProcess(handle, timeout);
#else
-@@ -255,13 +265,6 @@
- return Process(handle);
+@@ -258,7 +268,11 @@
+ #if !defined(OS_LINUX)
+ // static
+ bool Process::CanBackgroundProcesses() {
++#if defined(OS_BSD)
++ return true;
++#else
+ return false;
++#endif
}
+ #endif // !defined(OS_LINUX)
--#if !defined(OS_LINUX) && !defined(OS_MACOSX)
--// static
--bool Process::CanBackgroundProcesses() {
-- return false;
--}
--#endif // !defined(OS_LINUX) && !defined(OS_MACOSX)
--
- bool Process::IsValid() const {
- return process_ != kNullProcessHandle;
- }
-@@ -357,18 +360,27 @@
- }
+@@ -358,17 +372,21 @@
- #if !defined(OS_LINUX) && !defined(OS_MACOSX)
-+// static
-+bool Process::CanBackgroundProcesses() {
-+ return true;
-+}
-+
+ #if !defined(OS_LINUX)
bool Process::IsProcessBackgrounded() const {
- // See SetProcessBackgrounded().
DCHECK(IsValid());
@@ -68,9 +60,9 @@
}
bool Process::SetProcessBackgrounded(bool value) {
-- // Not implemented for POSIX systems other than Mac and Linux. With POSIX, if
-- // we were to lower the process priority we wouldn't be able to raise it back
-- // to its initial priority.
+- // Not implemented for POSIX systems other than Linux. With POSIX, if we were
+- // to lower the process priority we wouldn't be able to raise it back to its
+- // initial priority.
- NOTIMPLEMENTED();
- return false;
+ DCHECK(IsValid());
@@ -84,5 +76,5 @@
+ DPCHECK(result == 0);
+ return result == 0;
}
- #endif // !defined(OS_LINUX) && !defined(OS_MACOSX)
+ #endif // !defined(OS_LINUX)
diff --git a/www/chromium/files/patch-chrome__app__chrome_main_delegate.cc b/www/chromium/files/patch-chrome__app__chrome_main_delegate.cc
index 91ff873223a0..467347f3337a 100644
--- a/www/chromium/files/patch-chrome__app__chrome_main_delegate.cc
+++ b/www/chromium/files/patch-chrome__app__chrome_main_delegate.cc
@@ -1,15 +1,24 @@
---- chrome/app/chrome_main_delegate.cc.orig 2014-10-10 09:15:29 UTC
-+++ chrome/app/chrome_main_delegate.cc
-@@ -97,7 +97,7 @@
+--- chrome/app/chrome_main_delegate.cc.orig 2015-10-21 18:00:37.000000000 -0400
++++ chrome/app/chrome_main_delegate.cc 2015-10-23 12:25:02.965569000 -0400
+@@ -103,7 +103,7 @@
#include "ui/base/x/x11_util.h"
#endif
-#if defined(OS_POSIX) && !defined(OS_MACOSX)
+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD)
- #include "components/crash/app/breakpad_linux.h"
+ #include "components/crash/content/app/breakpad_linux.h"
#endif
-@@ -449,7 +449,7 @@
+@@ -405,7 +405,7 @@
+ } // namespace
+
+ ChromeMainDelegate::ChromeMainDelegate() {
+-#if defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_LINUX)
++#if defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD)
+ // Record the startup process creation time on supported platforms.
+ startup_metric_utils::RecordStartupProcessCreationTime(
+ base::CurrentProcessInfo::CreationTime());
+@@ -508,7 +508,7 @@
std::string format_str =
command_line.GetSwitchValueASCII(switches::kDiagnosticsFormat);
if (format_str == "machine") {
@@ -18,7 +27,7 @@
} else if (format_str == "log") {
format = diagnostics::DiagnosticsWriter::LOG;
} else {
-@@ -500,7 +500,7 @@
+@@ -558,7 +558,7 @@
std::string format_str =
command_line.GetSwitchValueASCII(switches::kDiagnosticsFormat);
if (format_str == "machine") {
@@ -27,7 +36,7 @@
} else if (format_str == "human") {
format = diagnostics::DiagnosticsWriter::HUMAN;
} else {
-@@ -640,7 +640,7 @@
+@@ -641,7 +641,7 @@
std::string process_type =
command_line.GetSwitchValueASCII(switches::kProcessType);
@@ -36,16 +45,16 @@
crash_reporter::SetCrashReporterClient(g_chrome_crash_client.Pointer());
#endif
-@@ -767,7 +767,7 @@
+@@ -762,7 +762,7 @@
+ chrome::InitializePDF();
#endif
- }
-#if defined(OS_POSIX) && !defined(OS_MACOSX)
+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD)
// Zygote needs to call InitCrashReporter() in RunZygote().
if (process_type != switches::kZygoteProcess) {
#if defined(OS_ANDROID)
-@@ -779,7 +779,7 @@
+@@ -776,7 +776,7 @@
breakpad::InitCrashReporter(process_type);
#endif // defined(OS_ANDROID)
}
@@ -54,7 +63,7 @@
// After all the platform Breakpads have been initialized, store the command
// line for crash reporting.
-@@ -875,7 +875,7 @@
+@@ -886,7 +886,7 @@
#endif
return process_type == switches::kRelauncherProcess;
}
diff --git a/www/chromium/files/patch-chrome__app__theme__theme_resources.grd b/www/chromium/files/patch-chrome__app__theme__theme_resources.grd
new file mode 100644
index 000000000000..1409865c2375
--- /dev/null
+++ b/www/chromium/files/patch-chrome__app__theme__theme_resources.grd
@@ -0,0 +1,11 @@
+--- chrome/app/theme/theme_resources.grd.orig 2015-11-18 08:18:51.872583000 -0500
++++ chrome/app/theme/theme_resources.grd 2015-11-18 08:19:44.804018000 -0500
+@@ -481,7 +481,7 @@
+ <structure type="chrome_scaled_image" name="IDR_NOTIFICATION_PERIPHERAL_BATTERY_LOW" file="cros/notification_peripheral_battery_low.png" />
+ <structure type="chrome_scaled_image" name="IDR_PORTAL_DETECTION_ALERT" file="cros/captive_portal_icon.png" />
+ </if>
+- <if expr="is_win or desktop_linux">
++ <if expr="is_win or desktop_linux or is_posix">
+ <structure type="chrome_scaled_image" name="IDR_NOTIFICATION_TRAY_DO_NOT_DISTURB_ATTENTION" file="common/notification_tray_do_not_disturb_attention.png" />
+ <structure type="chrome_scaled_image" name="IDR_NOTIFICATION_TRAY_DO_NOT_DISTURB_EMPTY" file="common/notification_tray_do_not_disturb_empty.png" />
+ <structure type="chrome_scaled_image" name="IDR_NOTIFICATION_TRAY_ATTENTION" file="common/notification_tray_attention.png" />
diff --git a/www/chromium/files/patch-chrome__browser__browser_resources.grd b/www/chromium/files/patch-chrome__browser__browser_resources.grd
new file mode 100644
index 000000000000..521fc18023d1
--- /dev/null
+++ b/www/chromium/files/patch-chrome__browser__browser_resources.grd
@@ -0,0 +1,11 @@
+--- chrome/browser/browser_resources.grd.orig 2015-11-18 08:21:01.846760000 -0500
++++ chrome/browser/browser_resources.grd 2015-11-18 08:21:22.801803000 -0500
+@@ -251,7 +251,7 @@
+ <include name="IDR_ABOUT_VOICESEARCH_JS" file="resources\about_voicesearch.js" type="BINDATA" />
+ <include name="IDR_PLUGIN_DB_JSON" file="resources\plugin_metadata\plugins_chromeos.json" type="BINDATA" />
+ </if>
+- <if expr="desktop_linux or (is_android and enable_plugins)">
++ <if expr="desktop_linux or (is_android and enable_plugins) or is_posix">
+ <include name="IDR_PLUGIN_DB_JSON" file="resources\plugin_metadata\plugins_linux.json" type="BINDATA" />
+ </if>
+ <if expr="is_android">
diff --git a/www/chromium/files/patch-chrome__browser__chrome_browser_main.cc b/www/chromium/files/patch-chrome__browser__chrome_browser_main.cc
index bf2b9e545538..8dc72f13f43b 100644
--- a/www/chromium/files/patch-chrome__browser__chrome_browser_main.cc
+++ b/www/chromium/files/patch-chrome__browser__chrome_browser_main.cc
@@ -1,11 +1,29 @@
---- chrome/browser/chrome_browser_main.cc.orig 2014-10-10 09:15:30 UTC
-+++ chrome/browser/chrome_browser_main.cc
-@@ -947,7 +947,7 @@
+--- chrome/browser/chrome_browser_main.cc.orig 2015-10-13 15:04:31.000000000 -0400
++++ chrome/browser/chrome_browser_main.cc 2015-10-15 13:19:01.371935000 -0400
+@@ -158,7 +158,7 @@
+ #include "chrome/browser/feedback/feedback_profile_observer.h"
+ #endif // defined(OS_ANDROID)
+
+-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
++#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
+ #include "chrome/browser/first_run/upgrade_util_linux.h"
+ #include "chrome/browser/sxs_linux.h"
+ #endif // defined(OS_LINUX) && !defined(OS_CHROMEOS)
+@@ -1013,7 +1013,7 @@
}
- #endif
+ #endif // !defined(OS_ANDROID) && !defined(OS_CHROMEOS)
-#if defined(OS_LINUX) || defined(OS_OPENBSD) || defined(OS_MACOSX)
+#if defined(OS_LINUX) || defined(OS_BSD) || defined(OS_MACOSX)
// Set the product channel for crash reports.
base::debug::SetCrashKeyValue(crash_keys::kChannel,
- chrome::VersionInfo::GetVersionStringModifier());
+ chrome::GetChannelString());
+@@ -1349,7 +1349,7 @@
+ return chrome::RESULT_CODE_MACHINE_LEVEL_INSTALL_EXISTS;
+ #endif // defined(OS_WIN)
+
+-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
++#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
+ if (sxs_linux::ShouldMigrateUserDataDir())
+ return sxs_linux::MigrateUserDataDir();
+ #endif // defined(OS_LINUX) && !defined(OS_CHROMEOS)
diff --git a/www/chromium/files/patch-chrome__browser__net__cookie_store_util.cc b/www/chromium/files/patch-chrome__browser__net__cookie_store_util.cc
index 317fcc9fe527..70ff693e826b 100644
--- a/www/chromium/files/patch-chrome__browser__net__cookie_store_util.cc
+++ b/www/chromium/files/patch-chrome__browser__net__cookie_store_util.cc
@@ -1,24 +1,11 @@
---- chrome/browser/net/cookie_store_util.cc.orig 2015-10-14 19:42:28.950909000 +0200
-+++ chrome/browser/net/cookie_store_util.cc 2015-10-14 19:43:32.447326000 +0200
-@@ -15,7 +15,7 @@
-
- namespace chrome_browser_net {
+--- chrome/browser/net/cookie_store_util.cc.orig 2015-07-21 21:42:54.358730000 -0400
++++ chrome/browser/net/cookie_store_util.cc 2015-07-21 21:43:07.938330000 -0400
+@@ -85,7 +85,7 @@
+ new ChromeCookieMonsterDelegate(profile));
+ }
-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)
+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD)
namespace {
// Use the operating system's mechanisms to encrypt cookies before writing
-@@ -67,10 +67,10 @@
- net::CookieCryptoDelegate* GetCookieCryptoDelegate() {
- return g_cookie_crypto_delegate.Pointer();
- }
--#else // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)
-+#else // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD)
- net::CookieCryptoDelegate* GetCookieCryptoDelegate() {
- return NULL;
- }
--#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)
-+#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD)
-
- } // namespace chrome_browser_net
diff --git a/www/chromium/files/patch-chrome__browser__ssl__ssl_blocking_page.cc b/www/chromium/files/patch-chrome__browser__ssl__ssl_blocking_page.cc
deleted file mode 100644
index 9c46f504fb31..000000000000
--- a/www/chromium/files/patch-chrome__browser__ssl__ssl_blocking_page.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- chrome/browser/ssl/ssl_blocking_page.cc.orig 2015-04-18 23:34:15.000000000 +0200
-+++ chrome/browser/ssl/ssl_blocking_page.cc 2015-04-18 23:40:51.000000000 +0200
-@@ -132,7 +132,7 @@
- // iOS does not have a way to launch the date and time settings.
- NOTREACHED();
-
--#elif defined(OS_LINUX)
-+#elif defined(OS_LINUX) || defined(OS_BSD)
- struct ClockCommand {
- const char* pathname;
- const char* argument;
diff --git a/www/chromium/files/patch-chrome__browser__ui__browser.cc b/www/chromium/files/patch-chrome__browser__ui__browser.cc
deleted file mode 100644
index f917cc12ae07..000000000000
--- a/www/chromium/files/patch-chrome__browser__ui__browser.cc
+++ /dev/null
@@ -1,20 +0,0 @@
---- chrome/browser/ui/browser.cc.orig 2015-04-14 18:31:21.000000000 -0400
-+++ chrome/browser/ui/browser.cc 2015-04-28 10:02:57.120071000 -0400
-@@ -1284,7 +1284,7 @@
- window_has_shown_ = true;
-
- // CurrentProcessInfo::CreationTime() is missing on some platforms.
--#if defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_LINUX)
-+#if defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD)
- // Measure the latency from startup till the first browser window becomes
- // visible.
- static bool is_first_browser_window = true;
-@@ -1300,7 +1300,7 @@
- base::Time::Now() - process_creation_time);
- }
- }
--#endif // defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_LINUX)
-+#endif // defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD)
-
- // Nothing to do for non-tabbed windows.
- if (!is_type_tabbed())
diff --git a/www/chromium/files/patch-chrome__browser__ui__views__message_center__message_center_widget_delegate.cc b/www/chromium/files/patch-chrome__browser__ui__views__message_center__message_center_widget_delegate.cc
deleted file mode 100644
index e9288bfeda76..000000000000
--- a/www/chromium/files/patch-chrome__browser__ui__views__message_center__message_center_widget_delegate.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- chrome/browser/ui/views/message_center/message_center_widget_delegate.cc.orig 2015-04-14 18:18:50.000000000 -0400
-+++ chrome/browser/ui/views/message_center/message_center_widget_delegate.cc 2015-04-28 09:46:29.443573000 -0400
-@@ -97,7 +97,7 @@
- // immediately after the mouse exists from the bubble, which is a really bad
- // experience. Disable hiding until the bug around the focus is fixed.
- // TODO(erg, pkotwicz): fix the activation issue and then remove this ifdef.
--#if !defined(OS_LINUX)
-+#if !defined(OS_LINUX) || !defined(OS_BSD)
- if (!active) {
- tray_->SendHideMessageCenter();
- }
diff --git a/www/chromium/files/patch-chrome__browser__ui__views__message_center__web_notification_tray.cc b/www/chromium/files/patch-chrome__browser__ui__views__message_center__web_notification_tray.cc
deleted file mode 100644
index 3990354ae59c..000000000000
--- a/www/chromium/files/patch-chrome__browser__ui__views__message_center__web_notification_tray.cc
+++ /dev/null
@@ -1,20 +0,0 @@
---- chrome/browser/ui/views/message_center/web_notification_tray.cc.orig 2015-04-28 09:44:00.558139000 -0400
-+++ chrome/browser/ui/views/message_center/web_notification_tray.cc 2015-04-28 09:44:33.539806000 -0400
-@@ -31,7 +31,7 @@
- #include "ui/strings/grit/ui_strings.h"
- #include "ui/views/widget/widget.h"
-
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
- #include "base/environment.h"
- #include "base/nix/xdg_util.h"
- #endif
-@@ -66,7 +66,7 @@
- }
-
- bool CanDestroyStatusIcon() {
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
- // Avoid creating multiple system tray icons on KDE4 and newer versions of KDE
- // because the OS does not support removing system tray icons.
- // TODO(pkotwicz): This is a hack for the sake of M40. Fix this properly.
diff --git a/www/chromium/files/patch-chrome__browser__ui__webui__chrome_web_ui_controller_factory.cc b/www/chromium/files/patch-chrome__browser__ui__webui__chrome_web_ui_controller_factory.cc
index 2ab84bff90aa..24878bea5af3 100644
--- a/www/chromium/files/patch-chrome__browser__ui__webui__chrome_web_ui_controller_factory.cc
+++ b/www/chromium/files/patch-chrome__browser__ui__webui__chrome_web_ui_controller_factory.cc
@@ -1,5 +1,5 @@
---- chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig 2015-10-14 16:37:51.456856000 +0200
-+++ chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc 2015-10-14 16:38:21.306588000 +0200
+--- chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig 2015-10-13 15:04:32.000000000 -0400
++++ chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc 2015-10-14 08:16:21.359565000 -0400
@@ -273,7 +273,7 @@
#if !defined(OS_ANDROID)
|| url.host() == chrome::kChromeUITermsHost
diff --git a/www/chromium/files/patch-chrome__chrome_browser.gypi b/www/chromium/files/patch-chrome__chrome_browser.gypi
index 4d2db23b0960..80cefc0df4b1 100644
--- a/www/chromium/files/patch-chrome__chrome_browser.gypi
+++ b/www/chromium/files/patch-chrome__chrome_browser.gypi
@@ -1,6 +1,6 @@
---- chrome/chrome_browser.gypi.orig 2015-07-21 22:00:15.902799000 -0400
-+++ chrome/chrome_browser.gypi 2015-07-21 22:08:53.180707000 -0400
-@@ -3277,6 +3277,13 @@
+--- chrome/chrome_browser.gypi.orig 2015-10-21 18:00:37.000000000 -0400
++++ chrome/chrome_browser.gypi 2015-10-23 12:31:48.047090000 -0400
+@@ -3365,6 +3365,13 @@
'browser/download/download_dir_policy_handler.h',
],
}],
@@ -14,7 +14,7 @@
['OS=="mac"', {
'dependencies': [
'app_shim',
-@@ -3416,7 +3423,7 @@
+@@ -3518,7 +3525,7 @@
'../device/media_transfer_protocol/media_transfer_protocol.gyp:device_media_transfer_protocol',
],
}],
@@ -23,7 +23,7 @@
'dependencies': [
'../build/linux/system.gyp:libspeechd',
],
-@@ -3472,7 +3479,7 @@
+@@ -3572,7 +3579,7 @@
['use_x11==1', {
'sources': [ '<@(chrome_browser_x11_sources)' ],
}],
@@ -32,12 +32,12 @@
'sources': [
'app/chrome_crash_reporter_client.cc',
'app/chrome_crash_reporter_client.h',
-@@ -3667,7 +3674,7 @@
+@@ -3813,7 +3820,7 @@
}],
],
}],
- ['OS=="linux"', {
+ ['OS=="linux" or os_bsd==1', {
- 'sources': [ '<@(chrome_browser_linux_sources)' ],
'conditions': [
['use_aura==1', {
+ 'dependencies': [
diff --git a/www/chromium/files/patch-chrome__chrome_browser_ui.gypi b/www/chromium/files/patch-chrome__chrome_browser_ui.gypi
index 1348edac9312..a0ba00869888 100644
--- a/www/chromium/files/patch-chrome__chrome_browser_ui.gypi
+++ b/www/chromium/files/patch-chrome__chrome_browser_ui.gypi
@@ -1,5 +1,5 @@
---- chrome/chrome_browser_ui.gypi.orig 2015-10-14 16:42:08.849931000 +0200
-+++ chrome/chrome_browser_ui.gypi 2015-10-14 16:45:35.205417000 +0200
+--- chrome/chrome_browser_ui.gypi.orig 2015-10-13 15:04:32.000000000 -0400
++++ chrome/chrome_browser_ui.gypi 2015-10-14 08:19:30.748417000 -0400
@@ -2921,7 +2921,7 @@
}],
],
diff --git a/www/chromium/files/patch-chrome__chrome_common.gypi b/www/chromium/files/patch-chrome__chrome_common.gypi
new file mode 100644
index 000000000000..753d2fe38997
--- /dev/null
+++ b/www/chromium/files/patch-chrome__chrome_common.gypi
@@ -0,0 +1,13 @@
+--- chrome/chrome_common.gypi.orig 2015-10-21 18:00:37.000000000 -0400
++++ chrome/chrome_common.gypi 2015-10-23 12:33:22.684474000 -0400
+@@ -43,8 +43,8 @@
+ 'common/common_param_traits.cc',
+ 'common/common_param_traits.h',
+ 'common/common_param_traits_macros.h',
+- 'common/component_flash_hint_file_linux.cc',
+- 'common/component_flash_hint_file_linux.h',
++# 'common/component_flash_hint_file_linux.cc',
++# 'common/component_flash_hint_file_linux.h',
+ 'common/content_restriction.h',
+ 'common/content_settings_pattern_serializer.cc',
+ 'common/content_settings_pattern_serializer.h',
diff --git a/www/chromium/files/patch-chrome__common__chrome_paths.h b/www/chromium/files/patch-chrome__common__chrome_paths.h
index cd5daa1bad05..bd8f6ed551f3 100644
--- a/www/chromium/files/patch-chrome__common__chrome_paths.h
+++ b/www/chromium/files/patch-chrome__common__chrome_paths.h
@@ -1,33 +1,11 @@
---- chrome/common/chrome_paths.h.orig 2015-10-14 23:15:23.226535000 +0200
-+++ chrome/common/chrome_paths.h 2015-10-14 23:18:15.292087000 +0200
-@@ -50,7 +50,7 @@
- DIR_USER_APPLICATIONS, // ~/Applications
- DIR_USER_LIBRARY, // ~/Library
- #endif
--#if defined(OS_CHROMEOS) || (defined(OS_LINUX) && defined(CHROMIUM_BUILD)) || \
-+#if defined(OS_CHROMEOS) || ((defined(OS_LINUX) || defined(OS_BSD)) && defined(CHROMIUM_BUILD)) || \
- (defined(OS_MACOSX) && !defined(OS_IOS))
- DIR_USER_EXTERNAL_EXTENSIONS, // Directory for per-user external extensions
- // on Chrome Mac and Chromium Linux.
-@@ -114,7 +114,7 @@
- DIR_SUPERVISED_USERS_DEFAULT_APPS, // Directory where installer places .crx
- // files to be installed when managed user
- // session starts.
+--- chrome/common/chrome_paths.h.orig 2015-10-14 03:01:20.000000000 -0400
++++ chrome/common/chrome_paths.h 2015-10-23 12:35:13.801677000 -0400
+@@ -117,7 +117,7 @@
+ DIR_SUPERVISED_USER_INSTALLED_WHITELISTS, // Directory where sanitized
+ // supervised user whitelists are
+ // installed.
-#if defined(OS_LINUX) || (defined(OS_MACOSX) && !defined(OS_IOS))
+#if defined(OS_LINUX) || defined(OS_BSD) || (defined(OS_MACOSX) && !defined(OS_IOS))
DIR_NATIVE_MESSAGING, // System directory where native messaging host
// manifest files are stored.
DIR_USER_NATIVE_MESSAGING, // Directory with Native Messaging Hosts
-@@ -133,10 +133,10 @@
- DIR_GEN_TEST_DATA, // Directory where generated test data resides.
- DIR_TEST_DATA, // Directory where unit test data resides.
- DIR_TEST_TOOLS, // Directory where unit test tools reside.
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
- FILE_COMPONENT_FLASH_HINT, // A file in a known location that points to
- // the component updated flash plugin.
--#endif // defined(OS_LINUX)
-+#endif // defined(OS_LINUX) || defined(OS_BSD)
-
- PATH_END
- };
diff --git a/www/chromium/files/patch-chrome__common__component_flash_hint_file_linux.h b/www/chromium/files/patch-chrome__common__component_flash_hint_file_linux.h
deleted file mode 100644
index 7045b654327f..000000000000
--- a/www/chromium/files/patch-chrome__common__component_flash_hint_file_linux.h
+++ /dev/null
@@ -1,14 +0,0 @@
---- chrome/common/component_flash_hint_file_linux.h.orig 2015-10-15 10:25:32.927627000 +0200
-+++ chrome/common/component_flash_hint_file_linux.h 2015-10-15 10:25:53.911624000 +0200
-@@ -7,9 +7,9 @@
-
- #include "build/build_config.h"
-
--#if !defined(OS_LINUX)
-+#if !defined(OS_LINUX) && !defined(OS_FREEBSD)
- #error "This file only applies to the Linux component update of Flash."
--#endif // !defined(OS_LINUX)
-+#endif // !defined(OS_LINUX) && !defined(OS_FREEBSD)
-
- #include <string>
-
diff --git a/www/chromium/files/patch-chrome__commin__variations__fieldtrial_testing_config.gyp b/www/chromium/files/patch-chrome__common__variations__fieldtrial_testing_config.gyp
index 17adc5d82262..8b12cb0f1c0a 100644
--- a/www/chromium/files/patch-chrome__commin__variations__fieldtrial_testing_config.gyp
+++ b/www/chromium/files/patch-chrome__common__variations__fieldtrial_testing_config.gyp
@@ -1,11 +1,11 @@
---- chrome/common/variations/fieldtrial_testing_config.gyp.orig 2015-10-14 23:35:23.943296000 +0200
-+++ chrome/common/variations/fieldtrial_testing_config.gyp 2015-10-14 23:36:22.584477000 +0200
+--- chrome/common/variations/fieldtrial_testing_config.gyp.orig 2015-10-15 09:32:40.670879000 -0400
++++ chrome/common/variations/fieldtrial_testing_config.gyp 2015-10-15 09:27:09.909117000 -0400
@@ -19,7 +19,7 @@
'conditions': [
['OS!="android"', {'sources/': [['exclude', '_android\\.json$']]}],
['OS!="win"', {'sources/': [['exclude', '_win\\.json$']]}],
- ['OS!="linux" or chromeos==1', {'sources/': [['exclude', '_linux\\.json$']]}],
-+ ['(OS!="linux" and OS!="freebsd") or chromeos==1', {'sources/': [['exclude', '_linux\\.json$']]}],
++ ['(OS!="linux" or chromeos==1) and os_bsd!=1', {'sources/': [['exclude', '_linux\\.json$']]}],
['OS!="mac"', {'sources/': [['exclude', '_mac\\.json$']]}],
['chromeos!=1', {'sources/': [['exclude', '_chromeos\\.json$']]}],
['OS!="ios"', {'sources/': [['exclude', '_ios\\.json$']]}],
diff --git a/www/chromium/files/patch-components__metrics__drive_metrics_provider_linux.cc b/www/chromium/files/patch-components__metrics__drive_metrics_provider_linux.cc
index 3ff02e625ae6..c6d8f497b5b6 100644
--- a/www/chromium/files/patch-components__metrics__drive_metrics_provider_linux.cc
+++ b/www/chromium/files/patch-components__metrics__drive_metrics_provider_linux.cc
@@ -1,5 +1,5 @@
---- components/metrics/drive_metrics_provider_linux.cc.orig 2015-10-14 16:34:04.903957000 +0200
-+++ components/metrics/drive_metrics_provider_linux.cc 2015-10-14 16:34:35.113096000 +0200
+--- components/metrics/drive_metrics_provider_linux.cc.orig 2015-10-14 08:11:50.411251000 -0400
++++ components/metrics/drive_metrics_provider_linux.cc 2015-10-14 08:12:35.355093000 -0400
@@ -4,7 +4,13 @@
#include "components/metrics/drive_metrics_provider.h"
diff --git a/www/chromium/files/patch-chrome__browser__memory__system_memory_stats_recorder_linux.cc b/www/chromium/files/patch-components__metrics__system_memory_stats_recorder_linux.cc
index 9a66382f0a29..5d96773c38a2 100644
--- a/www/chromium/files/patch-chrome__browser__memory__system_memory_stats_recorder_linux.cc
+++ b/www/chromium/files/patch-components__metrics__system_memory_stats_recorder_linux.cc
@@ -1,5 +1,5 @@
---- chrome/browser/memory/system_memory_stats_recorder_linux.cc.orig 2015-09-03 20:30:21.188785000 -0400
-+++ chrome/browser/memory/system_memory_stats_recorder_linux.cc 2015-09-03 20:25:00.522580000 -0400
+--- components/metrics/system_memory_stats_recorder_linux.cc.orig 2015-09-03 20:30:21.188785000 -0400
++++ components/metrics/system_memory_stats_recorder_linux.cc 2015-09-03 20:25:00.522580000 -0400
@@ -29,6 +29,7 @@
UMA_HISTOGRAM_LINEAR(name, sample, 2500, 50)
diff --git a/www/chromium/files/patch-content__browser__bluetooth__bluetooth_dispatcher_host.cc b/www/chromium/files/patch-content__browser__bluetooth__bluetooth_dispatcher_host.cc
deleted file mode 100644
index f918b25da853..000000000000
--- a/www/chromium/files/patch-content__browser__bluetooth__bluetooth_dispatcher_host.cc
+++ /dev/null
@@ -1,18 +0,0 @@
---- content/browser/bluetooth/bluetooth_dispatcher_host.cc.orig 2015-10-14 22:52:01.308600000 +0200
-+++ content/browser/bluetooth/bluetooth_dispatcher_host.cc 2015-10-14 22:57:26.070951000 +0200
-@@ -191,6 +191,7 @@
- set_adapter(scoped_refptr<device::BluetoothAdapter>());
- }
-
-+#if 0
- // Stores information associated with an in-progress requestDevice call. This
- // will include the state of the active chooser dialog in a future patch.
- struct BluetoothDispatcherHost::RequestDeviceSession {
-@@ -201,6 +202,7 @@
- std::vector<BluetoothScanFilter> filters;
- std::vector<BluetoothUUID> optional_services;
- };
-+#endif
-
- void BluetoothDispatcherHost::set_adapter(
- scoped_refptr<device::BluetoothAdapter> adapter) {
diff --git a/www/chromium/files/patch-content__browser__bluetooth__bluetooth_dispatcher_host.h b/www/chromium/files/patch-content__browser__bluetooth__bluetooth_dispatcher_host.h
deleted file mode 100644
index e90cf6347446..000000000000
--- a/www/chromium/files/patch-content__browser__bluetooth__bluetooth_dispatcher_host.h
+++ /dev/null
@@ -1,18 +0,0 @@
---- content/browser/bluetooth/bluetooth_dispatcher_host.h.orig 2015-10-14 22:52:05.596671000 +0200
-+++ content/browser/bluetooth/bluetooth_dispatcher_host.h 2015-10-14 22:58:17.694827000 +0200
-@@ -51,7 +51,14 @@
- friend class base::DeleteHelper<BluetoothDispatcherHost>;
- friend struct BrowserThread::DeleteOnThread<BrowserThread::UI>;
-
-- struct RequestDeviceSession;
-+ struct RequestDeviceSession {
-+ RequestDeviceSession(const std::vector<BluetoothScanFilter>& filters,
-+ const std::vector<device::BluetoothUUID>& optional_services)
-+ : filters(filters), optional_services(optional_services) {}
-+
-+ std::vector<BluetoothScanFilter> filters;
-+ std::vector<device::BluetoothUUID> optional_services;
-+ };
-
- // Set |adapter_| to a BluetoothAdapter instance and register observers,
- // releasing references to previous |adapter_|.
diff --git a/www/chromium/files/patch-content__browser__renderer_host__renderer_process_host_impl.cc b/www/chromium/files/patch-content__browser__renderer_host__renderer_process_host_impl.cc
deleted file mode 100644
index 8fa8cfb38cd0..000000000000
--- a/www/chromium/files/patch-content__browser__renderer_host__renderer_process_host_impl.cc
+++ /dev/null
@@ -1,10 +0,0 @@
---- content/browser/renderer_host/render_process_host_impl.cc.orig 2015-10-14 23:20:02.027419000 +0200
-+++ content/browser/renderer_host/render_process_host_impl.cc 2015-10-14 23:20:29.597226000 +0200
-@@ -38,6 +38,7 @@
- #include "base/tracked_objects.h"
- #include "cc/base/switches.h"
- #include "components/tracing/tracing_switches.h"
-+#include "content/common/bluetooth/bluetooth_scan_filter.h"
- #include "content/browser/appcache/appcache_dispatcher_host.h"
- #include "content/browser/appcache/chrome_appcache_service.h"
- #include "content/browser/background_sync/background_sync_service_impl.h"
diff --git a/www/chromium/files/patch-content__renderer__renderer_blink_platform_impl.cc b/www/chromium/files/patch-content__renderer__renderer_blink_platform_impl.cc
index c9c487a37205..ee1ed2cabea7 100644
--- a/www/chromium/files/patch-content__renderer__renderer_blink_platform_impl.cc
+++ b/www/chromium/files/patch-content__renderer__renderer_blink_platform_impl.cc
@@ -1,6 +1,6 @@
---- content/renderer/renderer_blink_platform_impl.cc.orig 2015-05-13 18:35:46.000000000 -0400
-+++ content/renderer/renderer_blink_platform_impl.cc 2015-05-20 15:52:34.484662000 -0400
-@@ -99,7 +99,7 @@
+--- content/renderer/renderer_blink_platform_impl.cc.orig 2015-11-04 18:00:50.000000000 -0500
++++ content/renderer/renderer_blink_platform_impl.cc 2015-11-06 16:14:45.473476000 -0500
+@@ -104,7 +104,7 @@
#if defined(OS_POSIX)
#include "base/file_descriptor_posix.h"
@@ -9,7 +9,7 @@
#include <map>
#include <string>
-@@ -189,7 +189,7 @@
+@@ -195,7 +195,7 @@
scoped_refptr<ThreadSafeSender> thread_safe_sender_;
};
@@ -18,7 +18,7 @@
class RendererBlinkPlatformImpl::SandboxSupport
: public blink::WebSandboxSupport {
public:
-@@ -216,7 +216,7 @@
+@@ -222,7 +222,7 @@
std::map<int32_t, blink::WebFallbackFont> unicode_font_families_;
#endif
};
@@ -27,7 +27,7 @@
//------------------------------------------------------------------------------
-@@ -232,7 +232,7 @@
+@@ -238,7 +238,7 @@
plugin_refresh_allowed_(true),
default_task_runner_(renderer_scheduler->DefaultTaskRunner()),
web_scrollbar_behavior_(new WebScrollbarBehaviorImpl) {
@@ -36,7 +36,16 @@
if (g_sandbox_enabled && sandboxEnabled()) {
sandbox_support_.reset(new RendererBlinkPlatformImpl::SandboxSupport);
} else {
-@@ -289,7 +289,7 @@
+@@ -263,7 +263,7 @@
+ }
+
+ void RendererBlinkPlatformImpl::Shutdown() {
+-#if !defined(OS_ANDROID) && !defined(OS_WIN)
++#if !defined(OS_ANDROID) && !defined(OS_WIN) && !defined(OS_BSD)
+ // SandboxSupport contains a map of WebFontFamily objects, which hold
+ // WebCStrings, which become invalidated when blink is shut down. Hence, we
+ // need to clear that map now, just before blink::shutdown() is called.
+@@ -300,7 +300,7 @@
}
blink::WebSandboxSupport* RendererBlinkPlatformImpl::sandboxSupport() {
@@ -45,7 +54,7 @@
// These platforms do not require sandbox support.
return NULL;
#else
-@@ -557,7 +557,7 @@
+@@ -570,7 +570,7 @@
return FontLoader::CGFontRefFromBuffer(font_data, font_data_size, out);
}
diff --git a/www/chromium/files/patch-device__serial__serial_io_handler_posix.cc b/www/chromium/files/patch-device__serial__serial_io_handler_posix.cc
index f5ff28038f94..170720a85467 100644
--- a/www/chromium/files/patch-device__serial__serial_io_handler_posix.cc
+++ b/www/chromium/files/patch-device__serial__serial_io_handler_posix.cc
@@ -1,5 +1,5 @@
---- device/serial/serial_io_handler_posix.cc.orig 2015-10-14 16:49:00.395597000 +0200
-+++ device/serial/serial_io_handler_posix.cc 2015-10-14 17:18:20.515698000 +0200
+--- device/serial/serial_io_handler_posix.cc.orig 2015-10-06 22:42:12.000000000 -0400
++++ device/serial/serial_io_handler_posix.cc 2015-10-14 10:57:52.264932000 -0400
@@ -59,7 +59,7 @@
BITRATE_TO_SPEED_CASE(9600)
BITRATE_TO_SPEED_CASE(19200)
diff --git a/www/chromium/files/patch-device__usb__usb_service_impl.cc b/www/chromium/files/patch-device__usb__usb_service_impl.cc
index 3e953bdab48b..259874300f90 100644
--- a/www/chromium/files/patch-device__usb__usb_service_impl.cc
+++ b/www/chromium/files/patch-device__usb__usb_service_impl.cc
@@ -1,5 +1,5 @@
---- device/usb/usb_service_impl.cc.orig 2015-10-14 17:21:32.323520000 +0200
-+++ device/usb/usb_service_impl.cc 2015-10-14 17:28:13.062771000 +0200
+--- device/usb/usb_service_impl.cc.orig 2015-10-21 18:00:38.000000000 -0400
++++ device/usb/usb_service_impl.cc 2015-10-23 12:39:46.908676000 -0400
@@ -20,7 +20,11 @@
#include "device/usb/usb_device_handle.h"
#include "device/usb/usb_error.h"
@@ -20,29 +20,23 @@
rv = libusb_hotplug_register_callback(
context_->context(),
static_cast<libusb_hotplug_event>(LIBUSB_HOTPLUG_EVENT_DEVICE_ARRIVED |
-@@ -553,6 +558,8 @@
+@@ -559,12 +564,15 @@
+ device_observer_.Add(device_monitor);
}
-
- RefreshDevices();
-+#endif // !OS_FREEBSD
-+
- #if defined(OS_WIN)
- DeviceMonitorWin* device_monitor = DeviceMonitorWin::GetForAllInterfaces();
- if (device_monitor) {
-@@ -562,10 +569,11 @@
+ #endif // OS_WIN
++#endif // OS_FREEBSD
}
UsbServiceImpl::~UsbServiceImpl() {
--
+#if !defined(OS_FREEBSD)
if (hotplug_enabled_) {
libusb_hotplug_deregister_callback(context_->context(), hotplug_handle_);
}
-+#endif // !OS_FREEBSD
++#endif // OS_FREEBSD
for (const auto& map_entry : devices_) {
map_entry.second->OnDisconnect();
}
-@@ -803,6 +811,7 @@
+@@ -802,6 +810,7 @@
device->OnDisconnect();
}
@@ -50,11 +44,11 @@
// static
int LIBUSB_CALL UsbServiceImpl::HotplugCallback(libusb_context* context,
PlatformUsbDevice device,
-@@ -840,6 +849,7 @@
+@@ -839,6 +848,7 @@
return 0;
}
-+#endif // !OS_FREEBSD
++#endif // !OS_FREEBSD
void UsbServiceImpl::OnPlatformDeviceAdded(PlatformUsbDevice platform_device) {
DCHECK(CalledOnValidThread());
diff --git a/www/chromium/files/patch-gpu__command_buffer__service__async_pixel_transfer_manager_share_group.cc b/www/chromium/files/patch-gpu__command_buffer__service__async_pixel_transfer_manager_share_group.cc
deleted file mode 100644
index 2c19b3693b91..000000000000
--- a/www/chromium/files/patch-gpu__command_buffer__service__async_pixel_transfer_manager_share_group.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- gpu/command_buffer/service/async_pixel_transfer_manager_share_group.cc.orig 2015-09-01 16:10:43.000000000 -0400
-+++ gpu/command_buffer/service/async_pixel_transfer_manager_share_group.cc 2015-09-03 10:44:42.860094000 -0400
-@@ -48,7 +48,7 @@
- : base::Thread(kAsyncTransferThreadName),
- initialized_(false) {
- base::Thread::Options options;
--#if defined(OS_ANDROID) || defined(OS_LINUX)
-+#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD)
- options.priority = base::ThreadPriority::BACKGROUND;
- #endif
- StartWithOptions(options);
diff --git a/www/chromium/files/patch-media__audio__audio_input_volume_unittest.cc b/www/chromium/files/patch-media__audio__audio_input_volume_unittest.cc
deleted file mode 100644
index 128a6cd136ab..000000000000
--- a/www/chromium/files/patch-media__audio__audio_input_volume_unittest.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- media/audio/audio_input_volume_unittest.cc.orig 2014-10-10 08:54:15 UTC
-+++ media/audio/audio_input_volume_unittest.cc
-@@ -74,7 +74,7 @@
- params, device_id);
- EXPECT_TRUE(NULL != ais);
-
--#if defined(OS_LINUX) || defined(OS_OPENBSD)
-+#if defined(OS_LINUX) || defined(OS_BSD)
- // Some linux devices do not support our settings, we may fail to open
- // those devices.
- if (!ais->Open()) {
diff --git a/www/chromium/files/patch-media__capture__video__fake_video_capture_device_factory.cc b/www/chromium/files/patch-media__capture__video__fake_video_capture_device_factory.cc
index 2c7bc9353a2f..f0fea6f517f8 100644
--- a/www/chromium/files/patch-media__capture__video__fake_video_capture_device_factory.cc
+++ b/www/chromium/files/patch-media__capture__video__fake_video_capture_device_factory.cc
@@ -1,5 +1,5 @@
---- media/capture/video/fake_video_capture_device_factory.cc.orig 2015-10-14 17:33:35.934406000 +0200
-+++ media/capture/video/fake_video_capture_device_factory.cc 2015-10-14 17:34:01.687650000 +0200
+--- media/capture/video/fake_video_capture_device_factory.cc.orig 2015-10-14 11:08:16.489018000 -0400
++++ media/capture/video/fake_video_capture_device_factory.cc 2015-10-14 11:09:19.850751000 -0400
@@ -51,7 +51,7 @@
for (int n = 0; n < number_of_devices_; ++n) {
VideoCaptureDevice::Name name(base::StringPrintf("fake_device_%d", n),
diff --git a/www/chromium/files/patch-media__capture__video__file_video_capture_device_factory.cc b/www/chromium/files/patch-media__capture__video__file_video_capture_device_factory.cc
index 0847e219c1ee..a81ee46b851d 100644
--- a/www/chromium/files/patch-media__capture__video__file_video_capture_device_factory.cc
+++ b/www/chromium/files/patch-media__capture__video__file_video_capture_device_factory.cc
@@ -1,5 +1,5 @@
---- media/capture/video/file_video_capture_device_factory.cc.orig 2015-10-14 17:42:06.832425000 +0200
-+++ media/capture/video/file_video_capture_device_factory.cc 2015-10-14 17:42:45.561757000 +0200
+--- media/capture/video/file_video_capture_device_factory.cc.orig 2015-10-14 11:10:41.842256000 -0400
++++ media/capture/video/file_video_capture_device_factory.cc 2015-10-14 11:11:13.400581000 -0400
@@ -49,7 +49,7 @@
device_names->push_back(VideoCaptureDevice::Name(
command_line_file_path.value(), kFileVideoCaptureDeviceName,
diff --git a/www/chromium/files/patch-media__capture__video__linux__video_capture_device_linux.cc b/www/chromium/files/patch-media__capture__video__linux__video_capture_device_linux.cc
index ab80191fcfb0..9d8842312f4e 100644
--- a/www/chromium/files/patch-media__capture__video__linux__video_capture_device_linux.cc
+++ b/www/chromium/files/patch-media__capture__video__linux__video_capture_device_linux.cc
@@ -1,40 +1,57 @@
---- media/capture/video/linux/video_capture_device_linux.cc.orig 2015-10-14 17:46:45.617486000 +0200
-+++ media/capture/video/linux/video_capture_device_linux.cc 2015-10-14 21:44:58.276861000 +0200
+--- media/capture/video/linux/video_capture_device_linux.cc.orig 2015-10-21 18:00:38.000000000 -0400
++++ media/capture/video/linux/video_capture_device_linux.cc 2015-10-23 12:49:31.985359000 -0400
@@ -43,6 +43,7 @@
// Translates Video4Linux pixel formats to Chromium pixel formats.
// static
+#if !defined(OS_FREEBSD)
- VideoCapturePixelFormat
+ VideoPixelFormat
VideoCaptureDeviceLinux::V4l2FourCcToChromiumPixelFormat(uint32 v4l2_fourcc) {
return V4L2CaptureDelegate::V4l2FourCcToChromiumPixelFormat(v4l2_fourcc);
@@ -54,6 +55,7 @@
bool favour_mjpeg) {
return V4L2CaptureDelegate::GetListOfUsableFourCcs(favour_mjpeg);
}
-+#endif // !OS_FREEBSD
++#endif // !defined(OS_FREEBSD)
const std::string VideoCaptureDevice::Name::GetModel() const {
// |unique_id| is of the form "/dev/video2". |file_name| is "video2".
-@@ -88,6 +90,7 @@
+@@ -91,6 +93,7 @@
+ void VideoCaptureDeviceLinux::AllocateAndStart(
+ const VideoCaptureParams& params,
+ scoped_ptr<VideoCaptureDevice::Client> client) {
++#if !defined(OS_FREEBSD)
+ DCHECK(!capture_impl_);
+ if (v4l2_thread_.IsRunning())
+ return; // Wrong state.
+@@ -110,9 +113,11 @@
+ params.requested_format.frame_size.width(),
+ params.requested_format.frame_size.height(),
+ params.requested_format.frame_rate, base::Passed(&client)));
++#endif
+ }
+
+ void VideoCaptureDeviceLinux::StopAndDeAllocate() {
++#if !defined(OS_FREEBSD)
+ if (!v4l2_thread_.IsRunning())
+ return; // Wrong state.
+ v4l2_thread_.message_loop()->PostTask(
+@@ -121,8 +126,10 @@
v4l2_thread_.Stop();
+
+ capture_impl_ = NULL;
++#endif
}
+#if !defined(OS_FREEBSD)
- void VideoCaptureDeviceLinux::AllocateAndStart(
- const VideoCaptureParams& params,
- scoped_ptr<VideoCaptureDevice::Client> client) {
-@@ -130,6 +133,13 @@
+ void VideoCaptureDeviceLinux::SetRotation(int rotation) {
+ if (v4l2_thread_.IsRunning()) {
+ v4l2_thread_.message_loop()->PostTask(
+@@ -130,6 +137,7 @@
base::Bind(&V4L2CaptureDelegate::SetRotation, capture_impl_, rotation));
}
}
-+#else // !OS_FREEBSD
-+void VideoCaptureDeviceLinux::AllocateAndStart(
-+ const VideoCaptureParams& params,
-+ scoped_ptr<VideoCaptureDevice::Client> client) {}
-+void VideoCaptureDeviceLinux::StopAndDeAllocate() {}
-+void VideoCaptureDeviceLinux::SetRotation(int rotation) {}
-+#endif // !OS_FREEBSD
++#endif // !defined(OS_FREEBSD)
// static
int VideoCaptureDeviceLinux::TranslatePowerLineFrequencyToV4L2(int frequency) {
diff --git a/www/chromium/files/patch-media__capture__video__linux__video_capture_device_linux.h b/www/chromium/files/patch-media__capture__video__linux__video_capture_device_linux.h
new file mode 100644
index 000000000000..668292c50d71
--- /dev/null
+++ b/www/chromium/files/patch-media__capture__video__linux__video_capture_device_linux.h
@@ -0,0 +1,13 @@
+--- media/capture/video/linux/video_capture_device_linux.h.orig 2015-10-13 15:04:33.000000000 -0400
++++ media/capture/video/linux/video_capture_device_linux.h 2015-10-14 14:59:17.508402000 -0400
+@@ -37,8 +37,10 @@
+ scoped_ptr<Client> client) override;
+ void StopAndDeAllocate() override;
+
++#if !defined(OS_FREEBSD)
+ protected:
+ void SetRotation(int rotation);
++#endif // !defined(OS_FREEBSD)
+
+ private:
+ static int TranslatePowerLineFrequencyToV4L2(int frequency);
diff --git a/www/chromium/files/patch-media__capture__video__video_capture_device.cc b/www/chromium/files/patch-media__capture__video__video_capture_device.cc
index b20d4875d4d1..ae0e53e2e526 100644
--- a/www/chromium/files/patch-media__capture__video__video_capture_device.cc
+++ b/www/chromium/files/patch-media__capture__video__video_capture_device.cc
@@ -1,6 +1,6 @@
---- media/capture/video/video_capture_device.cc.orig 2015-10-14 17:57:48.996214000 +0200
-+++ media/capture/video/video_capture_device.cc 2015-10-14 18:00:26.654041000 +0200
-@@ -9,6 +9,10 @@
+--- media/capture/video/video_capture_device.cc.orig 2015-10-21 18:00:38.000000000 -0400
++++ media/capture/video/video_capture_device.cc 2015-10-23 12:51:56.086998000 -0400
+@@ -11,6 +11,10 @@
namespace media {
@@ -8,10 +8,10 @@
+ return "";
+}
+
+ // TODO(msu.koo): http://crbug.com/532272, remove checking the switch in favour
+ // of deferring GetModel() call to the actual VideoCaptureDevice object.
const std::string VideoCaptureDevice::Name::GetNameAndModel() const {
- const std::string model_id = GetModel();
- if (model_id.empty())
-@@ -26,7 +30,7 @@
+@@ -33,7 +37,7 @@
: device_name_(name), unique_id_(id) {
}
@@ -20,7 +20,7 @@
VideoCaptureDevice::Name::Name(const std::string& name,
const std::string& id,
const CaptureApiType api_type)
-@@ -73,7 +77,7 @@
+@@ -80,7 +84,7 @@
VideoCaptureDevice::Name::~Name() {
}
diff --git a/www/chromium/files/patch-media__capture__video__video_capture_device.h b/www/chromium/files/patch-media__capture__video__video_capture_device.h
index a46323584218..a77e2182a849 100644
--- a/www/chromium/files/patch-media__capture__video__video_capture_device.h
+++ b/www/chromium/files/patch-media__capture__video__video_capture_device.h
@@ -1,5 +1,5 @@
---- media/capture/video/video_capture_device.h.orig 2015-10-14 18:04:30.325845000 +0200
-+++ media/capture/video/video_capture_device.h 2015-10-14 18:06:41.271627000 +0200
+--- media/capture/video/video_capture_device.h.orig 2015-10-14 11:35:25.088073000 -0400
++++ media/capture/video/video_capture_device.h 2015-10-14 11:37:56.457208000 -0400
@@ -43,7 +43,7 @@
Name();
Name(const std::string& name, const std::string& id);
diff --git a/www/chromium/files/patch-media__capture__video__video_capture_device_factory.cc b/www/chromium/files/patch-media__capture__video__video_capture_device_factory.cc
index ee7e842ec044..6472953a7e4b 100644
--- a/www/chromium/files/patch-media__capture__video__video_capture_device_factory.cc
+++ b/www/chromium/files/patch-media__capture__video__video_capture_device_factory.cc
@@ -1,5 +1,5 @@
---- media/capture/video/video_capture_device_factory.cc.orig 2015-10-14 18:11:45.655658000 +0200
-+++ media/capture/video/video_capture_device_factory.cc 2015-10-14 18:13:09.785092000 +0200
+--- media/capture/video/video_capture_device_factory.cc.orig 2015-10-14 11:42:17.044891000 -0400
++++ media/capture/video/video_capture_device_factory.cc 2015-10-14 11:43:44.770286000 -0400
@@ -14,6 +14,10 @@
// static
scoped_ptr<VideoCaptureDeviceFactory> VideoCaptureDeviceFactory::CreateFactory(
@@ -15,7 +15,7 @@
return scoped_ptr<VideoCaptureDeviceFactory>(
CreateVideoCaptureDeviceFactory(ui_task_runner));
}
-+#endif
++#endif
}
VideoCaptureDeviceFactory::VideoCaptureDeviceFactory() {
diff --git a/www/chromium/files/patch-media__filters__vp9_parser.h b/www/chromium/files/patch-media__filters__vp9_parser.h
new file mode 100644
index 000000000000..306a52c08301
--- /dev/null
+++ b/www/chromium/files/patch-media__filters__vp9_parser.h
@@ -0,0 +1,10 @@
+--- media/filters/vp9_parser.h.orig 2015-11-13 12:04:18.000000000 +0100
++++ media/filters/vp9_parser.h 2015-12-06 01:55:30.382338000 +0100
+@@ -14,6 +14,7 @@
+
+ #include <stddef.h>
+ #include <stdint.h>
++#include <unistd.h>
+
+ #include <deque>
+
diff --git a/www/chromium/files/patch-media__media.gyp b/www/chromium/files/patch-media__media.gyp
index fb71bd684f17..e76abdee23ef 100644
--- a/www/chromium/files/patch-media__media.gyp
+++ b/www/chromium/files/patch-media__media.gyp
@@ -1,20 +1,20 @@
---- media/media.gyp.orig 2014-10-10 09:15:31 UTC
-+++ media/media.gyp
-@@ -760,6 +760,12 @@
+--- media/media.gyp.orig 2015-10-21 18:00:38.000000000 -0400
++++ media/media.gyp 2015-10-23 12:57:14.545450000 -0400
+@@ -780,13 +780,19 @@
['exclude', '_alsa\\.(h|cc)$'],
],
}],
+- ['OS=="openbsd"', {
+ ['OS=="freebsd"', {
+ 'sources!': [
-+ 'video/capture/linux/v4l2_capture_delegate.cc',
-+ 'video/capture/linux/video_capture_device_factory_linux.cc',
-+ ]
++ 'capture/video/linux/v4l2_capture_delegate.cc',
++ 'capture/video/linux/video_capture_device_factory_linux.cc',
++ ],
+ }],
- ['OS!="openbsd"', {
++ ['OS=="openbsd" or OS=="freebsd"', {
'sources!': [
- 'audio/openbsd/audio_manager_openbsd.cc',
-@@ -771,7 +777,7 @@
- 'video/capture/linux/v4l2_capture_delegate_multi_plane.h',
+ 'capture/video/linux/v4l2_capture_delegate_multi_plane.cc',
+ 'capture/video/linux/v4l2_capture_delegate_multi_plane.h',
],
}],
- ['OS=="linux"', {
@@ -22,8 +22,8 @@
'conditions': [
['use_x11==1', {
'dependencies': [
-@@ -1085,7 +1091,7 @@
- 'base/simd/convert_yuv_to_rgb_x86.cc',
+@@ -1122,7 +1128,7 @@
+ 'base/simd/filter_yuv_sse2.cc',
],
}],
- ['OS!="linux" and OS!="win"', {
diff --git a/www/chromium/files/patch-net__net.gypi b/www/chromium/files/patch-net__net.gypi
index 96ebb752c402..c9d0eea6628b 100644
--- a/www/chromium/files/patch-net__net.gypi
+++ b/www/chromium/files/patch-net__net.gypi
@@ -1,19 +1,19 @@
---- net/net.gypi.orig 2015-07-15 16:30:05.000000000 -0400
-+++ net/net.gypi 2015-07-22 07:53:36.298350000 -0400
-@@ -196,8 +196,8 @@
- 'android/network_change_notifier_factory_android.h',
- 'android/network_library.cc',
+--- net/net.gypi.orig 2015-10-21 18:00:38.000000000 -0400
++++ net/net.gypi 2015-10-23 12:58:44.791781000 -0400
+@@ -392,8 +392,8 @@
'android/network_library.h',
+ 'android/traffic_stats.cc',
+ 'android/traffic_stats.h',
- 'base/address_tracker_linux.cc',
- 'base/address_tracker_linux.h',
-+ #'base/address_tracker_linux.cc',
-+ #'base/address_tracker_linux.h',
++# 'base/address_tracker_linux.cc',
++# 'base/address_tracker_linux.h',
'base/backoff_entry.cc',
'base/backoff_entry.h',
'base/backoff_entry_serializer.cc',
-@@ -1278,7 +1278,7 @@
- 'android/keystore_unittest.cc',
+@@ -1245,7 +1245,7 @@
'android/network_change_notifier_android_unittest.cc',
+ 'android/traffic_stats_unittest.cc',
'base/address_list_unittest.cc',
- 'base/address_tracker_linux_unittest.cc',
+ #'base/address_tracker_linux_unittest.cc',
diff --git a/www/chromium/files/patch-net__proxy__proxy_service.cc b/www/chromium/files/patch-net__proxy__proxy_service.cc
index 0107af239f30..c8cfed800636 100644
--- a/www/chromium/files/patch-net__proxy__proxy_service.cc
+++ b/www/chromium/files/patch-net__proxy__proxy_service.cc
@@ -1,6 +1,6 @@
---- net/proxy/proxy_service.cc.orig 2014-10-10 09:15:31 UTC
-+++ net/proxy/proxy_service.cc
-@@ -40,7 +40,7 @@
+--- net/proxy/proxy_service.cc.orig 2015-10-21 18:00:38.000000000 -0400
++++ net/proxy/proxy_service.cc 2015-10-23 13:27:56.693933000 -0400
+@@ -43,7 +43,7 @@
#elif defined(OS_MACOSX)
#include "net/proxy/proxy_config_service_mac.h"
#include "net/proxy/proxy_resolver_mac.h"
@@ -9,12 +9,12 @@
#include "net/proxy/proxy_config_service_linux.h"
#elif defined(OS_ANDROID)
#include "net/proxy/proxy_config_service_android.h"
-@@ -1412,7 +1412,7 @@
+@@ -1507,7 +1507,7 @@
<< "profile_io_data.cc::CreateProxyConfigService and this should "
<< "be used only for examples.";
- return new UnsetProxyConfigService;
+ return make_scoped_ptr(new UnsetProxyConfigService);
-#elif defined(OS_LINUX)
+#elif defined(OS_LINUX) || defined(OS_FREEBSD)
- ProxyConfigServiceLinux* linux_config_service =
- new ProxyConfigServiceLinux();
+ scoped_ptr<ProxyConfigServiceLinux> linux_config_service(
+ new ProxyConfigServiceLinux());
diff --git a/www/chromium/files/patch-remoting__remoting_host.gypi b/www/chromium/files/patch-remoting__remoting_host.gypi
index ba65add232c4..b86aa5e4af49 100644
--- a/www/chromium/files/patch-remoting__remoting_host.gypi
+++ b/www/chromium/files/patch-remoting__remoting_host.gypi
@@ -1,5 +1,5 @@
---- remoting/remoting_host.gypi.orig 2015-04-19 16:56:09.000000000 +0200
-+++ remoting/remoting_host.gypi 2015-04-19 16:55:50.000000000 +0200
+--- remoting/remoting_host.gypi.orig 2015-10-14 03:01:21.000000000 -0400
++++ remoting/remoting_host.gypi 2015-10-23 13:56:18.229194000 -0400
@@ -18,7 +18,7 @@
'remoting_host_win.gypi',
],
@@ -9,7 +9,7 @@
'includes': [
'remoting_host_linux.gypi',
],
-@@ -56,7 +56,7 @@
+@@ -57,7 +57,7 @@
'<@(remoting_host_sources)',
],
'conditions': [
@@ -18,7 +18,16 @@
'conditions': [
['use_x11==1', {
'dependencies': [
-@@ -535,7 +535,7 @@
+@@ -331,7 +331,7 @@
+ 'host/setup/start_host.cc',
+ ],
+ 'conditions': [
+- ['OS=="linux" and use_allocator!="none"', {
++ ['(OS=="linux" or os_bsd==1) and use_allocator!="none"', {
+ 'dependencies': [
+ '../base/allocator/allocator.gyp:allocator',
+ ],
+@@ -549,7 +549,7 @@
}], # mac_breakpad==1
], # conditions
}], # OS=mac
@@ -27,7 +36,7 @@
'dependencies': [
'../base/allocator/allocator.gyp:allocator',
],
-@@ -657,13 +657,13 @@
+@@ -671,13 +671,13 @@
'host/it2me/it2me_native_messaging_host_main.h',
],
'conditions': [
@@ -35,7 +44,7 @@
+ ['(OS=="linux" or os_bsd==1) and chromeos==0 and use_ozone==0', {
'dependencies': [
# Always use GTK on Linux, even for Aura builds.
- '../build/linux/system.gyp:gtk',
+ '../build/linux/system.gyp:gtk2',
],
}],
- ['OS=="linux" and use_allocator!="none"', {
diff --git a/www/chromium/files/patch-skia__skia_chrome.gypi b/www/chromium/files/patch-skia__skia_chrome.gypi
index 22651eb2f119..0a546e31db0b 100644
--- a/www/chromium/files/patch-skia__skia_chrome.gypi
+++ b/www/chromium/files/patch-skia__skia_chrome.gypi
@@ -1,14 +1,14 @@
---- skia/skia_chrome.gypi.orig 2015-10-14 18:24:42.938769000 +0200
-+++ skia/skia_chrome.gypi 2015-10-14 18:22:24.515306000 +0200
-@@ -60,6 +60,11 @@
- 'ext/platform_canvas.cc',
- ],
- }],
+--- skia/skia_chrome.gypi.orig 2015-10-13 15:04:33.000000000 -0400
++++ skia/skia_chrome.gypi 2015-10-14 11:46:34.142959000 -0400
+@@ -55,6 +55,11 @@
+ 'ext/skia_utils_win.cc',
+ ],
+ 'conditions': [
+ [ 'use_cairo == 1', {
+ 'dependencies': [
+ '../build/linux/system.gyp:pangocairo',
+ ],
+ }],
- [ 'OS == "android" and '
- 'enable_basic_printing==0 and enable_print_preview==0', {
+ [ 'OS == "ios"', {
'sources!': [
+ 'ext/platform_canvas.cc',
diff --git a/www/chromium/files/patch-third_party__WebKit__Source__platform__fonts__FontPlatformData.cpp b/www/chromium/files/patch-third_party__WebKit__Source__platform__fonts__FontPlatformData.cpp
new file mode 100644
index 000000000000..5b54f394ffec
--- /dev/null
+++ b/www/chromium/files/patch-third_party__WebKit__Source__platform__fonts__FontPlatformData.cpp
@@ -0,0 +1,14 @@
+--- third_party/WebKit/Source/platform/fonts/FontPlatformData.cpp.orig 2015-10-14 15:15:21.746018000 -0400
++++ third_party/WebKit/Source/platform/fonts/FontPlatformData.cpp 2015-10-14 15:36:04.640922000 -0400
+@@ -358,7 +358,11 @@
+ {
+ RefPtr<SharedBuffer> buffer;
+
++#if defined(__FreeBSD__)
++ SkFontTableTag tag = bswap32(table);
++#else
+ SkFontTableTag tag = WTF::bswap32(table);
++#endif
+ const size_t tableSize = m_typeface->getTableSize(tag);
+ if (tableSize) {
+ Vector<char> tableBuffer(tableSize);
diff --git a/www/chromium/files/patch-third_party__ffmpeg__ffmpeg_generated.gypi b/www/chromium/files/patch-third_party__ffmpeg__ffmpeg_generated.gypi
index af8bcd0933cd..1ad5991e65b3 100644
--- a/www/chromium/files/patch-third_party__ffmpeg__ffmpeg_generated.gypi
+++ b/www/chromium/files/patch-third_party__ffmpeg__ffmpeg_generated.gypi
@@ -1,38 +1,80 @@
---- third_party/ffmpeg/ffmpeg_generated.gypi.orig 2015-09-04 18:08:57.318433000 -0400
-+++ third_party/ffmpeg/ffmpeg_generated.gypi 2015-09-08 12:00:45.690486000 -0400
-@@ -138,7 +138,7 @@
+--- third_party/ffmpeg/ffmpeg_generated.gypi.orig 2015-10-14 03:01:30.000000000 -0400
++++ third_party/ffmpeg/ffmpeg_generated.gypi 2015-10-23 17:43:05.578040000 -0400
+@@ -155,7 +155,7 @@
'libavcodec/x86/flacdsp.asm',
],
}], # (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromiumOS")
-- ['(OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or (OS == "mac" and ffmpeg_branding == "Chrome") or (OS == "win" and ffmpeg_branding == "Chrome")', {
-+ ['(OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or (OS == "mac" and ffmpeg_branding == "Chrome") or (OS == "win" and ffmpeg_branding == "Chrome") or (os_bsd==1 and ffmpeg_branding == "Chrome")', {
+- ['(OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome")', {
++ ['(OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (os_bsd==1 and ffmpeg_branding == "Chrome")', {
'c_sources': [
- 'libavcodec/x86/dct_init.c',
'libavcodec/x86/h264_qpel.c',
-@@ -301,7 +301,7 @@
+ 'libavcodec/x86/h264chroma_init.c',
+@@ -321,7 +321,7 @@
'libavutil/arm/autorename_libavutil_arm_float_dsp_neon.S',
],
- }], # (OS == "android" and target_arch == "arm") or (OS == "linux" and target_arch == "arm" and arm_neon == 1)
-- ['(OS == "linux" and target_arch == "ia32") or (OS == "linux" and target_arch == "x64") or (OS == "mac") or (OS == "win")', {
-+ ['(OS == "linux" and target_arch == "ia32") or (OS == "linux" and target_arch == "x64") or (OS == "mac") or (OS == "win") or (os_bsd==1)', {
+ }], # (OS == "android" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromiumOS")
+- ['(OS == "android" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome")', {
++ ['(OS == "android" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (os_bsd==1 and ffmpeg_branding=="Chrome")', {
+ 'c_sources': [
+ 'libavcodec/x86/aacpsdsp_init.c',
+ 'libavcodec/x86/dct_init.c',
+@@ -335,7 +335,7 @@
+ 'libavcodec/x86/sbrdsp.asm',
+ ],
+ }], # (OS == "android" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome")
+- ['(OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromiumOS") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chromium")', {
++ ['(OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromiumOS") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chromium") or (os_bsd==1 and ffmpeg_branding=="Chrome") or (os_bsd==1 and ffmpeg_branding=="Chromium")', {
'c_sources': [
'libavcodec/x86/autorename_libavcodec_x86_videodsp_init.c',
- 'libavcodec/x86/autorename_libavcodec_x86_vorbisdsp_init.c',
-@@ -376,7 +376,7 @@
- 'libavutil/arm/float_dsp_vfp.S',
+ 'libavcodec/x86/h264_intrapred_init.c',
+@@ -403,7 +403,7 @@
+ 'compat/strtod.c',
],
- }], # (OS == "android" and target_arch == "arm") or (OS == "linux" and target_arch == "arm" and arm_neon == 1) or (OS == "linux" and target_arch == "arm")
-- ['(OS == "linux" and ffmpeg_branding == "Chrome") or (OS == "linux" and ffmpeg_branding == "ChromeOS") or (OS == "mac" and ffmpeg_branding == "Chrome") or (OS == "win" and ffmpeg_branding == "Chrome")', {
-+ ['((OS == "linux" or os_bsd==1) and ffmpeg_branding == "Chrome") or (OS == "linux" and ffmpeg_branding == "ChromeOS") or (OS == "mac" and ffmpeg_branding == "Chrome") or (OS == "win" and ffmpeg_branding == "Chrome")', {
+ }], # (OS == "android" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm" and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "arm64" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm64" and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "mipsel" and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "x64" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chromium")
+- ['(OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome")', {
++ ['(OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (os_bsd==1 and ffmpeg_branding == "Chrome")', {
'c_sources': [
'libavcodec/cabac.c',
'libavcodec/h264.c',
-@@ -437,7 +437,7 @@
+@@ -425,7 +425,7 @@
+ 'libavcodec/startcode.c',
+ ],
+ }], # (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome")
+- ['(OS == "android" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "x64" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromiumOS") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chromium")', {
++ ['(OS == "android" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "x64" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromiumOS") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chromium") or (os_bsd==1 and ffmpeg_branding == "Chromium") or (os_bsd==1 and ffmpeg_branding == "Chrome")', {
+ 'c_sources': [
+ 'libavcodec/x86/autorename_libavcodec_x86_vorbisdsp_init.c',
+ 'libavcodec/x86/constants.c',
+@@ -442,7 +442,7 @@
+ 'libavutil/x86/lls.asm',
+ ],
+ }], # (OS == "android" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "x64" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromiumOS") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chromium")
+- ['(OS == "android" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm64" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome")', {
++ ['(OS == "android" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm64" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (os_bsd==1 and ffmpeg_branding == "Chrome")', {
+ 'c_sources': [
+ 'libavcodec/aac_ac3_parser.c',
+ 'libavcodec/aac_parser.c',
+@@ -477,12 +477,12 @@
+ 'libavformat/mp3dec.c',
+ ],
+ }], # (OS == "android" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm64" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome")
+- ['(OS == "android" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm64" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromiumOS") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome")', {
++ ['(OS == "android" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm64" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromiumOS") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (os_bsd==1 and ffmpeg_branding == "Chrome")', {
+ 'c_sources': [
'libavformat/rawdec.c',
],
- }], # (OS == "linux" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and ffmpeg_branding == "ChromiumOS") or (ffmpeg_branding == "Chrome")
-- ['(OS == "linux") or (OS == "mac") or (OS == "win")', {
-+ ['(OS == "linux") or (OS == "mac") or (OS == "win") or (os_bsd==1)', {
+ }], # (OS == "android" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm64" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromiumOS") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome")
+- ['(OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromiumOS") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chromium")', {
++ ['(OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromiumOS") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chromium") or (os_bsd==1 and ffmpeg_branding == "Chromium") or (os_bsd==1 and ffmpeg_branding == "Chrome")', {
'c_sources': [
'libavcodec/h264pred.c',
'libavcodec/hpeldsp.c',
+@@ -496,7 +496,7 @@
+ 'libavcodec/vp8dsp.c',
+ ],
+ }], # (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromiumOS") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chromium")
+- ['(OS == "android" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm" and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "arm64" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm64" and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "mipsel" and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "x64" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromiumOS") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chromium")', {
++ ['(OS == "android" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm" and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "arm64" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm64" and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "mipsel" and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "x64" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromiumOS") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chromium") or (os_bsd==1 and ffmpeg_branding == "Chromium") or (os_bsd==1 and ffmpeg_branding == "Chrome")', {
+ 'c_sources': [
+ 'libavcodec/allcodecs.c',
+ 'libavcodec/autorename_libavcodec_utils.c',
diff --git a/www/chromium/files/patch-third_party__pdfium__fpdfsdk__src__jsapi__fxjs_v8.cpp b/www/chromium/files/patch-third_party__pdfium__fpdfsdk__src__javascript__JS_Value.cpp
index 05b2590e815a..403572c5ea0b 100644
--- a/www/chromium/files/patch-third_party__pdfium__fpdfsdk__src__jsapi__fxjs_v8.cpp
+++ b/www/chromium/files/patch-third_party__pdfium__fpdfsdk__src__javascript__JS_Value.cpp
@@ -1,7 +1,7 @@
---- third_party/pdfium/fpdfsdk/src/jsapi/fxjs_v8.cpp.orig 2015-10-14 18:34:09.173122000 +0200
-+++ third_party/pdfium/fpdfsdk/src/jsapi/fxjs_v8.cpp 2015-10-14 18:36:12.927162000 +0200
-@@ -908,11 +908,12 @@
- // JavaScript time implement begin.
+--- third_party/pdfium/fpdfsdk/src/javascript/JS_Value.cpp.orig 2015-10-23 14:13:04.962770000 -0400
++++ third_party/pdfium/fpdfsdk/src/javascript/JS_Value.cpp 2015-10-23 14:14:08.152830000 -0400
+@@ -586,11 +586,12 @@
+ }
double _getLocalTZA() {
+ struct tm *lt;
@@ -14,7 +14,7 @@
#if _MSC_VER >= 1900
// In gcc and in Visual Studio prior to VS 2015 'timezone' is a global
// variable declared in time.h. That variable was deprecated and in VS 2015
-@@ -920,7 +921,11 @@
+@@ -598,7 +599,11 @@
long timezone = 0;
_get_timezone(&timezone);
#endif
diff --git a/www/chromium/files/patch-third_party__pdfium__fpdfsdk__src__javascript__PublicMethods.cpp b/www/chromium/files/patch-third_party__pdfium__fpdfsdk__src__javascript__PublicMethods.cpp
index 6b7f2a91fbc3..0ba21de9338c 100644
--- a/www/chromium/files/patch-third_party__pdfium__fpdfsdk__src__javascript__PublicMethods.cpp
+++ b/www/chromium/files/patch-third_party__pdfium__fpdfsdk__src__javascript__PublicMethods.cpp
@@ -1,5 +1,5 @@
---- third_party/pdfium/fpdfsdk/src/javascript/PublicMethods.cpp.orig 2015-10-14 18:30:46.180316000 +0200
-+++ third_party/pdfium/fpdfsdk/src/javascript/PublicMethods.cpp 2015-10-14 18:31:44.759135000 +0200
+--- third_party/pdfium/fpdfsdk/src/javascript/PublicMethods.cpp.orig 2015-10-13 15:04:43.000000000 -0400
++++ third_party/pdfium/fpdfsdk/src/javascript/PublicMethods.cpp 2015-10-14 11:50:05.723446000 -0400
@@ -910,7 +910,7 @@
const CJS_Parameters& params,
CJS_Value& vRet,
diff --git a/www/chromium/files/patch-third_party__sfntly__sfntly.gyp b/www/chromium/files/patch-third_party__sfntly__sfntly.gyp
index efd24c266537..c8dbb90333f7 100644
--- a/www/chromium/files/patch-third_party__sfntly__sfntly.gyp
+++ b/www/chromium/files/patch-third_party__sfntly__sfntly.gyp
@@ -1,11 +1,11 @@
---- third_party/sfntly/sfntly.gyp.orig 2014-10-10 08:54:18 UTC
-+++ third_party/sfntly/sfntly.gyp
+--- third_party/sfntly/sfntly.gyp.orig 2015-10-14 03:01:24.000000000 -0400
++++ third_party/sfntly/sfntly.gyp 2015-10-23 14:16:34.022090000 -0400
@@ -126,7 +126,7 @@
- 'cpp/src/sample/chromium/subsetter_impl.h',
+ 'src/cpp/src/sample/chromium/subsetter_impl.h',
],
'include_dirs': [
-- 'cpp/src', '../..',
-+ 'cpp/src', '../..', '<(prefix_dir)/include',
+- 'src/cpp/src',
++ 'src/cpp/src', '<(prefix_dir)/include',
],
# This macro must be define to suppress the use of exception
'defines': [
diff --git a/www/chromium/files/patch-third_party__webrtc__base__systeminfo.cc b/www/chromium/files/patch-third_party__webrtc__base__systeminfo.cc
index 4858955e8f4d..42e8f4d17a00 100644
--- a/www/chromium/files/patch-third_party__webrtc__base__systeminfo.cc
+++ b/www/chromium/files/patch-third_party__webrtc__base__systeminfo.cc
@@ -1,5 +1,5 @@
---- third_party/webrtc/base/systeminfo.cc.orig 2015-10-14 18:48:28.088649000 +0200
-+++ third_party/webrtc/base/systeminfo.cc 2015-10-14 18:57:35.819790000 +0200
+--- third_party/webrtc/base/systeminfo.cc.orig 2015-10-13 15:04:44.000000000 -0400
++++ third_party/webrtc/base/systeminfo.cc 2015-10-14 12:09:17.133190000 -0400
@@ -20,8 +20,12 @@
#elif defined(WEBRTC_MAC) && !defined(WEBRTC_IOS)
#include <ApplicationServices/ApplicationServices.h>
@@ -14,27 +14,17 @@
#endif
#if defined(WEBRTC_MAC)
#include <sys/sysctl.h>
-@@ -66,7 +70,7 @@
- SYSTEM_INFO si;
- GetSystemInfo(&si);
+@@ -68,8 +72,12 @@
number_of_cores = static_cast<int>(si.dwNumberOfProcessors);
--#elif defined(WEBRTC_LINUX) || defined(WEBRTC_ANDROID)
-+#elif defined(WEBRTC_LINUX) || defined(WEBRTC_ANDROID) || defined(WEBRTC_BSD)
+ #elif defined(WEBRTC_LINUX) || defined(WEBRTC_ANDROID)
number_of_cores = static_cast<int>(sysconf(_SC_NPROCESSORS_ONLN));
- #elif defined(WEBRTC_MAC)
- int name[] = {CTL_HW, HW_AVAILCPU};
-@@ -174,9 +178,13 @@
- LOG_GLE(LS_WARNING) << "GlobalMemoryStatusEx failed.";
- }
-
-#elif defined(WEBRTC_MAC)
+#elif defined(WEBRTC_MAC) || defined(WEBRTC_BSD)
- size_t len = sizeof(memory);
-+ #if defined(WEBRTC_MAC)
- int error = sysctlbyname("hw.memsize", &memory, &len, NULL, 0);
-+ #else
-+ int error = sysctlbyname("hw.physmem", &memory, &len, NULL, 0);
-+ #endif
- if (error || memory == 0)
- memory = -1;
- #else // WEBRTC_LINUX
++#if defined(WEBRTC_BSD)
++ int name[] = {CTL_HW, HW_NCPU};
++#else
+ int name[] = {CTL_HW, HW_AVAILCPU};
++#endif
+ size_t size = sizeof(number_of_cores);
+ if (0 != sysctl(name, 2, &number_of_cores, &size, NULL, 0)) {
+ LOG(LS_ERROR) << "Failed to get number of cores";
diff --git a/www/chromium/files/patch-ui__events__keycodes__dom__keycode_converter.cc b/www/chromium/files/patch-ui__events__keycodes__dom__keycode_converter.cc
index 2ba369e8e957..1f5a9e297cf9 100644
--- a/www/chromium/files/patch-ui__events__keycodes__dom__keycode_converter.cc
+++ b/www/chromium/files/patch-ui__events__keycodes__dom__keycode_converter.cc
@@ -1,11 +1,11 @@
---- ui/events/keycodes/dom/keycode_converter.cc.orig 2015-07-22 18:31:47.703757000 -0400
-+++ ui/events/keycodes/dom/keycode_converter.cc 2015-07-22 18:32:17.605463000 -0400
-@@ -16,7 +16,7 @@
+--- ui/events/keycodes/dom/keycode_converter.cc.orig 2015-10-14 03:01:24.000000000 -0400
++++ ui/events/keycodes/dom/keycode_converter.cc 2015-10-23 14:17:55.716373000 -0400
+@@ -17,7 +17,7 @@
// and DOM Level 3 |code| strings.
#if defined(OS_WIN)
- #define USB_KEYMAP(usb, xkb, win, mac, code, id) {usb, win, code}
+ #define USB_KEYMAP(usb, evdev, xkb, win, mac, code, id) {usb, win, code}
-#elif defined(OS_LINUX)
+#elif defined(OS_LINUX) || defined(OS_BSD)
- #define USB_KEYMAP(usb, xkb, win, mac, code, id) {usb, xkb, code}
+ #define USB_KEYMAP(usb, evdev, xkb, win, mac, code, id) {usb, xkb, code}
#elif defined(OS_MACOSX)
- #define USB_KEYMAP(usb, xkb, win, mac, code, id) {usb, mac, code}
+ #define USB_KEYMAP(usb, evdev, xkb, win, mac, code, id) {usb, mac, code}
diff --git a/www/chromium/files/patch-ui__gl__gl_surface_glx.cc b/www/chromium/files/patch-ui__gl__gl_surface_glx.cc
index 56f22755b419..cbc83edf4697 100644
--- a/www/chromium/files/patch-ui__gl__gl_surface_glx.cc
+++ b/www/chromium/files/patch-ui__gl__gl_surface_glx.cc
@@ -1,5 +1,5 @@
---- ui/gl/gl_surface_glx.cc.orig 2015-10-14 19:05:53.638848000 +0200
-+++ ui/gl/gl_surface_glx.cc 2015-10-14 19:06:56.014680000 +0200
+--- ui/gl/gl_surface_glx.cc.orig 2015-10-06 22:42:29.000000000 -0400
++++ ui/gl/gl_surface_glx.cc 2015-10-14 12:11:35.193730000 -0400
@@ -48,7 +48,7 @@
bool g_glx_sgi_video_sync_supported = false;
diff --git a/www/chromium/files/patch-ui__gl__sync_control_vsync_provider.cc b/www/chromium/files/patch-ui__gl__sync_control_vsync_provider.cc
index 3bcbb62628d0..7e08c78e1955 100644
--- a/www/chromium/files/patch-ui__gl__sync_control_vsync_provider.cc
+++ b/www/chromium/files/patch-ui__gl__sync_control_vsync_provider.cc
@@ -1,5 +1,5 @@
---- ui/gl/sync_control_vsync_provider.cc.orig 2015-10-14 19:12:40.408387000 +0200
-+++ ui/gl/sync_control_vsync_provider.cc 2015-10-14 19:13:44.335913000 +0200
+--- ui/gl/sync_control_vsync_provider.cc.orig 2015-10-06 22:42:29.000000000 -0400
++++ ui/gl/sync_control_vsync_provider.cc 2015-10-14 12:13:21.879502000 -0400
@@ -10,7 +10,7 @@
#include "base/time/time.h"
#include "base/trace_event/trace_event.h"
diff --git a/www/chromium/files/patch-ui__resources__ui_resources.grd b/www/chromium/files/patch-ui__resources__ui_resources.grd
index 0969426fee69..640ac959349f 100644
--- a/www/chromium/files/patch-ui__resources__ui_resources.grd
+++ b/www/chromium/files/patch-ui__resources__ui_resources.grd
@@ -1,5 +1,5 @@
---- ui/resources/ui_resources.grd.orig 2015-10-14 19:18:12.855975000 +0200
-+++ ui/resources/ui_resources.grd 2015-10-14 19:18:28.057725000 +0200
+--- ui/resources/ui_resources.grd.orig 2015-10-13 15:04:35.000000000 -0400
++++ ui/resources/ui_resources.grd 2015-10-14 12:14:47.062536000 -0400
@@ -15,7 +15,7 @@
<!-- KEEP THESE IN ALPHABETICAL ORDER! DO NOT ADD TO RANDOM PLACES JUST
BECAUSE YOUR RESOURCES ARE FUNCTIONALLY RELATED OR FALL UNDER THE
diff --git a/www/chromium/files/patch-ui__views__bubble__bubble_delegate.cc b/www/chromium/files/patch-ui__views__bubble__bubble_delegate.cc
index 57439c97ff21..dd0add1d0634 100644
--- a/www/chromium/files/patch-ui__views__bubble__bubble_delegate.cc
+++ b/www/chromium/files/patch-ui__views__bubble__bubble_delegate.cc
@@ -1,5 +1,5 @@
---- ui/views/bubble/bubble_delegate.cc.orig 2015-10-14 19:28:13.258489000 +0200
-+++ ui/views/bubble/bubble_delegate.cc 2015-10-14 19:28:52.612078000 +0200
+--- ui/views/bubble/bubble_delegate.cc.orig 2015-10-13 15:04:35.000000000 -0400
++++ ui/views/bubble/bubble_delegate.cc 2015-10-14 12:16:57.059468000 -0400
@@ -106,7 +106,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.
diff --git a/www/chromium/files/patch-ui__views__controls__button__label_button.cc b/www/chromium/files/patch-ui__views__controls__button__label_button.cc
index 051eaac7a6c4..2791a7416aed 100644
--- a/www/chromium/files/patch-ui__views__controls__button__label_button.cc
+++ b/www/chromium/files/patch-ui__views__controls__button__label_button.cc
@@ -1,5 +1,5 @@
---- ui/views/controls/button/label_button.cc.orig 2015-10-14 19:31:24.349106000 +0200
-+++ ui/views/controls/button/label_button.cc 2015-10-14 19:35:30.925886000 +0200
+--- ui/views/controls/button/label_button.cc.orig 2015-10-06 22:42:29.000000000 -0400
++++ ui/views/controls/button/label_button.cc 2015-10-14 12:19:09.857087000 -0400
@@ -23,7 +23,7 @@
// The default spacing between the icon and text.
const int kSpacing = 5;
diff --git a/www/chromium/pkg-plist b/www/chromium/pkg-plist
index 47858c916d2f..5e231ce7f4ed 100644
--- a/www/chromium/pkg-plist
+++ b/www/chromium/pkg-plist
@@ -114,14 +114,12 @@ share/applications/chromium-browser.desktop
%%DATADIR%%/resources/inspector/Images/responsiveDesign_2x.png
%%DATADIR%%/resources/inspector/Images/searchNext.png
%%DATADIR%%/resources/inspector/Images/searchPrev.png
-%%DATADIR%%/resources/inspector/Images/securityStateInsecure.png
-%%DATADIR%%/resources/inspector/Images/securityStateInsecure_2x.png
-%%DATADIR%%/resources/inspector/Images/securityStateNeutral.png
-%%DATADIR%%/resources/inspector/Images/securityStateNeutral_2x.png
-%%DATADIR%%/resources/inspector/Images/securityStateSecure.png
-%%DATADIR%%/resources/inspector/Images/securityStateSecure_2x.png
-%%DATADIR%%/resources/inspector/Images/securityStateWarning.png
-%%DATADIR%%/resources/inspector/Images/securityStateWarning_2x.png
+%%DATADIR%%/resources/inspector/Images/securityPropertyInsecure.svg
+%%DATADIR%%/resources/inspector/Images/securityPropertySecure.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
@@ -149,6 +147,7 @@ share/applications/chromium-browser.desktop
%%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/elements_module.js