Diff
Modified: trunk/LayoutTests/ChangeLog (235348 => 235349)
--- trunk/LayoutTests/ChangeLog 2018-08-27 02:54:13 UTC (rev 235348)
+++ trunk/LayoutTests/ChangeLog 2018-08-27 03:32:48 UTC (rev 235349)
@@ -1,5 +1,23 @@
2018-08-26 Andy Estes <[email protected]>
+ [Apple Pay] Introduce new values for -apple-pay-button-type
+ https://bugs.webkit.org/show_bug.cgi?id=188949
+ <rdar://problem/39992228>
+
+ Reviewed by Anders Carlsson.
+
+ * http/tests/ssl/applepay/ApplePayButton.html: Added.
+ * http/tests/ssl/applepay/ApplePayButtonV4.html: Added.
+ * platform/mac-highsierra/http/tests/ssl/applepay/ApplePayButton-expected.png:
+ * platform/mac-highsierra/http/tests/ssl/applepay/ApplePayButton-expected.txt:
+ * platform/mac/http/tests/ssl/applepay/ApplePayButton-expected.png: Added.
+ * platform/mac/http/tests/ssl/applepay/ApplePayButton-expected.txt: Added.
+ * platform/mac/http/tests/ssl/applepay/ApplePayButtonV4-expected.png: Added.
+ * platform/mac/http/tests/ssl/applepay/ApplePayButtonV4-expected.txt: Added.
+ * platform/mac-wk2/TestExpectations:
+
+2018-08-26 Andy Estes <[email protected]>
+
Update test expectations for http/tests/ssl/applepay/ApplePayButton.html on macOS High Sierra.
* platform/mac-highsierra/http/tests/ssl/applepay/ApplePayButton-expected.png: Renamed from LayoutTests/platform/mac-sierra/http/tests/ssl/applepay/ApplePayButton-expected.png.
Modified: trunk/LayoutTests/http/tests/ssl/applepay/ApplePayButton.html (235348 => 235349)
--- trunk/LayoutTests/http/tests/ssl/applepay/ApplePayButton.html 2018-08-27 02:54:13 UTC (rev 235348)
+++ trunk/LayoutTests/http/tests/ssl/applepay/ApplePayButton.html 2018-08-27 03:32:48 UTC (rev 235349)
@@ -33,6 +33,10 @@
-apple-pay-button-type: set-up;
}
+ .in-store {
+ -apple-pay-button-type: in-store;
+ }
+
.donate {
-apple-pay-button-type: donate;
}
@@ -41,7 +45,7 @@
<body>
<script>
for (let style of ["white", "white-outline", "black"]) {
- for (let type of ["plain", "buy", "set-up", "donate"]) {
+ for (let type of ["plain", "buy", "set-up", "in-store", "donate"]) {
var button = document.createElement("button");
button.classList.add("apple-pay-button", style, type);
document.body.appendChild(button);
Copied: trunk/LayoutTests/http/tests/ssl/applepay/ApplePayButtonV4.html (from rev 235348, trunk/LayoutTests/http/tests/ssl/applepay/ApplePayButton.html) (0 => 235349)
--- trunk/LayoutTests/http/tests/ssl/applepay/ApplePayButtonV4.html (rev 0)
+++ trunk/LayoutTests/http/tests/ssl/applepay/ApplePayButtonV4.html 2018-08-27 03:32:48 UTC (rev 235349)
@@ -0,0 +1,48 @@
+<!DOCTYPE html>
+<html>
+<head>
+ <meta charset="utf-8">
+ <title>Test rendering Apple Pay buttons in version 4</title>
+ <style>
+ .apple-pay-button {
+ -webkit-appearance: -apple-pay-button;
+ display: block;
+ }
+
+ .white {
+ -apple-pay-button-style: white;
+ }
+
+ .white-outline {
+ -apple-pay-button-style: white-outline;
+ }
+
+ .black {
+ -apple-pay-button-style: black;
+ }
+
+ .checkout {
+ -apple-pay-button-type: checkout;
+ }
+
+ .book {
+ -apple-pay-button-type: book;
+ }
+
+ .subscribe {
+ -apple-pay-button-type: subscribe;
+ }
+ </style>
+</head>
+<body>
+ <script>
+ for (let style of ["white", "white-outline", "black"]) {
+ for (let type of ["checkout", "book", "subscribe"]) {
+ var button = document.createElement("button");
+ button.classList.add("apple-pay-button", style, type);
+ document.body.appendChild(button);
+ }
+ }
+ </script>
+</body>
+</html>
Modified: trunk/LayoutTests/platform/mac/http/tests/ssl/applepay/ApplePayButton-expected.png
(Binary files differ)
Modified: trunk/LayoutTests/platform/mac/http/tests/ssl/applepay/ApplePayButton-expected.txt (235348 => 235349)
--- trunk/LayoutTests/platform/mac/http/tests/ssl/applepay/ApplePayButton-expected.txt 2018-08-27 02:54:13 UTC (rev 235348)
+++ trunk/LayoutTests/platform/mac/http/tests/ssl/applepay/ApplePayButton-expected.txt 2018-08-27 03:32:48 UTC (rev 235349)
@@ -1,17 +1,20 @@
layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
-layer at (0,0) size 800x398
- RenderBlock {HTML} at (0,0) size 800x398
- RenderBody {BODY} at (8,8) size 784x382
+layer at (0,0) size 800x494
+ RenderBlock {HTML} at (0,0) size 800x494
+ RenderBody {BODY} at (8,8) size 784x478
RenderButton {BUTTON} at (2,0) size 100x30 [color=#000000D8] [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0)]
RenderButton {BUTTON} at (2,32) size 140x30 [color=#000000D8] [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0)]
RenderButton {BUTTON} at (2,64) size 140x30 [color=#000000D8] [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0)]
RenderButton {BUTTON} at (2,96) size 140x30 [color=#000000D8] [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0)]
- RenderButton {BUTTON} at (2,128) size 100x30 [color=#000000D8] [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0)]
- RenderButton {BUTTON} at (2,160) size 140x30 [color=#000000D8] [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0)]
+ RenderButton {BUTTON} at (2,128) size 140x30 [color=#000000D8] [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0)]
+ RenderButton {BUTTON} at (2,160) size 100x30 [color=#000000D8] [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0)]
RenderButton {BUTTON} at (2,192) size 140x30 [color=#000000D8] [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0)]
RenderButton {BUTTON} at (2,224) size 140x30 [color=#000000D8] [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0)]
- RenderButton {BUTTON} at (2,256) size 100x30 [color=#000000D8] [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0)]
+ RenderButton {BUTTON} at (2,256) size 140x30 [color=#000000D8] [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0)]
RenderButton {BUTTON} at (2,288) size 140x30 [color=#000000D8] [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0)]
- RenderButton {BUTTON} at (2,320) size 140x30 [color=#000000D8] [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0)]
+ RenderButton {BUTTON} at (2,320) size 100x30 [color=#000000D8] [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0)]
RenderButton {BUTTON} at (2,352) size 140x30 [color=#000000D8] [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0)]
+ RenderButton {BUTTON} at (2,384) size 140x30 [color=#000000D8] [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0)]
+ RenderButton {BUTTON} at (2,416) size 140x30 [color=#000000D8] [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0)]
+ RenderButton {BUTTON} at (2,448) size 140x30 [color=#000000D8] [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0)]
Added: trunk/LayoutTests/platform/mac/http/tests/ssl/applepay/ApplePayButtonV4-expected.png
(Binary files differ)
--- trunk/LayoutTests/platform/mac/http/tests/ssl/applepay/ApplePayButtonV4-expected.png 2018-08-27 02:54:13 UTC (rev 235348)
+++ trunk/LayoutTests/platform/mac/http/tests/ssl/applepay/ApplePayButtonV4-expected.png 2018-08-27 03:32:48 UTC (rev 235349)
Property changes on: trunk/LayoutTests/platform/mac/http/tests/ssl/applepay/ApplePayButtonV4-expected.png
___________________________________________________________________
Added: svn:mime-type
+image/png
\ No newline at end of property
Copied: trunk/LayoutTests/platform/mac/http/tests/ssl/applepay/ApplePayButtonV4-expected.txt (from rev 235348, trunk/LayoutTests/platform/mac/http/tests/ssl/applepay/ApplePayButton-expected.txt) (0 => 235349)
--- trunk/LayoutTests/platform/mac/http/tests/ssl/applepay/ApplePayButtonV4-expected.txt (rev 0)
+++ trunk/LayoutTests/platform/mac/http/tests/ssl/applepay/ApplePayButtonV4-expected.txt 2018-08-27 03:32:48 UTC (rev 235349)
@@ -0,0 +1,14 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x302
+ RenderBlock {HTML} at (0,0) size 800x302
+ RenderBody {BODY} at (8,8) size 784x286
+ RenderButton {BUTTON} at (2,0) size 140x30 [color=#000000D8] [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0)]
+ RenderButton {BUTTON} at (2,32) size 140x30 [color=#000000D8] [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0)]
+ RenderButton {BUTTON} at (2,64) size 140x30 [color=#000000D8] [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0)]
+ RenderButton {BUTTON} at (2,96) size 140x30 [color=#000000D8] [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0)]
+ RenderButton {BUTTON} at (2,128) size 140x30 [color=#000000D8] [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0)]
+ RenderButton {BUTTON} at (2,160) size 140x30 [color=#000000D8] [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0)]
+ RenderButton {BUTTON} at (2,192) size 140x30 [color=#000000D8] [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0)]
+ RenderButton {BUTTON} at (2,224) size 140x30 [color=#000000D8] [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0)]
+ RenderButton {BUTTON} at (2,256) size 140x30 [color=#000000D8] [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0)]
Modified: trunk/LayoutTests/platform/mac-highsierra/http/tests/ssl/applepay/ApplePayButton-expected.png
(Binary files differ)
Modified: trunk/LayoutTests/platform/mac-highsierra/http/tests/ssl/applepay/ApplePayButton-expected.txt (235348 => 235349)
--- trunk/LayoutTests/platform/mac-highsierra/http/tests/ssl/applepay/ApplePayButton-expected.txt 2018-08-27 02:54:13 UTC (rev 235348)
+++ trunk/LayoutTests/platform/mac-highsierra/http/tests/ssl/applepay/ApplePayButton-expected.txt 2018-08-27 03:32:48 UTC (rev 235349)
@@ -1,17 +1,20 @@
layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
-layer at (0,0) size 800x398
- RenderBlock {HTML} at (0,0) size 800x398
- RenderBody {BODY} at (8,8) size 784x382
+layer at (0,0) size 800x494
+ RenderBlock {HTML} at (0,0) size 800x494
+ RenderBody {BODY} at (8,8) size 784x478
RenderButton {BUTTON} at (2,0) size 100x30 [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0)]
RenderButton {BUTTON} at (2,32) size 140x30 [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0)]
RenderButton {BUTTON} at (2,64) size 140x30 [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0)]
RenderButton {BUTTON} at (2,96) size 140x30 [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0)]
- RenderButton {BUTTON} at (2,128) size 100x30 [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0)]
- RenderButton {BUTTON} at (2,160) size 140x30 [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0)]
+ RenderButton {BUTTON} at (2,128) size 140x30 [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0)]
+ RenderButton {BUTTON} at (2,160) size 100x30 [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0)]
RenderButton {BUTTON} at (2,192) size 140x30 [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0)]
RenderButton {BUTTON} at (2,224) size 140x30 [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0)]
- RenderButton {BUTTON} at (2,256) size 100x30 [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0)]
+ RenderButton {BUTTON} at (2,256) size 140x30 [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0)]
RenderButton {BUTTON} at (2,288) size 140x30 [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0)]
- RenderButton {BUTTON} at (2,320) size 140x30 [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0)]
+ RenderButton {BUTTON} at (2,320) size 100x30 [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0)]
RenderButton {BUTTON} at (2,352) size 140x30 [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0)]
+ RenderButton {BUTTON} at (2,384) size 140x30 [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0)]
+ RenderButton {BUTTON} at (2,416) size 140x30 [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0)]
+ RenderButton {BUTTON} at (2,448) size 140x30 [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0)]
Modified: trunk/LayoutTests/platform/mac-wk2/TestExpectations (235348 => 235349)
--- trunk/LayoutTests/platform/mac-wk2/TestExpectations 2018-08-27 02:54:13 UTC (rev 235348)
+++ trunk/LayoutTests/platform/mac-wk2/TestExpectations 2018-08-27 03:32:48 UTC (rev 235349)
@@ -21,10 +21,12 @@
fast/media/mq-prefers-reduced-motion-live-update.html [ Pass ]
[ Sierra+ ] http/tests/ssl/applepay/ [ Pass ]
+[ Sierra ] http/tests/ssl/applepay/ApplePayButtonV4.html [ Skip ]
[ Sierra ] http/tests/ssl/applepay/ApplePayError.html [ Skip ]
[ Sierra ] http/tests/ssl/applepay/ApplePaySessionV3.html [ Skip ]
[ Sierra ] http/tests/ssl/applepay/ApplePaySessionV4.html [ Skip ]
[ Sierra ] http/tests/ssl/applepay/ApplePayRequestShippingContactV3.https.html [ Skip ]
+[ HighSierra ] http/tests/ssl/applepay/ApplePayButtonV4.html [ Skip ]
[ HighSierra ] http/tests/ssl/applepay/ApplePaySessionV4.html [ Skip ]
fast/visual-viewport/rubberbanding-viewport-rects.html [ Pass ]
Modified: trunk/Source/WebCore/ChangeLog (235348 => 235349)
--- trunk/Source/WebCore/ChangeLog 2018-08-27 02:54:13 UTC (rev 235348)
+++ trunk/Source/WebCore/ChangeLog 2018-08-27 03:32:48 UTC (rev 235349)
@@ -1,3 +1,27 @@
+2018-08-26 Andy Estes <[email protected]>
+
+ [Apple Pay] Introduce new values for -apple-pay-button-type
+ https://bugs.webkit.org/show_bug.cgi?id=188949
+ <rdar://problem/39992228>
+
+ Reviewed by Anders Carlsson.
+
+ Added "in-store", "checkout", "book", and "subscribe" keywords for -apple-pay-button-type,
+ and mapped those values to their equivalent PKPaymentButtonTypes.
+
+ Tests: http/tests/ssl/applepay/ApplePayButton.html
+ http/tests/ssl/applepay/ApplePayButtonV4.html
+
+ * css/CSSPrimitiveValueMappings.h:
+ (WebCore::CSSPrimitiveValue::CSSPrimitiveValue):
+ (WebCore::CSSPrimitiveValue::operator ApplePayButtonType const):
+ * css/CSSValueKeywords.in:
+ * css/parser/CSSParserFastPaths.cpp:
+ (WebCore::CSSParserFastPaths::isValidKeywordPropertyAndValue):
+ * rendering/RenderThemeCocoa.mm:
+ (WebCore::toPKPaymentButtonType):
+ * rendering/style/RenderStyleConstants.h:
+
2018-08-26 Youenn Fablet <[email protected]>
Make IDBCursor::m_request a WeakPtr
Modified: trunk/Source/WebCore/PAL/ChangeLog (235348 => 235349)
--- trunk/Source/WebCore/PAL/ChangeLog 2018-08-27 02:54:13 UTC (rev 235348)
+++ trunk/Source/WebCore/PAL/ChangeLog 2018-08-27 03:32:48 UTC (rev 235349)
@@ -1,3 +1,13 @@
+2018-08-26 Andy Estes <[email protected]>
+
+ [Apple Pay] Introduce new values for -apple-pay-button-type
+ https://bugs.webkit.org/show_bug.cgi?id=188949
+ <rdar://problem/39992228>
+
+ Reviewed by Anders Carlsson.
+
+ * pal/spi/cocoa/PassKitSPI.h:
+
2018-08-23 Andy Estes <[email protected]>
[Apple Pay] Introduce Apple Pay JS v4 on iOS 12 and macOS Mojave
Modified: trunk/Source/WebCore/PAL/pal/spi/cocoa/PassKitSPI.h (235348 => 235349)
--- trunk/Source/WebCore/PAL/pal/spi/cocoa/PassKitSPI.h 2018-08-27 02:54:13 UTC (rev 235348)
+++ trunk/Source/WebCore/PAL/pal/spi/cocoa/PassKitSPI.h 2018-08-27 03:32:48 UTC (rev 235349)
@@ -275,6 +275,12 @@
PKPaymentButtonTypeBuy,
PKPaymentButtonTypeSetUp,
PKPaymentButtonTypeInStore,
+ PKPaymentButtonTypeDonate,
+#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MAX_ALLOWED >= 101400) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 120000)
+ PKPaymentButtonTypeCheckout,
+ PKPaymentButtonTypeBook,
+ PKPaymentButtonTypeSubscribe,
+#endif
};
#endif
Modified: trunk/Source/WebCore/css/CSSPrimitiveValueMappings.h (235348 => 235349)
--- trunk/Source/WebCore/css/CSSPrimitiveValueMappings.h 2018-08-27 02:54:13 UTC (rev 235348)
+++ trunk/Source/WebCore/css/CSSPrimitiveValueMappings.h 2018-08-27 03:32:48 UTC (rev 235349)
@@ -5475,9 +5475,23 @@
case ApplePayButtonType::SetUp:
m_value.valueID = CSSValueSetUp;
break;
+ case ApplePayButtonType::InStore:
+ m_value.valueID = CSSValueInStore;
+ break;
case ApplePayButtonType::Donate:
m_value.valueID = CSSValueDonate;
break;
+#if ENABLE(APPLE_PAY_SESSION_V4)
+ case ApplePayButtonType::Checkout:
+ m_value.valueID = CSSValueCheckout;
+ break;
+ case ApplePayButtonType::Book:
+ m_value.valueID = CSSValueBook;
+ break;
+ case ApplePayButtonType::Subscribe:
+ m_value.valueID = CSSValueSubscribe;
+ break;
+#endif
default:
ASSERT_NOT_REACHED();
@@ -5495,8 +5509,18 @@
return ApplePayButtonType::Buy;
case CSSValueSetUp:
return ApplePayButtonType::SetUp;
+ case CSSValueInStore:
+ return ApplePayButtonType::InStore;
case CSSValueDonate:
return ApplePayButtonType::Donate;
+#if ENABLE(APPLE_PAY_SESSION_V4)
+ case CSSValueCheckout:
+ return ApplePayButtonType::Checkout;
+ case CSSValueBook:
+ return ApplePayButtonType::Book;
+ case CSSValueSubscribe:
+ return ApplePayButtonType::Subscribe;
+#endif
default:
break;
}
Modified: trunk/Source/WebCore/css/CSSValueKeywords.in (235348 => 235349)
--- trunk/Source/WebCore/css/CSSValueKeywords.in 2018-08-27 02:54:13 UTC (rev 235348)
+++ trunk/Source/WebCore/css/CSSValueKeywords.in 2018-08-27 03:32:48 UTC (rev 235349)
@@ -1334,8 +1334,14 @@
plain
buy
set-up
+in-store
donate
+#if defined(ENABLE_APPLE_PAY_SESSION_V4) && ENABLE_APPLE_PAY_SESSION_V4
+checkout
+book
+subscribe
#endif
+#endif
// font-synthesis
weight
Modified: trunk/Source/WebCore/css/parser/CSSParserFastPaths.cpp (235348 => 235349)
--- trunk/Source/WebCore/css/parser/CSSParserFastPaths.cpp 2018-08-27 02:54:13 UTC (rev 235348)
+++ trunk/Source/WebCore/css/parser/CSSParserFastPaths.cpp 2018-08-27 03:32:48 UTC (rev 235349)
@@ -769,9 +769,15 @@
#if ENABLE(APPLE_PAY)
case CSSPropertyApplePayButtonStyle: // white | white-outline | black
return valueID == CSSValueWhite || valueID == CSSValueWhiteOutline || valueID == CSSValueBlack;
- case CSSPropertyApplePayButtonType: // plain | buy | set-up | donate
- return valueID == CSSValuePlain || valueID == CSSValueBuy || valueID == CSSValueSetUp || valueID == CSSValueDonate;
+ case CSSPropertyApplePayButtonType: // plain | buy | set-up | in-store | donate | checkout | book | subscribe
+ if (valueID == CSSValuePlain || valueID == CSSValueBuy || valueID == CSSValueSetUp || valueID == CSSValueInStore || valueID == CSSValueDonate)
+ return true;
+#if ENABLE(APPLE_PAY_SESSION_V4)
+ return valueID == CSSValueCheckout || valueID == CSSValueBook || valueID == CSSValueSubscribe;
+#else
+ return false;
#endif
+#endif
case CSSPropertyWebkitNbspMode: // normal | space
return valueID == CSSValueNormal || valueID == CSSValueSpace;
case CSSPropertyWebkitTextZoom:
Modified: trunk/Source/WebCore/rendering/RenderThemeCocoa.mm (235348 => 235349)
--- trunk/Source/WebCore/rendering/RenderThemeCocoa.mm 2018-08-27 02:54:13 UTC (rev 235348)
+++ trunk/Source/WebCore/rendering/RenderThemeCocoa.mm 2018-08-27 03:32:48 UTC (rev 235349)
@@ -87,9 +87,18 @@
return PKPaymentButtonTypeBuy;
case ApplePayButtonType::SetUp:
return PKPaymentButtonTypeSetUp;
+ case ApplePayButtonType::InStore:
+ return PKPaymentButtonTypeInStore;
case ApplePayButtonType::Donate:
- // FIXME: Use a named constant here.
- return (PKPaymentButtonType)4;
+ return PKPaymentButtonTypeDonate;
+#if ENABLE(APPLE_PAY_SESSION_V4)
+ case ApplePayButtonType::Checkout:
+ return PKPaymentButtonTypeCheckout;
+ case ApplePayButtonType::Book:
+ return PKPaymentButtonTypeBook;
+ case ApplePayButtonType::Subscribe:
+ return PKPaymentButtonTypeSubscribe;
+#endif
}
}
Modified: trunk/Source/WebCore/rendering/style/RenderStyleConstants.h (235348 => 235349)
--- trunk/Source/WebCore/rendering/style/RenderStyleConstants.h 2018-08-27 02:54:13 UTC (rev 235348)
+++ trunk/Source/WebCore/rendering/style/RenderStyleConstants.h 2018-08-27 03:32:48 UTC (rev 235349)
@@ -1126,7 +1126,13 @@
Plain,
Buy,
SetUp,
+ InStore,
Donate,
+#if ENABLE(APPLE_PAY_SESSION_V4)
+ Checkout,
+ Book,
+ Subscribe,
+#endif
};
#endif
