<!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>[174011] 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/174011">174011</a></dd>
<dt>Author</dt> <dd>mmaxfield@apple.com</dd>
<dt>Date</dt> <dd>2014-09-26 10:18:57 -0700 (Fri, 26 Sep 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>SVG -> OTF converter bug gardening
https://bugs.webkit.org/show_bug.cgi?id=137088
Reviewed by Darin Adler.
This test fixes some (but not all) of the svg/ layout tests that never worked with the
SVG -> OTF font converter. The actual list of tests this fixes is shown below. I will be
filing bugs for the remaining issues along with the relevant tests that those issues
cause to fail.
Tests: svg/W3C-SVG-1.1/fonts-elem-05-t.svg
svg/W3C-SVG-1.1/fonts-kern-01-t.svg
svg/custom/glyph-setting-d-attribute.svg
svg/custom/scrolling-embedded-svg-file-image-repaint-problem.html
svg/custom/skip-underline-missing-glyph.html
svg/custom/svg-fonts-fallback.xhtml
svg/custom/svg-fonts-in-text-controls.html
* svg/SVGToOTFFontConversion.cpp:
(WebCore::SVGToOTFFontConverter::appendHEADTable): We use the font's minimum and maximum
bounding box information to size <textarea>s and <input>s.
(WebCore::SVGToOTFFontConverter::addCodepointRanges): Codepoint ranges are closed.
(WebCore::SVGToOTFFontConverter::computeKerningData): Typo in appending glyphs to the
wrong set.
(WebCore::SVGToOTFFontConverter::transcodeGlyphPaths): Use the font's horizontal
origin if the glyph doesn't have one.
(WebCore::SVGToOTFFontConverter::convertSVGToOTFFont): <a href="http://trac.webkit.org/projects/webkit/changeset/173852">r173852</a> implemented vhea, vmtx,
and kern.
(WebCore::transcodeGlyphPaths): Moved inside SVGToOTFFontConverter.</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 (174010 => 174011)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-09-26 17:02:37 UTC (rev 174010)
+++ trunk/Source/WebCore/ChangeLog 2014-09-26 17:18:57 UTC (rev 174011)
</span><span class="lines">@@ -1,3 +1,35 @@
</span><ins>+2014-09-26 Myles C. Maxfield <mmaxfield@apple.com>
+
+ SVG -> OTF converter bug gardening
+ https://bugs.webkit.org/show_bug.cgi?id=137088
+
+ Reviewed by Darin Adler.
+
+ This test fixes some (but not all) of the svg/ layout tests that never worked with the
+ SVG -> OTF font converter. The actual list of tests this fixes is shown below. I will be
+ filing bugs for the remaining issues along with the relevant tests that those issues
+ cause to fail.
+
+ Tests: svg/W3C-SVG-1.1/fonts-elem-05-t.svg
+ svg/W3C-SVG-1.1/fonts-kern-01-t.svg
+ svg/custom/glyph-setting-d-attribute.svg
+ svg/custom/scrolling-embedded-svg-file-image-repaint-problem.html
+ svg/custom/skip-underline-missing-glyph.html
+ svg/custom/svg-fonts-fallback.xhtml
+ svg/custom/svg-fonts-in-text-controls.html
+
+ * svg/SVGToOTFFontConversion.cpp:
+ (WebCore::SVGToOTFFontConverter::appendHEADTable): We use the font's minimum and maximum
+ bounding box information to size <textarea>s and <input>s.
+ (WebCore::SVGToOTFFontConverter::addCodepointRanges): Codepoint ranges are closed.
+ (WebCore::SVGToOTFFontConverter::computeKerningData): Typo in appending glyphs to the
+ wrong set.
+ (WebCore::SVGToOTFFontConverter::transcodeGlyphPaths): Use the font's horizontal
+ origin if the glyph doesn't have one.
+ (WebCore::SVGToOTFFontConverter::convertSVGToOTFFont): r173852 implemented vhea, vmtx,
+ and kern.
+ (WebCore::transcodeGlyphPaths): Moved inside SVGToOTFFontConverter.
+
</ins><span class="cx"> 2014-09-26 Dan Bernstein <mitz@apple.com>
</span><span class="cx">
</span><span class="cx"> iOS build fix following r173989.
</span></span></pre></div>
<a id="trunkSourceWebCoresvgSVGToOTFFontConversioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/svg/SVGToOTFFontConversion.cpp (174010 => 174011)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/svg/SVGToOTFFontConversion.cpp 2014-09-26 17:02:37 UTC (rev 174010)
+++ trunk/Source/WebCore/svg/SVGToOTFFontConversion.cpp 2014-09-26 17:18:57 UTC (rev 174011)
</span><span class="lines">@@ -130,6 +130,9 @@
</span><span class="cx"> void appendCFFTable(Vector<char>&) const;
</span><span class="cx"> void appendVORGTable(Vector<char>&) const;
</span><span class="cx">
</span><ins>+ template <typename T>
+ Vector<char> transcodeGlyphPaths(float width, const T& glyphElement, FloatRect& boundingBox) const;
+
</ins><span class="cx"> void addCodepointRanges(const UnicodeRanges&, HashSet<uint16_t>& glyphSet) const;
</span><span class="cx"> void addCodepoints(const HashSet<String>& codepoints, HashSet<uint16_t>& glyphSet) const;
</span><span class="cx"> void addGlyphNames(const HashSet<String>& glyphNames, HashSet<uint16_t>& glyphSet) const;
</span><span class="lines">@@ -228,10 +231,10 @@
</span><span class="cx"> write32(result, 0); // Last half of creation date
</span><span class="cx"> write32(result, 0); // First half of modification date
</span><span class="cx"> write32(result, 0); // Last half of modification date
</span><del>- write16(result, std::numeric_limits<int16_t>::min()); // Minimum X
- write16(result, std::numeric_limits<int16_t>::min()); // Minimum Y
- write16(result, std::numeric_limits<int16_t>::max()); // Maximum X
- write16(result, std::numeric_limits<int16_t>::max()); // Maximum Y
</del><ins>+ write16(result, m_boundingBox.x()); // Minimum X
+ write16(result, m_boundingBox.y()); // Minimum Y
+ write16(result, m_boundingBox.maxX()); // Maximum X
+ write16(result, m_boundingBox.maxY()); // Maximum Y
</ins><span class="cx"> write16(result, (m_italic ? 1 << 1 : 0) | (m_weight >= 7 ? 1 : 0));
</span><span class="cx"> write16(result, 3); // Smallest readable size in pixels
</span><span class="cx"> write16(result, 0); // Might contain LTR or RTL glyphs
</span><span class="lines">@@ -603,7 +606,7 @@
</span><span class="cx"> void SVGToOTFFontConverter::addCodepointRanges(const UnicodeRanges& unicodeRanges, HashSet<Glyph>& glyphSet) const
</span><span class="cx"> {
</span><span class="cx"> for (auto& unicodeRange : unicodeRanges) {
</span><del>- for (auto codepoint = unicodeRange.first; codepoint < unicodeRange.second; ++codepoint) {
</del><ins>+ for (auto codepoint = unicodeRange.first; codepoint <= unicodeRange.second; ++codepoint) {
</ins><span class="cx"> if (!codepoint || codepoint >= std::numeric_limits<Codepoint>::max())
</span><span class="cx"> continue;
</span><span class="cx"> auto iterator = m_codepointToIndexMap.find(codepoint);
</span><span class="lines">@@ -660,7 +663,7 @@
</span><span class="cx"> addGlyphNames(kerningPair.glyphName1, glyphSet1);
</span><span class="cx"> addGlyphNames(kerningPair.glyphName2, glyphSet2);
</span><span class="cx"> addCodepoints(kerningPair.unicodeName1, glyphSet1);
</span><del>- addCodepoints(kerningPair.unicodeName2, glyphSet1);
</del><ins>+ addCodepoints(kerningPair.unicodeName2, glyphSet2);
</ins><span class="cx">
</span><span class="cx"> // FIXME: Use table format 2 so we don't have to append each of these one by one
</span><span class="cx"> for (auto& glyph1 : glyphSet1) {
</span><span class="lines">@@ -835,7 +838,7 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> template <typename T>
</span><del>-static Vector<char> transcodeGlyphPaths(float width, const T& glyphElement, FloatRect& boundingBox)
</del><ins>+Vector<char> SVGToOTFFontConverter::transcodeGlyphPaths(float width, const T& glyphElement, FloatRect& boundingBox) const
</ins><span class="cx"> {
</span><span class="cx"> Vector<char> result;
</span><span class="cx"> auto& dAttribute = glyphElement.fastGetAttribute(SVGNames::dAttr);
</span><span class="lines">@@ -851,11 +854,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 = glyphElement.fastGetAttribute(SVGNames::horiz_origin_xAttr).toFloat(&ok);
</span><del>- if (!ok)
- horizontalOriginX = 0;
</del><ins>+ if (!ok && m_fontFaceElement)
+ horizontalOriginX = m_fontFaceElement->horizontalOriginX();
</ins><span class="cx"> float horizontalOriginY = glyphElement.fastGetAttribute(SVGNames::horiz_origin_yAttr).toFloat(&ok);
</span><del>- if (!ok)
- horizontalOriginY = 0;
</del><ins>+ if (!ok && m_fontFaceElement)
+ 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">@@ -1062,7 +1065,6 @@
</span><span class="cx"> for (size_t i = 0; i < kDirectoryEntrySize * numTables; ++i)
</span><span class="cx"> result.append(0);
</span><span class="cx">
</span><del>- // FIXME: Implement more tables, like vhea and vmtx (and kern!)
</del><span class="cx"> appendTable("CFF ", result, &SVGToOTFFontConverter::appendCFFTable);
</span><span class="cx"> appendTable("OS/2", result, &SVGToOTFFontConverter::appendOS2Table);
</span><span class="cx"> appendTable("VORG", result, &SVGToOTFFontConverter::appendVORGTable);
</span></span></pre>
</div>
</div>
</body>
</html>