Index: chrome/renderer/webworker_proxy.h |
diff --git a/chrome/renderer/webworker_proxy.h b/chrome/renderer/webworker_proxy.h |
index 8c53a67dd40fbeed7259eeffdae683216647cff7..686669a2db877df0930f8c7ec54fc86ed13bd5ab 100644 |
--- a/chrome/renderer/webworker_proxy.h |
+++ b/chrome/renderer/webworker_proxy.h |
@@ -8,6 +8,7 @@ |
#include <vector> |
#include "base/basictypes.h" |
+#include "chrome/renderer/webworker_base.h" |
#include "ipc/ipc_channel.h" |
#include "webkit/api/public/WebWorker.h" |
@@ -21,13 +22,11 @@ struct WorkerHostMsg_PostConsoleMessageToWorkerObject_Params; |
// dispatched in the worker process by WebWorkerClientProxy. It also receives |
// IPC messages from WebWorkerClientProxy which it converts to function calls to |
// WebWorkerClient. |
-class WebWorkerProxy : public WebKit::WebWorker, |
- public IPC::Channel::Listener { |
+class WebWorkerProxy : public WebKit::WebWorker, private WebWorkerBase { |
public: |
WebWorkerProxy(WebKit::WebWorkerClient* client, |
ChildThread* child_thread, |
int render_view_route_id); |
- virtual ~WebWorkerProxy(); |
// WebWorker implementation. |
virtual void startWorkerContext(const WebKit::WebURL& script_url, |
@@ -44,32 +43,20 @@ class WebWorkerProxy : public WebKit::WebWorker, |
void OnMessageReceived(const IPC::Message& message); |
private: |
- bool Send(IPC::Message* message); |
+ virtual void Disconnect(); |
- void OnDedicatedWorkerCreated(); |
+ void OnWorkerCreated(); |
void OnPostMessage(const string16& message, |
const std::vector<int>& sent_message_port_ids, |
const std::vector<int>& new_routing_ids); |
void OnPostConsoleMessageToWorkerObject( |
const WorkerHostMsg_PostConsoleMessageToWorkerObject_Params& params); |
- void Disconnect(); |
- |
- // The routing id used to reach WebWorkerClientProxy in the worker process. |
- int route_id_; |
- |
- ChildThread* child_thread_; |
- |
- // The routing id for the RenderView that created this worker. |
- int render_view_route_id_; |
// Used to communicate to the WebCore::Worker object in response to IPC |
// messages. |
WebKit::WebWorkerClient* client_; |
- // Stores messages that were sent before the StartWorkerContext message. |
- std::vector<IPC::Message*> queued_messages_; |
- |
DISALLOW_COPY_AND_ASSIGN(WebWorkerProxy); |
}; |