ServiceWorker: Clean up ownership management of WebServiceWorkerRegistration

Source/modules/serviceworkers/ServiceWorkerContainer.cpp

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 46 matching lines @@
 #include "public/platform/modules/serviceworker/WebServiceWorkerRegistration.h"
 
 namespace blink {
 
 class RegistrationCallback : public WebServiceWorkerProvider::WebServiceWorkerRegistrationCallbacks {
 public:
     explicit RegistrationCallback(ScriptPromiseResolver* resolver)
         : m_resolver(resolver) { }
     ~RegistrationCallback() override { }
 
-    void onSuccess(WebServiceWorkerRegistration* registration) override
+    // Takes ownership of |registrationRaw|.
+    void onSuccess(WebServiceWorkerRegistration* registrationRaw) override
     {
+        OwnPtr<WebServiceWorkerRegistration> registration = adoptPtr(registrationRaw);
         if (!m_resolver->executionContext() || m_resolver->executionContext()->activeDOMObjectsAreStopped())
             return;
-        m_resolver->resolve(ServiceWorkerRegistration::take(m_resolver.get(), registration));
+        m_resolver->resolve(ServiceWorkerRegistration::create(m_resolver->executionContext(), registration.release()));
     }
 
     // Takes ownership of |errorRaw|.
     void onError(WebServiceWorkerError* errorRaw) override
     {
         OwnPtr<WebServiceWorkerError> error = adoptPtr(errorRaw);
         if (!m_resolver->executionContext() || m_resolver->executionContext()->activeDOMObjectsAreStopped())
             return;
         m_resolver->reject(ServiceWorkerError::take(m_resolver.get(), *error));
     }
 
 private:
     Persistent<ScriptPromiseResolver> m_resolver;
     WTF_MAKE_NONCOPYABLE(RegistrationCallback);
 };
 
 class GetRegistrationCallback : public WebServiceWorkerProvider::WebServiceWorkerGetRegistrationCallbacks {
 public:
     explicit GetRegistrationCallback(ScriptPromiseResolver* resolver)
         : m_resolver(resolver) { }
     ~GetRegistrationCallback() override { }
 
-    void onSuccess(WebServiceWorkerRegistration* registration) override
+    // Takes ownership of |registrationRaw|.
+    void onSuccess(WebServiceWorkerRegistration* registrationRaw) override
     {
+        OwnPtr<WebServiceWorkerRegistration> registration = adoptPtr(registrationRaw);
         if (!m_resolver->executionContext() || m_resolver->executionContext()->activeDOMObjectsAreStopped())
             return;
         if (!registration) {
             // Resolve the promise with undefined.
             m_resolver->resolve();
             return;
         }
-        m_resolver->resolve(ServiceWorkerRegistration::take(m_resolver.get(), registration));
+        m_resolver->resolve(ServiceWorkerRegistration::create(m_resolver->executionContext(), registration.release()));
     }
 
     // Takes ownership of |errorRaw|.
     void onError(WebServiceWorkerError* errorRaw) override
     {
         OwnPtr<WebServiceWorkerError> error = adoptPtr(errorRaw);
         if (!m_resolver->executionContext() || m_resolver->executionContext()->activeDOMObjectsAreStopped())
             return;
         m_resolver->reject(ServiceWorkerError::take(m_resolver.get(), *error));
     }
@@ skipping 30 matching lines @@
 private:
     Persistent<ScriptPromiseResolver> m_resolver;
     WTF_MAKE_NONCOPYABLE(GetRegistrationsCallback);
 };
 
 class ServiceWorkerContainer::GetRegistrationForReadyCallback : public WebServiceWorkerProvider::WebServiceWorkerGetRegistrationForReadyCallbacks {
 public:
     explicit GetRegistrationForReadyCallback(ReadyProperty* ready)
         : m_ready(ready) { }
     ~GetRegistrationForReadyCallback() { }
-    void onSuccess(WebServiceWorkerRegistration* registration) override
+
+    // Takes ownership of |registrationRaw|.
+    void onSuccess(WebServiceWorkerRegistration* registrationRaw) override
     {
-        ASSERT(registration);
+        ASSERT(registrationRaw);
         ASSERT(m_ready->state() == ReadyProperty::Pending);
+
+        OwnPtr<WebServiceWorkerRegistration> registration = adoptPtr(registrationRaw);
         if (m_ready->executionContext() && !m_ready->executionContext()->activeDOMObjectsAreStopped())
-            m_ready->resolve(ServiceWorkerRegistration::from(m_ready->executionContext(), registration));
+            m_ready->resolve(ServiceWorkerRegistration::create(m_ready->executionContext(), registration.release()));
     }
+
 private:
     Persistent<ReadyProperty> m_ready;
     WTF_MAKE_NONCOPYABLE(GetRegistrationForReadyCallback);
 };
 
 ServiceWorkerContainer* ServiceWorkerContainer::create(ExecutionContext* executionContext)
 {
     return new ServiceWorkerContainer(executionContext);
 }
 
@@ skipping 226 matching lines @@
         return;
 
     if (ServiceWorkerContainerClient* client = ServiceWorkerContainerClient::from(executionContext)) {
         m_provider = client->provider();
         if (m_provider)
             m_provider->setClient(this);
     }
 }
 
 } // namespace blink