Diff
Modified: branches/safari-606-branch/LayoutTests/ChangeLog (235801 => 235802)
--- branches/safari-606-branch/LayoutTests/ChangeLog 2018-09-07 20:08:16 UTC (rev 235801)
+++ branches/safari-606-branch/LayoutTests/ChangeLog 2018-09-07 20:08:20 UTC (rev 235802)
@@ -1,5 +1,52 @@
2018-09-06 Babak Shafiei <[email protected]>
+ Cherry-pick r235754. rdar://problem/44210305
+
+ [Apple Pay] Rename the -apple-pay-button-type value "checkout" to "check-out"
+ https://bugs.webkit.org/show_bug.cgi?id=189366
+ <rdar://problem/44193218>
+
+ Reviewed by Sam Weinig.
+
+ Source/WebCore:
+
+ The button title is "Check out with Apple Pay", so we should use the verb phrase "check out"
+ rather than the noun "checkout" for naming this value.
+
+ Updated 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:
+
+ Source/WebInspectorUI:
+
+ * UserInterface/Models/CSSKeywordCompletions.js:
+
+ LayoutTests:
+
+ * http/tests/ssl/applepay/ApplePayButtonV4.html:
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@235754 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2018-09-06 Andy Estes <[email protected]>
+
+ [Apple Pay] Rename the -apple-pay-button-type value "checkout" to "check-out"
+ https://bugs.webkit.org/show_bug.cgi?id=189366
+ <rdar://problem/44193218>
+
+ Reviewed by Sam Weinig.
+
+ * http/tests/ssl/applepay/ApplePayButtonV4.html:
+
+2018-09-06 Babak Shafiei <[email protected]>
+
Cherry-pick r235349. rdar://problem/44209834
[Apple Pay] Introduce new values for -apple-pay-button-type
Modified: branches/safari-606-branch/LayoutTests/http/tests/ssl/applepay/ApplePayButtonV4.html (235801 => 235802)
--- branches/safari-606-branch/LayoutTests/http/tests/ssl/applepay/ApplePayButtonV4.html 2018-09-07 20:08:16 UTC (rev 235801)
+++ branches/safari-606-branch/LayoutTests/http/tests/ssl/applepay/ApplePayButtonV4.html 2018-09-07 20:08:20 UTC (rev 235802)
@@ -21,8 +21,8 @@
-apple-pay-button-style: black;
}
- .checkout {
- -apple-pay-button-type: checkout;
+ .check-out {
+ -apple-pay-button-type: check-out;
}
.book {
@@ -37,7 +37,7 @@
<body>
<script>
for (let style of ["white", "white-outline", "black"]) {
- for (let type of ["checkout", "book", "subscribe"]) {
+ for (let type of ["check-out", "book", "subscribe"]) {
var button = document.createElement("button");
button.classList.add("apple-pay-button", style, type);
document.body.appendChild(button);
Modified: branches/safari-606-branch/Source/WebCore/ChangeLog (235801 => 235802)
--- branches/safari-606-branch/Source/WebCore/ChangeLog 2018-09-07 20:08:16 UTC (rev 235801)
+++ branches/safari-606-branch/Source/WebCore/ChangeLog 2018-09-07 20:08:20 UTC (rev 235802)
@@ -1,5 +1,65 @@
2018-09-06 Babak Shafiei <[email protected]>
+ Cherry-pick r235754. rdar://problem/44210305
+
+ [Apple Pay] Rename the -apple-pay-button-type value "checkout" to "check-out"
+ https://bugs.webkit.org/show_bug.cgi?id=189366
+ <rdar://problem/44193218>
+
+ Reviewed by Sam Weinig.
+
+ Source/WebCore:
+
+ The button title is "Check out with Apple Pay", so we should use the verb phrase "check out"
+ rather than the noun "checkout" for naming this value.
+
+ Updated 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:
+
+ Source/WebInspectorUI:
+
+ * UserInterface/Models/CSSKeywordCompletions.js:
+
+ LayoutTests:
+
+ * http/tests/ssl/applepay/ApplePayButtonV4.html:
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@235754 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2018-09-06 Andy Estes <[email protected]>
+
+ [Apple Pay] Rename the -apple-pay-button-type value "checkout" to "check-out"
+ https://bugs.webkit.org/show_bug.cgi?id=189366
+ <rdar://problem/44193218>
+
+ Reviewed by Sam Weinig.
+
+ The button title is "Check out with Apple Pay", so we should use the verb phrase "check out"
+ rather than the noun "checkout" for naming this value.
+
+ Updated 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-09-06 Babak Shafiei <[email protected]>
+
Cherry-pick r235349. rdar://problem/44209834
[Apple Pay] Introduce new values for -apple-pay-button-type
Modified: branches/safari-606-branch/Source/WebCore/css/CSSPrimitiveValueMappings.h (235801 => 235802)
--- branches/safari-606-branch/Source/WebCore/css/CSSPrimitiveValueMappings.h 2018-09-07 20:08:16 UTC (rev 235801)
+++ branches/safari-606-branch/Source/WebCore/css/CSSPrimitiveValueMappings.h 2018-09-07 20:08:20 UTC (rev 235802)
@@ -5472,8 +5472,8 @@
m_value.valueID = CSSValueDonate;
break;
#if ENABLE(APPLE_PAY_SESSION_V4)
- case ApplePayButtonType::Checkout:
- m_value.valueID = CSSValueCheckout;
+ case ApplePayButtonType::CheckOut:
+ m_value.valueID = CSSValueCheckOut;
break;
case ApplePayButtonType::Book:
m_value.valueID = CSSValueBook;
@@ -5504,8 +5504,8 @@
case CSSValueDonate:
return ApplePayButtonType::Donate;
#if ENABLE(APPLE_PAY_SESSION_V4)
- case CSSValueCheckout:
- return ApplePayButtonType::Checkout;
+ case CSSValueCheckOut:
+ return ApplePayButtonType::CheckOut;
case CSSValueBook:
return ApplePayButtonType::Book;
case CSSValueSubscribe:
Modified: branches/safari-606-branch/Source/WebCore/css/CSSValueKeywords.in (235801 => 235802)
--- branches/safari-606-branch/Source/WebCore/css/CSSValueKeywords.in 2018-09-07 20:08:16 UTC (rev 235801)
+++ branches/safari-606-branch/Source/WebCore/css/CSSValueKeywords.in 2018-09-07 20:08:20 UTC (rev 235802)
@@ -1331,7 +1331,7 @@
in-store
donate
#if defined(ENABLE_APPLE_PAY_SESSION_V4) && ENABLE_APPLE_PAY_SESSION_V4
-checkout
+check-out
book
subscribe
#endif
Modified: branches/safari-606-branch/Source/WebCore/css/parser/CSSParserFastPaths.cpp (235801 => 235802)
--- branches/safari-606-branch/Source/WebCore/css/parser/CSSParserFastPaths.cpp 2018-09-07 20:08:16 UTC (rev 235801)
+++ branches/safari-606-branch/Source/WebCore/css/parser/CSSParserFastPaths.cpp 2018-09-07 20:08:20 UTC (rev 235802)
@@ -769,11 +769,11 @@
#if ENABLE(APPLE_PAY)
case CSSPropertyApplePayButtonStyle: // white | white-outline | black
return valueID == CSSValueWhite || valueID == CSSValueWhiteOutline || valueID == CSSValueBlack;
- case CSSPropertyApplePayButtonType: // plain | buy | set-up | in-store | donate | checkout | book | subscribe
+ case CSSPropertyApplePayButtonType: // plain | buy | set-up | in-store | donate | check-out | 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;
+ return valueID == CSSValueCheckOut || valueID == CSSValueBook || valueID == CSSValueSubscribe;
#else
return false;
#endif
Modified: branches/safari-606-branch/Source/WebCore/rendering/RenderThemeCocoa.mm (235801 => 235802)
--- branches/safari-606-branch/Source/WebCore/rendering/RenderThemeCocoa.mm 2018-09-07 20:08:16 UTC (rev 235801)
+++ branches/safari-606-branch/Source/WebCore/rendering/RenderThemeCocoa.mm 2018-09-07 20:08:20 UTC (rev 235802)
@@ -92,7 +92,7 @@
case ApplePayButtonType::Donate:
return PKPaymentButtonTypeDonate;
#if ENABLE(APPLE_PAY_SESSION_V4)
- case ApplePayButtonType::Checkout:
+ case ApplePayButtonType::CheckOut:
return PKPaymentButtonTypeCheckout;
case ApplePayButtonType::Book:
return PKPaymentButtonTypeBook;
Modified: branches/safari-606-branch/Source/WebCore/rendering/style/RenderStyleConstants.h (235801 => 235802)
--- branches/safari-606-branch/Source/WebCore/rendering/style/RenderStyleConstants.h 2018-09-07 20:08:16 UTC (rev 235801)
+++ branches/safari-606-branch/Source/WebCore/rendering/style/RenderStyleConstants.h 2018-09-07 20:08:20 UTC (rev 235802)
@@ -1129,7 +1129,7 @@
InStore,
Donate,
#if ENABLE(APPLE_PAY_SESSION_V4)
- Checkout,
+ CheckOut,
Book,
Subscribe,
#endif
Modified: branches/safari-606-branch/Source/WebInspectorUI/ChangeLog (235801 => 235802)
--- branches/safari-606-branch/Source/WebInspectorUI/ChangeLog 2018-09-07 20:08:16 UTC (rev 235801)
+++ branches/safari-606-branch/Source/WebInspectorUI/ChangeLog 2018-09-07 20:08:20 UTC (rev 235802)
@@ -1,5 +1,52 @@
2018-09-06 Babak Shafiei <[email protected]>
+ Cherry-pick r235754. rdar://problem/44210305
+
+ [Apple Pay] Rename the -apple-pay-button-type value "checkout" to "check-out"
+ https://bugs.webkit.org/show_bug.cgi?id=189366
+ <rdar://problem/44193218>
+
+ Reviewed by Sam Weinig.
+
+ Source/WebCore:
+
+ The button title is "Check out with Apple Pay", so we should use the verb phrase "check out"
+ rather than the noun "checkout" for naming this value.
+
+ Updated 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:
+
+ Source/WebInspectorUI:
+
+ * UserInterface/Models/CSSKeywordCompletions.js:
+
+ LayoutTests:
+
+ * http/tests/ssl/applepay/ApplePayButtonV4.html:
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@235754 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2018-09-06 Andy Estes <[email protected]>
+
+ [Apple Pay] Rename the -apple-pay-button-type value "checkout" to "check-out"
+ https://bugs.webkit.org/show_bug.cgi?id=189366
+ <rdar://problem/44193218>
+
+ Reviewed by Sam Weinig.
+
+ * UserInterface/Models/CSSKeywordCompletions.js:
+
+2018-09-06 Babak Shafiei <[email protected]>
+
Cherry-pick r235406. rdar://problem/44210305
Teach Web Inspector how to complete keywords for -apple-pay-button-style and -apple-pay-button-type
Modified: branches/safari-606-branch/Source/WebInspectorUI/UserInterface/Models/CSSKeywordCompletions.js (235801 => 235802)
--- branches/safari-606-branch/Source/WebInspectorUI/UserInterface/Models/CSSKeywordCompletions.js 2018-09-07 20:08:16 UTC (rev 235801)
+++ branches/safari-606-branch/Source/WebInspectorUI/UserInterface/Models/CSSKeywordCompletions.js 2018-09-07 20:08:20 UTC (rev 235802)
@@ -1063,6 +1063,6 @@
"black", "white", "white-outline"
],
"-apple-pay-button-type": [
- "book", "buy", "checkout", "donate", "in-store", "plain", "set-up", "subscribe"
+ "book", "buy", "check-out", "donate", "in-store", "plain", "set-up", "subscribe"
]
};
