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

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

Patch Set: add FIXME 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

« no previous file with comments | « LayoutTests/http/tests/serviceworker/unregister-controller.html ('k') | Source/modules/serviceworkers/WaitUntilObserver.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Source/modules/serviceworkers/ServiceWorker.cpp

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

index fed70b650a5fc4e6b5a2853eb887c5d3613133ab..c6e1d3c7bf33347e5b64faebc24712fd80598607 100644

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

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

@@ -113,8 +113,8 @@ const AtomicString& ServiceWorker::state() const

DEFINE_STATIC_LOCAL(AtomicString, installing, ("installing", AtomicString::ConstructFromLiteral));

DEFINE_STATIC_LOCAL(AtomicString, installed, ("installed", AtomicString::ConstructFromLiteral));

DEFINE_STATIC_LOCAL(AtomicString, activating, ("activating", AtomicString::ConstructFromLiteral));

- DEFINE_STATIC_LOCAL(AtomicString, active, ("active", AtomicString::ConstructFromLiteral));

- DEFINE_STATIC_LOCAL(AtomicString, deactivated, ("deactivated", AtomicString::ConstructFromLiteral));

+ DEFINE_STATIC_LOCAL(AtomicString, activated, ("activated", AtomicString::ConstructFromLiteral));

+ DEFINE_STATIC_LOCAL(AtomicString, redundant, ("redundant", AtomicString::ConstructFromLiteral));

switch (m_outerWorker->state()) {

case blink::WebServiceWorkerStateUnknown:

@@ -129,10 +129,10 @@ const AtomicString& ServiceWorker::state() const

return installed;

case blink::WebServiceWorkerStateActivating:

return activating;

- case blink::WebServiceWorkerStateActive:

- return active;

- case blink::WebServiceWorkerStateDeactivated:

- return deactivated;

+ case blink::WebServiceWorkerStateActivated:

+ return activated;

+ case blink::WebServiceWorkerStateRedundant:

+ return redundant;

default:

ASSERT_NOT_REACHED();

return nullAtom;

@@ -212,7 +212,7 @@ bool ServiceWorker::hasPendingActivity() const

return true;

if (m_proxyState == ContextStopped)

return false;

- return m_outerWorker->state() != blink::WebServiceWorkerStateDeactivated;

+ return m_outerWorker->state() != blink::WebServiceWorkerStateRedundant;

}

void ServiceWorker::stop()