ServiceWorker: Clean up ownership management of WebServiceWorkerRegistration

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/ScriptPromiseResolver.h"
 #include "core/dom/ActiveDOMObject.h"
 #include "core/events/EventTarget.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/OwnPtr.h"
 #include "wtf/PassOwnPtr.h"
 #include "wtf/PassRefPtr.h"
 #include "wtf/RefCounted.h"
 
 namespace blink {
 
 class ScriptPromise;
-class ScriptPromiseResolver;
 class ScriptState;
 class WebServiceWorkerProvider;
 
 class ServiceWorkerRegistration final
     : public RefCountedGarbageCollectedEventTargetWithInlineData<ServiceWorkerRegistration>
     , public ActiveDOMObject
     , public WebServiceWorkerRegistrationProxy
     , public HeapSupplementable<ServiceWorkerRegistration> {
     DEFINE_WRAPPERTYPEINFO();
     REFCOUNTED_GARBAGE_COLLECTED_EVENT_TARGET(ServiceWorkerRegistration);
     USING_GARBAGE_COLLECTED_MIXIN(ServiceWorkerRegistration);
 public:
     // EventTarget overrides.
     const AtomicString& interfaceName() const override;
     ExecutionContext* executionContext() const override { return ActiveDOMObject::executionContext(); }
 
     // WebServiceWorkerRegistrationProxy overrides.
     void dispatchUpdateFoundEvent() override;
     void setInstalling(WebServiceWorker*) override;
     void setWaiting(WebServiceWorker*) override;
     void setActive(WebServiceWorker*) override;
 
-    static ServiceWorkerRegistration* from(ExecutionContext*, WebServiceWorkerRegistration*);
-    static ServiceWorkerRegistration* take(ScriptPromiseResolver*, WebServiceWorkerRegistration*);
-    static void dispose(WebServiceWorkerRegistration*);
+    static ServiceWorkerRegistration* create(ExecutionContext*, PassOwnPtr<WebServiceWorkerRegistration>);
 
     ServiceWorker* installing() { return m_installing; }
     ServiceWorker* waiting() { return m_waiting; }
     ServiceWorker* active() { return m_active; }
 
     String scope() const;
 
     WebServiceWorkerRegistration* webRegistration() { return m_outerRegistration.get(); }
 
     ScriptPromise update(ScriptState*);
     ScriptPromise unregister(ScriptState*);
 
     DEFINE_ATTRIBUTE_EVENT_LISTENER(updatefound);
 
     ~ServiceWorkerRegistration() override;
 
     // Eager finalization needed to promptly release owned WebServiceWorkerRegistration.
     EAGERLY_FINALIZE();
     DECLARE_VIRTUAL_TRACE();
 
 private:
-    static ServiceWorkerRegistration* getOrCreate(ExecutionContext*, WebServiceWorkerRegistration*);
     ServiceWorkerRegistration(ExecutionContext*, PassOwnPtr<WebServiceWorkerRegistration>);
 
     // ActiveDOMObject overrides.
     bool hasPendingActivity() const override;
     void stop() override;
 
     OwnPtr<WebServiceWorkerRegistration> m_outerRegistration;
     WebServiceWorkerProvider* m_provider;
     Member<ServiceWorker> m_installing;
     Member<ServiceWorker> m_waiting;
     Member<ServiceWorker> m_active;
 
     bool m_stopped;
 };
 
 class ServiceWorkerRegistrationArray {
     STATIC_ONLY(ServiceWorkerRegistrationArray);
 public:
     static HeapVector<Member<ServiceWorkerRegistration>> take(ScriptPromiseResolver* resolver, PassOwnPtr<WebVector<WebServiceWorkerRegistration*>> webServiceWorkerRegistrations)
     {
         HeapVector<Member<ServiceWorkerRegistration>> registrations;
         for (WebServiceWorkerRegistration* registration : *webServiceWorkerRegistrations)
-            registrations.append(ServiceWorkerRegistration::take(resolver, registration));
+            registrations.append(ServiceWorkerRegistration::create(resolver->executionContext(), adoptPtr(registration)));
         return registrations;
     }
-
-    static void dispose(PassOwnPtr<WebVector<WebServiceWorkerRegistration*>> webServiceWorkerRegistrations)
-    {
-        for (WebServiceWorkerRegistration* registration : *webServiceWorkerRegistrations)
-            ServiceWorkerRegistration::dispose(registration);
-    }
 };
 
 } // namespace blink
 
 #endif // ServiceWorkerRegistration_h