Implement WebBluetooth getDescriptor[s]

third_party/WebKit/Source/modules/bluetooth/BluetoothRemoteGATTCharacteristic.cpp

Index: third_party/WebKit/Source/modules/bluetooth/BluetoothRemoteGATTCharacteristic.cpp
diff --git a/third_party/WebKit/Source/modules/bluetooth/BluetoothRemoteGATTCharacteristic.cpp b/third_party/WebKit/Source/modules/bluetooth/BluetoothRemoteGATTCharacteristic.cpp
index 1177d433d2343380f65a46325157c8119712f8ab..d12676128742157d7085fe913091aff6958bc024 100644
--- a/third_party/WebKit/Source/modules/bluetooth/BluetoothRemoteGATTCharacteristic.cpp
+++ b/third_party/WebKit/Source/modules/bluetooth/BluetoothRemoteGATTCharacteristic.cpp
@@ -13,8 +13,10 @@
 #include "core/inspector/ConsoleMessage.h"
 #include "modules/bluetooth/BluetoothCharacteristicProperties.h"
 #include "modules/bluetooth/BluetoothError.h"
+#include "modules/bluetooth/BluetoothRemoteGATTDescriptor.h"
 #include "modules/bluetooth/BluetoothRemoteGATTService.h"
 #include "modules/bluetooth/BluetoothSupplement.h"
+#include "modules/bluetooth/BluetoothUUID.h"
 #include "public/platform/modules/bluetooth/WebBluetooth.h"
 #include <memory>
 
@@ -117,6 +119,137 @@ void BluetoothRemoteGATTCharacteristic::addedEventListener(
   }
 }
 
+// TODO dft:  maybe we can share with GetCharacteristicsCallback

[ortuno, 2016/11/21 03:34:09]

TODO(crbug.com/[new bug number]): Make class that can be shared with
GetCharacteristicsCallback.

fwiw: This pattern will go away once we Onion Soup this. So the new issue might
not be worth it. 

[dougt, 2016/11/22 01:47:16]

Onion Soup for the win.  I'll remove my comment for now. 

