<!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>[174466] 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/174466">174466</a></dd>
<dt>Author</dt> <dd>mmaxfield@apple.com</dd>
<dt>Date</dt> <dd>2014-10-08 11:55:59 -0700 (Wed, 08 Oct 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Text drawn with an SVG font has no spaces when word-rounding hacks are enabled
https://bugs.webkit.org/show_bug.cgi?id=137463
Reviewed by Darin Adler.
Source/WebCore:
When rounding hacks are enabled, we use the "adjusted space width" instead of the
regular space width. However, the SVG-font-specific implementation of the
SimpleFontData constructor doesn't initialize this value, so it was getting set
to an undefined value (which happened to be close to 0 in my tests).
Test: svg/text/svg-font-word-rounding-hacks-spaces.html
* css/CSSFontFaceSource.cpp:
(WebCore::CSSFontFaceSource::getFontData):
(WebCore::CSSFontFaceSource::ensureFontData):
* loader/cache/CachedFont.cpp:
(WebCore::CachedFont::ensureCustomFontData):
(WebCore::CachedFont::getSVGFontById):
* platform/graphics/SimpleFontData.h:
* svg/SVGFontData.cpp:
(WebCore::SVGFontData::initializeFontData):
LayoutTests:
Make sure that spaces are present.
* svg/text/svg-font-word-rounding-hacks-spaces.html:
* svg/text/svg-font-word-rounding-hacks-spaces-expected.html:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestssvgtextresourcesLitherumsvg">trunk/LayoutTests/svg/text/resources/Litherum.svg</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsSimpleFontDatah">trunk/Source/WebCore/platform/graphics/SimpleFontData.h</a></li>
<li><a href="#trunkSourceWebCoresvgSVGFontDatacpp">trunk/Source/WebCore/svg/SVGFontData.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestssvgtextsvgfontwordroundinghacksspacesexpectedhtml">trunk/LayoutTests/svg/text/svg-font-word-rounding-hacks-spaces-expected.html</a></li>
<li><a href="#trunkLayoutTestssvgtextsvgfontwordroundinghacksspaceshtml">trunk/LayoutTests/svg/text/svg-font-word-rounding-hacks-spaces.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (174465 => 174466)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-10-08 18:32:12 UTC (rev 174465)
+++ trunk/LayoutTests/ChangeLog 2014-10-08 18:55:59 UTC (rev 174466)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2014-10-08 Myles C. Maxfield <mmaxfield@apple.com>
+
+ Text drawn with an SVG font has no spaces when word-rounding hacks are enabled
+ https://bugs.webkit.org/show_bug.cgi?id=137463
+
+ Reviewed by Darin Adler.
+
+ Make sure that spaces are present.
+
+ * svg/text/svg-font-word-rounding-hacks-spaces.html:
+ * svg/text/svg-font-word-rounding-hacks-spaces-expected.html:
+
</ins><span class="cx"> 2014-10-08 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove tests that always pass from the TestExpectations files.
</span></span></pre></div>
<a id="trunkLayoutTestssvgtextresourcesLitherumsvg"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/svg/text/resources/Litherum.svg (174465 => 174466)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/svg/text/resources/Litherum.svg 2014-10-08 18:32:12 UTC (rev 174465)
+++ trunk/LayoutTests/svg/text/resources/Litherum.svg 2014-10-08 18:55:59 UTC (rev 174466)
</span><span class="lines">@@ -3,10 +3,12 @@
</span><span class="cx"> <svg xmlns="http://www.w3.org/2000/svg">
</span><span class="cx"> <metadata></metadata>
</span><span class="cx"> <defs>
</span><del>-<font id="Litherum" horiz-adv-x="1024">
</del><ins>+<font id="Litherum" horiz-adv-x="14">
</ins><span class="cx"> <font-face units-per-em="14" ascent="14" descent="-7"/>
</span><del>-<glyph unicode="|" horiz-adv-x="14" d="M5 -7v21h4v-21z"/>
-<glyph unicode="&#x20001;" horiz-adv-x="14" d="M5 -7v21h4v-21z"/>
</del><ins>+<glyph unicode="|" d="M5 -7v21h4v-21z"/>
+<glyph unicode="&#x20001;" d="M5 -7v21h4v-21z"/>
+<glyph unicode="a" d="M0 -7v21h14v-21z"/>
+<glyph unicode=" "/>
</ins><span class="cx"> </font>
</span><span class="cx"> </defs>
</span><span class="cx"> </svg>
</span></span></pre></div>
<a id="trunkLayoutTestssvgtextsvgfontwordroundinghacksspacesexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/svg/text/svg-font-word-rounding-hacks-spaces-expected.html (0 => 174466)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/svg/text/svg-font-word-rounding-hacks-spaces-expected.html (rev 0)
+++ trunk/LayoutTests/svg/text/svg-font-word-rounding-hacks-spaces-expected.html 2014-10-08 18:55:59 UTC (rev 174466)
</span><span class="lines">@@ -0,0 +1,24 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<style>
+.blackbox {
+ display: inline-block;
+ width: 14px;
+ height: 21px;
+ background: black;
+}
+.whitebox {
+ display: inline-block;
+ width: 14px;
+ height: 21px;
+ background: white;
+}
+</style>
+</head>
+<body>
+This test makes sure that text drawn with an SVG font with word-wrapping hacks has spaces.
+The test is successful if the space between the two boxes below is the same as the width of each of the boxes.
+<div><div class="blackbox"></div><div class="whitebox"></div><div class="blackbox"></div></div>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestssvgtextsvgfontwordroundinghacksspaceshtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/svg/text/svg-font-word-rounding-hacks-spaces.html (0 => 174466)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/svg/text/svg-font-word-rounding-hacks-spaces.html (rev 0)
+++ trunk/LayoutTests/svg/text/svg-font-word-rounding-hacks-spaces.html 2014-10-08 18:55:59 UTC (rev 174466)
</span><span class="lines">@@ -0,0 +1,20 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<style>
+@font-face {
+ font-family: 'Litherum';
+ src: url("resources/Litherum.svg") format(svg)
+}
+</style>
+<script>
+if (window.internals)
+ window.internals.allowRoundingHacks();
+</script>
+</head>
+<body>
+This test makes sure that text drawn with an SVG font with word-wrapping hacks has spaces.
+The test is successful if the space between the two boxes below is the same as the width of each of the boxes.
+<div style="font: 14px Litherum;">a a</div>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (174465 => 174466)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-10-08 18:32:12 UTC (rev 174465)
+++ trunk/Source/WebCore/ChangeLog 2014-10-08 18:55:59 UTC (rev 174466)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2014-10-08 Myles C. Maxfield <mmaxfield@apple.com>
+
+ Text drawn with an SVG font has no spaces when word-rounding hacks are enabled
+ https://bugs.webkit.org/show_bug.cgi?id=137463
+
+ Reviewed by Darin Adler.
+
+ When rounding hacks are enabled, we use the "adjusted space width" instead of the
+ regular space width. However, the SVG-font-specific implementation of the
+ SimpleFontData constructor doesn't initialize this value, so it was getting set
+ to an undefined value (which happened to be close to 0 in my tests).
+
+ Test: svg/text/svg-font-word-rounding-hacks-spaces.html
+
+ * css/CSSFontFaceSource.cpp:
+ (WebCore::CSSFontFaceSource::getFontData):
+ (WebCore::CSSFontFaceSource::ensureFontData):
+ * loader/cache/CachedFont.cpp:
+ (WebCore::CachedFont::ensureCustomFontData):
+ (WebCore::CachedFont::getSVGFontById):
+ * platform/graphics/SimpleFontData.h:
+ * svg/SVGFontData.cpp:
+ (WebCore::SVGFontData::initializeFontData):
+
</ins><span class="cx"> 2014-10-08 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> [Win] Resolve various static analyzer warnings in WebCore.
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsSimpleFontDatah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/SimpleFontData.h (174465 => 174466)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/SimpleFontData.h 2014-10-08 18:32:12 UTC (rev 174465)
+++ trunk/Source/WebCore/platform/graphics/SimpleFontData.h 2014-10-08 18:55:59 UTC (rev 174466)
</span><span class="lines">@@ -159,7 +159,11 @@
</span><span class="cx">
</span><span class="cx"> float spaceWidth() const { return m_spaceWidth; }
</span><span class="cx"> float adjustedSpaceWidth() const { return m_adjustedSpaceWidth; }
</span><del>- void setSpaceWidth(float spaceWidth) { m_spaceWidth = spaceWidth; }
</del><ins>+ void setSpaceWidths(float spaceWidth)
+ {
+ m_spaceWidth = spaceWidth;
+ m_adjustedSpaceWidth = spaceWidth;
+ }
</ins><span class="cx">
</span><span class="cx"> #if USE(CG) || USE(CAIRO)
</span><span class="cx"> float syntheticBoldOffset() const { return m_syntheticBoldOffset; }
</span></span></pre></div>
<a id="trunkSourceWebCoresvgSVGFontDatacpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/svg/SVGFontData.cpp (174465 => 174466)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/svg/SVGFontData.cpp 2014-10-08 18:32:12 UTC (rev 174465)
+++ trunk/Source/WebCore/svg/SVGFontData.cpp 2014-10-08 18:55:59 UTC (rev 174466)
</span><span class="lines">@@ -98,7 +98,7 @@
</span><span class="cx">
</span><span class="cx"> if (!glyphPageZero) {
</span><span class="cx"> fontData->setSpaceGlyph(0);
</span><del>- fontData->setSpaceWidth(0);
</del><ins>+ fontData->setSpaceWidths(0);
</ins><span class="cx"> fontData->setAvgCharWidth(0);
</span><span class="cx"> fontData->setMaxCharWidth(ascent);
</span><span class="cx"> return;
</span><span class="lines">@@ -107,7 +107,7 @@
</span><span class="cx"> // Calculate space width.
</span><span class="cx"> Glyph spaceGlyph = glyphPageZero->glyphDataForCharacter(' ').glyph;
</span><span class="cx"> fontData->setSpaceGlyph(spaceGlyph);
</span><del>- fontData->setSpaceWidth(fontData->widthForGlyph(spaceGlyph));
</del><ins>+ fontData->setSpaceWidths(fontData->widthForGlyph(spaceGlyph));
</ins><span class="cx">
</span><span class="cx"> // Estimate average character width.
</span><span class="cx"> Glyph numeralZeroGlyph = glyphPageZero->glyphDataForCharacter('0').glyph;
</span></span></pre>
</div>
</div>
</body>
</html>