Reduce SuspendableObjects

third_party/WebKit/Source/modules/serviceworkers/ServiceWorkerRegistration.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/serviceworkers/ServiceWorkerRegistration.h"
 
 #include "bindings/core/v8/CallbackPromiseAdapter.h"
 #include "bindings/core/v8/ScriptPromise.h"
 #include "bindings/core/v8/ScriptState.h"
 #include "core/dom/DOMException.h"
@@ skipping 57 matching lines @@
     std::unique_ptr<WebServiceWorkerRegistration::Handle> handle) {
   ASSERT(handle);
 
   ServiceWorkerRegistration* existingRegistration =
       static_cast<ServiceWorkerRegistration*>(handle->registration()->proxy());
   if (existingRegistration) {
     ASSERT(existingRegistration->getExecutionContext() == executionContext);
     return existingRegistration;
   }
 
-  ServiceWorkerRegistration* newRegistration =
-      new ServiceWorkerRegistration(executionContext, std::move(handle));
-  newRegistration->suspendIfNeeded();
-  return newRegistration;
+  return new ServiceWorkerRegistration(executionContext, std::move(handle));
 }
 
 NavigationPreloadManager* ServiceWorkerRegistration::navigationPreload() {
   if (!m_navigationPreload)
     m_navigationPreload = NavigationPreloadManager::create(this);
   return m_navigationPreload;
 }
 
 String ServiceWorkerRegistration::scope() const {
   return m_handle->registration()->scope().string();
@@ skipping 33 matching lines @@
   m_handle->registration()->unregister(
       client->provider(),
       WTF::makeUnique<CallbackPromiseAdapter<bool, ServiceWorkerError>>(
           resolver));
   return promise;
 }
 
 ServiceWorkerRegistration::ServiceWorkerRegistration(
     ExecutionContext* executionContext,
     std::unique_ptr<WebServiceWorkerRegistration::Handle> handle)
-    : SuspendableObject(executionContext),
+    : ContextLifecycleObserver(executionContext),
       m_handle(std::move(handle)),
       m_stopped(false) {
   ASSERT(m_handle);
   ASSERT(!m_handle->registration()->proxy());
 
   if (!executionContext)
     return;
   m_handle->registration()->setProxy(this);
 }
 
 ServiceWorkerRegistration::~ServiceWorkerRegistration() {}
 
 void ServiceWorkerRegistration::dispose() {
   // Promptly clears a raw reference from content/ to an on-heap object
   // so that content/ doesn't access it in a lazy sweeping phase.
   m_handle.reset();
 }
 
 DEFINE_TRACE(ServiceWorkerRegistration) {
   visitor->trace(m_installing);
   visitor->trace(m_waiting);
   visitor->trace(m_active);
   visitor->trace(m_navigationPreload);
   EventTargetWithInlineData::trace(visitor);
-  SuspendableObject::trace(visitor);
+  ContextLifecycleObserver::trace(visitor);
   Supplementable<ServiceWorkerRegistration>::trace(visitor);
 }
 
 void ServiceWorkerRegistration::contextDestroyed() {
   if (m_stopped)
     return;
   m_stopped = true;
   m_handle->registration()->proxyStopped();
 }
 
 }  // namespace blink