Changeset 206697 in webkit

Timestamp:

Sep 30, 2016, 5:18:52 PM (9 years ago)

Author:

bshafiei@apple.com

Message:

Merge follow up fix for rdar://problem/28567557.

Location:

branches/safari-602-branch/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• css/CSSParser.cpp (modified) (1 diff)
• rendering/RenderThemeCocoa.mm (modified) (1 diff)

branches/safari-602-branch/Source/WebCore/ChangeLog

@@ +1 @@
+2016-09-30  Babak Shafiei  <bshafiei@apple.com>
+
+        Merge follow up fix for rdar://problem/28567557.
+
+    2016-09-30  Anders Carlsson  <andersca@apple.com>
+
+            Follow up for <rdar://problem/28567561> Add CSS -webkit-appearance property for Apple Pay buttons
+
+            Reviewed by Dan Bernstein.
+
+            * css/CSSParser.cpp:
+            (WebCore::isKeywordPropertyID):
+            Add CSSPropertyApplePayButtonStyle and CSSPropertyApplePayButtonType.
+
+            * rendering/RenderThemeCocoa.mm:
+            (WebCore::RenderThemeCocoa::paintApplePayButton):
+            Make sure to reinitialize the text matrix.
+
 2016-09-30  Babak Shafiei  <bshafiei@apple.com>
 

branches/safari-602-branch/Source/WebCore/css/CSSParser.cpp

@@ -1152 +1152 @@
 #if ENABLE(CSS_TRAILING_WORD)
     case CSSPropertyAppleTrailingWord:
+#endif
+#if ENABLE(APPLE_PAY)
+    case CSSPropertyApplePayButtonStyle:
+    case CSSPropertyApplePayButtonType:
 #endif
     case CSSPropertyFontVariantPosition:

branches/safari-602-branch/Source/WebCore/rendering/RenderThemeCocoa.mm

@@ -92 +92 @@
     paintInfo.context().scale(FloatSize(1, -1));
 
+    CGContextSetTextMatrix(paintInfo.context().platformContext(), CGAffineTransformIdentity);
     PKDrawApplePayButton(paintInfo.context().platformContext(), CGRectMake(paintRect.x(), -paintRect.maxY(), paintRect.width(), paintRect.height()), 1.0, toPKPaymentButtonType(renderer.style().applePayButtonType()), toPKPaymentButtonStyle(renderer.style().applePayButtonStyle()), renderer.style().locale());