ServiceWorker: Make '.ready' return a promise to be resolved with ServiceWorkerRegistration (1/3)

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 30 matching lines @@
 #include "core/dom/MessagePort.h"
 #include "core/events/MessageEvent.h"
 #include "modules/serviceworkers/RegistrationOptionList.h"
 #include "modules/serviceworkers/ServiceWorker.h"
 #include "modules/serviceworkers/ServiceWorkerContainerClient.h"
 #include "modules/serviceworkers/ServiceWorkerError.h"
 #include "modules/serviceworkers/ServiceWorkerRegistration.h"
 #include "platform/RuntimeEnabledFeatures.h"
 #include "public/platform/WebServiceWorker.h"
 #include "public/platform/WebServiceWorkerProvider.h"
+#include "public/platform/WebServiceWorkerRegistration.h"
 #include "public/platform/WebString.h"
 #include "public/platform/WebURL.h"
 
-using blink::WebServiceWorker;
-using blink::WebServiceWorkerProvider;
-
 namespace blink {
 
 ServiceWorkerContainer* ServiceWorkerContainer::create(ExecutionContext* executionContext)
 {
     return new ServiceWorkerContainer(executionContext);
 }
 
 ServiceWorkerContainer::~ServiceWorkerContainer()
 {
     ASSERT(!m_provider);
 }
 
 void ServiceWorkerContainer::willBeDetachedFromFrame()
 {
     if (m_provider) {
         m_provider->setClient(0);
         m_provider = nullptr;
     }
 }
 
 void ServiceWorkerContainer::trace(Visitor* visitor)
 {
     visitor->trace(m_active);
     visitor->trace(m_controller);
     visitor->trace(m_installing);
     visitor->trace(m_waiting);
+    visitor->trace(m_readyRegistration);
     visitor->trace(m_ready);
 }
 
 ScriptPromise ServiceWorkerContainer::registerServiceWorker(ScriptState* scriptState, const String& url, const Dictionary& dictionary)
 {
     RegistrationOptionList options(dictionary);
     ASSERT(RuntimeEnabledFeatures::serviceWorkerEnabled());
     RefPtr<ScriptPromiseResolver> resolver = ScriptPromiseResolver::create(scriptState);
     ScriptPromise promise = resolver->promise();
 
@@ skipping 95 matching lines @@
 
 // If the WebServiceWorker is up for adoption (does not have a
 // WebServiceWorkerProxy owner), rejects the adoption by deleting the
 // WebServiceWorker.
 static void deleteIfNoExistingOwner(WebServiceWorker* serviceWorker)
 {
     if (serviceWorker && !serviceWorker->proxy())
         delete serviceWorker;
 }
 
+static void deleteIfNoExistingOwner(WebServiceWorkerRegistration* registration)
+{
+    if (registration && !registration->proxy())
+        delete registration;
+}
+
+void ServiceWorkerContainer::setReadyRegistration(WebServiceWorkerRegistration* registration)
+{
+    if (!executionContext()) {
+        deleteIfNoExistingOwner(registration);
+        return;
+    }
+
+    ServiceWorkerRegistration* readyRegistration = ServiceWorkerRegistration::from(executionContext(), registration);
+    ASSERT(readyRegistration->active());
+
+    if (m_readyRegistration) {
+        ASSERT(m_readyRegistration == readyRegistration);
+        ASSERT(m_ready->state() == ReadyProperty::Resolved);
+        return;
+    }
+
+    m_readyRegistration = readyRegistration;
+    m_ready->resolve(readyRegistration);
+}
+
 void ServiceWorkerContainer::setActive(WebServiceWorker* serviceWorker)
 {
     if (!executionContext()) {
         deleteIfNoExistingOwner(serviceWorker);
         return;
     }
-    RefPtrWillBeRawPtr<ServiceWorker> previousReadyWorker = m_active;
     m_active = ServiceWorker::from(executionContext(), serviceWorker);
-    checkReadyChanged(previousReadyWorker.release());
-}
-
-void ServiceWorkerContainer::checkReadyChanged(PassRefPtrWillBeRawPtr<ServiceWorker> previousReadyWorker)
-{
-    ServiceWorker* currentReadyWorker = m_active.get();
-
-    if (previousReadyWorker == currentReadyWorker)
-        return;
-
-    if (m_ready->state() != ReadyProperty::Pending) {
-        // Already resolved Promises are now stale because the
-        // ready worker changed
-        m_ready = createReadyProperty();
-    }
-
-    if (currentReadyWorker)
-        m_ready->resolve(currentReadyWorker);
 }
 
 void ServiceWorkerContainer::setController(WebServiceWorker* serviceWorker)
 {
     if (!executionContext()) {
         deleteIfNoExistingOwner(serviceWorker);
         return;
     }
     m_controller = ServiceWorker::from(executionContext(), serviceWorker);
 }
@@ skipping 38 matching lines @@
     m_ready = createReadyProperty();
 
     if (ServiceWorkerContainerClient* client = ServiceWorkerContainerClient::from(executionContext)) {
         m_provider = client->provider();
         if (m_provider)
             m_provider->setClient(this);
     }
 }
 
 } // namespace blink