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

Unified Diff: chrome/renderer/webworker_base.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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/renderer/webworker_base.h ('k') | chrome/renderer/webworker_proxy.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/renderer/webworker_base.cc
diff --git a/chrome/renderer/webworker_base.cc b/chrome/renderer/webworker_base.cc
index e32026c2506840aef58e3310579af892941bbf82..e78ef6481e7b99cd23086545a265df1ced6b4f5e 100644
--- a/chrome/renderer/webworker_base.cc
+++ b/chrome/renderer/webworker_base.cc
@@ -19,11 +19,13 @@ using WebKit::WebWorkerClient;
WebWorkerBase::WebWorkerBase(
ChildThread* child_thread,
+ unsigned long long document_id,
int route_id,
int render_view_route_id)
: route_id_(route_id),
render_view_route_id_(render_view_route_id),
- child_thread_(child_thread) {
+ child_thread_(child_thread),
+ document_id_(document_id) {
if (route_id_ != MSG_ROUTING_NONE)
child_thread_->AddRoute(route_id_, this);
}
@@ -54,8 +56,14 @@ void WebWorkerBase::CreateWorkerContext(const GURL& script_url,
const string16& user_agent,
const string16& source_code) {
DCHECK(route_id_ == MSG_ROUTING_NONE);
+ ViewHostMsg_CreateWorker_Params params;
+ params.url = script_url;
+ params.is_shared = is_shared;
+ params.name = name;
+ params.document_id = document_id_;
+ params.render_view_route_id = render_view_route_id_;
IPC::Message* create_message = new ViewHostMsg_CreateWorker(
- script_url, is_shared, name, render_view_route_id_, &route_id_);
+ params, &route_id_);
child_thread_->Send(create_message);
if (route_id_ == MSG_ROUTING_NONE)
return;
« no previous file with comments | « chrome/renderer/webworker_base.h ('k') | chrome/renderer/webworker_proxy.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698