<!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>[278437] 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/278437">278437</a></dd>
<dt>Author</dt> <dd>drousso@apple.com</dd>
<dt>Date</dt> <dd>2021-06-03 17:35:06 -0700 (Thu, 03 Jun 2021)</dd>
</dl>

<h3>Log Message</h3>
<pre>[Payment Request] allow additional line items and/or an override total to be specified in `ApplePayModifier`
https://bugs.webkit.org/show_bug.cgi?id=226597
<rdar://problem/78835065>

Reviewed by Wenson Hsieh.

Instead of merging properties of the first applicable `PaymentDetailsModifier` (or more
specifically the related `ApplePayModifier` with only the `total` line item, add `total`
and `additionalLineItems` properties to `ApplePayModifier` that are `ApplePayLineItem`.

* Modules/applepay/paymentrequest/ApplePayModifier.idl:
* Modules/applepay/paymentrequest/ApplePayModifier.h:
Drive-by: Rename `additionalShippingOptions` to `additionalShippingMethods` to emphasize
          that the values are `ApplePayShippingMethod` instead of `PaymentShippingOption`.

* Modules/applepay/paymentrequest/ApplePayPaymentHandler.cpp:
(WebCore::ApplePayPaymentHandler::computeShippingMethods const):
(WebCore::ApplePayPaymentHandler::computeTotalAndLineItems const):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesapplepaypaymentrequestApplePayModifierh">trunk/Source/WebCore/Modules/applepay/paymentrequest/ApplePayModifier.h</a></li>
<li><a href="#trunkSourceWebCoreModulesapplepaypaymentrequestApplePayModifieridl">trunk/Source/WebCore/Modules/applepay/paymentrequest/ApplePayModifier.idl</a></li>
<li><a href="#trunkSourceWebCoreModulesapplepaypaymentrequestApplePayPaymentHandlercpp">trunk/Source/WebCore/Modules/applepay/paymentrequest/ApplePayPaymentHandler.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (278436 => 278437)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2021-06-04 00:31:45 UTC (rev 278436)
+++ trunk/Source/WebCore/ChangeLog      2021-06-04 00:35:06 UTC (rev 278437)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2021-06-03  Devin Rousso  <drousso@apple.com>
+
+        [Payment Request] allow additional line items and/or an override total to be specified in `ApplePayModifier`
+        https://bugs.webkit.org/show_bug.cgi?id=226597
+        <rdar://problem/78835065>
+
+        Reviewed by Wenson Hsieh.
+
+        Instead of merging properties of the first applicable `PaymentDetailsModifier` (or more
+        specifically the related `ApplePayModifier` with only the `total` line item, add `total`
+        and `additionalLineItems` properties to `ApplePayModifier` that are `ApplePayLineItem`.
+
+        * Modules/applepay/paymentrequest/ApplePayModifier.idl:
+        * Modules/applepay/paymentrequest/ApplePayModifier.h:
+        Drive-by: Rename `additionalShippingOptions` to `additionalShippingMethods` to emphasize
+                  that the values are `ApplePayShippingMethod` instead of `PaymentShippingOption`.
+
+        * Modules/applepay/paymentrequest/ApplePayPaymentHandler.cpp:
+        (WebCore::ApplePayPaymentHandler::computeShippingMethods const):
+        (WebCore::ApplePayPaymentHandler::computeTotalAndLineItems const):
+
</ins><span class="cx"> 2021-06-03  Chris Lord  <clord@igalia.com>
</span><span class="cx"> 
</span><span class="cx">         [WPE] position:sticky content is not correctly offset on async scrolled overflow layers with an RTL vertical scrollbar
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesapplepaypaymentrequestApplePayModifierh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/applepay/paymentrequest/ApplePayModifier.h (278436 => 278437)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/applepay/paymentrequest/ApplePayModifier.h  2021-06-04 00:31:45 UTC (rev 278436)
+++ trunk/Source/WebCore/Modules/applepay/paymentrequest/ApplePayModifier.h     2021-06-04 00:35:06 UTC (rev 278437)
</span><span class="lines">@@ -27,6 +27,7 @@
</span><span class="cx"> 
</span><span class="cx"> #if ENABLE(APPLE_PAY) && ENABLE(PAYMENT_REQUEST)
</span><span class="cx"> 
</span><ins>+#include "ApplePayLineItem.h"
</ins><span class="cx"> #include "ApplePayPaymentMethodType.h"
</span><span class="cx"> #include "ApplePayShippingMethod.h"
</span><span class="cx"> 
</span><span class="lines">@@ -38,7 +39,9 @@
</span><span class="cx"> 
</span><span class="cx"> struct ApplePayModifier {
</span><span class="cx">     std::optional<ApplePayPaymentMethodType> paymentMethodType;
</span><del>-    Vector<ApplePayShippingMethod> additionalShippingOptions;
</del><ins>+    std::optional<ApplePayLineItem> total;
+    Vector<ApplePayLineItem> additionalLineItems;
+    Vector<ApplePayShippingMethod> additionalShippingMethods;
</ins><span class="cx"> 
</span><span class="cx"> #if defined(ApplePayModifierAdditions_members)
</span><span class="cx">     ApplePayModifierAdditions_members
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesapplepaypaymentrequestApplePayModifieridl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/applepay/paymentrequest/ApplePayModifier.idl (278436 => 278437)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/applepay/paymentrequest/ApplePayModifier.idl        2021-06-04 00:31:45 UTC (rev 278436)
+++ trunk/Source/WebCore/Modules/applepay/paymentrequest/ApplePayModifier.idl   2021-06-04 00:35:06 UTC (rev 278437)
</span><span class="lines">@@ -27,5 +27,7 @@
</span><span class="cx">     Conditional=APPLE_PAY&PAYMENT_REQUEST,
</span><span class="cx"> ] dictionary ApplePayModifier {
</span><span class="cx">     ApplePayPaymentMethodType paymentMethodType;
</span><del>-    sequence<ApplePayShippingMethod> additionalShippingOptions;
</del><ins>+    ApplePayLineItem total;
+    sequence<ApplePayLineItem> additionalLineItems;
+    sequence<ApplePayShippingMethod> additionalShippingMethods;
</ins><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesapplepaypaymentrequestApplePayPaymentHandlercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/applepay/paymentrequest/ApplePayPaymentHandler.cpp (278436 => 278437)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/applepay/paymentrequest/ApplePayPaymentHandler.cpp  2021-06-04 00:31:45 UTC (rev 278436)
+++ trunk/Source/WebCore/Modules/applepay/paymentrequest/ApplePayPaymentHandler.cpp     2021-06-04 00:35:06 UTC (rev 278437)
</span><span class="lines">@@ -311,16 +311,11 @@
</span><span class="cx">     if (modifierException.hasException())
</span><span class="cx">         return modifierException.releaseException();
</span><span class="cx">     if (auto modifierData = modifierException.releaseReturnValue())
</span><del>-        shippingOptions.appendVector(WTFMove(std::get<1>(*modifierData).additionalShippingOptions));
</del><ins>+        shippingOptions.appendVector(WTFMove(std::get<1>(*modifierData).additionalShippingMethods));
</ins><span class="cx"> 
</span><span class="cx">     return WTFMove(shippingOptions);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-
-#if !ENABLE(APPLE_PAY_LINE_ITEM_DATA)
-static void merge(ApplePayLineItem&, ApplePayModifier&&) { }
-#endif // !ENABLE(APPLE_PAY_LINE_ITEM_DATA)
-
</del><span class="cx"> ExceptionOr<std::tuple<ApplePayLineItem, Vector<ApplePayLineItem>>> ApplePayPaymentHandler::computeTotalAndLineItems() const
</span><span class="cx"> {
</span><span class="cx">     auto& details = m_paymentRequest->paymentDetails();
</span><span class="lines">@@ -357,7 +352,10 @@
</span><span class="cx">             return additionalDisplayItems.releaseException();
</span><span class="cx">         lineItems.appendVector(additionalDisplayItems.releaseReturnValue());
</span><span class="cx"> 
</span><del>-        merge(total, WTFMove(applePayModifier));
</del><ins>+        if (applePayModifier.total)
+            total = *applePayModifier.total;
+
+        lineItems.appendVector(applePayModifier.additionalLineItems);
</ins><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx">     return {{ WTFMove(total), WTFMove(lineItems) }};
</span></span></pre>
</div>
</div>

</body>
</html>