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

Source/modules/serviceworkers/ServiceWorkerContainer.h

 /*
  * 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 18 matching lines @@
  */
 
 #ifndef ServiceWorkerContainer_h
 #define ServiceWorkerContainer_h
 
 #include "bindings/core/v8/ScriptPromise.h"
 #include "bindings/core/v8/ScriptPromiseProperty.h"
 #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"
 #include "wtf/PassRefPtr.h"
 #include "wtf/RefCounted.h"
 #include "wtf/RefPtr.h"
 
 namespace blink {
 
 class Dictionary;
 class ExecutionContext;
-class ServiceWorker;
 class WebServiceWorker;
 class WebServiceWorkerProvider;
+class WebServiceWorkerRegistration;
 
 class ServiceWorkerContainer FINAL
     : public RefCountedWillBeGarbageCollectedFinalized<ServiceWorkerContainer>
     , public ScriptWrappable
     , public ContextLifecycleObserver
     , public WebServiceWorkerProviderClient {
     DEFINE_WRAPPERTYPEINFO();
 public:
     static PassRefPtrWillBeRawPtr<ServiceWorkerContainer> create(ExecutionContext*);
     ~ServiceWorkerContainer();
@@ skipping 10 matching lines @@
     WebServiceWorkerProvider* provider() { return m_provider; }
 
     ScriptPromise registerServiceWorker(ScriptState*, const String& pattern, const Dictionary&);
     ScriptPromise unregisterServiceWorker(ScriptState*, const String& scope);
 
     // WebServiceWorkerProviderClient overrides.
     virtual void setActive(WebServiceWorker*) OVERRIDE;
     virtual void setController(WebServiceWorker*) OVERRIDE;
     virtual void setInstalling(WebServiceWorker*) OVERRIDE;
     virtual void setWaiting(WebServiceWorker*) OVERRIDE;
+    virtual void setReadyRegistration(WebServiceWorkerRegistration*) OVERRIDE;
     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);
 
     WebServiceWorkerProvider* m_provider;
     RefPtrWillBeMember<ServiceWorker> m_active;
     RefPtrWillBeMember<ServiceWorker> m_controller;
     RefPtrWillBeMember<ServiceWorker> m_installing;
     RefPtrWillBeMember<ServiceWorker> m_waiting;
+    RefPtrWillBeMember<ServiceWorkerRegistration> m_readyRegistration;

[tkent, 2014/09/05 02:01:25]

Please update ServiceWorkerContainer::trace().

[nhiroki, 2014/09/05 02:23:04]

Done. Thanks!

     PersistentWillBeMember<ReadyProperty> m_ready;
 };
 
 } // namespace blink
 
 #endif // ServiceWorkerContainer_h