2009-02-02 David Levin <levin@chromium.org>
authorap@webkit.org <ap@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 3 Feb 2009 07:38:38 +0000 (07:38 +0000)
committerap@webkit.org <ap@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 3 Feb 2009 07:38:38 +0000 (07:38 +0000)
        Reviewed by Alexey Proskuryakov.

        Bug 23636: Make the async api of ThreadableLoader functional for the worker context.
        <https://bugs.webkit.org/show_bug.cgi?id=23636>

        No observable change in behavior, so no test.

        * WebCore.xcodeproj/project.pbxproj:
        * dom/Worker.cpp:
        * dom/Worker.h:
        * dom/WorkerContext.cpp:
        (WebCore::WorkerContext::addMessage):
        (WebCore::WorkerContext::postTask):
        (WebCore::WorkerContext::postTaskToWorkerObject):
        * dom/WorkerContext.h:
        * dom/WorkerMessagingProxy.cpp:
        (WebCore::MessageWorkerContextTask::performTask):
        (WebCore::WorkerMessagingProxy::postMessageToWorkerContext):
        (WebCore::WorkerMessagingProxy::postTaskToWorkerContext):
        Expose postTaskToWorkerContext for use by the worker object thread.

        (WebCore::WorkerMessagingProxy::postTaskToWorkerObject):
        Change the name of postTaskToParentContext to postTaskToWorkerObject for consistency
        with postMessageToWorkerObject.

        * dom/WorkerMessagingProxy.h:
        * dom/WorkerRunLoop.cpp:
        (WebCore::WorkerRunLoop::run):
        (WebCore::WorkerRunLoop::postTask):
        * dom/WorkerRunLoop.h:
        * dom/WorkerTask.cpp: Removed.
        * dom/WorkerTask.h: Removed.
        Removed WorkerTask and replaced with the existing ScriptExecutionContext::Task.

        The resulted in the class going away along with an adapter that made
        a ScriptExecutionContext::Task look like a WorkerTask.

        * dom/WorkerThread.cpp:
        * dom/WorkerThread.h:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@40526 268f45cc-cd09-0410-ab3c-d52691b4dbfc

14 files changed:
WebCore/ChangeLog
WebCore/WebCore.xcodeproj/project.pbxproj
WebCore/dom/Worker.cpp
WebCore/dom/Worker.h
WebCore/dom/WorkerContext.cpp
WebCore/dom/WorkerContext.h
WebCore/dom/WorkerMessagingProxy.cpp
WebCore/dom/WorkerMessagingProxy.h
WebCore/dom/WorkerRunLoop.cpp
WebCore/dom/WorkerRunLoop.h
WebCore/dom/WorkerTask.cpp [deleted file]
WebCore/dom/WorkerTask.h [deleted file]
WebCore/dom/WorkerThread.cpp
WebCore/dom/WorkerThread.h

index e6d2a8f8e9c3bec3e4c413db473cbeee5696966a..88873010747eb6eaa804db232a8b65e9a5e17727 100644 (file)
@@ -1,3 +1,45 @@
+2009-02-02  David Levin  <levin@chromium.org>
+
+        Reviewed by Alexey Proskuryakov.
+
+        Bug 23636: Make the async api of ThreadableLoader functional for the worker context.
+        <https://bugs.webkit.org/show_bug.cgi?id=23636>
+
+        No observable change in behavior, so no test.
+
+        * WebCore.xcodeproj/project.pbxproj:
+        * dom/Worker.cpp:
+        * dom/Worker.h:
+        * dom/WorkerContext.cpp:
+        (WebCore::WorkerContext::addMessage):
+        (WebCore::WorkerContext::postTask):
+        (WebCore::WorkerContext::postTaskToWorkerObject):
+        * dom/WorkerContext.h:
+        * dom/WorkerMessagingProxy.cpp:
+        (WebCore::MessageWorkerContextTask::performTask):
+        (WebCore::WorkerMessagingProxy::postMessageToWorkerContext):
+        (WebCore::WorkerMessagingProxy::postTaskToWorkerContext):
+        Expose postTaskToWorkerContext for use by the worker object thread.
+
+        (WebCore::WorkerMessagingProxy::postTaskToWorkerObject):
+        Change the name of postTaskToParentContext to postTaskToWorkerObject for consistency
+        with postMessageToWorkerObject.
+
+        * dom/WorkerMessagingProxy.h:
+        * dom/WorkerRunLoop.cpp:
+        (WebCore::WorkerRunLoop::run):
+        (WebCore::WorkerRunLoop::postTask):
+        * dom/WorkerRunLoop.h:
+        * dom/WorkerTask.cpp: Removed.
+        * dom/WorkerTask.h: Removed.
+        Removed WorkerTask and replaced with the existing ScriptExecutionContext::Task.
+
+        The resulted in the class going away along with an adapter that made
+        a ScriptExecutionContext::Task look like a WorkerTask.
+
+        * dom/WorkerThread.cpp:
+        * dom/WorkerThread.h:
+
 2009-02-02  David Levin  <levin@chromium.org>
 
         Reviewed by Alexey Proskuryakov.
