[ServiceWorker] waitUntil() should wait until all promises got resolved/rejected.

third_party/WebKit/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 "modules/serviceworkers/WaitUntilObserver.h"
 
 #include "bindings/core/v8/ScriptFunction.h"
 #include "bindings/core/v8/ScriptPromise.h"
 #include "bindings/core/v8/ScriptValue.h"
 #include "bindings/core/v8/V8BindingForCore.h"
@@ skipping 47 matching lines @@
                WaitUntilObserver* observer,
                ResolveType type)
       : ScriptFunction(script_state),
         observer_(observer),
         resolve_type_(type) {}
 
   ScriptValue Call(ScriptValue value) override {
     ASSERT(observer_);
     ASSERT(resolve_type_ == kFulfilled || resolve_type_ == kRejected);
     if (resolve_type_ == kRejected) {
-      observer_->ReportError(value);
       value =
           ScriptPromise::Reject(value.GetScriptState(), value).GetScriptValue();
     }
-    observer_->DecrementPendingActivity();
+    observer_->OnPromiseCompleted(resolve_type_ == kRejected ? true : false);
     observer_ = nullptr;
     return value;
   }
 
   Member<WaitUntilObserver> observer_;
   ResolveType resolve_type_;
 };
 
 WaitUntilObserver* WaitUntilObserver::Create(ExecutionContext* context,
                                              EventType type,
                                              int event_id) {
   return new WaitUntilObserver(context, type, event_id);
 }
 
 void WaitUntilObserver::WillDispatchEvent() {
   event_dispatch_time_ = WTF::CurrentTime();
   // When handling a notificationclick or paymentrequest event, we want to
   // allow one window to be focused or opened. These calls are allowed between
   // the call to willDispatchEvent() and the last call to
   // decrementPendingActivity(). If waitUntil() isn't called, that means
   // between willDispatchEvent() and didDispatchEvent().
   if (type_ == kNotificationClick || type_ == kPaymentRequest)
     execution_context_->AllowWindowInteraction();
 
   IncrementPendingActivity();
 }
 
-void WaitUntilObserver::DidDispatchEvent(bool error_occurred) {
-  if (error_occurred)
-    has_error_ = true;
+void WaitUntilObserver::DidDispatchEvent(bool event_dispatch_failed) {
+  event_dispatch_state_ = event_dispatch_failed ? kFailed : kCompleted;
   DecrementPendingActivity();
-  event_dispatched_ = true;
 }
 
 void WaitUntilObserver::WaitUntil(ScriptState* script_state,
                                   ScriptPromise script_promise,
                                   ExceptionState& exception_state) {
-  if (event_dispatched_) {
+  if (event_dispatch_state_ != kInitial) {
     exception_state.ThrowDOMException(kInvalidStateError,
                                       "The event handler is already finished.");
     return;
   }
 
   if (!execution_context_)
     return;
 
   // When handling a notificationclick event, we want to allow one window to
   // be focused or opened. See comments in ::willDispatchEvent(). When
@@ skipping 15 matching lines @@
                                      EventType type,
                                      int event_id)
     : execution_context_(context),
       type_(type),
       event_id_(event_id),
       consume_window_interaction_timer_(
           Platform::Current()->CurrentThread()->GetWebTaskRunner(),
           this,
           &WaitUntilObserver::ConsumeWindowInteraction) {}
 
-void WaitUntilObserver::ReportError(const ScriptValue& value) {
-  // FIXME: Propagate error message to the client for onerror handling.
-  NOTIMPLEMENTED();
-
-  has_error_ = true;
+void WaitUntilObserver::OnPromiseCompleted(bool rejected) {

[falken, 2017/05/10 05:25:12]

OnPromiseSettled is aligned with promise terminology.

To avoid the bool param, I'd rather have this use the enum ResolveType, or just
split it into OnPromiseFulfilled and OnPromiseRejected.

[leonhsl(Using Gerrit), 2017/05/10 07:07:52]

Done.

+  if (rejected)
+    has_rejected_promise_ = true;
+  DecrementPendingActivity();
 }
 
 void WaitUntilObserver::IncrementPendingActivity() {
   ++pending_activity_;
 }
 
 void WaitUntilObserver::DecrementPendingActivity() {
   ASSERT(pending_activity_ > 0);
-  if (!execution_context_ || (!has_error_ && --pending_activity_))
+  if (!execution_context_ ||
+      (event_dispatch_state_ != kFailed && --pending_activity_))
     return;
 
   ServiceWorkerGlobalScopeClient* client =
       ServiceWorkerGlobalScopeClient::From(execution_context_);
   WebServiceWorkerEventResult result =
-      has_error_ ? kWebServiceWorkerEventResultRejected
-                 : kWebServiceWorkerEventResultCompleted;
+      (event_dispatch_state_ == kFailed || has_rejected_promise_)
+          ? kWebServiceWorkerEventResultRejected
+          : kWebServiceWorkerEventResultCompleted;
   switch (type_) {
     case kActivate:
       client->DidHandleActivateEvent(event_id_, result, event_dispatch_time_);
       break;
     case kFetch:
       client->DidHandleFetchEvent(event_id_, result, event_dispatch_time_);
       break;
     case kInstall:
       client->DidHandleInstallEvent(event_id_, result, event_dispatch_time_);
       break;
@@ skipping 45 matching lines @@
   if (!execution_context_)
     return;
   execution_context_->ConsumeWindowInteraction();
 }
 
 DEFINE_TRACE(WaitUntilObserver) {
   visitor->Trace(execution_context_);
 }
 
 }  // namespace blink