+// Class that allows us to resolve the promise with a single Descriptor or
+// with a vector owning the descriptors.
+class GetDescriptorsCallback : public WebBluetoothGetDescriptorsCallbacks {
+ public:
+  GetDescriptorsCallback(BluetoothRemoteGATTService* service,

[ortuno, 2016/11/21 03:34:09]

I think you forgot to change this to BluetoothRemoteGATTCharacteristic. The
characteristic object has a gatt() method so you don't have to do
m_characteristic->service()->device()->gatt().

[dougt, 2016/11/22 01:47:16]

Acknowledged.

+                         mojom::blink::WebBluetoothGATTQueryQuantity quantity,
+                         ScriptPromiseResolver* resolver)
+      : m_service(service), m_quantity(quantity), m_resolver(resolver) {
+    // We always check that the device is connected before constructing this
+    // object.
+    CHECK(m_service->device()->gatt()->connected());
+    m_service->device()->gatt()->AddToActiveAlgorithms(m_resolver.get());
+  }
+
+  void onSuccess(const WebVector<WebBluetoothRemoteGATTDescriptorInit*>&
+                     webDescriptors) override {
+    if (!m_resolver->getExecutionContext() ||
+        m_resolver->getExecutionContext()->activeDOMObjectsAreStopped())
+      return;
+
+    // If the resolver is not in the set of ActiveAlgorithms then the frame
+    // disconnected so we reject.
+    if (!m_service->device()->gatt()->RemoveFromActiveAlgorithms(
+            m_resolver.get())) {
+      m_resolver->reject(
+          DOMException::create(NetworkError, kGATTServerDisconnected));

[ortuno, 2016/11/21 03:34:09]

Add a new error for GetDescriptor(s) similar to Service's "GATT Server
disconnected while retrieving characteristics.";

[dougt, 2016/11/22 01:47:16]

For most of the calls on characteristics, you'll get an error message like
"Cannot perform GATT operations."

Do you want us to clean up all of the error messages in a follow up?

+      return;
+    }
+
+    if (m_quantity == mojom::blink::WebBluetoothGATTQueryQuantity::SINGLE) {
+      DCHECK_EQ(1u, webDescriptors.size());
+      m_resolver->resolve(BluetoothRemoteGATTDescriptor::take(

[ortuno, 2016/11/21 03:34:09]

Add TODO for adding the descriptor to the map e.g.:

TODO(crbug.com/495270): Add the descriptor to the Attribute Instance Map when
the map supports it.

[dougt, 2016/11/22 01:47:16]

Acknowledged.

+          m_resolver, wrapUnique(webDescriptors[0]), m_service));
+      return;
+    }
+
+    HeapVector<Member<BluetoothRemoteGATTDescriptor>> descriptors;
+    descriptors.reserveInitialCapacity(webDescriptors.size());
+    for (WebBluetoothRemoteGATTDescriptorInit* webDescriptor : webDescriptors) {
+      descriptors.append(BluetoothRemoteGATTDescriptor::take(

[ortuno, 2016/11/21 03:34:09]

Add same TODO here.

[dougt, 2016/11/22 01:47:16]

Acknowledged.

+          m_resolver, wrapUnique(webDescriptor), m_service));
+    }
+    m_resolver->resolve(descriptors);
+  }
+
+  void onError(
+      int32_t
+          error /* Corresponds to WebBluetoothResult in web_bluetooth.mojom */)
+      override {
+    if (!m_resolver->getExecutionContext() ||
+        m_resolver->getExecutionContext()->activeDOMObjectsAreStopped())
+      return;
+
+    // If the resolver is not in the set of ActiveAlgorithms then the frame
+    // disconnected so we reject.
+    if (!m_service->device()->gatt()->RemoveFromActiveAlgorithms(
+            m_resolver.get())) {
+      m_resolver->reject(
+          DOMException::create(NetworkError, kGATTServerDisconnected));
+      return;
+    }
+
+    m_resolver->reject(BluetoothError::take(m_resolver, error));
+  }
+
+ private:
+  Persistent<BluetoothRemoteGATTService> m_service;
+  mojom::blink::WebBluetoothGATTQueryQuantity m_quantity;
+  const Persistent<ScriptPromiseResolver> m_resolver;
+};
+
+ScriptPromise BluetoothRemoteGATTCharacteristic::getDescriptorsImpl(
+    ScriptState* scriptState,
+    mojom::blink::WebBluetoothGATTQueryQuantity quantity,
+    const String& descriptor) {
+  WebBluetooth* webbluetooth =
+      BluetoothSupplement::fromScriptState(scriptState);
+
+  if (!gatt()->connected()) {
+    return ScriptPromise::rejectWithDOMException(
+        scriptState,
+        DOMException::create(NetworkError, kGATTServerNotConnected));
+  }
+

[ortuno, 2016/11/21 03:34:09]

Also check that the characteristic is still valid
https://cs.chromium.org/chromium/src/third_party/WebKit/Source/modules/blueto...

[dougt, 2016/11/22 01:47:16]

Acknowledged.

+  ScriptPromiseResolver* resolver = ScriptPromiseResolver::create(scriptState);
+  ScriptPromise promise = resolver->promise();
+
+  webbluetooth->getDescriptors(
+      m_webCharacteristic->characteristicInstanceID,
+      static_cast<int32_t>(quantity), descriptor,
+      new GetDescriptorsCallback(m_service, quantity, resolver));
+
+  return promise;
+}
+
+ScriptPromise BluetoothRemoteGATTCharacteristic::getDescriptor(
+    ScriptState* scriptState,
+    const StringOrUnsignedLong& descriptorUUID,
+    ExceptionState& exceptionState) {
+  String descriptor =
+      BluetoothUUID::getDescriptor(descriptorUUID, exceptionState);
+  if (exceptionState.hadException())
+    return exceptionState.reject(scriptState);
+
+  return getDescriptorsImpl(scriptState,
+                            mojom::blink::WebBluetoothGATTQueryQuantity::SINGLE,
+                            descriptor);
+}
+
+ScriptPromise BluetoothRemoteGATTCharacteristic::getDescriptors(
+    ScriptState* scriptState,
+    ExceptionState&) {
+  return getDescriptorsImpl(
+      scriptState, mojom::blink::WebBluetoothGATTQueryQuantity::MULTIPLE);
+}
+
+ScriptPromise BluetoothRemoteGATTCharacteristic::getDescriptors(
+    ScriptState* scriptState,
+    const StringOrUnsignedLong& descriptorUUID,
+    ExceptionState& exceptionState) {
+  String descriptor =
+      BluetoothUUID::getDescriptor(descriptorUUID, exceptionState);
+  if (exceptionState.hadException())
+    return exceptionState.reject(scriptState);
+
+  return getDescriptorsImpl(
+      scriptState, mojom::blink::WebBluetoothGATTQueryQuantity::MULTIPLE,
+      descriptor);
+}
+
 class ReadValueCallback : public WebBluetoothReadValueCallbacks {
  public:
   ReadValueCallback(BluetoothRemoteGATTCharacteristic* characteristic,
@@ -183,8 +316,9 @@ ScriptPromise BluetoothRemoteGATTCharacteristic::readValue(
 
   ScriptPromiseResolver* resolver = ScriptPromiseResolver::create(scriptState);
   ScriptPromise promise = resolver->promise();
-  webbluetooth->readValue(m_webCharacteristic->characteristicInstanceID,
-                          new ReadValueCallback(this, resolver));
+  webbluetooth->characteristicReadValue(
+      m_webCharacteristic->characteristicInstanceID,
+      new ReadValueCallback(this, resolver));
 
   return promise;
 }
@@ -269,8 +403,9 @@ ScriptPromise BluetoothRemoteGATTCharacteristic::writeValue(
   ScriptPromiseResolver* resolver = ScriptPromiseResolver::create(scriptState);
 
   ScriptPromise promise = resolver->promise();
-  webbluetooth->writeValue(m_webCharacteristic->characteristicInstanceID,
-                           valueVector, new WriteValueCallback(this, resolver));
+  webbluetooth->characteristicWriteValue(
+      m_webCharacteristic->characteristicInstanceID, valueVector,
+      new WriteValueCallback(this, resolver));
 
   return promise;
 }