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

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

Issue 251723002: Introduce EmbeddedWorkerDevToolsAgent. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: WorkerWrapper::dev_tools_agent() 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"
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 explicit WorkerWrapper(blink::WebEmbeddedWorker* worker)
32 : worker_(worker),
33 dev_tools_agent_(new EmbeddedWorkerDevToolsAgent(worker)) {}
30 ~WorkerWrapper() {} 34 ~WorkerWrapper() {}
31 35
32 blink::WebEmbeddedWorker* worker() { return worker_.get(); } 36 blink::WebEmbeddedWorker* worker() { return worker_.get(); }
37 EmbeddedWorkerDevToolsAgent* dev_tools_agent() {
38 return dev_tools_agent_.get();
39 }
33 40
34 private: 41 private:
35 ScopedChildProcessReference process_ref_; 42 ScopedChildProcessReference process_ref_;
36 scoped_ptr<blink::WebEmbeddedWorker> worker_; 43 scoped_ptr<blink::WebEmbeddedWorker> worker_;
44 scoped_ptr<EmbeddedWorkerDevToolsAgent> dev_tools_agent_;
37 }; 45 };
38 46
39 EmbeddedWorkerDispatcher::EmbeddedWorkerDispatcher() : weak_factory_(this) {} 47 EmbeddedWorkerDispatcher::EmbeddedWorkerDispatcher() : weak_factory_(this) {}
40 48
41 EmbeddedWorkerDispatcher::~EmbeddedWorkerDispatcher() {} 49 EmbeddedWorkerDispatcher::~EmbeddedWorkerDispatcher() {}
42 50
43 bool EmbeddedWorkerDispatcher::OnMessageReceived( 51 bool EmbeddedWorkerDispatcher::OnMessageReceived(
44 const IPC::Message& message) { 52 const IPC::Message& message) {
45 bool handled = true; 53 bool handled = true;
46 IPC_BEGIN_MESSAGE_MAP(EmbeddedWorkerDispatcher, message) 54 IPC_BEGIN_MESSAGE_MAP(EmbeddedWorkerDispatcher, message)
47 IPC_MESSAGE_HANDLER(EmbeddedWorkerMsg_StartWorker, OnStartWorker) 55 IPC_MESSAGE_HANDLER(EmbeddedWorkerMsg_StartWorker, OnStartWorker)
48 IPC_MESSAGE_HANDLER(EmbeddedWorkerMsg_StopWorker, OnStopWorker) 56 IPC_MESSAGE_HANDLER(EmbeddedWorkerMsg_StopWorker, OnStopWorker)
57 IPC_MESSAGE_HANDLER(EmbeddedWorkerMsg_MessageToDevToolsAgent,
58 OnMessageToDevToolsAgent)
49 IPC_MESSAGE_UNHANDLED(handled = false) 59 IPC_MESSAGE_UNHANDLED(handled = false)
50 IPC_END_MESSAGE_MAP() 60 IPC_END_MESSAGE_MAP()
51 return handled; 61 return handled;
52 } 62 }
53 63
54 void EmbeddedWorkerDispatcher::WorkerContextDestroyed( 64 void EmbeddedWorkerDispatcher::WorkerContextDestroyed(
55 int embedded_worker_id) { 65 int embedded_worker_id) {
56 RenderThreadImpl::current()->thread_safe_sender()->Send( 66 RenderThreadImpl::current()->thread_safe_sender()->Send(
57 new EmbeddedWorkerHostMsg_WorkerStopped(embedded_worker_id)); 67 new EmbeddedWorkerHostMsg_WorkerStopped(embedded_worker_id));
58 workers_.Remove(embedded_worker_id); 68 workers_.Remove(embedded_worker_id);
59 } 69 }
60 70
61 void EmbeddedWorkerDispatcher::OnStartWorker(int embedded_worker_id, 71 void EmbeddedWorkerDispatcher::OnStartWorker(int embedded_worker_id,
62 int64 service_worker_version_id, 72 int64 service_worker_version_id,
63 const GURL& service_worker_scope, 73 const GURL& service_worker_scope,
64 const GURL& script_url) { 74 const GURL& script_url) {
65 DCHECK(!workers_.Lookup(embedded_worker_id)); 75 DCHECK(!workers_.Lookup(embedded_worker_id));
66 scoped_ptr<WorkerWrapper> wrapper(new WorkerWrapper( 76 scoped_ptr<WorkerWrapper> wrapper(
67 blink::WebEmbeddedWorker::create( 77 new WorkerWrapper(blink::WebEmbeddedWorker::create(
68 new EmbeddedWorkerContextClient( 78 new EmbeddedWorkerContextClient(embedded_worker_id,
69 embedded_worker_id, 79 service_worker_version_id,
70 service_worker_version_id, 80 service_worker_scope,
71 service_worker_scope, 81 script_url),
72 script_url),
73 NULL))); 82 NULL)));
74 83
75 blink::WebEmbeddedWorkerStartData start_data; 84 blink::WebEmbeddedWorkerStartData start_data;
76 start_data.scriptURL = script_url; 85 start_data.scriptURL = script_url;
77 start_data.userAgent = base::UTF8ToUTF16(GetContentClient()->GetUserAgent()); 86 start_data.userAgent = base::UTF8ToUTF16(GetContentClient()->GetUserAgent());
78 start_data.startMode = blink::WebEmbeddedWorkerStartModeDontPauseOnStart; 87 start_data.startMode = blink::WebEmbeddedWorkerStartModeDontPauseOnStart;
79 88
80 wrapper->worker()->startWorkerContext(start_data); 89 wrapper->worker()->startWorkerContext(start_data);
81 workers_.AddWithID(wrapper.release(), embedded_worker_id); 90 workers_.AddWithID(wrapper.release(), embedded_worker_id);
82 } 91 }
83 92
84 void EmbeddedWorkerDispatcher::OnStopWorker(int embedded_worker_id) { 93 void EmbeddedWorkerDispatcher::OnStopWorker(int embedded_worker_id) {
85 WorkerWrapper* wrapper = workers_.Lookup(embedded_worker_id); 94 WorkerWrapper* wrapper = workers_.Lookup(embedded_worker_id);
86 if (!wrapper) { 95 if (!wrapper) {
87 LOG(WARNING) << "Got OnStopWorker for nonexistent worker"; 96 LOG(WARNING) << "Got OnStopWorker for nonexistent worker";
88 return; 97 return;
89 } 98 }
90 99
91 // This should eventually call WorkerContextDestroyed. (We may need to post 100 // This should eventually call WorkerContextDestroyed. (We may need to post
92 // a delayed task to forcibly abort the worker context if we find it 101 // a delayed task to forcibly abort the worker context if we find it
93 // necessary) 102 // necessary)
94 wrapper->worker()->terminateWorkerContext(); 103 wrapper->worker()->terminateWorkerContext();
95 } 104 }
96 105
106 void EmbeddedWorkerDispatcher::OnMessageToDevToolsAgent(
107 int embedded_worker_id,
108 const IPC::Message& message) {
109 WorkerWrapper* wrapper = workers_.Lookup(embedded_worker_id);
110 if (!wrapper) {
111 LOG(WARNING) << "Got OnMessageToDevToolsAgent for nonexistent worker";
112 return;
113 }
114 const bool handled = wrapper->dev_tools_agent()->OnMessageReceived(message);
115 DCHECK(handled);
116 }
117
97 } // namespace content 118 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698