bluetooth: Browser-side implementation of getCharacteristic

content/child/bluetooth/bluetooth_dispatcher.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/child/bluetooth/bluetooth_dispatcher.h"
 
 #include "base/lazy_instance.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/thread_task_runner_handle.h"
 #include "content/child/thread_safe_sender.h"
 #include "content/common/bluetooth/bluetooth_messages.h"
 #include "third_party/WebKit/public/platform/modules/bluetooth/WebBluetoothDevice.h"
 #include "third_party/WebKit/public/platform/modules/bluetooth/WebBluetoothError.h"
+#include "third_party/WebKit/public/platform/modules/bluetooth/WebBluetoothGATTCharacteristic.h"
 #include "third_party/WebKit/public/platform/modules/bluetooth/WebBluetoothGATTRemoteServer.h"
 #include "third_party/WebKit/public/platform/modules/bluetooth/WebBluetoothGATTService.h"
 
 using blink::WebBluetoothConnectGATTCallbacks;
 using blink::WebBluetoothDevice;
 using blink::WebBluetoothError;
+using blink::WebBluetoothGATTCharacteristic;
 using blink::WebBluetoothGATTRemoteServer;
 using blink::WebBluetoothGATTService;
 using blink::WebBluetoothRequestDeviceCallbacks;
 using blink::WebString;
 using blink::WebVector;
 
 struct BluetoothPrimaryServiceRequest {
   BluetoothPrimaryServiceRequest(
       blink::WebString device_instance_id,
       blink::WebString service_uuid,
       blink::WebBluetoothGetPrimaryServiceCallbacks* callbacks)
       : device_instance_id(device_instance_id),
         service_uuid(service_uuid),
         callbacks(callbacks) {}
   ~BluetoothPrimaryServiceRequest() {}
 
   blink::WebString device_instance_id;
   blink::WebString service_uuid;
   scoped_ptr<blink::WebBluetoothGetPrimaryServiceCallbacks> callbacks;
 };
 
+struct BluetoothCharacteristicRequest {
+  BluetoothCharacteristicRequest(
+      blink::WebString service_instance_id,
+      blink::WebString characteristic_uuid,
+      blink::WebBluetoothGetCharacteristicCallbacks* callbacks)
+      : service_instance_id(service_instance_id),
+        characteristic_uuid(characteristic_uuid),
+        callbacks(callbacks) {}
+  ~BluetoothCharacteristicRequest() {}
+
+  blink::WebString service_instance_id;
+  blink::WebString characteristic_uuid;
+  scoped_ptr<blink::WebBluetoothGetCharacteristicCallbacks> callbacks;
+};
+
 namespace content {
 
 namespace {
 
 base::LazyInstance<base::ThreadLocalPointer<BluetoothDispatcher>>::Leaky
     g_dispatcher_tls = LAZY_INSTANCE_INITIALIZER;
 
 BluetoothDispatcher* const kHasBeenDeleted =
     reinterpret_cast<BluetoothDispatcher*>(0x1);
 
@@ skipping 64 matching lines @@
   IPC_BEGIN_MESSAGE_MAP(BluetoothDispatcher, msg)
   IPC_MESSAGE_HANDLER(BluetoothMsg_RequestDeviceSuccess,
                       OnRequestDeviceSuccess);
   IPC_MESSAGE_HANDLER(BluetoothMsg_RequestDeviceError, OnRequestDeviceError);
   IPC_MESSAGE_HANDLER(BluetoothMsg_ConnectGATTSuccess, OnConnectGATTSuccess);
   IPC_MESSAGE_HANDLER(BluetoothMsg_ConnectGATTError, OnConnectGATTError);
   IPC_MESSAGE_HANDLER(BluetoothMsg_GetPrimaryServiceSuccess,
                       OnGetPrimaryServiceSuccess);
   IPC_MESSAGE_HANDLER(BluetoothMsg_GetPrimaryServiceError,
                       OnGetPrimaryServiceError);
+  IPC_MESSAGE_HANDLER(BluetoothMsg_GetCharacteristicSuccess,
+                      OnGetCharacteristicSuccess);
+  IPC_MESSAGE_HANDLER(BluetoothMsg_GetCharacteristicError,
+                      OnGetCharacteristicError);
   IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
   DCHECK(handled) << "Unhandled message:" << msg.type();
 }
 
 void BluetoothDispatcher::requestDevice(
     blink::WebBluetoothRequestDeviceCallbacks* callbacks) {
   int request_id = pending_requests_.Add(callbacks);
   Send(new BluetoothHostMsg_RequestDevice(CurrentWorkerId(), request_id));
 }
@@ skipping 11 matching lines @@
     const blink::WebString& service_uuid,
     blink::WebBluetoothGetPrimaryServiceCallbacks* callbacks) {
   int request_id =
       pending_primary_service_requests_.Add(new BluetoothPrimaryServiceRequest(
           device_instance_id, service_uuid, callbacks));
   Send(new BluetoothHostMsg_GetPrimaryService(CurrentWorkerId(), request_id,
                                               device_instance_id.utf8(),
                                               service_uuid.utf8()));
 }
 
