<!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>[197215] trunk</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/197215">197215</a></dd>
<dt>Author</dt> <dd>ryanhaddad@apple.com</dd>
<dt>Date</dt> <dd>2016-02-26 15:39:45 -0800 (Fri, 26 Feb 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Unreviewed, rolling out <a href="http://trac.webkit.org/projects/webkit/changeset/197160">r197160</a>.
https://bugs.webkit.org/show_bug.cgi?id=154757
This change causes editing/mac/attributed-string/font-
size.html to fail on El Capitan WK1 (Requested by ryanhaddad
on #webkit).
Reverted changeset:
"Font size computed style is innaccurate"
https://bugs.webkit.org/show_bug.cgi?id=154705
http://trac.webkit.org/changeset/197160
Patch by Commit Queue <commit-queue@webkit.org> on 2016-02-26</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestscss3calcfontsizefractionalexpectedtxt">trunk/LayoutTests/css3/calc/font-size-fractional-expected.txt</a></li>
<li><a href="#trunkLayoutTestscss3viewportpercentagelengthsviewportpercentagelengthsrelativefontsizeexpectedtxt">trunk/LayoutTests/css3/viewport-percentage-lengths/viewport-percentage-lengths-relative-font-size-expected.txt</a></li>
<li><a href="#trunkLayoutTestscss3viewportpercentagelengthsviewportpercentagelengthsrelativefontsizehtml">trunk/LayoutTests/css3/viewport-percentage-lengths/viewport-percentage-lengths-relative-font-size.html</a></li>
<li><a href="#trunkLayoutTestseditingmacattributedstringfontsizeexpectedtxt">trunk/LayoutTests/editing/mac/attributed-string/font-size-expected.txt</a></li>
<li><a href="#trunkLayoutTestseditingmacattributedstringverticalalignexpectedtxt">trunk/LayoutTests/editing/mac/attributed-string/vertical-align-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacmaverickseditingmacattributedstringfontsizeexpectedtxt">trunk/LayoutTests/platform/mac-mavericks/editing/mac/attributed-string/font-size-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacmaverickseditingmacattributedstringverticalalignexpectedtxt">trunk/LayoutTests/platform/mac-mavericks/editing/mac/attributed-string/vertical-align-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacyosemiteeditingmacattributedstringfontsizeexpectedtxt">trunk/LayoutTests/platform/mac-yosemite/editing/mac/attributed-string/font-size-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacyosemiteeditingmacattributedstringverticalalignexpectedtxt">trunk/LayoutTests/platform/mac-yosemite/editing/mac/attributed-string/vertical-align-expected.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorecssCSSComputedStyleDeclarationcpp">trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (197214 => 197215)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-02-26 23:33:45 UTC (rev 197214)
+++ trunk/LayoutTests/ChangeLog 2016-02-26 23:39:45 UTC (rev 197215)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2016-02-26 Commit Queue <commit-queue@webkit.org>
+
+ Unreviewed, rolling out r197160.
+ https://bugs.webkit.org/show_bug.cgi?id=154757
+
+ This change causes editing/mac/attributed-string/font-
+ size.html to fail on El Capitan WK1 (Requested by ryanhaddad
+ on #webkit).
+
+ Reverted changeset:
+
+ "Font size computed style is innaccurate"
+ https://bugs.webkit.org/show_bug.cgi?id=154705
+ http://trac.webkit.org/changeset/197160
+
</ins><span class="cx"> 2016-02-26 Ryan Haddad <ryanhaddad@apple.com>
</span><span class="cx">
</span><span class="cx"> Skip js/basic-map.html on Mac since it is already run in JSC tests
</span></span></pre></div>
<a id="trunkLayoutTestscss3calcfontsizefractionalexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/css3/calc/font-size-fractional-expected.txt (197214 => 197215)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/calc/font-size-fractional-expected.txt 2016-02-26 23:33:45 UTC (rev 197214)
+++ trunk/LayoutTests/css3/calc/font-size-fractional-expected.txt 2016-02-26 23:39:45 UTC (rev 197215)
</span><span class="lines">@@ -4,7 +4,7 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> PASS getComputedStyle(document.getElementById("calc-reduce"), null).lineHeight is "24px"
</span><del>-PASS getComputedStyle(document.getElementById("calc-reduce"), null).fontSize is "9.600000381469727px"
</del><ins>+PASS getComputedStyle(document.getElementById("calc-reduce"), null).fontSize is "10px"
</ins><span class="cx"> PASS successfullyParsed is true
</span><span class="cx">
</span><span class="cx"> TEST COMPLETE
</span></span></pre></div>
<a id="trunkLayoutTestscss3viewportpercentagelengthsviewportpercentagelengthsrelativefontsizeexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/css3/viewport-percentage-lengths/viewport-percentage-lengths-relative-font-size-expected.txt (197214 => 197215)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/viewport-percentage-lengths/viewport-percentage-lengths-relative-font-size-expected.txt 2016-02-26 23:33:45 UTC (rev 197214)
+++ trunk/LayoutTests/css3/viewport-percentage-lengths/viewport-percentage-lengths-relative-font-size-expected.txt 2016-02-26 23:39:45 UTC (rev 197215)
</span><span class="lines">@@ -15,17 +15,17 @@
</span><span class="cx"> PASS innerHeight is 600
</span><span class="cx"> PASS getComputedStyle(container).fontSize is "45px"
</span><span class="cx"> PASS getComputedStyle(ems).fontSize is "180px"
</span><del>-PASS getComputedStyle(percent).fontSize is "22.5px"
</del><ins>+PASS getComputedStyle(percent).fontSize is "23px"
</ins><span class="cx"> PASS innerWidth is 900
</span><span class="cx"> PASS innerHeight is 640
</span><span class="cx"> PASS getComputedStyle(container).fontSize is "45px"
</span><span class="cx"> PASS getComputedStyle(ems).fontSize is "180px"
</span><del>-PASS getComputedStyle(percent).fontSize is "22.5px"
</del><ins>+PASS getComputedStyle(percent).fontSize is "23px"
</ins><span class="cx"> PASS innerWidth is 500
</span><span class="cx"> PASS innerHeight is 640
</span><span class="cx"> PASS getComputedStyle(container).fontSize is "25px"
</span><span class="cx"> PASS getComputedStyle(ems).fontSize is "100px"
</span><del>-PASS getComputedStyle(percent).fontSize is "12.5px"
</del><ins>+PASS getComputedStyle(percent).fontSize is "13px"
</ins><span class="cx"> PASS innerWidth is 800
</span><span class="cx"> PASS innerHeight is 600
</span><span class="cx"> PASS getComputedStyle(container).fontSize is "40px"
</span></span></pre></div>
<a id="trunkLayoutTestscss3viewportpercentagelengthsviewportpercentagelengthsrelativefontsizehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/css3/viewport-percentage-lengths/viewport-percentage-lengths-relative-font-size.html (197214 => 197215)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/viewport-percentage-lengths/viewport-percentage-lengths-relative-font-size.html 2016-02-26 23:33:45 UTC (rev 197214)
+++ trunk/LayoutTests/css3/viewport-percentage-lengths/viewport-percentage-lengths-relative-font-size.html 2016-02-26 23:39:45 UTC (rev 197215)
</span><span class="lines">@@ -21,9 +21,9 @@
</span><span class="cx"> <script>
</span><span class="cx"> description("Test that relative font sizes work when the parent is in viewport units.");
</span><span class="cx"> standardResizeTest(function () {
</span><del>- shouldBeEqualToString("getComputedStyle(container).fontSize", (innerWidth / 20) + "px");
- shouldBeEqualToString("getComputedStyle(ems).fontSize", (innerWidth / 5) + "px");
- shouldBeEqualToString("getComputedStyle(percent).fontSize", (innerWidth / 40) + "px");
</del><ins>+ shouldBeEqualToString("getComputedStyle(container).fontSize", Math.round(innerWidth / 20) + "px");
+ shouldBeEqualToString("getComputedStyle(ems).fontSize", Math.round(innerWidth / 5) + "px");
+ shouldBeEqualToString("getComputedStyle(percent).fontSize", Math.round(innerWidth / 40) + "px");
</ins><span class="cx"> });
</span><span class="cx"> </script>
</span><span class="cx"> <script src="../../resources/js-test-post.js"></script>
</span></span></pre></div>
<a id="trunkLayoutTestseditingmacattributedstringfontsizeexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/editing/mac/attributed-string/font-size-expected.txt (197214 => 197215)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/editing/mac/attributed-string/font-size-expected.txt 2016-02-26 23:33:45 UTC (rev 197214)
+++ trunk/LayoutTests/editing/mac/attributed-string/font-size-expected.txt 2016-02-26 23:39:45 UTC (rev 197215)
</span><span class="lines">@@ -34,7 +34,7 @@
</span><span class="cx"> HeaderLevel: 0
</span><span class="cx"> [small element]
</span><span class="cx"> NSColor: #000000 (NSDeviceRGBColorSpace)
</span><del>- NSFont: Times-Roman 13.33 pt.
</del><ins>+ NSFont: Times-Roman 13.00 pt.
</ins><span class="cx"> NSKern: 0pt
</span><span class="cx"> NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
</span><span class="cx"> NSStrokeWidth: 0
</span><span class="lines">@@ -385,7 +385,7 @@
</span><span class="cx"> HeaderLevel: 0
</span><span class="cx"> [ ]
</span><span class="cx"> NSColor: #000000 (NSDeviceRGBColorSpace)
</span><del>- NSFont: Times-Roman 16.67 pt.
</del><ins>+ NSFont: Times-Roman 16.00 pt.
</ins><span class="cx"> NSKern: 0pt
</span><span class="cx"> NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
</span><span class="cx"> NSStrokeWidth: 0
</span></span></pre></div>
<a id="trunkLayoutTestseditingmacattributedstringverticalalignexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/editing/mac/attributed-string/vertical-align-expected.txt (197214 => 197215)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/editing/mac/attributed-string/vertical-align-expected.txt 2016-02-26 23:33:45 UTC (rev 197214)
+++ trunk/LayoutTests/editing/mac/attributed-string/vertical-align-expected.txt 2016-02-26 23:39:45 UTC (rev 197215)
</span><span class="lines">@@ -29,7 +29,7 @@
</span><span class="cx"> HeaderLevel: 0
</span><span class="cx"> [sup element]
</span><span class="cx"> NSColor: #000000 (NSDeviceRGBColorSpace)
</span><del>- NSFont: Times-Roman 13.33 pt.
</del><ins>+ NSFont: Times-Roman 13.00 pt.
</ins><span class="cx"> NSKern: 0pt
</span><span class="cx"> NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
</span><span class="cx"> NSStrokeWidth: 0
</span><span class="lines">@@ -84,7 +84,7 @@
</span><span class="cx"> HeaderLevel: 0
</span><span class="cx"> [sub element]
</span><span class="cx"> NSColor: #000000 (NSDeviceRGBColorSpace)
</span><del>- NSFont: Times-Roman 13.33 pt.
</del><ins>+ NSFont: Times-Roman 13.00 pt.
</ins><span class="cx"> NSKern: 0pt
</span><span class="cx"> NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
</span><span class="cx"> NSStrokeWidth: 0
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacmaverickseditingmacattributedstringfontsizeexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac-mavericks/editing/mac/attributed-string/font-size-expected.txt (197214 => 197215)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-mavericks/editing/mac/attributed-string/font-size-expected.txt 2016-02-26 23:33:45 UTC (rev 197214)
+++ trunk/LayoutTests/platform/mac-mavericks/editing/mac/attributed-string/font-size-expected.txt 2016-02-26 23:39:45 UTC (rev 197215)
</span><span class="lines">@@ -31,7 +31,7 @@
</span><span class="cx"> TighteningFactor: 0.05
</span><span class="cx"> HeaderLevel: 0
</span><span class="cx"> [small element]
</span><del>- NSFont: Times-Roman 13.33 pt.
</del><ins>+ NSFont: Times-Roman 13.00 pt.
</ins><span class="cx"> NSParagraphStyle:
</span><span class="cx"> Alignment 4
</span><span class="cx"> LineSpacing: 0
</span><span class="lines">@@ -325,7 +325,7 @@
</span><span class="cx"> TighteningFactor: 0.05
</span><span class="cx"> HeaderLevel: 0
</span><span class="cx"> [5pt]
</span><del>- NSFont: Times-Roman 6.67 pt.
</del><ins>+ NSFont: Times-Roman 7.00 pt.
</ins><span class="cx"> NSParagraphStyle:
</span><span class="cx"> Alignment 4
</span><span class="cx"> LineSpacing: 0
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacmaverickseditingmacattributedstringverticalalignexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac-mavericks/editing/mac/attributed-string/vertical-align-expected.txt (197214 => 197215)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-mavericks/editing/mac/attributed-string/vertical-align-expected.txt 2016-02-26 23:33:45 UTC (rev 197214)
+++ trunk/LayoutTests/platform/mac-mavericks/editing/mac/attributed-string/vertical-align-expected.txt 2016-02-26 23:39:45 UTC (rev 197215)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> TighteningFactor: 0.05
</span><span class="cx"> HeaderLevel: 0
</span><span class="cx"> [sup element]
</span><del>- NSFont: Times-Roman 13.33 pt.
</del><ins>+ NSFont: Times-Roman 13.00 pt.
</ins><span class="cx"> NSSuperScript: 1
</span><span class="cx"> NSParagraphStyle:
</span><span class="cx"> Alignment 4
</span><span class="lines">@@ -69,7 +69,7 @@
</span><span class="cx"> TighteningFactor: 0.05
</span><span class="cx"> HeaderLevel: 0
</span><span class="cx"> [sub element]
</span><del>- NSFont: Times-Roman 13.33 pt.
</del><ins>+ NSFont: Times-Roman 13.00 pt.
</ins><span class="cx"> NSSuperScript: -1
</span><span class="cx"> NSParagraphStyle:
</span><span class="cx"> Alignment 4
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacyosemiteeditingmacattributedstringfontsizeexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac-yosemite/editing/mac/attributed-string/font-size-expected.txt (197214 => 197215)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-yosemite/editing/mac/attributed-string/font-size-expected.txt 2016-02-26 23:33:45 UTC (rev 197214)
+++ trunk/LayoutTests/platform/mac-yosemite/editing/mac/attributed-string/font-size-expected.txt 2016-02-26 23:39:45 UTC (rev 197215)
</span><span class="lines">@@ -32,7 +32,7 @@
</span><span class="cx"> HeaderLevel: 0
</span><span class="cx"> [small element]
</span><span class="cx"> NSColor: #000000 (NSDeviceRGBColorSpace)
</span><del>- NSFont: Times-Roman 13.33 pt.
</del><ins>+ NSFont: Times-Roman 13.00 pt.
</ins><span class="cx"> NSKern: 0pt
</span><span class="cx"> NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
</span><span class="cx"> NSStrokeWidth: 0
</span><span class="lines">@@ -382,7 +382,7 @@
</span><span class="cx"> HeaderLevel: 0
</span><span class="cx"> [5pt]
</span><span class="cx"> NSColor: #000000 (NSDeviceRGBColorSpace)
</span><del>- NSFont: Times-Roman 6.67 pt.
</del><ins>+ NSFont: Times-Roman 7.00 pt.
</ins><span class="cx"> NSKern: 0pt
</span><span class="cx"> NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
</span><span class="cx"> NSStrokeWidth: 0
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacyosemiteeditingmacattributedstringverticalalignexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac-yosemite/editing/mac/attributed-string/vertical-align-expected.txt (197214 => 197215)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-yosemite/editing/mac/attributed-string/vertical-align-expected.txt 2016-02-26 23:33:45 UTC (rev 197214)
+++ trunk/LayoutTests/platform/mac-yosemite/editing/mac/attributed-string/vertical-align-expected.txt 2016-02-26 23:39:45 UTC (rev 197215)
</span><span class="lines">@@ -27,7 +27,7 @@
</span><span class="cx"> HeaderLevel: 0
</span><span class="cx"> [sup element]
</span><span class="cx"> NSColor: #000000 (NSDeviceRGBColorSpace)
</span><del>- NSFont: Times-Roman 13.33 pt.
</del><ins>+ NSFont: Times-Roman 13.00 pt.
</ins><span class="cx"> NSKern: 0pt
</span><span class="cx"> NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
</span><span class="cx"> NSStrokeWidth: 0
</span><span class="lines">@@ -78,7 +78,7 @@
</span><span class="cx"> HeaderLevel: 0
</span><span class="cx"> [sub element]
</span><span class="cx"> NSColor: #000000 (NSDeviceRGBColorSpace)
</span><del>- NSFont: Times-Roman 13.33 pt.
</del><ins>+ NSFont: Times-Roman 13.00 pt.
</ins><span class="cx"> NSKern: 0pt
</span><span class="cx"> NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
</span><span class="cx"> NSStrokeWidth: 0
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (197214 => 197215)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-02-26 23:33:45 UTC (rev 197214)
+++ trunk/Source/WebCore/ChangeLog 2016-02-26 23:39:45 UTC (rev 197215)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2016-02-26 Commit Queue <commit-queue@webkit.org>
+
+ Unreviewed, rolling out r197160.
+ https://bugs.webkit.org/show_bug.cgi?id=154757
+
+ This change causes editing/mac/attributed-string/font-
+ size.html to fail on El Capitan WK1 (Requested by ryanhaddad
+ on #webkit).
+
+ Reverted changeset:
+
+ "Font size computed style is innaccurate"
+ https://bugs.webkit.org/show_bug.cgi?id=154705
+ http://trac.webkit.org/changeset/197160
+
</ins><span class="cx"> 2016-02-26 Gavin Barraclough <barraclough@apple.com>
</span><span class="cx">
</span><span class="cx"> Page TimerAlignmentIntervalIncrease mechanism should have upper limit
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSComputedStyleDeclarationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp (197214 => 197215)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp 2016-02-26 23:33:45 UTC (rev 197214)
+++ trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp 2016-02-26 23:39:45 UTC (rev 197215)
</span><span class="lines">@@ -1578,7 +1578,7 @@
</span><span class="cx"> if (CSSValueID sizeIdentifier = style->fontDescription().keywordSizeAsIdentifier())
</span><span class="cx"> return CSSValuePool::singleton().createIdentifierValue(sizeIdentifier);
</span><span class="cx">
</span><del>- return zoomAdjustedPixelValue(style->fontDescription().computedSize(), *style);
</del><ins>+ return zoomAdjustedPixelValue(style->fontDescription().computedPixelSize(), *style);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool ComputedStyleExtractor::useFixedFontDefaultSize() const
</span><span class="lines">@@ -1830,7 +1830,7 @@
</span><span class="cx">
</span><span class="cx"> static Ref<CSSPrimitiveValue> fontSizeFromStyle(RenderStyle& style)
</span><span class="cx"> {
</span><del>- return zoomAdjustedPixelValue(style.fontDescription().computedSize(), style);
</del><ins>+ return zoomAdjustedPixelValue(style.fontDescription().computedPixelSize(), style);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static Ref<CSSPrimitiveValue> fontStyleFromStyle(RenderStyle* style)
</span></span></pre>
</div>
</div>
</body>
</html>