<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[206697] branches/safari-602-branch/Source/WebCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/206697">206697</a></dd>
<dt>Author</dt> <dd>bshafiei@apple.com</dd>
<dt>Date</dt> <dd>2016-09-30 17:18:52 -0700 (Fri, 30 Sep 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge follow up fix for rdar://problem/28567557.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari602branchSourceWebCoreChangeLog">branches/safari-602-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari602branchSourceWebCorecssCSSParsercpp">branches/safari-602-branch/Source/WebCore/css/CSSParser.cpp</a></li>
<li><a href="#branchessafari602branchSourceWebCorerenderingRenderThemeCocoamm">branches/safari-602-branch/Source/WebCore/rendering/RenderThemeCocoa.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari602branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebCore/ChangeLog (206696 => 206697)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,5 +1,23 @@
</span><span class="cx"> 2016-09-30 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><ins>+ 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>
+
</ins><span class="cx"> Merge r206181. rdar://problem/28408526
</span><span class="cx">
</span><span class="cx"> 2016-09-20 Anders Carlsson <andersca@apple.com>
</span></span></pre></div>
<a id="branchessafari602branchSourceWebCorecssCSSParsercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebCore/css/CSSParser.cpp (206696 => 206697)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1152,6 +1152,10 @@
</span><span class="cx"> #if ENABLE(CSS_TRAILING_WORD)
</span><span class="cx"> case CSSPropertyAppleTrailingWord:
</span><span class="cx"> #endif
</span><ins>+#if ENABLE(APPLE_PAY)
+ case CSSPropertyApplePayButtonStyle:
+ case CSSPropertyApplePayButtonType:
+#endif
</ins><span class="cx"> case CSSPropertyFontVariantPosition:
</span><span class="cx"> case CSSPropertyFontVariantCaps:
</span><span class="cx"> case CSSPropertyFontVariantAlternates:
</span></span></pre></div>
<a id="branchessafari602branchSourceWebCorerenderingRenderThemeCocoamm"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebCore/rendering/RenderThemeCocoa.mm (206696 => 206697)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -91,6 +91,7 @@
</span><span class="cx"> paintInfo.context().setShouldSmoothFonts(true);
</span><span class="cx"> paintInfo.context().scale(FloatSize(1, -1));
</span><span class="cx">
</span><ins>+ CGContextSetTextMatrix(paintInfo.context().platformContext(), CGAffineTransformIdentity);
</ins><span class="cx"> 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());
</span><span class="cx">
</span><span class="cx"> return false;
</span></span></pre>
</div>
</div>
</body>
</html>