Implement WebBluetooth getDescriptor[s]

content/renderer/bluetooth/web_bluetooth_impl.h

 // 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.
 
 #ifndef CONTENT_RENDERER_BLUETOOTH_WEB_BLUETOOTH_IMPL_H_
 #define CONTENT_RENDERER_BLUETOOTH_WEB_BLUETOOTH_IMPL_H_
 
 #include <stdint.h>
 
 #include <memory>
@@ skipping 46 matching lines @@
       int32_t quantity /* Corresponds to WebBluetoothGATTQueryQuantity in
                         web_bluetooth.mojom */,
       const blink::WebString& services_uuid,
       blink::WebBluetoothGetPrimaryServicesCallbacks* callbacks) override;
   void getCharacteristics(
       const blink::WebString& service_instance_id,
       int32_t quantity /* Corresponds to WebBluetoothGATTQueryQuantity in
                         web_bluetooth.mojom */,
       const blink::WebString& characteristics_uuid,
       blink::WebBluetoothGetCharacteristicsCallbacks* callbacks) override;
-  void readValue(const blink::WebString& characteristic_instance_id,
-                 blink::WebBluetoothReadValueCallbacks* callbacks) override;
-  void writeValue(const blink::WebString& characteristic_instance_id,
-                  const blink::WebVector<uint8_t>& value,
-                  blink::WebBluetoothWriteValueCallbacks*) override;
+  void characteristicReadValue(
+      const blink::WebString& characteristic_instance_id,
+      blink::WebBluetoothReadValueCallbacks* callbacks) override;
+  void characteristicWriteValue(
+      const blink::WebString& characteristic_instance_id,
+      const blink::WebVector<uint8_t>& value,
+      blink::WebBluetoothWriteValueCallbacks*) override;
   void startNotifications(
       const blink::WebString& characteristic_instance_id,
       blink::WebBluetoothNotificationsCallbacks*) override;
   void stopNotifications(
       const blink::WebString& characteristic_instance_id,
       blink::WebBluetoothNotificationsCallbacks*) override;
   void characteristicObjectRemoved(
       const blink::WebString& characteristic_instance_id,
       blink::WebBluetoothRemoteGATTCharacteristic* characteristic) override;
   void registerCharacteristicObject(
       const blink::WebString& characteristic_instance_id,
       blink::WebBluetoothRemoteGATTCharacteristic* characteristic) override;
+  void getDescriptors(
+      const blink::WebString& characteristic_instance_id,
+      int32_t quantity /* Corresponds to WebBluetoothGATTQueryQuantity in
+                        web_bluetooth.mojom */,
+      const blink::WebString& descriptor_uuid,
+      blink::WebBluetoothGetDescriptorsCallbacks* callbacks) override;
+  void descriptorReadValue(
+      const blink::WebString& descriptor_instance_id,
+      blink::WebBluetoothReadValueCallbacks* callbacks) override;
+  void descriptorWriteValue(const blink::WebString& descriptor_instance_id,
+                            const blink::WebVector<uint8_t>& value,
+                            blink::WebBluetoothWriteValueCallbacks*) override;
+  void descriptorObjectRemoved(
+      const blink::WebString& descriptor_instance_id,
+      blink::WebBluetoothRemoteGATTDescriptor* descriptor) override;
+  void registerDescriptorObject(

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

Per comment in web_bluetooth.mojom, no need for these two functions

+      const blink::WebString& descriptor_instance_id,
+      blink::WebBluetoothRemoteGATTDescriptor* descriptor) override;
 
  private:
   struct GetCharacteristicsCallback;
   // WebBluetoothServiceClient methods:
   void RemoteCharacteristicValueChanged(
       const mojo::String& characteristic_instance_id,
       mojo::Array<uint8_t> value) override;
