Reduce SuspendableObjects

third_party/WebKit/Source/modules/serviceworkers/ServiceWorkerRegistration.h

 // 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.
 
 #ifndef ServiceWorkerRegistration_h
 #define ServiceWorkerRegistration_h
 
 #include "bindings/core/v8/ActiveScriptWrappable.h"
 #include "bindings/core/v8/ScriptPromiseResolver.h"
-#include "core/dom/SuspendableObject.h"
+#include "core/dom/ContextLifecycleObserver.h"
 #include "core/events/EventTarget.h"
 #include "modules/serviceworkers/NavigationPreloadManager.h"
 #include "modules/serviceworkers/ServiceWorker.h"
 #include "modules/serviceworkers/ServiceWorkerRegistration.h"
 #include "platform/Supplementable.h"
 #include "public/platform/modules/serviceworker/WebServiceWorkerRegistration.h"
 #include "public/platform/modules/serviceworker/WebServiceWorkerRegistrationProxy.h"
 #include "wtf/Forward.h"
 #include <memory>
 
 namespace blink {
 
 class ScriptPromise;
 class ScriptState;
 
 // The implementation of a service worker registration object in Blink. Actual
 // registration representation is in the embedder and this class accesses it
 // via WebServiceWorkerRegistration::Handle object.
 class ServiceWorkerRegistration final
     : public EventTargetWithInlineData,
       public ActiveScriptWrappable<ServiceWorkerRegistration>,
-      public SuspendableObject,
+      public ContextLifecycleObserver,
       public WebServiceWorkerRegistrationProxy,
       public Supplementable<ServiceWorkerRegistration> {
   DEFINE_WRAPPERTYPEINFO();
   USING_GARBAGE_COLLECTED_MIXIN(ServiceWorkerRegistration);
   USING_PRE_FINALIZER(ServiceWorkerRegistration, dispose);
 
  public:
   // Called from CallbackPromiseAdapter.
   using WebType = std::unique_ptr<WebServiceWorkerRegistration::Handle>;
   static ServiceWorkerRegistration* take(
       ScriptPromiseResolver*,
       std::unique_ptr<WebServiceWorkerRegistration::Handle>);
 
   // ScriptWrappable overrides.
   bool hasPendingActivity() const final;
 
   // EventTarget overrides.
   const AtomicString& interfaceName() const override;
   ExecutionContext* getExecutionContext() const override {
-    return SuspendableObject::getExecutionContext();
+    return ContextLifecycleObserver::getExecutionContext();
   }
 
   // WebServiceWorkerRegistrationProxy overrides.
   void dispatchUpdateFoundEvent() override;
   void setInstalling(std::unique_ptr<WebServiceWorker::Handle>) override;
   void setWaiting(std::unique_ptr<WebServiceWorker::Handle>) override;
   void setActive(std::unique_ptr<WebServiceWorker::Handle>) override;
 
   // Returns an existing registration object for the handle if it exists.
   // Otherwise, returns a new registration object.
@@ skipping 20 matching lines @@
   ~ServiceWorkerRegistration() override;
 
   DECLARE_VIRTUAL_TRACE();
 
  private:
   ServiceWorkerRegistration(
       ExecutionContext*,
       std::unique_ptr<WebServiceWorkerRegistration::Handle>);
   void dispose();
 
-  // SuspendableObject overrides.
+  // ContextLifecycleObserver overrides.
   void contextDestroyed() override;
 
   // A handle to the registration representation in the embedder.
   std::unique_ptr<WebServiceWorkerRegistration::Handle> m_handle;
 
   Member<ServiceWorker> m_installing;
   Member<ServiceWorker> m_waiting;
   Member<ServiceWorker> m_active;
   Member<NavigationPreloadManager> m_navigationPreload;
 
@@ skipping 15 matching lines @@
       registrations.append(
           ServiceWorkerRegistration::take(resolver, std::move(registration)));
     }
     return registrations;
   }
 };
 
 }  // namespace blink
 
 #endif  // ServiceWorkerRegistration_h