bluetooth: Add characteristicvaluechanged event

content/renderer/bluetooth/bluetooth_dispatcher.cc

Index: content/renderer/bluetooth/bluetooth_dispatcher.cc
diff --git a/content/renderer/bluetooth/bluetooth_dispatcher.cc b/content/renderer/bluetooth/bluetooth_dispatcher.cc
index 85fd71a29c39a6ff8ecbe1a2ea14c2db8cdf52bf..5eb5ff0535090b44a6c6062dcca87e8b14c05cc2 100644
--- a/content/renderer/bluetooth/bluetooth_dispatcher.cc
+++ b/content/renderer/bluetooth/bluetooth_dispatcher.cc
@@ -177,6 +177,8 @@ void BluetoothDispatcher::OnMessageReceived(const IPC::Message& msg) {
                       OnStartNotificationsError)
   IPC_MESSAGE_HANDLER(BluetoothMsg_StopNotificationsSuccess,
                       OnStopNotificationsSuccess)
+  IPC_MESSAGE_HANDLER(BluetoothMsg_CharacteristicValueChanged,
+                      OnCharacteristicValueChanged)
   IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
   DCHECK(handled) << "Unhandled message:" << msg.type();
@@ -295,9 +297,18 @@ void BluetoothDispatcher::stopNotifications(
 void BluetoothDispatcher::characteristicObjectRemoved(
     const blink::WebString& characteristic_instance_id,
     blink::WebBluetoothGATTCharacteristic* characteristic) {
-  // A characteristic object is in the queue waiting for a response
-  // or in the set of active notifications.
-
+  // We need to remove references to the object from the following:
+  //  1) The set of active characteristics
+  //  2) The queue waiting for a response
+  //  3) The set of active notifications
+
+  // 1
+  // TODO(ortuno): We should only unregister a characteristic once

[Jeffrey Yasskin, 2015/10/15 23:00:51]

"should only unregister" sounds like we're unregistering in too many cases, but
the bug here looks like it's actually too _few_ cases.

You could also link to the bug about supporting multiple frames, since fixing
that will probably involve passing |characteristic| to
UnregisterCharacteristicObject.

[ortuno, 2015/10/16 01:24:21]

Linked to multiple frames bug. Done.

+  // there are no characteristic objects that have listeners attached.
+  // http://crbug.com/541390

[Jeffrey Yasskin, 2015/10/15 23:00:51]

Nit: Prefer https links.

[ortuno, 2015/10/16 01:24:21]

Done.

+  UnregisterCharacteristicObject(characteristic_instance_id);
+
+  // 2
   // If the object is in the queue we null the characteristic. If this is the
   // first object waiting for a response OnStartNotificationsSuccess will make
   // sure not to add the characteristic to the map and it will queue a Stop
@@ -324,6 +335,7 @@ void BluetoothDispatcher::characteristicObjectRemoved(
     return;
   }
 
+  // 3
   // If the object is not in the queue then:
   //   1. The subscription was inactive already: this characteristic
   //      object didn't subscribe to notifications.
@@ -345,6 +357,15 @@ void BluetoothDispatcher::characteristicObjectRemoved(
       nullptr /* callbacks */, NotificationsRequestType::STOP));
 }
 
+void BluetoothDispatcher::registerCharacteristicObject(
+    const blink::WebString& characteristic_instance_id,
+    blink::WebBluetoothGATTCharacteristic* characteristic) {
+  active_characteristics_.insert(
+      std::make_pair(characteristic_instance_id.utf8(), characteristic));
+  Send(new BluetoothHostMsg_RegisterCharacteristic(
+      CurrentWorkerId(), characteristic_instance_id.utf8()));
+}
+
 void BluetoothDispatcher::WillStopCurrentWorkerThread() {
   delete this;
 }
@@ -500,6 +521,16 @@ void BluetoothDispatcher::ResolveOrSendStopNotificationsRequest(
   PopNotificationRequestQueueAndProcessNext(request_id);
 }
 
+void BluetoothDispatcher::UnregisterCharacteristicObject(
+    const blink::WebString& characteristic_instance_id) {
+  int removed =
+      active_characteristics_.erase(characteristic_instance_id.utf8());
+  if (removed != 0) {
+    Send(new BluetoothHostMsg_UnregisterCharacteristic(
+        CurrentWorkerId(), characteristic_instance_id.utf8()));
+  }
+}
+
 void BluetoothDispatcher::OnRequestDeviceSuccess(
     int thread_id,
     int request_id,
@@ -716,4 +747,14 @@ void BluetoothDispatcher::OnStopNotificationsSuccess(int thread_id,
   PopNotificationRequestQueueAndProcessNext(request_id);
 }
 
+void BluetoothDispatcher::OnCharacteristicValueChanged(
+    int thread_id,
+    const std::string& characteristic_instance_id,
+    const std::vector<uint8_t> new_value) {
+  auto active_iter = active_characteristics_.find(characteristic_instance_id);
+  if (active_iter != active_characteristics_.end()) {
+    active_iter->second->dispatchCharacteristicValueChanged(new_value);
+  }
+}
+
 }  // namespace content