index ade796b2f41fddffc1cb5fd33803e91e4e07c931..c970fc368cad6eed4beafec38289cd54b4d7210e 100644 (file)
                E107400E0E77BDC00033AF24 /* JSMessageChannel.h in Headers */ = {isa = PBXBuildFile; fileRef = E107400C0E77BDC00033AF24 /* JSMessageChannel.h */; };
                E10743240E7835830033AF24 /* JSMessageChannelConstructor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E10743230E7835830033AF24 /* JSMessageChannelConstructor.cpp */; };
                E10743270E7835A50033AF24 /* JSMessageChannelConstructor.h in Headers */ = {isa = PBXBuildFile; fileRef = E10743260E7835A50033AF24 /* JSMessageChannelConstructor.h */; };
-               E108224B0EC3153A00E93953 /* WorkerTask.h in Headers */ = {isa = PBXBuildFile; fileRef = E108224A0EC3153A00E93953 /* WorkerTask.h */; };
-               E108224F0EC3156700E93953 /* WorkerTask.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E108224E0EC3156700E93953 /* WorkerTask.cpp */; };
                E10B937C0B73C00A003ED890 /* JSCustomXPathNSResolver.h in Headers */ = {isa = PBXBuildFile; fileRef = E10B937B0B73C00A003ED890 /* JSCustomXPathNSResolver.h */; };
                E10B93C30B73C291003ED890 /* JSCustomXPathNSResolver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E10B93C20B73C291003ED890 /* JSCustomXPathNSResolver.cpp */; };
                E10B9B6C0B747599003ED890 /* NativeXPathNSResolver.h in Headers */ = {isa = PBXBuildFile; fileRef = E10B9B6A0B747599003ED890 /* NativeXPathNSResolver.h */; };
                E107400C0E77BDC00033AF24 /* JSMessageChannel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSMessageChannel.h; sourceTree = "<group>"; };
                E10743230E7835830033AF24 /* JSMessageChannelConstructor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSMessageChannelConstructor.cpp; sourceTree = "<group>"; };
                E10743260E7835A50033AF24 /* JSMessageChannelConstructor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSMessageChannelConstructor.h; sourceTree = "<group>"; };
-               E108224A0EC3153A00E93953 /* WorkerTask.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WorkerTask.h; sourceTree = "<group>"; };
-               E108224E0EC3156700E93953 /* WorkerTask.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WorkerTask.cpp; sourceTree = "<group>"; };
                E10B937B0B73C00A003ED890 /* JSCustomXPathNSResolver.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSCustomXPathNSResolver.h; sourceTree = "<group>"; };
                E10B93C20B73C291003ED890 /* JSCustomXPathNSResolver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSCustomXPathNSResolver.cpp; sourceTree = "<group>"; };
                E10B9B6A0B747599003ED890 /* NativeXPathNSResolver.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NativeXPathNSResolver.h; sourceTree = "<group>"; };
                                E14799A60ECDE3A400292BF3 /* WorkerMessagingProxy.h */,
                                18A0537A0F26859C00A51705 /* WorkerRunLoop.cpp */,
                                18A0537B0F26859C00A51705 /* WorkerRunLoop.h */,
-                               E108224E0EC3156700E93953 /* WorkerTask.cpp */,
-                               E108224A0EC3153A00E93953 /* WorkerTask.h */,
                                E1C2C4280EACE0E0007E61FB /* WorkerThread.cpp */,
                                E1C2C4230EACE0BC007E61FB /* WorkerThread.h */,
                                F523D30902DE4476018635CA /* XMLTokenizer.cpp */,
                                E1271A0B0EEEC77A00F61213 /* WorkerNavigator.h in Headers */,
                                18A0537D0F26859C00A51705 /* WorkerRunLoop.h in Headers */,
                                E1A643F20EC0972500779668 /* WorkerScriptController.h in Headers */,
