<!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>[185100] 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/185100">185100</a></dd>
<dt>Author</dt> <dd>mmaxfield@apple.com</dd>
<dt>Date</dt> <dd>2015-06-01 20:11:11 -0700 (Mon, 01 Jun 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[SVG -> OTF Converter] Remove unnecessary hacks
https://bugs.webkit.org/show_bug.cgi?id=145088
Reviewed by Simon Fraser.
Source/WebCore:
Not needed anymore.
Test: svg/text/offset-square-svg-font.html
* svg/SVGToOTFFontConversion.cpp:
(WebCore::SVGToOTFFontConverter::appendKERNTable):
(WebCore::SVGToOTFFontConverter::SVGToOTFFontConverter):
LayoutTests:
Test that the hacks are unnecessary.
* svg/text/offset-square-svg-font-expected.html: Added.
* svg/text/offset-square-svg-font.html: Added.
* svg/text/resources/offset-square-svg-font.svg: Added.
* svg/text/resources/offset-square-svg-font2.svg: Added.</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="#trunkSourceWebCoresvgSVGToOTFFontConversioncpp">trunk/Source/WebCore/svg/SVGToOTFFontConversion.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestssvgtextoffsetsquaresvgfontexpectedhtml">trunk/LayoutTests/svg/text/offset-square-svg-font-expected.html</a></li>
<li><a href="#trunkLayoutTestssvgtextoffsetsquaresvgfonthtml">trunk/LayoutTests/svg/text/offset-square-svg-font.html</a></li>
<li><a href="#trunkLayoutTestssvgtextresourcesoffsetsquaresvgfontsvg">trunk/LayoutTests/svg/text/resources/offset-square-svg-font.svg</a></li>
<li><a href="#trunkLayoutTestssvgtextresourcesoffsetsquaresvgfont2svg">trunk/LayoutTests/svg/text/resources/offset-square-svg-font2.svg</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (185099 => 185100)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-06-02 02:59:39 UTC (rev 185099)
+++ trunk/LayoutTests/ChangeLog 2015-06-02 03:11:11 UTC (rev 185100)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2015-06-01 Myles C. Maxfield <mmaxfield@apple.com>
+
+ [SVG -> OTF Converter] Remove unnecessary hacks
+ https://bugs.webkit.org/show_bug.cgi?id=145088
+
+ Reviewed by Simon Fraser.
+
+ Test that the hacks are unnecessary.
+
+ * svg/text/offset-square-svg-font-expected.html: Added.
+ * svg/text/offset-square-svg-font.html: Added.
+ * svg/text/resources/offset-square-svg-font.svg: Added.
+ * svg/text/resources/offset-square-svg-font2.svg: Added.
+
</ins><span class="cx"> 2015-06-01 Zalan Bujtas <zalan@apple.com>
</span><span class="cx">
</span><span class="cx"> [Mac] Unreviewed gardening.
</span></span></pre></div>
<a id="trunkLayoutTestssvgtextoffsetsquaresvgfontexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/svg/text/offset-square-svg-font-expected.html (0 => 185100)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/svg/text/offset-square-svg-font-expected.html (rev 0)
+++ trunk/LayoutTests/svg/text/offset-square-svg-font-expected.html 2015-06-02 03:11:11 UTC (rev 185100)
</span><span class="lines">@@ -0,0 +1,15 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<style>
+@font-face {
+ font-family: "TestFont";
+ src: url("resources/offset-square-svg-font2.svg") format("svg");
+}
+</style>
+</head>
+<body>
+This test makes sure that a glyph which is an offset square is rendered as expected. The test succeeds if you see a square below.
+<div style="font: 40px TestFont;">ab</div>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestssvgtextoffsetsquaresvgfonthtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/svg/text/offset-square-svg-font.html (0 => 185100)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/svg/text/offset-square-svg-font.html (rev 0)
+++ trunk/LayoutTests/svg/text/offset-square-svg-font.html 2015-06-02 03:11:11 UTC (rev 185100)
</span><span class="lines">@@ -0,0 +1,15 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<style>
+@font-face {
+ font-family: "TestFont";
+ src: url("resources/offset-square-svg-font.svg") format("svg");
+}
+</style>
+</head>
+<body>
+This test makes sure that a glyph which is an offset square is rendered as expected. The test succeeds if you see a square below.
+<div style="font: 40px TestFont;">a</div>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestssvgtextresourcesoffsetsquaresvgfontsvg"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/svg/text/resources/offset-square-svg-font.svg (0 => 185100)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/svg/text/resources/offset-square-svg-font.svg (rev 0)
+++ trunk/LayoutTests/svg/text/resources/offset-square-svg-font.svg 2015-06-02 03:11:11 UTC (rev 185100)
</span><span class="lines">@@ -0,0 +1,9 @@
</span><ins>+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="100%" height="100%" xmlns="http://www.w3.org/2000/svg">
+<defs>
+<font horiz-adv-x="481" id="ascii">
+ <font-face font-family="testfont" units-per-em="1000" ascent="800" descent="-200" alphabetic="0"/>
+<glyph unicode="a" horiz-adv-x="1000" d="M500 0V500H1000V0H500Z"/>
+</font>
+</defs>
+</svg>
</ins></span></pre></div>
<a id="trunkLayoutTestssvgtextresourcesoffsetsquaresvgfont2svg"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/svg/text/resources/offset-square-svg-font2.svg (0 => 185100)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/svg/text/resources/offset-square-svg-font2.svg (rev 0)
+++ trunk/LayoutTests/svg/text/resources/offset-square-svg-font2.svg 2015-06-02 03:11:11 UTC (rev 185100)
</span><span class="lines">@@ -0,0 +1,10 @@
</span><ins>+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="100%" height="100%" xmlns="http://www.w3.org/2000/svg">
+<defs>
+<font horiz-adv-x="481" id="ascii">
+ <font-face font-family="testfont" units-per-em="1000" ascent="800" descent="-200" alphabetic="0"/>
+<glyph unicode="a" horiz-adv-x="500" d="M0 0Z"/>
+<glyph unicode="b" horiz-adv-x="500" d="M0 0V500H500V0H0Z"/>
+</font>
+</defs>
+</svg>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (185099 => 185100)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-06-02 02:59:39 UTC (rev 185099)
+++ trunk/Source/WebCore/ChangeLog 2015-06-02 03:11:11 UTC (rev 185100)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2015-06-01 Myles C. Maxfield <mmaxfield@apple.com>
+
+ [SVG -> OTF Converter] Remove unnecessary hacks
+ https://bugs.webkit.org/show_bug.cgi?id=145088
+
+ Reviewed by Simon Fraser.
+
+ Not needed anymore.
+
+ Test: svg/text/offset-square-svg-font.html
+
+ * svg/SVGToOTFFontConversion.cpp:
+ (WebCore::SVGToOTFFontConverter::appendKERNTable):
+ (WebCore::SVGToOTFFontConverter::SVGToOTFFontConverter):
+
</ins><span class="cx"> 2015-06-01 Andreas Kling <akling@apple.com>
</span><span class="cx">
</span><span class="cx"> CSS animations in filling-forwards state shouldn't force compositing.
</span></span></pre></div>
<a id="trunkSourceWebCoresvgSVGToOTFFontConversioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/svg/SVGToOTFFontConversion.cpp (185099 => 185100)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/svg/SVGToOTFFontConversion.cpp 2015-06-02 02:59:39 UTC (rev 185099)
+++ trunk/Source/WebCore/svg/SVGToOTFFontConversion.cpp 2015-06-02 03:11:11 UTC (rev 185100)
</span><span class="lines">@@ -1102,9 +1102,11 @@
</span><span class="cx"> size_t sizeOfVerticalSubtable = appendKERNSubtable<SVGVKernElement>(&SVGVKernElement::buildVerticalKerningPair, 0);
</span><span class="cx"> ASSERT_UNUSED(sizeOfVerticalSubtable, subtablesOffset + sizeOfHorizontalSubtable + sizeOfVerticalSubtable == m_result.size());
</span><span class="cx">
</span><ins>+#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED <= 101000) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED <= 80000)
</ins><span class="cx"> // Work around a bug in Apple's font parser by adding some padding bytes. <rdar://problem/18401901>
</span><span class="cx"> for (int i = 0; i < 6; ++i)
</span><span class="cx"> m_result.append(0);
</span><ins>+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template <typename V>
</span><span class="lines">@@ -1398,9 +1400,11 @@
</span><span class="cx"> processGlyphElement(glyphElement, &glyphElement, defaultHorizontalAdvance, defaultVerticalAdvance, unicodeAttribute, initialGlyph);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED <= 101000) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED <= 80000)
</ins><span class="cx"> // <rdar://problem/20086223> Cocoa has a bug where glyph bounding boxes are not correctly respected for frustum culling. Work around this by
</span><span class="cx"> // inflating the font's bounding box
</span><span class="cx"> m_boundingBox.extend(FloatPoint(0, 0));
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> appendLigatureGlyphs();
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>