Attachment 349063 Details for Bug 189366 – Patch

[patch] Patch

bug-189366-20180906133415.patch (text/plain), 8.52 KB, created by Andy Estes on 2018-09-06 13:34:16 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Andy Estes

Created: 2018-09-06 13:34:16 PDT

Size: 8.52 KB

patch

obsolete

>Subversion Revision: 235752
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 3881993737d6cf47abdca043ba6c91088e1f1aa2..5edc1d82cf1a7908b87e7641693d9510f78dbdf1 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,26 @@
>+2018-09-06  Andy Estes  <aestes@apple.com>
>+
>+        [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 NOBODY (OOPS!).
>+
>+        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  Jer Noble  <jer.noble@apple.com>
> 
>         Don't pause playback when locking screen if video is being displayed on second screen.
>diff --git a/Source/WebInspectorUI/ChangeLog b/Source/WebInspectorUI/ChangeLog
>index 890cbd7ca12b897aea995ef56023b9718ff0f190..965ddf3af3bafc3eb035be02bb69ac28546c64c9 100644
>--- a/Source/WebInspectorUI/ChangeLog
>+++ b/Source/WebInspectorUI/ChangeLog
>@@ -1,3 +1,13 @@
>+2018-09-06  Andy Estes  <aestes@apple.com>
>+
>+        [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 NOBODY (OOPS!).
>+
>+        * UserInterface/Models/CSSKeywordCompletions.js:
>+
> 2018-08-31  Jamal Nasser  <xnasser@outlook.com>
> 
>         Added a CSS rule to DarkMode.css to fix color on sidebar toggle.
>diff --git a/Source/WebCore/css/CSSPrimitiveValueMappings.h b/Source/WebCore/css/CSSPrimitiveValueMappings.h
>index 95b3f95fae690ddf73c9219e0b793a1971f1bd87..5ee6f6386032549feb2d2631a96dba0e1026566e 100644
>--- a/Source/WebCore/css/CSSPrimitiveValueMappings.h
>+++ b/Source/WebCore/css/CSSPrimitiveValueMappings.h
>@@ -5482,8 +5482,8 @@ template<> inline CSSPrimitiveValue::CSSPrimitiveValue(ApplePayButtonType e)
>         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;
>@@ -5514,8 +5514,8 @@ template<> inline CSSPrimitiveValue::operator ApplePayButtonType() const
>     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:
>diff --git a/Source/WebCore/css/CSSValueKeywords.in b/Source/WebCore/css/CSSValueKeywords.in
>index 74c450d09f652f64d783e55c0c4a4bcfa2d2bbf1..c71c74fcb5cb4f293791ae6aa0222403253aaf5c 100644
>--- a/Source/WebCore/css/CSSValueKeywords.in
>+++ b/Source/WebCore/css/CSSValueKeywords.in
>@@ -1337,7 +1337,7 @@ set-up
> in-store
> donate
> #if defined(ENABLE_APPLE_PAY_SESSION_V4) && ENABLE_APPLE_PAY_SESSION_V4
>-checkout
>+check-out
> book
> subscribe
> #endif
>diff --git a/Source/WebCore/css/parser/CSSParserFastPaths.cpp b/Source/WebCore/css/parser/CSSParserFastPaths.cpp
>index 87bc573cd5866f7820c9cf536a07b9748fd524bd..54595d84e3e0a7748b3c4bf348c493865a640bb5 100644
>--- a/Source/WebCore/css/parser/CSSParserFastPaths.cpp
>+++ b/Source/WebCore/css/parser/CSSParserFastPaths.cpp
>@@ -769,11 +769,11 @@ bool CSSParserFastPaths::isValidKeywordPropertyAndValue(CSSPropertyID propertyId
> #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
>diff --git a/Source/WebCore/rendering/RenderThemeCocoa.mm b/Source/WebCore/rendering/RenderThemeCocoa.mm
>index 5cada85cfdcbb0fbccb4c5fe4e9fe0f22990473b..8d6203aa080e0c9db8333fb08849cd9337e44c2a 100644
>--- a/Source/WebCore/rendering/RenderThemeCocoa.mm
>+++ b/Source/WebCore/rendering/RenderThemeCocoa.mm
>@@ -119,7 +119,7 @@ static PKPaymentButtonType toPKPaymentButtonType(ApplePayButtonType type)
>     case ApplePayButtonType::Donate:
>         return PKPaymentButtonTypeDonate;
> #if ENABLE(APPLE_PAY_SESSION_V4)
>-    case ApplePayButtonType::Checkout:
>+    case ApplePayButtonType::CheckOut:
>         return PKPaymentButtonTypeCheckout;
>     case ApplePayButtonType::Book:
>         return PKPaymentButtonTypeBook;
>diff --git a/Source/WebCore/rendering/style/RenderStyleConstants.h b/Source/WebCore/rendering/style/RenderStyleConstants.h
>index 943c62c40373112064194acb21b02d9e5200e118..283df64590797f923880cc6667d49c4f42dbce9e 100644
>--- a/Source/WebCore/rendering/style/RenderStyleConstants.h
>+++ b/Source/WebCore/rendering/style/RenderStyleConstants.h
>@@ -1129,7 +1129,7 @@ enum class ApplePayButtonType : uint8_t {
>     InStore,
>     Donate,
> #if ENABLE(APPLE_PAY_SESSION_V4)
>-    Checkout,
>+    CheckOut,
>     Book,
>     Subscribe,
> #endif
>diff --git a/Source/WebInspectorUI/UserInterface/Models/CSSKeywordCompletions.js b/Source/WebInspectorUI/UserInterface/Models/CSSKeywordCompletions.js
>index a099c693d381a0bb1bd5041f6c1e75fd5e54e887..043bb7151369822505890ee91119a01721dc076f 100644
>--- a/Source/WebInspectorUI/UserInterface/Models/CSSKeywordCompletions.js
>+++ b/Source/WebInspectorUI/UserInterface/Models/CSSKeywordCompletions.js
>@@ -1063,6 +1063,6 @@ WI.CSSKeywordCompletions._propertyKeywordMap = {
>         "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"
>     ]
> };
>diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
>index 9bc9d084cc6ee23087305a4370276610cf1f13c5..48564cc1cf364e99097769a793df900f21152a2f 100644
>--- a/LayoutTests/ChangeLog
>+++ b/LayoutTests/ChangeLog
>@@ -1,3 +1,13 @@
>+2018-09-06  Andy Estes  <aestes@apple.com>
>+
>+        [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 NOBODY (OOPS!).
>+
>+        * http/tests/ssl/applepay/ApplePayButtonV4.html:
>+
> 2018-09-06  Zalan Bujtas  <zalan@apple.com>
> 
>         [LFC][BFC] Add support for min(max)-width
>diff --git a/LayoutTests/http/tests/ssl/applepay/ApplePayButtonV4.html b/LayoutTests/http/tests/ssl/applepay/ApplePayButtonV4.html
>index b0ec2b2b7e4d9f16865e696335002e3783ae04b6..689f6e8da1cf6dfed25c9087abe81edca2475243 100644
>--- a/LayoutTests/http/tests/ssl/applepay/ApplePayButtonV4.html
>+++ b/LayoutTests/http/tests/ssl/applepay/ApplePayButtonV4.html
>@@ -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);

Flags:

sam: review+

Actions: View | Formatted Diff | Diff

Attachments on bug 189366: 349063