Index: content/renderer/websharedworker_proxy.h |
diff --git a/content/renderer/websharedworker_proxy.h b/content/renderer/websharedworker_proxy.h |
index 78a979e4ee50448ac95208a49faa994865850456..b11138bde2bf732ad4de8ef8fbd7e9cefb3254c5 100644 |
--- a/content/renderer/websharedworker_proxy.h |
+++ b/content/renderer/websharedworker_proxy.h |
@@ -29,32 +29,18 @@ class WebSharedWorkerProxy : public blink::WebSharedWorkerConnector, |
// If the worker not loaded yet, route_id == MSG_ROUTING_NONE |
WebSharedWorkerProxy(ChildThread* child_thread, |
unsigned long long document_id, |
- bool exists, |
int route_id, |
int render_frame_route_id); |
virtual ~WebSharedWorkerProxy(); |
- // Implementations of WebSharedWorker APIs |
- virtual bool isStarted(); |
+ // Implementations of WebSharedWorkerConnector APIs |
virtual void connect(blink::WebMessagePortChannel* channel, |
ConnectListener* listener); |
- virtual void startWorkerContext( |
- const blink::WebURL& script_url, |
- const blink::WebString& name, |
- const blink::WebString& user_agent, |
- const blink::WebString& source_code, |
- const blink::WebString& content_security_policy, |
- blink::WebContentSecurityPolicyType policy_type, |
- long long script_resource_appcache_id); |
- |
private: |
// IPC::Listener implementation. |
virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; |
- // Returns true if the worker is running (can send messages to it). |
- bool IsStarted(); |
- |
// Disconnects the worker (stops listening for incoming messages). |
void Disconnect(); |
@@ -68,17 +54,9 @@ class WebSharedWorkerProxy : public blink::WebSharedWorkerConnector, |
// Sends any messages currently in the queue. |
void SendQueuedMessages(); |
- void CreateWorkerContext(const GURL& script_url, |
- bool is_shared, |
- const base::string16& name, |
- const base::string16& user_agent, |
- const base::string16& source_code, |
- const base::string16& content_security_policy, |
- blink::WebContentSecurityPolicyType policy_type, |
- int pending_route_id, |
- int64 script_resource_appcache_id); |
void OnWorkerCreated(); |
- |
+ void OnWorkerScriptLoadFailed(); |
+ void OnWorkerConnected(); |
// Routing id associated with this worker - used to receive messages from the |
// worker, and also to route messages to the worker (WorkerService contains |
@@ -103,6 +81,7 @@ class WebSharedWorkerProxy : public blink::WebSharedWorkerConnector, |
// the worker). |
int pending_route_id_; |
ConnectListener* connect_listener_; |
+ bool created_; |
DISALLOW_COPY_AND_ASSIGN(WebSharedWorkerProxy); |
}; |