summaryrefslogtreecommitdiff
path: root/www/chromium/files/patch-device__usb__usb_service_impl.cc
diff options
context:
space:
mode:
authorRene Ladan <rene@FreeBSD.org>2016-06-07 20:28:41 +0000
committerRene Ladan <rene@FreeBSD.org>2016-06-07 20:28:41 +0000
commit45d3cc73dc908af3262c6a714cb755edd03f071a (patch)
tree564e40b2ccfe669385077be2c94de93ac0c15fe3 /www/chromium/files/patch-device__usb__usb_service_impl.cc
parentUpdate to 6.0p1. Notable fixes: (diff)
www/chromium: update to 51.0.2704.84
A lot of patch files are renamed in this update. Submitted by: Timothy Vaccarelli Obtained from: https://github.com/LeFroid/ MFH: 2016Q2 Security: http://vuxml.freebsd.org/freebsd/c039a761-2c29-11e6-8912-3065ec8fd3ec.html Security: http://vuxml.freebsd.org/freebsd/1a6bbb95-24b8-11e6-bd31-3065ec8fd3ec.html Security: http://vuxml.freebsd.org/freebsd/4dfafa16-24ba-11e6-bd31-3065ec8fd3ec.html Security: http://vuxml.freebsd.org/freebsd/7da1da96-24bb-11e6-bd31-3065ec8fd3ec.html Security: http://vuxml.freebsd.org/freebsd/6d8505f0-0614-11e6-b39c-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.cc59
1 files changed, 0 insertions, 59 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
deleted file mode 100644
index 80b221282dfb..000000000000
--- a/www/chromium/files/patch-device__usb__usb_service_impl.cc
+++ /dev/null
@@ -1,59 +0,0 @@
---- device/usb/usb_service_impl.cc.orig 2015-12-04 22:33:43.708484000 +0100
-+++ device/usb/usb_service_impl.cc 2015-12-04 22:39:47.903086000 +0100
-@@ -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
- #include "third_party/libusb/src/libusb/libusb.h"
-+#endif
-
- #if defined(OS_WIN)
- #include <setupapi.h>
-@@ -541,6 +545,7 @@
- }
- context_ = new UsbContext(platform_context);
-
-+#if !defined(OS_FREEBSD)
- rv = libusb_hotplug_register_callback(
- context_->context(),
- static_cast<libusb_hotplug_event>(LIBUSB_HOTPLUG_EVENT_DEVICE_ARRIVED |
-@@ -553,6 +558,8 @@
- }
-
- RefreshDevices();
-+#endif // !defined(OS_FREEBSD)
-+
- #if defined(OS_WIN)
- DeviceMonitorWin* device_monitor = DeviceMonitorWin::GetForAllInterfaces();
- if (device_monitor) {
-@@ -562,9 +569,11 @@
- }
-
- UsbServiceImpl::~UsbServiceImpl() {
-+#if !defined(OS_FREEBSD)
- if (hotplug_enabled_) {
- libusb_hotplug_deregister_callback(context_->context(), hotplug_handle_);
- }
-+#endif // !defined(OS_FREEBSD)
- for (const auto& map_entry : devices_) {
- map_entry.second->OnDisconnect();
- }
-@@ -802,6 +811,7 @@
- device->OnDisconnect();
- }
-
-+#if !defined(OS_FREEBSD)
- // static
- int LIBUSB_CALL UsbServiceImpl::HotplugCallback(libusb_context* context,
- PlatformUsbDevice device,
-@@ -839,6 +849,7 @@
-
- return 0;
- }
-+#endif // !defined(OS_FREEBSD)
-
- void UsbServiceImpl::OnPlatformDeviceAdded(PlatformUsbDevice platform_device) {
- DCHECK(CalledOnValidThread());