<!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>[208421] 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/208421">208421</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2016-11-06 22:12:36 -0800 (Sun, 06 Nov 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/208392">r208392</a>. rdar://problem/28409526</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari602branchSourceWebCoreChangeLog">branches/safari-602-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari602branchSourceWebCoreDerivedSourcesmake">branches/safari-602-branch/Source/WebCore/DerivedSources.make</a></li>
<li><a href="#branchessafari602branchSourceWebCoreWebCorePrefixh">branches/safari-602-branch/Source/WebCore/WebCorePrefix.h</a></li>
<li><a href="#branchessafari602branchSourceWebCorecssCSSParsercpp">branches/safari-602-branch/Source/WebCore/css/CSSParser.cpp</a></li>
<li><a href="#branchessafari602branchSourceWebCorecssCSSPrimitiveValueMappingsh">branches/safari-602-branch/Source/WebCore/css/CSSPrimitiveValueMappings.h</a></li>
<li><a href="#branchessafari602branchSourceWebCorecssCSSValueKeywordsin">branches/safari-602-branch/Source/WebCore/css/CSSValueKeywords.in</a></li>
<li><a href="#branchessafari602branchSourceWebCorerenderingRenderThemeCocoamm">branches/safari-602-branch/Source/WebCore/rendering/RenderThemeCocoa.mm</a></li>
<li><a href="#branchessafari602branchSourceWebCorerenderingstyleRenderStyleConstantsh">branches/safari-602-branch/Source/WebCore/rendering/style/RenderStyleConstants.h</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 (208420 => 208421)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebCore/ChangeLog 2016-11-05 18:00:29 UTC (rev 208420)
+++ branches/safari-602-branch/Source/WebCore/ChangeLog 2016-11-07 06:12:36 UTC (rev 208421)
</span><span class="lines">@@ -1,3 +1,44 @@
</span><ins>+2016-11-06 Matthew Hanson <matthew_hanson@apple.com>
+
+ Merge r208392. rdar://problem/28409526
+
+ 2016-11-03 Anders Carlsson <andersca@apple.com>
+
+ Add new 'other' Apple Pay button style
+ https://bugs.webkit.org/show_bug.cgi?id=164384
+ rdar://problem/28302528
+
+ Reviewed by Dean Jackson.
+
+ * DerivedSources.make:
+ * WebCorePrefix.h:
+ Add extension points.
+
+ * css/CSSPrimitiveValueMappings.h:
+ (WebCore::CSSPrimitiveValue::CSSPrimitiveValue):
+ Add ApplePayButtonType::Other.
+
+ (WebCore::CSSPrimitiveValue::operator ApplePayButtonType):
+ Add CSSValueOther.
+
+ * css/CSSValueKeywords.in:
+ Add other.
+
+ * css/parser/CSSParser.cpp:
+ (WebCore::isValidKeywordPropertyAndValue):
+ Add CSSValueOther.
+
+ * css/parser/CSSParserFastPaths.cpp:
+ (WebCore::CSSParserFastPaths::isValidKeywordPropertyAndValue):
+ Add CSSValueOther.
+
+ * rendering/RenderThemeCocoa.mm:
+ (WebCore::toPKPaymentButtonType):
+ Handle ApplePayButtonType::Other.
+
+ * rendering/style/RenderStyleConstants.h:
+ Add ApplePayButtonType::Other.
+
</ins><span class="cx"> 2016-11-03 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r208328. rdar://problem/29084886
</span></span></pre></div>
<a id="branchessafari602branchSourceWebCoreDerivedSourcesmake"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebCore/DerivedSources.make (208420 => 208421)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebCore/DerivedSources.make 2016-11-05 18:00:29 UTC (rev 208420)
+++ branches/safari-602-branch/Source/WebCore/DerivedSources.make 2016-11-07 06:12:36 UTC (rev 208421)
</span><span class="lines">@@ -791,6 +791,8 @@
</span><span class="cx">
</span><span class="cx"> -include WebCoreDerivedSourcesAdditions.make
</span><span class="cx">
</span><ins>+-include ApplePayWebCoreDerivedSourcesAdditions.make
+
</ins><span class="cx"> NON_SVG_BINDING_IDLS += $(ADDITIONAL_BINDING_IDLS)
</span><span class="cx">
</span><span class="cx"> all : $(ADDITIONAL_BINDING_IDLS:%.idl=JS%.h)
</span><span class="lines">@@ -896,6 +898,7 @@
</span><span class="cx"> WEBCORE_CSS_PROPERTY_NAMES := $(WebCore)/css/CSSPropertyNames.in
</span><span class="cx"> WEBCORE_CSS_VALUE_KEYWORDS := $(WebCore)/css/CSSValueKeywords.in
</span><span class="cx"> WEBCORE_CSS_VALUE_KEYWORDS := $(WEBCORE_CSS_VALUE_KEYWORDS) $(WebCore)/css/SVGCSSValueKeywords.in
</span><ins>+WEBCORE_CSS_VALUE_KEYWORDS_DEFINES := $(FEATURE_DEFINES) $(ADDITIONAL_CSS_VALUE_KEYWORDS_DEFINES)
</ins><span class="cx">
</span><span class="cx"> CSSPropertyNames.h CSSPropertyNames.cpp StyleBuilder.cpp StylePropertyShorthandFunctions.h StylePropertyShorthandFunctions.cpp : makeprop.intermediate
</span><span class="cx"> .INTERMEDIATE : makeprop.intermediate
</span><span class="lines">@@ -907,7 +910,7 @@
</span><span class="cx"> .INTERMEDIATE : makevalues.intermediate
</span><span class="cx"> makevalues.intermediate : $(WEBCORE_CSS_VALUE_KEYWORDS) css/makevalues.pl bindings/scripts/preprocessor.pm $(PLATFORM_FEATURE_DEFINES)
</span><span class="cx"> $(PERL) -pe '' $(WEBCORE_CSS_VALUE_KEYWORDS) > CSSValueKeywords.in
</span><del>- $(PERL) -I$(WebCore)/bindings/scripts "$(WebCore)/css/makevalues.pl" --defines "$(FEATURE_DEFINES)"
</del><ins>+ $(PERL) -I$(WebCore)/bindings/scripts "$(WebCore)/css/makevalues.pl" --defines "$(WEBCORE_CSS_VALUE_KEYWORDS_DEFINES)"
</ins><span class="cx">
</span><span class="cx"> # --------
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari602branchSourceWebCoreWebCorePrefixh"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebCore/WebCorePrefix.h (208420 => 208421)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebCore/WebCorePrefix.h 2016-11-05 18:00:29 UTC (rev 208420)
+++ branches/safari-602-branch/Source/WebCore/WebCorePrefix.h 2016-11-07 06:12:36 UTC (rev 208421)
</span><span class="lines">@@ -172,6 +172,10 @@
</span><span class="cx"> #define delete ("if you use new/delete make sure to include config.h at the top of the file"())
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if USE(APPLE_INTERNAL_SDK)
+#include <WebKitAdditions/ApplePayWebCorePrefixAdditions.h>
+#endif
+
</ins><span class="cx"> /* When C++ exceptions are disabled, the C++ library defines |try| and |catch|
</span><span class="cx"> * to allow C++ code that expects exceptions to build. These definitions
</span><span class="cx"> * interfere with Objective-C++ uses of Objective-C exception handlers, which
</span></span></pre></div>
<a id="branchessafari602branchSourceWebCorecssCSSParsercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebCore/css/CSSParser.cpp (208420 => 208421)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebCore/css/CSSParser.cpp 2016-11-05 18:00:29 UTC (rev 208420)
+++ branches/safari-602-branch/Source/WebCore/css/CSSParser.cpp 2016-11-07 06:12:36 UTC (rev 208421)
</span><span class="lines">@@ -982,8 +982,8 @@
</span><span class="cx"> if (valueID == CSSValueWhite || valueID == CSSValueWhiteOutline || valueID == CSSValueBlack)
</span><span class="cx"> return true;
</span><span class="cx"> break;
</span><del>- case CSSPropertyApplePayButtonType: // plain | buy | set-up
- if (valueID == CSSValuePlain || valueID == CSSValueBuy || valueID == CSSValueSetUp)
</del><ins>+ case CSSPropertyApplePayButtonType: // plain | buy | set-up | other
+ if (valueID == CSSValuePlain || valueID == CSSValueBuy || valueID == CSSValueSetUp || valueID == CSSValueOther)
</ins><span class="cx"> return true;
</span><span class="cx"> break;
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="branchessafari602branchSourceWebCorecssCSSPrimitiveValueMappingsh"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebCore/css/CSSPrimitiveValueMappings.h (208420 => 208421)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebCore/css/CSSPrimitiveValueMappings.h 2016-11-05 18:00:29 UTC (rev 208420)
+++ branches/safari-602-branch/Source/WebCore/css/CSSPrimitiveValueMappings.h 2016-11-07 06:12:36 UTC (rev 208421)
</span><span class="lines">@@ -5530,6 +5530,10 @@
</span><span class="cx"> case ApplePayButtonType::SetUp:
</span><span class="cx"> m_value.valueID = CSSValueSetUp;
</span><span class="cx"> break;
</span><ins>+ case ApplePayButtonType::Other:
+ m_value.valueID = CSSValueOther;
+ break;
+
</ins><span class="cx"> default:
</span><span class="cx"> ASSERT_NOT_REACHED();
</span><span class="cx"> break;
</span><span class="lines">@@ -5546,6 +5550,8 @@
</span><span class="cx"> return ApplePayButtonType::Buy;
</span><span class="cx"> case CSSValueSetUp:
</span><span class="cx"> return ApplePayButtonType::SetUp;
</span><ins>+ case CSSValueOther:
+ return ApplePayButtonType::Other;
</ins><span class="cx"> default:
</span><span class="cx"> break;
</span><span class="cx"> }
</span></span></pre></div>
<a id="branchessafari602branchSourceWebCorecssCSSValueKeywordsin"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebCore/css/CSSValueKeywords.in (208420 => 208421)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebCore/css/CSSValueKeywords.in 2016-11-05 18:00:29 UTC (rev 208420)
+++ branches/safari-602-branch/Source/WebCore/css/CSSValueKeywords.in 2016-11-07 06:12:36 UTC (rev 208421)
</span><span class="lines">@@ -1190,6 +1190,7 @@
</span><span class="cx"> plain
</span><span class="cx"> buy
</span><span class="cx"> set-up
</span><ins>+other
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> // font-synthesis
</span></span></pre></div>
<a id="branchessafari602branchSourceWebCorerenderingRenderThemeCocoamm"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebCore/rendering/RenderThemeCocoa.mm (208420 => 208421)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebCore/rendering/RenderThemeCocoa.mm 2016-11-05 18:00:29 UTC (rev 208420)
+++ branches/safari-602-branch/Source/WebCore/rendering/RenderThemeCocoa.mm 2016-11-07 06:12:36 UTC (rev 208421)
</span><span class="lines">@@ -78,6 +78,9 @@
</span><span class="cx"> return PKPaymentButtonTypeBuy;
</span><span class="cx"> case ApplePayButtonType::SetUp:
</span><span class="cx"> return PKPaymentButtonTypeSetUp;
</span><ins>+ case ApplePayButtonType::Other:
+ // FIXME: Use a named constant here.
+ return (PKPaymentButtonType)4;
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari602branchSourceWebCorerenderingstyleRenderStyleConstantsh"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebCore/rendering/style/RenderStyleConstants.h (208420 => 208421)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebCore/rendering/style/RenderStyleConstants.h 2016-11-05 18:00:29 UTC (rev 208420)
+++ branches/safari-602-branch/Source/WebCore/rendering/style/RenderStyleConstants.h 2016-11-07 06:12:36 UTC (rev 208421)
</span><span class="lines">@@ -707,6 +707,7 @@
</span><span class="cx"> Plain,
</span><span class="cx"> Buy,
</span><span class="cx"> SetUp,
</span><ins>+ Other,
</ins><span class="cx"> };
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>