Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / web / ServiceWorkerGlobalScopeProxy.h

diff --git a/src/third_party/WebKit/Source/web/ServiceWorkerGlobalScopeProxy.h b/src/third_party/WebKit/Source/web/ServiceWorkerGlobalScopeProxy.h
index 5389418..cf378f7 100644 (file)
--- a/src/third_party/WebKit/Source/web/ServiceWorkerGlobalScopeProxy.h
+++ b/src/third_party/WebKit/Source/web/ServiceWorkerGlobalScopeProxy.h
@@ -42,6 +42,7 @@ namespace blink {
 
 class ConsoleMessage;
 class Document;
+class ServiceWorkerGlobalScope;
 class WebEmbeddedWorkerImpl;
 class WebServiceWorkerContextClient;
 class WebServiceWorkerRequest;
@@ -58,7 +59,7 @@ class WebServiceWorkerRequest;
 // An instance of this class is supposed to outlive until
 // workerThreadTerminated() is called by its corresponding
 // WorkerGlobalScope.
-class ServiceWorkerGlobalScopeProxy FINAL
+class ServiceWorkerGlobalScopeProxy final
     : public WebServiceWorkerContextProxy
     , public WorkerReportingProxy {
     WTF_MAKE_NONCOPYABLE(ServiceWorkerGlobalScopeProxy);
@@ -67,22 +68,23 @@ public:
     virtual ~ServiceWorkerGlobalScopeProxy();
 
     // WebServiceWorkerContextProxy overrides:
-    virtual void dispatchActivateEvent(int) OVERRIDE;
-    virtual void dispatchInstallEvent(int) OVERRIDE;
-    virtual void dispatchFetchEvent(int, const WebServiceWorkerRequest&) OVERRIDE;
-    virtual void dispatchMessageEvent(const WebString& message, const WebMessagePortChannelArray&) OVERRIDE;
-    virtual void dispatchPushEvent(int, const WebString& data) OVERRIDE;
-    virtual void dispatchSyncEvent(int) OVERRIDE;
+    virtual void dispatchActivateEvent(int) override;
+    virtual void dispatchInstallEvent(int) override;
+    virtual void dispatchFetchEvent(int, const WebServiceWorkerRequest&) override;
+    virtual void dispatchGeofencingEvent(int, WebGeofencingEventType, const WebString& regionID, const WebCircularGeofencingRegion&) override;
+    virtual void dispatchMessageEvent(const WebString& message, const WebMessagePortChannelArray&) override;
+    virtual void dispatchPushEvent(int, const WebString& data) override;
+    virtual void dispatchSyncEvent(int) override;
 
     // WorkerReportingProxy overrides:
-    virtual void reportException(const String& errorMessage, int lineNumber, int columnNumber, const String& sourceURL) OVERRIDE;
-    virtual void reportConsoleMessage(PassRefPtrWillBeRawPtr<ConsoleMessage>) OVERRIDE;
-    virtual void postMessageToPageInspector(const String&) OVERRIDE;
-    virtual void updateInspectorStateCookie(const String&) OVERRIDE;
-    virtual void workerGlobalScopeStarted(WorkerGlobalScope*) OVERRIDE;
-    virtual void workerGlobalScopeClosed() OVERRIDE;
-    virtual void willDestroyWorkerGlobalScope() OVERRIDE;
-    virtual void workerThreadTerminated() OVERRIDE;
+    virtual void reportException(const String& errorMessage, int lineNumber, int columnNumber, const String& sourceURL) override;
+    virtual void reportConsoleMessage(PassRefPtrWillBeRawPtr<ConsoleMessage>) override;
+    virtual void postMessageToPageInspector(const String&) override;
+    virtual void didEvaluateWorkerScript(bool success) override;
+    virtual void workerGlobalScopeStarted(WorkerGlobalScope*) override;
+    virtual void workerGlobalScopeClosed() override;
+    virtual void willDestroyWorkerGlobalScope() override;
+    virtual void workerThreadTerminated() override;
 
 private:
     ServiceWorkerGlobalScopeProxy(WebEmbeddedWorkerImpl&, Document&, WebServiceWorkerContextClient&);
@@ -92,7 +94,7 @@ private:
 
     WebServiceWorkerContextClient& m_client;
 
-    WorkerGlobalScope* m_workerGlobalScope;
+    ServiceWorkerGlobalScope* m_workerGlobalScope;
 };
 
 } // namespace blink