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

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

Issue 2605593002: (M56) service worker: Attempt to send WorkerStopped before ProviderDestroyed. (Closed)
Patch Set: Created 3 years, 12 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
« no previous file with comments | « content/renderer/service_worker/embedded_worker_dispatcher.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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"
(...skipping 20 matching lines...) Expand all
31 DCHECK(renderer_request_.is_pending()); 31 DCHECK(renderer_request_.is_pending());
32 interface_registry->Bind( 32 interface_registry->Bind(
33 std::move(renderer_request_), service_manager::Identity(), 33 std::move(renderer_request_), service_manager::Identity(),
34 service_manager::InterfaceProviderSpec(), service_manager::Identity(), 34 service_manager::InterfaceProviderSpec(), service_manager::Identity(),
35 service_manager::InterfaceProviderSpec()); 35 service_manager::InterfaceProviderSpec());
36 } 36 }
37 37
38 void EmbeddedWorkerInstanceClientImpl::StopWorkerCompleted() { 38 void EmbeddedWorkerInstanceClientImpl::StopWorkerCompleted() {
39 DCHECK(embedded_worker_id_); 39 DCHECK(embedded_worker_id_);
40 DCHECK(stop_callback_); 40 DCHECK(stop_callback_);
41 TRACE_EVENT0("ServiceWorker",
42 "EmbeddedWorkerInstanceClientImpl::StopWorkerCompleted");
43 // TODO(falken): The signals to the browser should be in the order:
44 // (1) WorkerStopped (via stop_callback_)
45 // (2) ProviderDestroyed (via UnregisterWorker destroying
46 // WebEmbeddedWorkerImpl)
47 // But this ordering is currently not guaranteed since the Mojo pipes are
48 // different. https://crbug.com/676526
49 stop_callback_.Run();
50 stop_callback_.Reset();
41 dispatcher_->UnregisterWorker(embedded_worker_id_.value()); 51 dispatcher_->UnregisterWorker(embedded_worker_id_.value());
42 embedded_worker_id_.reset(); 52 embedded_worker_id_.reset();
43 stop_callback_.Run();
44 TRACE_EVENT0("ServiceWorker",
45 "EmbeddedWorkerInstanceClientImpl::StopWorkerCompleted");
46 stop_callback_.Reset();
47 wrapper_ = nullptr; 53 wrapper_ = nullptr;
48 } 54 }
49 55
50 void EmbeddedWorkerInstanceClientImpl::StartWorker( 56 void EmbeddedWorkerInstanceClientImpl::StartWorker(
51 const EmbeddedWorkerStartParams& params, 57 const EmbeddedWorkerStartParams& params,
52 service_manager::mojom::InterfaceProviderPtr browser_interfaces, 58 service_manager::mojom::InterfaceProviderPtr browser_interfaces,
53 service_manager::mojom::InterfaceProviderRequest renderer_request) { 59 service_manager::mojom::InterfaceProviderRequest renderer_request) {
54 DCHECK(ChildThreadImpl::current()); 60 DCHECK(ChildThreadImpl::current());
55 DCHECK(!wrapper_); 61 DCHECK(!wrapper_);
56 TRACE_EVENT0("ServiceWorker", 62 TRACE_EVENT0("ServiceWorker",
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
95 } 101 }
96 102
97 EmbeddedWorkerInstanceClientImpl::~EmbeddedWorkerInstanceClientImpl() {} 103 EmbeddedWorkerInstanceClientImpl::~EmbeddedWorkerInstanceClientImpl() {}
98 104
99 void EmbeddedWorkerInstanceClientImpl::OnError() { 105 void EmbeddedWorkerInstanceClientImpl::OnError() {
100 // Removes myself if it's owned by myself. 106 // Removes myself if it's owned by myself.
101 temporal_self_.reset(); 107 temporal_self_.reset();
102 } 108 }
103 109
104 } // namespace content 110 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/service_worker/embedded_worker_dispatcher.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698