Diff
Modified: trunk/LayoutTests/ChangeLog (262527 => 262528)
--- trunk/LayoutTests/ChangeLog 2020-06-04 01:05:36 UTC (rev 262527)
+++ trunk/LayoutTests/ChangeLog 2020-06-04 01:57:38 UTC (rev 262528)
@@ -1,3 +1,19 @@
+2020-06-03 Andy Estes <[email protected]>
+
+ [Apple Pay] Add new values for -apple-pay-button-type
+ https://bugs.webkit.org/show_bug.cgi?id=212684
+ <rdar://problem/63908535>
+
+ Reviewed by Anders Carlsson.
+
+ * http/tests/ssl/applepay/ApplePayButton-expected.txt: Added.
+ * http/tests/ssl/applepay/ApplePayButton.html:
+ * http/tests/ssl/applepay/ApplePayButtonV4.html: Removed.
+ * platform/mac/http/tests/ssl/applepay/ApplePayButton-expected.png: Removed.
+ * platform/mac/http/tests/ssl/applepay/ApplePayButton-expected.txt: Removed.
+ * platform/mac/http/tests/ssl/applepay/ApplePayButtonV4-expected.png: Removed.
+ * platform/mac/http/tests/ssl/applepay/ApplePayButtonV4-expected.txt: Removed.
+
2020-06-02 Chris Dumez <[email protected]>
Resync web-platform-tests/2dcontext from upstream
Added: trunk/LayoutTests/http/tests/ssl/applepay/ApplePayButton-expected.txt (0 => 262528)
--- trunk/LayoutTests/http/tests/ssl/applepay/ApplePayButton-expected.txt (rev 0)
+++ trunk/LayoutTests/http/tests/ssl/applepay/ApplePayButton-expected.txt 2020-06-04 01:57:38 UTC (rev 262528)
@@ -0,0 +1,234 @@
+Test Apple Pay button types and styles
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS CSS.supports("-apple-pay-button-style: white") is true
+PASS CSS.supports("-apple-pay-button-type: plain") is supportsVersion
+PASS computedStyle.getPropertyValue("-webkit-appearance") is "-apple-pay-button"
+PASS computedStyle.getPropertyValue("-apple-pay-button-style") is expectedStyle
+PASS computedStyle.getPropertyValue("-apple-pay-button-type") is expectedType
+PASS CSS.supports("-apple-pay-button-style: white") is true
+PASS CSS.supports("-apple-pay-button-type: buy") is supportsVersion
+PASS computedStyle.getPropertyValue("-webkit-appearance") is "-apple-pay-button"
+PASS computedStyle.getPropertyValue("-apple-pay-button-style") is expectedStyle
+PASS computedStyle.getPropertyValue("-apple-pay-button-type") is expectedType
+PASS CSS.supports("-apple-pay-button-style: white") is true
+PASS CSS.supports("-apple-pay-button-type: set-up") is supportsVersion
+PASS computedStyle.getPropertyValue("-webkit-appearance") is "-apple-pay-button"
+PASS computedStyle.getPropertyValue("-apple-pay-button-style") is expectedStyle
+PASS computedStyle.getPropertyValue("-apple-pay-button-type") is expectedType
+PASS CSS.supports("-apple-pay-button-style: white") is true
+PASS CSS.supports("-apple-pay-button-type: donate") is supportsVersion
+PASS computedStyle.getPropertyValue("-webkit-appearance") is "-apple-pay-button"
+PASS computedStyle.getPropertyValue("-apple-pay-button-style") is expectedStyle
+PASS computedStyle.getPropertyValue("-apple-pay-button-type") is expectedType
+PASS CSS.supports("-apple-pay-button-style: white") is true
+PASS CSS.supports("-apple-pay-button-type: check-out") is supportsVersion
+PASS computedStyle.getPropertyValue("-webkit-appearance") is "-apple-pay-button"
+PASS computedStyle.getPropertyValue("-apple-pay-button-style") is expectedStyle
+PASS computedStyle.getPropertyValue("-apple-pay-button-type") is expectedType
+PASS CSS.supports("-apple-pay-button-style: white") is true
+PASS CSS.supports("-apple-pay-button-type: book") is supportsVersion
+PASS computedStyle.getPropertyValue("-webkit-appearance") is "-apple-pay-button"
+PASS computedStyle.getPropertyValue("-apple-pay-button-style") is expectedStyle
+PASS computedStyle.getPropertyValue("-apple-pay-button-type") is expectedType
+PASS CSS.supports("-apple-pay-button-style: white") is true
+PASS CSS.supports("-apple-pay-button-type: subscribe") is supportsVersion
+PASS computedStyle.getPropertyValue("-webkit-appearance") is "-apple-pay-button"
+PASS computedStyle.getPropertyValue("-apple-pay-button-style") is expectedStyle
+PASS computedStyle.getPropertyValue("-apple-pay-button-type") is expectedType
+PASS CSS.supports("-apple-pay-button-style: white") is true
+PASS CSS.supports("-apple-pay-button-type: reload") is supportsVersion
+PASS computedStyle.getPropertyValue("-webkit-appearance") is "-apple-pay-button"
+PASS computedStyle.getPropertyValue("-apple-pay-button-style") is expectedStyle
+PASS computedStyle.getPropertyValue("-apple-pay-button-type") is expectedType
+PASS CSS.supports("-apple-pay-button-style: white") is true
+PASS CSS.supports("-apple-pay-button-type: add-money") is supportsVersion
+PASS computedStyle.getPropertyValue("-webkit-appearance") is "-apple-pay-button"
+PASS computedStyle.getPropertyValue("-apple-pay-button-style") is expectedStyle
+PASS computedStyle.getPropertyValue("-apple-pay-button-type") is expectedType
+PASS CSS.supports("-apple-pay-button-style: white") is true
+PASS CSS.supports("-apple-pay-button-type: top-up") is supportsVersion
+PASS computedStyle.getPropertyValue("-webkit-appearance") is "-apple-pay-button"
+PASS computedStyle.getPropertyValue("-apple-pay-button-style") is expectedStyle
+PASS computedStyle.getPropertyValue("-apple-pay-button-type") is expectedType
+PASS CSS.supports("-apple-pay-button-style: white") is true
+PASS CSS.supports("-apple-pay-button-type: order") is supportsVersion
+PASS computedStyle.getPropertyValue("-webkit-appearance") is "-apple-pay-button"
+PASS computedStyle.getPropertyValue("-apple-pay-button-style") is expectedStyle
+PASS computedStyle.getPropertyValue("-apple-pay-button-type") is expectedType
+PASS CSS.supports("-apple-pay-button-style: white") is true
+PASS CSS.supports("-apple-pay-button-type: rent") is supportsVersion
+PASS computedStyle.getPropertyValue("-webkit-appearance") is "-apple-pay-button"
+PASS computedStyle.getPropertyValue("-apple-pay-button-style") is expectedStyle
+PASS computedStyle.getPropertyValue("-apple-pay-button-type") is expectedType
+PASS CSS.supports("-apple-pay-button-style: white") is true
+PASS CSS.supports("-apple-pay-button-type: support") is supportsVersion
+PASS computedStyle.getPropertyValue("-webkit-appearance") is "-apple-pay-button"
+PASS computedStyle.getPropertyValue("-apple-pay-button-style") is expectedStyle
+PASS computedStyle.getPropertyValue("-apple-pay-button-type") is expectedType
+PASS CSS.supports("-apple-pay-button-style: white") is true
+PASS CSS.supports("-apple-pay-button-type: contribute") is supportsVersion
+PASS computedStyle.getPropertyValue("-webkit-appearance") is "-apple-pay-button"
+PASS computedStyle.getPropertyValue("-apple-pay-button-style") is expectedStyle
+PASS computedStyle.getPropertyValue("-apple-pay-button-type") is expectedType
+PASS CSS.supports("-apple-pay-button-style: white") is true
+PASS CSS.supports("-apple-pay-button-type: tip") is supportsVersion
+PASS computedStyle.getPropertyValue("-webkit-appearance") is "-apple-pay-button"
+PASS computedStyle.getPropertyValue("-apple-pay-button-style") is expectedStyle
+PASS computedStyle.getPropertyValue("-apple-pay-button-type") is expectedType
+PASS CSS.supports("-apple-pay-button-style: white-outline") is true
+PASS CSS.supports("-apple-pay-button-type: plain") is supportsVersion
+PASS computedStyle.getPropertyValue("-webkit-appearance") is "-apple-pay-button"
+PASS computedStyle.getPropertyValue("-apple-pay-button-style") is expectedStyle
+PASS computedStyle.getPropertyValue("-apple-pay-button-type") is expectedType
+PASS CSS.supports("-apple-pay-button-style: white-outline") is true
+PASS CSS.supports("-apple-pay-button-type: buy") is supportsVersion
+PASS computedStyle.getPropertyValue("-webkit-appearance") is "-apple-pay-button"
+PASS computedStyle.getPropertyValue("-apple-pay-button-style") is expectedStyle
+PASS computedStyle.getPropertyValue("-apple-pay-button-type") is expectedType
+PASS CSS.supports("-apple-pay-button-style: white-outline") is true
+PASS CSS.supports("-apple-pay-button-type: set-up") is supportsVersion
+PASS computedStyle.getPropertyValue("-webkit-appearance") is "-apple-pay-button"
+PASS computedStyle.getPropertyValue("-apple-pay-button-style") is expectedStyle
+PASS computedStyle.getPropertyValue("-apple-pay-button-type") is expectedType
+PASS CSS.supports("-apple-pay-button-style: white-outline") is true
+PASS CSS.supports("-apple-pay-button-type: donate") is supportsVersion
+PASS computedStyle.getPropertyValue("-webkit-appearance") is "-apple-pay-button"
+PASS computedStyle.getPropertyValue("-apple-pay-button-style") is expectedStyle
+PASS computedStyle.getPropertyValue("-apple-pay-button-type") is expectedType
+PASS CSS.supports("-apple-pay-button-style: white-outline") is true
+PASS CSS.supports("-apple-pay-button-type: check-out") is supportsVersion
+PASS computedStyle.getPropertyValue("-webkit-appearance") is "-apple-pay-button"
+PASS computedStyle.getPropertyValue("-apple-pay-button-style") is expectedStyle
+PASS computedStyle.getPropertyValue("-apple-pay-button-type") is expectedType
+PASS CSS.supports("-apple-pay-button-style: white-outline") is true
+PASS CSS.supports("-apple-pay-button-type: book") is supportsVersion
+PASS computedStyle.getPropertyValue("-webkit-appearance") is "-apple-pay-button"
+PASS computedStyle.getPropertyValue("-apple-pay-button-style") is expectedStyle
+PASS computedStyle.getPropertyValue("-apple-pay-button-type") is expectedType
+PASS CSS.supports("-apple-pay-button-style: white-outline") is true
+PASS CSS.supports("-apple-pay-button-type: subscribe") is supportsVersion
+PASS computedStyle.getPropertyValue("-webkit-appearance") is "-apple-pay-button"
+PASS computedStyle.getPropertyValue("-apple-pay-button-style") is expectedStyle
+PASS computedStyle.getPropertyValue("-apple-pay-button-type") is expectedType
+PASS CSS.supports("-apple-pay-button-style: white-outline") is true
+PASS CSS.supports("-apple-pay-button-type: reload") is supportsVersion
+PASS computedStyle.getPropertyValue("-webkit-appearance") is "-apple-pay-button"
+PASS computedStyle.getPropertyValue("-apple-pay-button-style") is expectedStyle
+PASS computedStyle.getPropertyValue("-apple-pay-button-type") is expectedType
+PASS CSS.supports("-apple-pay-button-style: white-outline") is true
+PASS CSS.supports("-apple-pay-button-type: add-money") is supportsVersion
+PASS computedStyle.getPropertyValue("-webkit-appearance") is "-apple-pay-button"
+PASS computedStyle.getPropertyValue("-apple-pay-button-style") is expectedStyle
+PASS computedStyle.getPropertyValue("-apple-pay-button-type") is expectedType
+PASS CSS.supports("-apple-pay-button-style: white-outline") is true
+PASS CSS.supports("-apple-pay-button-type: top-up") is supportsVersion
+PASS computedStyle.getPropertyValue("-webkit-appearance") is "-apple-pay-button"
+PASS computedStyle.getPropertyValue("-apple-pay-button-style") is expectedStyle
+PASS computedStyle.getPropertyValue("-apple-pay-button-type") is expectedType
+PASS CSS.supports("-apple-pay-button-style: white-outline") is true
+PASS CSS.supports("-apple-pay-button-type: order") is supportsVersion
+PASS computedStyle.getPropertyValue("-webkit-appearance") is "-apple-pay-button"
+PASS computedStyle.getPropertyValue("-apple-pay-button-style") is expectedStyle
+PASS computedStyle.getPropertyValue("-apple-pay-button-type") is expectedType
+PASS CSS.supports("-apple-pay-button-style: white-outline") is true
+PASS CSS.supports("-apple-pay-button-type: rent") is supportsVersion
+PASS computedStyle.getPropertyValue("-webkit-appearance") is "-apple-pay-button"
+PASS computedStyle.getPropertyValue("-apple-pay-button-style") is expectedStyle
+PASS computedStyle.getPropertyValue("-apple-pay-button-type") is expectedType
+PASS CSS.supports("-apple-pay-button-style: white-outline") is true
+PASS CSS.supports("-apple-pay-button-type: support") is supportsVersion
+PASS computedStyle.getPropertyValue("-webkit-appearance") is "-apple-pay-button"
+PASS computedStyle.getPropertyValue("-apple-pay-button-style") is expectedStyle
+PASS computedStyle.getPropertyValue("-apple-pay-button-type") is expectedType
+PASS CSS.supports("-apple-pay-button-style: white-outline") is true
+PASS CSS.supports("-apple-pay-button-type: contribute") is supportsVersion
+PASS computedStyle.getPropertyValue("-webkit-appearance") is "-apple-pay-button"
+PASS computedStyle.getPropertyValue("-apple-pay-button-style") is expectedStyle
+PASS computedStyle.getPropertyValue("-apple-pay-button-type") is expectedType
+PASS CSS.supports("-apple-pay-button-style: white-outline") is true
+PASS CSS.supports("-apple-pay-button-type: tip") is supportsVersion
+PASS computedStyle.getPropertyValue("-webkit-appearance") is "-apple-pay-button"
+PASS computedStyle.getPropertyValue("-apple-pay-button-style") is expectedStyle
+PASS computedStyle.getPropertyValue("-apple-pay-button-type") is expectedType
+PASS CSS.supports("-apple-pay-button-style: black") is true
+PASS CSS.supports("-apple-pay-button-type: plain") is supportsVersion
+PASS computedStyle.getPropertyValue("-webkit-appearance") is "-apple-pay-button"
+PASS computedStyle.getPropertyValue("-apple-pay-button-style") is expectedStyle
+PASS computedStyle.getPropertyValue("-apple-pay-button-type") is expectedType
+PASS CSS.supports("-apple-pay-button-style: black") is true
+PASS CSS.supports("-apple-pay-button-type: buy") is supportsVersion
+PASS computedStyle.getPropertyValue("-webkit-appearance") is "-apple-pay-button"
+PASS computedStyle.getPropertyValue("-apple-pay-button-style") is expectedStyle
+PASS computedStyle.getPropertyValue("-apple-pay-button-type") is expectedType
+PASS CSS.supports("-apple-pay-button-style: black") is true
+PASS CSS.supports("-apple-pay-button-type: set-up") is supportsVersion
+PASS computedStyle.getPropertyValue("-webkit-appearance") is "-apple-pay-button"
+PASS computedStyle.getPropertyValue("-apple-pay-button-style") is expectedStyle
+PASS computedStyle.getPropertyValue("-apple-pay-button-type") is expectedType
+PASS CSS.supports("-apple-pay-button-style: black") is true
+PASS CSS.supports("-apple-pay-button-type: donate") is supportsVersion
+PASS computedStyle.getPropertyValue("-webkit-appearance") is "-apple-pay-button"
+PASS computedStyle.getPropertyValue("-apple-pay-button-style") is expectedStyle
+PASS computedStyle.getPropertyValue("-apple-pay-button-type") is expectedType
+PASS CSS.supports("-apple-pay-button-style: black") is true
+PASS CSS.supports("-apple-pay-button-type: check-out") is supportsVersion
+PASS computedStyle.getPropertyValue("-webkit-appearance") is "-apple-pay-button"
+PASS computedStyle.getPropertyValue("-apple-pay-button-style") is expectedStyle
+PASS computedStyle.getPropertyValue("-apple-pay-button-type") is expectedType
+PASS CSS.supports("-apple-pay-button-style: black") is true
+PASS CSS.supports("-apple-pay-button-type: book") is supportsVersion
+PASS computedStyle.getPropertyValue("-webkit-appearance") is "-apple-pay-button"
+PASS computedStyle.getPropertyValue("-apple-pay-button-style") is expectedStyle
+PASS computedStyle.getPropertyValue("-apple-pay-button-type") is expectedType
+PASS CSS.supports("-apple-pay-button-style: black") is true
+PASS CSS.supports("-apple-pay-button-type: subscribe") is supportsVersion
+PASS computedStyle.getPropertyValue("-webkit-appearance") is "-apple-pay-button"
+PASS computedStyle.getPropertyValue("-apple-pay-button-style") is expectedStyle
+PASS computedStyle.getPropertyValue("-apple-pay-button-type") is expectedType
+PASS CSS.supports("-apple-pay-button-style: black") is true
+PASS CSS.supports("-apple-pay-button-type: reload") is supportsVersion
+PASS computedStyle.getPropertyValue("-webkit-appearance") is "-apple-pay-button"
+PASS computedStyle.getPropertyValue("-apple-pay-button-style") is expectedStyle
+PASS computedStyle.getPropertyValue("-apple-pay-button-type") is expectedType
+PASS CSS.supports("-apple-pay-button-style: black") is true
+PASS CSS.supports("-apple-pay-button-type: add-money") is supportsVersion
+PASS computedStyle.getPropertyValue("-webkit-appearance") is "-apple-pay-button"
+PASS computedStyle.getPropertyValue("-apple-pay-button-style") is expectedStyle
+PASS computedStyle.getPropertyValue("-apple-pay-button-type") is expectedType
+PASS CSS.supports("-apple-pay-button-style: black") is true
+PASS CSS.supports("-apple-pay-button-type: top-up") is supportsVersion
+PASS computedStyle.getPropertyValue("-webkit-appearance") is "-apple-pay-button"
+PASS computedStyle.getPropertyValue("-apple-pay-button-style") is expectedStyle
+PASS computedStyle.getPropertyValue("-apple-pay-button-type") is expectedType
+PASS CSS.supports("-apple-pay-button-style: black") is true
+PASS CSS.supports("-apple-pay-button-type: order") is supportsVersion
+PASS computedStyle.getPropertyValue("-webkit-appearance") is "-apple-pay-button"
+PASS computedStyle.getPropertyValue("-apple-pay-button-style") is expectedStyle
+PASS computedStyle.getPropertyValue("-apple-pay-button-type") is expectedType
+PASS CSS.supports("-apple-pay-button-style: black") is true
+PASS CSS.supports("-apple-pay-button-type: rent") is supportsVersion
+PASS computedStyle.getPropertyValue("-webkit-appearance") is "-apple-pay-button"
+PASS computedStyle.getPropertyValue("-apple-pay-button-style") is expectedStyle
+PASS computedStyle.getPropertyValue("-apple-pay-button-type") is expectedType
+PASS CSS.supports("-apple-pay-button-style: black") is true
+PASS CSS.supports("-apple-pay-button-type: support") is supportsVersion
+PASS computedStyle.getPropertyValue("-webkit-appearance") is "-apple-pay-button"
+PASS computedStyle.getPropertyValue("-apple-pay-button-style") is expectedStyle
+PASS computedStyle.getPropertyValue("-apple-pay-button-type") is expectedType
+PASS CSS.supports("-apple-pay-button-style: black") is true
+PASS CSS.supports("-apple-pay-button-type: contribute") is supportsVersion
+PASS computedStyle.getPropertyValue("-webkit-appearance") is "-apple-pay-button"
+PASS computedStyle.getPropertyValue("-apple-pay-button-style") is expectedStyle
+PASS computedStyle.getPropertyValue("-apple-pay-button-type") is expectedType
+PASS CSS.supports("-apple-pay-button-style: black") is true
+PASS CSS.supports("-apple-pay-button-type: tip") is supportsVersion
+PASS computedStyle.getPropertyValue("-webkit-appearance") is "-apple-pay-button"
+PASS computedStyle.getPropertyValue("-apple-pay-button-style") is expectedStyle
+PASS computedStyle.getPropertyValue("-apple-pay-button-type") is expectedType
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
Modified: trunk/LayoutTests/http/tests/ssl/applepay/ApplePayButton.html (262527 => 262528)
--- trunk/LayoutTests/http/tests/ssl/applepay/ApplePayButton.html 2020-06-04 01:05:36 UTC (rev 262527)
+++ trunk/LayoutTests/http/tests/ssl/applepay/ApplePayButton.html 2020-06-04 01:57:38 UTC (rev 262528)
@@ -1,62 +1,43 @@
<!DOCTYPE html>
<html>
<head>
- <meta charset="utf-8">
- <title>Test rendering Apple Pay buttons</title>
- <style>
- .apple-pay-button {
- -webkit-appearance: -apple-pay-button;
- display: block;
- float: left;
- }
+ <meta charset='utf-8'>
+ <script src=''></script>
+ <meta charset='utf-8'>
+</head>
+<body>
+ <script>
+ function testButton(style, type, version)
+ {
+ shouldBe(`CSS.supports("-apple-pay-button-style: ${style}")`, 'true');
- .white {
- -apple-pay-button-style: white;
- }
+ supportsVersion = ApplePaySession.supportsVersion(version);
+ shouldBe(`CSS.supports("-apple-pay-button-type: ${type}")`, 'supportsVersion');
- .white-outline {
- -apple-pay-button-style: white-outline;
- }
+ let button = document.createElement('button');
+ button.setAttribute('style', `-webkit-appearance: -apple-pay-button; -apple-pay-button-style: ${style}; -apple-pay-button-type: ${type}`);
+ document.body.appendChild(button);
- .black {
- -apple-pay-button-style: black;
+ computedStyle = getComputedStyle(button);
+ expectedStyle = style;
+ expectedType = supportsVersion ? type : 'plain';
+ shouldBe('computedStyle.getPropertyValue("-webkit-appearance")', '"-apple-pay-button"');
+ shouldBe('computedStyle.getPropertyValue("-apple-pay-button-style")', 'expectedStyle');
+ shouldBe('computedStyle.getPropertyValue("-apple-pay-button-type")', 'expectedType');
}
- .plain {
- -apple-pay-button-type: plain;
- }
+ description('Test Apple Pay button types and styles');
- .buy {
- -apple-pay-button-type: buy;
- }
+ for (let style of ['white', 'white-outline', 'black']) {
+ for (let type of ['plain', 'buy', 'set-up', 'donate', 'check-out', 'book', 'subscribe']) {
+ testButton(style, type, 4);
+ }
- .set-up {
- -apple-pay-button-type: set-up;
- }
-
- .donate {
- -apple-pay-button-type: donate;
- }
- .borderRadiusLarge {
- border-top-left-radius: 20px/21px;
- border-top-right-radius: 25px;
- border-bottom-left-radius: 10px/1px;
- border-bottom-right-radius: 5px;
- }
- </style>
-</head>
-<body bgcolor="#E6E6FA">
- <script>
- for (let style of ["white", "white-outline", "black"]) {
- for (let type of ["plain", "buy", "set-up", "donate"]) {
- var button = document.createElement("button");
- button.classList.add("apple-pay-button", style, type, "borderRadiusLarge");
- var buttonNoRadius = document.createElement("button");
- buttonNoRadius.classList.add("apple-pay-button", style, type);
- document.body.appendChild(button);
- document.body.appendChild(buttonNoRadius);
+ for (let type of ['reload', 'add-money', 'top-up', 'order', 'rent', 'support', 'contribute', 'tip']) {
+ testButton(style, type, 10);
}
}
</script>
+ <script src=""
</body>
</html>
Deleted: trunk/LayoutTests/http/tests/ssl/applepay/ApplePayButtonV4.html (262527 => 262528)
--- trunk/LayoutTests/http/tests/ssl/applepay/ApplePayButtonV4.html 2020-06-04 01:05:36 UTC (rev 262527)
+++ trunk/LayoutTests/http/tests/ssl/applepay/ApplePayButtonV4.html 2020-06-04 01:57:38 UTC (rev 262528)
@@ -1,57 +0,0 @@
-<!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;
- }
-
- .check-out {
- -apple-pay-button-type: check-out;
- }
-
- .book {
- -apple-pay-button-type: book;
- }
-
- .subscribe {
- -apple-pay-button-type: subscribe;
- }
- .borderRadiusLarge {
- border-top-left-radius: 20px/21px;
- border-top-right-radius: 25px;
- border-bottom-left-radius: 10px/1px;
- border-bottom-right-radius: 5px;
- }
- </style>
-</head>
-<body bgcolor="#E6E6FA">
- <script>
- for (let style of ["white", "white-outline", "black"]) {
- for (let type of ["check-out", "book", "subscribe"]) {
- var button = document.createElement("button");
- button.classList.add("apple-pay-button", style, type, "borderRadiusLarge");
- var buttonNoRadius = document.createElement("button");
- buttonNoRadius.classList.add("apple-pay-button", style, type);
- document.body.appendChild(button);
- document.body.appendChild(buttonNoRadius);
- }
- }
- </script>
-</body>
-</html>
Modified: trunk/Source/WTF/ChangeLog (262527 => 262528)
--- trunk/Source/WTF/ChangeLog 2020-06-04 01:05:36 UTC (rev 262527)
+++ trunk/Source/WTF/ChangeLog 2020-06-04 01:57:38 UTC (rev 262528)
@@ -1,3 +1,13 @@
+2020-06-03 Andy Estes <[email protected]>
+
+ [Apple Pay] Add new values for -apple-pay-button-type
+ https://bugs.webkit.org/show_bug.cgi?id=212684
+ <rdar://problem/63908535>
+
+ Reviewed by Anders Carlsson.
+
+ * wtf/PlatformEnableCocoa.h:
+
2020-06-01 Simon Fraser <[email protected]>
Add ENABLE(WHEEL_EVENT_REGIONS), enabled on macOS which is the only platform that needs wheel event regions for scrolling thread hit-testing
Modified: trunk/Source/WTF/wtf/PlatformEnableCocoa.h (262527 => 262528)
--- trunk/Source/WTF/wtf/PlatformEnableCocoa.h 2020-06-04 01:05:36 UTC (rev 262527)
+++ trunk/Source/WTF/wtf/PlatformEnableCocoa.h 2020-06-04 01:57:38 UTC (rev 262528)
@@ -63,20 +63,28 @@
#define ENABLE_APPLE_PAY_INSTALLMENT_ITEMS 1
#endif
-#if !defined(ENABLE_APPLE_INSTALLMENTS) && HAVE(PASSKIT_INSTALLMENTS)
+#if !defined(ENABLE_APPLE_PAY_INSTALLMENTS) && HAVE(PASSKIT_INSTALLMENTS)
#define ENABLE_APPLE_PAY_INSTALLMENTS 1
#endif
+#if !defined(ENABLE_APPLE_PAY_NEW_BUTTON_TYPES) && HAVE(PASSKIT_NEW_BUTTON_TYPES)
+#define ENABLE_APPLE_PAY_NEW_BUTTON_TYPES 1
+#endif
+
+#if !defined(ENABLE_APPLE_PAY_SESSION_V7) && HAVE(PASSKIT_PAYMENT_SETUP)
+#define ENABLE_APPLE_PAY_SESSION_V7 1
+#endif
+
#if !defined(ENABLE_APPLE_PAY_SESSION_V8) && HAVE(PASSKIT_INSTALLMENTS)
#define ENABLE_APPLE_PAY_SESSION_V8 1
#endif
-#if !defined(ENABLE_APPLE_PAY_REMOTE_UI) && (PLATFORM(IOS_FAMILY) && !PLATFORM(APPLETV) && !PLATFORM(MACCATALYST) && !PLATFORM(WATCHOS))
-#define ENABLE_APPLE_PAY_REMOTE_UI 1
+#if !defined(ENABLE_APPLE_PAY_SESSION_V9) && HAVE(PASSKIT_INSTALLMENT_ITEMS)
+#define ENABLE_APPLE_PAY_SESSION_V9 1
#endif
-#if !defined(ENABLE_APPLE_PAY_SESSION_V7) && HAVE(PASSKIT_PAYMENT_SETUP)
-#define ENABLE_APPLE_PAY_SESSION_V7 1
+#if !defined(ENABLE_APPLE_PAY_SESSION_V10) && HAVE(PASSKIT_NEW_BUTTON_TYPES)
+#define ENABLE_APPLE_PAY_SESSION_V10 1
#endif
#if !defined(ENABLE_APPLE_PAY_SETUP) && HAVE(PASSKIT_PAYMENT_SETUP)
@@ -83,6 +91,10 @@
#define ENABLE_APPLE_PAY_SETUP 1
#endif
+#if !defined(ENABLE_APPLE_PAY_REMOTE_UI) && (PLATFORM(IOS_FAMILY) && !PLATFORM(APPLETV) && !PLATFORM(MACCATALYST) && !PLATFORM(WATCHOS))
+#define ENABLE_APPLE_PAY_REMOTE_UI 1
+#endif
+
#if !defined(ENABLE_APPLICATION_MANIFEST)
#define ENABLE_APPLICATION_MANIFEST 1
#endif
Modified: trunk/Source/WebCore/ChangeLog (262527 => 262528)
--- trunk/Source/WebCore/ChangeLog 2020-06-04 01:05:36 UTC (rev 262527)
+++ trunk/Source/WebCore/ChangeLog 2020-06-04 01:57:38 UTC (rev 262528)
@@ -1,3 +1,43 @@
+2020-06-03 Andy Estes <[email protected]>
+
+ [Apple Pay] Add new values for -apple-pay-button-type
+ https://bugs.webkit.org/show_bug.cgi?id=212684
+ <rdar://problem/63908535>
+
+ Reviewed by Anders Carlsson.
+
+ Where available, added new values for -apple-pay-button-type and introduced ApplePaySession v10.
+
+ New test: http/tests/ssl/applepay/ApplePayButton.html
+
+ * Modules/applepay/PaymentCoordinatorClient.cpp:
+ (WebCore::PaymentCoordinatorClient::supportsVersion):
+ * accessibility/AccessibilityRenderObject.cpp:
+ (WebCore::AccessibilityRenderObject::applePayButtonDescription const):
+ * css/CSSPrimitiveValueMappings.h:
+ (WebCore::CSSPrimitiveValue::CSSPrimitiveValue):
+ (WebCore::CSSPrimitiveValue::operator ApplePayButtonType const):
+ * css/CSSValueKeywords.in:
+ * css/parser/CSSParserFastPaths.cpp:
+ (WebCore::CSSParserFastPaths::isValidKeywordPropertyAndValue):
+ * en.lproj/Localizable.strings:
+ * platform/LocalizedStrings.cpp:
+ (WebCore::AXApplePayReloadLabel):
+ (WebCore::AXApplePayAddMoneyLabel):
+ (WebCore::AXApplePayTopUpLabel):
+ (WebCore::AXApplePayOrderLabel):
+ (WebCore::AXApplePayRentLabel):
+ (WebCore::AXApplePaySupportLabel):
+ (WebCore::AXApplePayContributeLabel):
+ (WebCore::AXApplePayTipLabel):
+ * platform/LocalizedStrings.h:
+ * rendering/RenderThemeCocoa.mm:
+ (WebCore::toPKPaymentButtonType):
+ * rendering/style/RenderStyleConstants.cpp:
+ (WebCore::operator<<):
+ * rendering/style/RenderStyleConstants.h:
+ * rendering/style/StyleRareNonInheritedData.h:
+
2020-06-03 Daniel Bates <[email protected]>
Inserted text placeholder should vertically align to top and behave like block-level element when it has 0 width
Modified: trunk/Source/WebCore/Modules/applepay/PaymentCoordinatorClient.cpp (262527 => 262528)
--- trunk/Source/WebCore/Modules/applepay/PaymentCoordinatorClient.cpp 2020-06-04 01:05:36 UTC (rev 262527)
+++ trunk/Source/WebCore/Modules/applepay/PaymentCoordinatorClient.cpp 2020-06-04 01:57:38 UTC (rev 262528)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2015-2019 Apple Inc. All rights reserved.
+ * Copyright (C) 2015-2020 Apple Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -44,8 +44,10 @@
static const unsigned currentVersion = 7;
#elif !ENABLE(APPLE_PAY_SESSION_V9)
static const unsigned currentVersion = 8;
+#elif !ENABLE(APPLE_PAY_SESSION_V10)
+ static const unsigned currentVersion = 9;
#else
- static const unsigned currentVersion = 9;
+ static const unsigned currentVersion = 10;
#endif
return version <= currentVersion;
Modified: trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp (262527 => 262528)
--- trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp 2020-06-04 01:05:36 UTC (rev 262527)
+++ trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp 2020-06-04 01:57:38 UTC (rev 262528)
@@ -1138,6 +1138,24 @@
case ApplePayButtonType::Subscribe:
return AXApplePaySubscribeLabel();
#endif
+#if ENABLE(APPLE_PAY_NEW_BUTTON_TYPES)
+ case ApplePayButtonType::Reload:
+ return AXApplePayReloadLabel();
+ case ApplePayButtonType::AddMoney:
+ return AXApplePayAddMoneyLabel();
+ case ApplePayButtonType::TopUp:
+ return AXApplePayTopUpLabel();
+ case ApplePayButtonType::Order:
+ return AXApplePayOrderLabel();
+ case ApplePayButtonType::Rent:
+ return AXApplePayRentLabel();
+ case ApplePayButtonType::Support:
+ return AXApplePaySupportLabel();
+ case ApplePayButtonType::Contribute:
+ return AXApplePayContributeLabel();
+ case ApplePayButtonType::Tip:
+ return AXApplePayTipLabel();
+#endif
}
}
#endif
Modified: trunk/Source/WebCore/css/CSSPrimitiveValueMappings.h (262527 => 262528)
--- trunk/Source/WebCore/css/CSSPrimitiveValueMappings.h 2020-06-04 01:05:36 UTC (rev 262527)
+++ trunk/Source/WebCore/css/CSSPrimitiveValueMappings.h 2020-06-04 01:57:38 UTC (rev 262528)
@@ -1,6 +1,6 @@
/*
* Copyright (C) 2007 Alexey Proskuryakov <[email protected]>.
- * Copyright (C) 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
+ * Copyright (C) 2008-2020 Apple Inc. All rights reserved.
* Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
* Copyright (C) 2009 Jeff Schiller <[email protected]>
* Copyright (C) Research In Motion Limited 2010. All rights reserved.
@@ -5476,7 +5476,32 @@
m_value.valueID = CSSValueSubscribe;
break;
#endif
-
+#if ENABLE(APPLE_PAY_NEW_BUTTON_TYPES)
+ case ApplePayButtonType::Reload:
+ m_value.valueID = CSSValueReload;
+ break;
+ case ApplePayButtonType::AddMoney:
+ m_value.valueID = CSSValueAddMoney;
+ break;
+ case ApplePayButtonType::TopUp:
+ m_value.valueID = CSSValueTopUp;
+ break;
+ case ApplePayButtonType::Order:
+ m_value.valueID = CSSValueOrder;
+ break;
+ case ApplePayButtonType::Rent:
+ m_value.valueID = CSSValueRent;
+ break;
+ case ApplePayButtonType::Support:
+ m_value.valueID = CSSValueSupport;
+ break;
+ case ApplePayButtonType::Contribute:
+ m_value.valueID = CSSValueContribute;
+ break;
+ case ApplePayButtonType::Tip:
+ m_value.valueID = CSSValueTip;
+ break;
+#endif
default:
ASSERT_NOT_REACHED();
break;
@@ -5503,6 +5528,24 @@
case CSSValueSubscribe:
return ApplePayButtonType::Subscribe;
#endif
+#if ENABLE(APPLE_PAY_NEW_BUTTON_TYPES)
+ case CSSValueReload:
+ return ApplePayButtonType::Reload;
+ case CSSValueAddMoney:
+ return ApplePayButtonType::AddMoney;
+ case CSSValueTopUp:
+ return ApplePayButtonType::TopUp;
+ case CSSValueOrder:
+ return ApplePayButtonType::Order;
+ case CSSValueRent:
+ return ApplePayButtonType::Rent;
+ case CSSValueSupport:
+ return ApplePayButtonType::Support;
+ case CSSValueContribute:
+ return ApplePayButtonType::Contribute;
+ case CSSValueTip:
+ return ApplePayButtonType::Tip;
+#endif
default:
break;
}
Modified: trunk/Source/WebCore/css/CSSValueKeywords.in (262527 => 262528)
--- trunk/Source/WebCore/css/CSSValueKeywords.in 2020-06-04 01:05:36 UTC (rev 262527)
+++ trunk/Source/WebCore/css/CSSValueKeywords.in 2020-06-04 01:57:38 UTC (rev 262528)
@@ -1356,7 +1356,17 @@
book
subscribe
#endif
+#if defined(ENABLE_APPLE_PAY_NEW_BUTTON_TYPES) && ENABLE_APPLE_PAY_NEW_BUTTON_TYPES
+reload
+add-money
+top-up
+order
+rent
+support
+contribute
+tip
#endif
+#endif
// font-synthesis
weight
Modified: trunk/Source/WebCore/css/parser/CSSParserFastPaths.cpp (262527 => 262528)
--- trunk/Source/WebCore/css/parser/CSSParserFastPaths.cpp 2020-06-04 01:05:36 UTC (rev 262527)
+++ trunk/Source/WebCore/css/parser/CSSParserFastPaths.cpp 2020-06-04 01:57:38 UTC (rev 262528)
@@ -835,16 +835,27 @@
#if ENABLE(APPLE_PAY)
case CSSPropertyApplePayButtonStyle: // white | white-outline | black
return valueID == CSSValueWhite || valueID == CSSValueWhiteOutline || valueID == CSSValueBlack;
- case CSSPropertyApplePayButtonType: // plain | buy | set-up | donate
- if (valueID == CSSValuePlain || valueID == CSSValueBuy || valueID == CSSValueSetUp || valueID == CSSValueDonate)
- return true;
+ case CSSPropertyApplePayButtonType: // plain | buy | set-up | donate | check-out | book | subscribe | reload | add-money | top-up | order | rent | support | contribute | tip
+ return valueID == CSSValuePlain
#if ENABLE(APPLE_PAY_SESSION_V4)
- // check-out | book | subscribe
- return valueID == CSSValueCheckOut || valueID == CSSValueBook || valueID == CSSValueSubscribe;
-#else
- return false;
+ || valueID == CSSValueCheckOut
+ || valueID == CSSValueBook
+ || valueID == CSSValueSubscribe
#endif
+#if ENABLE(APPLE_PAY_NEW_BUTTON_TYPES)
+ || valueID == CSSValueReload
+ || valueID == CSSValueAddMoney
+ || valueID == CSSValueTopUp
+ || valueID == CSSValueOrder
+ || valueID == CSSValueRent
+ || valueID == CSSValueSupport
+ || valueID == CSSValueContribute
+ || valueID == CSSValueTip
#endif
+ || valueID == CSSValueBuy
+ || valueID == CSSValueSetUp
+ || valueID == CSSValueDonate;
+#endif
case CSSPropertyWebkitNbspMode: // normal | space
return valueID == CSSValueNormal || valueID == CSSValueSpace;
case CSSPropertyWebkitTextZoom:
Modified: trunk/Source/WebCore/en.lproj/Localizable.strings (262527 => 262528)
--- trunk/Source/WebCore/en.lproj/Localizable.strings 2020-06-04 01:05:36 UTC (rev 262527)
+++ trunk/Source/WebCore/en.lproj/Localizable.strings 2020-06-04 01:57:38 UTC (rev 262528)
@@ -100,6 +100,9 @@
/* WKErrorJavaScriptExceptionOccurred description */
"A _javascript_ exception occurred" = "A _javascript_ exception occurred";
+/* Label for the add money with Apple Pay button. */
+"Add money with Apple Pay" = "Add money with Apple Pay";
+
/* Title for Add to Photos action button */
"Add to Photos" = "Add to Photos";
@@ -226,6 +229,9 @@
/* Continue with Touch ID. */
"Continue with Touch ID." = "Continue with Touch ID.";
+/* Label for the contribute with Apple Pay button. */
+"Contribute with Apple Pay" = "Contribute with Apple Pay";
+
/* Media Controls context menu item */
"Controls" = "Controls";
@@ -571,6 +577,9 @@
/* context menu item for PDF */
"Open with %@" = "Open with %@";
+/* Label for the order with Apple Pay button. */
+"Order with Apple Pay" = "Order with Apple Pay";
+
/* Undo action name */
"Outdent (Undo action name)" = "Outdent";
@@ -634,9 +643,15 @@
/* Reload context menu item */
"Reload" = "Reload";
+/* Label for the reload with Apple Pay button. */
+"Reload with Apple Pay" = "Reload with Apple Pay";
+
/* WKErrorContentRuleListStoreRemoveFailed description */
"Removing a WKContentRuleList failed" = "Removing a WKContentRuleList failed";
+/* Label for the rent with Apple Pay button. */
+"Rent with Apple Pay" = "Rent with Apple Pay";
+
/* default label for Reset buttons in forms on web pages */
"Reset" = "Reset";
@@ -802,6 +817,9 @@
/* Undo action name */
"Superscript (Undo action name)" = "Superscript";
+/* Label for the support with Apple Pay button. */
+"Support with Apple Pay" = "Support with Apple Pay";
+
/* File Upload alert sheet camera button string for taking only photos */
"Take Photo (file upload action sheet)" = "Take Photo";
@@ -877,6 +895,9 @@
/* WKErrorAttributedStringContentLoadTimedOut description */
"Timed out while loading attributed string content" = "Timed out while loading attributed string content";
+/* Label for the tip with Apple Pay button. */
+"Tip with Apple Pay" = "Tip with Apple Pay";
+
/* prompt string in authentication panel */
"To view this page, you must log in to area “%@” on %@." = "To view this page, you must log in to area “%@” on %@.";
@@ -886,6 +907,9 @@
/* prompt string in authentication panel */
"To view this page, you must log in to this area on %@:" = "To view this page, you must log in to this area on %@:";
+/* Label for the top up with Apple Pay button. */
+"Top up with Apple Pay" = "Top up with Apple Pay";
+
/* Transformations context sub-menu item */
"Transformations" = "Transformations";
Modified: trunk/Source/WebCore/platform/LocalizedStrings.cpp (262527 => 262528)
--- trunk/Source/WebCore/platform/LocalizedStrings.cpp 2020-06-04 01:05:36 UTC (rev 262527)
+++ trunk/Source/WebCore/platform/LocalizedStrings.cpp 2020-06-04 01:57:38 UTC (rev 262528)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2003, 2006, 2009, 2010, 2012, 2013 Apple Inc. All rights reserved.
+ * Copyright (C) 2003-2020 Apple Inc. All rights reserved.
* Copyright (C) 2010 Igalia S.L
*
* Redistribution and use in source and binary forms, with or without
@@ -720,7 +720,42 @@
{
return WEB_UI_STRING("Subscribe with Apple Pay", "Label for the subcribe with Apple Pay button.");
}
+
+#if ENABLE(APPLE_PAY_NEW_BUTTON_TYPES)
+String AXApplePayReloadLabel()
+{
+ return WEB_UI_STRING("Reload with Apple Pay", "Label for the reload with Apple Pay button.");
+}
+String AXApplePayAddMoneyLabel()
+{
+ return WEB_UI_STRING("Add money with Apple Pay", "Label for the add money with Apple Pay button.");
+}
+String AXApplePayTopUpLabel()
+{
+ return WEB_UI_STRING("Top up with Apple Pay", "Label for the top up with Apple Pay button.");
+}
+String AXApplePayOrderLabel()
+{
+ return WEB_UI_STRING("Order with Apple Pay", "Label for the order with Apple Pay button.");
+}
+String AXApplePayRentLabel()
+{
+ return WEB_UI_STRING("Rent with Apple Pay", "Label for the rent with Apple Pay button.");
+}
+String AXApplePaySupportLabel()
+{
+ return WEB_UI_STRING("Support with Apple Pay", "Label for the support with Apple Pay button.");
+}
+String AXApplePayContributeLabel()
+{
+ return WEB_UI_STRING("Contribute with Apple Pay", "Label for the contribute with Apple Pay button.");
+}
+String AXApplePayTipLabel()
+{
+ return WEB_UI_STRING("Tip with Apple Pay", "Label for the tip with Apple Pay button.");
+}
#endif
+#endif
String AXAutoFillCredentialsLabel()
{
Modified: trunk/Source/WebCore/platform/LocalizedStrings.h (262527 => 262528)
--- trunk/Source/WebCore/platform/LocalizedStrings.h 2020-06-04 01:05:36 UTC (rev 262527)
+++ trunk/Source/WebCore/platform/LocalizedStrings.h 2020-06-04 01:57:38 UTC (rev 262528)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2003, 2006, 2009, 2011, 2012, 2013 Apple Inc. All rights reserved.
+ * Copyright (C) 2003-2020 Apple Inc. All rights reserved.
* Copyright (C) 2010 Igalia S.L
*
* Redistribution and use in source and binary forms, with or without
@@ -221,7 +221,17 @@
String AXApplePayCheckOutLabel();
String AXApplePayBookLabel();
String AXApplePaySubscribeLabel();
+#if ENABLE(APPLE_PAY_NEW_BUTTON_TYPES)
+ String AXApplePayReloadLabel();
+ String AXApplePayAddMoneyLabel();
+ String AXApplePayTopUpLabel();
+ String AXApplePayOrderLabel();
+ String AXApplePayRentLabel();
+ String AXApplePaySupportLabel();
+ String AXApplePayContributeLabel();
+ String AXApplePayTipLabel();
#endif
+#endif
String AXAutoFillCredentialsLabel();
String AXAutoFillContactsLabel();
Modified: trunk/Source/WebCore/rendering/RenderThemeCocoa.mm (262527 => 262528)
--- trunk/Source/WebCore/rendering/RenderThemeCocoa.mm 2020-06-04 01:05:36 UTC (rev 262527)
+++ trunk/Source/WebCore/rendering/RenderThemeCocoa.mm 2020-06-04 01:57:38 UTC (rev 262528)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2016 Apple Inc. All rights reserved.
+ * Copyright (C) 2016-2020 Apple Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -99,6 +99,24 @@
case ApplePayButtonType::Subscribe:
return PKPaymentButtonTypeSubscribe;
#endif
+#if HAVE(PASSKIT_NEW_BUTTON_TYPES)
+ case ApplePayButtonType::Reload:
+ return PKPaymentButtonTypeReload;
+ case ApplePayButtonType::AddMoney:
+ return PKPaymentButtonTypeAddMoney;
+ case ApplePayButtonType::TopUp:
+ return PKPaymentButtonTypeTopUp;
+ case ApplePayButtonType::Order:
+ return PKPaymentButtonTypeOrder;
+ case ApplePayButtonType::Rent:
+ return PKPaymentButtonTypeRent;
+ case ApplePayButtonType::Support:
+ return PKPaymentButtonTypeSupport;
+ case ApplePayButtonType::Contribute:
+ return PKPaymentButtonTypeContribute;
+ case ApplePayButtonType::Tip:
+ return PKPaymentButtonTypeTip;
+#endif
}
}
Modified: trunk/Source/WebCore/rendering/style/RenderStyleConstants.cpp (262527 => 262528)
--- trunk/Source/WebCore/rendering/style/RenderStyleConstants.cpp 2020-06-04 01:05:36 UTC (rev 262527)
+++ trunk/Source/WebCore/rendering/style/RenderStyleConstants.cpp 2020-06-04 01:57:38 UTC (rev 262528)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2015 Apple Inc. All rights reserved.
+ * Copyright (C) 2015-2020 Apple Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -74,7 +74,16 @@
case ApplePayButtonType::Book: ts << "book"; break;
case ApplePayButtonType::Subscribe: ts << "subscribe"; break;
#endif
-
+#if ENABLE(APPLE_PAY_NEW_BUTTON_TYPES)
+ case ApplePayButtonType::Reload: ts << "reload"; break;
+ case ApplePayButtonType::AddMoney: ts << "add-money"; break;
+ case ApplePayButtonType::TopUp: ts << "top-up"; break;
+ case ApplePayButtonType::Order: ts << "order"; break;
+ case ApplePayButtonType::Rent: ts << "rent"; break;
+ case ApplePayButtonType::Support: ts << "support"; break;
+ case ApplePayButtonType::Contribute: ts << "contribute"; break;
+ case ApplePayButtonType::Tip: ts << "tip"; break;
+#endif
}
return ts;
}
Modified: trunk/Source/WebCore/rendering/style/RenderStyleConstants.h (262527 => 262528)
--- trunk/Source/WebCore/rendering/style/RenderStyleConstants.h 2020-06-04 01:05:36 UTC (rev 262527)
+++ trunk/Source/WebCore/rendering/style/RenderStyleConstants.h 2020-06-04 01:57:38 UTC (rev 262528)
@@ -2,7 +2,7 @@
* Copyright (C) 2000 Lars Knoll ([email protected])
* (C) 2000 Antti Koivisto ([email protected])
* (C) 2000 Dirk Mueller ([email protected])
- * Copyright (C) 2003, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved.
+ * Copyright (C) 2003-2020 Apple Inc. All rights reserved.
* Copyright (C) 2006 Graham Dennis ([email protected])
* Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
*
@@ -1152,6 +1152,16 @@
Book,
Subscribe,
#endif
+#if ENABLE(APPLE_PAY_NEW_BUTTON_TYPES)
+ Reload,
+ AddMoney,
+ TopUp,
+ Order,
+ Rent,
+ Support,
+ Contribute,
+ Tip,
+#endif
};
#endif
Modified: trunk/Source/WebCore/rendering/style/StyleRareNonInheritedData.h (262527 => 262528)
--- trunk/Source/WebCore/rendering/style/StyleRareNonInheritedData.h 2020-06-04 01:05:36 UTC (rev 262527)
+++ trunk/Source/WebCore/rendering/style/StyleRareNonInheritedData.h 2020-06-04 01:57:38 UTC (rev 262528)
@@ -203,7 +203,7 @@
#if ENABLE(APPLE_PAY)
unsigned applePayButtonStyle : 2;
- unsigned applePayButtonType : 3;
+ unsigned applePayButtonType : 4;
#endif
unsigned objectFit : 3; // ObjectFit