-                               E108224B0EC3153A00E93953 /* WorkerTask.h in Headers */,
                                E1C2C4240EACE0BC007E61FB /* WorkerThread.h in Headers */,
                                93309E24099E64920056E581 /* WrapContentsInDummySpanCommand.h in Headers */,
                                6565820209D1508D000E61D7 /* XLinkNames.h in Headers */,
                                E1271A140EEEC80400F61213 /* WorkerNavigator.cpp in Sources */,
                                18A0537C0F26859C00A51705 /* WorkerRunLoop.cpp in Sources */,
                                E1A643FD0EC097A000779668 /* WorkerScriptController.cpp in Sources */,
-                               E108224F0EC3156700E93953 /* WorkerTask.cpp in Sources */,
                                E1C2C4290EACE0E0007E61FB /* WorkerThread.cpp in Sources */,
                                93309E23099E64920056E581 /* WrapContentsInDummySpanCommand.cpp in Sources */,
                                A833C7CC0A2CF07400D57664 /* XLinkNames.cpp in Sources */,
index 6889a422a40cb1e3fcb68caab39d8a305f22b8a0..17fe3ea1abef75c7bb965d2989865536ffc52ce4 100644 (file)
@@ -44,7 +44,6 @@
 #include "SecurityOrigin.h"
 #include "WorkerContext.h"
 #include "WorkerMessagingProxy.h"
-#include "WorkerTask.h"
 #include "WorkerThread.h"
 #include <wtf/MainThread.h>
 
index 6a47bac44d97de35e44ce73422cd6e8a04f0665f..d7e662bf3aae984c272c0891b8f8084fbbf4053c 100644 (file)
@@ -47,7 +47,6 @@ namespace WebCore {
     class ScriptExecutionContext;
     class String;
     class WorkerMessagingProxy;
-    class WorkerTask;
 
     typedef int ExceptionCode;
 
index 8ef1b424898998d3d1d8d32ca2495e42d7e19b9b..faa81968320b5b28605015e73bc0e268b60a9660 100644 (file)
@@ -40,7 +40,6 @@
 #include "WorkerLocation.h"
 #include "WorkerMessagingProxy.h"
 #include "WorkerNavigator.h"
-#include "WorkerTask.h"
 #include "WorkerThread.h"
 #include <wtf/RefPtr.h>
 
@@ -120,7 +119,7 @@ static void addMessageTask(ScriptExecutionContext* context, WorkerMessagingProxy
 
 void WorkerContext::addMessage(MessageDestination destination, MessageSource source, MessageLevel level, const String& message, unsigned lineNumber, const String& sourceURL)
 {
-    postTaskToParentContext(createCallbackTask(&addMessageTask, m_thread->messagingProxy(), destination, source, level, message, lineNumber, sourceURL));
+    postTaskToWorkerObject(createCallbackTask(&addMessageTask, m_thread->messagingProxy(), destination, source, level, message, lineNumber, sourceURL));
 }
 
 void WorkerContext::resourceRetrievedByXMLHttpRequest(unsigned long, const ScriptString&)
@@ -185,35 +184,14 @@ bool WorkerContext::dispatchEvent(PassRefPtr<Event> event, ExceptionCode& ec)
     return !event->defaultPrevented();
 }
 
-class ScriptExecutionContextTaskWorkerTask : public WorkerTask {
-public:
-    static PassRefPtr<ScriptExecutionContextTaskWorkerTask> create(PassRefPtr<ScriptExecutionContext::Task> task)
-    {
-        return adoptRef(new ScriptExecutionContextTaskWorkerTask(task));
-    }
-
-private:
-    ScriptExecutionContextTaskWorkerTask(PassRefPtr<ScriptExecutionContext::Task> task)
-        : m_task(task)
-    {
-    }
-
-    virtual void performTask(WorkerContext* context)
-    {
-        m_task->performTask(context);
-    }
-
-    RefPtr<ScriptExecutionContext::Task> m_task;
-};
-
 void WorkerContext::postTask(PassRefPtr<Task> task)
 {
-    thread()->runLoop().postTask(ScriptExecutionContextTaskWorkerTask::create(task));
+    thread()->runLoop().postTask(task);
 }
 
-void WorkerContext::postTaskToParentContext(PassRefPtr<Task> task)
+void WorkerContext::postTaskToWorkerObject(PassRefPtr<Task> task)
 {
-    thread()->messagingProxy()->postTaskToParentContext(task);
+    thread()->messagingProxy()->postTaskToWorkerObject(task);
 }
 
 } // namespace WebCore
