Refactor WebBluetoothServiceClient in the web_bluetooth.mojom

third_party/WebKit/Source/modules/bluetooth/BluetoothRemoteGATTCharacteristic.h

 // Copyright 2015 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 BluetoothRemoteGATTCharacteristic_h
 #define BluetoothRemoteGATTCharacteristic_h
 
+#include <memory>
 #include "bindings/core/v8/ScriptWrappable.h"
 #include "core/dom/ContextLifecycleObserver.h"
 #include "core/dom/DOMArrayPiece.h"
 #include "core/dom/DOMDataView.h"
 #include "modules/EventTargetModules.h"
 #include "modules/bluetooth/BluetoothRemoteGATTService.h"
+#include "mojo/public/cpp/bindings/associated_binding.h"
 #include "platform/heap/Handle.h"
 #include "public/platform/modules/bluetooth/web_bluetooth.mojom-blink.h"
 #include "wtf/text/WTFString.h"
-#include <memory>
 
 namespace blink {
 
 class BluetoothCharacteristicProperties;
 class BluetoothDevice;
 class ExecutionContext;
 class ScriptPromise;
 class ScriptState;
 
 // BluetoothRemoteGATTCharacteristic represents a GATT Characteristic, which is
 // a basic data element that provides further information about a peripheral's
 // service.
 //
 // Callbacks providing WebBluetoothRemoteGATTCharacteristicInit objects are
 // handled by CallbackPromiseAdapter templatized with this class. See this
 // class's "Interface required by CallbackPromiseAdapter" section and the
 // CallbackPromiseAdapter class comments.
 class BluetoothRemoteGATTCharacteristic final
     : public EventTargetWithInlineData,
-      public ContextLifecycleObserver {
+      public ContextLifecycleObserver,
+      public mojom::blink::WebBluetoothCharacteristicClient {
   USING_PRE_FINALIZER(BluetoothRemoteGATTCharacteristic, dispose);
   DEFINE_WRAPPERTYPEINFO();
   USING_GARBAGE_COLLECTED_MIXIN(BluetoothRemoteGATTCharacteristic);
 
  public:
   explicit BluetoothRemoteGATTCharacteristic(
       ExecutionContext*,
       mojom::blink::WebBluetoothRemoteGATTCharacteristicPtr,
       BluetoothRemoteGATTService*,
       BluetoothDevice*);
 
   static BluetoothRemoteGATTCharacteristic* create(
       ExecutionContext*,
       mojom::blink::WebBluetoothRemoteGATTCharacteristicPtr,
       BluetoothRemoteGATTService*,
       BluetoothDevice*);
 
   // Save value.
   void setValue(DOMDataView*);
 
-  void dispatchCharacteristicValueChanged(const Vector<uint8_t>& value);
-
   // ContextLifecycleObserver interface.
   void contextDestroyed(ExecutionContext*) override;
 
+  // mojom::blink::WebBluetoothCharacteristicClient:
+  void RemoteCharacteristicValueChanged(

[ortuno, 2017/03/01 04:52:06]

nit: Move this above contextDestroyed so that both functions that are supposed
to be called at the end of the the object's lifetime are closer.

[juncai, 2017/03/02 03:23:49]

Done.

+      const WTF::Vector<uint8_t>& value) override;
+
   // USING_PRE_FINALIZER interface.
   // Called before the object gets garbage collected.
   void dispose();
 
   // Notify our embedder that we should stop any notifications.
   // The function only notifies the embedder once.
   void notifyCharacteristicObjectRemoved();
 
   // EventTarget methods:
   const AtomicString& interfaceName() const override;
@@ skipping 30 matching lines @@
   friend class BluetoothRemoteGATTDescriptor;
 
   BluetoothRemoteGATTServer* getGatt() { return m_service->device()->gatt(); }
 
   void ReadValueCallback(ScriptPromiseResolver*,
                          mojom::blink::WebBluetoothResult,
                          const Optional<Vector<uint8_t>>& value);
   void WriteValueCallback(ScriptPromiseResolver*,
                           const Vector<uint8_t>& value,
                           mojom::blink::WebBluetoothResult);
-  void NotificationsCallback(ScriptPromiseResolver*,
-                             mojom::blink::WebBluetoothResult);
+  void NotificationsCallback(
+      ScriptPromiseResolver*,
+      mojom::blink::WebBluetoothResult,
+      mojom::blink::WebBluetoothCharacteristicClientAssociatedRequest);
 
   ScriptPromise getDescriptorsImpl(ScriptState*,
                                    mojom::blink::WebBluetoothGATTQueryQuantity,
                                    const String& descriptorUUID = String());
 
   void GetDescriptorsCallback(
       const String& requestedDescriptorUUID,
       const String& characteristicInstanceId,
       mojom::blink::WebBluetoothGATTQueryQuantity,
       ScriptPromiseResolver*,
       mojom::blink::WebBluetoothResult,
       Optional<Vector<mojom::blink::WebBluetoothRemoteGATTDescriptorPtr>>
           descriptors);
 
   DOMException* createInvalidCharacteristicError();
 
   mojom::blink::WebBluetoothRemoteGATTCharacteristicPtr m_characteristic;
   Member<BluetoothRemoteGATTService> m_service;
-  bool m_stopped;
+  mojo::AssociatedBinding<mojom::blink::WebBluetoothCharacteristicClient>

[ortuno, 2017/03/01 04:52:06]

nit: move this to the end.

[juncai, 2017/03/02 03:23:49]

Done.

+      m_clientBinding;
   Member<BluetoothCharacteristicProperties> m_properties;
   Member<DOMDataView> m_value;
   Member<BluetoothDevice> m_device;
 };
 
 }  // namespace blink
 
 #endif  // BluetoothRemoteGATTCharacteristic_h