Upstream version 9.38.198.0

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

diff --git a/src/third_party/WebKit/Source/web/WebSharedWorkerImpl.h b/src/third_party/WebKit/Source/web/WebSharedWorkerImpl.h
index 42dcef8..d898de2 100644 (file)
--- a/src/third_party/WebKit/Source/web/WebSharedWorkerImpl.h
+++ b/src/third_party/WebKit/Source/web/WebSharedWorkerImpl.h
@@ -45,11 +45,10 @@
 #include "wtf/RefPtr.h"
 #include "wtf/WeakPtr.h"
 
-namespace WebCore {
-class ResourceResponse;
-}
-
 namespace blink {
+
+class ConsoleMessage;
+class ResourceResponse;
 class WebApplicationCacheHost;
 class WebApplicationCacheHostClient;
 class WebWorkerClient;
@@ -60,34 +59,32 @@ class WebView;
 class WebWorker;
 class WebSharedWorkerClient;
 
-// This class is used by the worker process code to talk to the WebCore::SharedWorker implementation.
+// This class is used by the worker process code to talk to the SharedWorker implementation.
 // It can't use it directly since it uses WebKit types, so this class converts the data types.
-// When the WebCore::SharedWorker object wants to call WebCore::WorkerReportingProxy, this class will
+// When the SharedWorker object wants to call WorkerReportingProxy, this class will
 // convert to Chrome data types first and then call the supplied WebCommonWorkerClient.
 class WebSharedWorkerImpl FINAL
-    : public WebCore::WorkerReportingProxy
-    , public WebCore::WorkerLoaderProxy
+    : public WorkerReportingProxy
+    , public WorkerLoaderProxy
     , public WebFrameClient
     , public WebSharedWorker {
 public:
     explicit WebSharedWorkerImpl(WebSharedWorkerClient*);
 
-    // WebCore::WorkerReportingProxy methods:
+    // WorkerReportingProxy methods:
     virtual void reportException(
         const WTF::String&, int, int, const WTF::String&) OVERRIDE;
-    virtual void reportConsoleMessage(
-        WebCore::MessageSource, WebCore::MessageLevel,
-        const WTF::String&, int, const WTF::String&) OVERRIDE;
+    virtual void reportConsoleMessage(PassRefPtrWillBeRawPtr<ConsoleMessage>) OVERRIDE;
     virtual void postMessageToPageInspector(const WTF::String&) OVERRIDE;
     virtual void updateInspectorStateCookie(const WTF::String&) OVERRIDE;
-    virtual void workerGlobalScopeStarted(WebCore::WorkerGlobalScope*) OVERRIDE;
+    virtual void workerGlobalScopeStarted(WorkerGlobalScope*) OVERRIDE;
     virtual void workerGlobalScopeClosed() OVERRIDE;
-    virtual void workerGlobalScopeDestroyed() OVERRIDE;
+    virtual void workerThreadTerminated() OVERRIDE;
     virtual void willDestroyWorkerGlobalScope() OVERRIDE { }
 
-    // WebCore::WorkerLoaderProxy methods:
-    virtual void postTaskToLoader(PassOwnPtr<WebCore::ExecutionContextTask>) OVERRIDE;
-    virtual bool postTaskToWorkerGlobalScope(PassOwnPtr<WebCore::ExecutionContextTask>) OVERRIDE;
+    // WorkerLoaderProxy methods:
+    virtual void postTaskToLoader(PassOwnPtr<ExecutionContextTask>) OVERRIDE;
+    virtual bool postTaskToWorkerGlobalScope(PassOwnPtr<ExecutionContextTask>) OVERRIDE;
 
     // WebFrameClient methods to support resource loading thru the 'shadow page'.
     virtual WebApplicationCacheHost* createApplicationCacheHost(WebLocalFrame*, WebApplicationCacheHostClient*) OVERRIDE;
@@ -113,8 +110,8 @@ private:
 
     WebSharedWorkerClient* client() { return m_client->get(); }
 
-    void setWorkerThread(PassRefPtr<WebCore::WorkerThread> thread) { m_workerThread = thread; }
-    WebCore::WorkerThread* workerThread() { return m_workerThread.get(); }
+    void setWorkerThread(PassRefPtr<WorkerThread> thread) { m_workerThread = thread; }
+    WorkerThread* workerThread() { return m_workerThread.get(); }
 
     // Shuts down the worker thread.
     void stopWorkerThread();
@@ -125,18 +122,18 @@ private:
     void didReceiveScriptLoaderResponse();
     void onScriptLoaderFinished();
 
-    static void connectTask(WebCore::ExecutionContext*, PassOwnPtr<WebMessagePortChannel>);
+    static void connectTask(ExecutionContext*, PassOwnPtr<WebMessagePortChannel>);
     // Tasks that are run on the main thread.
     void workerGlobalScopeClosedOnMainThread();
-    void workerGlobalScopeDestroyedOnMainThread();
+    void workerThreadTerminatedOnMainThread();
 
     // 'shadow page' - created to proxy loading requests from the worker.
-    RefPtrWillBePersistent<WebCore::ExecutionContext> m_loadingDocument;
+    RefPtrWillBePersistent<ExecutionContext> m_loadingDocument;
     WebView* m_webView;
     WebFrame* m_mainFrame;
     bool m_askedToTerminate;
 
-    RefPtr<WebCore::WorkerThread> m_workerThread;
+    RefPtr<WorkerThread> m_workerThread;
 
     // This one's initialized and bound to the main thread.
     RefPtr<WeakReference<WebSharedWorkerClient> > m_client;