<!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>[210140] 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/210140">210140</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-12-23 14:01:12 -0800 (Fri, 23 Dec 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add missing std::optional to ApplePayPaymentRequest.lineItems
https://bugs.webkit.org/show_bug.cgi?id=166468
Patch by Sam Weinig <sam@webkit.org> on 2016-12-23
Reviewed by Alexey Proskuryakov.
No functional change, but is more consistent.
* Modules/applepay/ApplePayPaymentRequest.h:
Remove unnecessary #include of <heap/Strong.h>, add std::optional to lineItems.
* Modules/applepay/ApplePaySession.cpp:
(WebCore::convertAndValidate):
Update to deal with optional line items, remove unnecessary comment.
* Modules/applepay/ApplePaySession.h:
Remove unneeded forward declarations.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesapplepayApplePayPaymentRequesth">trunk/Source/WebCore/Modules/applepay/ApplePayPaymentRequest.h</a></li>
<li><a href="#trunkSourceWebCoreModulesapplepayApplePaySessioncpp">trunk/Source/WebCore/Modules/applepay/ApplePaySession.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesapplepayApplePaySessionh">trunk/Source/WebCore/Modules/applepay/ApplePaySession.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (210139 => 210140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-12-23 19:45:46 UTC (rev 210139)
+++ trunk/Source/WebCore/ChangeLog 2016-12-23 22:01:12 UTC (rev 210140)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2016-12-23 Sam Weinig <sam@webkit.org>
+
+ Add missing std::optional to ApplePayPaymentRequest.lineItems
+ https://bugs.webkit.org/show_bug.cgi?id=166468
+
+ Reviewed by Alexey Proskuryakov.
+
+ No functional change, but is more consistent.
+
+ * Modules/applepay/ApplePayPaymentRequest.h:
+ Remove unnecessary #include of <heap/Strong.h>, add std::optional to lineItems.
+
+ * Modules/applepay/ApplePaySession.cpp:
+ (WebCore::convertAndValidate):
+ Update to deal with optional line items, remove unnecessary comment.
+
+ * Modules/applepay/ApplePaySession.h:
+ Remove unneeded forward declarations.
+
</ins><span class="cx"> 2016-12-22 Sam Weinig <sam@webkit.org>
</span><span class="cx">
</span><span class="cx"> [WebIDL] Remove custom bindings for WebSQL code
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesapplepayApplePayPaymentRequesth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/applepay/ApplePayPaymentRequest.h (210139 => 210140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/applepay/ApplePayPaymentRequest.h 2016-12-23 19:45:46 UTC (rev 210139)
+++ trunk/Source/WebCore/Modules/applepay/ApplePayPaymentRequest.h 2016-12-23 22:01:12 UTC (rev 210140)
</span><span class="lines">@@ -31,7 +31,6 @@
</span><span class="cx"> #include "ApplePayPaymentContact.h"
</span><span class="cx"> #include "ApplePayShippingMethod.h"
</span><span class="cx"> #include "PaymentRequest.h"
</span><del>-#include <heap/Strong.h>
</del><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="lines">@@ -56,7 +55,7 @@
</span><span class="cx"> std::optional<Vector<ApplePayShippingMethod>> shippingMethods;
</span><span class="cx">
</span><span class="cx"> ApplePayLineItem total;
</span><del>- Vector<ApplePayLineItem> lineItems;
</del><ins>+ std::optional<Vector<ApplePayLineItem>> lineItems;
</ins><span class="cx">
</span><span class="cx"> String applicationData;
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesapplepayApplePaySessioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/applepay/ApplePaySession.cpp (210139 => 210140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/applepay/ApplePaySession.cpp 2016-12-23 19:45:46 UTC (rev 210139)
+++ trunk/Source/WebCore/Modules/applepay/ApplePaySession.cpp 2016-12-23 22:01:12 UTC (rev 210140)
</span><span class="lines">@@ -176,12 +176,15 @@
</span><span class="cx"> return WTFMove(result);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static ExceptionOr<Vector<PaymentRequest::LineItem>> convertAndValidate(Vector<ApplePayLineItem>&& lineItems)
</del><ins>+static ExceptionOr<Vector<PaymentRequest::LineItem>> convertAndValidate(std::optional<Vector<ApplePayLineItem>>&& lineItems)
</ins><span class="cx"> {
</span><span class="cx"> Vector<PaymentRequest::LineItem> result;
</span><del>- result.reserveInitialCapacity(lineItems.size());
</del><ins>+ if (!lineItems)
+ return WTFMove(result);
+
+ result.reserveInitialCapacity(lineItems->size());
</ins><span class="cx">
</span><del>- for (auto lineItem : lineItems) {
</del><ins>+ for (auto lineItem : lineItems.value()) {
</ins><span class="cx"> auto convertedLineItem = convertAndValidate(WTFMove(lineItem));
</span><span class="cx"> if (convertedLineItem.hasException())
</span><span class="cx"> return convertedLineItem.releaseException();
</span><span class="lines">@@ -300,7 +303,6 @@
</span><span class="cx"> return total.releaseException();
</span><span class="cx"> result.setTotal(total.releaseReturnValue());
</span><span class="cx">
</span><del>- // FIXME: Should this swallow exceptions like the old code seemed to do?
</del><span class="cx"> auto lineItems = convertAndValidate(WTFMove(paymentRequest.lineItems));
</span><span class="cx"> if (lineItems.hasException())
</span><span class="cx"> return lineItems.releaseException();
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesapplepayApplePaySessionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/applepay/ApplePaySession.h (210139 => 210140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/applepay/ApplePaySession.h 2016-12-23 19:45:46 UTC (rev 210139)
+++ trunk/Source/WebCore/Modules/applepay/ApplePaySession.h 2016-12-23 22:01:12 UTC (rev 210140)
</span><span class="lines">@@ -34,6 +34,11 @@
</span><span class="cx"> #include <wtf/Ref.h>
</span><span class="cx"> #include <wtf/RefCounted.h>
</span><span class="cx">
</span><ins>+namespace JSC {
+class ExecState;
+class JSValue;
+}
+
</ins><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> class DeferredPromise;
</span></span></pre>
</div>
</div>
</body>
</html>