<!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>[212645] branches/safari-603-branch</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/212645">212645</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2017-02-20 09:29:08 -0800 (Mon, 20 Feb 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/212558">r212558</a>. rdar://problem/30451563</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari603branchLayoutTestsChangeLog">branches/safari-603-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari603branchLayoutTestsTestExpectations">branches/safari-603-branch/LayoutTests/TestExpectations</a></li>
<li><a href="#branchessafari603branchLayoutTestsplatformmacTestExpectations">branches/safari-603-branch/LayoutTests/platform/mac/TestExpectations</a></li>
<li><a href="#branchessafari603branchSourceWebCoreChangeLog">branches/safari-603-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari603branchSourceWebCorecssparserCSSPropertyParsercpp">branches/safari-603-branch/Source/WebCore/css/parser/CSSPropertyParser.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari603branchLayoutTestsfastcssappearanceapplepaybuttonexpectedhtml">branches/safari-603-branch/LayoutTests/fast/css/appearance-apple-pay-button-expected.html</a></li>
<li><a href="#branchessafari603branchLayoutTestsfastcssappearanceapplepaybuttonhtml">branches/safari-603-branch/LayoutTests/fast/css/appearance-apple-pay-button.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari603branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/LayoutTests/ChangeLog (212644 => 212645)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/LayoutTests/ChangeLog 2017-02-20 17:24:12 UTC (rev 212644)
+++ branches/safari-603-branch/LayoutTests/ChangeLog 2017-02-20 17:29:08 UTC (rev 212645)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2017-02-20 Matthew Hanson <matthew_hanson@apple.com>
+
+ Merge r212558. rdar://problem/30451563
+
+ 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.
+
</ins><span class="cx"> 2017-02-17 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r212354. rdar://problem/30450371
</span></span></pre></div>
<a id="branchessafari603branchLayoutTestsTestExpectations"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/LayoutTests/TestExpectations (212644 => 212645)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/LayoutTests/TestExpectations 2017-02-20 17:24:12 UTC (rev 212644)
+++ branches/safari-603-branch/LayoutTests/TestExpectations 2017-02-20 17:29:08 UTC (rev 212645)
</span><span class="lines">@@ -744,6 +744,7 @@
</span><span class="cx"> # integral hittest vs. subpixel table
</span><span class="cx"> fast/table/hittest-tablecell-with-borders-right-edge.html [ Pass Failure ]
</span><span class="cx"> fast/table/hittest-tablecell-right-edge.html [ Pass Failure ]
</span><ins>+fast/css/appearance-apple-pay-button.html [ Failure ]
</ins><span class="cx">
</span><span class="cx"> webkit.org/b/150598 fast/repaint/table-hover-on-link.html [ Pass Failure ]
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari603branchLayoutTestsfastcssappearanceapplepaybuttonexpectedhtml"></a>
<div class="addfile"><h4>Added: branches/safari-603-branch/LayoutTests/fast/css/appearance-apple-pay-button-expected.html (0 => 212645)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/LayoutTests/fast/css/appearance-apple-pay-button-expected.html (rev 0)
+++ branches/safari-603-branch/LayoutTests/fast/css/appearance-apple-pay-button-expected.html 2017-02-20 17:29:08 UTC (rev 212645)
</span><span class="lines">@@ -0,0 +1,47 @@
</span><ins>+
+<style>
+ .container {
+ position: relative;
+ background-color: silver;
+ padding: 25px;
+ width: 500px;
+ }
+ .apple-pay-button-div {
+ display :block;
+ margin: 25px;
+ height: 100px;
+ width: 400px;
+ }
+
+ .masker {
+ position: absolute;
+ width: 200px;
+ height: 80px;
+ background-color: blue;
+ }
+
+ .corner-mask {
+ position: absolute;
+ width: 20px;
+ height: 20px;
+ background-color: blue;
+ }
+</style>
+
+<div class="container">
+ <div style="background-color: black;" class="apple-pay-button-div"></div>
+ <div style="background-color: white;" class="apple-pay-button-div"></div>
+
+ <div class="masker" style="top: 60px; left: 150px"></div>
+ <div class="masker" style="top: 185px; left: 150px"></div>
+
+ <div class="corner-mask" style="top: 45px; left: 45px"></div>
+ <div class="corner-mask" style="top: 135px; left: 45px"></div>
+ <div class="corner-mask" style="top: 45px; left: 435px"></div>
+ <div class="corner-mask" style="top: 135px; left: 435px"></div>
+
+ <div class="corner-mask" style="top: 170px; left: 45px"></div>
+ <div class="corner-mask" style="top: 260px; left: 45px"></div>
+ <div class="corner-mask" style="top: 170px; left: 435px"></div>
+ <div class="corner-mask" style="top: 260px; left: 435px"></div>
+</div>
</ins></span></pre></div>
<a id="branchessafari603branchLayoutTestsfastcssappearanceapplepaybuttonhtml"></a>
<div class="addfile"><h4>Added: branches/safari-603-branch/LayoutTests/fast/css/appearance-apple-pay-button.html (0 => 212645)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/LayoutTests/fast/css/appearance-apple-pay-button.html (rev 0)
+++ branches/safari-603-branch/LayoutTests/fast/css/appearance-apple-pay-button.html 2017-02-20 17:29:08 UTC (rev 212645)
</span><span class="lines">@@ -0,0 +1,48 @@
</span><ins>+
+<style>
+ .container {
+ position: relative;
+ background-color: silver;
+ padding: 25px;
+ width: 500px;
+ }
+ .apple-pay-button-div {
+ display :block;
+ margin: 25px;
+ -webkit-appearance: -apple-pay-button;
+ height: 100px;
+ width: 400px;
+ }
+
+ .masker {
+ position: absolute;
+ width: 200px;
+ height: 80px;
+ background-color: blue;
+ }
+
+ .corner-mask {
+ position: absolute;
+ width: 20px;
+ height: 20px;
+ background-color: blue;
+ }
+</style>
+
+<div class="container">
+ <button style="-apple-pay-button-style: black;" class="apple-pay-button-div"></button>
+ <button style="-apple-pay-button-style: white;" class="apple-pay-button-div"></button>
+
+ <div class="masker" style="top: 60px; left: 150px"></div>
+ <div class="masker" style="top: 185px; left: 150px"></div>
+
+ <div class="corner-mask" style="top: 45px; left: 45px"></div>
+ <div class="corner-mask" style="top: 135px; left: 45px"></div>
+ <div class="corner-mask" style="top: 45px; left: 435px"></div>
+ <div class="corner-mask" style="top: 135px; left: 435px"></div>
+
+ <div class="corner-mask" style="top: 170px; left: 45px"></div>
+ <div class="corner-mask" style="top: 260px; left: 45px"></div>
+ <div class="corner-mask" style="top: 170px; left: 435px"></div>
+ <div class="corner-mask" style="top: 260px; left: 435px"></div>
+</div>
</ins></span></pre></div>
<a id="branchessafari603branchLayoutTestsplatformmacTestExpectations"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/LayoutTests/platform/mac/TestExpectations (212644 => 212645)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/LayoutTests/platform/mac/TestExpectations 2017-02-20 17:24:12 UTC (rev 212644)
+++ branches/safari-603-branch/LayoutTests/platform/mac/TestExpectations 2017-02-20 17:29:08 UTC (rev 212645)
</span><span class="lines">@@ -1329,6 +1329,8 @@
</span><span class="cx">
</span><span class="cx"> webkit.org/b/158889 media/video-controls-show-on-kb-or-ax-event.html [ Pass Failure ]
</span><span class="cx">
</span><ins>+[ Sierra+ ] fast/css/appearance-apple-pay-button.html [ Pass ]
+
</ins><span class="cx"> # <rdar://problem/23500327> storage/websql/alter-to-info-table.html
</span><span class="cx"> [ Sierra+ ] storage/websql/alter-to-info-table.html [ Pass Failure ]
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari603branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebCore/ChangeLog (212644 => 212645)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebCore/ChangeLog 2017-02-20 17:24:12 UTC (rev 212644)
+++ branches/safari-603-branch/Source/WebCore/ChangeLog 2017-02-20 17:29:08 UTC (rev 212645)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2017-02-20 Matthew Hanson <matthew_hanson@apple.com>
+
+ Merge r212558. rdar://problem/30451563
+
+ 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):
+
</ins><span class="cx"> 2017-02-17 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r212554. rdar://problem/30339638
</span></span></pre></div>
<a id="branchessafari603branchSourceWebCorecssparserCSSPropertyParsercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebCore/css/parser/CSSPropertyParser.cpp (212644 => 212645)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebCore/css/parser/CSSPropertyParser.cpp 2017-02-20 17:24:12 UTC (rev 212644)
+++ branches/safari-603-branch/Source/WebCore/css/parser/CSSPropertyParser.cpp 2017-02-20 17:29:08 UTC (rev 212645)
</span><span class="lines">@@ -155,10 +155,12 @@
</span><span class="cx"> {
</span><span class="cx"> static const char applePrefix[] = "-apple-";
</span><span class="cx"> static const char appleSystemPrefix[] = "-apple-system";
</span><ins>+ static const char applePayPrefix[] = "-apple-pay";
</ins><span class="cx"> static const char* appleWirelessPlaybackTargetActive = getValueName(CSSValueAppleWirelessPlaybackTargetActive);
</span><span class="cx">
</span><span class="cx"> return hasPrefix(valueKeyword, length, applePrefix)
</span><span class="cx"> && !hasPrefix(valueKeyword, length, appleSystemPrefix)
</span><ins>+ && !hasPrefix(valueKeyword, length, applePayPrefix)
</ins><span class="cx"> && !WTF::equal(reinterpret_cast<const LChar*>(valueKeyword), reinterpret_cast<const LChar*>(appleWirelessPlaybackTargetActive), length);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>