ServiceWorker: Wait for registration promise to resolve before changing states.

Source/modules/serviceworkers/ServiceWorker.cpp

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 16 matching lines @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "config.h"
 #include "ServiceWorker.h"
 
 #include "EventTargetNames.h"
 #include "bindings/v8/ExceptionState.h"
 #include "bindings/v8/NewScriptState.h"
+#include "bindings/v8/ScriptPromiseResolverWithContext.h"
 #include "core/dom/MessagePort.h"
 #include "core/events/Event.h"
 #include "platform/NotImplemented.h"
 #include "public/platform/WebMessagePortChannel.h"
 #include "public/platform/WebServiceWorkerState.h"
 #include "public/platform/WebString.h"
 
 namespace WebCore {
 
+class ServiceWorker::ThenFunction FINAL : public ScriptFunction {
+public:
+    enum ResolveType {
+        Fulfilled,
+        Rejected,
+    };
+
+    static PassOwnPtr<ScriptFunction> create(PassRefPtr<ServiceWorker> observer, ResolveType type)
+    {
+        ExecutionContext* executionContext = observer->executionContext();
+        return adoptPtr(new ThenFunction(toIsolate(executionContext), observer, type));
+    }
+private:
+    ThenFunction(v8::Isolate* isolate, PassRefPtr<ServiceWorker> observer, ResolveType type)
+        : ScriptFunction(isolate)
+        , m_observer(observer)
+        , m_resolveType(type)
+    {
+    }
+
+    virtual ScriptValue call(ScriptValue value) OVERRIDE
+    {
+        ASSERT(m_resolveType == Fulfilled);
+        m_observer->onPromiseResolved();
+        return value;
+    }
+
+    RefPtr<ServiceWorker> m_observer;
+    ResolveType m_resolveType;
+};
+
 const AtomicString& ServiceWorker::interfaceName() const
 {
     return EventTargetNames::ServiceWorker;
 }
 
 void ServiceWorker::postMessage(PassRefPtr<SerializedScriptValue> message, const MessagePortArray* ports, ExceptionState& exceptionState)
 {
     // Disentangle the port in preparation for sending it to the remote context.
     OwnPtr<MessagePortChannelArray> channels = MessagePort::disentanglePorts(ports, exceptionState);
     if (exceptionState.hadException())
         return;
 
     blink::WebString messageString = message->toWireString();
     OwnPtr<blink::WebMessagePortChannelArray> webChannels = MessagePort::toWebMessagePortChannelArray(channels.release());
     m_outerWorker->postMessage(messageString, webChannels.leakPtr());
 }
 
+void ServiceWorker::onStateChanged(blink::WebServiceWorkerState state)
+{
+    if (m_isPromisePending)
+        m_queuedStates.append(state);
+    else
+        changeState(state);
+}
+
 void ServiceWorker::dispatchStateChangeEvent()
 {

[kinuko, 2014/04/23 14:20:00]

Can  you also add 'FIXME: deprecate' comment here? (As this one looks confusing)

[falken, 2014/04/24 00:58:50]

Done.

-    this->dispatchEvent(Event::create(EventTypeNames::statechange));
+    changeState(m_outerWorker->state());
 }
 
 const AtomicString& ServiceWorker::state() const
 {
     DEFINE_STATIC_LOCAL(AtomicString, unknown, ("unknown", AtomicString::ConstructFromLiteral));
     DEFINE_STATIC_LOCAL(AtomicString, parsed, ("parsed", AtomicString::ConstructFromLiteral));
     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));
@@ skipping 15 matching lines @@
     case blink::WebServiceWorkerStateActive:
         return active;
     case blink::WebServiceWorkerStateDeactivated:
         return deactivated;
     default:
         ASSERT_NOT_REACHED();
         return nullAtom;
     }
 }
 
-PassRefPtr<ServiceWorker> ServiceWorker::from(NewScriptState* scriptState, WebType* worker)
+PassRefPtr<ServiceWorker> ServiceWorker::from(ScriptPromiseResolverWithContext* resolver, WebType* worker)
 {
-    return create(scriptState->executionContext(), adoptPtr(worker));
+    NewScriptState::Scope scope(resolver->scriptState());
+    RefPtr<ServiceWorker> serviceWorker = create(resolver->scriptState()->executionContext(), adoptPtr(worker));
+    serviceWorker->waitOnPromise(resolver->promise());
+    return serviceWorker;
+}
+
+void ServiceWorker::onPromiseResolved()
+{

[kinuko, 2014/04/23 14:20:00]

nit: maybe ASSERT(m_isPromisePending) here

[falken, 2014/04/24 00:58:50]

Done.

+    m_isPromisePending = false;
+    for (Vector<blink::WebServiceWorkerState>::iterator iterator = m_queuedStates.begin(); iterator != m_queuedStates.end(); ++iterator)
+        changeState(*iterator);
+}
+
+void ServiceWorker::waitOnPromise(ScriptPromise promise)
+{
+    m_isPromisePending = true;
+    promise.then(
+        ThenFunction::create(this, ThenFunction::Fulfilled),
+        ThenFunction::create(this, ThenFunction::Rejected));
+}
+
+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));
     worker->suspendIfNeeded();
     return worker.release();
 }
 
 ServiceWorker::ServiceWorker(ExecutionContext* executionContext, PassOwnPtr<blink::WebServiceWorker> worker)
     : AbstractWorker(executionContext)
     , m_outerWorker(worker)
+    , m_isPromisePending(false)
 {
     ScriptWrappable::init(this);
     ASSERT(m_outerWorker);
     m_outerWorker->setProxy(this);
 }
 
 } // namespace WebCore