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 <list>
+#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);
+  // mojom::blink::WebBluetoothCharacteristicClient:
+  void RemoteCharacteristicValueChanged(
+      const WTF::Vector<uint8_t>& value) override;
 
   // ContextLifecycleObserver interface.
   void contextDestroyed(ExecutionContext*) 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;
   ExecutionContext* getExecutionContext() const;
 
   // Interface required by garbage collection.
   DECLARE_VIRTUAL_TRACE();
 
   // IDL exposed interface:
   BluetoothRemoteGATTService* service() { return m_service; }
   String uuid() { return m_characteristic->uuid; }
@@ skipping 40 matching lines @@
       const String& requestedDescriptorUUID,
       const String& characteristicInstanceId,
       mojom::blink::WebBluetoothGATTQueryQuantity,
       ScriptPromiseResolver*,
       mojom::blink::WebBluetoothResult,
       Optional<Vector<mojom::blink::WebBluetoothRemoteGATTDescriptorPtr>>
           descriptors);
 
   DOMException* CreateInvalidCharacteristicError();
 
+  void CloseClientBindings();
+
   mojom::blink::WebBluetoothRemoteGATTCharacteristicPtr m_characteristic;
   Member<BluetoothRemoteGATTService> m_service;
-  bool m_stopped;
   Member<BluetoothCharacteristicProperties> m_properties;
   Member<DOMDataView> m_value;
   Member<BluetoothDevice> m_device;
+  std::list<std::unique_ptr<
+      mojo::AssociatedBinding<mojom::blink::WebBluetoothCharacteristicClient>>>

[dcheng, 2017/03/23 00:16:57]

Can this use AssociatedBindingSet from
https://cs.chromium.org/chromium/src/mojo/public/cpp/bindings/associated_bind...

[juncai, 2017/03/23 05:34:18]

Done.

+      m_clientBindings;
 };
 
 }  // namespace blink
 
 #endif  // BluetoothRemoteGATTCharacteristic_h