Title: [206695] branches/safari-602.2.14.0-branch/Source/WebCore
- Revision
- 206695
- Author
- [email protected]
- Date
- 2016-09-30 17:12:47 -0700 (Fri, 30 Sep 2016)
Log Message
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.
Modified Paths
Diff
Modified: branches/safari-602.2.14.0-branch/Source/WebCore/ChangeLog (206694 => 206695)
--- branches/safari-602.2.14.0-branch/Source/WebCore/ChangeLog 2016-10-01 00:08:28 UTC (rev 206694)
+++ branches/safari-602.2.14.0-branch/Source/WebCore/ChangeLog 2016-10-01 00:12:47 UTC (rev 206695)
@@ -1,3 +1,17 @@
+2016-09-30 Anders Carlsson <[email protected]>
+
+ 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 <[email protected]>
Merge r206181. rdar://problem/28408526
Modified: branches/safari-602.2.14.0-branch/Source/WebCore/css/CSSParser.cpp (206694 => 206695)
--- branches/safari-602.2.14.0-branch/Source/WebCore/css/CSSParser.cpp 2016-10-01 00:08:28 UTC (rev 206694)
+++ branches/safari-602.2.14.0-branch/Source/WebCore/css/CSSParser.cpp 2016-10-01 00:12:47 UTC (rev 206695)
@@ -1152,6 +1152,10 @@
#if ENABLE(CSS_TRAILING_WORD)
case CSSPropertyAppleTrailingWord:
#endif
+#if ENABLE(APPLE_PAY)
+ case CSSPropertyApplePayButtonStyle:
+ case CSSPropertyApplePayButtonType:
+#endif
case CSSPropertyFontVariantPosition:
case CSSPropertyFontVariantCaps:
case CSSPropertyFontVariantAlternates:
Modified: branches/safari-602.2.14.0-branch/Source/WebCore/rendering/RenderThemeCocoa.mm (206694 => 206695)
--- branches/safari-602.2.14.0-branch/Source/WebCore/rendering/RenderThemeCocoa.mm 2016-10-01 00:08:28 UTC (rev 206694)
+++ branches/safari-602.2.14.0-branch/Source/WebCore/rendering/RenderThemeCocoa.mm 2016-10-01 00:12:47 UTC (rev 206695)
@@ -91,6 +91,7 @@
paintInfo.context().setShouldSmoothFonts(true);
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());
return false;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
