Chromium Code Reviews| Index: Source/modules/serviceworkers/ServiceWorker.cpp |
| diff --git a/Source/modules/serviceworkers/ServiceWorker.cpp b/Source/modules/serviceworkers/ServiceWorker.cpp |
| index da801172e1098dcf0e2ffed160ac67797e66919e..13fdba95c1eba1b3b30063d7d2ef8de532f41d17 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, active, ("activated", AtomicString::ConstructFromLiteral)); |
|
jsbell
2014/07/01 16:16:48
Rename the variable as well, for consistency?
xiang
2014/07/02 05:10:43
OK.
|
| + DEFINE_STATIC_LOCAL(AtomicString, redundant, ("redundant", AtomicString::ConstructFromLiteral)); |
| switch (m_outerWorker->state()) { |
| case blink::WebServiceWorkerStateUnknown: |
| @@ -131,8 +131,8 @@ const AtomicString& ServiceWorker::state() const |
| return activating; |
| case blink::WebServiceWorkerStateActive: |
| return active; |
| - case blink::WebServiceWorkerStateDeactivated: |
| - return deactivated; |
| + 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() |