Dispatch the ServiceWorker "activate" event during activation

This will be tested by a Chromium browsertest. Service Worker plumbing that would make this possible to test in Blink isn't fitted yet.

BUG=356021

Review URL: https://codereview.chromium.org/214413004

git-svn-id: svn://svn.chromium.org/blink/trunk@170310 bbb929c8-8fbe-4397-9dbb-9b2b20218538

third_party/WebKit/Source/modules/serviceworkers/InstallPhaseEvent.cpp

@@ -41,6 +41,11 @@ PassRefPtrWillBeRawPtr<InstallPhaseEvent> InstallPhaseEvent::create()
     return adoptRefWillBeRefCountedGarbageCollected(new InstallPhaseEvent());
 }
 
+PassRefPtrWillBeRawPtr<InstallPhaseEvent> InstallPhaseEvent::create(const AtomicString& type, const EventInit& eventInit, PassRefPtr<WaitUntilObserver> observer)
+{
+    return adoptRefWillBeRefCountedGarbageCollected(new InstallPhaseEvent(type, eventInit, observer));
+}
+
 InstallPhaseEvent::~InstallPhaseEvent()
 {
 }

third_party/WebKit/Source/modules/serviceworkers/InstallPhaseEvent.h

@@ -41,6 +41,7 @@ class WaitUntilObserver;
 class InstallPhaseEvent : public Event {
 public:
     static PassRefPtrWillBeRawPtr<InstallPhaseEvent> create();
+    static PassRefPtrWillBeRawPtr<InstallPhaseEvent> create(const AtomicString& type, const EventInit&, PassRefPtr<WaitUntilObserver>);
 
     virtual ~InstallPhaseEvent();
 

third_party/WebKit/Source/modules/serviceworkers/ServiceWorkerGlobalScopeClient.h

@@ -47,6 +47,7 @@ class ServiceWorkerGlobalScopeClient : public Supplement<WorkerClients> {
 public:
     virtual ~ServiceWorkerGlobalScopeClient() { }
 
+    virtual void didHandleActivateEvent(int eventID, blink::WebServiceWorkerEventResult) = 0;
     virtual void didHandleInstallEvent(int installEventID, blink::WebServiceWorkerEventResult) = 0;
     // A null response means no valid response was provided by the service worker, so fallback to native.
     virtual void didHandleFetchEvent(int fetchEventID, PassRefPtr<Response> = nullptr) = 0;

third_party/WebKit/Source/modules/serviceworkers/WaitUntilObserver.cpp

@@ -53,9 +53,9 @@ private:
     ResolveType m_resolveType;
 };
 
-PassRefPtr<WaitUntilObserver> WaitUntilObserver::create(ExecutionContext* context, int eventID)
+PassRefPtr<WaitUntilObserver> WaitUntilObserver::create(ExecutionContext* context, EventType type, int eventID)
 {
-    return adoptRef(new WaitUntilObserver(context, eventID));
+    return adoptRef(new WaitUntilObserver(context, type, eventID));
 }
 
 WaitUntilObserver::~WaitUntilObserver()
@@ -81,8 +81,9 @@ void WaitUntilObserver::waitUntil(const ScriptValue& value)
         ThenFunction::create(this, ThenFunction::Rejected));
 }
 
-WaitUntilObserver::WaitUntilObserver(ExecutionContext* context, int eventID)
+WaitUntilObserver::WaitUntilObserver(ExecutionContext* context, EventType type, int eventID)
     : ContextLifecycleObserver(context)
+    , m_type(type)
     , m_eventID(eventID)
     , m_pendingActivity(0)
     , m_hasError(false)
@@ -108,8 +109,16 @@ void WaitUntilObserver::decrementPendingActivity()
     if (--m_pendingActivity || !executionContext())
         return;
 
+    ServiceWorkerGlobalScopeClient* client = ServiceWorkerGlobalScopeClient::from(executionContext());
     blink::WebServiceWorkerEventResult result = m_hasError ? blink::WebServiceWorkerEventResultRejected : blink::WebServiceWorkerEventResultCompleted;
-    ServiceWorkerGlobalScopeClient::from(executionContext())->didHandleInstallEvent(m_eventID, result);
+    switch (m_type) {
+    case Activate:
+        client->didHandleActivateEvent(m_eventID, result);
+        break;
+    case Install:
+        client->didHandleInstallEvent(m_eventID, result);
+        break;
+    }
     observeContext(0);
 }
 

third_party/WebKit/Source/modules/serviceworkers/WaitUntilObserver.h

