Make new WebUSB implementation more resilient to garbage collection.

third_party/WebKit/Source/modules/webusb/USBDevice.cpp

Index: third_party/WebKit/Source/modules/webusb/USBDevice.cpp
diff --git a/third_party/WebKit/Source/modules/webusb/USBDevice.cpp b/third_party/WebKit/Source/modules/webusb/USBDevice.cpp
index 77934f5e1c982e398943edc56b408d11e48b6f91..09d84f8660239c0fbaebf2b99e7ed4624fc43edb 100644
--- a/third_party/WebKit/Source/modules/webusb/USBDevice.cpp
+++ b/third_party/WebKit/Source/modules/webusb/USBDevice.cpp
@@ -99,16 +99,8 @@ USBDevice::USBDevice(usb::DeviceInfoPtr deviceInfo, usb::DevicePtr device, Execu
     , m_deviceStateChangeInProgress(false)
     , m_configurationIndex(-1)
 {
-    if (m_device) {
-        m_device.set_connection_error_handler([this]() {
-            m_device.reset();
-            m_opened = false;
-            for (ScriptPromiseResolver* resolver : m_deviceRequests) {
-                if (isActive(resolver))
-                    resolver->reject(DOMException::create(NotFoundError, kDeviceUnavailable));
-            }
-        });
-    }
+    if (m_device)
+        m_device.set_connection_error_handler(createBaseCallback(bind(&USBDevice::onConnectionError, WeakPersistentThisPointer<USBDevice>(this))));

[haraken, 2016/04/25 08:47:05]

Just to confirm: Your intention is that the error callback should not be called
if the USBDevice object is already garbage-collected when the error callback is
about to run, right?

I'm curious why you cannot just use a Persistent handle (implicitly created by
WTF::bind when you pass the |this| pointer).

     int configurationIndex = findConfigurationIndex(info().active_configuration);
     if (configurationIndex != -1)
         onConfigurationSelected(true /* success */, configurationIndex);
@@ -116,7 +108,8 @@ USBDevice::USBDevice(usb::DeviceInfoPtr deviceInfo, usb::DevicePtr device, Execu
 
 USBDevice::~USBDevice()
 {
-    DCHECK(!m_device);
+    // |m_device| may still be valid but there should be no more outstanding
+    // requests because each holds a persistent handle to this object.
     DCHECK(m_deviceRequests.isEmpty());
 }
 
@@ -797,4 +790,15 @@ void USBDevice::asyncReset(ScriptPromiseResolver* resolver, bool success)
         resolver->reject(DOMException::create(NetworkError, "Unable to reset the device."));
 }
 
+void USBDevice::onConnectionError()
+{
+    m_device.reset();
+    m_opened = false;
+    for (ScriptPromiseResolver* resolver : m_deviceRequests) {
+        if (isActive(resolver))
+            resolver->reject(DOMException::create(NotFoundError, kDeviceUnavailable));
+    }
+    m_deviceRequests.clear();
+}
+
 } // namespace blink