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

Unified Diff: content/browser/service_worker/service_worker_version.cc

Issue 1901363002: Don't stop ServiceWorker when DevTools is attached even if JS execution is failed. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: add running_status check Created 4 years, 8 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/browser/service_worker/service_worker_version.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/service_worker/service_worker_version.cc
diff --git a/content/browser/service_worker/service_worker_version.cc b/content/browser/service_worker/service_worker_version.cc
index 1b8997253a338ffaed60de231d8b78f282297681..4ca26b607eb25f2159b436f3899eeec70b7941ec 100644
--- a/content/browser/service_worker/service_worker_version.cc
+++ b/content/browser/service_worker/service_worker_version.cc
@@ -614,8 +614,12 @@ void ServiceWorkerVersion::SetStartWorkerStatusCode(
void ServiceWorkerVersion::Doom() {
DCHECK(!HasControllee());
SetStatus(REDUNDANT);
- if (running_status() == STARTING || running_status() == RUNNING)
- embedded_worker_->Stop();
+ if (running_status() == STARTING || running_status() == RUNNING) {
+ if (embedded_worker()->devtools_attached())
+ stop_when_devtools_detached_ = true;
+ else
+ embedded_worker_->Stop();
+ }
if (!context_)
return;
std::vector<ServiceWorkerDatabase::ResourceRecord> resources;
@@ -625,6 +629,12 @@ void ServiceWorkerVersion::Doom() {
void ServiceWorkerVersion::SetDevToolsAttached(bool attached) {
embedded_worker()->set_devtools_attached(attached);
+ if (stop_when_devtools_detached_ && !attached) {
+ DCHECK_EQ(REDUNDANT, status());
+ if (running_status() == STARTING || running_status() == RUNNING)
+ embedded_worker_->Stop();
+ return;
+ }
if (attached) {
// TODO(falken): Canceling the timeouts when debugging could cause
// heisenbugs; we should instead run them as normal show an educational
« no previous file with comments | « content/browser/service_worker/service_worker_version.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698