content/browser/service_worker/embedded_worker_instance.cc - Issue 1063823005: Service Worker: Use more specific errors when StartWorker fails

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 1063823005: Service Worker: Use more specific errors when StartWorker fails (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: update histograms.xml Created 5 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/push_messaging/push_messaging_router.cc ('k') | content/browser/service_worker/service_worker_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/service_worker/embedded_worker_instance.cc

diff --git a/content/browser/service_worker/embedded_worker_instance.cc b/content/browser/service_worker/embedded_worker_instance.cc

index 03895d01ef8fd21a650f6163424af15a523a6d1d..fd09125c13f31610a1fd44a8f092df7430d7e12e 100644

--- a/content/browser/service_worker/embedded_worker_instance.cc

+++ b/content/browser/service_worker/embedded_worker_instance.cc

@@ -354,13 +354,16 @@ void EmbeddedWorkerInstance::OnScriptLoadFailed() {

void EmbeddedWorkerInstance::OnScriptEvaluated(bool success) {

starting_phase_ = SCRIPT_EVALUATED;

+ if (start_callback_.is_null()) {

+ DVLOG(1) << "Received unexpected OnScriptEvaluated message.";

+ return;

+ }

if (success && !start_timing_.is_null()) {

UMA_HISTOGRAM_TIMES("EmbeddedWorkerInstance.ScriptEvaluate",

base::TimeTicks::Now() - start_timing_);

}

- DCHECK(!start_callback_.is_null());

start_callback_.Run(success ? SERVICE_WORKER_OK

- : SERVICE_WORKER_ERROR_START_WORKER_FAILED);

+ : SERVICE_WORKER_ERROR_SCRIPT_EVALUATE_FAILED);

start_callback_.Reset();

}