+void BluetoothDispatcher::getCharacteristic(
+    const blink::WebString& service_instance_id,
+    const blink::WebString& characteristic_uuid,
+    blink::WebBluetoothGetCharacteristicCallbacks* callbacks) {
+  int request_id =
+      pending_characteristic_requests_.Add(new BluetoothCharacteristicRequest(
+          service_instance_id, characteristic_uuid, callbacks));
+  Send(new BluetoothHostMsg_GetCharacteristic(CurrentWorkerId(), request_id,
+                                              service_instance_id.utf8(),
+                                              characteristic_uuid.utf8()));
+}
+
 void BluetoothDispatcher::OnWorkerRunLoopStopped() {
   delete this;
 }
 
 void BluetoothDispatcher::OnRequestDeviceSuccess(
     int thread_id,
     int request_id,
     const BluetoothDevice& device) {
   DCHECK(pending_requests_.Lookup(request_id)) << request_id;
 
@@ skipping 74 matching lines @@
   }
 
   pending_primary_service_requests_.Lookup(request_id)
       ->callbacks->onError(new WebBluetoothError(
           // TODO(ortuno): Return more descriptive error messages.
           // http://crbug.com/490419
           WebBluetoothErrorFromBluetoothError(error_type), ""));
   pending_primary_service_requests_.Remove(request_id);
 }
 
+void BluetoothDispatcher::OnGetCharacteristicSuccess(
+    int thread_id,
+    int request_id,
+    const std::string& characteristic_instance_id) {
+  DCHECK(pending_characteristic_requests_.Lookup(request_id)) << request_id;
+
+  BluetoothCharacteristicRequest* request =
+      pending_characteristic_requests_.Lookup(request_id);
+  request->callbacks->onSuccess(new WebBluetoothGATTCharacteristic(
+      WebString::fromUTF8(characteristic_instance_id),
+      request->service_instance_id, request->characteristic_uuid));
+
+  pending_characteristic_requests_.Remove(request_id);
+}
+
+void BluetoothDispatcher::OnGetCharacteristicError(int thread_id,
+                                                   int request_id,
+                                                   BluetoothError error_type) {
+  DCHECK(pending_characteristic_requests_.Lookup(request_id)) << request_id;
+
+  // Since we couldn't find the characteristic return null. See Step 3 of
+  // getCharacteristic algorithm:
+  // https://webbluetoothcg.github.io/web-bluetooth/#dom-bluetoothgattservice-getcharacteristic
+  if (error_type == BluetoothError::NOT_FOUND) {
+    pending_characteristic_requests_.Lookup(request_id)
+        ->callbacks->onSuccess(nullptr);
+  } else {
+    pending_characteristic_requests_.Lookup(request_id)
+        ->callbacks->onError(new WebBluetoothError(
+            // TODO(ortuno): Return more descriptive error messages.
+            // http://crbug.com/490419
+            WebBluetoothErrorFromBluetoothError(error_type), ""));

[scheib, 2015/06/04 06:30:49]

Error messages...
https://codereview.chromium.org/1159523002/diff/60001/content/browser/bluetoo...
OK, this patch was already written when that last comment was made so it passes,
but before new code added please.

[ortuno, 2015/06/05 19:37:44]

Ah ok. My plan was to do that after we get something demoable i.e. after
readValue is implemented.

+  }
+  pending_characteristic_requests_.Remove(request_id);
+}
+
 }  // namespace content