diff options
| author | Rene Ladan <rene@FreeBSD.org> | 2015-07-28 18:35:43 +0000 |
|---|---|---|
| committer | Rene Ladan <rene@FreeBSD.org> | 2015-07-28 18:35:43 +0000 |
| commit | 21a6834bf34b715e6738679557d65e23a7559049 (patch) | |
| tree | b26c6693a07a6978d438855c60f44e308c1dbcb7 /www/chromium/files/patch-device__usb__usb_service_impl.cc | |
| parent | Fix file permissions so WWWDIR is not writable by WWWOWN (diff) | |
www/chromium: update to 44.0.2403.107
Note that chromium is currently broken on 9.X due to some obscure compiler
error caused possibly caused by Ports GCC.
Submitted by: LeFroid
Obtained from: https://github.com/gliaskos/freebsd-chromium/pull/25
MFH: 2015Q3
Security: http://vuxml.freebsd.org/freebsd/9d732078-32c7-11e5-b263-00262d5ed8ee.html
Diffstat (limited to 'www/chromium/files/patch-device__usb__usb_service_impl.cc')
| -rw-r--r-- | www/chromium/files/patch-device__usb__usb_service_impl.cc | 40 |
1 files changed, 27 insertions, 13 deletions
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 1bc9c6d553ae..b36f44e90004 100644 --- a/www/chromium/files/patch-device__usb__usb_service_impl.cc +++ b/www/chromium/files/patch-device__usb__usb_service_impl.cc @@ -1,42 +1,56 @@ ---- device/usb/usb_service_impl.cc.orig 2015-04-19 21:12:40.000000000 +0200 -+++ device/usb/usb_service_impl.cc 2015-04-19 21:16:15.000000000 +0200 -@@ -113,6 +113,7 @@ - hotplug_enabled_(false), +--- device/usb/usb_service_impl.cc.orig 2015-07-15 16:30:04.000000000 -0400 ++++ device/usb/usb_service_impl.cc 2015-07-22 20:14:21.946835000 -0400 +@@ -17,7 +17,11 @@ + #include "base/thread_task_runner_handle.h" + #include "components/device_event_log/device_event_log.h" + #include "device/usb/usb_error.h" ++#if defined(OS_FREEBSD) ++#include "libusb.h" ++#else + #include "third_party/libusb/src/libusb/libusb.h" ++#endif + + #if defined(OS_WIN) + #include <setupapi.h> +@@ -294,6 +298,7 @@ weak_factory_(this) { - task_runner_ = base::ThreadTaskRunnerHandle::Get(); + base::MessageLoop::current()->AddDestructionObserver(this); + +#if !defined(OS_FREEBSD) int rv = libusb_hotplug_register_callback( context_->context(), static_cast<libusb_hotplug_event>(LIBUSB_HOTPLUG_EVENT_DEVICE_ARRIVED | -@@ -130,12 +131,15 @@ - base::Unretained(ui_thread_helper_))); +@@ -321,14 +326,16 @@ + } #endif // OS_WIN } +#endif // !OS_FREEBSD } 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 - #if defined(OS_WIN) - if (ui_thread_helper_) { - ui_task_runner_->DeleteSoon(FROM_HERE, ui_thread_helper_); -@@ -219,6 +223,7 @@ + for (const auto& map_entry : devices_) { + map_entry.second->OnDisconnect(); } +@@ -566,6 +573,7 @@ + device->OnDisconnect(); } +#if !defined(OS_FREEBSD) // static int LIBUSB_CALL UsbServiceImpl::HotplugCallback(libusb_context* context, PlatformUsbDevice device, -@@ -256,6 +261,7 @@ +@@ -603,6 +611,7 @@ return 0; } +#endif // !OS_FREEBSD - void UsbServiceImpl::OnDeviceAdded(PlatformUsbDevice platform_device) { + void UsbServiceImpl::OnPlatformDeviceAdded(PlatformUsbDevice platform_device) { DCHECK(CalledOnValidThread()); |