OLD | NEW |
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" |
11 #include "content/child/scoped_child_process_reference.h" | 11 #include "content/child/scoped_child_process_reference.h" |
12 #include "content/child/thread_safe_sender.h" | 12 #include "content/child/thread_safe_sender.h" |
13 #include "content/child/worker_task_runner.h" | 13 #include "content/child/worker_task_runner.h" |
| 14 #include "content/common/devtools_messages.h" |
14 #include "content/common/service_worker/embedded_worker_messages.h" | 15 #include "content/common/service_worker/embedded_worker_messages.h" |
15 #include "content/public/common/content_client.h" | 16 #include "content/public/common/content_client.h" |
16 #include "content/renderer/render_thread_impl.h" | 17 #include "content/renderer/render_thread_impl.h" |
17 #include "content/renderer/service_worker/embedded_worker_context_client.h" | 18 #include "content/renderer/service_worker/embedded_worker_context_client.h" |
| 19 #include "content/renderer/service_worker/embedded_worker_devtools_agent.h" |
18 #include "third_party/WebKit/public/platform/WebString.h" | 20 #include "third_party/WebKit/public/platform/WebString.h" |
19 #include "third_party/WebKit/public/platform/WebURL.h" | 21 #include "third_party/WebKit/public/platform/WebURL.h" |
20 #include "third_party/WebKit/public/web/WebEmbeddedWorker.h" | 22 #include "third_party/WebKit/public/web/WebEmbeddedWorker.h" |
21 #include "third_party/WebKit/public/web/WebEmbeddedWorkerStartData.h" | 23 #include "third_party/WebKit/public/web/WebEmbeddedWorkerStartData.h" |
22 | 24 |
23 namespace content { | 25 namespace content { |
24 | 26 |
25 // A thin wrapper of WebEmbeddedWorker which also adds and releases process | 27 // A thin wrapper of WebEmbeddedWorker which also adds and releases process |
26 // references automatically. | 28 // references automatically. |
27 class EmbeddedWorkerDispatcher::WorkerWrapper { | 29 class EmbeddedWorkerDispatcher::WorkerWrapper { |
28 public: | 30 public: |
29 explicit WorkerWrapper(blink::WebEmbeddedWorker* worker) : worker_(worker) {} | 31 WorkerWrapper(blink::WebEmbeddedWorker* worker, int devtools_agent_route_id) |
| 32 : worker_(worker), |
| 33 dev_tools_agent_( |
| 34 new EmbeddedWorkerDevToolsAgent(worker, devtools_agent_route_id)) {} |
30 ~WorkerWrapper() {} | 35 ~WorkerWrapper() {} |
31 | 36 |
32 blink::WebEmbeddedWorker* worker() { return worker_.get(); } | 37 blink::WebEmbeddedWorker* worker() { return worker_.get(); } |
33 | 38 |
34 private: | 39 private: |
35 ScopedChildProcessReference process_ref_; | 40 ScopedChildProcessReference process_ref_; |
36 scoped_ptr<blink::WebEmbeddedWorker> worker_; | 41 scoped_ptr<blink::WebEmbeddedWorker> worker_; |
| 42 scoped_ptr<EmbeddedWorkerDevToolsAgent> dev_tools_agent_; |
37 }; | 43 }; |
38 | 44 |
39 EmbeddedWorkerDispatcher::EmbeddedWorkerDispatcher() : weak_factory_(this) {} | 45 EmbeddedWorkerDispatcher::EmbeddedWorkerDispatcher() : weak_factory_(this) {} |
40 | 46 |
41 EmbeddedWorkerDispatcher::~EmbeddedWorkerDispatcher() {} | 47 EmbeddedWorkerDispatcher::~EmbeddedWorkerDispatcher() {} |
42 | 48 |
43 bool EmbeddedWorkerDispatcher::OnMessageReceived( | 49 bool EmbeddedWorkerDispatcher::OnMessageReceived( |
44 const IPC::Message& message) { | 50 const IPC::Message& message) { |
45 bool handled = true; | 51 bool handled = true; |
46 IPC_BEGIN_MESSAGE_MAP(EmbeddedWorkerDispatcher, message) | 52 IPC_BEGIN_MESSAGE_MAP(EmbeddedWorkerDispatcher, message) |
(...skipping 10 matching lines...) Expand all Loading... |
57 new EmbeddedWorkerHostMsg_WorkerStopped(embedded_worker_id)); | 63 new EmbeddedWorkerHostMsg_WorkerStopped(embedded_worker_id)); |
58 workers_.Remove(embedded_worker_id); | 64 workers_.Remove(embedded_worker_id); |
59 } | 65 } |
60 | 66 |
61 void EmbeddedWorkerDispatcher::OnStartWorker( | 67 void EmbeddedWorkerDispatcher::OnStartWorker( |
62 const EmbeddedWorkerMsg_StartWorker_Params& params) { | 68 const EmbeddedWorkerMsg_StartWorker_Params& params) { |
63 DCHECK(!workers_.Lookup(params.embedded_worker_id)); | 69 DCHECK(!workers_.Lookup(params.embedded_worker_id)); |
64 RenderThread::Get()->EnsureWebKitInitialized(); | 70 RenderThread::Get()->EnsureWebKitInitialized(); |
65 scoped_ptr<WorkerWrapper> wrapper( | 71 scoped_ptr<WorkerWrapper> wrapper( |
66 new WorkerWrapper(blink::WebEmbeddedWorker::create( | 72 new WorkerWrapper(blink::WebEmbeddedWorker::create( |
67 new EmbeddedWorkerContextClient( | 73 new EmbeddedWorkerContextClient( |
68 params.embedded_worker_id, | 74 params.embedded_worker_id, |
69 params.service_worker_version_id, | 75 params.service_worker_version_id, |
70 params.scope, | 76 params.scope, |
71 params.script_url, | 77 params.script_url, |
72 params.worker_devtools_agent_route_id), | 78 params.worker_devtools_agent_route_id), |
73 NULL))); | 79 NULL), |
| 80 params.worker_devtools_agent_route_id)); |
74 | 81 |
75 blink::WebEmbeddedWorkerStartData start_data; | 82 blink::WebEmbeddedWorkerStartData start_data; |
76 start_data.scriptURL = params.script_url; | 83 start_data.scriptURL = params.script_url; |
77 start_data.userAgent = base::UTF8ToUTF16(GetContentClient()->GetUserAgent()); | 84 start_data.userAgent = base::UTF8ToUTF16(GetContentClient()->GetUserAgent()); |
78 start_data.startMode = blink::WebEmbeddedWorkerStartModeDontPauseOnStart; | 85 start_data.startMode = blink::WebEmbeddedWorkerStartModeDontPauseOnStart; |
79 | 86 |
80 wrapper->worker()->startWorkerContext(start_data); | 87 wrapper->worker()->startWorkerContext(start_data); |
81 workers_.AddWithID(wrapper.release(), params.embedded_worker_id); | 88 workers_.AddWithID(wrapper.release(), params.embedded_worker_id); |
82 } | 89 } |
83 | 90 |
84 void EmbeddedWorkerDispatcher::OnStopWorker(int embedded_worker_id) { | 91 void EmbeddedWorkerDispatcher::OnStopWorker(int embedded_worker_id) { |
85 WorkerWrapper* wrapper = workers_.Lookup(embedded_worker_id); | 92 WorkerWrapper* wrapper = workers_.Lookup(embedded_worker_id); |
86 if (!wrapper) { | 93 if (!wrapper) { |
87 LOG(WARNING) << "Got OnStopWorker for nonexistent worker"; | 94 LOG(WARNING) << "Got OnStopWorker for nonexistent worker"; |
88 return; | 95 return; |
89 } | 96 } |
90 | 97 |
91 // This should eventually call WorkerContextDestroyed. (We may need to post | 98 // This should eventually call WorkerContextDestroyed. (We may need to post |
92 // a delayed task to forcibly abort the worker context if we find it | 99 // a delayed task to forcibly abort the worker context if we find it |
93 // necessary) | 100 // necessary) |
94 wrapper->worker()->terminateWorkerContext(); | 101 wrapper->worker()->terminateWorkerContext(); |
95 } | 102 } |
96 | 103 |
97 } // namespace content | 104 } // namespace content |
OLD | NEW |