bluetooth: Invalidate services upon disconnection

third_party/WebKit/Source/modules/bluetooth/BluetoothDevice.cpp

 // 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 "modules/bluetooth/BluetoothDevice.h"
 
 #include "bindings/core/v8/CallbackPromiseAdapter.h"
 #include "bindings/core/v8/ScriptPromise.h"
 #include "bindings/core/v8/ScriptPromiseResolver.h"
 #include "core/dom/DOMException.h"
@@ skipping 27 matching lines @@
                              std::move(webDevice));
 }
 
 BluetoothRemoteGATTService*
 BluetoothDevice::getOrCreateBluetoothRemoteGATTService(
     std::unique_ptr<WebBluetoothRemoteGATTService> webService) {
   return m_attributeInstanceMap->getOrCreateBluetoothRemoteGATTService(
       std::move(webService));
 }
 
+bool BluetoothDevice::isValidService(const String& serviceInstanceId) {
+  return m_attributeInstanceMap->containsService(serviceInstanceId);
+}
+
 void BluetoothDevice::dispose() {
   disconnectGATTIfConnected();
 }
 
 void BluetoothDevice::contextDestroyed() {
   disconnectGATTIfConnected();
 }
 
-bool BluetoothDevice::disconnectGATTIfConnected() {
+void BluetoothDevice::disconnectGATTIfConnected() {
   if (m_gatt->connected()) {
     m_gatt->setConnected(false);
     m_gatt->ClearActiveAlgorithms();
     BluetoothSupplement::fromExecutionContext(getExecutionContext())
         ->disconnect(id());
-    return true;
   }
-  return false;
+}
+
+void BluetoothDevice::cleanupDisconnectedDeviceAndFireEvent() {
+  DCHECK(m_gatt->connected());
+  m_gatt->setConnected(false);
+  m_gatt->ClearActiveAlgorithms();
+  m_attributeInstanceMap->Clear();
+  dispatchEvent(Event::createBubble(EventTypeNames::gattserverdisconnected));
 }
 
 const WTF::AtomicString& BluetoothDevice::interfaceName() const {
   return EventTargetNames::BluetoothDevice;
 }
 
 ExecutionContext* BluetoothDevice::getExecutionContext() const {
   return ContextLifecycleObserver::getExecutionContext();
 }
 
 void BluetoothDevice::dispatchGattServerDisconnected() {
-  if (m_gatt->connected()) {
-    m_gatt->setConnected(false);
-    m_gatt->ClearActiveAlgorithms();
-    dispatchEvent(Event::createBubble(EventTypeNames::gattserverdisconnected));
+  if (!m_gatt->connected()) {
+    return;
   }
+  cleanupDisconnectedDeviceAndFireEvent();
 }
 
 DEFINE_TRACE(BluetoothDevice) {
   EventTargetWithInlineData::trace(visitor);
   ContextLifecycleObserver::trace(visitor);
   visitor->trace(m_attributeInstanceMap);
   visitor->trace(m_gatt);
 }
 
 }  // namespace blink