svn commit: r399613 - head/www/chromium/files
Rene Ladan
rene at FreeBSD.org
Sun Oct 18 10:36:11 UTC 2015
Author: rene
Date: Sun Oct 18 10:36:06 2015
New Revision: 399613
URL: https://svnweb.freebsd.org/changeset/ports/399613
Log:
www/chromium: update to 46.0.2490.71
Submitted by: Christoph Moench-Tegeder
Obtained from: https://github.com/gliaskos/freebsd-chromium/pull/38
MFH: 2015Q4
Security: http://vuxml.freebsd.org/freebsd/8301c04d-71df-11e5-9fcb-00262d5ed8ee.html
Added:
head/www/chromium/files/patch-chrome__commin__variations__fieldtrial_testing_config.gyp (contents, props changed)
head/www/chromium/files/patch-chrome__common__component_flash_hint_file_linux.h (contents, props changed)
head/www/chromium/files/patch-components__metrics__drive_metrics_provider_linux.cc (contents, props changed)
head/www/chromium/files/patch-content__browser__bluetooth__bluetooth_dispatcher_host.cc (contents, props changed)
head/www/chromium/files/patch-content__browser__bluetooth__bluetooth_dispatcher_host.h (contents, props changed)
head/www/chromium/files/patch-content__browser__renderer_host__renderer_process_host_impl.cc (contents, props changed)
head/www/chromium/files/patch-media__capture__video__fake_video_capture_device_factory.cc (contents, props changed)
head/www/chromium/files/patch-media__capture__video__file_video_capture_device_factory.cc (contents, props changed)
head/www/chromium/files/patch-media__capture__video__linux__video_capture_device_linux.cc (contents, props changed)
head/www/chromium/files/patch-media__capture__video__video_capture_device.cc (contents, props changed)
head/www/chromium/files/patch-media__capture__video__video_capture_device.h (contents, props changed)
head/www/chromium/files/patch-media__capture__video__video_capture_device_factory.cc (contents, props changed)
Deleted:
head/www/chromium/files/patch-base__test__expectations__expectation.cc
head/www/chromium/files/patch-chrome__browser__metrics__drive_metrics_provider_linux.cc
head/www/chromium/files/patch-media__video__capture__fake_video_capture_device_factory.cc
head/www/chromium/files/patch-media__video__capture__file_video_capture_device_factory.cc
head/www/chromium/files/patch-media__video__capture__linux__video_capture_device_linux.cc
head/www/chromium/files/patch-media__video__capture__linux__video_capture_device_linux.h
head/www/chromium/files/patch-media__video__capture__video_capture_device.cc
head/www/chromium/files/patch-media__video__capture__video_capture_device.h
head/www/chromium/files/patch-media__video__capture__video_capture_device_factory.cc
head/www/chromium/files/patch-third_party__webrtc__base__cpumonitor.cc
head/www/chromium/files/patch-third_party__webrtc__system_wrappers__source__cpu_info.cc
head/www/chromium/files/patch-ui__views__controls__menu__menu_scroll_view_container.cc
Modified:
head/www/chromium/files/extra-patch-clang
head/www/chromium/files/extra-patch-gcc
head/www/chromium/files/patch-base__process__process_info_linux.cc
head/www/chromium/files/patch-chrome__browser__net__cookie_store_util.cc
head/www/chromium/files/patch-chrome__browser__ui__webui__chrome_web_ui_controller_factory.cc
head/www/chromium/files/patch-chrome__chrome_browser_ui.gypi
head/www/chromium/files/patch-chrome__common__chrome_paths.h
head/www/chromium/files/patch-device__serial__serial_io_handler_posix.cc
head/www/chromium/files/patch-device__usb__usb_service_impl.cc
head/www/chromium/files/patch-skia__skia_chrome.gypi
head/www/chromium/files/patch-third_party__pdfium__fpdfsdk__src__javascript__PublicMethods.cpp
head/www/chromium/files/patch-third_party__pdfium__fpdfsdk__src__jsapi__fxjs_v8.cpp
head/www/chromium/files/patch-third_party__webrtc__base__systeminfo.cc
head/www/chromium/files/patch-ui__gl__gl_surface_glx.cc
head/www/chromium/files/patch-ui__gl__sync_control_vsync_provider.cc
head/www/chromium/files/patch-ui__resources__ui_resources.grd
head/www/chromium/files/patch-ui__views__bubble__bubble_delegate.cc
head/www/chromium/files/patch-ui__views__controls__button__label_button.cc
Modified: head/www/chromium/files/extra-patch-clang
==============================================================================
--- head/www/chromium/files/extra-patch-clang Sun Oct 18 09:55:55 2015 (r399612)
+++ head/www/chromium/files/extra-patch-clang Sun Oct 18 10:36:06 2015 (r399613)
@@ -242,14 +242,14 @@
}
bool AudioCodingImpl::RegisterReceiveCodec(AudioDecoder* receive_codec) {
---- v8/src/runtime/runtime-i18n.cc 2015-04-15 00:32:37.000000000 +0200
-+++ v8/src/runtime/runtime-i18n.cc 2015-04-18 22:06:17.000000000 +0200
-@@ -627,7 +627,7 @@
+--- 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;
- local_object->SetInternalField(0, reinterpret_cast<Smi*>(break_iterator));
- // Make sure that the pointer to adopted text is NULL.
-- local_object->SetInternalField(1, reinterpret_cast<Smi*>(NULL));
-+ local_object->SetInternalField(1, static_cast<Smi*>(NULL));
-
- Factory* factory = isolate->factory();
- Handle<String> key = factory->NewStringFromStaticChars("breakIterator");
+- SkFontTableTag tag = WTF::bswap32(table);
++ SkFontTableTag tag = bswap32(table);
+ const size_t tableSize = m_typeface->getTableSize(tag);
+ if (tableSize) {
+ Vector<char> tableBuffer(tableSize);
Modified: head/www/chromium/files/extra-patch-gcc
==============================================================================
--- head/www/chromium/files/extra-patch-gcc Sun Oct 18 09:55:55 2015 (r399612)
+++ head/www/chromium/files/extra-patch-gcc Sun Oct 18 10:36:06 2015 (r399613)
@@ -135,3 +135,15 @@
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"
Modified: head/www/chromium/files/patch-base__process__process_info_linux.cc
==============================================================================
--- head/www/chromium/files/patch-base__process__process_info_linux.cc Sun Oct 18 09:55:55 2015 (r399612)
+++ head/www/chromium/files/patch-base__process__process_info_linux.cc Sun Oct 18 10:36:06 2015 (r399613)
@@ -1,5 +1,5 @@
---- base/process/process_info_linux.cc.orig 2015-06-20 15:12:38
-+++ base/process/process_info_linux.cc
+--- 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
@@ -10,10 +10,28 @@
#include "base/process/process_handle.h"
#include "base/time/time.h"
@@ -12,7 +12,7 @@
+
namespace base {
- //static
+ // static
const Time CurrentProcessInfo::CreationTime() {
+#if defined(__FreeBSD__) || defined(__DragonFly__)
+ int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, getpid() };
Modified: head/www/chromium/files/patch-chrome__browser__net__cookie_store_util.cc
==============================================================================
--- head/www/chromium/files/patch-chrome__browser__net__cookie_store_util.cc Sun Oct 18 09:55:55 2015 (r399612)
+++ head/www/chromium/files/patch-chrome__browser__net__cookie_store_util.cc Sun Oct 18 10:36:06 2015 (r399613)
@@ -1,11 +1,24 @@
---- 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));
- }
+--- 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 {
-#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: head/www/chromium/files/patch-chrome__browser__ui__webui__chrome_web_ui_controller_factory.cc
==============================================================================
--- head/www/chromium/files/patch-chrome__browser__ui__webui__chrome_web_ui_controller_factory.cc Sun Oct 18 09:55:55 2015 (r399612)
+++ head/www/chromium/files/patch-chrome__browser__ui__webui__chrome_web_ui_controller_factory.cc Sun Oct 18 10:36:06 2015 (r399613)
@@ -1,11 +1,11 @@
---- chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig 2015-04-19 00:04:55.000000000 +0200
-+++ chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc 2015-04-19 00:05:15.000000000 +0200
-@@ -249,7 +249,7 @@
+--- 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
+@@ -273,7 +273,7 @@
#if !defined(OS_ANDROID)
|| url.host() == chrome::kChromeUITermsHost
#endif
-#if defined(OS_LINUX) || defined(OS_OPENBSD)
+#if defined(OS_LINUX) || defined(OS_BSD)
- || url.host() == chrome::kChromeUILinuxProxyConfigHost
- || url.host() == chrome::kChromeUISandboxHost
+ || url.host() == chrome::kChromeUILinuxProxyConfigHost ||
+ url.host() == chrome::kChromeUISandboxHost
#endif
Modified: head/www/chromium/files/patch-chrome__chrome_browser_ui.gypi
==============================================================================
--- head/www/chromium/files/patch-chrome__chrome_browser_ui.gypi Sun Oct 18 09:55:55 2015 (r399612)
+++ head/www/chromium/files/patch-chrome__chrome_browser_ui.gypi Sun Oct 18 10:36:06 2015 (r399613)
@@ -1,6 +1,6 @@
---- chrome/chrome_browser_ui.gypi.orig 2015-07-15 16:29:59.000000000 -0400
-+++ chrome/chrome_browser_ui.gypi 2015-07-21 22:40:24.997217000 -0400
-@@ -2922,7 +2922,7 @@
+--- 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
+@@ -2921,7 +2921,7 @@
}],
],
}],
@@ -9,16 +9,16 @@
'dependencies': [
# gtk2 is the only component that can interact with gtk2 in our new
# world.
-@@ -2930,7 +2930,7 @@
+@@ -2929,7 +2929,7 @@
'../build/linux/system.gyp:gio',
],
}],
- ['OS=="win" or OS=="mac" or desktop_linux==1', {
+ ['OS=="win" or OS=="mac" or desktop_linux==1 or os_bsd==1', {
- 'sources': [ '<@(chrome_browser_ui_desktop_sources)' ],
- }],
- ['use_aura==1', {
-@@ -3083,10 +3083,10 @@
+ # A temporary define to make it easier to remove CrOS dependencies on
+ # avatar button code. TODO(estade): remove.
+ 'defines': [ 'FRAME_AVATAR_BUTTON=1', ],
+@@ -3095,10 +3095,10 @@
}],
],
}],
Added: head/www/chromium/files/patch-chrome__commin__variations__fieldtrial_testing_config.gyp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/chromium/files/patch-chrome__commin__variations__fieldtrial_testing_config.gyp Sun Oct 18 10:36:06 2015 (r399613)
@@ -0,0 +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
+@@ -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!="mac"', {'sources/': [['exclude', '_mac\\.json$']]}],
+ ['chromeos!=1', {'sources/': [['exclude', '_chromeos\\.json$']]}],
+ ['OS!="ios"', {'sources/': [['exclude', '_ios\\.json$']]}],
Modified: head/www/chromium/files/patch-chrome__common__chrome_paths.h
==============================================================================
--- head/www/chromium/files/patch-chrome__common__chrome_paths.h Sun Oct 18 09:55:55 2015 (r399612)
+++ head/www/chromium/files/patch-chrome__common__chrome_paths.h Sun Oct 18 10:36:06 2015 (r399613)
@@ -1,6 +1,15 @@
---- chrome/common/chrome_paths.h.orig 2014-10-10 08:54:11 UTC
-+++ chrome/common/chrome_paths.h
-@@ -112,7 +112,7 @@
+--- 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.
@@ -9,3 +18,16 @@
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
+ };
Added: head/www/chromium/files/patch-chrome__common__component_flash_hint_file_linux.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/chromium/files/patch-chrome__common__component_flash_hint_file_linux.h Sun Oct 18 10:36:06 2015 (r399613)
@@ -0,0 +1,14 @@
+--- 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>
+
Added: head/www/chromium/files/patch-components__metrics__drive_metrics_provider_linux.cc
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/chromium/files/patch-components__metrics__drive_metrics_provider_linux.cc Sun Oct 18 10:36:06 2015 (r399613)
@@ -0,0 +1,16 @@
+--- 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
+@@ -4,7 +4,13 @@
+
+ #include "components/metrics/drive_metrics_provider.h"
+
++#if defined(OS_BSD)
++#include <sys/types.h>
++#define MAJOR(dev) major(dev)
++#define MINOR(dev) minor(dev)
++#else
+ #include <linux/kdev_t.h> // For MAJOR()/MINOR().
++#endif
+ #include <sys/stat.h>
+ #include <string>
+
Added: head/www/chromium/files/patch-content__browser__bluetooth__bluetooth_dispatcher_host.cc
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/chromium/files/patch-content__browser__bluetooth__bluetooth_dispatcher_host.cc Sun Oct 18 10:36:06 2015 (r399613)
@@ -0,0 +1,18 @@
+--- 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) {
Added: head/www/chromium/files/patch-content__browser__bluetooth__bluetooth_dispatcher_host.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/chromium/files/patch-content__browser__bluetooth__bluetooth_dispatcher_host.h Sun Oct 18 10:36:06 2015 (r399613)
@@ -0,0 +1,18 @@
+--- 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_|.
Added: head/www/chromium/files/patch-content__browser__renderer_host__renderer_process_host_impl.cc
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/chromium/files/patch-content__browser__renderer_host__renderer_process_host_impl.cc Sun Oct 18 10:36:06 2015 (r399613)
@@ -0,0 +1,10 @@
+--- 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"
Modified: head/www/chromium/files/patch-device__serial__serial_io_handler_posix.cc
==============================================================================
--- head/www/chromium/files/patch-device__serial__serial_io_handler_posix.cc Sun Oct 18 09:55:55 2015 (r399612)
+++ head/www/chromium/files/patch-device__serial__serial_io_handler_posix.cc Sun Oct 18 10:36:06 2015 (r399613)
@@ -1,6 +1,6 @@
---- device/serial/serial_io_handler_posix.cc.orig 2015-07-15 16:30:04.000000000 -0400
-+++ device/serial/serial_io_handler_posix.cc 2015-07-22 07:27:41.841184000 -0400
-@@ -61,7 +61,7 @@
+--- 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
+@@ -59,7 +59,7 @@
BITRATE_TO_SPEED_CASE(9600)
BITRATE_TO_SPEED_CASE(19200)
BITRATE_TO_SPEED_CASE(38400)
@@ -9,21 +9,3 @@
BITRATE_TO_SPEED_CASE(57600)
BITRATE_TO_SPEED_CASE(115200)
BITRATE_TO_SPEED_CASE(230400)
-@@ -99,7 +99,7 @@
- SPEED_TO_BITRATE_CASE(9600)
- SPEED_TO_BITRATE_CASE(19200)
- SPEED_TO_BITRATE_CASE(38400)
--#if !defined(OS_MACOSX)
-+#if !defined(OS_MACOSX) && !defined(OS_BSD)
- SPEED_TO_BITRATE_CASE(57600)
- SPEED_TO_BITRATE_CASE(115200)
- SPEED_TO_BITRATE_CASE(230400)
-@@ -131,7 +131,7 @@
- return false;
- }
- return true;
--#elif defined(OS_MACOSX)
-+#elif defined(OS_MACOSX) || defined(OS_BSD)
- speed_t speed = static_cast<speed_t>(bitrate);
- cfsetispeed(config, speed);
- cfsetospeed(config, speed);
Modified: head/www/chromium/files/patch-device__usb__usb_service_impl.cc
==============================================================================
--- head/www/chromium/files/patch-device__usb__usb_service_impl.cc Sun Oct 18 09:55:55 2015 (r399612)
+++ head/www/chromium/files/patch-device__usb__usb_service_impl.cc Sun Oct 18 10:36:06 2015 (r399613)
@@ -1,9 +1,9 @@
---- device/usb/usb_service_impl.cc.orig 2015-09-01 16:10:43.000000000 -0400
-+++ device/usb/usb_service_impl.cc 2015-09-03 10:41:26.551811000 -0400
-@@ -19,7 +19,11 @@
- #include "components/device_event_log/device_event_log.h"
+--- 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
+@@ -20,7 +20,11 @@
#include "device/usb/usb_device_handle.h"
#include "device/usb/usb_error.h"
+ #include "device/usb/webusb_descriptors.h"
+#if defined(OS_FREEBSD)
+#include "libusb.h"
+#else
@@ -12,33 +12,37 @@
#if defined(OS_WIN)
#include <setupapi.h>
-@@ -373,6 +377,7 @@
- weak_factory_(this) {
- base::MessageLoop::current()->AddDestructionObserver(this);
+@@ -541,6 +545,7 @@
+ }
+ context_ = new UsbContext(platform_context);
+#if !defined(OS_FREEBSD)
- int rv = libusb_hotplug_register_callback(
+ rv = libusb_hotplug_register_callback(
context_->context(),
static_cast<libusb_hotplug_event>(LIBUSB_HOTPLUG_EVENT_DEVICE_ARRIVED |
-@@ -391,14 +396,17 @@
- device_observer_.Add(device_monitor);
+@@ -553,6 +558,8 @@
}
- #endif // OS_WIN
-+#endif // OS_FREEBSD
+
+ RefreshDevices();
++#endif // !OS_FREEBSD
++
+ #if defined(OS_WIN)
+ DeviceMonitorWin* device_monitor = DeviceMonitorWin::GetForAllInterfaces();
+ if (device_monitor) {
+@@ -562,10 +569,11 @@
}
UsbServiceImpl::~UsbServiceImpl() {
- base::MessageLoop::current()->RemoveDestructionObserver(this);
-
+-
+#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();
}
-@@ -630,6 +638,7 @@
+@@ -803,6 +811,7 @@
device->OnDisconnect();
}
@@ -46,11 +50,11 @@
// static
int LIBUSB_CALL UsbServiceImpl::HotplugCallback(libusb_context* context,
PlatformUsbDevice device,
-@@ -667,6 +676,7 @@
+@@ -840,6 +849,7 @@
return 0;
}
-+#endif // !OS_FREEBSD
++#endif // !OS_FREEBSD
void UsbServiceImpl::OnPlatformDeviceAdded(PlatformUsbDevice platform_device) {
DCHECK(CalledOnValidThread());
Added: head/www/chromium/files/patch-media__capture__video__fake_video_capture_device_factory.cc
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/chromium/files/patch-media__capture__video__fake_video_capture_device_factory.cc Sun Oct 18 10:36:06 2015 (r399613)
@@ -0,0 +1,11 @@
+--- 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
+@@ -51,7 +51,7 @@
+ for (int n = 0; n < number_of_devices_; ++n) {
+ VideoCaptureDevice::Name name(base::StringPrintf("fake_device_%d", n),
+ base::StringPrintf("/dev/video%d", n)
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+ ,
+ VideoCaptureDevice::Name::V4L2_SINGLE_PLANE
+ #elif defined(OS_MACOSX)
Added: head/www/chromium/files/patch-media__capture__video__file_video_capture_device_factory.cc
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/chromium/files/patch-media__capture__video__file_video_capture_device_factory.cc Sun Oct 18 10:36:06 2015 (r399613)
@@ -0,0 +1,11 @@
+--- 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
+@@ -49,7 +49,7 @@
+ device_names->push_back(VideoCaptureDevice::Name(
+ command_line_file_path.value(), kFileVideoCaptureDeviceName,
+ VideoCaptureDevice::Name::AVFOUNDATION));
+-#elif defined(OS_LINUX)
++#elif defined(OS_LINUX) || defined(OS_BSD)
+ device_names->push_back(VideoCaptureDevice::Name(
+ command_line_file_path.value(), kFileVideoCaptureDeviceName,
+ VideoCaptureDevice::Name::V4L2_SINGLE_PLANE));
Added: head/www/chromium/files/patch-media__capture__video__linux__video_capture_device_linux.cc
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/chromium/files/patch-media__capture__video__linux__video_capture_device_linux.cc Sun Oct 18 10:36:06 2015 (r399613)
@@ -0,0 +1,40 @@
+--- 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
+@@ -43,6 +43,7 @@
+
+ // Translates Video4Linux pixel formats to Chromium pixel formats.
+ // static
++#if !defined(OS_FREEBSD)
+ VideoCapturePixelFormat
+ 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
+
+ const std::string VideoCaptureDevice::Name::GetModel() const {
+ // |unique_id| is of the form "/dev/video2". |file_name| is "video2".
+@@ -88,6 +90,7 @@
+ v4l2_thread_.Stop();
+ }
+
++#if !defined(OS_FREEBSD)
+ void VideoCaptureDeviceLinux::AllocateAndStart(
+ const VideoCaptureParams& params,
+ scoped_ptr<VideoCaptureDevice::Client> client) {
+@@ -130,6 +133,13 @@
+ 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
+
+ // static
+ int VideoCaptureDeviceLinux::TranslatePowerLineFrequencyToV4L2(int frequency) {
Added: head/www/chromium/files/patch-media__capture__video__video_capture_device.cc
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/chromium/files/patch-media__capture__video__video_capture_device.cc Sun Oct 18 10:36:06 2015 (r399613)
@@ -0,0 +1,31 @@
+--- 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 @@
+
+ namespace media {
+
++const std::string VideoCaptureDevice::Name::GetModel() const {
++ return "";
++}
++
+ const std::string VideoCaptureDevice::Name::GetNameAndModel() const {
+ const std::string model_id = GetModel();
+ if (model_id.empty())
+@@ -26,7 +30,7 @@
+ : device_name_(name), unique_id_(id) {
+ }
+
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+ VideoCaptureDevice::Name::Name(const std::string& name,
+ const std::string& id,
+ const CaptureApiType api_type)
+@@ -73,7 +77,7 @@
+ VideoCaptureDevice::Name::~Name() {
+ }
+
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+ const char* VideoCaptureDevice::Name::GetCaptureApiTypeString() const {
+ switch (capture_api_type()) {
+ case V4L2_SINGLE_PLANE:
Added: head/www/chromium/files/patch-media__capture__video__video_capture_device.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/chromium/files/patch-media__capture__video__video_capture_device.h Sun Oct 18 10:36:06 2015 (r399613)
@@ -0,0 +1,38 @@
+--- 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
+@@ -43,7 +43,7 @@
+ Name();
+ Name(const std::string& name, const std::string& id);
+
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+ // Linux/CrOS targets Capture Api type: it can only be set on construction.
+ enum CaptureApiType {
+ V4L2_SINGLE_PLANE,
+@@ -75,7 +75,7 @@
+ #endif
+
+ #if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \
+- defined(OS_ANDROID)
++ defined(OS_ANDROID) || defined(OS_BSD)
+ Name(const std::string& name,
+ const std::string& id,
+ const CaptureApiType api_type);
+@@ -112,7 +112,7 @@
+ bool operator<(const Name& other) const { return unique_id_ < other.id(); }
+
+ #if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \
+- defined(OS_ANDROID)
++ defined(OS_ANDROID) || defined(OS_BSD)
+ CaptureApiType capture_api_type() const {
+ return capture_api_class_.capture_api_type();
+ }
+@@ -136,7 +136,7 @@
+ std::string device_name_;
+ std::string unique_id_;
+ #if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \
+- defined(OS_ANDROID)
++ defined(OS_ANDROID) || defined(OS_BSD)
+ // This class wraps the CaptureApiType to give it a by default value if not
+ // initialized.
+ class CaptureApiClass {
Added: head/www/chromium/files/patch-media__capture__video__video_capture_device_factory.cc
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/chromium/files/patch-media__capture__video__video_capture_device_factory.cc Sun Oct 18 10:36:06 2015 (r399613)
@@ -0,0 +1,21 @@
+--- 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
+@@ -14,6 +14,10 @@
+ // static
+ scoped_ptr<VideoCaptureDeviceFactory> VideoCaptureDeviceFactory::CreateFactory(
+ scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner) {
++#if defined(OS_BSD)
++ return scoped_ptr<VideoCaptureDeviceFactory>(new
++ media::FakeVideoCaptureDeviceFactory());
++#else
+ const base::CommandLine* command_line =
+ base::CommandLine::ForCurrentProcess();
+ // Use a Fake or File Video Device Factory if the command line flags are
+@@ -32,6 +36,7 @@
+ return scoped_ptr<VideoCaptureDeviceFactory>(
+ CreateVideoCaptureDeviceFactory(ui_task_runner));
+ }
++#endif
+ }
+
+ VideoCaptureDeviceFactory::VideoCaptureDeviceFactory() {
Modified: head/www/chromium/files/patch-skia__skia_chrome.gypi
==============================================================================
--- head/www/chromium/files/patch-skia__skia_chrome.gypi Sun Oct 18 09:55:55 2015 (r399612)
+++ head/www/chromium/files/patch-skia__skia_chrome.gypi Sun Oct 18 10:36:06 2015 (r399613)
@@ -1,9 +1,9 @@
---- skia/skia_chrome.gypi.orig 2015-01-21 20:28:18 UTC
-+++ skia/skia_chrome.gypi
-@@ -87,6 +87,11 @@
- 'ext/vector_platform_device_skia.h',
- ],
- 'conditions': [
+--- 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',
+ ],
+ }],
+ [ 'use_cairo == 1', {
+ 'dependencies': [
+ '../build/linux/system.gyp:pangocairo',
Modified: head/www/chromium/files/patch-third_party__pdfium__fpdfsdk__src__javascript__PublicMethods.cpp
==============================================================================
--- head/www/chromium/files/patch-third_party__pdfium__fpdfsdk__src__javascript__PublicMethods.cpp Sun Oct 18 09:55:55 2015 (r399612)
+++ head/www/chromium/files/patch-third_party__pdfium__fpdfsdk__src__javascript__PublicMethods.cpp Sun Oct 18 10:36:06 2015 (r399613)
@@ -1,20 +1,20 @@
---- third_party/pdfium/fpdfsdk/src/javascript/PublicMethods.cpp.orig 2014-10-10 09:15:55 UTC
-+++ third_party/pdfium/fpdfsdk/src/javascript/PublicMethods.cpp
-@@ -1052,7 +1052,7 @@
- //function AFNumber_Format(nDec, sepStyle, negStyle, currStyle, strCurrency, bCurrencyPrepend)
- FX_BOOL CJS_PublicMethods::AFNumber_Format(OBJ_METHOD_PARAMS)
- {
+--- 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
+@@ -910,7 +910,7 @@
+ const CJS_Parameters& params,
+ CJS_Value& vRet,
+ CFX_WideString& sError) {
-#if _FX_OS_ != _FX_ANDROID_
+#if _FX_OS_ != _FX_ANDROID_ && _FX_OS_ != _FX_LINUX_DESKTOP_
- v8::Isolate* isolate = ::GetIsolate(cc);
- CJS_Context* pContext = (CJS_Context *)cc;
- ASSERT(pContext != NULL);
-@@ -1393,7 +1393,7 @@
- //function AFPercent_Format(nDec, sepStyle)
- FX_BOOL CJS_PublicMethods::AFPercent_Format(OBJ_METHOD_PARAMS)
- {
+ v8::Isolate* isolate = ::GetIsolate(cc);
+ CJS_Context* pContext = (CJS_Context*)cc;
+ ASSERT(pContext != NULL);
+@@ -1213,7 +1213,7 @@
+ const CJS_Parameters& params,
+ CJS_Value& vRet,
+ CFX_WideString& sError) {
-#if _FX_OS_ != _FX_ANDROID_
+#if _FX_OS_ != _FX_ANDROID_ && _FX_OS_ != _FX_LINUX_DESKTOP_
- CJS_Context* pContext = (CJS_Context *)cc;
- ASSERT(pContext != NULL);
- CJS_EventHandler* pEvent = pContext->GetEventHandler();
+ CJS_Context* pContext = (CJS_Context*)cc;
+ ASSERT(pContext != NULL);
+ CJS_EventHandler* pEvent = pContext->GetEventHandler();
Modified: head/www/chromium/files/patch-third_party__pdfium__fpdfsdk__src__jsapi__fxjs_v8.cpp
==============================================================================
--- head/www/chromium/files/patch-third_party__pdfium__fpdfsdk__src__jsapi__fxjs_v8.cpp Sun Oct 18 09:55:55 2015 (r399612)
+++ head/www/chromium/files/patch-third_party__pdfium__fpdfsdk__src__jsapi__fxjs_v8.cpp Sun Oct 18 10:36:06 2015 (r399613)
@@ -1,28 +1,28 @@
---- third_party/pdfium/fpdfsdk/src/jsapi/fxjs_v8.cpp.orig 2015-07-15 16:31:51.000000000 -0400
-+++ third_party/pdfium/fpdfsdk/src/jsapi/fxjs_v8.cpp 2015-07-22 18:15:27.210562000 -0400
-@@ -747,11 +747,12 @@
+--- 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.
- double _getLocalTZA()
- {
-+ struct tm *lt;
- if(!FSDK_IsSandBoxPolicyEnabled(FPDF_POLICY_MACHINETIME_ACCESS))
- return 0;
- time_t t = 0;
- time(&t);
-- localtime(&t);
-+ lt = localtime(&t);
+ double _getLocalTZA() {
++ struct tm *lt;
+ if (!FSDK_IsSandBoxPolicyEnabled(FPDF_POLICY_MACHINETIME_ACCESS))
+ return 0;
+ time_t t = 0;
+ time(&t);
+- localtime(&t);
++ lt = localtime(&t);
#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
-@@ -759,7 +760,11 @@
+@@ -920,7 +921,11 @@
long timezone = 0;
_get_timezone(&timezone);
#endif
+#ifdef __FreeBSD__
-+ return (double)(-(lt->tm_gmtoff * 1000));
++ return (double)(-(lt->tm_gmtoff * 1000));
+#else
- return (double)(-(timezone * 1000));
+ return (double)(-(timezone * 1000));
+#endif
}
- int _getDaylightSavingTA(double d)
+ int _getDaylightSavingTA(double d) {
Modified: head/www/chromium/files/patch-third_party__webrtc__base__systeminfo.cc
==============================================================================
--- head/www/chromium/files/patch-third_party__webrtc__base__systeminfo.cc Sun Oct 18 09:55:55 2015 (r399612)
+++ head/www/chromium/files/patch-third_party__webrtc__base__systeminfo.cc Sun Oct 18 10:36:06 2015 (r399613)
@@ -1,6 +1,6 @@
---- third_party/webrtc/base/systeminfo.cc.orig 2015-06-11 20:19:52 UTC
-+++ third_party/webrtc/base/systeminfo.cc
-@@ -19,8 +19,12 @@
+--- 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
+@@ -20,8 +20,12 @@
#elif defined(WEBRTC_MAC) && !defined(WEBRTC_IOS)
#include <ApplicationServices/ApplicationServices.h>
#include <CoreServices/CoreServices.h>
@@ -14,32 +14,27 @@
#endif
#if defined(WEBRTC_MAC)
#include <sys/sysctl.h>
-@@ -31,7 +35,7 @@
- #include "webrtc/base/win32.h"
- #elif defined(WEBRTC_MAC) && !defined(WEBRTC_IOS)
- #include "webrtc/base/macconversion.h"
--#elif defined(WEBRTC_LINUX)
-+#elif defined(WEBRTC_LINUX) || defined(WEBRT_BSD)
- #include "webrtc/base/linux.h"
- #endif
- #include "webrtc/base/common.h"
-@@ -168,6 +172,19 @@
+@@ -66,7 +70,7 @@
+ SYSTEM_INFO si;
+ GetSystemInfo(&si);
+ 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)
+ 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(__native_client__)
- // TODO(ryanpetrie): Implement this via PPAPI when it's available.
-+#elif defined(OS_FREEBSD)
-+ int sysctl_value;
-+ size_t length = sizeof(sysctl_value);
-+ if (!sysctlbyname("hw.ncpu", &sysctl_value, &length, NULL, 0)) {
-+ physical_cpus_ = sysctl_value;
-+ }
-+#if !defined(__DragonFly__)
-+ if (!sysctlbyname("kern.smp.cpus", &sysctl_value, &length, NULL, 0)) {
-+ logical_cpus_ = sysctl_value;
-+ }
-+#endif
-+ // L3 / L2 cache size?
-+ // CPU family/model/stepping (available in dmesg, kernel only TODO)
+
+-#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
- ProcCpuInfo proc_info;
- if (proc_info.LoadFromSystem()) {
Modified: head/www/chromium/files/patch-ui__gl__gl_surface_glx.cc
==============================================================================
--- head/www/chromium/files/patch-ui__gl__gl_surface_glx.cc Sun Oct 18 09:55:55 2015 (r399612)
+++ head/www/chromium/files/patch-ui__gl__gl_surface_glx.cc Sun Oct 18 10:36:06 2015 (r399613)
@@ -1,9 +1,9 @@
---- ui/gl/gl_surface_glx.cc.orig 2015-04-14 18:31:23.000000000 -0400
-+++ ui/gl/gl_surface_glx.cc 2015-04-28 08:44:08.840888000 -0400
-@@ -57,7 +57,7 @@
+--- 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
+@@ -48,7 +48,7 @@
bool g_glx_sgi_video_sync_supported = false;
- static const base::TimeDelta kGetVSyncParametersMinPeriod =
+ static const int kGetVSyncParametersMinSeconds =
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
// See crbug.com/373489
Modified: head/www/chromium/files/patch-ui__gl__sync_control_vsync_provider.cc
==============================================================================
--- head/www/chromium/files/patch-ui__gl__sync_control_vsync_provider.cc Sun Oct 18 09:55:55 2015 (r399612)
+++ head/www/chromium/files/patch-ui__gl__sync_control_vsync_provider.cc Sun Oct 18 10:36:06 2015 (r399613)
@@ -1,24 +1,24 @@
---- ui/gl/sync_control_vsync_provider.cc.orig 2015-04-14 18:19:00.000000000 -0400
-+++ ui/gl/sync_control_vsync_provider.cc 2015-04-28 08:42:41.263448000 -0400
-@@ -9,7 +9,7 @@
- #include "base/logging.h"
+--- 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
+@@ -10,7 +10,7 @@
#include "base/time/time.h"
+ #include "base/trace_event/trace_event.h"
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
// These constants define a reasonable range for a calculated refresh interval.
// Calculating refreshes out of this range will be considered a fatal error.
const int64 kMinVsyncIntervalUs = base::Time::kMicrosecondsPerSecond / 400;
-@@ -35,7 +35,7 @@
-
+@@ -37,7 +37,7 @@
void SyncControlVSyncProvider::GetVSyncParameters(
const UpdateVSyncCallback& callback) {
+ TRACE_EVENT0("gpu", "SyncControlVSyncProvider::GetVSyncParameters");
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
base::TimeTicks timebase;
// The actual clock used for the system time returned by glXGetSyncValuesOML
-@@ -151,7 +151,7 @@
+@@ -153,7 +153,7 @@
last_timebase_ = timebase;
last_media_stream_counter_ = media_stream_counter;
callback.Run(timebase, last_good_interval_);
Modified: head/www/chromium/files/patch-ui__resources__ui_resources.grd
==============================================================================
--- head/www/chromium/files/patch-ui__resources__ui_resources.grd Sun Oct 18 09:55:55 2015 (r399612)
+++ head/www/chromium/files/patch-ui__resources__ui_resources.grd Sun Oct 18 10:36:06 2015 (r399613)
@@ -1,9 +1,9 @@
---- ui/resources/ui_resources.grd.orig 2014-10-10 09:15:32 UTC
-+++ ui/resources/ui_resources.grd
-@@ -39,7 +39,7 @@
- <structure type="chrome_scaled_image" name="IDR_APP_TOP_LEFT" file="app_top_left.png" />
- <structure type="chrome_scaled_image" name="IDR_APP_TOP_RIGHT" file="app_top_right.png" />
- </if>
+--- 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
+@@ -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
+ SAME CONDITIONALS. -->
- <if expr="is_linux and use_aura">
+ <if expr="(is_linux or is_bsd) and use_aura">
<structure type="chrome_scaled_image" name="IDR_AURA_CURSOR_BIG_ALIAS" file="common/pointers/alias_big.png" />
Modified: head/www/chromium/files/patch-ui__views__bubble__bubble_delegate.cc
==============================================================================
--- head/www/chromium/files/patch-ui__views__bubble__bubble_delegate.cc Sun Oct 18 09:55:55 2015 (r399612)
+++ head/www/chromium/files/patch-ui__views__bubble__bubble_delegate.cc Sun Oct 18 10:36:06 2015 (r399613)
@@ -1,11 +1,11 @@
---- ui/views/bubble/bubble_delegate.cc.orig 2015-04-14 18:31:23.000000000 -0400
-+++ ui/views/bubble/bubble_delegate.cc 2015-04-28 08:17:15.923055000 -0400
-@@ -104,7 +104,7 @@
+--- 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
+@@ -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.
bubble_delegate->set_adjust_if_offscreen(ui::win::IsAeroGlassEnabled());
--#elif defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#elif (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
+-#elif (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_MACOSX)
++#elif (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_MACOSX) || defined(OS_BSD)
// Linux clips bubble windows that extend outside their parent window bounds.
+ // Mac never adjusts.
bubble_delegate->set_adjust_if_offscreen(false);
- #endif
Modified: head/www/chromium/files/patch-ui__views__controls__button__label_button.cc
==============================================================================
--- head/www/chromium/files/patch-ui__views__controls__button__label_button.cc Sun Oct 18 09:55:55 2015 (r399612)
+++ head/www/chromium/files/patch-ui__views__controls__button__label_button.cc Sun Oct 18 10:36:06 2015 (r399613)
@@ -1,15 +1,6 @@
---- ui/views/controls/button/label_button.cc.orig Thu May 14 00:23:12 2015
-+++ ui/views/controls/button/label_button.cc Wed May 20 08:34:57 2015
-@@ -17,7 +17,7 @@
- #include "ui/views/painter.h"
- #include "ui/views/window/dialog_delegate.h"
-
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
- #include "ui/views/linux_ui/linux_ui.h"
- #endif
-
-@@ -26,7 +26,7 @@
+--- 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
+@@ -23,7 +23,7 @@
// The default spacing between the icon and text.
const int kSpacing = 5;
@@ -18,7 +9,7 @@
// Default text and shadow colors for STYLE_BUTTON.
const SkColor kStyleButtonTextColor = SK_ColorBLACK;
const SkColor kStyleButtonShadowColor = SK_ColorWHITE;
-@@ -406,7 +406,7 @@
+@@ -401,7 +401,7 @@
// confusion. These details should either be pushed into ui::NativeThemeWin
// or should be obsoleted by rendering buttons with paint calls instead of
// with static assets. http://crbug.com/350498
@@ -27,12 +18,3 @@
constant_text_color = true;
colors[STATE_NORMAL] = kStyleButtonTextColor;
label_->SetBackgroundColor(theme->GetSystemColor(
-@@ -443,7 +443,7 @@
-
- scoped_ptr<LabelButtonBorder> label_button_border = CreateDefaultBorder();
-
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
- views::LinuxUI* linux_ui = views::LinuxUI::instance();
- if (linux_ui) {
- SetBorder(linux_ui->CreateNativeBorder(
More information about the svn-ports-all
mailing list