Dispatch the ServiceWorker "activate" event during activation

Source/modules/serviceworkers/WaitUntilObserver.cpp

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "config.h"
 #include "modules/serviceworkers/WaitUntilObserver.h"
 
 #include "bindings/v8/ScriptFunction.h"
 #include "bindings/v8/ScriptPromise.h"
 #include "bindings/v8/ScriptValue.h"
@@ skipping 35 matching lines @@
             m_observer->reportError(value);
         m_observer->decrementPendingActivity();
         m_observer = nullptr;
         return value;
     }
 
     RefPtr<WaitUntilObserver> m_observer;
     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()
 {
     ASSERT(!m_pendingActivity);
 }
 
 void WaitUntilObserver::willDispatchEvent()
 {
     incrementPendingActivity();
 }
 
 void WaitUntilObserver::didDispatchEvent()
 {
     decrementPendingActivity();
 }
 
 void WaitUntilObserver::waitUntil(const ScriptValue& value)
 {
     incrementPendingActivity();
     ScriptPromise::cast(value).then(
         ThenFunction::create(this, ThenFunction::Fulfilled),
         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)
 {
 }
 
 void WaitUntilObserver::reportError(const ScriptValue& value)
 {
     // FIXME: Propagate error message to the client for onerror handling.
     notImplemented();
 
     m_hasError = true;
 }
 
 void WaitUntilObserver::incrementPendingActivity()
 {
     ++m_pendingActivity;
 }
 
 void WaitUntilObserver::decrementPendingActivity()
 {
     ASSERT(m_pendingActivity > 0);
     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);
 }
 
 } // namespace WebCore