<!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>[192938] 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/192938">192938</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2015-12-01 19:23:59 -0800 (Tue, 01 Dec 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Unreviewed, rolling out <a href="http://trac.webkit.org/projects/webkit/changeset/192894">r192894</a> and <a href="http://trac.webkit.org/projects/webkit/changeset/192904">r192904</a>.
https://bugs.webkit.org/show_bug.cgi?id=151738
Crashes sometimes on Windows (Requested by litherum on
#webkit).
Reverted changesets:
"[Win] Web fonts with small caps have excess whitespace with
the complex text codepath"
https://bugs.webkit.org/show_bug.cgi?id=151698
http://trac.webkit.org/changeset/192894
"Test gardening after <a href="http://trac.webkit.org/projects/webkit/changeset/192894">r192894</a>"
http://trac.webkit.org/changeset/192904</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicswinSimpleFontDataWincpp">trunk/Source/WebCore/platform/graphics/win/SimpleFontDataWin.cpp</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfasttextresourcestinyfontsvg">trunk/LayoutTests/fast/text/resources/tinyfont.svg</a></li>
<li><a href="#trunkLayoutTestsfasttextsmallcapscomplexexpectedhtml">trunk/LayoutTests/fast/text/small-caps-complex-expected.html</a></li>
<li><a href="#trunkLayoutTestsfasttextsmallcapscomplexhtml">trunk/LayoutTests/fast/text/small-caps-complex.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (192937 => 192938)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-12-02 03:16:28 UTC (rev 192937)
+++ trunk/LayoutTests/ChangeLog 2015-12-02 03:23:59 UTC (rev 192938)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2015-12-01 Commit Queue <commit-queue@webkit.org>
+
+ Unreviewed, rolling out r192894 and r192904.
+ https://bugs.webkit.org/show_bug.cgi?id=151738
+
+ Crashes sometimes on Windows (Requested by litherum on
+ #webkit).
+
+ Reverted changesets:
+
+ "[Win] Web fonts with small caps have excess whitespace with
+ the complex text codepath"
+ https://bugs.webkit.org/show_bug.cgi?id=151698
+ http://trac.webkit.org/changeset/192894
+
+ "Test gardening after r192894"
+ http://trac.webkit.org/changeset/192904
+
</ins><span class="cx"> 2015-12-01 Myles C. Maxfield <mmaxfield@apple.com>
</span><span class="cx">
</span><span class="cx"> [SVG -> OTF Converter] Force UnitsPerEm to 1000
</span></span></pre></div>
<a id="trunkLayoutTestsfasttextresourcestinyfontsvg"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/fast/text/resources/tinyfont.svg (192937 => 192938)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text/resources/tinyfont.svg 2015-12-02 03:16:28 UTC (rev 192937)
+++ trunk/LayoutTests/fast/text/resources/tinyfont.svg 2015-12-02 03:23:59 UTC (rev 192938)
</span><span class="lines">@@ -1,13 +0,0 @@
</span><del>-<?xml version="1.0" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
-<svg xmlns="http://www.w3.org/2000/svg">
-<metadata></metadata>
-<defs>
-<font id="Litherum" horiz-adv-x="100">
-<font-face units-per-em="100" ascent="80" descent="-20"/>
-<glyph unicode=" "/>
-<glyph horiz-adv-x="80" unicode="e&#x300;" d="M0 -20v100h100v-100z"/>
-<glyph horiz-adv-x="80" unicode="&#xe8;" d="M0 -20v100h100v-100z"/>
-</font>
-</defs>
-</svg>
</del></span></pre></div>
<a id="trunkLayoutTestsfasttextsmallcapscomplexexpectedhtml"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/fast/text/small-caps-complex-expected.html (192937 => 192938)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text/small-caps-complex-expected.html 2015-12-02 03:16:28 UTC (rev 192937)
+++ trunk/LayoutTests/fast/text/small-caps-complex-expected.html 2015-12-02 03:23:59 UTC (rev 192938)
</span><span class="lines">@@ -1,25 +0,0 @@
</span><del>-<!DOCTYPE html>
-<html>
-<head>
-<style>
-@font-face {
- font-family: "WebAhem";
- src: url("../../resources/Ahem.ttf") format(truetype);
-}
-@font-face {
- font-family: "WebFallbackFont";
- src: url("resources/tinyfont.svg") format("svg");
-}
-</style>
-</head>
-<body>
-This test makes sure that small-caps works in both the simple and complex text codepaths.
-<div style="position: relative;">
-<div style="font: 100px WebAhem, WebFallbackFont; font-variant: small-caps;">a&#xe8;bcd</div>
-<div style="position: absolute; left: 50px; top: 0px; width: 125px; height: 100px; background-color: black;"></div>
-<div style="position: absolute; left: 350px; top: 0px; width: 20px; height: 100px; background-color: black;"></div>
-<div style="position: absolute; left: 0px; top: 83px; width: 370px; height: 32px; background-color: black;"></div>
-<div style="position: absolute; left: 0px; top: 20px; width: 370px; height: 15px; background-color: black;"></div>
-</div>
-</body>
-</html>
</del></span></pre></div>
<a id="trunkLayoutTestsfasttextsmallcapscomplexhtml"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/fast/text/small-caps-complex.html (192937 => 192938)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text/small-caps-complex.html 2015-12-02 03:16:28 UTC (rev 192937)
+++ trunk/LayoutTests/fast/text/small-caps-complex.html 2015-12-02 03:23:59 UTC (rev 192938)
</span><span class="lines">@@ -1,25 +0,0 @@
</span><del>-<!DOCTYPE html>
-<html>
-<head>
-<style>
-@font-face {
- font-family: "WebAhem";
- src: url("../../resources/Ahem.ttf") format("truetype");
-}
-@font-face {
- font-family: "WebFallbackFont";
- src: url("resources/tinyfont.svg") format("svg");
-}
-</style>
-</head>
-<body>
-This test makes sure that small-caps works in both the simple and complex text codepaths.
-<div style="position: relative;">
-<div style="font: 100px WebAhem, WebFallbackFont; font-variant: small-caps;">ae&#x300;bcd</div>
-<div style="position: absolute; left: 50px; top: 0px; width: 125px; height: 100px; background-color: black;"></div>
-<div style="position: absolute; left: 350px; top: 0px; width: 20px; height: 100px; background-color: black;"></div>
-<div style="position: absolute; left: 0px; top: 93px; width: 370px; height: 22px; background-color: black;"></div>
-<div style="position: absolute; left: 0px; top: 20px; width: 370px; height: 15px; background-color: black;"></div>
-</div>
-</body>
-</html>
</del></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (192937 => 192938)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-12-02 03:16:28 UTC (rev 192937)
+++ trunk/Source/WebCore/ChangeLog 2015-12-02 03:23:59 UTC (rev 192938)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2015-12-01 Commit Queue <commit-queue@webkit.org>
+
+ Unreviewed, rolling out r192894 and r192904.
+ https://bugs.webkit.org/show_bug.cgi?id=151738
+
+ Crashes sometimes on Windows (Requested by litherum on
+ #webkit).
+
+ Reverted changesets:
+
+ "[Win] Web fonts with small caps have excess whitespace with
+ the complex text codepath"
+ https://bugs.webkit.org/show_bug.cgi?id=151698
+ http://trac.webkit.org/changeset/192894
+
+ "Test gardening after r192894"
+ http://trac.webkit.org/changeset/192904
+
</ins><span class="cx"> 2015-12-01 Yusuke Suzuki <utatane.tea@gmail.com>
</span><span class="cx">
</span><span class="cx"> [ES6] Implement LLInt/Baseline Support for ES6 Generators and enable this feature
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicswinSimpleFontDataWincpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/win/SimpleFontDataWin.cpp (192937 => 192938)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/win/SimpleFontDataWin.cpp 2015-12-02 03:16:28 UTC (rev 192937)
+++ trunk/Source/WebCore/platform/graphics/win/SimpleFontDataWin.cpp 2015-12-02 03:23:59 UTC (rev 192938)
</span><span class="lines">@@ -135,6 +135,12 @@
</span><span class="cx"> RefPtr<Font> Font::platformCreateScaledFont(const FontDescription& fontDescription, float scaleFactor) const
</span><span class="cx"> {
</span><span class="cx"> float scaledSize = scaleFactor * m_platformData.size();
</span><ins>+ if (isCustomFont()) {
+ FontPlatformData scaledFont(m_platformData);
+ scaledFont.setSize(scaledSize);
+ return Font::create(scaledFont, true, false);
+ }
+
</ins><span class="cx"> LOGFONT winfont;
</span><span class="cx"> GetObject(m_platformData.hfont(), sizeof(LOGFONT), &winfont);
</span><span class="cx"> winfont.lfHeight = -lroundf(scaledSize * (m_platformData.useGDI() ? 1 : 32));
</span></span></pre>
</div>
</div>
</body>
</html>