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 {
 
 PassRefPtrWillBeRawPtr<ServiceWorkerContainer> ServiceWorkerContainer::create(ExecutionContext* executionContext)
 {
     return adoptRefWillBeNoop(new ServiceWorkerContainer(executionContext));
 }
 
 ServiceWorkerContainer::~ServiceWorkerContainer()
 {
     ASSERT(!m_provider);
@@ skipping 144 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::setReady(WebServiceWorkerRegistration* registration)

[michaeln, 2014/09/03 22:27:29]

should there be an assertion here that registration has an active version?

[nhiroki, 2014/09/04 08:55:58]

Done.

+{
+    if (!executionContext()) {
+        deleteIfNoExistingOwner(registration);
+        return;
+    }
+
+    RefPtrWillBeRawPtr<ServiceWorkerRegistration> previousReadyRegistration = m_readyRegistration;

[michaeln, 2014/09/03 22:27:29]

is it ever expected that the previous reg is not null?

[nhiroki, 2014/09/04 08:55:58]

I think the previous reg could be non-null, for example, in the following case:

// in "/foo/bar/index.html"
nav.sW.register('/foo/')
  .then(function(reg) {
       return wait_for_activated(reg.installing);
     })
  .then(function() {
       // nav.sW.ready should be set to |reg|.
       return nav.sW.register('/foo/bar/');
     })
  .then(function(new_reg) {
       return wait_for_activated(new_reg.installing);
     })
  .then(function() {
       // nav.sW.ready should be replaced with longer matched |new_reg|.
     });

(Please let me know if I'm missing something...)

[nhiroki, 2014/09/04 10:45:10]

Ah, you're right! The previous reg should always be null because the
browser-side doesn't allow the provider host to get associated with a new
registration when the host has already been associated with another one. I'll
fix this.

[nhiroki, 2014/09/04 13:06:57]

Done. Removed checkReadyChanged() and added ASSERTs instead.

+    m_readyRegistration = ServiceWorkerRegistration::from(executionContext(), registration);
+    checkReadyChanged(previousReadyRegistration.release());
+}
+
 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)
+void ServiceWorkerContainer::checkReadyChanged(PassRefPtrWillBeRawPtr<ServiceWorkerRegistration> previousReadyRegistration)
 {
-    ServiceWorker* currentReadyWorker = m_active.get();
+    ServiceWorkerRegistration* currentReadyRegistration = m_readyRegistration.get();
 
-    if (previousReadyWorker == currentReadyWorker)
+    if (previousReadyRegistration == currentReadyRegistration)
         return;
 
     if (m_ready->state() != ReadyProperty::Pending) {
         // Already resolved Promises are now stale because the
-        // ready worker changed
+        // ready registration changed
         m_ready = createReadyProperty();
     }
 
-    if (currentReadyWorker)
-        m_ready->resolve(currentReadyWorker);
+    if (currentReadyRegistration)
+        m_ready->resolve(currentReadyRegistration);
 }
 
 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