<!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>[203789] trunk/Source/WebCore</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/203789">203789</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2016-07-27 13:52:50 -0700 (Wed, 27 Jul 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Stop accepting the deprecated "requiredShippingAddressFields" and "requiredBillingAddressFields" properties
https://bugs.webkit.org/show_bug.cgi?id=160264
rdar://problem/27574519
Reviewed by Simon Fraser.
* Modules/applepay/ApplePaySession.cpp:
(WebCore::createPaymentRequest):
(WebCore::isValidPaymentRequestPropertyName):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesapplepayApplePaySessioncpp">trunk/Source/WebCore/Modules/applepay/ApplePaySession.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (203788 => 203789)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2016-07-27 20:51:41 UTC (rev 203788)
+++ trunk/Source/WebCore/ChangeLog        2016-07-27 20:52:50 UTC (rev 203789)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2016-07-27 Anders Carlsson <andersca@apple.com>
+
+ Stop accepting the deprecated "requiredShippingAddressFields" and "requiredBillingAddressFields" properties
+ https://bugs.webkit.org/show_bug.cgi?id=160264
+ rdar://problem/27574519
+
+ Reviewed by Simon Fraser.
+
+ * Modules/applepay/ApplePaySession.cpp:
+ (WebCore::createPaymentRequest):
+ (WebCore::isValidPaymentRequestPropertyName):
+
</ins><span class="cx"> 2016-07-27 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> First parameter to indexed property getters should be mandatory
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesapplepayApplePaySessioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/applepay/ApplePaySession.cpp (203788 => 203789)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/applepay/ApplePaySession.cpp        2016-07-27 20:51:41 UTC (rev 203788)
+++ trunk/Source/WebCore/Modules/applepay/ApplePaySession.cpp        2016-07-27 20:52:50 UTC (rev 203789)
</span><span class="lines">@@ -472,10 +472,6 @@
</span><span class="cx"> "total",
</span><span class="cx"> "lineItems",
</span><span class="cx"> "applicationData",
</span><del>-
- // FIXME: Get rid of these.
- "requiredBillingAddressFields",
- "requiredShippingAddressFields",
</del><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> for (auto& validPropertyName : validPropertyNames) {
</span><span class="lines">@@ -494,6 +490,16 @@
</span><span class="cx"> dictionary.getOwnPropertyNames(propertyNames);
</span><span class="cx">
</span><span class="cx"> for (auto& propertyName : propertyNames) {
</span><ins>+ if (propertyName == "requiredShippingAddressFields") {
+ window.printErrorMessage("\"requiredShippingAddressFields\" has been deprecated. Please switch to \"requiredShippingContactFields\" instead.");
+ return Nullopt;
+ }
+
+ if (propertyName == "requiredBillingAddressFields") {
+ window.printErrorMessage("\"requiredBillingAddressFields\" has been deprecated. Please switch to \"requiredBillingContactFields\" instead.");
+ return Nullopt;
+ }
+
</ins><span class="cx"> if (!isValidPaymentRequestPropertyName(propertyName)) {
</span><span class="cx"> auto message = makeString("\"" + propertyName, "\" is not a valid payment request property name.");
</span><span class="cx"> window.printErrorMessage(message);
</span><span class="lines">@@ -528,18 +534,8 @@
</span><span class="cx"> return Nullopt;
</span><span class="cx">
</span><span class="cx"> paymentRequest.setRequiredBillingContactFields(*requiredBillingContactFields);
</span><del>- } else if (auto requiredBillingAddressFieldsArray = dictionary.get<ArrayValue>("requiredBillingAddressFields")) {
- if (PageConsoleClient* pageConsole = window.console())
- pageConsole->addMessage(MessageSource::JS, MessageLevel::Warning, "\"requiredBillingAddressFields\" has been deprecated and will stop working shortly. Please switch to \"requiredBillingContactFields\" instead.");
-
- auto requiredBillingAddressFields = createContactFields(window, *requiredBillingAddressFieldsArray);
- if (!requiredBillingAddressFields)
- return Nullopt;
-
- paymentRequest.setRequiredBillingContactFields(*requiredBillingAddressFields);
</del><span class="cx"> }
</span><span class="cx">
</span><del>-
</del><span class="cx"> if (auto billingContactValue = dictionary.get<JSC::JSValue>("billingContact")) {
</span><span class="cx"> String errorMessage;
</span><span class="cx"> auto billingContact = PaymentContact::fromJS(*JSMainThreadExecState::currentState(), *billingContactValue, errorMessage);
</span><span class="lines">@@ -557,18 +553,8 @@
</span><span class="cx"> return Nullopt;
</span><span class="cx">
</span><span class="cx"> paymentRequest.setRequiredShippingContactFields(*requiredShippingContactFields);
</span><del>- } else if (auto requiredShippingAddressFieldsArray = dictionary.get<ArrayValue>("requiredShippingAddressFields")) {
- if (PageConsoleClient* pageConsole = window.console())
- pageConsole->addMessage(MessageSource::JS, MessageLevel::Warning, "\"requiredShippingAddressFields\" has been deprecated and will stop working shortly. Please switch to \"requiredShippingContactFields\" instead.");
-
- auto requiredShippingAddressFields = createContactFields(window, *requiredShippingAddressFieldsArray);
- if (!requiredShippingAddressFields)
- return Nullopt;
-
- paymentRequest.setRequiredShippingContactFields(*requiredShippingAddressFields);
</del><span class="cx"> }
</span><span class="cx">
</span><del>-
</del><span class="cx"> if (auto shippingContactValue = dictionary.get<JSC::JSValue>("shippingContact")) {
</span><span class="cx"> String errorMessage;
</span><span class="cx"> auto shippingContact = PaymentContact::fromJS(*JSMainThreadExecState::currentState(), *shippingContactValue, errorMessage);
</span></span></pre>
</div>
</div>
</body>
</html>