Chromium Code Reviews| OLD | NEW |
|---|---|
| (Empty) | |
| 1 // Copyright 2017 The Chromium Authors. All rights reserved. | |
| 2 // Use of this source code is governed by a BSD-style license that can be | |
| 3 // found in the LICENSE file. | |
| 4 | |
| 5 #include "modules/payments/PaymentRequestRespondWithObserver.h" | |
| 6 | |
| 7 #include <v8.h> | |
| 8 #include "bindings/core/v8/ScriptValue.h" | |
| 9 #include "bindings/core/v8/V8Binding.h" | |
| 10 #include "bindings/modules/v8/V8PaymentAppResponse.h" | |
| 11 #include "core/dom/ExecutionContext.h" | |
| 12 #include "core/inspector/ConsoleMessage.h" | |
| 13 #include "modules/payments/PaymentAppResponse.h" | |
| 14 #include "modules/serviceworkers/ServiceWorkerGlobalScopeClient.h" | |
| 15 #include "modules/serviceworkers/WaitUntilObserver.h" | |
| 16 #include "public/platform/modules/payments/WebPaymentAppResponse.h" | |
| 17 | |
| 18 namespace blink { | |
| 19 namespace { | |
| 20 | |
| 21 // Returns the error message to let the developer know about the reason of the | |
| 22 // unusual failures. | |
| 23 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
| |
| 24 String errorMessage = | |
| 25 "The PaymentRequestEvent resulted in a network error response: "; | |
| 26 switch (error) { | |
| 27 case WebServiceWorkerResponseErrorPromiseRejected: | |
| 28 errorMessage = errorMessage + "the promise was rejected."; | |
| 29 break; | |
| 30 case WebServiceWorkerResponseErrorDefaultPrevented: | |
| 31 errorMessage = | |
| 32 errorMessage + | |
| 33 "preventDefault() was called without calling respondWith()."; | |
| 34 break; | |
| 35 case WebServiceWorkerResponseErrorNoV8Instance: | |
| 36 errorMessage = errorMessage + | |
| 37 "an object that was not a PaymentResponse was passed to " | |
| 38 "respondWith()."; | |
| 39 break; | |
| 40 case WebServiceWorkerResponseErrorResponseTypeError: | |
| 41 errorMessage = errorMessage + | |
| 42 "the promise was resolved with an error response object."; | |
| 43 break; | |
| 44 case WebServiceWorkerResponseErrorUnknown: | |
| 45 errorMessage = errorMessage + "an unexpected error occurred."; | |
| 46 break; | |
| 47 case WebServiceWorkerResponseErrorResponseTypeOpaque: | |
| 48 case WebServiceWorkerResponseErrorResponseTypeNotBasicOrDefault: | |
| 49 case WebServiceWorkerResponseErrorBodyUsed: | |
| 50 case WebServiceWorkerResponseErrorResponseTypeOpaqueForClientRequest: | |
| 51 case WebServiceWorkerResponseErrorResponseTypeOpaqueRedirect: | |
| 52 case WebServiceWorkerResponseErrorBodyLocked: | |
| 53 case WebServiceWorkerResponseErrorNoForeignFetchResponse: | |
| 54 case WebServiceWorkerResponseErrorForeignFetchHeadersWithoutOrigin: | |
| 55 case WebServiceWorkerResponseErrorForeignFetchMismatchedOrigin: | |
| 56 case WebServiceWorkerResponseErrorRedirectedResponseForNotFollowRequest: | |
| 57 NOTREACHED(); | |
| 58 errorMessage = errorMessage + "an unexpected error occurred."; | |
| 59 break; | |
| 60 } | |
| 61 return errorMessage; | |
| 62 } | |
| 63 | |
| 64 } // namespace | |
| 65 | |
| 66 PaymentRequestRespondWithObserver::~PaymentRequestRespondWithObserver() {} | |
| 67 | |
| 68 PaymentRequestRespondWithObserver* PaymentRequestRespondWithObserver::create( | |
| 69 ExecutionContext* context, | |
| 70 int eventID, | |
| 71 WaitUntilObserver* observer) { | |
| 72 return new PaymentRequestRespondWithObserver(context, eventID, observer); | |
| 73 } | |
| 74 | |
| 75 void PaymentRequestRespondWithObserver::onResponseRejected( | |
| 76 WebServiceWorkerResponseError error) { | |
| 77 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
| |
| 78 JSMessageSource, WarningMessageLevel, getMessageForResponseError(error))); | |
| 79 | |
| 80 WebPaymentAppResponse webData; | |
| 81 ServiceWorkerGlobalScopeClient::from(getExecutionContext()) | |
| 82 ->respondToPaymentRequestEvent(m_eventID, webData, m_eventDispatchTime); | |
| 83 } | |
| 84 | |
| 85 void PaymentRequestRespondWithObserver::onResponseFulfilled( | |
| 86 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
| |
| 87 PaymentAppResponse response; | |
| 88 ExceptionState exceptionState(value.isolate(), ExceptionState::UnknownContext, | |
| 89 "PaymentRequestEvent", "respondWith"); | |
| 90 V8PaymentAppResponse::toImpl(toIsolate(getExecutionContext()), | |
| 91 value.v8Value(), response, exceptionState); | |
| 92 | |
| 93 if (exceptionState.hadException()) { | |
| 94 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.
| |
| 95 onResponseRejected(WebServiceWorkerResponseErrorNoV8Instance); | |
| 96 return; | |
| 97 } | |
| 98 | |
| 99 WebPaymentAppResponse webData; | |
| 100 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.
| |
| 101 | |
| 102 v8::Local<v8::String> detailsValue; | |
| 103 if (!v8::JSON::Stringify(response.details().context(), | |
| 104 response.details().v8Value().As<v8::Object>()) | |
| 105 .ToLocal(&detailsValue)) { | |
| 106 onResponseRejected(WebServiceWorkerResponseErrorUnknown); | |
| 107 return; | |
| 108 } | |
| 109 webData.stringifiedDetails = WebString(AtomicString( | |
| 110 v8StringToWebCoreString<String>(detailsValue, DoNotExternalize))); | |
|
nhiroki
2017/03/16 13:24:47
webData.stringifiedDetails = toCoreString(detailsV
zino
2017/03/16 14:32:02
Done.
| |
| 111 ServiceWorkerGlobalScopeClient::from(getExecutionContext()) | |
| 112 ->respondToPaymentRequestEvent(m_eventID, webData, m_eventDispatchTime); | |
| 113 } | |
| 114 | |
| 115 void PaymentRequestRespondWithObserver::onNoResponse() { | |
| 116 ServiceWorkerGlobalScopeClient::from(getExecutionContext()) | |
| 117 ->respondToPaymentRequestEvent(m_eventID, WebPaymentAppResponse(), | |
| 118 m_eventDispatchTime); | |
| 119 } | |
| 120 | |
| 121 PaymentRequestRespondWithObserver::PaymentRequestRespondWithObserver( | |
| 122 ExecutionContext* context, | |
| 123 int eventID, | |
| 124 WaitUntilObserver* observer) | |
| 125 : RespondWithObserver(context, eventID, observer) {} | |
| 126 | |
| 127 DEFINE_TRACE(PaymentRequestRespondWithObserver) { | |
| 128 RespondWithObserver::trace(visitor); | |
| 129 } | |
| 130 | |
| 131 } // namespace blink | |
| OLD | NEW |