<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[213946] trunk/Source</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/213946">213946</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2017-03-14 15:32:10 -0700 (Tue, 14 Mar 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Propagate PassKit errors
https://bugs.webkit.org/show_bug.cgi?id=169633
rdar://problem/31043392
Reviewed by Dean Jackson.
Source/WebCore:
* Modules/applepay/ApplePayError.idl:
* Modules/applepay/ApplePaySession.cpp:
(WebCore::convert):
(WebCore::convertAndValidate):
* Modules/applepay/PaymentRequest.h:
Source/WebKit2:
* UIProcess/ApplePay/cocoa/WebPaymentCoordinatorProxyCocoa.mm:
(WebKit::toNSError):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesapplepayApplePayErroridl">trunk/Source/WebCore/Modules/applepay/ApplePayError.idl</a></li>
<li><a href="#trunkSourceWebCoreModulesapplepayApplePaySessioncpp">trunk/Source/WebCore/Modules/applepay/ApplePaySession.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesapplepayPaymentRequesth">trunk/Source/WebCore/Modules/applepay/PaymentRequest.h</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessApplePaycocoaWebPaymentCoordinatorProxyCocoamm">trunk/Source/WebKit2/UIProcess/ApplePay/cocoa/WebPaymentCoordinatorProxyCocoa.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (213945 => 213946)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-03-14 22:23:06 UTC (rev 213945)
+++ trunk/Source/WebCore/ChangeLog 2017-03-14 22:32:10 UTC (rev 213946)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2017-03-14 Anders Carlsson <andersca@apple.com>
+
+ Propagate PassKit errors
+ https://bugs.webkit.org/show_bug.cgi?id=169633
+ rdar://problem/31043392
+
+ Reviewed by Dean Jackson.
+
+ * Modules/applepay/ApplePayError.idl:
+ * Modules/applepay/ApplePaySession.cpp:
+ (WebCore::convert):
+ (WebCore::convertAndValidate):
+ * Modules/applepay/PaymentRequest.h:
+
</ins><span class="cx"> 2017-03-14 Alan Kinsley <zalan@apple.com>
</span><span class="cx">
</span><span class="cx"> Simple line layout: Adjust hyphenation constrains based on the normal line layout line-breaking logic.
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesapplepayApplePayErroridl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/applepay/ApplePayError.idl (213945 => 213946)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/applepay/ApplePayError.idl 2017-03-14 22:23:06 UTC (rev 213945)
+++ trunk/Source/WebCore/Modules/applepay/ApplePayError.idl 2017-03-14 22:32:10 UTC (rev 213946)
</span><span class="lines">@@ -37,14 +37,12 @@
</span><span class="cx"> ] enum ApplePayErrorContactField {
</span><span class="cx"> "phoneNumber",
</span><span class="cx"> "emailAddress",
</span><del>- "givenName",
- "familyName",
- "addressLines",
</del><ins>+ "name",
+ "address",
</ins><span class="cx"> "locality",
</span><span class="cx"> "postalCode",
</span><span class="cx"> "administrativeArea",
</span><del>- "country",
- "countryCode"
</del><ins>+ "country"
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> [
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesapplepayApplePaySessioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/applepay/ApplePaySession.cpp (213945 => 213946)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/applepay/ApplePaySession.cpp 2017-03-14 22:23:06 UTC (rev 213945)
+++ trunk/Source/WebCore/Modules/applepay/ApplePaySession.cpp 2017-03-14 22:32:10 UTC (rev 213946)
</span><span class="lines">@@ -413,6 +413,23 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static Vector<PaymentError> convert(const Vector<RefPtr<ApplePayError>>& errors)
+{
+ Vector<PaymentError> convertedErrors;
+
+ for (auto& error : errors) {
+ PaymentError convertedError;
+
+ convertedError.code = error->code();
+ convertedError.message = error->message();
+ convertedError.contactField = error->contactField();
+
+ convertedErrors.append(convertedError);
+ }
+
+ return convertedErrors;
+}
+
</ins><span class="cx"> static ExceptionOr<PaymentAuthorizationResult> convertAndValidate(ApplePayPaymentAuthorizationResult&& result)
</span><span class="cx"> {
</span><span class="cx"> PaymentAuthorizationResult convertedResult;
</span><span class="lines">@@ -421,6 +438,7 @@
</span><span class="cx"> if (!authorizationStatus)
</span><span class="cx"> return Exception { INVALID_ACCESS_ERR };
</span><span class="cx"> convertedResult.status = *authorizationStatus;
</span><ins>+ convertedResult.errors = convert(result.errors);
</ins><span class="cx">
</span><span class="cx"> return WTFMove(convertedResult);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesapplepayPaymentRequesth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/applepay/PaymentRequest.h (213945 => 213946)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/applepay/PaymentRequest.h 2017-03-14 22:23:06 UTC (rev 213945)
+++ trunk/Source/WebCore/Modules/applepay/PaymentRequest.h 2017-03-14 22:32:10 UTC (rev 213946)
</span><span class="lines">@@ -161,14 +161,12 @@
</span><span class="cx"> enum class ContactField {
</span><span class="cx"> PhoneNumber,
</span><span class="cx"> EmailAddress,
</span><del>- GivenName,
- FamilyName,
- AddressLines,
</del><ins>+ Name,
+ Address,
</ins><span class="cx"> Locality,
</span><span class="cx"> PostalCode,
</span><span class="cx"> AdministrativeArea,
</span><span class="cx"> Country,
</span><del>- CountryCode,
</del><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> Code code;
</span><span class="lines">@@ -218,14 +216,12 @@
</span><span class="cx"> WebCore::PaymentError::ContactField,
</span><span class="cx"> WebCore::PaymentError::ContactField::PhoneNumber,
</span><span class="cx"> WebCore::PaymentError::ContactField::EmailAddress,
</span><del>- WebCore::PaymentError::ContactField::GivenName,
- WebCore::PaymentError::ContactField::FamilyName,
- WebCore::PaymentError::ContactField::AddressLines,
</del><ins>+ WebCore::PaymentError::ContactField::Name,
+ WebCore::PaymentError::ContactField::Address,
</ins><span class="cx"> WebCore::PaymentError::ContactField::Locality,
</span><span class="cx"> WebCore::PaymentError::ContactField::PostalCode,
</span><span class="cx"> WebCore::PaymentError::ContactField::AdministrativeArea,
</span><del>- WebCore::PaymentError::ContactField::Country,
- WebCore::PaymentError::ContactField::CountryCode
</del><ins>+ WebCore::PaymentError::ContactField::Country
</ins><span class="cx"> >;
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (213945 => 213946)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2017-03-14 22:23:06 UTC (rev 213945)
+++ trunk/Source/WebKit2/ChangeLog 2017-03-14 22:32:10 UTC (rev 213946)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2017-03-14 Anders Carlsson <andersca@apple.com>
+
+ Propagate PassKit errors
+ https://bugs.webkit.org/show_bug.cgi?id=169633
+ rdar://problem/31043392
+
+ Reviewed by Dean Jackson.
+
+ * UIProcess/ApplePay/cocoa/WebPaymentCoordinatorProxyCocoa.mm:
+ (WebKit::toNSError):
+
</ins><span class="cx"> 2017-03-06 Jer Noble <jer.noble@apple.com>
</span><span class="cx">
</span><span class="cx"> Refactor: Allow WebKit2 to override the creation of RealtimeMediaSources
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessApplePaycocoaWebPaymentCoordinatorProxyCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/ApplePay/cocoa/WebPaymentCoordinatorProxyCocoa.mm (213945 => 213946)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/ApplePay/cocoa/WebPaymentCoordinatorProxyCocoa.mm 2017-03-14 22:23:06 UTC (rev 213945)
+++ trunk/Source/WebKit2/UIProcess/ApplePay/cocoa/WebPaymentCoordinatorProxyCocoa.mm 2017-03-14 22:32:10 UTC (rev 213946)
</span><span class="lines">@@ -58,11 +58,23 @@
</span><span class="cx"> SOFT_LINK_CONSTANT(PassKit, PKPaymentNetworkVisa, NSString *);
</span><span class="cx">
</span><span class="cx"> #if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101300) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 110000)
</span><ins>+SOFT_LINK_FRAMEWORK(Contacts)
+SOFT_LINK_CONSTANT(Contacts, CNPostalAddressStreetKey, NSString *);
+SOFT_LINK_CONSTANT(Contacts, CNPostalAddressCityKey, NSString *);
+SOFT_LINK_CONSTANT(Contacts, CNPostalAddressStateKey, NSString *);
+SOFT_LINK_CONSTANT(Contacts, CNPostalAddressPostalCodeKey, NSString *);
+SOFT_LINK_CONSTANT(Contacts, CNPostalAddressCountryKey, NSString *);
</ins><span class="cx"> SOFT_LINK_CLASS(PassKit, PKPaymentAuthorizationResult)
</span><span class="cx"> SOFT_LINK_CLASS(PassKit, PKPaymentRequestPaymentMethodUpdate)
</span><span class="cx"> SOFT_LINK_CLASS(PassKit, PKPaymentRequestShippingContactUpdate)
</span><span class="cx"> SOFT_LINK_CLASS(PassKit, PKPaymentRequestShippingMethodUpdate)
</span><span class="cx"> SOFT_LINK_CONSTANT(PassKit, PKPaymentErrorDomain, NSString *);
</span><ins>+SOFT_LINK_CONSTANT(PassKit, PKContactFieldPostalAddress, NSString *);
+SOFT_LINK_CONSTANT(PassKit, PKContactFieldEmailAddress, NSString *);
+SOFT_LINK_CONSTANT(PassKit, PKContactFieldPhoneNumber, NSString *);
+SOFT_LINK_CONSTANT(PassKit, PKContactFieldName, NSString *);
+SOFT_LINK_CONSTANT(PassKit, PKPaymentErrorContactFieldUserInfoKey, NSString *);
+SOFT_LINK_CONSTANT(PassKit, PKPaymentErrorPostalAddressUserInfoKey, NSString *);
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> typedef void (^PKCanMakePaymentsCompletion)(BOOL isValid, NSError *error);
</span><span class="lines">@@ -547,8 +559,53 @@
</span><span class="cx"> auto userInfo = adoptNS([[NSMutableDictionary alloc] init]);
</span><span class="cx"> [userInfo setObject:error.message forKey:NSLocalizedDescriptionKey];
</span><span class="cx">
</span><del>- // FIXME: Set the contact field key.
</del><ins>+ if (error.contactField) {
+ NSString *pkContactField = nil;
+ NSString *postalAddressKey = nil;
</ins><span class="cx">
</span><ins>+ switch (*error.contactField) {
+ case WebCore::PaymentError::ContactField::PhoneNumber:
+ pkContactField = getPKContactFieldPhoneNumber();
+ break;
+
+ case WebCore::PaymentError::ContactField::EmailAddress:
+ pkContactField = getPKContactFieldEmailAddress();
+ break;
+
+ case WebCore::PaymentError::ContactField::Name:
+ pkContactField = getPKContactFieldName();
+ break;
+
+ case WebCore::PaymentError::ContactField::Address:
+ pkContactField = getPKContactFieldPostalAddress();
+ postalAddressKey = getCNPostalAddressStreetKey();
+ break;
+
+ case WebCore::PaymentError::ContactField::Locality:
+ pkContactField = getPKContactFieldPostalAddress();
+ postalAddressKey = getCNPostalAddressCityKey();
+ break;
+
+ case WebCore::PaymentError::ContactField::PostalCode:
+ pkContactField = getPKContactFieldPostalAddress();
+ postalAddressKey = getCNPostalAddressPostalCodeKey();
+ break;
+
+ case WebCore::PaymentError::ContactField::AdministrativeArea:
+ pkContactField = getPKContactFieldPostalAddress();
+ postalAddressKey = getCNPostalAddressCityKey();
+ break;
+
+ case WebCore::PaymentError::ContactField::Country:
+ pkContactField = getPKContactFieldPostalAddress();
+ postalAddressKey = getCNPostalAddressCountryKey();
+ break;
+ }
+
+ [userInfo setObject:pkContactField forKey:getPKPaymentErrorContactFieldUserInfoKey()];
+ [userInfo setObject:postalAddressKey forKey:getPKPaymentErrorPostalAddressUserInfoKey()];
+ }
+
</ins><span class="cx"> return adoptNS([[NSError alloc] initWithDomain:getPKPaymentErrorDomain() code:toPKPaymentErrorCode(error.code) userInfo:userInfo.get()]);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>