Make ServiceWorker an ActiveDOMObject

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 68 matching lines @@
     if (exceptionState.hadException())
         return;
 
     blink::WebString messageString = message->toWireString();
     OwnPtr<blink::WebMessagePortChannelArray> webChannels = MessagePort::toWebMessagePortChannelArray(channels.release());
     m_outerWorker->postMessage(messageString, webChannels.leakPtr());
 }
 
 bool ServiceWorker::isReady()
 {
-    return !m_isPromisePending;
+    return m_proxyState == Ready;
 }
 
 void ServiceWorker::dispatchStateChangeEvent()
 {
     ASSERT(isReady());
     this->dispatchEvent(Event::create(EventTypeNames::statechange));
 }
 
 String ServiceWorker::scope() const
 {
@@ skipping 54 matching lines @@
 }
 
 PassRefPtr<ServiceWorker> ServiceWorker::from(ScriptPromiseResolverWithContext* resolver, WebType* worker)
 {
     RefPtr<ServiceWorker> serviceWorker = ServiceWorker::from(resolver->scriptState()->executionContext(), worker);
     ScriptState::Scope scope(resolver->scriptState());
     serviceWorker->waitOnPromise(resolver->promise());
     return serviceWorker;
 }
 
+void ServiceWorker::setProxyState(ProxyState state)

[dominicc (has gone to gerrit), 2014/06/13 19:55:13]

This is very nice and neat.

[falken, 2014/06/13 22:34:18]

Thanks!

+{
+    if (m_proxyState == state)
+        return;
+    switch (m_proxyState) {
+    case Initial:
+        ASSERT(state == RegisterPromisePending || state == ContextStopped);
+        break;
+    case RegisterPromisePending:
+        ASSERT(state == Ready || state == ContextStopped);
+        break;
+    case Ready:
+        ASSERT(state == ContextStopped);
+        break;
+    case ContextStopped:
+        ASSERT_NOT_REACHED();
+        break;
+    }
+
+    ProxyState oldState = m_proxyState;
+    m_proxyState = state;
+    if (oldState == Ready || state == Ready)
+        m_outerWorker->proxyReadyChanged();
+}
+
 void ServiceWorker::onPromiseResolved()
 {
-    ASSERT(m_isPromisePending);
-    m_isPromisePending = false;
-    m_outerWorker->proxyReadyChanged();
+    if (m_proxyState == ContextStopped)
+        return;
+    setProxyState(Ready);
 }
 
 void ServiceWorker::waitOnPromise(ScriptPromise promise)
 {
-    ASSERT(!m_isPromisePending);
-    m_isPromisePending = true;
-    m_outerWorker->proxyReadyChanged();
+    setProxyState(RegisterPromisePending);
     promise.then(ThenFunction::create(this));
 }
 
+bool ServiceWorker::hasPendingActivity() const
+{
+    if (m_proxyState == ContextStopped)
+        return false;
+    return m_outerWorker->state() != blink::WebServiceWorkerStateDeactivated;
+}
+
+void ServiceWorker::stop()
+{
+    setProxyState(ContextStopped);
+}
+
 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)
     , WebServiceWorkerProxy(this)
     , m_outerWorker(worker)
-    , m_isPromisePending(false)
+    , m_proxyState(Initial)
 {
     ScriptWrappable::init(this);
     ASSERT(m_outerWorker);
     m_outerWorker->setProxy(this);
 }
 
 } // namespace WebCore