Implement WebBluetooth getDescriptor[s]

content/renderer/bluetooth/web_bluetooth_impl.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/renderer/bluetooth/web_bluetooth_impl.h"
 
 #include <memory>
 #include <utility>
 #include <vector>
 
 #include "base/memory/ptr_util.h"
 #include "base/optional.h"
 #include "content/child/mojo/type_converters.h"
 #include "content/child/thread_safe_sender.h"
 #include "content/common/bluetooth/web_bluetooth_device_id.h"
 #include "content/renderer/bluetooth/bluetooth_type_converters.h"
 #include "ipc/ipc_message.h"
 #include "mojo/public/cpp/bindings/array.h"
 #include "services/service_manager/public/cpp/interface_provider.h"
 #include "third_party/WebKit/public/platform/modules/bluetooth/WebBluetoothDevice.h"
 #include "third_party/WebKit/public/platform/modules/bluetooth/WebBluetoothDeviceInit.h"
 #include "third_party/WebKit/public/platform/modules/bluetooth/WebBluetoothRemoteGATTCharacteristic.h"
 #include "third_party/WebKit/public/platform/modules/bluetooth/WebBluetoothRemoteGATTCharacteristicInit.h"
+#include "third_party/WebKit/public/platform/modules/bluetooth/WebBluetoothRemoteGATTDescriptorInit.h"
 #include "third_party/WebKit/public/platform/modules/bluetooth/WebBluetoothRemoteGATTService.h"
 #include "third_party/WebKit/public/platform/modules/bluetooth/WebRequestDeviceOptions.h"
 
 namespace content {
 
 namespace {
 
 // Blink can't use non-blink mojo enums like blink::mojom::WebBluetoothResult,
 // so we pass it as an int32 across the boundary.
 int32_t ToInt32(blink::mojom::WebBluetoothResult result) {
@@ skipping 71 matching lines @@
       static_cast<blink::mojom::WebBluetoothGATTQueryQuantity>(quantity),
       characteristics_uuid.isEmpty()
           ? base::nullopt
           : base::make_optional(
                 device::BluetoothUUID(characteristics_uuid.utf8())),
       base::Bind(&WebBluetoothImpl::OnGetCharacteristicsComplete,
                  base::Unretained(this), service_instance_id,
                  base::Passed(base::WrapUnique(callbacks))));
 }
 
-void WebBluetoothImpl::readValue(
+void WebBluetoothImpl::characteristicReadValue(
     const blink::WebString& characteristic_instance_id,
     blink::WebBluetoothReadValueCallbacks* callbacks) {
   GetWebBluetoothService().RemoteCharacteristicReadValue(
       mojo::String::From(characteristic_instance_id),
       base::Bind(&WebBluetoothImpl::OnReadValueComplete, base::Unretained(this),
                  base::Passed(base::WrapUnique(callbacks))));
 }
 
-void WebBluetoothImpl::writeValue(
+void WebBluetoothImpl::characteristicWriteValue(
     const blink::WebString& characteristic_instance_id,
     const blink::WebVector<uint8_t>& value,
     blink::WebBluetoothWriteValueCallbacks* callbacks) {
   GetWebBluetoothService().RemoteCharacteristicWriteValue(
       mojo::String::From(characteristic_instance_id),
       mojo::Array<uint8_t>::From(value),
       base::Bind(&WebBluetoothImpl::OnWriteValueComplete,
                  base::Unretained(this), value,
                  base::Passed(base::WrapUnique(callbacks))));
 }
@@ skipping 11 matching lines @@
 void WebBluetoothImpl::stopNotifications(
     const blink::WebString& characteristic_instance_id,
     blink::WebBluetoothNotificationsCallbacks* callbacks) {
   GetWebBluetoothService().RemoteCharacteristicStopNotifications(
       mojo::String::From(characteristic_instance_id),
       base::Bind(&WebBluetoothImpl::OnStopNotificationsComplete,
                  base::Unretained(this),
                  base::Passed(base::WrapUnique(callbacks))));
 }
 
+void WebBluetoothImpl::getDescriptors(
+    const blink::WebString& characteristic_instance_id,
+    int32_t quantity,
+    const blink::WebString& descriptors_uuid,
+    blink::WebBluetoothGetDescriptorsCallbacks* callbacks) {
+  DCHECK(blink::mojom::IsKnownEnumValue(
+      static_cast<blink::mojom::WebBluetoothGATTQueryQuantity>(quantity)));
+
+  GetWebBluetoothService().RemoteCharacteristicGetDescriptors(
+      mojo::String::From(characteristic_instance_id),
+      static_cast<blink::mojom::WebBluetoothGATTQueryQuantity>(quantity),
+      descriptors_uuid.isEmpty()
+          ? base::nullopt
+          : base::make_optional(device::BluetoothUUID(descriptors_uuid.utf8())),
+      base::Bind(&WebBluetoothImpl::OnGetDescriptorsComplete,
+                 base::Unretained(this), characteristic_instance_id,
+                 base::Passed(base::WrapUnique(callbacks))));
+}
+
 void WebBluetoothImpl::characteristicObjectRemoved(
     const blink::WebString& characteristic_instance_id,
     blink::WebBluetoothRemoteGATTCharacteristic* characteristic) {
   active_characteristics_.erase(characteristic_instance_id.utf8());
 }
 
 void WebBluetoothImpl::registerCharacteristicObject(
     const blink::WebString& characteristic_instance_id,
     blink::WebBluetoothRemoteGATTCharacteristic* characteristic) {
   // TODO(ortuno): After the Bluetooth Tree is implemented, there will
@@ skipping 94 matching lines @@
                                        characteristics.value()[i]->instance_id),
               blink::WebString::fromUTF8(characteristics.value()[i]->uuid),
               characteristics.value()[i]->properties);
     }
     callbacks->onSuccess(promise_characteristics);
   } else {
     callbacks->onError(ToInt32(result));
   }
 }
 
