PaymentApp: Implement respondWith() in PaymentRequestEvent. (blink side)

third_party/WebKit/Source/web/ServiceWorkerGlobalScopeProxy.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 12 matching lines @@
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (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 "web/ServiceWorkerGlobalScopeProxy.h"
 
+#include <memory>
+#include <utility>
 #include "bindings/core/v8/SourceLocation.h"
 #include "bindings/core/v8/WorkerOrWorkletScriptController.h"
 #include "core/dom/Document.h"
 #include "core/dom/ExecutionContext.h"
 #include "core/dom/ExecutionContextTask.h"
 #include "core/dom/MessagePort.h"
 #include "core/inspector/ConsoleMessage.h"
 #include "core/origin_trials/OriginTrials.h"
 #include "core/workers/ParentFrameTaskRunners.h"
 #include "core/workers/WorkerGlobalScope.h"
 #include "core/workers/WorkerThread.h"
 #include "modules/background_sync/SyncEvent.h"
 #include "modules/fetch/Headers.h"
 #include "modules/notifications/Notification.h"
 #include "modules/notifications/NotificationEvent.h"
 #include "modules/notifications/NotificationEventInit.h"
 #include "modules/payments/PaymentAppRequest.h"
 #include "modules/payments/PaymentAppRequestConversion.h"
 #include "modules/payments/PaymentRequestEvent.h"
 #include "modules/push_messaging/PushEvent.h"
 #include "modules/push_messaging/PushMessageData.h"
 #include "modules/serviceworkers/ExtendableEvent.h"
 #include "modules/serviceworkers/ExtendableMessageEvent.h"
 #include "modules/serviceworkers/FetchEvent.h"
 #include "modules/serviceworkers/ForeignFetchEvent.h"
 #include "modules/serviceworkers/InstallEvent.h"
+#include "modules/serviceworkers/PaymentRequestRespondWithObserver.h"
 #include "modules/serviceworkers/ServiceWorkerClient.h"
 #include "modules/serviceworkers/ServiceWorkerGlobalScope.h"
 #include "modules/serviceworkers/ServiceWorkerWindowClient.h"
 #include "modules/serviceworkers/WaitUntilObserver.h"
 #include "platform/RuntimeEnabledFeatures.h"
 #include "public/platform/modules/notifications/WebNotificationData.h"
 #include "public/platform/modules/serviceworker/WebServiceWorkerEventResult.h"
 #include "public/platform/modules/serviceworker/WebServiceWorkerRequest.h"
 #include "public/web/WebSerializedScriptValue.h"
 #include "public/web/modules/serviceworker/WebServiceWorkerContextClient.h"
 #include "web/WebEmbeddedWorkerImpl.h"
 #include "wtf/Assertions.h"
 #include "wtf/Functional.h"
 #include "wtf/PtrUtil.h"
-#include <memory>
-#include <utility>
 
 namespace blink {
 
 ServiceWorkerGlobalScopeProxy* ServiceWorkerGlobalScopeProxy::create(
     WebEmbeddedWorkerImpl& embeddedWorker,
     Document& document,
     WebServiceWorkerContextClient& client) {
   return new ServiceWorkerGlobalScopeProxy(embeddedWorker, document, client);
 }
 
@@ skipping 248 matching lines @@
   WaitUntilObserver* observer = WaitUntilObserver::create(
       workerGlobalScope(), WaitUntilObserver::Sync, eventID);
   Event* event = SyncEvent::create(EventTypeNames::sync, tag,
                                    lastChance == IsLastChance, observer);
   workerGlobalScope()->dispatchExtendableEvent(event, observer);
 }
 
 void ServiceWorkerGlobalScopeProxy::dispatchPaymentRequestEvent(
     int eventID,
     const WebPaymentAppRequest& webAppRequest) {
-  WaitUntilObserver* observer = WaitUntilObserver::create(
+  ScriptState::Scope scope(

[nhiroki, 2017/03/08 02:28:16]

You enter the scope because toPaymentAppRequestData() internally uses
ScriptState, right? Can you add a comment about it here so that future readers
can easily understand it?

[haraken, 2017/03/08 09:28:06]

Alternately, how about making toPaymentAppRequest enter the ScriptState?

[zino, 2017/03/10 17:57:52]

Done.

+      workerGlobalScope()->scriptController()->getScriptState());
+  WaitUntilObserver* waitUntilObserver = WaitUntilObserver::create(
       workerGlobalScope(), WaitUntilObserver::PaymentRequest, eventID);
+  RespondWithObserver* respondWithObserver =
+      PaymentRequestRespondWithObserver::create(workerGlobalScope(), eventID,
+                                                waitUntilObserver);
+
   Event* event = PaymentRequestEvent::create(
       EventTypeNames::paymentrequest,
       PaymentAppRequestConversion::toPaymentAppRequest(
           workerGlobalScope()->scriptController()->getScriptState(),
           webAppRequest),
-      observer);
-  workerGlobalScope()->dispatchExtendableEvent(event, observer);
+      respondWithObserver, waitUntilObserver);
+
+  waitUntilObserver->willDispatchEvent();
+  respondWithObserver->willDispatchEvent();
+  DispatchEventResult dispatchResult =
+      workerGlobalScope()->dispatchEvent(event);
+  respondWithObserver->didDispatchEvent(dispatchResult);
+  // false is okay because waitUntil for payment request event doesn't care
+  // about the promise rejection or an uncaught runtime script error.
+  waitUntilObserver->didDispatchEvent(false /* errorOccurred */);
 }
 
 bool ServiceWorkerGlobalScopeProxy::hasFetchEventHandler() {
   DCHECK(m_workerGlobalScope);
   return m_workerGlobalScope->hasEventListeners(EventTypeNames::fetch);
 }
 
 void ServiceWorkerGlobalScopeProxy::countFeature(UseCounter::Feature feature) {
   client().countFeature(static_cast<uint32_t>(feature));
 }
@@ skipping 121 matching lines @@
   return *m_document;
 }
 
 ServiceWorkerGlobalScope* ServiceWorkerGlobalScopeProxy::workerGlobalScope()
     const {
   DCHECK(m_workerGlobalScope);
   return m_workerGlobalScope;
 }
 
 }  // namespace blink