Move createWorker from WebKitClient to WebWorkerClient per your suggestion, to avoid using WebKitClient outside the main thread.

Review URL: http://codereview.chromium.org/115103

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@16454 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 6 insertions, 7 deletions

diff --git a/webkit/api/public/WebKitClient.h b/webkit/api/public/WebKitClient.h
index 112e5ff..5b136d5 100644
--- a/webkit/api/public/WebKitClient.h
+++ b/webkit/api/public/WebKitClient.h
@@ -44,8 +44,6 @@ namespace WebKit {
     class WebURL;
     struct WebPluginInfo;
     template <typename T> class WebVector;
-    class WebWorker;
-    class WebWorkerClient;
 
     class WebKitClient {
     public:
@@ -129,11 +127,6 @@ namespace WebKit {
 
         // Callable from a background WebKit thread.
         virtual void callOnMainThread(void (*func)()) = 0;
-
-
-        // WebWorkers ----------------------------------------------------------
-
-        virtual WebWorker* createWorker(WebWorkerClient*) = 0;
     };
 
 } // namespace WebKit
diff --git a/webkit/api/public/WebWorkerClient.h b/webkit/api/public/WebWorkerClient.h
index dd46de2..6c6f0db 100644
--- a/webkit/api/public/WebWorkerClient.h
+++ b/webkit/api/public/WebWorkerClient.h
@@ -35,8 +35,11 @@
 
 namespace WebKit {
     class WebString;
+    class WebWorker;
 
     // 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:
         virtual void postMessageToWorkerObject(const WebString&) = 0;
@@ -57,6 +60,9 @@ namespace WebKit {
         virtual void reportPendingActivity(bool hasPendingActivity) = 0;
 
         virtual void workerContextDestroyed() = 0;
+
+        // This can be called on any thread to create a nested worker.
+        virtual WebKit::WebWorker* createWorker(WebKit::WebWorkerClient* client) = 0;
     };
 
 } // namespace WebKit