Title: [206697] branches/safari-602-branch/Source/WebCore
- Revision
- 206697
- Author
- [email protected]
- Date
- 2016-09-30 17:18:52 -0700 (Fri, 30 Sep 2016)
Log Message
Merge follow up fix for rdar://problem/28567557.
Modified Paths
Diff
Modified: branches/safari-602-branch/Source/WebCore/ChangeLog (206696 => 206697)
--- branches/safari-602-branch/Source/WebCore/ChangeLog 2016-10-01 00:16:04 UTC (rev 206696)
+++ branches/safari-602-branch/Source/WebCore/ChangeLog 2016-10-01 00:18:52 UTC (rev 206697)
@@ -1,5 +1,23 @@
2016-09-30 Babak Shafiei <[email protected]>
+ Merge follow up fix for rdar://problem/28567557.
+
+ 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
2016-09-20 Anders Carlsson <[email protected]>
Modified: branches/safari-602-branch/Source/WebCore/css/CSSParser.cpp (206696 => 206697)
--- branches/safari-602-branch/Source/WebCore/css/CSSParser.cpp 2016-10-01 00:16:04 UTC (rev 206696)
+++ branches/safari-602-branch/Source/WebCore/css/CSSParser.cpp 2016-10-01 00:18:52 UTC (rev 206697)
@@ -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-branch/Source/WebCore/rendering/RenderThemeCocoa.mm (206696 => 206697)
--- branches/safari-602-branch/Source/WebCore/rendering/RenderThemeCocoa.mm 2016-10-01 00:16:04 UTC (rev 206696)
+++ branches/safari-602-branch/Source/WebCore/rendering/RenderThemeCocoa.mm 2016-10-01 00:18:52 UTC (rev 206697)
@@ -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
