Reduce SuspendableObjects

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

 // 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.
 
 #include "modules/bluetooth/BluetoothRemoteGATTCharacteristic.h"
 
 #include "bindings/core/v8/ScriptPromise.h"
 #include "bindings/core/v8/ScriptPromiseResolver.h"
 #include "core/dom/DOMDataView.h"
 #include "core/dom/DOMException.h"
@@ skipping 26 matching lines @@
       DOMArrayBuffer::create(webVector.data(), webVector.size());
   return DOMDataView::create(domBuffer, 0, webVector.size());
 }
 
 }  // anonymous namespace
 
 BluetoothRemoteGATTCharacteristic::BluetoothRemoteGATTCharacteristic(
     ExecutionContext* context,
     std::unique_ptr<WebBluetoothRemoteGATTCharacteristicInit> webCharacteristic,
     BluetoothRemoteGATTService* service)
-    : SuspendableObject(context),
+    : ContextLifecycleObserver(context),
       m_webCharacteristic(std::move(webCharacteristic)),
       m_service(service),
       m_stopped(false) {
   m_properties = BluetoothCharacteristicProperties::create(
       m_webCharacteristic->characteristicProperties);
 }
 
 BluetoothRemoteGATTCharacteristic* BluetoothRemoteGATTCharacteristic::create(
     ExecutionContext* context,
     std::unique_ptr<WebBluetoothRemoteGATTCharacteristicInit> webCharacteristic,
     BluetoothRemoteGATTService* service) {
   DCHECK(webCharacteristic);
 
-  BluetoothRemoteGATTCharacteristic* characteristic =
-      new BluetoothRemoteGATTCharacteristic(
-          context, std::move(webCharacteristic), service);
-  // See note in SuspendableObject about suspendIfNeeded.
-  characteristic->suspendIfNeeded();
-  return characteristic;
+  return new BluetoothRemoteGATTCharacteristic(
+      context, std::move(webCharacteristic), service);
 }
 
 void BluetoothRemoteGATTCharacteristic::setValue(DOMDataView* domDataView) {
   m_value = domDataView;
 }
 
 void BluetoothRemoteGATTCharacteristic::dispatchCharacteristicValueChanged(
     const WebVector<uint8_t>& value) {
   this->setValue(ConvertWebVectorToDataView(value));
   dispatchEvent(Event::create(EventTypeNames::characteristicvaluechanged));
 }
 
 void BluetoothRemoteGATTCharacteristic::contextDestroyed() {
   notifyCharacteristicObjectRemoved();
 }
 
 void BluetoothRemoteGATTCharacteristic::dispose() {
   notifyCharacteristicObjectRemoved();
 }
 
 void BluetoothRemoteGATTCharacteristic::notifyCharacteristicObjectRemoved() {
   if (!m_stopped) {
     m_stopped = true;
     WebBluetooth* webbluetooth = BluetoothSupplement::fromExecutionContext(
-        SuspendableObject::getExecutionContext());
+        ContextLifecycleObserver::getExecutionContext());
     webbluetooth->characteristicObjectRemoved(
         m_webCharacteristic->characteristicInstanceID, this);
   }
 }
 
 const WTF::AtomicString& BluetoothRemoteGATTCharacteristic::interfaceName()
     const {
   return EventTargetNames::BluetoothRemoteGATTCharacteristic;
 }
 
 ExecutionContext* BluetoothRemoteGATTCharacteristic::getExecutionContext()
     const {
-  return SuspendableObject::getExecutionContext();
+  return ContextLifecycleObserver::getExecutionContext();
 }
 
 void BluetoothRemoteGATTCharacteristic::addedEventListener(
     const AtomicString& eventType,
     RegisteredEventListener& registeredListener) {
   EventTargetWithInlineData::addedEventListener(eventType, registeredListener);
   // We will also need to unregister a characteristic once all the event
   // listeners have been removed. See http://crbug.com/541390
   if (eventType == EventTypeNames::characteristicvaluechanged) {
     WebBluetooth* webbluetooth =
@@ skipping 271 matching lines @@
   webbluetooth->stopNotifications(m_webCharacteristic->characteristicInstanceID,
                                   new NotificationsCallback(this, resolver));
   return promise;
 }
 
 DEFINE_TRACE(BluetoothRemoteGATTCharacteristic) {
   visitor->trace(m_service);
   visitor->trace(m_properties);
   visitor->trace(m_value);
   EventTargetWithInlineData::trace(visitor);
-  SuspendableObject::trace(visitor);
+  ContextLifecycleObserver::trace(visitor);
 }
 
 }  // namespace blink