<!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>[193537] 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/193537">193537</a></dd>
<dt>Author</dt> <dd>dburkart@apple.com</dd>
<dt>Date</dt> <dd>2015-12-05 16:46:54 -0800 (Sat, 05 Dec 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/190564">r190564</a>. rdar://problem/23769747</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari601branchLayoutTestsChangeLog">branches/safari-601-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari601branchLayoutTestscss3fontfeaturesettingsparsinghtml">branches/safari-601-branch/LayoutTests/css3/font-feature-settings-parsing.html</a></li>
<li><a href="#branchessafari601branchLayoutTestscss3fontfeaturesettingspreinstalledfontshtml">branches/safari-601-branch/LayoutTests/css3/font-feature-settings-preinstalled-fonts.html</a></li>
<li><a href="#branchessafari601branchLayoutTestscss3fontfeaturesettingsrendering2html">branches/safari-601-branch/LayoutTests/css3/font-feature-settings-rendering-2.html</a></li>
<li><a href="#branchessafari601branchLayoutTestscss3fontfeaturesettingsrenderinghtml">branches/safari-601-branch/LayoutTests/css3/font-feature-settings-rendering.html</a></li>
<li><a href="#branchessafari601branchLayoutTestsfastcssinheritedpropertiesraretextexpectedtxt">branches/safari-601-branch/LayoutTests/fast/css/inherited-properties-rare-text-expected.txt</a></li>
<li><a href="#branchessafari601branchLayoutTestsfastcssinheritedpropertiesraretexthtml">branches/safari-601-branch/LayoutTests/fast/css/inherited-properties-rare-text.html</a></li>
<li><a href="#branchessafari601branchLayoutTestsfasttextshapingshapingscriptorderhtml">branches/safari-601-branch/LayoutTests/fast/text/shaping/shaping-script-order.html</a></li>
<li><a href="#branchessafari601branchLayoutTestsfasttextshapingshapingselectionrecthtml">branches/safari-601-branch/LayoutTests/fast/text/shaping/shaping-selection-rect.html</a></li>
<li><a href="#branchessafari601branchLayoutTestsfontsunicodecharacterfontcrashhtml">branches/safari-601-branch/LayoutTests/fonts/unicode-character-font-crash.html</a></li>
<li><a href="#branchessafari601branchLayoutTestsscrollbarsscrollbarscrollbarpartsrepaintcrashhtml">branches/safari-601-branch/LayoutTests/scrollbars/scrollbar-scrollbarparts-repaint-crash.html</a></li>
<li><a href="#branchessafari601branchSourceWebCoreChangeLog">branches/safari-601-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari601branchSourceWebCorecssCSSComputedStyleDeclarationcpp">branches/safari-601-branch/Source/WebCore/css/CSSComputedStyleDeclaration.cpp</a></li>
<li><a href="#branchessafari601branchSourceWebCorecssCSSParsercpp">branches/safari-601-branch/Source/WebCore/css/CSSParser.cpp</a></li>
<li><a href="#branchessafari601branchSourceWebCorecssCSSPropertyNamesin">branches/safari-601-branch/Source/WebCore/css/CSSPropertyNames.in</a></li>
<li><a href="#branchessafari601branchSourceWebCorecssCSSValueKeywordsin">branches/safari-601-branch/Source/WebCore/css/CSSValueKeywords.in</a></li>
<li><a href="#branchessafari601branchSourceWebCorecssStyleBuilderCustomh">branches/safari-601-branch/Source/WebCore/css/StyleBuilderCustom.h</a></li>
<li><a href="#branchessafari601branchSourceWebInspectorUIChangeLog">branches/safari-601-branch/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#branchessafari601branchSourceWebInspectorUIUserInterfaceModelsCSSKeywordCompletionsjs">branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Models/CSSKeywordCompletions.js</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 (193536 => 193537)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/ChangeLog 2015-12-05 22:02:53 UTC (rev 193536)
+++ branches/safari-601-branch/LayoutTests/ChangeLog 2015-12-06 00:46:54 UTC (rev 193537)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2015-12-05 Dana Burkart <dburkart@apple.com>
+
+ Merge r190564. rdar://problem/23769747
+
+ 2015-10-05 Myles C. Maxfield <mmaxfield@apple.com>
+
+ Unprefix -webkit-font-feature-settings
+ https://bugs.webkit.org/show_bug.cgi?id=149722
+
+ Reviewed by Sam Weinig.
+
+ * css3/font-feature-settings-parsing.html:
+ * css3/font-feature-settings-preinstalled-fonts.html:
+ * css3/font-feature-settings-rendering-2.html:
+ * css3/font-feature-settings-rendering.html:
+ * fast/css/inherited-properties-rare-text-expected.txt:
+ * fast/css/inherited-properties-rare-text.html:
+ * fast/text/shaping/shaping-script-order.html:
+ * fast/text/shaping/shaping-selection-rect.html:
+ * fonts/unicode-character-font-crash.html:
+ * scrollbars/scrollbar-scrollbarparts-repaint-crash.html:
+
</ins><span class="cx"> 2015-12-05 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r192953. rdar://problem/23581540
</span></span></pre></div>
<a id="branchessafari601branchLayoutTestscss3fontfeaturesettingsparsinghtml"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/LayoutTests/css3/font-feature-settings-parsing.html (193536 => 193537)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/css3/font-feature-settings-parsing.html 2015-12-05 22:02:53 UTC (rev 193536)
+++ branches/safari-601-branch/LayoutTests/css3/font-feature-settings-parsing.html 2015-12-06 00:46:54 UTC (rev 193537)
</span><span class="lines">@@ -2,128 +2,128 @@
</span><span class="cx"> <head>
</span><span class="cx"> <style>
</span><span class="cx"> #valid_normal {
</span><del>- -webkit-font-feature-settings: normal;
</del><ins>+ font-feature-settings: normal;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #valid_value_1 {
</span><del>- -webkit-font-feature-settings: "dlig" 1;
</del><ins>+ font-feature-settings: "dlig" 1;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #valid_value_2 {
</span><del>- -webkit-font-feature-settings: "swsh" 2;
</del><ins>+ font-feature-settings: "swsh" 2;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #valid_value_on {
</span><del>- -webkit-font-feature-settings: "smcp" on;
</del><ins>+ font-feature-settings: "smcp" on;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #valid_value_off {
</span><del>- -webkit-font-feature-settings: "liga" off;
</del><ins>+ font-feature-settings: "liga" off;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #valid_value_omit {
</span><del>- -webkit-font-feature-settings: "c2sc";
</del><ins>+ font-feature-settings: "c2sc";
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #valid_valuelist {
</span><del>- -webkit-font-feature-settings: "tnum", 'hist';
</del><ins>+ font-feature-settings: "tnum", 'hist';
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #valid_singlequote {
</span><del>- -webkit-font-feature-settings: 'PKRN';
</del><ins>+ font-feature-settings: 'PKRN';
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #valid_unusual_tag {
</span><del>- -webkit-font-feature-settings: "!@#$";
</del><ins>+ font-feature-settings: "!@#$";
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #valid_tag_space {
</span><del>- -webkit-font-feature-settings: "a bc";
</del><ins>+ font-feature-settings: "a bc";
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #valid_composite {
</span><del>- -webkit-font-feature-settings: "dlig" 1, 'smcp' on, 'lig ' off;
</del><ins>+ font-feature-settings: "dlig" 1, 'smcp' on, 'lig ' off;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #invalid_ident {
</span><del>- -webkit-font-feature-settings: dlig;
</del><ins>+ font-feature-settings: dlig;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #invalid_cases {
</span><del>- -webkit-font-feature-settings: dlig, DLIG, DLig;
</del><ins>+ font-feature-settings: dlig, DLIG, DLig;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #invalid_1 {
</span><del>- -webkit-font-feature-settings: 1;
</del><ins>+ font-feature-settings: 1;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #invalid_off {
</span><del>- -webkit-font-feature-settings: off;
</del><ins>+ font-feature-settings: off;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #invalid_normal_duplicate {
</span><del>- -webkit-font-feature-settings: normal, normal;
</del><ins>+ font-feature-settings: normal, normal;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #invalid_normal_list {
</span><del>- -webkit-font-feature-settings: normal, aaaa;
</del><ins>+ font-feature-settings: normal, aaaa;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #invalid_longer_ident {
</span><del>- -webkit-font-feature-settings: aaaaa;
</del><ins>+ font-feature-settings: aaaaa;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #invalid_longer_quote {
</span><del>- -webkit-font-feature-settings: "aaaaa";
</del><ins>+ font-feature-settings: "aaaaa";
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #invalid_negative {
</span><del>- -webkit-font-feature-settings: aaaa -1;
</del><ins>+ font-feature-settings: aaaa -1;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #invalid_float {
</span><del>- -webkit-font-feature-settings: aaaa 1.5;
</del><ins>+ font-feature-settings: aaaa 1.5;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #invalid_missing_comma {
</span><del>- -webkit-font-feature-settings: aaaa "bbbb";
</del><ins>+ font-feature-settings: aaaa "bbbb";
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #invalid_missing_comma_ident {
</span><del>- -webkit-font-feature-settings: aaaa bbbb;
</del><ins>+ font-feature-settings: aaaa bbbb;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #invalid_comma {
</span><del>- -webkit-font-feature-settings: ,;
</del><ins>+ font-feature-settings: ,;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #invalid_ending_comma {
</span><del>- -webkit-font-feature-settings: aaaa,;
</del><ins>+ font-feature-settings: aaaa,;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #invalid_beginning_comma {
</span><del>- -webkit-font-feature-settings: ,aaaa;
</del><ins>+ font-feature-settings: ,aaaa;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #invalid_on {
</span><del>- -webkit-font-feature-settings: aaaa, on;
</del><ins>+ font-feature-settings: aaaa, on;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #invalid_0 {
</span><del>- -webkit-font-feature-settings: "aaaa" 1, "bbbb", 0;
</del><ins>+ font-feature-settings: "aaaa" 1, "bbbb", 0;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #invalid_composite {
</span><del>- -webkit-font-feature-settings: aaaaa on, dlig on, PKRN -1;
</del><ins>+ font-feature-settings: aaaaa on, dlig on, PKRN -1;
</ins><span class="cx"> }
</span><span class="cx"> </style>
</span><span class="cx"> <style>
</span><span class="cx"> @font-face {
</span><del>- -webkit-font-feature-settings: 'liga';
</del><ins>+ font-feature-settings: 'liga';
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> @font-face {
</span><del>- -webkit-font-feature-settings: aaaaa;
</del><ins>+ font-feature-settings: aaaaa;
</ins><span class="cx"> }
</span><span class="cx"> </style>
</span><span class="cx"> <script src="../resources/js-test-pre.js"></script>
</span><span class="lines">@@ -159,7 +159,7 @@
</span><span class="cx"> <div id="invalid_on"></div>
</span><span class="cx"> <div id="invalid_0"></div>
</span><span class="cx">
</span><del>-<div id="outer" style="-webkit-font-feature-settings: 'dlig';">
</del><ins>+<div id="outer" style="font-feature-settings: 'dlig';">
</ins><span class="cx"> <div id="inner"></div>
</span><span class="cx"> </div>
</span><span class="cx">
</span><span class="lines">@@ -170,7 +170,7 @@
</span><span class="cx">
</span><span class="cx"> function parseResultOf(id) {
</span><span class="cx"> var element = document.getElementById(id);
</span><del>- return window.getComputedStyle(element)['-webkit-font-feature-settings'];
</del><ins>+ return window.getComputedStyle(element)['font-feature-settings'];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> debug('- Tests valid inputs.');
</span><span class="lines">@@ -210,8 +210,8 @@
</span><span class="cx"> shouldBeEqualToString('parseResultOf("inner")', "'dlig' 1");
</span><span class="cx">
</span><span class="cx"> debug('- Tests @font-face.');
</span><del>-var fontFaceRuleValid = document.styleSheets[1].cssRules[0].style['-webkit-font-feature-settings'];
-var fontFaceRuleInvalid = document.styleSheets[1].cssRules[1].style['-webkit-font-feature-settings'];
</del><ins>+var fontFaceRuleValid = document.styleSheets[1].cssRules[0].style['font-feature-settings'];
+var fontFaceRuleInvalid = document.styleSheets[1].cssRules[1].style['font-feature-settings'];
</ins><span class="cx"> shouldBeEqualToString('fontFaceRuleValid', "'liga' 1");
</span><span class="cx"> shouldBeEqualToString('fontFaceRuleInvalid', "");
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari601branchLayoutTestscss3fontfeaturesettingspreinstalledfontshtml"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/LayoutTests/css3/font-feature-settings-preinstalled-fonts.html (193536 => 193537)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/css3/font-feature-settings-preinstalled-fonts.html 2015-12-05 22:02:53 UTC (rev 193536)
+++ branches/safari-601-branch/LayoutTests/css3/font-feature-settings-preinstalled-fonts.html 2015-12-06 00:46:54 UTC (rev 193537)
</span><span class="lines">@@ -14,7 +14,7 @@
</span><span class="cx"> var element = document.createElement("div");
</span><span class="cx"> element.textContent = "Lucky affluent actor asks to feast on giant 10.34\" cheese-filled quiche in fjord.";
</span><span class="cx"> element.style.fontFamily = font;
</span><del>- element.style.webkitFontFeatureSettings = feature;
</del><ins>+ element.style.fontFeatureSettings = feature;
</ins><span class="cx"> document.body.appendChild(element);
</span><span class="cx"> });
</span><span class="cx"> });
</span></span></pre></div>
<a id="branchessafari601branchLayoutTestscss3fontfeaturesettingsrendering2html"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/LayoutTests/css3/font-feature-settings-rendering-2.html (193536 => 193537)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/css3/font-feature-settings-rendering-2.html 2015-12-05 22:02:53 UTC (rev 193536)
+++ branches/safari-601-branch/LayoutTests/css3/font-feature-settings-rendering-2.html 2015-12-06 00:46:54 UTC (rev 193537)
</span><span class="lines">@@ -20,7 +20,7 @@
</span><span class="cx"> var element = document.createElement("span");
</span><span class="cx"> element.textContent = c;
</span><span class="cx"> element.style.fontFamily = "FontFeaturesTest";
</span><del>- element.style.webkitFontFeatureSettings = '"' + feature + '" ' + state;
</del><ins>+ element.style.fontFeatureSettings = '"' + feature + '" ' + state;
</ins><span class="cx"> insertionpoint.appendChild(element);
</span><span class="cx"> });
</span><span class="cx"> insertionpoint.appendChild(document.createTextNode(" "));
</span></span></pre></div>
<a id="branchessafari601branchLayoutTestscss3fontfeaturesettingsrenderinghtml"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/LayoutTests/css3/font-feature-settings-rendering.html (193536 => 193537)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/css3/font-feature-settings-rendering.html 2015-12-05 22:02:53 UTC (rev 193536)
+++ branches/safari-601-branch/LayoutTests/css3/font-feature-settings-rendering.html 2015-12-06 00:46:54 UTC (rev 193537)
</span><span class="lines">@@ -11,11 +11,11 @@
</span><span class="cx"> }
</span><span class="cx"> .dligOn {
</span><span class="cx"> font-family: 'test';
</span><del>- -webkit-font-feature-settings: 'dlig';
</del><ins>+ font-feature-settings: 'dlig';
</ins><span class="cx"> }
</span><span class="cx"> .dligOff {
</span><span class="cx"> font-family: 'test';
</span><del>- -webkit-font-feature-settings: 'dlig' 0;
</del><ins>+ font-feature-settings: 'dlig' 0;
</ins><span class="cx"> }
</span><span class="cx"> .dligNone {
</span><span class="cx"> font-family: 'test';
</span></span></pre></div>
<a id="branchessafari601branchLayoutTestsfastcssinheritedpropertiesraretextexpectedtxt"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/LayoutTests/fast/css/inherited-properties-rare-text-expected.txt (193536 => 193537)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/fast/css/inherited-properties-rare-text-expected.txt 2015-12-05 22:02:53 UTC (rev 193536)
+++ branches/safari-601-branch/LayoutTests/fast/css/inherited-properties-rare-text-expected.txt 2015-12-06 00:46:54 UTC (rev 193537)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><del>-test1 -webkit-font-feature-settings: 'dlig' 1
-test2 -webkit-font-feature-settings: normal
</del><ins>+test1 font-feature-settings: 'dlig' 1
+test2 font-feature-settings: normal
</ins><span class="cx"> test1 -webkit-font-smoothing: antialiased
</span><span class="cx"> test2 -webkit-font-smoothing: auto
</span><span class="cx"> test1 -webkit-text-orientation: upright
</span></span></pre></div>
<a id="branchessafari601branchLayoutTestsfastcssinheritedpropertiesraretexthtml"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/LayoutTests/fast/css/inherited-properties-rare-text.html (193536 => 193537)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/fast/css/inherited-properties-rare-text.html 2015-12-05 22:02:53 UTC (rev 193536)
+++ branches/safari-601-branch/LayoutTests/fast/css/inherited-properties-rare-text.html 2015-12-06 00:46:54 UTC (rev 193537)
</span><span class="lines">@@ -3,7 +3,7 @@
</span><span class="cx"> testRunner.dumpAsText();
</span><span class="cx"> </script>
</span><span class="cx"> <style>
</span><del>-.a { -webkit-font-feature-settings: 'dlig'; -webkit-font-smoothing: antialiased; -webkit-text-orientation: upright; }
</del><ins>+.a { font-feature-settings: 'dlig'; -webkit-font-smoothing: antialiased; -webkit-text-orientation: upright; }
</ins><span class="cx"> </style>
</span><span class="cx"> <div class=a>
</span><span class="cx"> <div id=test1></div>
</span><span class="lines">@@ -16,10 +16,10 @@
</span><span class="cx"> document.write(e + " " + p + ": " + cssValue.cssText + "<br>");
</span><span class="cx"> }
</span><span class="cx">
</span><del>-test('test1', '-webkit-font-feature-settings');
-test('test2', '-webkit-font-feature-settings');
</del><ins>+test('test1', 'font-feature-settings');
+test('test2', 'font-feature-settings');
</ins><span class="cx"> test('test1', '-webkit-font-smoothing');
</span><span class="cx"> test('test2', '-webkit-font-smoothing');
</span><span class="cx"> test('test1', '-webkit-text-orientation');
</span><span class="cx"> test('test2', '-webkit-text-orientation');
</span><del>-</script>
</del><span class="cx">\ No newline at end of file
</span><ins>+</script>
</ins></span></pre></div>
<a id="branchessafari601branchLayoutTestsfasttextshapingshapingscriptorderhtml"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/LayoutTests/fast/text/shaping/shaping-script-order.html (193536 => 193537)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/fast/text/shaping/shaping-script-order.html 2015-12-05 22:02:53 UTC (rev 193536)
+++ branches/safari-601-branch/LayoutTests/fast/text/shaping/shaping-script-order.html 2015-12-06 00:46:54 UTC (rev 193537)
</span><span class="lines">@@ -11,6 +11,6 @@
</span><span class="cx"> <body>
</span><span class="cx"> The following two lines should be the same:
</span><span class="cx"> <p class="lro">abc&#x05d2;&#x05d1;&#x05d0;&#x0661;&#x0662;&#x0663;</p>
</span><del>-<p class="lro" style="-webkit-font-feature-settings: 'kern';">abc&#x05d2;&#x05d1;&#x05d0;&#x0661;&#x0662;&#x0663;</p>
</del><ins>+<p class="lro" style="font-feature-settings: 'kern';">abc&#x05d2;&#x05d1;&#x05d0;&#x0661;&#x0662;&#x0663;</p>
</ins><span class="cx"> </body>
</span><span class="cx"> </html>
</span></span></pre></div>
<a id="branchessafari601branchLayoutTestsfasttextshapingshapingselectionrecthtml"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/LayoutTests/fast/text/shaping/shaping-selection-rect.html (193536 => 193537)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/fast/text/shaping/shaping-selection-rect.html 2015-12-05 22:02:53 UTC (rev 193536)
+++ branches/safari-601-branch/LayoutTests/fast/text/shaping/shaping-selection-rect.html 2015-12-06 00:46:54 UTC (rev 193537)
</span><span class="lines">@@ -9,10 +9,10 @@
</span><span class="cx"> unicode-bidi: bidi-override;
</span><span class="cx"> }
</span><span class="cx"> #kerning {
</span><del>- -webkit-font-feature-settings: 'kern';
</del><ins>+ font-feature-settings: 'kern';
</ins><span class="cx"> }
</span><span class="cx"> #smallcaps {
</span><del>- -webkit-font-feature-settings: 'smcp';
</del><ins>+ font-feature-settings: 'smcp';
</ins><span class="cx"> }
</span><span class="cx"> </style>
</span><span class="cx"> <script>
</span></span></pre></div>
<a id="branchessafari601branchLayoutTestsfontsunicodecharacterfontcrashhtml"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/LayoutTests/fonts/unicode-character-font-crash.html (193536 => 193537)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/fonts/unicode-character-font-crash.html 2015-12-05 22:02:53 UTC (rev 193536)
+++ branches/safari-601-branch/LayoutTests/fonts/unicode-character-font-crash.html 2015-12-06 00:46:54 UTC (rev 193537)
</span><span class="lines">@@ -2,7 +2,7 @@
</span><span class="cx">
</span><span class="cx"> <head>
</span><span class="cx"> <style>
</span><del>-.texhtml{-webkit-font-feature-settings:"lnum","tnum"}
</del><ins>+.texhtml{font-feature-settings:"lnum","tnum"}
</ins><span class="cx"> </style>
</span><span class="cx"> </head>
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari601branchLayoutTestsscrollbarsscrollbarscrollbarpartsrepaintcrashhtml"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/LayoutTests/scrollbars/scrollbar-scrollbarparts-repaint-crash.html (193536 => 193537)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/scrollbars/scrollbar-scrollbarparts-repaint-crash.html 2015-12-05 22:02:53 UTC (rev 193536)
+++ branches/safari-601-branch/LayoutTests/scrollbars/scrollbar-scrollbarparts-repaint-crash.html 2015-12-06 00:46:54 UTC (rev 193537)
</span><span class="lines">@@ -3,7 +3,7 @@
</span><span class="cx"> <head>
</span><span class="cx"> <style>
</span><span class="cx"> body::-webkit-scrollbar {
</span><del>- -webkit-font-feature-settings: "a bc";
</del><ins>+ font-feature-settings: "a bc";
</ins><span class="cx"> }
</span><span class="cx"> </style>
</span><span class="cx"> <script>
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/ChangeLog (193536 => 193537)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/ChangeLog 2015-12-05 22:02:53 UTC (rev 193536)
+++ branches/safari-601-branch/Source/WebCore/ChangeLog 2015-12-06 00:46:54 UTC (rev 193537)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2015-12-05 Dana Burkart <dburkart@apple.com>
+
+ Merge r190564. rdar://problem/23769747
+
+ 2015-10-05 Myles C. Maxfield <mmaxfield@apple.com>
+
+ Unprefix -webkit-font-feature-settings
+ https://bugs.webkit.org/show_bug.cgi?id=149722
+
+ Reviewed by Sam Weinig.
+
+ * css/CSSComputedStyleDeclaration.cpp:
+ (WebCore::ComputedStyleExtractor::propertyValue):
+ * css/CSSParser.cpp:
+ (WebCore::CSSParser::parseValue):
+ (WebCore::CSSParser::parseFontFeatureSettings):
+ * css/CSSPropertyNames.in:
+ * css/CSSValueKeywords.in:
+ * css/StyleBuilderCustom.h:
+ (WebCore::StyleBuilderCustom::applyInitialFontFeatureSettings):
+ (WebCore::StyleBuilderCustom::applyInheritFontFeatureSettings):
+ (WebCore::StyleBuilderCustom::applyInitialWebkitFontFeatureSettings): Deleted.
+ (WebCore::StyleBuilderCustom::applyInheritWebkitFontFeatureSettings): Deleted.
+
</ins><span class="cx"> 2015-12-05 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r192953. rdar://problem/23581540
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCorecssCSSComputedStyleDeclarationcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/css/CSSComputedStyleDeclaration.cpp (193536 => 193537)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/css/CSSComputedStyleDeclaration.cpp 2015-12-05 22:02:53 UTC (rev 193536)
+++ branches/safari-601-branch/Source/WebCore/css/CSSComputedStyleDeclaration.cpp 2015-12-06 00:46:54 UTC (rev 193537)
</span><span class="lines">@@ -2322,7 +2322,7 @@
</span><span class="cx"> return fontWeightFromStyle(style.get());
</span><span class="cx"> case CSSPropertyFontSynthesis:
</span><span class="cx"> return fontSynthesisFromStyle(*style);
</span><del>- case CSSPropertyWebkitFontFeatureSettings: {
</del><ins>+ case CSSPropertyFontFeatureSettings: {
</ins><span class="cx"> const FontFeatureSettings* featureSettings = style->fontDescription().featureSettings();
</span><span class="cx"> if (!featureSettings || !featureSettings->size())
</span><span class="cx"> return cssValuePool().createIdentifierValue(CSSValueNormal);
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCorecssCSSParsercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/css/CSSParser.cpp (193536 => 193537)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/css/CSSParser.cpp 2015-12-05 22:02:53 UTC (rev 193536)
+++ branches/safari-601-branch/Source/WebCore/css/CSSParser.cpp 2015-12-06 00:46:54 UTC (rev 193537)
</span><span class="lines">@@ -3080,7 +3080,7 @@
</span><span class="cx"> else
</span><span class="cx"> return parseLineBoxContain(important);
</span><span class="cx"> break;
</span><del>- case CSSPropertyWebkitFontFeatureSettings:
</del><ins>+ case CSSPropertyFontFeatureSettings:
</ins><span class="cx"> if (id == CSSValueNormal)
</span><span class="cx"> validPrimitive = true;
</span><span class="cx"> else
</span><span class="lines">@@ -10517,7 +10517,7 @@
</span><span class="cx"> if (m_valueList->size() == 1 && m_valueList->current()->id == CSSValueNormal) {
</span><span class="cx"> RefPtr<CSSPrimitiveValue> normalValue = cssValuePool().createIdentifierValue(CSSValueNormal);
</span><span class="cx"> m_valueList->next();
</span><del>- addProperty(CSSPropertyWebkitFontFeatureSettings, normalValue.release(), important);
</del><ins>+ addProperty(CSSPropertyFontFeatureSettings, normalValue.release(), important);
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -10532,7 +10532,7 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx"> if (settings->length()) {
</span><del>- addProperty(CSSPropertyWebkitFontFeatureSettings, settings.release(), important);
</del><ins>+ addProperty(CSSPropertyFontFeatureSettings, settings.release(), important);
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx"> return false;
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCorecssCSSPropertyNamesin"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/css/CSSPropertyNames.in (193536 => 193537)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/css/CSSPropertyNames.in 2015-12-05 22:02:53 UTC (rev 193536)
+++ branches/safari-601-branch/Source/WebCore/css/CSSPropertyNames.in 2015-12-06 00:46:54 UTC (rev 193537)
</span><span class="lines">@@ -105,7 +105,7 @@
</span><span class="cx"> font-variant [Inherited, FontProperty, NameForMethods=SmallCaps]
</span><span class="cx"> font-weight [Inherited, Custom=All]
</span><span class="cx"> text-rendering [Inherited, FontProperty, NameForMethods=TextRenderingMode]
</span><del>--webkit-font-feature-settings [Inherited, FontProperty, Custom=Initial|Inherit, Converter=FontFeatureSettings, NameForMethods=FeatureSettings]
</del><ins>+font-feature-settings [Inherited, FontProperty, Custom=Initial|Inherit, Converter=FontFeatureSettings, NameForMethods=FeatureSettings]
</ins><span class="cx"> -webkit-font-kerning [Inherited, FontProperty, NameForMethods=Kerning]
</span><span class="cx"> -webkit-font-smoothing [Inherited, FontProperty]
</span><span class="cx"> -webkit-font-variant-ligatures [Inherited, Custom=All]
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCorecssCSSValueKeywordsin"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/css/CSSValueKeywords.in (193536 => 193537)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/css/CSSValueKeywords.in 2015-12-05 22:02:53 UTC (rev 193536)
+++ branches/safari-601-branch/Source/WebCore/css/CSSValueKeywords.in 2015-12-06 00:46:54 UTC (rev 193537)
</span><span class="lines">@@ -1009,7 +1009,7 @@
</span><span class="cx"> initial-letter
</span><span class="cx"> replaced
</span><span class="cx">
</span><del>-// -webkit-font-feature-settings
</del><ins>+// font-feature-settings
</ins><span class="cx"> on
</span><span class="cx"> off
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCorecssStyleBuilderCustomh"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/css/StyleBuilderCustom.h (193536 => 193537)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/css/StyleBuilderCustom.h 2015-12-05 22:02:53 UTC (rev 193536)
+++ branches/safari-601-branch/Source/WebCore/css/StyleBuilderCustom.h 2015-12-06 00:46:54 UTC (rev 193537)
</span><span class="lines">@@ -107,8 +107,8 @@
</span><span class="cx"> // Custom handling of initial + inherit value setting only.
</span><span class="cx"> static void applyInitialWebkitMaskImage(StyleResolver&) { }
</span><span class="cx"> static void applyInheritWebkitMaskImage(StyleResolver&) { }
</span><del>- static void applyInitialWebkitFontFeatureSettings(StyleResolver&) { }
- static void applyInheritWebkitFontFeatureSettings(StyleResolver&) { }
</del><ins>+ static void applyInitialFontFeatureSettings(StyleResolver&) { }
+ static void applyInheritFontFeatureSettings(StyleResolver&) { }
</ins><span class="cx">
</span><span class="cx"> // Custom handling of inherit + value setting only.
</span><span class="cx"> static void applyInheritDisplay(StyleResolver&);
</span></span></pre></div>
<a id="branchessafari601branchSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/ChangeLog (193536 => 193537)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/ChangeLog 2015-12-05 22:02:53 UTC (rev 193536)
+++ branches/safari-601-branch/Source/WebInspectorUI/ChangeLog 2015-12-06 00:46:54 UTC (rev 193537)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2015-12-05 Dana Burkart <dburkart@apple.com>
+
+ Merge r190564. rdar://problem/23769747
+
+ 2015-10-05 Myles C. Maxfield <mmaxfield@apple.com>
+
+ Unprefix -webkit-font-feature-settings
+ https://bugs.webkit.org/show_bug.cgi?id=149722
+
+ Reviewed by Sam Weinig.
+
+ * UserInterface/Models/CSSKeywordCompletions.js:
+
</ins><span class="cx"> 2015-12-04 Timothy Hatcher <timothy@apple.com>
</span><span class="cx">
</span><span class="cx"> <rdar://problem/23764741> REGRESSION: Recording does not show the progress till the recording is stopped.
</span></span></pre></div>
<a id="branchessafari601branchSourceWebInspectorUIUserInterfaceModelsCSSKeywordCompletionsjs"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Models/CSSKeywordCompletions.js (193536 => 193537)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Models/CSSKeywordCompletions.js 2015-12-05 22:02:53 UTC (rev 193536)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Models/CSSKeywordCompletions.js 2015-12-06 00:46:54 UTC (rev 193537)
</span><span class="lines">@@ -101,7 +101,7 @@
</span><span class="cx"> "stroke-width", "tab-size", "text-align", "text-anchor", "text-decoration", "text-indent", "text-rendering",
</span><span class="cx"> "text-shadow", "text-transform", "visibility", "voice-family", "volume", "white-space", "widows", "word-break",
</span><span class="cx"> "word-spacing", "word-wrap", "writing-mode", "-webkit-aspect-ratio", "-webkit-border-horizontal-spacing",
</span><del>- "-webkit-border-vertical-spacing", "-webkit-box-direction", "-webkit-color-correction", "-webkit-font-feature-settings",
</del><ins>+ "-webkit-border-vertical-spacing", "-webkit-box-direction", "-webkit-color-correction", "font-feature-settings",
</ins><span class="cx"> "-webkit-font-kerning", "-webkit-font-smoothing", "-webkit-font-variant-ligatures",
</span><span class="cx"> "-webkit-hyphenate-character", "-webkit-hyphenate-limit-after", "-webkit-hyphenate-limit-before",
</span><span class="cx"> "-webkit-hyphenate-limit-lines", "-webkit-hyphens", "-webkit-line-align", "-webkit-line-box-contain",
</span><span class="lines">@@ -958,7 +958,7 @@
</span><span class="cx"> "-webkit-line-box-contain": [
</span><span class="cx"> "block", "inline", "font", "glyphs", "replaced", "inline-box", "none"
</span><span class="cx"> ],
</span><del>- "-webkit-font-feature-settings": [
</del><ins>+ "font-feature-settings": [
</ins><span class="cx"> "normal"
</span><span class="cx"> ],
</span><span class="cx"> "-webkit-font-variant-ligatures": [
</span></span></pre>
</div>
</div>
</body>
</html>