@@ -20,7 +20,12 @@ class WaitUntilObserver FINAL :
     public ContextLifecycleObserver,
     public RefCounted<WaitUntilObserver> {
 public:
-    static PassRefPtr<WaitUntilObserver> create(ExecutionContext*, int eventID);
+    enum EventType {
+        Activate,
+        Install
+    };
+
+    static PassRefPtr<WaitUntilObserver> create(ExecutionContext*, EventType, int eventID);
 
     ~WaitUntilObserver();
 
@@ -28,20 +33,21 @@ public:
     void willDispatchEvent();
     void didDispatchEvent();
 
-    // Observes the promise and delays calling didHandleInstallEvent() until
+    // Observes the promise and delays calling the continuation until
     // the given promise is resolved or rejected.
     void waitUntil(const ScriptValue&);
 
 private:
     class ThenFunction;
 
-    WaitUntilObserver(ExecutionContext*, int eventID);
+    WaitUntilObserver(ExecutionContext*, EventType, int eventID);
 
     void reportError(const ScriptValue&);
 
     void incrementPendingActivity();
     void decrementPendingActivity();
 
+    EventType m_type;
     int m_eventID;
     int m_pendingActivity;
     bool m_hasError;

third_party/WebKit/Source/web/ServiceWorkerGlobalScopeClientImpl.cpp

@@ -48,6 +48,11 @@ ServiceWorkerGlobalScopeClientImpl::~ServiceWorkerGlobalScopeClientImpl()
 {
 }
 
+void ServiceWorkerGlobalScopeClientImpl::didHandleActivateEvent(int eventID, WebServiceWorkerEventResult result)
+{
+    m_client->didHandleActivateEvent(eventID, result);
+}
+
 void ServiceWorkerGlobalScopeClientImpl::didHandleInstallEvent(int installEventID, WebServiceWorkerEventResult result)
 {
     m_client->didHandleInstallEvent(installEventID, result);
@@ -73,6 +78,7 @@ void ServiceWorkerGlobalScopeClientImpl::didHandleSyncEvent(int syncEventID)
 ServiceWorkerGlobalScopeClientImpl::ServiceWorkerGlobalScopeClientImpl(PassOwnPtr<WebServiceWorkerContextClient> client)
     : m_client(client)
 {
+    ASSERT(m_client);
 }
 
 } // namespace blink

third_party/WebKit/Source/web/ServiceWorkerGlobalScopeClientImpl.h

@@ -43,6 +43,7 @@ public:
     static PassOwnPtr<WebCore::ServiceWorkerGlobalScopeClient> create(PassOwnPtr<WebServiceWorkerContextClient>);
     virtual ~ServiceWorkerGlobalScopeClientImpl();
 
+    virtual void didHandleActivateEvent(int eventID, WebServiceWorkerEventResult) OVERRIDE;
     virtual void didHandleInstallEvent(int installEventID, WebServiceWorkerEventResult) OVERRIDE;
     virtual void didHandleFetchEvent(int fetchEventID, PassRefPtr<WebCore::Response>) OVERRIDE;
     virtual void didHandleSyncEvent(int syncEventID) OVERRIDE;

third_party/WebKit/Source/web/ServiceWorkerGlobalScopeProxy.cpp

@@ -41,6 +41,7 @@
 #include "core/workers/WorkerGlobalScope.h"
 #include "modules/serviceworkers/FetchEvent.h"
 #include "modules/serviceworkers/InstallEvent.h"
+#include "modules/serviceworkers/InstallPhaseEvent.h"
 #include "modules/serviceworkers/WaitUntilObserver.h"
 #include "platform/NotImplemented.h"
 #include "wtf/Functional.h"
@@ -62,12 +63,21 @@ ServiceWorkerGlobalScopeProxy::~ServiceWorkerGlobalScopeProxy()
 void ServiceWorkerGlobalScopeProxy::dispatchInstallEvent(int eventID)
 {
     ASSERT(m_workerGlobalScope);
-    RefPtr<WaitUntilObserver> observer = WaitUntilObserver::create(m_workerGlobalScope, eventID);
+    RefPtr<WaitUntilObserver> observer = WaitUntilObserver::create(m_workerGlobalScope, WaitUntilObserver::Install, eventID);
     observer->willDispatchEvent();
     m_workerGlobalScope->dispatchEvent(InstallEvent::create(EventTypeNames::install, EventInit(), observer));
     observer->didDispatchEvent();
 }
 
+void ServiceWorkerGlobalScopeProxy::dispatchActivateEvent(int eventID)
+{
+    ASSERT(m_workerGlobalScope);
+    RefPtr<WaitUntilObserver> observer = WaitUntilObserver::create(m_workerGlobalScope, WaitUntilObserver::Activate, eventID);
+    observer->willDispatchEvent();
+    m_workerGlobalScope->dispatchEvent(InstallPhaseEvent::create(EventTypeNames::activate, EventInit(), observer));
+    observer->didDispatchEvent();
+}
+
 void ServiceWorkerGlobalScopeProxy::dispatchFetchEvent(int eventID)
 {
     ASSERT(m_workerGlobalScope);

third_party/WebKit/Source/web/ServiceWorkerGlobalScopeProxy.h

@@ -66,6 +66,7 @@ public:
     virtual ~ServiceWorkerGlobalScopeProxy();
 
     // WebServiceWorkerContextProxy overrides:
+    virtual void dispatchActivateEvent(int) OVERRIDE;
     virtual void dispatchInstallEvent(int) OVERRIDE;
     virtual void dispatchFetchEvent(int) OVERRIDE;
     virtual void dispatchMessageEvent(const WebString& message, const WebMessagePortChannelArray&) OVERRIDE;

third_party/WebKit/public/web/WebServiceWorkerContextClient.h

@@ -78,6 +78,9 @@ public:
     virtual void dispatchDevToolsMessage(const WebString&) { }
     virtual void saveDevToolsAgentState(const WebString&) { }
 
+    // ServiceWorker specific method.
+    virtual void didHandleActivateEvent(int eventID, blink::WebServiceWorkerEventResult result) { }
+
     // ServiceWorker specific method. Called after InstallEvent (dispatched
     // via WebServiceWorkerContextProxy) is handled by the ServiceWorker's
     // script context.

third_party/WebKit/public/web/WebServiceWorkerContextProxy.h

@@ -43,6 +43,7 @@ class WebServiceWorkerContextProxy {
 public:
     virtual ~WebServiceWorkerContextProxy() { }
 
+    virtual void dispatchActivateEvent(int eventID) = 0;
     // FIXME: This needs to pass the active service worker info.
     virtual void dispatchInstallEvent(int installEventID) = 0;
     // FIXME: This needs to pass the fetch request info.