3 files changed, 25 insertions, 92 deletions
diff --git a/webkit/api/public/WebCommonWorkerClient.h b/webkit/api/public/WebCommonWorkerClient.h
deleted file mode 100644
index fd7e399..0000000
--- a/webkit/api/public/WebCommonWorkerClient.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Copyright (C) 2009 Google 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:
- *
- *     * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *     * 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.
- *     * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "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 THE COPYRIGHT
- * OWNER 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 WebCommonWorkerClient_h
-#define WebCommonWorkerClient_h
-
-namespace WebKit {
-    class WebNotificationPresenter;
-    class WebString;
-    class WebWorker;
-    class WebWorkerClient;
-
-    // Provides an interface back to the in-page script object for a worker.
-    // This interface contains common APIs used by both shared and dedicated
-    // workers.
-    // All functions are expected to be called back on the thread that created
-    // the Worker object, unless noted.
-    class WebCommonWorkerClient {
-    public:
-        virtual void postExceptionToWorkerObject(
-            const WebString& errorString, int lineNumber,
-            const WebString& sourceURL) = 0;
-
-        virtual void postConsoleMessageToWorkerObject(
-            int destinationIdentifier,
-            int sourceIdentifier,
-            int messageType,
-            int messageLevel,
-            const WebString& message,
-            int lineNumber,
-            const WebString& sourceURL) = 0;
-
-        virtual void workerContextDestroyed() = 0;
-
-        // Returns the notification presenter for this worker context.  Pointer
-        // is owned by the object implementing WebCommonWorkerClient.
-        virtual WebNotificationPresenter* notificationPresenter() = 0;
-
-        // This can be called on any thread to create a nested WebWorker.
-        // WebSharedWorkers are not instantiated via this API - instead
-        // they are created via the WebSharedWorkerRepository.
-        virtual WebWorker* createWorker(WebWorkerClient* client) = 0;
-
-    protected:
-        ~WebCommonWorkerClient() { }
-    };
-
-} // namespace WebKit
-
-#endif
diff --git a/webkit/api/public/WebSharedWorker.h b/webkit/api/public/WebSharedWorker.h
index a580882..37f0ad6 100644
--- a/webkit/api/public/WebSharedWorker.h
+++ b/webkit/api/public/WebSharedWorker.h
@@ -37,35 +37,24 @@ namespace WebKit {
     class ScriptExecutionContext;
     class WebString;
     class WebMessagePortChannel;
-    class WebCommonWorkerClient;
     class WebURL;
 
     // This is the interface to a SharedWorker thread.
     // Since SharedWorkers communicate entirely through MessagePorts this interface only contains APIs for starting up a SharedWorker.
     class WebSharedWorker {
     public:
-        // Invoked from the worker thread to instantiate a WebSharedWorker that interacts with the WebKit worker components.
-        WEBKIT_API static WebSharedWorker* create(WebCommonWorkerClient*);
-
-        virtual ~WebSharedWorker() {};
+        virtual ~WebSharedWorker() {}
 
         // Returns false if the thread hasn't been started yet (script loading has not taken place).
         // FIXME(atwilson): Remove this when we move the initial script loading into the worker process.
         virtual bool isStarted() = 0;
 
         virtual void startWorkerContext(const WebURL& scriptURL,
-                                        const WebString& name,
                                         const WebString& userAgent,
                                         const WebString& sourceCode) = 0;
 
-        // Sends a connect event to the SharedWorker context.
+        // Sends a connect event to the SharedWorker thread.
         virtual void connect(WebMessagePortChannel*) = 0;
-
-        // Invoked to shutdown the worker when there are no more associated documents.
-        virtual void terminateWorkerContext() = 0;
-
-        // Notification when the WebCommonWorkerClient is destroyed.
-        virtual void clientDestroyed() = 0;
     };
 } // namespace WebKit
 
diff --git a/webkit/api/public/WebWorkerClient.h b/webkit/api/public/WebWorkerClient.h
index 044ba52..c0aa1bd 100644
--- a/webkit/api/public/WebWorkerClient.h
+++ b/webkit/api/public/WebWorkerClient.h
@@ -32,7 +32,6 @@
 #define WebWorkerClient_h
 
 #include "WebMessagePortChannel.h"
-#include "WebCommonWorkerClient.h"
 
 namespace WebKit {
     class WebNotificationPresenter;
@@ -42,15 +41,37 @@ namespace WebKit {
     // Provides an interface back to the in-page script object for a worker.
     // All functions are expected to be called back on the thread that created
     // the Worker object, unless noted.
-    class WebWorkerClient : public WebCommonWorkerClient {
+    class WebWorkerClient {
     public:
         virtual void postMessageToWorkerObject(
             const WebString&,
             const WebMessagePortChannelArray&) = 0;
 
+        virtual void postExceptionToWorkerObject(
+            const WebString& errorString, int lineNumber,
+            const WebString& sourceURL) = 0;
+
+        virtual void postConsoleMessageToWorkerObject(
+            int destinationIdentifier,
+            int sourceIdentifier,
+            int messageType,
+            int messageLevel,
+            const WebString& message,
+            int lineNumber,
+            const WebString& sourceURL) = 0;
+
         virtual void confirmMessageFromWorkerObject(bool hasPendingActivity) = 0;
         virtual void reportPendingActivity(bool hasPendingActivity) = 0;
 
+        virtual void workerContextDestroyed() = 0;
+
+        // Returns the notification presenter for this worker context.  Pointer
+        // is owned by the object implementing WebWorkerClient.
+        virtual WebNotificationPresenter* notificationPresenter() = 0;
+
+        // This can be called on any thread to create a nested worker.
+        virtual WebWorker* createWorker(WebWorkerClient* client) = 0;
+
     protected:
         ~WebWorkerClient() { }
     };