<!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>[214829] 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/214829">214829</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2017-04-03 12:07:50 -0700 (Mon, 03 Apr 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Tweak ApplePaySession API
https://bugs.webkit.org/show_bug.cgi?id=170409
rdar://problem/31405459
Reviewed by Tim Horton.
Source/WebCore:
Rename "address" to "addressLines". Add "postalAddress". Reorder the ApplePayError constructor parameters.
* Modules/applepay/ApplePayError.cpp:
(WebCore::ApplePayError::create):
(WebCore::ApplePayError::ApplePayError):
* Modules/applepay/ApplePayError.h:
* Modules/applepay/ApplePayError.idl:
* Modules/applepay/PaymentRequest.h:
Source/WebKit2:
Update for WebCore changes.
* 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="#trunkSourceWebCoreModulesapplepayApplePayErrorcpp">trunk/Source/WebCore/Modules/applepay/ApplePayError.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesapplepayApplePayErrorh">trunk/Source/WebCore/Modules/applepay/ApplePayError.h</a></li>
<li><a href="#trunkSourceWebCoreModulesapplepayApplePayErroridl">trunk/Source/WebCore/Modules/applepay/ApplePayError.idl</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 (214828 => 214829)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-04-03 19:04:16 UTC (rev 214828)
+++ trunk/Source/WebCore/ChangeLog 2017-04-03 19:07:50 UTC (rev 214829)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2017-04-03 Anders Carlsson <andersca@apple.com>
+
+ Tweak ApplePaySession API
+ https://bugs.webkit.org/show_bug.cgi?id=170409
+ rdar://problem/31405459
+
+ Reviewed by Tim Horton.
+
+ Rename "address" to "addressLines". Add "postalAddress". Reorder the ApplePayError constructor parameters.
+
+ * Modules/applepay/ApplePayError.cpp:
+ (WebCore::ApplePayError::create):
+ (WebCore::ApplePayError::ApplePayError):
+ * Modules/applepay/ApplePayError.h:
+ * Modules/applepay/ApplePayError.idl:
+ * Modules/applepay/PaymentRequest.h:
+
</ins><span class="cx"> 2017-04-03 Zan Dobersek <zdobersek@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GCrypt] Implement CryptoKeyEC::keySizeInBits(), ::platformGeneratePair()
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesapplepayApplePayErrorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/applepay/ApplePayError.cpp (214828 => 214829)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/applepay/ApplePayError.cpp 2017-04-03 19:04:16 UTC (rev 214828)
+++ trunk/Source/WebCore/Modules/applepay/ApplePayError.cpp 2017-04-03 19:07:50 UTC (rev 214829)
</span><span class="lines">@@ -30,15 +30,15 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-Ref<ApplePayError> ApplePayError::create(Code code, const String& message, std::optional<ContactField> contactField)
</del><ins>+Ref<ApplePayError> ApplePayError::create(Code code, std::optional<ContactField> contactField, const String& message)
</ins><span class="cx"> {
</span><del>- return adoptRef(*new ApplePayError { code, message, contactField });
</del><ins>+ return adoptRef(*new ApplePayError { code, contactField, message });
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-ApplePayError::ApplePayError(Code code, const String& message, std::optional<ContactField> contactField)
</del><ins>+ApplePayError::ApplePayError(Code code, std::optional<ContactField> contactField, const String& message)
</ins><span class="cx"> : m_code { code }
</span><ins>+ , m_contactField { contactField }
</ins><span class="cx"> , m_message { message }
</span><del>- , m_contactField { contactField }
</del><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesapplepayApplePayErrorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/applepay/ApplePayError.h (214828 => 214829)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/applepay/ApplePayError.h 2017-04-03 19:04:16 UTC (rev 214828)
+++ trunk/Source/WebCore/Modules/applepay/ApplePayError.h 2017-04-03 19:07:50 UTC (rev 214829)
</span><span class="lines">@@ -38,24 +38,24 @@
</span><span class="cx"> using Code = PaymentError::Code;
</span><span class="cx"> using ContactField = PaymentError::ContactField;
</span><span class="cx">
</span><del>- static Ref<ApplePayError> create(Code, const String& message, std::optional<ContactField>);
</del><ins>+ static Ref<ApplePayError> create(Code, std::optional<ContactField>, const String& message);
</ins><span class="cx"> virtual ~ApplePayError();
</span><span class="cx">
</span><span class="cx"> Code code() const { return m_code; }
</span><span class="cx"> void setCode(Code code) { m_code = code; }
</span><span class="cx">
</span><ins>+ std::optional<ContactField> contactField() const { return m_contactField; }
+ void setContactField(std::optional<ContactField> contactField) { m_contactField = contactField; }
+
</ins><span class="cx"> String message() const { return m_message; }
</span><span class="cx"> void setMessage(String&& message) { m_message = WTFMove(message); }
</span><span class="cx">
</span><del>- std::optional<ContactField> contactField() const { return m_contactField; }
- void setContactField(std::optional<ContactField> contactField) { m_contactField = contactField; }
-
</del><span class="cx"> private:
</span><del>- ApplePayError(Code, const String& message, std::optional<ContactField>);
</del><ins>+ ApplePayError(Code, std::optional<ContactField>, const String& message);
</ins><span class="cx">
</span><span class="cx"> Code m_code;
</span><ins>+ std::optional<ContactField> m_contactField;
</ins><span class="cx"> String m_message;
</span><del>- std::optional<ContactField> m_contactField;
</del><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesapplepayApplePayErroridl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/applepay/ApplePayError.idl (214828 => 214829)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/applepay/ApplePayError.idl 2017-04-03 19:04:16 UTC (rev 214828)
+++ trunk/Source/WebCore/Modules/applepay/ApplePayError.idl 2017-04-03 19:07:50 UTC (rev 214829)
</span><span class="lines">@@ -38,7 +38,8 @@
</span><span class="cx"> "phoneNumber",
</span><span class="cx"> "emailAddress",
</span><span class="cx"> "name",
</span><del>- "address",
</del><ins>+ "postalAddress",
+ "addressLines",
</ins><span class="cx"> "locality",
</span><span class="cx"> "postalCode",
</span><span class="cx"> "administrativeArea",
</span><span class="lines">@@ -46,11 +47,10 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> [
</span><del>- Constructor(ApplePayErrorCode errorCode, optional DOMString message = "", optional ApplePayErrorContactField contactField),
</del><ins>+ Constructor(ApplePayErrorCode errorCode, optional ApplePayErrorContactField contactField, optional DOMString message = ""),
</ins><span class="cx"> Conditional=APPLE_PAY_DELEGATE,
</span><span class="cx"> ] interface ApplePayError {
</span><span class="cx"> attribute ApplePayErrorCode code;
</span><ins>+ attribute ApplePayErrorContactField? contactField;
</ins><span class="cx"> attribute DOMString message;
</span><del>-
- attribute ApplePayErrorContactField? contactField;
</del><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesapplepayPaymentRequesth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/applepay/PaymentRequest.h (214828 => 214829)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/applepay/PaymentRequest.h 2017-04-03 19:04:16 UTC (rev 214828)
+++ trunk/Source/WebCore/Modules/applepay/PaymentRequest.h 2017-04-03 19:07:50 UTC (rev 214829)
</span><span class="lines">@@ -162,7 +162,8 @@
</span><span class="cx"> PhoneNumber,
</span><span class="cx"> EmailAddress,
</span><span class="cx"> Name,
</span><del>- Address,
</del><ins>+ PostalAddress,
+ AddressLines,
</ins><span class="cx"> Locality,
</span><span class="cx"> PostalCode,
</span><span class="cx"> AdministrativeArea,
</span><span class="lines">@@ -217,7 +218,8 @@
</span><span class="cx"> WebCore::PaymentError::ContactField::PhoneNumber,
</span><span class="cx"> WebCore::PaymentError::ContactField::EmailAddress,
</span><span class="cx"> WebCore::PaymentError::ContactField::Name,
</span><del>- WebCore::PaymentError::ContactField::Address,
</del><ins>+ WebCore::PaymentError::ContactField::PostalAddress,
+ WebCore::PaymentError::ContactField::AddressLines,
</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></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (214828 => 214829)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2017-04-03 19:04:16 UTC (rev 214828)
+++ trunk/Source/WebKit2/ChangeLog 2017-04-03 19:07:50 UTC (rev 214829)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2017-04-03 Anders Carlsson <andersca@apple.com>
+
+ Tweak ApplePaySession API
+ https://bugs.webkit.org/show_bug.cgi?id=170409
+ rdar://problem/31405459
+
+ Reviewed by Tim Horton.
+
+ Update for WebCore changes.
+
+ * UIProcess/ApplePay/cocoa/WebPaymentCoordinatorProxyCocoa.mm:
+ (WebKit::toNSError):
+
</ins><span class="cx"> 2017-04-03 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> [SOUP] URI Fragment is lost after redirect
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessApplePaycocoaWebPaymentCoordinatorProxyCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/ApplePay/cocoa/WebPaymentCoordinatorProxyCocoa.mm (214828 => 214829)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/ApplePay/cocoa/WebPaymentCoordinatorProxyCocoa.mm 2017-04-03 19:04:16 UTC (rev 214828)
+++ trunk/Source/WebKit2/UIProcess/ApplePay/cocoa/WebPaymentCoordinatorProxyCocoa.mm 2017-04-03 19:07:50 UTC (rev 214829)
</span><span class="lines">@@ -616,8 +616,12 @@
</span><span class="cx"> pkContactField = getPKContactFieldName();
</span><span class="cx"> break;
</span><span class="cx">
</span><del>- case WebCore::PaymentError::ContactField::Address:
</del><ins>+ case WebCore::PaymentError::ContactField::PostalAddress:
</ins><span class="cx"> pkContactField = getPKContactFieldPostalAddress();
</span><ins>+ break;
+
+ case WebCore::PaymentError::ContactField::AddressLines:
+ pkContactField = getPKContactFieldPostalAddress();
</ins><span class="cx"> postalAddressKey = getCNPostalAddressStreetKey();
</span><span class="cx"> break;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>