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

Side by Side Diff: content/renderer/service_worker/embedded_worker_dispatcher.cc

Issue 252633003: Introduce worker_devtools_agent_route_id for EmbeddedWorker. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Create NextRoutingIDCallback from widget_helper_ in RenderProcessHostImpl. Rename worker_route_id to worker_devtools_agent_route_id and change the order. Created 6 years, 7 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
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 "content/renderer/service_worker/embedded_worker_dispatcher.h" 5 #include "content/renderer/service_worker/embedded_worker_dispatcher.h"
6 6
7 #include "base/memory/scoped_ptr.h" 7 #include "base/memory/scoped_ptr.h"
8 #include "base/strings/string16.h" 8 #include "base/strings/string16.h"
9 #include "base/strings/utf_string_conversions.h" 9 #include "base/strings/utf_string_conversions.h"
10 #include "content/child/child_process.h" 10 #include "content/child/child_process.h"
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
51 return handled; 51 return handled;
52 } 52 }
53 53
54 void EmbeddedWorkerDispatcher::WorkerContextDestroyed( 54 void EmbeddedWorkerDispatcher::WorkerContextDestroyed(
55 int embedded_worker_id) { 55 int embedded_worker_id) {
56 RenderThreadImpl::current()->thread_safe_sender()->Send( 56 RenderThreadImpl::current()->thread_safe_sender()->Send(
57 new EmbeddedWorkerHostMsg_WorkerStopped(embedded_worker_id)); 57 new EmbeddedWorkerHostMsg_WorkerStopped(embedded_worker_id));
58 workers_.Remove(embedded_worker_id); 58 workers_.Remove(embedded_worker_id);
59 } 59 }
60 60
61 void EmbeddedWorkerDispatcher::OnStartWorker(int embedded_worker_id, 61 void EmbeddedWorkerDispatcher::OnStartWorker(
62 int64 service_worker_version_id, 62 int embedded_worker_id,
63 const GURL& service_worker_scope, 63 int64 service_worker_version_id,
64 const GURL& script_url) { 64 const GURL& service_worker_scope,
65 const GURL& script_url,
66 int worker_devtools_agent_route_id) {
65 DCHECK(!workers_.Lookup(embedded_worker_id)); 67 DCHECK(!workers_.Lookup(embedded_worker_id));
66 scoped_ptr<WorkerWrapper> wrapper(new WorkerWrapper( 68 scoped_ptr<WorkerWrapper> wrapper(
67 blink::WebEmbeddedWorker::create( 69 new WorkerWrapper(blink::WebEmbeddedWorker::create(
68 new EmbeddedWorkerContextClient( 70 new EmbeddedWorkerContextClient(embedded_worker_id,
69 embedded_worker_id, 71 service_worker_version_id,
70 service_worker_version_id, 72 service_worker_scope,
71 service_worker_scope, 73 script_url,
72 script_url), 74 worker_devtools_agent_route_id),
73 NULL))); 75 NULL)));
74 76
75 blink::WebEmbeddedWorkerStartData start_data; 77 blink::WebEmbeddedWorkerStartData start_data;
76 start_data.scriptURL = script_url; 78 start_data.scriptURL = script_url;
77 start_data.userAgent = base::UTF8ToUTF16(GetContentClient()->GetUserAgent()); 79 start_data.userAgent = base::UTF8ToUTF16(GetContentClient()->GetUserAgent());
78 start_data.startMode = blink::WebEmbeddedWorkerStartModeDontPauseOnStart; 80 start_data.startMode = blink::WebEmbeddedWorkerStartModeDontPauseOnStart;
79 81
80 wrapper->worker()->startWorkerContext(start_data); 82 wrapper->worker()->startWorkerContext(start_data);
81 workers_.AddWithID(wrapper.release(), embedded_worker_id); 83 workers_.AddWithID(wrapper.release(), embedded_worker_id);
82 } 84 }
83 85
84 void EmbeddedWorkerDispatcher::OnStopWorker(int embedded_worker_id) { 86 void EmbeddedWorkerDispatcher::OnStopWorker(int embedded_worker_id) {
85 WorkerWrapper* wrapper = workers_.Lookup(embedded_worker_id); 87 WorkerWrapper* wrapper = workers_.Lookup(embedded_worker_id);
86 if (!wrapper) { 88 if (!wrapper) {
87 LOG(WARNING) << "Got OnStopWorker for nonexistent worker"; 89 LOG(WARNING) << "Got OnStopWorker for nonexistent worker";
88 return; 90 return;
89 } 91 }
90 92
91 // This should eventually call WorkerContextDestroyed. (We may need to post 93 // This should eventually call WorkerContextDestroyed. (We may need to post
92 // a delayed task to forcibly abort the worker context if we find it 94 // a delayed task to forcibly abort the worker context if we find it
93 // necessary) 95 // necessary)
94 wrapper->worker()->terminateWorkerContext(); 96 wrapper->worker()->terminateWorkerContext();
95 } 97 }
96 98
97 } // namespace content 99 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698