Upstream version 7.36.149.0

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

diff --git a/src/third_party/WebKit/Source/modules/serviceworkers/NavigatorServiceWorker.h b/src/third_party/WebKit/Source/modules/serviceworkers/NavigatorServiceWorker.h
index 57f114d..39cc29a 100644 (file)
--- a/src/third_party/WebKit/Source/modules/serviceworkers/NavigatorServiceWorker.h
+++ b/src/third_party/WebKit/Source/modules/serviceworkers/NavigatorServiceWorker.h
@@ -5,13 +5,13 @@
 #ifndef NavigatorServiceWorker_h
 #define NavigatorServiceWorker_h
 
-#include "bindings/v8/ScriptPromise.h"
 #include "core/frame/Navigator.h"
-#include "heap/Handle.h"
 #include "platform/Supplementable.h"
+#include "platform/heap/Handle.h"
 
 namespace WebCore {
 
+class Document;
 class Navigator;
 class ServiceWorkerContainer;
 
@@ -19,17 +19,18 @@ class NavigatorServiceWorker FINAL : public NoBaseWillBeGarbageCollectedFinalize
     WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(NavigatorServiceWorker);
 public:
     virtual ~NavigatorServiceWorker();
+    static NavigatorServiceWorker* from(Document&);
     static NavigatorServiceWorker& from(Navigator&);
     static NavigatorServiceWorker* toNavigatorServiceWorker(Navigator&);
     static const char* supplementName();
 
-    static ServiceWorkerContainer* serviceWorker(ExecutionContext*, Navigator&);
+    static ServiceWorkerContainer* serviceWorker(Navigator&);
 
-    void trace(Visitor*) { }
+    virtual void trace(Visitor* visitor) OVERRIDE { WillBeHeapSupplement<Navigator>::trace(visitor); }
 
 private:
     explicit NavigatorServiceWorker(Navigator&);
-    ServiceWorkerContainer* serviceWorker(ExecutionContext*);
+    ServiceWorkerContainer* serviceWorker();
 
     // DOMWindowProperty override.
     virtual void willDetachGlobalObjectFromFrame() OVERRIDE;