index 2e443d9a42f1f48264c9f08a3d51e4f153ea870f..0036b7072ee998234a57272291893fdb084317e4 100644 (file)
@@ -78,7 +78,7 @@ namespace WebCore {
 
         void postMessage(const String& message);
         virtual void postTask(PassRefPtr<Task>); // Executes the task on context's thread asynchronously.
-        void postTaskToParentContext(PassRefPtr<Task>); // Executes the task in the parent's context (and thread) asynchronously.
+        void postTaskToWorkerObject(PassRefPtr<Task>); // Executes the task on the worker object's thread asynchronously.
 
         virtual void addEventListener(const AtomicString& eventType, PassRefPtr<EventListener>, bool useCapture);
         virtual void removeEventListener(const AtomicString& eventType, EventListener*, bool useCapture);
index daeae5ab997b306a5d7452c1e67c8ee37179ac10..8cd66f179152539ae2a1e31823a96114037fd580 100644 (file)
 #include "DOMWindow.h"
 #include "Document.h"
 #include "MessageEvent.h"
+#include "ScriptExecutionContext.h"
 #include "Worker.h"
 #include "WorkerContext.h"
-#include "WorkerTask.h"
 #include "WorkerThread.h"
 
 namespace WebCore {
 
-class MessageWorkerContextTask : public WorkerTask {
+class MessageWorkerContextTask : public ScriptExecutionContext::Task {
 public:
     static PassRefPtr<MessageWorkerContextTask> create(const String& message)
     {
@@ -53,8 +53,11 @@ private:
     {
     }
 
-    virtual void performTask(WorkerContext* context)
+    virtual void performTask(ScriptExecutionContext* scriptContext)
     {
+        ASSERT(scriptContext->isWorkerContext());
+        WorkerContext* context = static_cast<WorkerContext*>(scriptContext);
+
         RefPtr<Event> evt = MessageEvent::create(m_message, "", "", 0, 0);
 
         if (context->onmessage()) {
@@ -212,18 +215,23 @@ void WorkerMessagingProxy::postMessageToWorkerObject(const String& message)
 }
 
 void WorkerMessagingProxy::postMessageToWorkerContext(const String& message)
+{
+    postTaskToWorkerContext(MessageWorkerContextTask::create(message));
+}
+
+void WorkerMessagingProxy::postTaskToWorkerContext(PassRefPtr<ScriptExecutionContext::Task> task)
 {
     if (m_askedToTerminate)
         return;
 
     if (m_workerThread) {
         ++m_unconfirmedMessageCount;
-        m_workerThread->runLoop().postTask(MessageWorkerContextTask::create(message));
+        m_workerThread->runLoop().postTask(task);
     } else
-        m_queuedEarlyTasks.append(MessageWorkerContextTask::create(message));
+        m_queuedEarlyTasks.append(task);
 }
 
-void WorkerMessagingProxy::postTaskToParentContext(PassRefPtr<ScriptExecutionContext::Task> task)
+void WorkerMessagingProxy::postTaskToWorkerObject(PassRefPtr<ScriptExecutionContext::Task> task)
 {
     m_scriptExecutionContext->postTask(task);
 }
index 7fdc8750ce251646955ca73e5f81164c4171ea7d..b010700491ae19108f83e60ccc9a952af5b022dc 100644 (file)
@@ -40,7 +40,6 @@ namespace WebCore {
     class ScriptExecutionContext;
     class String;
     class Worker;
-    class WorkerTask;
     class WorkerThread;
 
     class WorkerMessagingProxy : Noncopyable {
@@ -49,7 +48,9 @@ namespace WebCore {
 
         void postMessageToWorkerObject(const String& message);
         void postMessageToWorkerContext(const String& message);
-        void postTaskToParentContext(PassRefPtr<ScriptExecutionContext::Task>);
+
+        void postTaskToWorkerObject(PassRefPtr<ScriptExecutionContext::Task>);
+        void postTaskToWorkerContext(PassRefPtr<ScriptExecutionContext::Task>);
 
         void postWorkerException(const String& errorMessage, int lineNumber, const String& sourceURL);
 
@@ -85,7 +86,7 @@ namespace WebCore {
 
         bool m_askedToTerminate;
 
-        Vector<RefPtr<WorkerTask> > m_queuedEarlyTasks; // Tasks are queued here until there's a thread object created.
+        Vector<RefPtr<ScriptExecutionContext::Task> > m_queuedEarlyTasks; // Tasks are queued here until there's a thread object created.
     };
 
 } // namespace WebCore
index 98c2e8dc3b61cb60f04e1414dc2272190185d9df..e929b7bc16b2eb4e033bb429b4cef35a3f91e232 100644 (file)
@@ -32,9 +32,9 @@
 
 #if ENABLE(WORKERS)
 
+#include "ScriptExecutionContext.h"
 #include "WorkerRunLoop.h"
 #include "WorkerContext.h"
-#include "WorkerTask.h"
 #include "WorkerThread.h"
 
 namespace WebCore {
@@ -46,7 +46,7 @@ void WorkerRunLoop::run(WorkerContext* context)
     ASSERT(context->thread()->threadID() == currentThread());
     
     while (true) {
-        RefPtr<WorkerTask> task;
+        RefPtr<ScriptExecutionContext::Task> task;
         if (!m_messageQueue.waitForMessage(task))
             break;
 
@@ -59,7 +59,7 @@ void WorkerRunLoop::terminate()
     m_messageQueue.kill();
 }
 
-void WorkerRunLoop::postTask(PassRefPtr<WorkerTask> task)
+void WorkerRunLoop::postTask(PassRefPtr<ScriptExecutionContext::Task> task)
 {
     m_messageQueue.append(task);
 }
index 03a746bc40d08b38098f5ef0bcfc30f2ccc4c96f..339fe1c16ab72e5e7b216946b079803ba3766f36 100644 (file)
@@ -33,7 +33,7 @@
 
 #if ENABLE(WORKERS)
 
-#include "WorkerTask.h"
+#include "ScriptExecutionContext.h"
 #include <wtf/MessageQueue.h>
 #include <wtf/PassRefPtr.h>
 
@@ -51,10 +51,10 @@ namespace WebCore {
         void terminate();
         bool terminated() { return m_messageQueue.killed(); }
 
-        void postTask(PassRefPtr<WorkerTask>);
+        void postTask(PassRefPtr<ScriptExecutionContext::Task>);
         
     private:
-        MessageQueue<RefPtr<WorkerTask> > m_messageQueue;
+        MessageQueue<RefPtr<ScriptExecutionContext::Task> > m_messageQueue;
     };
 
 } // namespace WebCore
diff --git a/WebCore/dom/WorkerTask.cpp b/WebCore/dom/WorkerTask.cpp
deleted file mode 100644 (file)
index 4a22c59..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (C) 2008 Apple 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:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
- *
- */
-
-#include "config.h"
-
-#if ENABLE(WORKERS)
-
-#include "WorkerTask.h"
-
-namespace WebCore {
-
-WorkerTask::~WorkerTask()
-{
-}
-
-} // namespace WebCore
-
-#endif // ENABLE(WORKERS)
diff --git a/WebCore/dom/WorkerTask.h b/WebCore/dom/WorkerTask.h
deleted file mode 100644 (file)
index a842ce2..0000000
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (C) 2008 Apple 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:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
- *
- */
-
-#ifndef WorkerTask_h
-#define WorkerTask_h
-
-#if ENABLE(WORKERS)
-
-#include <wtf/Threading.h>
-
-namespace WebCore {
-
-    class WorkerContext;
-
-    class WorkerTask : public ThreadSafeShared<WorkerTask> {
-    public:
-        virtual ~WorkerTask();
-        virtual void performTask(WorkerContext*) = 0;
-    };
-
-} // namespace WebCore
-
-#endif // ENABLE(WORKERS)
-
-#endif // WorkerTask_h
index a762e0bf39b1d3e661e3b0b5ef8723947cbc63cb..b44d843e5c9fce70837c1f0247f085d55cab7b1b 100644 (file)
@@ -37,7 +37,6 @@
 #include "Worker.h"
 #include "WorkerContext.h"
 #include "WorkerMessagingProxy.h"
-#include "WorkerTask.h"
 
 #include <utility>
 #include <wtf/Noncopyable.h>
index 504db8167118ed13959a3854b9e8a23ce3fa0872..bd792d4d2fa28a14db103fcc5127ed9651d5d15c 100644 (file)
@@ -40,7 +40,6 @@ namespace WebCore {
     class String;
     class WorkerContext;
     class WorkerMessagingProxy;
-    class WorkerTask;
     struct WorkerThreadStartupData;
 
     class WorkerThread : public RefCounted<WorkerThread> {