Track USB device configuration state in Blink.

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 d4bc001f16c4fc67ca73446b92413b26eed81e82..51688afcf0a0851d8404e5a36b79996edfc7c19e 100644
--- a/third_party/WebKit/Source/modules/webusb/USBDevice.cpp
+++ b/third_party/WebKit/Source/modules/webusb/USBDevice.cpp
@@ -26,8 +26,9 @@ namespace blink {
 
 namespace {
 
-const char kOpenCloseInProgress[] = "An open() or close() task is in progress.";
-const char kOpenRequired[] = "The device must be open()ed first.";
+const char kDeviceStateChangeInProgress[] = "An operation that changes the device state is in progress.";
+const char kOpenRequired[] = "The device must be opened first.";
+const char kNotConfigured[] = "The device must have a configuration selected.";
 
 DOMException* convertControlTransferParameters(
     WebUSBDevice::TransferDirection direction,
@@ -110,27 +111,37 @@ private:
     bool m_desiredState; // true: open, false: closed
 };
 
-class GetConfigurationPromiseAdapter : public WebCallbacks<uint8_t, const WebUSBError&> {
+class SelectConfigurationPromiseAdapter : public WebCallbacks<void, const WebUSBError&> {
 public:
-    GetConfigurationPromiseAdapter(USBDevice* device, ScriptPromiseResolver* resolver) : m_device(device), m_resolver(resolver) {}
+    SelectConfigurationPromiseAdapter(USBDevice* device, ScriptPromiseResolver* resolver, int configurationIndex)
+        : m_device(device)
+        , m_resolver(resolver)
+        , m_configurationIndex(configurationIndex)
+    {
+    }
 
-    void onSuccess(uint8_t value) override
+    void onSuccess() override
     {
         if (!m_resolver->getExecutionContext() || m_resolver->getExecutionContext()->activeDOMObjectsAreStopped())
             return;
-        m_resolver->resolve(USBConfiguration::createFromValue(m_device, value));
+        if (m_device)
+            m_device->onConfigurationSelected(true /* success */, m_configurationIndex);
+        m_resolver->resolve();
     }
 
     void onError(const WebUSBError& e) override
     {
         if (!m_resolver->getExecutionContext() || m_resolver->getExecutionContext()->activeDOMObjectsAreStopped())
             return;
+        if (m_device)
+            m_device->onConfigurationSelected(false /* failure */, m_configurationIndex);
         m_resolver->reject(USBError::take(m_resolver, e));
     }
 
 private:
-    Persistent<USBDevice> m_device;
+    WeakPersistent<USBDevice> m_device;
     Persistent<ScriptPromiseResolver> m_resolver;
+    int m_configurationIndex;
 };
 
 class InputTransferResult {
@@ -234,12 +245,41 @@ USBDevice* USBDevice::take(ScriptPromiseResolver* resolver, PassOwnPtr<WebUSBDev
     return USBDevice::create(device, resolver->getExecutionContext());
 }
 
+USBDevice::USBDevice(PassOwnPtr<WebUSBDevice> device, ExecutionContext* context)
+    : ContextLifecycleObserver(context)
+    , m_device(device)
+    , m_opened(false)
+    , m_deviceStateChangeInProgress(false)
+    , m_configurationIndex(-1)
+{
+    for (size_t i = 0; i < info().configurations.size(); ++i) {

[juncai, 2016/03/11 02:17:21]

This info() is a function call, maybe can store it into a variable:
const WebUSBDeviceInfo& info = info(); to avoid multiple function calls in a for
loop.

[Reilly Grant (use Gerrit), 2016/03/12 02:43:03]

Done.

+        if (info().configurations[i].configurationValue == info().activeConfiguration) {
+            m_configurationIndex = i;
+            break;
+        }
+    }
+}
+
 void USBDevice::onDeviceOpenedOrClosed(bool opened)
 {
     m_opened = opened;
     m_deviceStateChangeInProgress = false;
 }
 
+void USBDevice::onConfigurationSelected(bool success, int configurationIndex)
+{
+    if (success)
+        m_configurationIndex = configurationIndex;
+    m_deviceStateChangeInProgress = false;
+}
+
+USBConfiguration* USBDevice::configuration() const
+{
+    if (m_configurationIndex != -1)
+        return USBConfiguration::create(this, m_configurationIndex);
+    return nullptr;
+}
+
 HeapVector<Member<USBConfiguration>> USBDevice::configurations() const
 {
     HeapVector<Member<USBConfiguration>> configurations;
@@ -253,7 +293,7 @@ ScriptPromise USBDevice::open(ScriptState* scriptState)
     ScriptPromiseResolver* resolver = ScriptPromiseResolver::create(scriptState);
     ScriptPromise promise = resolver->promise();
     if (m_deviceStateChangeInProgress) {
-        resolver->reject(DOMException::create(InvalidStateError, kOpenCloseInProgress));
+        resolver->reject(DOMException::create(InvalidStateError, kDeviceStateChangeInProgress));
     } else if (m_opened) {
         resolver->resolve();
     } else {
@@ -268,7 +308,7 @@ ScriptPromise USBDevice::close(ScriptState* scriptState)
     ScriptPromiseResolver* resolver = ScriptPromiseResolver::create(scriptState);
     ScriptPromise promise = resolver->promise();
     if (m_deviceStateChangeInProgress) {
-        resolver->reject(DOMException::create(InvalidStateError, kOpenCloseInProgress));
+        resolver->reject(DOMException::create(InvalidStateError, kDeviceStateChangeInProgress));
     } else if (!m_opened) {
         resolver->resolve();
     } else {
@@ -278,22 +318,31 @@ ScriptPromise USBDevice::close(ScriptState* scriptState)
     return promise;
 }
 
-ScriptPromise USBDevice::getConfiguration(ScriptState* scriptState)
-{
-    ScriptPromiseResolver* resolver = ScriptPromiseResolver::create(scriptState);
-    ScriptPromise promise = resolver->promise();
-    m_device->getConfiguration(new GetConfigurationPromiseAdapter(this, resolver));
-    return promise;
-}
-
-ScriptPromise USBDevice::setConfiguration(ScriptState* scriptState, uint8_t configurationValue)
+ScriptPromise USBDevice::selectConfiguration(ScriptState* scriptState, uint8_t configurationValue)
 {
     ScriptPromiseResolver* resolver = ScriptPromiseResolver::create(scriptState);
     ScriptPromise promise = resolver->promise();
-    if (!m_opened)
+    if (!m_opened) {
         resolver->reject(DOMException::create(InvalidStateError, kOpenRequired));
-    else
-        m_device->setConfiguration(configurationValue, new CallbackPromiseAdapter<void, USBError>(resolver));
+    } else if (m_deviceStateChangeInProgress) {
+        resolver->reject(DOMException::create(InvalidStateError, kDeviceStateChangeInProgress));
+    } else {
+        int configurationIndex = -1;
+        for (size_t i = 0; i < info().configurations.size(); ++i) {

[juncai, 2016/03/11 02:17:21]

ditto.

[Reilly Grant (use Gerrit), 2016/03/12 02:43:02]

Done.

+            if (info().configurations[i].configurationValue == configurationValue) {
+                configurationIndex = i;
+                break;
+            }
+        }
+        if (configurationIndex == -1) {
+            resolver->reject(DOMException::create(NotFoundError, "The configuration value provided is not supported by the device."));
+        } else if (m_configurationIndex == configurationIndex) {
+            resolver->resolve();
+        } else {
+            m_deviceStateChangeInProgress = true;
+            m_device->setConfiguration(configurationValue, new SelectConfigurationPromiseAdapter(this, resolver, configurationIndex));
+        }
+    }
     return promise;
 }
 
@@ -303,6 +352,10 @@ ScriptPromise USBDevice::claimInterface(ScriptState* scriptState, uint8_t interf
     ScriptPromise promise = resolver->promise();
     if (!m_opened)
         resolver->reject(DOMException::create(InvalidStateError, kOpenRequired));
+    else if (m_deviceStateChangeInProgress)
+        resolver->reject(DOMException::create(InvalidStateError, kDeviceStateChangeInProgress));
+    else if (m_configurationIndex == -1)
+        resolver->reject(DOMException::create(InvalidStateError, kNotConfigured));
     else
         m_device->claimInterface(interfaceNumber, new CallbackPromiseAdapter<void, USBError>(resolver));
     return promise;
@@ -314,6 +367,10 @@ ScriptPromise USBDevice::releaseInterface(ScriptState* scriptState, uint8_t inte
     ScriptPromise promise = resolver->promise();
     if (!m_opened)
         resolver->reject(DOMException::create(InvalidStateError, kOpenRequired));
+    else if (m_deviceStateChangeInProgress)
+        resolver->reject(DOMException::create(InvalidStateError, kDeviceStateChangeInProgress));
+    else if (m_configurationIndex == -1)
+        resolver->reject(DOMException::create(InvalidStateError, kNotConfigured));
     else
         m_device->releaseInterface(interfaceNumber, new CallbackPromiseAdapter<void, USBError>(resolver));
     return promise;
@@ -325,6 +382,10 @@ ScriptPromise USBDevice::setInterface(ScriptState* scriptState, uint8_t interfac
     ScriptPromise promise = resolver->promise();
     if (!m_opened)
         resolver->reject(DOMException::create(InvalidStateError, kOpenRequired));
+    else if (m_deviceStateChangeInProgress)
+        resolver->reject(DOMException::create(InvalidStateError, kDeviceStateChangeInProgress));
+    else if (m_configurationIndex == -1)
+        resolver->reject(DOMException::create(InvalidStateError, kNotConfigured));
     else
         m_device->setInterface(interfaceNumber, alternateSetting, new CallbackPromiseAdapter<void, USBError>(resolver));
     return promise;
@@ -336,17 +397,18 @@ ScriptPromise USBDevice::controlTransferIn(ScriptState* scriptState, const USBCo
     ScriptPromise promise = resolver->promise();
     if (!m_opened) {
         resolver->reject(DOMException::create(InvalidStateError, kOpenRequired));
-        return promise;
-    }
-
-    WebUSBDevice::ControlTransferParameters parameters;
-    DOMException* error = convertControlTransferParameters(WebUSBDevice::TransferDirection::In, setup, &parameters);
-    if (error) {
-        resolver->reject(error);
-        return promise;
+    } else if (m_deviceStateChangeInProgress) {
+        resolver->reject(DOMException::create(InvalidStateError, kDeviceStateChangeInProgress));
+    } else if (m_configurationIndex == -1) {
+        resolver->reject(DOMException::create(InvalidStateError, kNotConfigured));
+    } else {
+        WebUSBDevice::ControlTransferParameters parameters;
+        DOMException* error = convertControlTransferParameters(WebUSBDevice::TransferDirection::In, setup, &parameters);
+        if (error)
+            resolver->reject(error);
+        else
+            m_device->controlTransfer(parameters, nullptr, length, 0, new CallbackPromiseAdapter<InputTransferResult, USBError>(resolver));
     }
-
-    m_device->controlTransfer(parameters, nullptr, length, 0, new CallbackPromiseAdapter<InputTransferResult, USBError>(resolver));
     return promise;
 }
 
@@ -356,17 +418,18 @@ ScriptPromise USBDevice::controlTransferOut(ScriptState* scriptState, const USBC
     ScriptPromise promise = resolver->promise();
     if (!m_opened) {
         resolver->reject(DOMException::create(InvalidStateError, kOpenRequired));
-        return promise;
-    }
-
-    WebUSBDevice::ControlTransferParameters parameters;
-    DOMException* error = convertControlTransferParameters(WebUSBDevice::TransferDirection::Out, setup, &parameters);
-    if (error) {
-        resolver->reject(error);
-        return promise;
+    } else if (m_deviceStateChangeInProgress) {
+        resolver->reject(DOMException::create(InvalidStateError, kDeviceStateChangeInProgress));
+    } else if (m_configurationIndex == -1) {
+        resolver->reject(DOMException::create(InvalidStateError, kNotConfigured));
+    } else {
+        WebUSBDevice::ControlTransferParameters parameters;
+        DOMException* error = convertControlTransferParameters(WebUSBDevice::TransferDirection::Out, setup, &parameters);
+        if (error)
+            resolver->reject(error);
+        else
+            m_device->controlTransfer(parameters, nullptr, 0, 0, new CallbackPromiseAdapter<OutputTransferResult, USBError>(resolver));
     }
-
-    m_device->controlTransfer(parameters, nullptr, 0, 0, new CallbackPromiseAdapter<OutputTransferResult, USBError>(resolver));
     return promise;
 }
 
@@ -376,18 +439,20 @@ ScriptPromise USBDevice::controlTransferOut(ScriptState* scriptState, const USBC
     ScriptPromise promise = resolver->promise();
     if (!m_opened) {
         resolver->reject(DOMException::create(InvalidStateError, kOpenRequired));
-        return promise;
-    }
-
-    WebUSBDevice::ControlTransferParameters parameters;
-    DOMException* error = convertControlTransferParameters(WebUSBDevice::TransferDirection::Out, setup, &parameters);
-    if (error) {
-        resolver->reject(error);
-        return promise;
+    } else if (m_deviceStateChangeInProgress) {
+        resolver->reject(DOMException::create(InvalidStateError, kDeviceStateChangeInProgress));
+    } else if (m_configurationIndex == -1) {
+        resolver->reject(DOMException::create(InvalidStateError, kNotConfigured));
+    } else {
+        WebUSBDevice::ControlTransferParameters parameters;
+        DOMException* error = convertControlTransferParameters(WebUSBDevice::TransferDirection::Out, setup, &parameters);
+        if (error) {
+            resolver->reject(error);
+        } else {
+            BufferSource buffer(data);
+            m_device->controlTransfer(parameters, buffer.data(), buffer.size(), 0, new CallbackPromiseAdapter<OutputTransferResult, USBError>(resolver));
+        }
     }
-
-    BufferSource buffer(data);
-    m_device->controlTransfer(parameters, buffer.data(), buffer.size(), 0, new CallbackPromiseAdapter<OutputTransferResult, USBError>(resolver));
     return promise;
 }
 
@@ -397,6 +462,10 @@ ScriptPromise USBDevice::clearHalt(ScriptState* scriptState, uint8_t endpointNum
     ScriptPromise promise = resolver->promise();
     if (!m_opened)
         resolver->reject(DOMException::create(InvalidStateError, kOpenRequired));
+    else if (m_deviceStateChangeInProgress)
+        resolver->reject(DOMException::create(InvalidStateError, kDeviceStateChangeInProgress));
+    else if (m_configurationIndex == -1)
+        resolver->reject(DOMException::create(InvalidStateError, kNotConfigured));
     else
         m_device->clearHalt(endpointNumber, new CallbackPromiseAdapter<void, USBError>(resolver));
     return promise;
@@ -408,6 +477,10 @@ ScriptPromise USBDevice::transferIn(ScriptState* scriptState, uint8_t endpointNu
     ScriptPromise promise = resolver->promise();
     if (!m_opened)
         resolver->reject(DOMException::create(InvalidStateError, kOpenRequired));
+    else if (m_deviceStateChangeInProgress)
+        resolver->reject(DOMException::create(InvalidStateError, kDeviceStateChangeInProgress));
+    else if (m_configurationIndex == -1)
+        resolver->reject(DOMException::create(InvalidStateError, kNotConfigured));
     else
         m_device->transfer(WebUSBDevice::TransferDirection::In, endpointNumber, nullptr, length, 0, new CallbackPromiseAdapter<InputTransferResult, USBError>(resolver));
     return promise;
@@ -419,6 +492,10 @@ ScriptPromise USBDevice::transferOut(ScriptState* scriptState, uint8_t endpointN
     ScriptPromise promise = resolver->promise();
     if (!m_opened) {
         resolver->reject(DOMException::create(InvalidStateError, kOpenRequired));
+    } else if (m_deviceStateChangeInProgress) {
+        resolver->reject(DOMException::create(InvalidStateError, kDeviceStateChangeInProgress));
+    } else if (m_configurationIndex == -1) {
+        resolver->reject(DOMException::create(InvalidStateError, kNotConfigured));
     } else {
         BufferSource buffer(data);
         m_device->transfer(WebUSBDevice::TransferDirection::Out, endpointNumber, buffer.data(), buffer.size(), 0, new CallbackPromiseAdapter<OutputTransferResult, USBError>(resolver));
@@ -432,6 +509,10 @@ ScriptPromise USBDevice::isochronousTransferIn(ScriptState* scriptState, uint8_t
     ScriptPromise promise = resolver->promise();
     if (!m_opened)
         resolver->reject(DOMException::create(InvalidStateError, kOpenRequired));
+    else if (m_deviceStateChangeInProgress)
+        resolver->reject(DOMException::create(InvalidStateError, kDeviceStateChangeInProgress));
+    else if (m_configurationIndex == -1)
+        resolver->reject(DOMException::create(InvalidStateError, kNotConfigured));
     else
         m_device->isochronousTransfer(WebUSBDevice::TransferDirection::In, endpointNumber, nullptr, 0, packetLengths, 0, new CallbackPromiseAdapter<IsochronousInputTransferResult, USBError>(resolver));
     return promise;
@@ -443,6 +524,10 @@ ScriptPromise USBDevice::isochronousTransferOut(ScriptState* scriptState, uint8_
     ScriptPromise promise = resolver->promise();
     if (!m_opened) {
         resolver->reject(DOMException::create(InvalidStateError, kOpenRequired));
+    } else if (m_deviceStateChangeInProgress) {
+        resolver->reject(DOMException::create(InvalidStateError, kDeviceStateChangeInProgress));
+    } else if (m_configurationIndex == -1) {
+        resolver->reject(DOMException::create(InvalidStateError, kNotConfigured));
     } else {
         BufferSource buffer(data);
         m_device->isochronousTransfer(WebUSBDevice::TransferDirection::Out, endpointNumber, buffer.data(), buffer.size(), packetLengths, 0, new CallbackPromiseAdapter<IsochronousOutputTransferResult, USBError>(resolver));
@@ -456,6 +541,8 @@ ScriptPromise USBDevice::reset(ScriptState* scriptState)
     ScriptPromise promise = resolver->promise();
     if (!m_opened)
         resolver->reject(DOMException::create(InvalidStateError, kOpenRequired));
+    else if (m_deviceStateChangeInProgress)
+        resolver->reject(DOMException::create(InvalidStateError, kDeviceStateChangeInProgress));
     else
         m_device->reset(new CallbackPromiseAdapter<void, USBError>(resolver));
     return promise;