<!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>[193579] branches/safari-601-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/193579">193579</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2015-12-06 02:37:21 -0800 (Sun, 06 Dec 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/190999">r190999</a>. rdar://problem/23769821</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari601branchLayoutTestsChangeLog">branches/safari-601-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari601branchLayoutTestsfasttextfontkerningexpectedhtml">branches/safari-601-branch/LayoutTests/fast/text/font-kerning-expected.html</a></li>
<li><a href="#branchessafari601branchLayoutTestsfasttextfontkerninghtml">branches/safari-601-branch/LayoutTests/fast/text/font-kerning.html</a></li>
<li><a href="#branchessafari601branchSourceWebCoreChangeLog">branches/safari-601-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari601branchSourceWebCorecssCSSPropertyNamesin">branches/safari-601-branch/Source/WebCore/css/CSSPropertyNames.in</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari601branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/LayoutTests/ChangeLog (193578 => 193579)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/ChangeLog 2015-12-06 10:37:16 UTC (rev 193578)
+++ branches/safari-601-branch/LayoutTests/ChangeLog 2015-12-06 10:37:21 UTC (rev 193579)
</span><span class="lines">@@ -1,5 +1,21 @@
</span><span class="cx"> 2015-12-06 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r190999. rdar://problem/23769821
+
+ 2015-10-13 Myles C. Maxfield <mmaxfield@apple.com>
+
+ Unprefix font-kerning
+ https://bugs.webkit.org/show_bug.cgi?id=150080
+
+ Reviewed by Sam Weinig.
+
+ This is the last property in CSS3 Fonts which is prefixed.
+
+ * fast/text/font-kerning-expected.html:
+ * fast/text/font-kerning.html:
+
+2015-12-06 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r190848. rdar://problem/23769770
</span><span class="cx">
</span><span class="cx"> 2015-10-11 Myles C. Maxfield <mmaxfield@apple.com>
</span></span></pre></div>
<a id="branchessafari601branchLayoutTestsfasttextfontkerningexpectedhtml"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/LayoutTests/fast/text/font-kerning-expected.html (193578 => 193579)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/fast/text/font-kerning-expected.html 2015-12-06 10:37:16 UTC (rev 193578)
+++ branches/safari-601-branch/LayoutTests/fast/text/font-kerning-expected.html 2015-12-06 10:37:21 UTC (rev 193579)
</span><span class="lines">@@ -9,4 +9,12 @@
</span><span class="cx"> <div class="notkerned">AVAVAVAV</div>
</span><span class="cx"> <div class="kerned">AVAVAVAV</div>
</span><span class="cx"> <div class="kerned">AVAVAVAV</div>
</span><ins>+ <div style="position: absolute; left: 300px; top: 8px;">
+ <div class="notkerned">AVAVAVAV</div>
+ <div class="kerned">AVAVAVAV</div>
+ <div class="kerned">AVAVAVAV</div>
+ <div class="notkerned">AVAVAVAV</div>
+ <div class="kerned">AVAVAVAV</div>
+ <div class="kerned">AVAVAVAV</div>
+ </div>
</ins><span class="cx"> </body>
</span></span></pre></div>
<a id="branchessafari601branchLayoutTestsfasttextfontkerninghtml"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/LayoutTests/fast/text/font-kerning.html (193578 => 193579)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/fast/text/font-kerning.html 2015-12-06 10:37:16 UTC (rev 193578)
+++ branches/safari-601-branch/LayoutTests/fast/text/font-kerning.html 2015-12-06 10:37:21 UTC (rev 193579)
</span><span class="lines">@@ -1,7 +1,10 @@
</span><span class="cx"> <style>
</span><del>- .kerning-none { -webkit-font-kerning: none; }
- .kerning-auto { -webkit-font-kerning: auto; }
- .kerning-normal { -webkit-font-kerning: normal; }
</del><ins>+ .kerning-none { font-kerning: none; }
+ .kerning-auto { font-kerning: auto; }
+ .kerning-normal { font-kerning: normal; }
+ .webkit-kerning-none { -webkit-font-kerning: none; }
+ .webkit-kerning-auto { -webkit-font-kerning: auto; }
+ .webkit-kerning-normal { -webkit-font-kerning: normal; }
</ins><span class="cx"> </style>
</span><span class="cx"> <body style="font-size: 36px;">
</span><span class="cx"> <div>
</span><span class="lines">@@ -14,4 +17,16 @@
</span><span class="cx"> <div class="kerning-auto">AVAVAVAV</div>
</span><span class="cx"> <div class="kerning-normal">AVAVAVAV</div>
</span><span class="cx"> </div>
</span><ins>+ <div style="position: absolute; left: 300px; top: 8px;">
+ <div>
+ <div class="webkit-kerning-none">AVAVAVAV</div>
+ <div class="webkit-kerning-auto">AVAVAVAV</div>
+ <div class="webkit-kerning-normal">AVAVAVAV</div>
+ </div>
+ <div style="text-rendering: optimizelegibility">
+ <div class="webkit-kerning-none">AVAVAVAV</div>
+ <div class="webkit-kerning-auto">AVAVAVAV</div>
+ <div class="webkit-kerning-normal">AVAVAVAV</div>
+ </div>
+ </div>
</ins><span class="cx"> </body>
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/ChangeLog (193578 => 193579)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/ChangeLog 2015-12-06 10:37:16 UTC (rev 193578)
+++ branches/safari-601-branch/Source/WebCore/ChangeLog 2015-12-06 10:37:21 UTC (rev 193579)
</span><span class="lines">@@ -1,5 +1,22 @@
</span><span class="cx"> 2015-12-06 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r190999. rdar://problem/23769821
+
+ 2015-10-13 Myles C. Maxfield <mmaxfield@apple.com>
+
+ Unprefix font-kerning
+ https://bugs.webkit.org/show_bug.cgi?id=150080
+
+ Reviewed by Sam Weinig.
+
+ This is the last property in CSS3 Fonts which is prefixed.
+
+ Test: fast/text/font-kerning.html
+
+ * css/CSSPropertyNames.in:
+
+2015-12-06 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r190402. rdar://problem/23769741
</span><span class="cx">
</span><span class="cx"> 2015-10-01 Csaba Osztrogonác <ossy@webkit.org>
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCorecssCSSPropertyNamesin"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/css/CSSPropertyNames.in (193578 => 193579)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/css/CSSPropertyNames.in 2015-12-06 10:37:16 UTC (rev 193578)
+++ branches/safari-601-branch/Source/WebCore/css/CSSPropertyNames.in 2015-12-06 10:37:21 UTC (rev 193579)
</span><span class="lines">@@ -107,6 +107,7 @@
</span><span class="cx"> text-rendering [Inherited, FontProperty, NameForMethods=TextRenderingMode]
</span><span class="cx"> font-feature-settings [Inherited, FontProperty, Custom=Initial|Inherit, Converter=FontFeatureSettings, NameForMethods=FeatureSettings]
</span><span class="cx"> -webkit-font-kerning [Inherited, FontProperty, NameForMethods=Kerning]
</span><ins>+font-kerning = -webkit-font-kerning
</ins><span class="cx"> -webkit-font-smoothing [Inherited, FontProperty]
</span><span class="cx"> font-variant-ligatures [Inherited, FontProperty, NameForMethods=VariantLigatures, Custom=All]
</span><span class="cx"> font-variant-position [Inherited, FontProperty, NameForMethods=VariantPosition]
</span></span></pre>
</div>
</div>
</body>
</html>