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

Unified Diff: Source/modules/serviceworkers/ServiceWorker.cpp

Issue 256723002: Remove the queued states mechanism from ServiceWorker (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: finish removal of stuff Created 6 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 | « Source/modules/serviceworkers/ServiceWorker.h ('k') | public/platform/WebServiceWorker.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/modules/serviceworkers/ServiceWorker.cpp
diff --git a/Source/modules/serviceworkers/ServiceWorker.cpp b/Source/modules/serviceworkers/ServiceWorker.cpp
index e3cc277a709b963dc7b96dd3da5a9a910beca887..01bc49e2b990ef72ff11c3d58b6d437b80161744 100644
--- a/Source/modules/serviceworkers/ServiceWorker.cpp
+++ b/Source/modules/serviceworkers/ServiceWorker.cpp
@@ -84,18 +84,15 @@ void ServiceWorker::postMessage(PassRefPtr<SerializedScriptValue> message, const
m_outerWorker->postMessage(messageString, webChannels.leakPtr());
}
-void ServiceWorker::onStateChanged(blink::WebServiceWorkerState state)
+bool ServiceWorker::isReady()
{
- if (m_isPromisePending)
- m_queuedStates.append(state);
- else
- changeState(state);
+ return !m_isPromisePending;
}
-// FIXME: To be removed, this is just here as part of a three-sided patch.
void ServiceWorker::dispatchStateChangeEvent()
{
- changeState(m_outerWorker->state());
+ // FIXME: Add ASSERT(isReady()) when Chromium side change rolls in.
+ this->dispatchEvent(Event::create(EventTypeNames::statechange));
}
const AtomicString& ServiceWorker::state() const
@@ -143,24 +140,17 @@ void ServiceWorker::onPromiseResolved()
{
ASSERT(m_isPromisePending);
m_isPromisePending = false;
- for (Vector<blink::WebServiceWorkerState>::iterator iterator = m_queuedStates.begin(); iterator != m_queuedStates.end(); ++iterator)
- changeState(*iterator);
- m_queuedStates.clear();
+ m_outerWorker->proxyReadyChanged();
}
void ServiceWorker::waitOnPromise(ScriptPromise promise)
{
ASSERT(!m_isPromisePending);
m_isPromisePending = true;
+ m_outerWorker->proxyReadyChanged();
promise.then(ThenFunction::create(this));
}
-void ServiceWorker::changeState(blink::WebServiceWorkerState state)
-{
- m_outerWorker->setState(state);
- this->dispatchEvent(Event::create(EventTypeNames::statechange));
-}
-
PassRefPtr<ServiceWorker> ServiceWorker::create(ExecutionContext* executionContext, PassOwnPtr<blink::WebServiceWorker> outerWorker)
{
RefPtr<ServiceWorker> worker = adoptRef(new ServiceWorker(executionContext, outerWorker));
« no previous file with comments | « Source/modules/serviceworkers/ServiceWorker.h ('k') | public/platform/WebServiceWorker.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698