<!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>[164075] 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/164075">164075</a></dd>
<dt>Author</dt> <dd>mmaxfield@apple.com</dd>
<dt>Date</dt> <dd>2014-02-13 16:30:15 -0800 (Thu, 13 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>text-decoration-skip: ink skips randomly when using SVG fonts
https://bugs.webkit.org/show_bug.cgi?id=128709
Reviewed by Simon Fraser.
Source/WebCore:
This patch simply disables skipping underlines being used with SVG fonts.
It's a stopgap until we can support skipping properly with SVG fonts.
Test: svg/custom/svg-fonts-skip-ink.html
* platform/graphics/cocoa/FontPlatformDataCocoa.mm:
(WebCore::FontPlatformData::ctFont):
* platform/graphics/mac/FontMac.mm:
(WebCore::Font::dashesForIntersectionsWithRect):
LayoutTests:
This text checks that some text without descenders in an SVG font renders the same with and
without text-decoration-skip: ink.
* svg/custom/svg-fonts-skip-ink-expected.html: Added.
* svg/custom/svg-fonts-skip-ink.html: 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="#trunkSourceWebCoreplatformgraphicscocoaFontPlatformDataCocoamm">trunk/Source/WebCore/platform/graphics/cocoa/FontPlatformDataCocoa.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsmacFontMacmm">trunk/Source/WebCore/platform/graphics/mac/FontMac.mm</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestssvgcustomsvgfontsskipinkexpectedhtml">trunk/LayoutTests/svg/custom/svg-fonts-skip-ink-expected.html</a></li>
<li><a href="#trunkLayoutTestssvgcustomsvgfontsskipinkhtml">trunk/LayoutTests/svg/custom/svg-fonts-skip-ink.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (164074 => 164075)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-02-14 00:22:45 UTC (rev 164074)
+++ trunk/LayoutTests/ChangeLog 2014-02-14 00:30:15 UTC (rev 164075)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2014-02-13 Myles C. Maxfield <mmaxfield@apple.com>
+
+ text-decoration-skip: ink skips randomly when using SVG fonts
+ https://bugs.webkit.org/show_bug.cgi?id=128709
+
+ Reviewed by Simon Fraser.
+
+ This text checks that some text without descenders in an SVG font renders the same with and
+ without text-decoration-skip: ink.
+
+ * svg/custom/svg-fonts-skip-ink-expected.html: Added.
+ * svg/custom/svg-fonts-skip-ink.html: Added.
+
</ins><span class="cx"> 2014-02-13 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> Create some latched scrolling tests.
</span></span></pre></div>
<a id="trunkLayoutTestssvgcustomsvgfontsskipinkexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/svg/custom/svg-fonts-skip-ink-expected.html (0 => 164075)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/svg/custom/svg-fonts-skip-ink-expected.html (rev 0)
+++ trunk/LayoutTests/svg/custom/svg-fonts-skip-ink-expected.html 2014-02-14 00:30:15 UTC (rev 164075)
</span><span class="lines">@@ -0,0 +1,19 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<style>
+@font-face {
+ font-family: 'SVGraffiti';
+ src: url("resources/graffiti.svg#SVGraffiti") format(svg)
+}
+body {
+ font:100px 'SVGraffiti';
+ -webkit-text-decoration-skip: none;
+ text-decoration: underline;
+}
+</style>
+</head>
+<body>
+NSNorth Podcast
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestssvgcustomsvgfontsskipinkhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/svg/custom/svg-fonts-skip-ink.html (0 => 164075)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/svg/custom/svg-fonts-skip-ink.html (rev 0)
+++ trunk/LayoutTests/svg/custom/svg-fonts-skip-ink.html 2014-02-14 00:30:15 UTC (rev 164075)
</span><span class="lines">@@ -0,0 +1,19 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<style>
+@font-face {
+ font-family: 'SVGraffiti';
+ src: url("resources/graffiti.svg#SVGraffiti") format(svg)
+}
+body {
+ font:100px 'SVGraffiti';
+ -webkit-text-decoration-skip: ink;
+ text-decoration: underline;
+}
+</style>
+</head>
+<body>
+NSNorth Podcast
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (164074 => 164075)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-02-14 00:22:45 UTC (rev 164074)
+++ trunk/Source/WebCore/ChangeLog 2014-02-14 00:30:15 UTC (rev 164075)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2014-02-13 Myles C. Maxfield <mmaxfield@apple.com>
+
+ text-decoration-skip: ink skips randomly when using SVG fonts
+ https://bugs.webkit.org/show_bug.cgi?id=128709
+
+ Reviewed by Simon Fraser.
+
+ This patch simply disables skipping underlines being used with SVG fonts.
+ It's a stopgap until we can support skipping properly with SVG fonts.
+
+ Test: svg/custom/svg-fonts-skip-ink.html
+
+ * platform/graphics/cocoa/FontPlatformDataCocoa.mm:
+ (WebCore::FontPlatformData::ctFont):
+ * platform/graphics/mac/FontMac.mm:
+ (WebCore::Font::dashesForIntersectionsWithRect):
+
</ins><span class="cx"> 2014-02-13 Daniel Bates <dabates@apple.com>
</span><span class="cx">
</span><span class="cx"> Fix the ARM build when HAVE_ARM_NEON_INTRINSICS is enabled
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscocoaFontPlatformDataCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cocoa/FontPlatformDataCocoa.mm (164074 => 164075)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/cocoa/FontPlatformDataCocoa.mm 2014-02-14 00:22:45 UTC (rev 164074)
+++ trunk/Source/WebCore/platform/graphics/cocoa/FontPlatformDataCocoa.mm 2014-02-14 00:30:15 UTC (rev 164075)
</span><span class="lines">@@ -319,8 +319,10 @@
</span><span class="cx"> else
</span><span class="cx"> fontDescriptor = cascadeToLastResortFontDescriptor();
</span><span class="cx"> m_CTFont = adoptCF(CTFontCreateCopyWithAttributes(m_CTFont.get(), m_size, 0, fontDescriptor));
</span><del>- } else
</del><ins>+ } else {
+ ASSERT(m_cgFont.get());
</ins><span class="cx"> m_CTFont = adoptCF(CTFontCreateWithGraphicsFont(m_cgFont.get(), m_size, 0, cascadeToLastResortFontDescriptor()));
</span><ins>+ }
</ins><span class="cx"> #else
</span><span class="cx"> // Apple Color Emoji size is adjusted (and then re-adjusted by Core Text) and capped.
</span><span class="cx"> CGFloat size = !m_isEmoji ? m_size : m_size <= 15 ? 4 * (m_size + 2) / static_cast<CGFloat>(5) : 16;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsmacFontMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/mac/FontMac.mm (164074 => 164075)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/mac/FontMac.mm 2014-02-14 00:22:45 UTC (rev 164074)
+++ trunk/Source/WebCore/platform/graphics/mac/FontMac.mm 2014-02-14 00:30:15 UTC (rev 164075)
</span><span class="lines">@@ -438,6 +438,9 @@
</span><span class="cx">
</span><span class="cx"> DashArray Font::dashesForIntersectionsWithRect(const TextRun& run, const FloatPoint& textOrigin, const FloatRect& lineExtents) const
</span><span class="cx"> {
</span><ins>+ if (loadingCustomFonts())
+ return DashArray();
+
</ins><span class="cx"> float deltaX;
</span><span class="cx"> GlyphBuffer glyphBuffer;
</span><span class="cx"> if (codePath(run) != Complex)
</span><span class="lines">@@ -449,7 +452,10 @@
</span><span class="cx"> DashArray result;
</span><span class="cx"> for (int i = 0; i < glyphBuffer.size(); ++i) {
</span><span class="cx"> GlyphIterationState info = GlyphIterationState(CGPointMake(0, 0), CGPointMake(0, 0), lineExtents.y(), lineExtents.y() + lineExtents.height(), lineExtents.x() + lineExtents.width(), lineExtents.x());
</span><del>- RetainPtr<CGPathRef> path = adoptCF(CTFontCreatePathForGlyph(glyphBuffer.fontDataAt(i)->platformData().ctFont(), glyphBuffer.glyphAt(i), &translation));
</del><ins>+ const SimpleFontData* fontData = glyphBuffer.fontDataAt(i);
+ if (fontData->isSVGFont())
+ continue;
+ RetainPtr<CGPathRef> path = adoptCF(CTFontCreatePathForGlyph(fontData->platformData().ctFont(), glyphBuffer.glyphAt(i), &translation));
</ins><span class="cx"> CGPathApply(path.get(), &info, &findPathIntersections);
</span><span class="cx"> if (info.minX < info.maxX) {
</span><span class="cx"> result.append(info.minX - lineExtents.x());
</span></span></pre>
</div>
</div>
</body>
</html>