svn commit: r403188 - in branches/2015Q4/www/chromium: . files
Rene Ladan
rene at FreeBSD.org
Mon Dec 7 08:43:25 UTC 2015
Author: rene
Date: Mon Dec 7 08:43:20 2015
New Revision: 403188
URL: https://svnweb.freebsd.org/changeset/ports/403188
Log:
MFH: r403185
www/chromium: update to 47.0.2526.73
Currently broken on 9.
Submitted by: LeFroid (tmvfroid gmail)
Obtained from: https://github.com/gliaskos/freebsd-chromium/pull/41
Security: http://vuxml.freebsd.org/freebsd/548f74bd-993c-11e5-956b-00262d5ed8ee.html
Approved by: portmgr (erwin)
Added:
branches/2015Q4/www/chromium/files/patch-chrome__app__theme__theme_resources.grd
- copied unchanged from r403185, head/www/chromium/files/patch-chrome__app__theme__theme_resources.grd
branches/2015Q4/www/chromium/files/patch-chrome__browser__browser_resources.grd
- copied unchanged from r403185, head/www/chromium/files/patch-chrome__browser__browser_resources.grd
branches/2015Q4/www/chromium/files/patch-chrome__chrome_common.gypi
- copied unchanged from r403185, head/www/chromium/files/patch-chrome__chrome_common.gypi
branches/2015Q4/www/chromium/files/patch-chrome__common__variations__fieldtrial_testing_config.gyp
- copied unchanged from r403185, head/www/chromium/files/patch-chrome__common__variations__fieldtrial_testing_config.gyp
branches/2015Q4/www/chromium/files/patch-components__metrics__system_memory_stats_recorder_linux.cc
- copied unchanged from r403185, head/www/chromium/files/patch-components__metrics__system_memory_stats_recorder_linux.cc
branches/2015Q4/www/chromium/files/patch-media__capture__video__linux__video_capture_device_linux.h
- copied unchanged from r403185, head/www/chromium/files/patch-media__capture__video__linux__video_capture_device_linux.h
branches/2015Q4/www/chromium/files/patch-media__filters__vp9_parser.h
- copied unchanged from r403185, head/www/chromium/files/patch-media__filters__vp9_parser.h
branches/2015Q4/www/chromium/files/patch-third_party__WebKit__Source__platform__fonts__FontPlatformData.cpp
- copied unchanged from r403185, head/www/chromium/files/patch-third_party__WebKit__Source__platform__fonts__FontPlatformData.cpp
branches/2015Q4/www/chromium/files/patch-third_party__pdfium__fpdfsdk__src__javascript__JS_Value.cpp
- copied unchanged from r403185, head/www/chromium/files/patch-third_party__pdfium__fpdfsdk__src__javascript__JS_Value.cpp
Deleted:
branches/2015Q4/www/chromium/files/patch-chrome__browser__memory__system_memory_stats_recorder_linux.cc
branches/2015Q4/www/chromium/files/patch-chrome__browser__ssl__ssl_blocking_page.cc
branches/2015Q4/www/chromium/files/patch-chrome__browser__ui__browser.cc
branches/2015Q4/www/chromium/files/patch-chrome__browser__ui__views__message_center__message_center_widget_delegate.cc
branches/2015Q4/www/chromium/files/patch-chrome__browser__ui__views__message_center__web_notification_tray.cc
branches/2015Q4/www/chromium/files/patch-chrome__commin__variations__fieldtrial_testing_config.gyp
branches/2015Q4/www/chromium/files/patch-chrome__common__component_flash_hint_file_linux.h
branches/2015Q4/www/chromium/files/patch-content__browser__bluetooth__bluetooth_dispatcher_host.cc
branches/2015Q4/www/chromium/files/patch-content__browser__bluetooth__bluetooth_dispatcher_host.h
branches/2015Q4/www/chromium/files/patch-content__browser__renderer_host__renderer_process_host_impl.cc
branches/2015Q4/www/chromium/files/patch-gpu__command_buffer__service__async_pixel_transfer_manager_share_group.cc
branches/2015Q4/www/chromium/files/patch-media__audio__audio_input_volume_unittest.cc
branches/2015Q4/www/chromium/files/patch-third_party__pdfium__fpdfsdk__src__jsapi__fxjs_v8.cpp
Modified:
branches/2015Q4/www/chromium/Makefile
branches/2015Q4/www/chromium/distinfo
branches/2015Q4/www/chromium/files/extra-patch-clang
branches/2015Q4/www/chromium/files/extra-patch-gcc
branches/2015Q4/www/chromium/files/patch-base__process__memory_unittest.cc
branches/2015Q4/www/chromium/files/patch-base__process__process_info_linux.cc
branches/2015Q4/www/chromium/files/patch-base__process__process_posix.cc
branches/2015Q4/www/chromium/files/patch-chrome__app__chrome_main_delegate.cc
branches/2015Q4/www/chromium/files/patch-chrome__browser__chrome_browser_main.cc
branches/2015Q4/www/chromium/files/patch-chrome__browser__net__cookie_store_util.cc
branches/2015Q4/www/chromium/files/patch-chrome__browser__ui__webui__chrome_web_ui_controller_factory.cc
branches/2015Q4/www/chromium/files/patch-chrome__chrome_browser.gypi
branches/2015Q4/www/chromium/files/patch-chrome__chrome_browser_ui.gypi
branches/2015Q4/www/chromium/files/patch-chrome__common__chrome_paths.h
branches/2015Q4/www/chromium/files/patch-components__metrics__drive_metrics_provider_linux.cc
branches/2015Q4/www/chromium/files/patch-content__renderer__renderer_blink_platform_impl.cc
branches/2015Q4/www/chromium/files/patch-device__serial__serial_io_handler_posix.cc
branches/2015Q4/www/chromium/files/patch-device__usb__usb_service_impl.cc
branches/2015Q4/www/chromium/files/patch-media__capture__video__fake_video_capture_device_factory.cc
branches/2015Q4/www/chromium/files/patch-media__capture__video__file_video_capture_device_factory.cc
branches/2015Q4/www/chromium/files/patch-media__capture__video__linux__video_capture_device_linux.cc
branches/2015Q4/www/chromium/files/patch-media__capture__video__video_capture_device.cc
branches/2015Q4/www/chromium/files/patch-media__capture__video__video_capture_device.h
branches/2015Q4/www/chromium/files/patch-media__capture__video__video_capture_device_factory.cc
branches/2015Q4/www/chromium/files/patch-media__media.gyp
branches/2015Q4/www/chromium/files/patch-net__net.gypi
branches/2015Q4/www/chromium/files/patch-net__proxy__proxy_service.cc
branches/2015Q4/www/chromium/files/patch-remoting__remoting_host.gypi
branches/2015Q4/www/chromium/files/patch-skia__skia_chrome.gypi
branches/2015Q4/www/chromium/files/patch-third_party__ffmpeg__ffmpeg_generated.gypi
branches/2015Q4/www/chromium/files/patch-third_party__pdfium__fpdfsdk__src__javascript__PublicMethods.cpp
branches/2015Q4/www/chromium/files/patch-third_party__sfntly__sfntly.gyp
branches/2015Q4/www/chromium/files/patch-third_party__webrtc__base__systeminfo.cc
branches/2015Q4/www/chromium/files/patch-ui__events__keycodes__dom__keycode_converter.cc
branches/2015Q4/www/chromium/files/patch-ui__gl__gl_surface_glx.cc
branches/2015Q4/www/chromium/files/patch-ui__gl__sync_control_vsync_provider.cc
branches/2015Q4/www/chromium/files/patch-ui__resources__ui_resources.grd
branches/2015Q4/www/chromium/files/patch-ui__views__bubble__bubble_delegate.cc
branches/2015Q4/www/chromium/files/patch-ui__views__controls__button__label_button.cc
branches/2015Q4/www/chromium/pkg-plist
Directory Properties:
branches/2015Q4/ (props changed)
Modified: branches/2015Q4/www/chromium/Makefile
==============================================================================
--- branches/2015Q4/www/chromium/Makefile Mon Dec 7 08:22:47 2015 (r403187)
+++ branches/2015Q4/www/chromium/Makefile Mon Dec 7 08:43:20 2015 (r403188)
@@ -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:${
${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} \
Modified: branches/2015Q4/www/chromium/distinfo
==============================================================================
--- branches/2015Q4/www/chromium/distinfo Mon Dec 7 08:22:47 2015 (r403187)
+++ branches/2015Q4/www/chromium/distinfo Mon Dec 7 08:43:20 2015 (r403188)
@@ -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
Modified: branches/2015Q4/www/chromium/files/extra-patch-clang
==============================================================================
--- branches/2015Q4/www/chromium/files/extra-patch-clang Mon Dec 7 08:22:47 2015 (r403187)
+++ branches/2015Q4/www/chromium/files/extra-patch-clang Mon Dec 7 08:43:20 2015 (r403188)
@@ -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);
Modified: branches/2015Q4/www/chromium/files/extra-patch-gcc
==============================================================================
--- branches/2015Q4/www/chromium/files/extra-patch-gcc Mon Dec 7 08:22:47 2015 (r403187)
+++ branches/2015Q4/www/chromium/files/extra-patch-gcc Mon Dec 7 08:43:20 2015 (r403188)
@@ -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>
Modified: branches/2015Q4/www/chromium/files/patch-base__process__memory_unittest.cc
==============================================================================
--- branches/2015Q4/www/chromium/files/patch-base__process__memory_unittest.cc Mon Dec 7 08:22:47 2015 (r403187)
+++ branches/2015Q4/www/chromium/files/patch-base__process__memory_unittest.cc Mon Dec 7 08:43:20 2015 (r403188)
@@ -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)
Modified: branches/2015Q4/www/chromium/files/patch-base__process__process_info_linux.cc
==============================================================================
--- branches/2015Q4/www/chromium/files/patch-base__process__process_info_linux.cc Mon Dec 7 08:22:47 2015 (r403187)
+++ branches/2015Q4/www/chromium/files/patch-base__process__process_info_linux.cc Mon Dec 7 08:43:20 2015 (r403188)
@@ -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"
Modified: branches/2015Q4/www/chromium/files/patch-base__process__process_posix.cc
==============================================================================
--- branches/2015Q4/www/chromium/files/patch-base__process__process_posix.cc Mon Dec 7 08:22:47 2015 (r403187)
+++ branches/2015Q4/www/chromium/files/patch-base__process__process_posix.cc Mon Dec 7 08:43:20 2015 (r403188)
@@ -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)
Modified: branches/2015Q4/www/chromium/files/patch-chrome__app__chrome_main_delegate.cc
==============================================================================
--- branches/2015Q4/www/chromium/files/patch-chrome__app__chrome_main_delegate.cc Mon Dec 7 08:22:47 2015 (r403187)
+++ branches/2015Q4/www/chromium/files/patch-chrome__app__chrome_main_delegate.cc Mon Dec 7 08:43:20 2015 (r403188)
@@ -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;
}
Copied: branches/2015Q4/www/chromium/files/patch-chrome__app__theme__theme_resources.grd (from r403185, head/www/chromium/files/patch-chrome__app__theme__theme_resources.grd)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/2015Q4/www/chromium/files/patch-chrome__app__theme__theme_resources.grd Mon Dec 7 08:43:20 2015 (r403188, copy of r403185, head/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" />
Copied: branches/2015Q4/www/chromium/files/patch-chrome__browser__browser_resources.grd (from r403185, head/www/chromium/files/patch-chrome__browser__browser_resources.grd)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/2015Q4/www/chromium/files/patch-chrome__browser__browser_resources.grd Mon Dec 7 08:43:20 2015 (r403188, copy of r403185, head/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">
Modified: branches/2015Q4/www/chromium/files/patch-chrome__browser__chrome_browser_main.cc
==============================================================================
--- branches/2015Q4/www/chromium/files/patch-chrome__browser__chrome_browser_main.cc Mon Dec 7 08:22:47 2015 (r403187)
+++ branches/2015Q4/www/chromium/files/patch-chrome__browser__chrome_browser_main.cc Mon Dec 7 08:43:20 2015 (r403188)
@@ -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)
Modified: branches/2015Q4/www/chromium/files/patch-chrome__browser__net__cookie_store_util.cc
==============================================================================
--- branches/2015Q4/www/chromium/files/patch-chrome__browser__net__cookie_store_util.cc Mon Dec 7 08:22:47 2015 (r403187)
+++ branches/2015Q4/www/chromium/files/patch-chrome__browser__net__cookie_store_util.cc Mon Dec 7 08:43:20 2015 (r403188)
@@ -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
Modified: branches/2015Q4/www/chromium/files/patch-chrome__browser__ui__webui__chrome_web_ui_controller_factory.cc
==============================================================================
--- branches/2015Q4/www/chromium/files/patch-chrome__browser__ui__webui__chrome_web_ui_controller_factory.cc Mon Dec 7 08:22:47 2015 (r403187)
+++ branches/2015Q4/www/chromium/files/patch-chrome__browser__ui__webui__chrome_web_ui_controller_factory.cc Mon Dec 7 08:43:20 2015 (r403188)
@@ -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
Modified: branches/2015Q4/www/chromium/files/patch-chrome__chrome_browser.gypi
==============================================================================
--- branches/2015Q4/www/chromium/files/patch-chrome__chrome_browser.gypi Mon Dec 7 08:22:47 2015 (r403187)
+++ branches/2015Q4/www/chromium/files/patch-chrome__chrome_browser.gypi Mon Dec 7 08:43:20 2015 (r403188)
@@ -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': [
Modified: branches/2015Q4/www/chromium/files/patch-chrome__chrome_browser_ui.gypi
==============================================================================
--- branches/2015Q4/www/chromium/files/patch-chrome__chrome_browser_ui.gypi Mon Dec 7 08:22:47 2015 (r403187)
+++ branches/2015Q4/www/chromium/files/patch-chrome__chrome_browser_ui.gypi Mon Dec 7 08:43:20 2015 (r403188)
@@ -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 @@
}],
],
Copied: branches/2015Q4/www/chromium/files/patch-chrome__chrome_common.gypi (from r403185, head/www/chromium/files/patch-chrome__chrome_common.gypi)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/2015Q4/www/chromium/files/patch-chrome__chrome_common.gypi Mon Dec 7 08:43:20 2015 (r403188, copy of r403185, head/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',
Modified: branches/2015Q4/www/chromium/files/patch-chrome__common__chrome_paths.h
==============================================================================
--- branches/2015Q4/www/chromium/files/patch-chrome__common__chrome_paths.h Mon Dec 7 08:22:47 2015 (r403187)
+++ branches/2015Q4/www/chromium/files/patch-chrome__common__chrome_paths.h Mon Dec 7 08:43:20 2015 (r403188)
@@ -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
- };
Copied: branches/2015Q4/www/chromium/files/patch-chrome__common__variations__fieldtrial_testing_config.gyp (from r403185, head/www/chromium/files/patch-chrome__common__variations__fieldtrial_testing_config.gyp)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/2015Q4/www/chromium/files/patch-chrome__common__variations__fieldtrial_testing_config.gyp Mon Dec 7 08:43:20 2015 (r403188, copy of r403185, head/www/chromium/files/patch-chrome__common__variations__fieldtrial_testing_config.gyp)
@@ -0,0 +1,11 @@
+--- 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" 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$']]}],
Modified: branches/2015Q4/www/chromium/files/patch-components__metrics__drive_metrics_provider_linux.cc
==============================================================================
--- branches/2015Q4/www/chromium/files/patch-components__metrics__drive_metrics_provider_linux.cc Mon Dec 7 08:22:47 2015 (r403187)
+++ branches/2015Q4/www/chromium/files/patch-components__metrics__drive_metrics_provider_linux.cc Mon Dec 7 08:43:20 2015 (r403188)
@@ -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"
Copied: branches/2015Q4/www/chromium/files/patch-components__metrics__system_memory_stats_recorder_linux.cc (from r403185, head/www/chromium/files/patch-components__metrics__system_memory_stats_recorder_linux.cc)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/2015Q4/www/chromium/files/patch-components__metrics__system_memory_stats_recorder_linux.cc Mon Dec 7 08:43:20 2015 (r403188, copy of r403185, head/www/chromium/files/patch-components__metrics__system_memory_stats_recorder_linux.cc)
@@ -0,0 +1,18 @@
+--- 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)
+
+ void RecordMemoryStats(RecordMemoryStatsType type) {
++#if !defined(OS_FREEBSD)
+ base::SystemMemoryInfoKB memory;
+ if (!base::GetSystemMemoryInfo(&memory))
+ return;
+@@ -92,6 +93,7 @@
+ break;
+ }
+ }
++#endif // !defined(OS_FREEBSD)
+ }
+
+ } // namespace memory
Modified: branches/2015Q4/www/chromium/files/patch-content__renderer__renderer_blink_platform_impl.cc
==============================================================================
--- branches/2015Q4/www/chromium/files/patch-content__renderer__renderer_blink_platform_impl.cc Mon Dec 7 08:22:47 2015 (r403187)
+++ branches/2015Q4/www/chromium/files/patch-content__renderer__renderer_blink_platform_impl.cc Mon Dec 7 08:43:20 2015 (r403188)
@@ -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);
}
Modified: branches/2015Q4/www/chromium/files/patch-device__serial__serial_io_handler_posix.cc
==============================================================================
--- branches/2015Q4/www/chromium/files/patch-device__serial__serial_io_handler_posix.cc Mon Dec 7 08:22:47 2015 (r403187)
+++ branches/2015Q4/www/chromium/files/patch-device__serial__serial_io_handler_posix.cc Mon Dec 7 08:43:20 2015 (r403188)
@@ -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)
Modified: branches/2015Q4/www/chromium/files/patch-device__usb__usb_service_impl.cc
==============================================================================
--- branches/2015Q4/www/chromium/files/patch-device__usb__usb_service_impl.cc Mon Dec 7 08:22:47 2015 (r403187)
+++ branches/2015Q4/www/chromium/files/patch-device__usb__usb_service_impl.cc Mon Dec 7 08:43:20 2015 (r403188)
@@ -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());
Modified: branches/2015Q4/www/chromium/files/patch-media__capture__video__fake_video_capture_device_factory.cc
==============================================================================
--- branches/2015Q4/www/chromium/files/patch-media__capture__video__fake_video_capture_device_factory.cc Mon Dec 7 08:22:47 2015 (r403187)
+++ branches/2015Q4/www/chromium/files/patch-media__capture__video__fake_video_capture_device_factory.cc Mon Dec 7 08:43:20 2015 (r403188)
@@ -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),
Modified: branches/2015Q4/www/chromium/files/patch-media__capture__video__file_video_capture_device_factory.cc
==============================================================================
--- branches/2015Q4/www/chromium/files/patch-media__capture__video__file_video_capture_device_factory.cc Mon Dec 7 08:22:47 2015 (r403187)
+++ branches/2015Q4/www/chromium/files/patch-media__capture__video__file_video_capture_device_factory.cc Mon Dec 7 08:43:20 2015 (r403188)
@@ -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,
Modified: branches/2015Q4/www/chromium/files/patch-media__capture__video__linux__video_capture_device_linux.cc
==============================================================================
--- branches/2015Q4/www/chromium/files/patch-media__capture__video__linux__video_capture_device_linux.cc Mon Dec 7 08:22:47 2015 (r403187)
+++ branches/2015Q4/www/chromium/files/patch-media__capture__video__linux__video_capture_device_linux.cc Mon Dec 7 08:43:20 2015 (r403188)
@@ -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) {
Copied: branches/2015Q4/www/chromium/files/patch-media__capture__video__linux__video_capture_device_linux.h (from r403185, head/www/chromium/files/patch-media__capture__video__linux__video_capture_device_linux.h)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/2015Q4/www/chromium/files/patch-media__capture__video__linux__video_capture_device_linux.h Mon Dec 7 08:43:20 2015 (r403188, copy of r403185, head/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);
Modified: branches/2015Q4/www/chromium/files/patch-media__capture__video__video_capture_device.cc
==============================================================================
--- branches/2015Q4/www/chromium/files/patch-media__capture__video__video_capture_device.cc Mon Dec 7 08:22:47 2015 (r403187)
+++ branches/2015Q4/www/chromium/files/patch-media__capture__video__video_capture_device.cc Mon Dec 7 08:43:20 2015 (r403188)
@@ -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() {
}
Modified: branches/2015Q4/www/chromium/files/patch-media__capture__video__video_capture_device.h
==============================================================================
--- branches/2015Q4/www/chromium/files/patch-media__capture__video__video_capture_device.h Mon Dec 7 08:22:47 2015 (r403187)
+++ branches/2015Q4/www/chromium/files/patch-media__capture__video__video_capture_device.h Mon Dec 7 08:43:20 2015 (r403188)
@@ -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);
Modified: branches/2015Q4/www/chromium/files/patch-media__capture__video__video_capture_device_factory.cc
==============================================================================
--- branches/2015Q4/www/chromium/files/patch-media__capture__video__video_capture_device_factory.cc Mon Dec 7 08:22:47 2015 (r403187)
+++ branches/2015Q4/www/chromium/files/patch-media__capture__video__video_capture_device_factory.cc Mon Dec 7 08:43:20 2015 (r403188)
@@ -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() {
Copied: branches/2015Q4/www/chromium/files/patch-media__filters__vp9_parser.h (from r403185, head/www/chromium/files/patch-media__filters__vp9_parser.h)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/2015Q4/www/chromium/files/patch-media__filters__vp9_parser.h Mon Dec 7 08:43:20 2015 (r403188, copy of r403185, head/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>
+
Modified: branches/2015Q4/www/chromium/files/patch-media__media.gyp
==============================================================================
--- branches/2015Q4/www/chromium/files/patch-media__media.gyp Mon Dec 7 08:22:47 2015 (r403187)
+++ branches/2015Q4/www/chromium/files/patch-media__media.gyp Mon Dec 7 08:43:20 2015 (r403188)
@@ -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 @@
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
More information about the svn-ports-all
mailing list