<!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>[178647] trunk/Source/WebCore</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/178647">178647</a></dd>
<dt>Author</dt> <dd>mmaxfield@apple.com</dd>
<dt>Date</dt> <dd>2015-01-19 08:32:26 -0800 (Mon, 19 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[SVG -> OTF Converter] Glyphs get clipped weirdly
https://bugs.webkit.org/show_bug.cgi?id=137095
Reviewed by Antti Koivisto.
The Adobe CFF spec doesn't actually tell you how to serialize a
"FontBBox." After trial and error, it seems to be (x, y, width,
height).
Test: svg/text/kerning.svg
svg/W3C-SVG-1.1/fonts-kern-01-t.svg
* svg/SVGToOTFFontConversion.cpp:
(WebCore::SVGToOTFFontConverter::appendHEADTable):
(WebCore::SVGToOTFFontConverter::appendCFFTable):
(WebCore::SVGToOTFFontConverter::appendVHEATable):
(WebCore::CFFBuilder::CFFBuilder):
(WebCore::SVGToOTFFontConverter::transcodeGlyphPaths):
(WebCore::SVGToOTFFontConverter::processGlyphElement):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoresvgSVGToOTFFontConversioncpp">trunk/Source/WebCore/svg/SVGToOTFFontConversion.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (178646 => 178647)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-01-19 15:27:57 UTC (rev 178646)
+++ trunk/Source/WebCore/ChangeLog 2015-01-19 16:32:26 UTC (rev 178647)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2015-01-19 Myles C. Maxfield <mmaxfield@apple.com>
+
+ [SVG -> OTF Converter] Glyphs get clipped weirdly
+ https://bugs.webkit.org/show_bug.cgi?id=137095
+
+ Reviewed by Antti Koivisto.
+
+ The Adobe CFF spec doesn't actually tell you how to serialize a
+ "FontBBox." After trial and error, it seems to be (x, y, width,
+ height).
+
+ Test: svg/text/kerning.svg
+ svg/W3C-SVG-1.1/fonts-kern-01-t.svg
+
+ * svg/SVGToOTFFontConversion.cpp:
+ (WebCore::SVGToOTFFontConverter::appendHEADTable):
+ (WebCore::SVGToOTFFontConverter::appendCFFTable):
+ (WebCore::SVGToOTFFontConverter::appendVHEATable):
+ (WebCore::CFFBuilder::CFFBuilder):
+ (WebCore::SVGToOTFFontConverter::transcodeGlyphPaths):
+ (WebCore::SVGToOTFFontConverter::processGlyphElement):
+
</ins><span class="cx"> 2015-01-19 Csaba Osztrogonác <ossy@webkit.org>
</span><span class="cx">
</span><span class="cx"> REGRESSION(r178486): It broke the !ENABLE(VIDEO) build
</span></span></pre></div>
<a id="trunkSourceWebCoresvgSVGToOTFFontConversioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/svg/SVGToOTFFontConversion.cpp (178646 => 178647)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/svg/SVGToOTFFontConversion.cpp 2015-01-19 15:27:57 UTC (rev 178646)
+++ trunk/Source/WebCore/svg/SVGToOTFFontConversion.cpp 2015-01-19 16:32:26 UTC (rev 178647)
</span><span class="lines">@@ -322,10 +322,10 @@
</span><span class="cx"> append32(0); // Last half of creation date
</span><span class="cx"> append32(0); // First half of modification date
</span><span class="cx"> append32(0); // Last half of modification date
</span><del>- append16(m_boundingBox.x()); // Minimum X
- append16(m_boundingBox.y()); // Minimum Y
- append16(m_boundingBox.maxX()); // Maximum X
- append16(m_boundingBox.maxY()); // Maximum Y
</del><ins>+ append16(clampTo<int16_t>(m_boundingBox.x()));
+ append16(clampTo<int16_t>(m_boundingBox.y()));
+ append16(clampTo<int16_t>(m_boundingBox.maxX()));
+ append16(clampTo<int16_t>(m_boundingBox.maxY()));
</ins><span class="cx"> append16((m_italic ? 1 << 1 : 0) | (m_weight >= 7 ? 1 : 0));
</span><span class="cx"> append16(3); // Smallest readable size in pixels
</span><span class="cx"> append16(0); // Might contain LTR or RTL glyphs
</span><span class="lines">@@ -575,11 +575,11 @@
</span><span class="cx"> m_result.append(operand32Bit);
</span><span class="cx"> append32(clampTo<int32_t>(m_boundingBox.x()));
</span><span class="cx"> m_result.append(operand32Bit);
</span><del>- append32(clampTo<int32_t>(m_boundingBox.maxX()));
- m_result.append(operand32Bit);
</del><span class="cx"> append32(clampTo<int32_t>(m_boundingBox.y()));
</span><span class="cx"> m_result.append(operand32Bit);
</span><del>- append32(clampTo<int32_t>(m_boundingBox.maxY()));
</del><ins>+ append32(clampTo<int32_t>(m_boundingBox.width()));
+ m_result.append(operand32Bit);
+ append32(clampTo<int32_t>(m_boundingBox.height()));
</ins><span class="cx"> m_result.append(fontBBoxKey);
</span><span class="cx"> m_result.append(operand32Bit);
</span><span class="cx"> unsigned charsetOffsetLocation = m_result.size();
</span><span class="lines">@@ -887,6 +887,7 @@
</span><span class="cx"> append16(m_unitsPerEm / 2); // Vertical typographic ascender (vertical baseline to the right)
</span><span class="cx"> append16(clampTo<int16_t>(-static_cast<int>(m_unitsPerEm / 2))); // Vertical typographic descender
</span><span class="cx"> append16(m_unitsPerEm / 10); // Vertical typographic line gap
</span><ins>+ // FIXME: m_unitsPerEm is almost certainly not correct
</ins><span class="cx"> append16(clampTo<int16_t>(m_advanceHeightMax));
</span><span class="cx"> append16(clampTo<int16_t>(m_unitsPerEm - m_boundingBox.maxY())); // Minimum top side bearing
</span><span class="cx"> append16(clampTo<int16_t>(m_boundingBox.y())); // Minimum bottom side bearing
</span><span class="lines">@@ -1049,6 +1050,7 @@
</span><span class="cx"> : m_cffData(cffData)
</span><span class="cx"> , m_hasBoundingBox(false)
</span><span class="cx"> {
</span><ins>+ // FIXME: Moving to the origin isn't going to work for subsequent absolute coordinates
</ins><span class="cx"> writeCFFEncodedNumber(m_cffData, width);
</span><span class="cx"> writeCFFEncodedNumber(m_cffData, origin.x());
</span><span class="cx"> writeCFFEncodedNumber(m_cffData, origin.y());
</span><span class="lines">@@ -1149,11 +1151,11 @@
</span><span class="cx"> // FIXME: If we are vertical, use vert_origin_x and vert_origin_y
</span><span class="cx"> bool ok;
</span><span class="cx"> float horizontalOriginX = glyphOrMissingGlyphElement.fastGetAttribute(SVGNames::horiz_origin_xAttr).toFloat(&ok);
</span><del>- if (!ok)
- horizontalOriginX = m_fontFaceElement ? m_fontFaceElement->horizontalOriginX() : 0;
</del><ins>+ if (!ok && m_fontFaceElement)
+ horizontalOriginX = m_fontFaceElement->horizontalOriginX();
</ins><span class="cx"> float horizontalOriginY = glyphOrMissingGlyphElement.fastGetAttribute(SVGNames::horiz_origin_yAttr).toFloat(&ok);
</span><span class="cx"> if (!ok && m_fontFaceElement)
</span><del>- horizontalOriginY = m_fontFaceElement ? m_fontFaceElement->horizontalOriginY() : 0;
</del><ins>+ horizontalOriginY = m_fontFaceElement->horizontalOriginY();
</ins><span class="cx">
</span><span class="cx"> CFFBuilder builder(result, width, FloatPoint(horizontalOriginX, horizontalOriginY));
</span><span class="cx"> SVGPathStringSource source(dAttribute);
</span><span class="lines">@@ -1195,7 +1197,7 @@
</span><span class="cx"> m_minRightSideBearing = std::min(m_minRightSideBearing, horizontalAdvance - glyphBoundingBox.maxX());
</span><span class="cx"> initialGlyph = false;
</span><span class="cx">
</span><del>- m_glyphs.append(GlyphData(WTF::move(path), glyphElement, horizontalAdvance, verticalAdvance, m_boundingBox, codepoints));
</del><ins>+ m_glyphs.append(GlyphData(WTF::move(path), glyphElement, horizontalAdvance, verticalAdvance, glyphBoundingBox, codepoints));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void SVGToOTFFontConverter::appendLigatureGlyphs()
</span></span></pre>
</div>
</div>
</body>
</html>