diff options
39 files changed, 365 insertions, 396 deletions
diff --git a/www/chromium/files/extra-patch-clang b/www/chromium/files/extra-patch-clang index 7a8df24e4655..c9b55a51824b 100644 --- a/www/chromium/files/extra-patch-clang +++ b/www/chromium/files/extra-patch-clang @@ -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 @@ - - 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"); +--- third_party/WebKit/Source/platform/fonts/FontPlatformData.cpp.orig 2015-10-14 22:17:57.580250000 +0200 ++++ third_party/WebKit/Source/platform/fonts/FontPlatformData.cpp 2015-10-14 22:18:13.766229000 +0200 +@@ -358,7 +358,7 @@ + { + RefPtr<SharedBuffer> buffer; + +- SkFontTableTag tag = WTF::bswap32(table); ++ SkFontTableTag tag = bswap32(table); + const size_t tableSize = m_typeface->getTableSize(tag); + if (tableSize) { + Vector<char> tableBuffer(tableSize); diff --git a/www/chromium/files/extra-patch-gcc b/www/chromium/files/extra-patch-gcc index e50403d345c7..c5b51f196126 100644 --- a/www/chromium/files/extra-patch-gcc +++ b/www/chromium/files/extra-patch-gcc @@ -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" diff --git a/www/chromium/files/patch-base__process__process_info_linux.cc b/www/chromium/files/patch-base__process__process_info_linux.cc index 768cbd9bc338..9ce09dad68e6 100644 --- a/www/chromium/files/patch-base__process__process_info_linux.cc +++ b/www/chromium/files/patch-base__process__process_info_linux.cc @@ -1,5 +1,5 @@ ---- base/process/process_info_linux.cc.orig 2015-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() }; diff --git a/www/chromium/files/patch-base__test__expectations__expectation.cc b/www/chromium/files/patch-base__test__expectations__expectation.cc deleted file mode 100644 index 30075abb3e5b..000000000000 --- a/www/chromium/files/patch-base__test__expectations__expectation.cc +++ /dev/null @@ -1,19 +0,0 @@ ---- base/test/expectations/expectation.cc.orig 2014-10-10 08:54:09 UTC -+++ base/test/expectations/expectation.cc -@@ -60,6 +60,7 @@ - variant != "64") { - return false; - } -+ } else if (name == "FreeBSD") { - } else if (name == "ChromeOS") { - // TODO(rsesek): Figure out what ChromeOS needs. - } else if (name == "iOS") { -@@ -125,6 +126,8 @@ - platform.variant = "32"; - else if (arch == "x86_64") - platform.variant = "64"; -+#elif defined(OS_FREEBSD) -+ platform.name = "FreeBSD"; - #else - NOTREACHED(); - #endif diff --git a/www/chromium/files/patch-chrome__browser__metrics__drive_metrics_provider_linux.cc b/www/chromium/files/patch-chrome__browser__metrics__drive_metrics_provider_linux.cc deleted file mode 100644 index 2f73a856c6f5..000000000000 --- a/www/chromium/files/patch-chrome__browser__metrics__drive_metrics_provider_linux.cc +++ /dev/null @@ -1,16 +0,0 @@ ---- chrome/browser/metrics/drive_metrics_provider_linux.cc.orig 2015-05-21 11:20:27.603865000 -0400 -+++ chrome/browser/metrics/drive_metrics_provider_linux.cc 2015-05-21 11:22:16.773943000 -0400 -@@ -4,7 +4,13 @@ - - #include "chrome/browser/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> - diff --git a/www/chromium/files/patch-chrome__browser__net__cookie_store_util.cc b/www/chromium/files/patch-chrome__browser__net__cookie_store_util.cc index 70ff693e826b..317fcc9fe527 100644 --- a/www/chromium/files/patch-chrome__browser__net__cookie_store_util.cc +++ b/www/chromium/files/patch-chrome__browser__net__cookie_store_util.cc @@ -1,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 diff --git a/www/chromium/files/patch-chrome__browser__ui__webui__chrome_web_ui_controller_factory.cc b/www/chromium/files/patch-chrome__browser__ui__webui__chrome_web_ui_controller_factory.cc index cb5b47f70870..2ab84bff90aa 100644 --- a/www/chromium/files/patch-chrome__browser__ui__webui__chrome_web_ui_controller_factory.cc +++ b/www/chromium/files/patch-chrome__browser__ui__webui__chrome_web_ui_controller_factory.cc @@ -1,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 diff --git a/www/chromium/files/patch-chrome__chrome_browser_ui.gypi b/www/chromium/files/patch-chrome__chrome_browser_ui.gypi index 39fbdd5d0491..1348edac9312 100644 --- a/www/chromium/files/patch-chrome__chrome_browser_ui.gypi +++ b/www/chromium/files/patch-chrome__chrome_browser_ui.gypi @@ -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 @@ }], ], }], diff --git a/www/chromium/files/patch-chrome__commin__variations__fieldtrial_testing_config.gyp b/www/chromium/files/patch-chrome__commin__variations__fieldtrial_testing_config.gyp new file mode 100644 index 000000000000..17adc5d82262 --- /dev/null +++ b/www/chromium/files/patch-chrome__commin__variations__fieldtrial_testing_config.gyp @@ -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$']]}], diff --git a/www/chromium/files/patch-chrome__common__chrome_paths.h b/www/chromium/files/patch-chrome__common__chrome_paths.h index a6de87f6b7da..cd5daa1bad05 100644 --- a/www/chromium/files/patch-chrome__common__chrome_paths.h +++ b/www/chromium/files/patch-chrome__common__chrome_paths.h @@ -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 + }; diff --git a/www/chromium/files/patch-chrome__common__component_flash_hint_file_linux.h b/www/chromium/files/patch-chrome__common__component_flash_hint_file_linux.h new file mode 100644 index 000000000000..7045b654327f --- /dev/null +++ b/www/chromium/files/patch-chrome__common__component_flash_hint_file_linux.h @@ -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> + diff --git a/www/chromium/files/patch-components__metrics__drive_metrics_provider_linux.cc b/www/chromium/files/patch-components__metrics__drive_metrics_provider_linux.cc new file mode 100644 index 000000000000..3ff02e625ae6 --- /dev/null +++ b/www/chromium/files/patch-components__metrics__drive_metrics_provider_linux.cc @@ -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> + diff --git a/www/chromium/files/patch-content__browser__bluetooth__bluetooth_dispatcher_host.cc b/www/chromium/files/patch-content__browser__bluetooth__bluetooth_dispatcher_host.cc new file mode 100644 index 000000000000..f918b25da853 --- /dev/null +++ b/www/chromium/files/patch-content__browser__bluetooth__bluetooth_dispatcher_host.cc @@ -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) { diff --git a/www/chromium/files/patch-content__browser__bluetooth__bluetooth_dispatcher_host.h b/www/chromium/files/patch-content__browser__bluetooth__bluetooth_dispatcher_host.h new file mode 100644 index 000000000000..e90cf6347446 --- /dev/null +++ b/www/chromium/files/patch-content__browser__bluetooth__bluetooth_dispatcher_host.h @@ -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_|. diff --git a/www/chromium/files/patch-content__browser__renderer_host__renderer_process_host_impl.cc b/www/chromium/files/patch-content__browser__renderer_host__renderer_process_host_impl.cc new file mode 100644 index 000000000000..8fa8cfb38cd0 --- /dev/null +++ b/www/chromium/files/patch-content__browser__renderer_host__renderer_process_host_impl.cc @@ -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" diff --git a/www/chromium/files/patch-device__serial__serial_io_handler_posix.cc b/www/chromium/files/patch-device__serial__serial_io_handler_posix.cc index 60bb9c6d4363..f5ff28038f94 100644 --- a/www/chromium/files/patch-device__serial__serial_io_handler_posix.cc +++ b/www/chromium/files/patch-device__serial__serial_io_handler_posix.cc @@ -1,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); diff --git a/www/chromium/files/patch-device__usb__usb_service_impl.cc b/www/chromium/files/patch-device__usb__usb_service_impl.cc index f3333dc003e2..3e953bdab48b 100644 --- a/www/chromium/files/patch-device__usb__usb_service_impl.cc +++ b/www/chromium/files/patch-device__usb__usb_service_impl.cc @@ -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()); diff --git a/www/chromium/files/patch-media__capture__video__fake_video_capture_device_factory.cc b/www/chromium/files/patch-media__capture__video__fake_video_capture_device_factory.cc new file mode 100644 index 000000000000..2c7bc9353a2f --- /dev/null +++ b/www/chromium/files/patch-media__capture__video__fake_video_capture_device_factory.cc @@ -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) diff --git a/www/chromium/files/patch-media__capture__video__file_video_capture_device_factory.cc b/www/chromium/files/patch-media__capture__video__file_video_capture_device_factory.cc new file mode 100644 index 000000000000..0847e219c1ee --- /dev/null +++ b/www/chromium/files/patch-media__capture__video__file_video_capture_device_factory.cc @@ -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)); diff --git a/www/chromium/files/patch-media__capture__video__linux__video_capture_device_linux.cc b/www/chromium/files/patch-media__capture__video__linux__video_capture_device_linux.cc new file mode 100644 index 000000000000..ab80191fcfb0 --- /dev/null +++ b/www/chromium/files/patch-media__capture__video__linux__video_capture_device_linux.cc @@ -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) { diff --git a/www/chromium/files/patch-media__video__capture__video_capture_device.cc b/www/chromium/files/patch-media__capture__video__video_capture_device.cc index b6776420d0f0..b20d4875d4d1 100644 --- a/www/chromium/files/patch-media__video__capture__video_capture_device.cc +++ b/www/chromium/files/patch-media__capture__video__video_capture_device.cc @@ -1,5 +1,5 @@ ---- media/video/capture/video_capture_device.cc.orig 2015-06-19 21:26:28 UTC -+++ media/video/capture/video_capture_device.cc +--- 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 { @@ -11,18 +11,18 @@ const std::string VideoCaptureDevice::Name::GetNameAndModel() const { const std::string model_id = GetModel(); if (model_id.empty()) -@@ -24,7 +28,7 @@ - VideoCaptureDevice::Name::Name(const std::string& name, const std::string& id) - : device_name_(name), unique_id_(id) {} +@@ -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) -@@ -69,7 +73,7 @@ - - VideoCaptureDevice::Name::~Name() {} +@@ -73,7 +77,7 @@ + VideoCaptureDevice::Name::~Name() { + } -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) diff --git a/www/chromium/files/patch-media__video__capture__video_capture_device.h b/www/chromium/files/patch-media__capture__video__video_capture_device.h index cf1f14d1627d..a46323584218 100644 --- a/www/chromium/files/patch-media__video__capture__video_capture_device.h +++ b/www/chromium/files/patch-media__capture__video__video_capture_device.h @@ -1,6 +1,6 @@ ---- media/video/capture/video_capture_device.h.orig 2015-06-19 21:22:59 UTC -+++ media/video/capture/video_capture_device.h -@@ -41,7 +41,7 @@ +--- 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); @@ -9,17 +9,17 @@ // Linux/CrOS targets Capture Api type: it can only be set on construction. enum CaptureApiType { V4L2_SINGLE_PLANE, -@@ -85,7 +85,7 @@ +@@ -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, + Name(const std::string& name, + const std::string& id, const CaptureApiType api_type); - #endif -@@ -123,7 +123,7 @@ - } +@@ -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) @@ -27,7 +27,7 @@ CaptureApiType capture_api_type() const { return capture_api_class_.capture_api_type(); } -@@ -155,7 +155,7 @@ +@@ -136,7 +136,7 @@ std::string device_name_; std::string unique_id_; #if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \ diff --git a/www/chromium/files/patch-media__video__capture__video_capture_device_factory.cc b/www/chromium/files/patch-media__capture__video__video_capture_device_factory.cc index 1fa4fe2160f6..ee7e842ec044 100644 --- a/www/chromium/files/patch-media__video__capture__video_capture_device_factory.cc +++ b/www/chromium/files/patch-media__capture__video__video_capture_device_factory.cc @@ -1,5 +1,5 @@ ---- media/video/capture/video_capture_device_factory.cc.orig 2015-06-19 21:33:03 UTC -+++ media/video/capture/video_capture_device_factory.cc +--- 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( diff --git a/www/chromium/files/patch-media__video__capture__fake_video_capture_device_factory.cc b/www/chromium/files/patch-media__video__capture__fake_video_capture_device_factory.cc deleted file mode 100644 index 5b71d92ef7b0..000000000000 --- a/www/chromium/files/patch-media__video__capture__fake_video_capture_device_factory.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- media/video/capture/fake_video_capture_device_factory.cc.orig 2015-06-19 21:21:37 UTC -+++ media/video/capture/fake_video_capture_device_factory.cc -@@ -48,7 +48,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) - , VideoCaptureDevice::Name::AVFOUNDATION diff --git a/www/chromium/files/patch-media__video__capture__file_video_capture_device_factory.cc b/www/chromium/files/patch-media__video__capture__file_video_capture_device_factory.cc deleted file mode 100644 index 392e24002c11..000000000000 --- a/www/chromium/files/patch-media__video__capture__file_video_capture_device_factory.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- media/video/capture/file_video_capture_device_factory.cc.orig 2015-06-19 21:29:29 UTC -+++ media/video/capture/file_video_capture_device_factory.cc -@@ -51,7 +51,7 @@ - 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, diff --git a/www/chromium/files/patch-media__video__capture__linux__video_capture_device_linux.cc b/www/chromium/files/patch-media__video__capture__linux__video_capture_device_linux.cc deleted file mode 100644 index 0f034eff1dc7..000000000000 --- a/www/chromium/files/patch-media__video__capture__linux__video_capture_device_linux.cc +++ /dev/null @@ -1,34 +0,0 @@ ---- media/video/capture/linux/video_capture_device_linux.cc.orig 2015-05-21 14:00:42.807667000 -0400 -+++ media/video/capture/linux/video_capture_device_linux.cc 2015-05-21 14:05:22.707732000 -0400 -@@ -44,6 +44,7 @@ - - // Translates Video4Linux pixel formats to Chromium pixel formats. - // static -+#if !defined(OS_FREEBSD) - VideoPixelFormat VideoCaptureDeviceLinux::V4l2FourCcToChromiumPixelFormat( - uint32 v4l2_fourcc) { - return V4L2CaptureDelegate::V4l2FourCcToChromiumPixelFormat(v4l2_fourcc); -@@ -55,6 +56,7 @@ - bool favour_mjpeg) { - return V4L2CaptureDelegate::GetListOfUsableFourCcs(favour_mjpeg); - } -+#endif - - const std::string VideoCaptureDevice::Name::GetModel() const { - // |unique_id| is of the form "/dev/video2". |file_name| is "video2". -@@ -90,6 +92,7 @@ - v4l2_thread_.Stop(); - } - -+#if !defined(OS_FREEBSD) - void VideoCaptureDeviceLinux::AllocateAndStart( - const VideoCaptureParams& params, - scoped_ptr<VideoCaptureDevice::Client> client) { -@@ -132,6 +135,7 @@ - capture_impl_, rotation)); - } - } -+#endif - - // static - int VideoCaptureDeviceLinux::TranslatePowerLineFrequencyToV4L2(int frequency) { diff --git a/www/chromium/files/patch-media__video__capture__linux__video_capture_device_linux.h b/www/chromium/files/patch-media__video__capture__linux__video_capture_device_linux.h deleted file mode 100644 index c45d2db30d60..000000000000 --- a/www/chromium/files/patch-media__video__capture__linux__video_capture_device_linux.h +++ /dev/null @@ -1,18 +0,0 @@ ---- media/video/capture/linux/video_capture_device_linux.h.orig 2015-05-21 14:16:06.014473000 -0400 -+++ media/video/capture/linux/video_capture_device_linux.h 2015-05-21 14:32:36.408695000 -0400 -@@ -31,6 +31,7 @@ - explicit VideoCaptureDeviceLinux(const Name& device_name); - ~VideoCaptureDeviceLinux() override; - -+#if !defined(OS_FREEBSD) - // VideoCaptureDevice implementation. - void AllocateAndStart(const VideoCaptureParams& params, - scoped_ptr<Client> client) override; -@@ -38,6 +39,7 @@ - - protected: - void SetRotation(int rotation); -+#endif - - private: - static int TranslatePowerLineFrequencyToV4L2(int frequency); diff --git a/www/chromium/files/patch-skia__skia_chrome.gypi b/www/chromium/files/patch-skia__skia_chrome.gypi index 8e88c67a0ba7..22651eb2f119 100644 --- a/www/chromium/files/patch-skia__skia_chrome.gypi +++ b/www/chromium/files/patch-skia__skia_chrome.gypi @@ -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', diff --git a/www/chromium/files/patch-third_party__pdfium__fpdfsdk__src__javascript__PublicMethods.cpp b/www/chromium/files/patch-third_party__pdfium__fpdfsdk__src__javascript__PublicMethods.cpp index 9e163796efe6..6b7f2a91fbc3 100644 --- a/www/chromium/files/patch-third_party__pdfium__fpdfsdk__src__javascript__PublicMethods.cpp +++ b/www/chromium/files/patch-third_party__pdfium__fpdfsdk__src__javascript__PublicMethods.cpp @@ -1,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(); diff --git a/www/chromium/files/patch-third_party__pdfium__fpdfsdk__src__jsapi__fxjs_v8.cpp b/www/chromium/files/patch-third_party__pdfium__fpdfsdk__src__jsapi__fxjs_v8.cpp index 118f9ac53d32..05b2590e815a 100644 --- a/www/chromium/files/patch-third_party__pdfium__fpdfsdk__src__jsapi__fxjs_v8.cpp +++ b/www/chromium/files/patch-third_party__pdfium__fpdfsdk__src__jsapi__fxjs_v8.cpp @@ -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) { diff --git a/www/chromium/files/patch-third_party__webrtc__base__cpumonitor.cc b/www/chromium/files/patch-third_party__webrtc__base__cpumonitor.cc deleted file mode 100644 index cbd6382b93ab..000000000000 --- a/www/chromium/files/patch-third_party__webrtc__base__cpumonitor.cc +++ /dev/null @@ -1,36 +0,0 @@ ---- third_party/webrtc/base/cpumonitor.cc.orig 2014-10-10 09:16:13 UTC -+++ third_party/webrtc/base/cpumonitor.cc -@@ -36,13 +36,13 @@ - #include <mach/task.h> - #endif // defined(WEBRTC_MAC) - --#if defined(WEBRTC_LINUX) -+#if defined(WEBRTC_LINUX) || defined(WEBRTC_BSD) - #include <sys/resource.h> - #include <errno.h> - #include <stdio.h> - #include "webrtc/base/fileutils.h" - #include "webrtc/base/pathutils.h" --#endif // defined(WEBRTC_LINUX) -+#endif // defined(WEBRTC_LINUX) || defined(WEBRTC_BSD) - - #if defined(WEBRTC_MAC) - static uint64 TimeValueTToInt64(const time_value_t &time_value) { -@@ -342,7 +342,7 @@ - TimeValueTToInt64(task_term_info.system_time)); - #endif // defined(WEBRTC_MAC) - --#if defined(WEBRTC_LINUX) -+#if defined(WEBRTC_LINUX) || defined(WEBRTC_BSD) - rusage usage; - if (getrusage(RUSAGE_SELF, &usage) < 0) { - LOG_ERR(LS_ERROR) << "getrusage failed"; -@@ -352,7 +352,7 @@ - const uint64 cpu_times = - (usage.ru_utime.tv_sec + usage.ru_stime.tv_sec) * kNumMicrosecsPerSec + - usage.ru_utime.tv_usec + usage.ru_stime.tv_usec; --#endif // defined(WEBRTC_LINUX) -+#endif // defined(WEBRTC_LINUX) || defined(WEBRTC_BSD) - - #if defined(__native_client__) - // TODO(ryanpetrie): Implement this via PPAPI when it's available. diff --git a/www/chromium/files/patch-third_party__webrtc__base__systeminfo.cc b/www/chromium/files/patch-third_party__webrtc__base__systeminfo.cc index 8b1846e0e277..4858955e8f4d 100644 --- a/www/chromium/files/patch-third_party__webrtc__base__systeminfo.cc +++ b/www/chromium/files/patch-third_party__webrtc__base__systeminfo.cc @@ -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()) { diff --git a/www/chromium/files/patch-third_party__webrtc__system_wrappers__source__cpu_info.cc b/www/chromium/files/patch-third_party__webrtc__system_wrappers__source__cpu_info.cc deleted file mode 100644 index 64289e1a9e36..000000000000 --- a/www/chromium/files/patch-third_party__webrtc__system_wrappers__source__cpu_info.cc +++ /dev/null @@ -1,34 +0,0 @@ ---- third_party/webrtc/system_wrappers/source/cpu_info.cc.orig 2014-10-10 09:16:13 UTC -+++ third_party/webrtc/system_wrappers/source/cpu_info.cc -@@ -12,7 +12,10 @@ - - #if defined(_WIN32) - #include <Windows.h> --#elif defined(WEBRTC_MAC) -+#elif defined(WEBRTC_MAC) || defined(WEBRTC_BSD) -+#if defined(WEBRTC_BSD) -+#include <sys/param.h> -+#endif - #include <sys/sysctl.h> - #include <sys/types.h> - #else // defined(WEBRTC_LINUX) or defined(WEBRTC_ANDROID) -@@ -34,13 +37,17 @@ - WEBRTC_TRACE(kTraceStateInfo, kTraceUtility, -1, - "Available number of cores:%d", number_of_cores_); - --#elif defined(WEBRTC_LINUX) || defined(WEBRTC_ANDROID) -+#elif (defined(WEBRTC_LINUX) || defined(WEBRTC_ANDROID)) && !defined(WEBRTC_BSD) - number_of_cores_ = static_cast<uint32_t>(sysconf(_SC_NPROCESSORS_ONLN)); - WEBRTC_TRACE(kTraceStateInfo, kTraceUtility, -1, - "Available number of cores:%d", number_of_cores_); - --#elif defined(WEBRTC_MAC) -+#elif defined(WEBRTC_MAC) || defined(WEBRTC_BSD) -+#if defined(WEBRTC_BSD) -+ int name[] = {CTL_HW, HW_NCPU}; -+#else - int name[] = {CTL_HW, HW_AVAILCPU}; -+#endif - int ncpu; - size_t size = sizeof(ncpu); - if (0 == sysctl(name, 2, &ncpu, &size, NULL, 0)) { diff --git a/www/chromium/files/patch-ui__gl__gl_surface_glx.cc b/www/chromium/files/patch-ui__gl__gl_surface_glx.cc index b8b571fd05b0..56f22755b419 100644 --- a/www/chromium/files/patch-ui__gl__gl_surface_glx.cc +++ b/www/chromium/files/patch-ui__gl__gl_surface_glx.cc @@ -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 diff --git a/www/chromium/files/patch-ui__gl__sync_control_vsync_provider.cc b/www/chromium/files/patch-ui__gl__sync_control_vsync_provider.cc index 5ce21b677e9f..3bcbb62628d0 100644 --- a/www/chromium/files/patch-ui__gl__sync_control_vsync_provider.cc +++ b/www/chromium/files/patch-ui__gl__sync_control_vsync_provider.cc @@ -1,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_); diff --git a/www/chromium/files/patch-ui__resources__ui_resources.grd b/www/chromium/files/patch-ui__resources__ui_resources.grd index d5b93d24aa94..0969426fee69 100644 --- a/www/chromium/files/patch-ui__resources__ui_resources.grd +++ b/www/chromium/files/patch-ui__resources__ui_resources.grd @@ -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" /> diff --git a/www/chromium/files/patch-ui__views__bubble__bubble_delegate.cc b/www/chromium/files/patch-ui__views__bubble__bubble_delegate.cc index 3de240129f4a..57439c97ff21 100644 --- a/www/chromium/files/patch-ui__views__bubble__bubble_delegate.cc +++ b/www/chromium/files/patch-ui__views__bubble__bubble_delegate.cc @@ -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 diff --git a/www/chromium/files/patch-ui__views__controls__button__label_button.cc b/www/chromium/files/patch-ui__views__controls__button__label_button.cc index 7431942d61f9..051eaac7a6c4 100644 --- a/www/chromium/files/patch-ui__views__controls__button__label_button.cc +++ b/www/chromium/files/patch-ui__views__controls__button__label_button.cc @@ -1,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( diff --git a/www/chromium/files/patch-ui__views__controls__menu__menu_scroll_view_container.cc b/www/chromium/files/patch-ui__views__controls__menu__menu_scroll_view_container.cc deleted file mode 100644 index 1102de17b801..000000000000 --- a/www/chromium/files/patch-ui__views__controls__menu__menu_scroll_view_container.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- ui/views/controls/menu/menu_scroll_view_container.cc.orig 2015-04-28 08:06:01.162896000 -0400 -+++ ui/views/controls/menu/menu_scroll_view_container.cc 2015-04-28 08:06:36.439435000 -0400 -@@ -281,7 +281,7 @@ - int padding = menu_config.corner_radius > 0 ? - kBorderPaddingDueToRoundedCorners : 0; - --#if defined(USE_AURA) && !(defined(OS_LINUX) && !defined(OS_CHROMEOS)) -+#if defined(USE_AURA) && !((defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)) - if (menu_config.native_theme == ui::NativeThemeAura::instance()) { - // In case of NativeThemeAura the border gets drawn with the shadow. - // Furthermore no additional padding is wanted. |