Implement WebBluetooth getDescriptor[s]

content/browser/bluetooth/web_bluetooth_service_impl.h

 // Copyright 2016 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_BROWSER_BLUETOOTH_WEB_BLUETOOTH_SERVICE_IMPL_H_
 #define CONTENT_BROWSER_BLUETOOTH_WEB_BLUETOOTH_SERVICE_IMPL_H_
 
 #include <memory>
 #include <string>
 #include <vector>
@@ skipping 78 matching lines @@
       device::BluetoothRemoteGattCharacteristic* characteristic,
       const std::vector<uint8_t>& value) override;
 
   // Notifies the WebBluetoothServiceClient that characteristic
   // |characteristic_instance_id| changed it's value. We only do this for
   // characteristics that have been returned to the client in the past.
   void NotifyCharacteristicValueChanged(
       const std::string& characteristic_instance_id,
       std::vector<uint8_t> value);
 
+  void GattDescriptorValueChanged(

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

per comment in web_bluetooth.mojom, we don't need these two.

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

Acknowledged.

+      device::BluetoothAdapter* adapter,
+      device::BluetoothRemoteGattDescriptor* descriptor,
+      const std::vector<uint8_t>& value) override;
+
+  // Notifies the WebBluetoothServiceClient that descriptor
+  // |descriptor_instance_id| changed it's value. We only do this for
+  // descriptors that have been returned to the client in the past.
+  void NotifyDescriptorValueChanged(const std::string& descriptor_instance_id,
+                                    std::vector<uint8_t> value);
+
   // WebBluetoothService methods:
   void SetClient(
       blink::mojom::WebBluetoothServiceClientAssociatedPtrInfo client) override;
   void RequestDevice(blink::mojom::WebBluetoothRequestDeviceOptionsPtr options,
                      const RequestDeviceCallback& callback) override;
   void RemoteServerConnect(
       const WebBluetoothDeviceId& device_id,
       const RemoteServerConnectCallback& callback) override;
   void RemoteServerDisconnect(const WebBluetoothDeviceId& device_id) override;
   void RemoteServerGetPrimaryServices(
@@ skipping 12 matching lines @@
   void RemoteCharacteristicWriteValue(
       const mojo::String& characteristic_instance_id,
       mojo::Array<uint8_t> value,
       const RemoteCharacteristicWriteValueCallback& callback) override;
   void RemoteCharacteristicStartNotifications(
       const mojo::String& characteristic_instance_id,
       const RemoteCharacteristicStartNotificationsCallback& callback) override;
   void RemoteCharacteristicStopNotifications(
       const mojo::String& characteristic_instance_id,
       const RemoteCharacteristicStopNotificationsCallback& callback) override;
+  void RemoteCharacteristicGetDescriptors(
+      const mojo::String& service_instance_id,
+      blink::mojom::WebBluetoothGATTQueryQuantity quantity,
+      const base::Optional<device::BluetoothUUID>& characteristics_uuid,
+      const RemoteCharacteristicGetDescriptorsCallback& callback) override;
+  void RemoteDescriptorReadValue(
+      const mojo::String& descriptor_instance_id,
+      const RemoteDescriptorReadValueCallback& callback) override;
+  void RemoteDescriptorWriteValue(
+      const mojo::String& descriptor_instance_id,
+      mojo::Array<uint8_t> value,
+      const RemoteDescriptorWriteValueCallback& callback) override;
+
+  // Callbacks for BluetoothRemoteGattDescriptor::ReadRemoteDescriptor.

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

Move these down with the rest of the callbacks.

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

Acknowledged.

+  void OnDescriptorReadValueSuccess(
+      const RemoteDescriptorReadValueCallback& callback,
+      const std::vector<uint8_t>& value);
+  void OnDescriptorReadValueFailed(
+      const RemoteDescriptorReadValueCallback& callback,
+      device::BluetoothRemoteGattService::GattErrorCode error_code);
+
+  // Callbacks for BluetoothRemoteGattDescriptor::WriteRemoteDescriptor.
+  void OnDescriptorWriteValueSuccess(
+      const RemoteDescriptorWriteValueCallback& callback);
+  void OnDescriptorWriteValueFailed(
+      const RemoteDescriptorWriteValueCallback& callback,
+      device::BluetoothRemoteGattService::GattErrorCode error_code);
 
   void RequestDeviceImpl(
       blink::mojom::WebBluetoothRequestDeviceOptionsPtr options,
       const RequestDeviceCallback& callback,
       device::BluetoothAdapter* adapter);
 
   // Should only be run after the services have been discovered for
   // |device_address|.
   void RemoteServerGetPrimaryServicesImpl(
       const WebBluetoothDeviceId& device_id,
@@ skipping 15 matching lines @@
       const WebBluetoothDeviceId& device_id,
       base::TimeTicks start_time,
       const RemoteServerConnectCallback& callback,
       std::unique_ptr<device::BluetoothGattConnection> connection);
   void OnCreateGATTConnectionFailed(
       base::TimeTicks start_time,
       const RemoteServerConnectCallback& callback,
       device::BluetoothDevice::ConnectErrorCode error_code);
 
   // Callbacks for BluetoothRemoteGattCharacteristic::ReadRemoteCharacteristic.
-  void OnReadValueSuccess(const RemoteCharacteristicReadValueCallback& callback,
-                          const std::vector<uint8_t>& value);
-  void OnReadValueFailed(
+  void OnCharacteristicReadValueSuccess(
+      const RemoteCharacteristicReadValueCallback& callback,
+      const std::vector<uint8_t>& value);
+  void OnCharacteristicReadValueFailed(
       const RemoteCharacteristicReadValueCallback& callback,
       device::BluetoothRemoteGattService::GattErrorCode error_code);
 
   // Callbacks for BluetoothRemoteGattCharacteristic::WriteRemoteCharacteristic.
-  void OnWriteValueSuccess(
+  void OnCharacteristicWriteValueSuccess(
       const RemoteCharacteristicWriteValueCallback& callback);
-  void OnWriteValueFailed(
+  void OnCharacteristicWriteValueFailed(
       const RemoteCharacteristicWriteValueCallback& callback,
       device::BluetoothRemoteGattService::GattErrorCode error_code);
 
   // Callbacks for BluetoothRemoteGattCharacteristic::StartNotifySession.
   void OnStartNotifySessionSuccess(
       const RemoteCharacteristicStartNotificationsCallback& callback,
       std::unique_ptr<device::BluetoothGattNotifySession> notify_session);
   void OnStartNotifySessionFailed(
       const RemoteCharacteristicStartNotificationsCallback& callback,
       device::BluetoothRemoteGattService::GattErrorCode error_code);
@@ skipping 18 matching lines @@
   // Queries the platform cache for a Service with |service_instance_id|. Fills
   // in the |outcome| field, and |device| and |service| fields if successful.
   CacheQueryResult QueryCacheForService(const std::string& service_instance_id);
 
   // Queries the platform cache for a characteristic with
   // |characteristic_instance_id|. Fills in the |outcome| field, and |device|,
   // |service| and |characteristic| fields if successful.
   CacheQueryResult QueryCacheForCharacteristic(
       const std::string& characteristic_instance_id);
 
+  // Queries the platform cache for a descriptor with
+  // |descriptor_instance_id|. Fills in the |outcome| field, and |device|,
+  // |service| and |descriptor| fields if successful.

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

|service|, |characteristic|, and |descriptor|

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

Acknowledged.

+  CacheQueryResult QueryCacheForDescriptor(
+      const std::string& descriptor_instance_id);
+
   RenderProcessHost* GetRenderProcessHost();
   device::BluetoothAdapter* GetAdapter();
   url::Origin GetOrigin();
 
   // Clears all state (maps, sets, etc).
   void ClearState();
 
   // Used to open a BluetoothChooser and start a device discovery session.
   std::unique_ptr<BluetoothDeviceChooserController> device_chooser_controller_;
 
   // Keeps track of which devices the frame's origin is allowed to access.
   BluetoothAllowedDevicesMap allowed_devices_map_;
 
   // Maps to get the object's parent based on its instanceID.
   std::unordered_map<std::string, std::string> service_id_to_device_address_;
   std::unordered_map<std::string, std::string> characteristic_id_to_service_id_;
+  std::unordered_map<std::string, std::string>
+      descriptor_id_to_characteristic_id_;
 
   // Map to keep track of the connected Bluetooth devices.
   std::unique_ptr<FrameConnectedBluetoothDevices> connected_devices_;
 
   // Maps a device address to callbacks that are waiting for services to
   // be discovered for that device.
   std::unordered_map<std::string, std::vector<PrimaryServicesRequestCallback>>
       pending_primary_services_requests_;
 
   // Map to keep track of the characteristics' notify sessions.
@@ skipping 13 matching lines @@
   mojo::Binding<blink::mojom::WebBluetoothService> binding_;
 
   base::WeakPtrFactory<WebBluetoothServiceImpl> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(WebBluetoothServiceImpl);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_BLUETOOTH_WEB_BLUETOOTH_SERVICE_IMPL_H_