Source/modules/serviceworkers/WaitUntilObserver.cpp - Issue 352423005: Add ServiceWorker InstallPhaseEvent.waitUntil() layout test.

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: Source/modules/serviceworkers/WaitUntilObserver.cpp

Issue 352423005: Add ServiceWorker InstallPhaseEvent.waitUntil() layout test. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Created 6 years, 6 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

« LayoutTests/http/tests/serviceworker/resources/install-phase-event-waituntil.js ('K') | « Source/modules/serviceworkers/ServiceWorker.cpp ('k') | public/platform/WebServiceWorkerState.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Source/modules/serviceworkers/WaitUntilObserver.cpp

diff --git a/Source/modules/serviceworkers/WaitUntilObserver.cpp b/Source/modules/serviceworkers/WaitUntilObserver.cpp

index 67770666e830b8fc7b85687c6252709008b51bab..bfee27809c03a3fc480d4287504c45e2eef8d133 100644

--- a/Source/modules/serviceworkers/WaitUntilObserver.cpp

+++ b/Source/modules/serviceworkers/WaitUntilObserver.cpp

@@ -108,7 +108,7 @@ void WaitUntilObserver::incrementPendingActivity()

void WaitUntilObserver::decrementPendingActivity()

{

ASSERT(m_pendingActivity > 0);

- if (--m_pendingActivity || !executionContext())

+ if (!executionContext() || (!m_hasError && --m_pendingActivity))

return;

ServiceWorkerGlobalScopeClient* client = ServiceWorkerGlobalScopeClient::from(executionContext());