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

Source/modules/serviceworkers/ServiceWorkerContainer.h

Index: Source/modules/serviceworkers/ServiceWorkerContainer.h
diff --git a/Source/modules/serviceworkers/ServiceWorkerContainer.h b/Source/modules/serviceworkers/ServiceWorkerContainer.h
index 119586d8078d7b98d6ad3f355c03c7cf0efac990..9eec3d86913ca09f7e521d1d2ff73f67ad6a328c 100644
--- a/Source/modules/serviceworkers/ServiceWorkerContainer.h
+++ b/Source/modules/serviceworkers/ServiceWorkerContainer.h
@@ -36,6 +36,7 @@
 #include "bindings/core/v8/ScriptWrappable.h"
 #include "core/dom/ContextLifecycleObserver.h"
 #include "modules/serviceworkers/ServiceWorker.h"
+#include "modules/serviceworkers/ServiceWorkerRegistration.h"
 #include "platform/heap/Handle.h"
 #include "public/platform/WebServiceWorkerProviderClient.h"
 #include "wtf/Forward.h"
@@ -47,9 +48,9 @@ namespace blink {
 
 class Dictionary;
 class ExecutionContext;
-class ServiceWorker;
 class WebServiceWorker;
 class WebServiceWorkerProvider;
+class WebServiceWorkerRegistration;
 
 class ServiceWorkerContainer FINAL
     : public RefCountedWillBeGarbageCollectedFinalized<ServiceWorkerContainer>
@@ -79,20 +80,22 @@ public:
     virtual void setController(WebServiceWorker*) OVERRIDE;
     virtual void setInstalling(WebServiceWorker*) OVERRIDE;
     virtual void setWaiting(WebServiceWorker*) OVERRIDE;
+    virtual void setReady(WebServiceWorkerRegistration*) OVERRIDE;

[michaeln, 2014/09/03 22:17:48]

Should this method be named setRegistration or maybe setReadyRegistration.

Sry for the naming nit but conventions are not real clear to me in the brave new
world of promises that blend events and attributes, onready is more or less the
event and registration is more or less the attribute. The attribute name is more
meaningful to me at least.

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

Sounds reasonable. Replaced 'setReady' with 'setReadyRegistration'.

     virtual void dispatchMessageEvent(const WebString& message, const WebMessagePortChannelArray&) OVERRIDE;
 
 private:
     explicit ServiceWorkerContainer(ExecutionContext*);
 
-    typedef ScriptPromiseProperty<RawPtrWillBeMember<ServiceWorkerContainer>, RefPtrWillBeMember<ServiceWorker>, RefPtrWillBeMember<ServiceWorker> > ReadyProperty;
+    typedef ScriptPromiseProperty<RawPtrWillBeMember<ServiceWorkerContainer>, RefPtrWillBeMember<ServiceWorkerRegistration>, RefPtrWillBeMember<ServiceWorkerRegistration> > ReadyProperty;
     ReadyProperty* createReadyProperty();
-    void checkReadyChanged(PassRefPtrWillBeRawPtr<ServiceWorker> previousReadyWorker);
+    void checkReadyChanged(PassRefPtrWillBeRawPtr<ServiceWorkerRegistration> previousReadyRegistration);
 
     WebServiceWorkerProvider* m_provider;
     RefPtrWillBeMember<ServiceWorker> m_active;
     RefPtrWillBeMember<ServiceWorker> m_controller;
     RefPtrWillBeMember<ServiceWorker> m_installing;
     RefPtrWillBeMember<ServiceWorker> m_waiting;
+    RefPtrWillBeMember<ServiceWorkerRegistration> m_readyRegistration;
     PersistentWillBeMember<ReadyProperty> m_ready;
 };