Changeset 212558 in webkit

Timestamp:

Feb 17, 2017 11:11:44 AM (7 years ago)

Author:

Simon Fraser

Message:

REGRESSION (209396): Apple Pay buttons do not render
​https://bugs.webkit.org/show_bug.cgi?id=168523
rdar://problem/30451563

Reviewed by Geoffrey Garen.
Source/WebCore:

The new CSS parser mistakenly converted -apple-pay-button values to
-webkit-pay-button, breaking -webkit-appearance: -apple-pay-button.

Fix by excluding "-apple-pay" prefixed values from the conversion.

Test: fast/css/appearance-apple-pay-button.html

• css/parser/CSSPropertyParser.cpp:

(WebCore::isAppleLegacyCssValueKeyword):

LayoutTests:

Ref test that masks out the middle and corners of the buttons.

• fast/css/appearance-apple-pay-button-expected.html: Added.
• fast/css/appearance-apple-pay-button.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/TestExpectations (modified) (1 diff)
• LayoutTests/fast/css/appearance-apple-pay-button-expected.html (added)
• LayoutTests/fast/css/appearance-apple-pay-button.html (added)
• LayoutTests/platform/mac/TestExpectations (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/css/parser/CSSPropertyParser.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2017-02-17  Simon Fraser  <simon.fraser@apple.com>
+
+        REGRESSION (209396): Apple Pay buttons do not render
+        https://bugs.webkit.org/show_bug.cgi?id=168523
+        rdar://problem/30451563
+
+        Reviewed by Geoffrey Garen.
+        
+        Ref test that masks out the middle and corners of the buttons.
+
+        * fast/css/appearance-apple-pay-button-expected.html: Added.
+        * fast/css/appearance-apple-pay-button.html: Added.
+
 2017-02-17  Ryan Haddad  <ryanhaddad@apple.com>
 

trunk/LayoutTests/TestExpectations

@@ -765 +765 @@
 fast/table/hittest-tablecell-with-borders-right-edge.html [ Pass Failure ]
 fast/table/hittest-tablecell-right-edge.html [ Pass Failure ]
+fast/css/appearance-apple-pay-button.html [ Failure ]
 
 webkit.org/b/150598 fast/repaint/table-hover-on-link.html [ Pass Failure ]

trunk/LayoutTests/platform/mac/TestExpectations

@@ -1340 +1340 @@
 webkit.org/b/158889 media/video-controls-show-on-kb-or-ax-event.html [ Pass Failure ]
 
+[ Sierra+ ] fast/css/appearance-apple-pay-button.html [ Pass ]
+
 # <rdar://problem/23500327> storage/websql/alter-to-info-table.html
 [ Sierra+ ] storage/websql/alter-to-info-table.html [ Pass Failure ]

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2017-02-17  Simon Fraser  <simon.fraser@apple.com>
+
+        REGRESSION (209396): Apple Pay buttons do not render
+        https://bugs.webkit.org/show_bug.cgi?id=168523
+        rdar://problem/30451563
+
+        Reviewed by Geoffrey Garen.
+
+        The new CSS parser mistakenly converted -apple-pay-button values to
+        -webkit-pay-button, breaking -webkit-appearance: -apple-pay-button.
+
+        Fix by excluding "-apple-pay" prefixed values from the conversion.
+
+        Test: fast/css/appearance-apple-pay-button.html
+
+        * css/parser/CSSPropertyParser.cpp:
+        (WebCore::isAppleLegacyCssValueKeyword):
+
 2017-02-17  Commit Queue  <commit-queue@webkit.org>
 

trunk/Source/WebCore/css/parser/CSSPropertyParser.cpp

@@ -156 +156 @@
     static const char applePrefix[] = "-apple-";
     static const char appleSystemPrefix[] = "-apple-system";
+    static const char applePayPrefix[] = "-apple-pay";
     static const char* appleWirelessPlaybackTargetActive = getValueName(CSSValueAppleWirelessPlaybackTargetActive);
     
     return hasPrefix(valueKeyword, length, applePrefix)
     && !hasPrefix(valueKeyword, length, appleSystemPrefix)
+    && !hasPrefix(valueKeyword, length, applePayPrefix)
     && !WTF::equal(reinterpret_cast<const LChar*>(valueKeyword), reinterpret_cast<const LChar*>(appleWirelessPlaybackTargetActive), length);
 }