+  void RemoteDescriptorValueChanged(const mojo::String& descriptor_instance_id,
+                                    mojo::Array<uint8_t> value) override;
   void GattServerDisconnected(const WebBluetoothDeviceId& device_id) override;
 
   // Callbacks for WebBluetoothService calls:
   void OnRequestDeviceComplete(
       std::unique_ptr<blink::WebBluetoothRequestDeviceCallbacks> callbacks,
       const blink::mojom::WebBluetoothResult result,
       blink::mojom::WebBluetoothDevicePtr device);
   void OnConnectComplete(
       std::unique_ptr<blink::WebBluetoothRemoteGATTServerConnectCallbacks>
           callbacks,
       blink::mojom::WebBluetoothResult result);
   void OnGetPrimaryServicesComplete(
       const blink::WebString& device_id,
       std::unique_ptr<blink::WebBluetoothGetPrimaryServicesCallbacks> callbacks,
       blink::mojom::WebBluetoothResult result,
       mojo::Array<blink::mojom::WebBluetoothRemoteGATTServicePtr> services);
   void OnGetCharacteristicsComplete(
-      const blink::WebString& service_instance_id,
+      const blink::WebString& characteristic_instance_id,
       std::unique_ptr<blink::WebBluetoothGetCharacteristicsCallbacks> callbacks,
       blink::mojom::WebBluetoothResult result,
       mojo::Array<blink::mojom::WebBluetoothRemoteGATTCharacteristicPtr>
           characteristics);
   void OnReadValueComplete(
       std::unique_ptr<blink::WebBluetoothReadValueCallbacks> callbacks,
       blink::mojom::WebBluetoothResult result,
       mojo::Array<uint8_t> value);
   void OnWriteValueComplete(
       const blink::WebVector<uint8_t>& value,
       std::unique_ptr<blink::WebBluetoothWriteValueCallbacks> callbacks,
       blink::mojom::WebBluetoothResult result);
   void OnStartNotificationsComplete(
       std::unique_ptr<blink::WebBluetoothNotificationsCallbacks> callbacks,
       blink::mojom::WebBluetoothResult result);
   void OnStopNotificationsComplete(
       std::unique_ptr<blink::WebBluetoothNotificationsCallbacks> callbacks);
-
+  void OnGetDescriptorsComplete(
+      const blink::WebString& service_instance_id,
+      std::unique_ptr<blink::WebBluetoothGetDescriptorsCallbacks> callbacks,
+      blink::mojom::WebBluetoothResult result,
+      mojo::Array<blink::mojom::WebBluetoothRemoteGATTDescriptorPtr>
+          characteristics);
   void DispatchCharacteristicValueChanged(
       const std::string& characteristic_instance_id,
       const std::vector<uint8_t>& value);
+  void DispatchDescriptorValueChanged(const std::string& descriptor_instance_id,
+                                      const std::vector<uint8_t>& value);
 
   blink::mojom::WebBluetoothService& GetWebBluetoothService();
   service_manager::InterfaceProvider* const remote_interfaces_;
   blink::mojom::WebBluetoothServicePtr web_bluetooth_service_;
 
   // Map of characteristic_instance_ids to
   // WebBluetoothRemoteGATTCharacteristics. When characteristicObjectRemoved is
   // called the characteristic should be removed from the map.
   // Keeps track of what characteristics have listeners.
   std::unordered_map<std::string, blink::WebBluetoothRemoteGATTCharacteristic*>
       active_characteristics_;
 
+  // Map of descriptor_instance_ids to
+  // WebBluetoothRemoteGATTDescriptors. When descriptorObjectRemoved is
+  // called the descriptor should be removed from the map.
+  // Keeps track of what descriptors have listeners.
+  std::unordered_map<std::string, blink::WebBluetoothRemoteGATTDescriptor*>
+      active_descriptors_;
+
   // Map of device_ids to WebBluetoothDevices. Added in connect() and removed in
   // disconnect(). This means a device may not actually be connected while in
   // this map, but that it will definitely be removed when the page navigates.
   std::unordered_map<WebBluetoothDeviceId,
                      blink::WebBluetoothDevice*,
                      WebBluetoothDeviceIdHash>
       connected_devices_;
 
   // Binding associated with |web_bluetooth_service_|.
   mojo::AssociatedBinding<blink::mojom::WebBluetoothServiceClient> binding_;
 
   DISALLOW_COPY_AND_ASSIGN(WebBluetoothImpl);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_BLUETOOTH_WEB_BLUETOOTH_IMPL_H_