+void WebBluetoothImpl::OnGetDescriptorsComplete(
+    const blink::WebString& characteristic_instance_id,
+    std::unique_ptr<blink::WebBluetoothGetDescriptorsCallbacks> callbacks,
+    blink::mojom::WebBluetoothResult result,
+    base::Optional<
+        std::vector<blink::mojom::WebBluetoothRemoteGATTDescriptorPtr>>
+        descriptors) {
+  if (result == blink::mojom::WebBluetoothResult::SUCCESS) {
+    DCHECK(descriptors);
+    // TODO(dcheng): This WebVector should use smart pointers.

[dcheng, 2016/12/09 08:17:57]

Hmm =)

[dougt, 2016/12/09 19:20:06]

Acknowledged.

Also see: OnGetPrimaryServicesComplete, OnGetCharacteristicsComplete.

+    blink::WebVector<blink::WebBluetoothRemoteGATTDescriptorInit*>
+        promise_descriptors(descriptors->size());
+    for (size_t i = 0; i < descriptors->size(); i++) {
+      promise_descriptors[i] = new blink::WebBluetoothRemoteGATTDescriptorInit(
+          blink::WebString::fromUTF8(descriptors.value()[i]->instance_id),
+          blink::WebString::fromUTF8(descriptors.value()[i]->uuid));
+    }
+    callbacks->onSuccess(promise_descriptors);
+  } else {
+    callbacks->onError(ToInt32(result));
+  }
+}
+
 void WebBluetoothImpl::OnReadValueComplete(
     std::unique_ptr<blink::WebBluetoothReadValueCallbacks> callbacks,
     blink::mojom::WebBluetoothResult result,
     const base::Optional<std::vector<uint8_t>>& value) {
   if (result == blink::mojom::WebBluetoothResult::SUCCESS) {
     DCHECK(value);
     callbacks->onSuccess(value.value());
   } else {
     callbacks->onError(ToInt32(result));
   }
@@ skipping 40 matching lines @@
     // Create an associated interface ptr and pass it to the WebBluetoothService
     // so that it can send us events without us prompting.
     blink::mojom::WebBluetoothServiceClientAssociatedPtrInfo ptr_info;
     binding_.Bind(&ptr_info, web_bluetooth_service_.associated_group());
     web_bluetooth_service_->SetClient(std::move(ptr_info));
   }
   return *web_bluetooth_service_;
 }
 
 }  // namespace content