Index: third_party/WebKit/Source/modules/payments/PaymentRequestRespondWithObserver.cpp |
diff --git a/third_party/WebKit/Source/modules/payments/PaymentRequestRespondWithObserver.cpp b/third_party/WebKit/Source/modules/payments/PaymentRequestRespondWithObserver.cpp |
new file mode 100644 |
index 0000000000000000000000000000000000000000..544f9f3168f8215243afe5e9079c2a568ea16a4a |
--- /dev/null |
+++ b/third_party/WebKit/Source/modules/payments/PaymentRequestRespondWithObserver.cpp |
@@ -0,0 +1,131 @@ |
+// Copyright 2017 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/payments/PaymentRequestRespondWithObserver.h" |
+ |
+#include <v8.h> |
+#include "bindings/core/v8/ScriptValue.h" |
+#include "bindings/core/v8/V8Binding.h" |
+#include "bindings/modules/v8/V8PaymentAppResponse.h" |
+#include "core/dom/ExecutionContext.h" |
+#include "core/inspector/ConsoleMessage.h" |
+#include "modules/payments/PaymentAppResponse.h" |
+#include "modules/serviceworkers/ServiceWorkerGlobalScopeClient.h" |
+#include "modules/serviceworkers/WaitUntilObserver.h" |
+#include "public/platform/modules/payments/WebPaymentAppResponse.h" |
+ |
+namespace blink { |
+namespace { |
+ |
+// Returns the error message to let the developer know about the reason of the |
+// unusual failures. |
+const String getMessageForResponseError(WebServiceWorkerResponseError error) { |
haraken
2017/03/16 15:16:52
Would there be any way to avoid code duplication w
zino
2017/03/16 16:34:19
It might be possible but the |request_url| will no
|
+ String errorMessage = |
+ "The PaymentRequestEvent resulted in a network error response: "; |
+ switch (error) { |
+ case WebServiceWorkerResponseErrorPromiseRejected: |
+ errorMessage = errorMessage + "the promise was rejected."; |
+ break; |
+ case WebServiceWorkerResponseErrorDefaultPrevented: |
+ errorMessage = |
+ errorMessage + |
+ "preventDefault() was called without calling respondWith()."; |
+ break; |
+ case WebServiceWorkerResponseErrorNoV8Instance: |
+ errorMessage = errorMessage + |
+ "an object that was not a PaymentResponse was passed to " |
+ "respondWith()."; |
+ break; |
+ case WebServiceWorkerResponseErrorResponseTypeError: |
+ errorMessage = errorMessage + |
+ "the promise was resolved with an error response object."; |
+ break; |
+ case WebServiceWorkerResponseErrorUnknown: |
+ errorMessage = errorMessage + "an unexpected error occurred."; |
+ break; |
+ case WebServiceWorkerResponseErrorResponseTypeOpaque: |
+ case WebServiceWorkerResponseErrorResponseTypeNotBasicOrDefault: |
+ case WebServiceWorkerResponseErrorBodyUsed: |
+ case WebServiceWorkerResponseErrorResponseTypeOpaqueForClientRequest: |
+ case WebServiceWorkerResponseErrorResponseTypeOpaqueRedirect: |
+ case WebServiceWorkerResponseErrorBodyLocked: |
+ case WebServiceWorkerResponseErrorNoForeignFetchResponse: |
+ case WebServiceWorkerResponseErrorForeignFetchHeadersWithoutOrigin: |
+ case WebServiceWorkerResponseErrorForeignFetchMismatchedOrigin: |
+ case WebServiceWorkerResponseErrorRedirectedResponseForNotFollowRequest: |
+ NOTREACHED(); |
+ errorMessage = errorMessage + "an unexpected error occurred."; |
+ break; |
+ } |
+ return errorMessage; |
+} |
+ |
+} // namespace |
+ |
+PaymentRequestRespondWithObserver::~PaymentRequestRespondWithObserver() {} |
+ |
+PaymentRequestRespondWithObserver* PaymentRequestRespondWithObserver::create( |
+ ExecutionContext* context, |
+ int eventID, |
+ WaitUntilObserver* observer) { |
+ return new PaymentRequestRespondWithObserver(context, eventID, observer); |
+} |
+ |
+void PaymentRequestRespondWithObserver::onResponseRejected( |
+ WebServiceWorkerResponseError error) { |
+ getExecutionContext()->addConsoleMessage(ConsoleMessage::create( |
haraken
2017/03/14 16:15:51
getExecutionContext() returns nullptr after the co
zino
2017/03/16 13:47:31
The PaymentRequestRespondWithObserver is derived f
haraken
2017/03/16 15:16:52
Makes sense. You're adding a bunch of getExecution
zino
2017/03/16 16:34:19
Yeah, before my patch, the RespondWithObserver::re
|
+ JSMessageSource, WarningMessageLevel, getMessageForResponseError(error))); |
+ |
+ WebPaymentAppResponse webData; |
+ ServiceWorkerGlobalScopeClient::from(getExecutionContext()) |
+ ->respondToPaymentRequestEvent(m_eventID, webData, m_eventDispatchTime); |
+} |
+ |
+void PaymentRequestRespondWithObserver::onResponseFulfilled( |
+ const ScriptValue& value) { |
haraken
2017/03/14 16:15:51
Who calls onResponseFulfilled?
onResponseFulfille
zino
2017/03/16 13:47:31
The scriptState is coming from PaymentRequestEvent
|
+ PaymentAppResponse response; |
+ ExceptionState exceptionState(value.isolate(), ExceptionState::UnknownContext, |
+ "PaymentRequestEvent", "respondWith"); |
+ V8PaymentAppResponse::toImpl(toIsolate(getExecutionContext()), |
+ value.v8Value(), response, exceptionState); |
+ |
+ if (exceptionState.hadException()) { |
+ exceptionState.clearException(); |
haraken
2017/03/14 16:15:51
Why is it okay to ignore the exception?
zino
2017/03/16 13:47:31
I hoped to use the same pattern with existing code
haraken
2017/03/16 15:16:52
Makes sense.
|
+ onResponseRejected(WebServiceWorkerResponseErrorNoV8Instance); |
+ return; |
+ } |
+ |
+ WebPaymentAppResponse webData; |
+ webData.methodName = WebString(AtomicString(response.methodName())); |
nhiroki
2017/03/16 13:24:47
webData.methodName = response.methodName(); could
zino
2017/03/16 14:32:02
Done.
|
+ |
+ v8::Local<v8::String> detailsValue; |
+ if (!v8::JSON::Stringify(response.details().context(), |
+ response.details().v8Value().As<v8::Object>()) |
+ .ToLocal(&detailsValue)) { |
+ onResponseRejected(WebServiceWorkerResponseErrorUnknown); |
+ return; |
+ } |
+ webData.stringifiedDetails = WebString(AtomicString( |
+ v8StringToWebCoreString<String>(detailsValue, DoNotExternalize))); |
nhiroki
2017/03/16 13:24:47
webData.stringifiedDetails = toCoreString(detailsV
zino
2017/03/16 14:32:02
Done.
|
+ ServiceWorkerGlobalScopeClient::from(getExecutionContext()) |
+ ->respondToPaymentRequestEvent(m_eventID, webData, m_eventDispatchTime); |
+} |
+ |
+void PaymentRequestRespondWithObserver::onNoResponse() { |
+ ServiceWorkerGlobalScopeClient::from(getExecutionContext()) |
+ ->respondToPaymentRequestEvent(m_eventID, WebPaymentAppResponse(), |
+ m_eventDispatchTime); |
+} |
+ |
+PaymentRequestRespondWithObserver::PaymentRequestRespondWithObserver( |
+ ExecutionContext* context, |
+ int eventID, |
+ WaitUntilObserver* observer) |
+ : RespondWithObserver(context, eventID, observer) {} |
+ |
+DEFINE_TRACE(PaymentRequestRespondWithObserver) { |
+ RespondWithObserver::trace(visitor); |
+} |
+ |
+} // namespace blink |