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

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

Issue 2307543002: ServiceWorker: Mojofication of EWInstance::StopWorker (Closed)
Patch Set: Added a check of the status when detached Created 4 years, 2 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 (c) 2016 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2016 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_instance_client_impl.h " 5 #include "content/renderer/service_worker/embedded_worker_instance_client_impl.h "
6 6
7 #include <memory> 7 #include <memory>
8 8
9 #include "base/strings/utf_string_conversions.h" 9 #include "base/strings/utf_string_conversions.h"
10 #include "content/child/scoped_child_process_reference.h" 10 #include "content/child/scoped_child_process_reference.h"
11 #include "content/common/service_worker/embedded_worker_messages.h" 11 #include "content/common/service_worker/embedded_worker_messages.h"
12 #include "content/public/common/content_client.h" 12 #include "content/public/common/content_client.h"
13 #include "content/renderer/service_worker/embedded_worker_devtools_agent.h" 13 #include "content/renderer/service_worker/embedded_worker_devtools_agent.h"
14 #include "content/renderer/service_worker/service_worker_context_client.h" 14 #include "content/renderer/service_worker/service_worker_context_client.h"
15 #include "mojo/public/cpp/bindings/strong_binding.h"
16 #include "third_party/WebKit/public/web/WebEmbeddedWorker.h" 15 #include "third_party/WebKit/public/web/WebEmbeddedWorker.h"
17 #include "third_party/WebKit/public/web/WebEmbeddedWorkerStartData.h" 16 #include "third_party/WebKit/public/web/WebEmbeddedWorkerStartData.h"
18 17
19 namespace content { 18 namespace content {
20 19
21 namespace {
22
23 void OnError() {
24 // TODO(shimazu): Implement here
25 NOTIMPLEMENTED();
26 }
27
28 } // namespace
29
30 // static 20 // static
31 void EmbeddedWorkerInstanceClientImpl::Create( 21 void EmbeddedWorkerInstanceClientImpl::Create(
32 EmbeddedWorkerDispatcher* dispatcher, 22 EmbeddedWorkerDispatcher* dispatcher,
33 mojo::InterfaceRequest<mojom::EmbeddedWorkerInstanceClient> request) { 23 mojo::InterfaceRequest<mojom::EmbeddedWorkerInstanceClient> request) {
34 auto binding = mojo::MakeStrongBinding( 24 // This won't be leaked because the lifetime will be managed internally.
35 base::MakeUnique<EmbeddedWorkerInstanceClientImpl>(dispatcher), 25 new EmbeddedWorkerInstanceClientImpl(dispatcher, std::move(request));
36 std::move(request)); 26 }
37 binding->set_connection_error_handler(base::Bind(&OnError)); 27
28 void EmbeddedWorkerInstanceClientImpl::StopWorkerCompleted() {
29 DCHECK(embedded_worker_id_);
30 DCHECK(stop_callback_);
31 dispatcher_->UnregisterWorker(embedded_worker_id_.value());
32 embedded_worker_id_.reset();
33 stop_callback_.Run();
34 TRACE_EVENT0("ServiceWorker",
35 "EmbeddedWorkerInstanceClientImpl::StopWorkerCompleted");
36 stop_callback_.Reset();
38 } 37 }
39 38
40 void EmbeddedWorkerInstanceClientImpl::StartWorker( 39 void EmbeddedWorkerInstanceClientImpl::StartWorker(
41 const EmbeddedWorkerStartParams& params) { 40 const EmbeddedWorkerStartParams& params) {
42 TRACE_EVENT0("ServiceWorker", 41 TRACE_EVENT0("ServiceWorker",
43 "EmbeddedWorkerInstanceClientImpl::StartWorker"); 42 "EmbeddedWorkerInstanceClientImpl::StartWorker");
43 embedded_worker_id_ = params.embedded_worker_id;
44 44
45 std::unique_ptr<EmbeddedWorkerDispatcher::WorkerWrapper> wrapper = 45 std::unique_ptr<EmbeddedWorkerDispatcher::WorkerWrapper> wrapper =
46 dispatcher_->StartWorkerContext( 46 dispatcher_->StartWorkerContext(
47 params, 47 params, base::MakeUnique<ServiceWorkerContextClient>(
48 base::MakeUnique<ServiceWorkerContextClient>( 48 params.embedded_worker_id,
49 params.embedded_worker_id, params.service_worker_version_id, 49 params.service_worker_version_id, params.scope,
50 params.scope, params.script_url, 50 params.script_url, params.worker_devtools_agent_route_id,
51 params.worker_devtools_agent_route_id)); 51 std::move(temporal_self_)));
52 wrapper_ = wrapper.get(); 52 wrapper_ = wrapper.get();
53 dispatcher_->RegisterWorker(params.embedded_worker_id, std::move(wrapper)); 53 dispatcher_->RegisterWorker(params.embedded_worker_id, std::move(wrapper));
54 } 54 }
55 55
56 void EmbeddedWorkerInstanceClientImpl::StopWorker(
57 const StopWorkerCallback& callback) {
58 DCHECK(embedded_worker_id_);
59 DCHECK(!stop_callback_);
60 TRACE_EVENT0("ServiceWorker", "EmbeddedWorkerInstanceClientImpl::StopWorker");
61 stop_callback_ = std::move(callback);
62 dispatcher_->RecordStopWorkerTimer(embedded_worker_id_.value());
63 wrapper_->worker()->terminateWorkerContext();
64 }
65
56 EmbeddedWorkerInstanceClientImpl::EmbeddedWorkerInstanceClientImpl( 66 EmbeddedWorkerInstanceClientImpl::EmbeddedWorkerInstanceClientImpl(
57 EmbeddedWorkerDispatcher* dispatcher) 67 EmbeddedWorkerDispatcher* dispatcher,
58 : dispatcher_(dispatcher) {} 68 mojo::InterfaceRequest<mojom::EmbeddedWorkerInstanceClient> request)
69 : dispatcher_(dispatcher),
70 binding_(this, std::move(request)),
71 temporal_self_(std::unique_ptr<EmbeddedWorkerInstanceClientImpl>(this)) {
72 binding_.set_connection_error_handler(base::Bind(
73 &EmbeddedWorkerInstanceClientImpl::OnError, base::Unretained(this)));
74 }
59 75
60 EmbeddedWorkerInstanceClientImpl::~EmbeddedWorkerInstanceClientImpl() {} 76 EmbeddedWorkerInstanceClientImpl::~EmbeddedWorkerInstanceClientImpl() {}
61 77
78 void EmbeddedWorkerInstanceClientImpl::OnError() {
79 // Removes myself if it's owned by myself.
80 temporal_self_.reset();
81 }
82
62 } // namespace content 83 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698