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

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

Issue 2490623005: Remove InterfaceRegistry/Provider from service workers (Closed)
Patch Set: Created 4 years, 1 month 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 <memory> 7 #include <memory>
8 8
9 #include "base/metrics/histogram_macros.h" 9 #include "base/metrics/histogram_macros.h"
10 #include "base/strings/string16.h" 10 #include "base/strings/string16.h"
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
56 } 56 }
57 57
58 void EmbeddedWorkerDispatcher::WorkerContextDestroyed( 58 void EmbeddedWorkerDispatcher::WorkerContextDestroyed(
59 int embedded_worker_id) { 59 int embedded_worker_id) {
60 UnregisterWorker(embedded_worker_id); 60 UnregisterWorker(embedded_worker_id);
61 RenderThreadImpl::current()->thread_safe_sender()->Send( 61 RenderThreadImpl::current()->thread_safe_sender()->Send(
62 new EmbeddedWorkerHostMsg_WorkerStopped(embedded_worker_id)); 62 new EmbeddedWorkerHostMsg_WorkerStopped(embedded_worker_id));
63 } 63 }
64 64
65 void EmbeddedWorkerDispatcher::OnStartWorker( 65 void EmbeddedWorkerDispatcher::OnStartWorker(
66 const EmbeddedWorkerStartParams& params) { 66 const EmbeddedWorkerStartParamsInternal& params) {
67 DCHECK(!workers_.Lookup(params.embedded_worker_id)); 67 DCHECK(!workers_.Lookup(params.embedded_worker_id));
68 TRACE_EVENT0("ServiceWorker", "EmbeddedWorkerDispatcher::OnStartWorker"); 68 TRACE_EVENT0("ServiceWorker", "EmbeddedWorkerDispatcher::OnStartWorker");
69 std::unique_ptr<WorkerWrapper> wrapper = StartWorkerContext( 69 std::unique_ptr<WorkerWrapper> wrapper = StartWorkerContext(
70 params, base::MakeUnique<ServiceWorkerContextClient>( 70 params, base::MakeUnique<ServiceWorkerContextClient>(
71 params.embedded_worker_id, params.service_worker_version_id, 71 params.embedded_worker_id, params.service_worker_version_id,
72 params.scope, params.script_url, 72 params.scope, params.script_url,
73 params.worker_devtools_agent_route_id, nullptr)); 73 params.worker_devtools_agent_route_id));
74 RegisterWorker(params.embedded_worker_id, std::move(wrapper)); 74 RegisterWorker(params.embedded_worker_id, std::move(wrapper));
75 } 75 }
76 76
77 void EmbeddedWorkerDispatcher::OnStopWorker(int embedded_worker_id) { 77 void EmbeddedWorkerDispatcher::OnStopWorker(int embedded_worker_id) {
78 TRACE_EVENT0("ServiceWorker", "EmbeddedWorkerDispatcher::OnStopWorker"); 78 TRACE_EVENT0("ServiceWorker", "EmbeddedWorkerDispatcher::OnStopWorker");
79 WorkerWrapper* wrapper = workers_.Lookup(embedded_worker_id); 79 WorkerWrapper* wrapper = workers_.Lookup(embedded_worker_id);
80 // OnStopWorker is possible to be called twice. 80 // OnStopWorker is possible to be called twice.
81 if (!wrapper) { 81 if (!wrapper) {
82 LOG(WARNING) << "Got OnStopWorker for nonexistent worker"; 82 LOG(WARNING) << "Got OnStopWorker for nonexistent worker";
83 return; 83 return;
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
122 case CONSOLE_MESSAGE_LEVEL_ERROR: 122 case CONSOLE_MESSAGE_LEVEL_ERROR:
123 target_level = blink::WebConsoleMessage::LevelError; 123 target_level = blink::WebConsoleMessage::LevelError;
124 break; 124 break;
125 } 125 }
126 wrapper->worker()->addMessageToConsole(blink::WebConsoleMessage( 126 wrapper->worker()->addMessageToConsole(blink::WebConsoleMessage(
127 target_level, blink::WebString::fromUTF8(message))); 127 target_level, blink::WebString::fromUTF8(message)));
128 } 128 }
129 129
130 std::unique_ptr<EmbeddedWorkerDispatcher::WorkerWrapper> 130 std::unique_ptr<EmbeddedWorkerDispatcher::WorkerWrapper>
131 EmbeddedWorkerDispatcher::StartWorkerContext( 131 EmbeddedWorkerDispatcher::StartWorkerContext(
132 const EmbeddedWorkerStartParams& params, 132 const EmbeddedWorkerStartParamsInternal& params,
133 std::unique_ptr<ServiceWorkerContextClient> context_client) { 133 std::unique_ptr<ServiceWorkerContextClient> context_client) {
134 std::unique_ptr<WorkerWrapper> wrapper(new WorkerWrapper( 134 std::unique_ptr<WorkerWrapper> wrapper(new WorkerWrapper(
135 blink::WebEmbeddedWorker::create(context_client.release(), nullptr), 135 blink::WebEmbeddedWorker::create(context_client.release(), nullptr),
136 params.worker_devtools_agent_route_id)); 136 params.worker_devtools_agent_route_id));
137 137
138 blink::WebEmbeddedWorkerStartData start_data; 138 blink::WebEmbeddedWorkerStartData start_data;
139 start_data.scriptURL = params.script_url; 139 start_data.scriptURL = params.script_url;
140 start_data.userAgent = base::UTF8ToUTF16(GetContentClient()->GetUserAgent()); 140 start_data.userAgent = base::UTF8ToUTF16(GetContentClient()->GetUserAgent());
141 start_data.waitForDebuggerMode = 141 start_data.waitForDebuggerMode =
142 params.wait_for_debugger 142 params.wait_for_debugger
(...skipping 30 matching lines...) Expand all
173 void EmbeddedWorkerDispatcher::RecordStopWorkerTimer(int embedded_worker_id) { 173 void EmbeddedWorkerDispatcher::RecordStopWorkerTimer(int embedded_worker_id) {
174 WorkerWrapper* wrapper = workers_.Lookup(embedded_worker_id); 174 WorkerWrapper* wrapper = workers_.Lookup(embedded_worker_id);
175 DCHECK(wrapper); 175 DCHECK(wrapper);
176 // This should eventually call WorkerContextDestroyed. (We may need to post 176 // This should eventually call WorkerContextDestroyed. (We may need to post
177 // a delayed task to forcibly abort the worker context if we find it 177 // a delayed task to forcibly abort the worker context if we find it
178 // necessary) 178 // necessary)
179 stop_worker_times_[embedded_worker_id] = base::TimeTicks::Now(); 179 stop_worker_times_[embedded_worker_id] = base::TimeTicks::Now();
180 } 180 }
181 181
182 } // namespace content 182 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698