Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / modules / serviceworkers / ServiceWorkerContainer.h

diff --git a/src/third_party/WebKit/Source/modules/serviceworkers/ServiceWorkerContainer.h b/src/third_party/WebKit/Source/modules/serviceworkers/ServiceWorkerContainer.h
index b3aa33e..71d04fb 100644 (file)
--- a/src/third_party/WebKit/Source/modules/serviceworkers/ServiceWorkerContainer.h
+++ b/src/third_party/WebKit/Source/modules/serviceworkers/ServiceWorkerContainer.h
@@ -31,63 +31,71 @@
 #ifndef ServiceWorkerContainer_h
 #define ServiceWorkerContainer_h
 
-#include "bindings/v8/ScriptPromise.h"
-#include "bindings/v8/ScriptWrappable.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 "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 WebServiceWorkerProvider;
-class WebServiceWorker;
-}
-
-namespace WebCore {
 
 class Dictionary;
 class ExecutionContext;
 class ServiceWorker;
+class WebServiceWorkerProvider;
+class WebServiceWorker;
 
-class ServiceWorkerContainer FINAL :
-    public RefCounted<ServiceWorkerContainer>,
-    public ScriptWrappable,
-    public ContextLifecycleObserver,
-    public blink::WebServiceWorkerProviderClient {
+class ServiceWorkerContainer FINAL
+    : public RefCountedWillBeGarbageCollectedFinalized<ServiceWorkerContainer>
+    , public ScriptWrappable
+    , public ContextLifecycleObserver
+    , public WebServiceWorkerProviderClient {
 public:
-    static PassRefPtr<ServiceWorkerContainer> create(ExecutionContext*);
+    static PassRefPtrWillBeRawPtr<ServiceWorkerContainer> create(ExecutionContext*);
     ~ServiceWorkerContainer();
 
-    void detachClient();
+    void willBeDetachedFromFrame();
+
+    void trace(Visitor*);
 
     PassRefPtrWillBeRawPtr<ServiceWorker> active() { return m_active.get(); }
     PassRefPtrWillBeRawPtr<ServiceWorker> controller() { return m_controller.get(); }
     PassRefPtrWillBeRawPtr<ServiceWorker> installing() { return m_installing.get(); }
     PassRefPtrWillBeRawPtr<ServiceWorker> waiting() { return m_waiting.get(); }
     ScriptPromise ready(ScriptState*);
+    WebServiceWorkerProvider* provider() { return m_provider; }
 
     ScriptPromise registerServiceWorker(ScriptState*, const String& pattern, const Dictionary&);
-    ScriptPromise unregisterServiceWorker(ScriptState*, const String& scope = String());
+    ScriptPromise unregisterServiceWorker(ScriptState*, const String& scope);
 
     // WebServiceWorkerProviderClient overrides.
-    virtual void setActive(blink::WebServiceWorker*) OVERRIDE;
-    virtual void setController(blink::WebServiceWorker*) OVERRIDE;
-    virtual void setInstalling(blink::WebServiceWorker*) OVERRIDE;
-    virtual void setWaiting(blink::WebServiceWorker*) OVERRIDE;
-    virtual void dispatchMessageEvent(const blink::WebString& message, const blink::WebMessagePortChannelArray&) OVERRIDE;
+    virtual void setActive(WebServiceWorker*) OVERRIDE;
+    virtual void setController(WebServiceWorker*) OVERRIDE;
+    virtual void setInstalling(WebServiceWorker*) OVERRIDE;
+    virtual void setWaiting(WebServiceWorker*) OVERRIDE;
+    virtual void dispatchMessageEvent(const WebString& message, const WebMessagePortChannelArray&) OVERRIDE;
 
 private:
     explicit ServiceWorkerContainer(ExecutionContext*);
 
-    blink::WebServiceWorkerProvider* m_provider;
-    RefPtr<ServiceWorker> m_active;
-    RefPtr<ServiceWorker> m_controller;
-    RefPtr<ServiceWorker> m_installing;
-    RefPtr<ServiceWorker> m_waiting;
+    typedef ScriptPromiseProperty<RawPtrWillBeMember<ServiceWorkerContainer>, RefPtrWillBeMember<ServiceWorker>, RefPtrWillBeMember<ServiceWorker> > 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;
+    PersistentWillBeMember<ReadyProperty> m_ready;
 };
 
-} // namespace WebCore
+} // namespace blink
 
 #endif // ServiceWorkerContainer_h