Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(48)

Side by Side Diff: chrome/renderer/websharedworker_proxy.cc

Issue 509016: Refactored code to allow associating workers with multiple renderers. (Closed)
Patch Set: Disabled overly-aggressive assertion in ResourceDispatcherHost. Created 10 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « chrome/renderer/websharedworker_proxy.h ('k') | chrome/renderer/webworker_base.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/renderer/websharedworker_proxy.h" 5 #include "chrome/renderer/websharedworker_proxy.h"
6 6
7 #include "chrome/common/render_messages.h" 7 #include "chrome/common/render_messages.h"
8 #include "chrome/common/webmessageportchannel_impl.h" 8 #include "chrome/common/webmessageportchannel_impl.h"
9 #include "chrome/common/worker_messages.h" 9 #include "chrome/common/worker_messages.h"
10 #include "third_party/WebKit/WebKit/chromium/public/WebURL.h" 10 #include "third_party/WebKit/WebKit/chromium/public/WebURL.h"
11 11
12 WebSharedWorkerProxy::WebSharedWorkerProxy(ChildThread* child_thread, 12 WebSharedWorkerProxy::WebSharedWorkerProxy(ChildThread* child_thread,
13 unsigned long long document_id,
13 int route_id, 14 int route_id,
14 int render_view_route_id) 15 int render_view_route_id)
15 : WebWorkerBase(child_thread, route_id, render_view_route_id), 16 : WebWorkerBase(child_thread, document_id, route_id, render_view_route_id),
16 connect_listener_(NULL) { 17 connect_listener_(NULL) {
17 } 18 }
18 19
19 bool WebSharedWorkerProxy::isStarted() { 20 bool WebSharedWorkerProxy::isStarted() {
20 return IsStarted(); 21 return IsStarted();
21 } 22 }
22 23
23 void WebSharedWorkerProxy::startWorkerContext( 24 void WebSharedWorkerProxy::startWorkerContext(
24 const WebKit::WebURL& script_url, 25 const WebKit::WebURL& script_url,
25 const WebKit::WebString& name, 26 const WebKit::WebString& name,
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
68 // The worker is created - now send off the CreateWorkerContext message and 69 // The worker is created - now send off the CreateWorkerContext message and
69 // any other queued messages 70 // any other queued messages
70 SendQueuedMessages(); 71 SendQueuedMessages();
71 72
72 // Inform any listener that the pending connect event has been sent 73 // Inform any listener that the pending connect event has been sent
73 // (this can result in this object being freed). 74 // (this can result in this object being freed).
74 if (connect_listener_) { 75 if (connect_listener_) {
75 connect_listener_->connected(); 76 connect_listener_->connected();
76 } 77 }
77 } 78 }
OLDNEW
« no previous file with comments | « chrome/renderer/websharedworker_proxy.h ('k') | chrome/renderer/webworker_base.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698