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

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

Issue 1821413003: Remove logic for lazy initialization of WebKit. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix test Created 4 years, 9 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/metrics/histogram_macros.h" 8 #include "base/metrics/histogram_macros.h"
9 #include "base/strings/string16.h" 9 #include "base/strings/string16.h"
10 #include "base/strings/utf_string_conversions.h" 10 #include "base/strings/utf_string_conversions.h"
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
71 71
72 RenderThreadImpl::current()->thread_safe_sender()->Send( 72 RenderThreadImpl::current()->thread_safe_sender()->Send(
73 new EmbeddedWorkerHostMsg_WorkerStopped(embedded_worker_id)); 73 new EmbeddedWorkerHostMsg_WorkerStopped(embedded_worker_id));
74 workers_.Remove(embedded_worker_id); 74 workers_.Remove(embedded_worker_id);
75 } 75 }
76 76
77 void EmbeddedWorkerDispatcher::OnStartWorker( 77 void EmbeddedWorkerDispatcher::OnStartWorker(
78 const EmbeddedWorkerMsg_StartWorker_Params& params) { 78 const EmbeddedWorkerMsg_StartWorker_Params& params) {
79 DCHECK(!workers_.Lookup(params.embedded_worker_id)); 79 DCHECK(!workers_.Lookup(params.embedded_worker_id));
80 TRACE_EVENT0("ServiceWorker", "EmbeddedWorkerDispatcher::OnStartWorker"); 80 TRACE_EVENT0("ServiceWorker", "EmbeddedWorkerDispatcher::OnStartWorker");
81 RenderThread::Get()->EnsureWebKitInitialized();
82 scoped_ptr<WorkerWrapper> wrapper( 81 scoped_ptr<WorkerWrapper> wrapper(
83 new WorkerWrapper(blink::WebEmbeddedWorker::create( 82 new WorkerWrapper(blink::WebEmbeddedWorker::create(
84 new ServiceWorkerContextClient( 83 new ServiceWorkerContextClient(
85 params.embedded_worker_id, 84 params.embedded_worker_id,
86 params.service_worker_version_id, 85 params.service_worker_version_id,
87 params.scope, 86 params.scope,
88 params.script_url, 87 params.script_url,
89 params.worker_devtools_agent_route_id), 88 params.worker_devtools_agent_route_id),
90 NULL), 89 NULL),
91 params.worker_devtools_agent_route_id)); 90 params.worker_devtools_agent_route_id));
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
129 "EmbeddedWorkerDispatcher::OnResumeAfterDownload"); 128 "EmbeddedWorkerDispatcher::OnResumeAfterDownload");
130 WorkerWrapper* wrapper = workers_.Lookup(embedded_worker_id); 129 WorkerWrapper* wrapper = workers_.Lookup(embedded_worker_id);
131 if (!wrapper) { 130 if (!wrapper) {
132 LOG(WARNING) << "Got OnResumeAfterDownload for nonexistent worker"; 131 LOG(WARNING) << "Got OnResumeAfterDownload for nonexistent worker";
133 return; 132 return;
134 } 133 }
135 wrapper->worker()->resumeAfterDownload(); 134 wrapper->worker()->resumeAfterDownload();
136 } 135 }
137 136
138 } // namespace content 137 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698