<!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>[158860] 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/158860">158860</a></dd>
<dt>Author</dt> <dd>antti@apple.com</dd>
<dt>Date</dt> <dd>2013-11-07 11:45:13 -0800 (Thu, 07 Nov 2013)</dd>
</dl>

<h3>Log Message</h3>
<pre>Simple line layout crashes with SVG fonts
https://bugs.webkit.org/show_bug.cgi?id=124002

Source/WebCore: 

Reviewed by Simon Fraser.
        
Don't use simple line layout for flows using SVG fonts. They crash if kerning is enabled.

Test: fast/text/svg-font-simple-line-crash.html

* platform/graphics/Font.h:
(WebCore::Font::isSVGFont):
        
    Add isSVGFont() so callers don't need to go via primaryFont().

* rendering/InlineTextBox.cpp:
(WebCore::InlineTextBox::constructTextRun):
* rendering/RenderBlock.cpp:
(WebCore::constructTextRunInternal):
* rendering/SimpleLineLayout.cpp:
(WebCore::SimpleLineLayout::canUseFor):
        
    Disallow SVG fonts.

* rendering/svg/SVGInlineTextBox.cpp:
(WebCore::SVGInlineTextBox::constructTextRun):
* rendering/svg/SVGTextMetrics.cpp:
(WebCore::SVGTextMetrics::constructTextRun):
(WebCore::SVGTextMetrics::SVGTextMetrics):
* rendering/svg/SVGTextRunRenderingContext.h:
        
    Get rid of the abstract textRunNeedsRenderingContext in favor of just testing isSVGFont().

LayoutTests: 

Reviewed by Simon Fraser.

* fast/text/svg-font-simple-line-crash-expected.txt: Added.
* fast/text/svg-font-simple-line-crash.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="#trunkSourceWebCoreplatformgraphicsFonth">trunk/Source/WebCore/platform/graphics/Font.h</a></li>
<li><a href="#trunkSourceWebCorerenderingInlineTextBoxcpp">trunk/Source/WebCore/rendering/InlineTextBox.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderBlockcpp">trunk/Source/WebCore/rendering/RenderBlock.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingSimpleLineLayoutcpp">trunk/Source/WebCore/rendering/SimpleLineLayout.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingsvgSVGInlineTextBoxcpp">trunk/Source/WebCore/rendering/svg/SVGInlineTextBox.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingsvgSVGTextMetricscpp">trunk/Source/WebCore/rendering/svg/SVGTextMetrics.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingsvgSVGTextRunRenderingContexth">trunk/Source/WebCore/rendering/svg/SVGTextRunRenderingContext.h</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfasttextsvgfontsimplelinecrashexpectedtxt">trunk/LayoutTests/fast/text/svg-font-simple-line-crash-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfasttextsvgfontsimplelinecrashhtml">trunk/LayoutTests/fast/text/svg-font-simple-line-crash.html</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (158859 => 158860)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog        2013-11-07 19:34:01 UTC (rev 158859)
+++ trunk/LayoutTests/ChangeLog        2013-11-07 19:45:13 UTC (rev 158860)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2013-11-07  Antti Koivisto  &lt;antti@apple.com&gt;
+
+        Simple line layout crashes with SVG fonts
+        https://bugs.webkit.org/show_bug.cgi?id=124002
+
+        Reviewed by Simon Fraser.
+
+        * fast/text/svg-font-simple-line-crash-expected.txt: Added.
+        * fast/text/svg-font-simple-line-crash.html: Added.
+
</ins><span class="cx"> 2013-11-07  Alexandru Chiculita  &lt;achicu@adobe.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Web Inspector: CSS Regions: Removing a content node of a ContentFlow from the DOM will send a 0 nodeId
</span></span></pre></div>
<a id="trunkLayoutTestsfasttextsvgfontsimplelinecrashexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/text/svg-font-simple-line-crash-expected.txt (0 => 158860)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text/svg-font-simple-line-crash-expected.txt                                (rev 0)
+++ trunk/LayoutTests/fast/text/svg-font-simple-line-crash-expected.txt        2013-11-07 19:45:13 UTC (rev 158860)
</span><span class="lines">@@ -0,0 +1 @@
</span><ins>+This test passes if it does not crash.
</ins></span></pre></div>
<a id="trunkLayoutTestsfasttextsvgfontsimplelinecrashhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/text/svg-font-simple-line-crash.html (0 => 158860)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text/svg-font-simple-line-crash.html                                (rev 0)
+++ trunk/LayoutTests/fast/text/svg-font-simple-line-crash.html        2013-11-07 19:45:13 UTC (rev 158860)
</span><span class="lines">@@ -0,0 +1,21 @@
</span><ins>+&lt;script&gt;
+    if (window.testRunner) {
+        testRunner.dumpAsText();
+        testRunner.waitUntilDone();
+        setTimeout(function () { testRunner.notifyDone(); }, 50);
+    }
+&lt;/script&gt;
+&lt;style&gt;
+    @font-face {
+        font-family: freesans;
+        src: url(../../svg/custom/resources/SVGFreeSans.svg) format(&quot;svg&quot;);
+    }
+
+    div {
+        font-family: freesans;
+        -webkit-font-kerning: normal;
+    }
+&lt;/style&gt;
+&lt;div id=test&gt;
+    This test passes if it does not crash.
+&lt;/div&gt;
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (158859 => 158860)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2013-11-07 19:34:01 UTC (rev 158859)
+++ trunk/Source/WebCore/ChangeLog        2013-11-07 19:45:13 UTC (rev 158860)
</span><span class="lines">@@ -1,3 +1,37 @@
</span><ins>+2013-11-07  Antti Koivisto  &lt;antti@apple.com&gt;
+
+        Simple line layout crashes with SVG fonts
+        https://bugs.webkit.org/show_bug.cgi?id=124002
+
+        Reviewed by Simon Fraser.
+        
+        Don't use simple line layout for flows using SVG fonts. They crash if kerning is enabled.
+
+        Test: fast/text/svg-font-simple-line-crash.html
+
+        * platform/graphics/Font.h:
+        (WebCore::Font::isSVGFont):
+        
+            Add isSVGFont() so callers don't need to go via primaryFont().
+
+        * rendering/InlineTextBox.cpp:
+        (WebCore::InlineTextBox::constructTextRun):
+        * rendering/RenderBlock.cpp:
+        (WebCore::constructTextRunInternal):
+        * rendering/SimpleLineLayout.cpp:
+        (WebCore::SimpleLineLayout::canUseFor):
+        
+            Disallow SVG fonts.
+
+        * rendering/svg/SVGInlineTextBox.cpp:
+        (WebCore::SVGInlineTextBox::constructTextRun):
+        * rendering/svg/SVGTextMetrics.cpp:
+        (WebCore::SVGTextMetrics::constructTextRun):
+        (WebCore::SVGTextMetrics::SVGTextMetrics):
+        * rendering/svg/SVGTextRunRenderingContext.h:
+        
+            Get rid of the abstract textRunNeedsRenderingContext in favor of just testing isSVGFont().
+
</ins><span class="cx"> 2013-11-07  Simon Fraser  &lt;simon.fraser@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Allow customization of the contentsScale of TileController tiles
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsFonth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/Font.h (158859 => 158860)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/Font.h        2013-11-07 19:34:01 UTC (rev 158859)
+++ trunk/Source/WebCore/platform/graphics/Font.h        2013-11-07 19:45:13 UTC (rev 158860)
</span><span class="lines">@@ -118,6 +118,7 @@
</span><span class="cx">     void setLetterSpacing(short s) { m_letterSpacing = s; }
</span><span class="cx">     bool isFixedPitch() const;
</span><span class="cx">     bool isPrinterFont() const { return m_fontDescription.usePrinterFont(); }
</span><ins>+    bool isSVGFont() const { return primaryFont()-&gt;isSVGFont(); }
</ins><span class="cx">     
</span><span class="cx">     FontRenderingMode renderingMode() const { return m_fontDescription.renderingMode(); }
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingInlineTextBoxcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/InlineTextBox.cpp (158859 => 158860)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/InlineTextBox.cpp        2013-11-07 19:34:01 UTC (rev 158859)
+++ trunk/Source/WebCore/rendering/InlineTextBox.cpp        2013-11-07 19:45:13 UTC (rev 158860)
</span><span class="lines">@@ -1475,7 +1475,7 @@
</span><span class="cx"> 
</span><span class="cx">     TextRun run(string, textPos(), expansion(), expansionBehavior(), direction(), dirOverride() || style.rtlOrdering() == VisualOrder, !renderer().canUseSimpleFontCodePath());
</span><span class="cx">     run.setTabSize(!style.collapseWhiteSpace(), style.tabSize());
</span><del>-    if (textRunNeedsRenderingContext(font))
</del><ins>+    if (font.isSVGFont())
</ins><span class="cx">         run.setRenderingContext(SVGTextRunRenderingContext::create(renderer()));
</span><span class="cx"> 
</span><span class="cx">     // Propagate the maximum length of the characters buffer to the TextRun, even when we're only processing a substring.
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBlockcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBlock.cpp (158859 => 158860)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBlock.cpp        2013-11-07 19:34:01 UTC (rev 158859)
+++ trunk/Source/WebCore/rendering/RenderBlock.cpp        2013-11-07 19:45:13 UTC (rev 158860)
</span><span class="lines">@@ -5291,7 +5291,7 @@
</span><span class="cx">     bool directionalOverride = style.rtlOrdering() == VisualOrder;
</span><span class="cx"> 
</span><span class="cx">     TextRun run(characters, length, 0, 0, expansion, textDirection, directionalOverride);
</span><del>-    if (textRunNeedsRenderingContext(font)) {
</del><ins>+    if (font.isSVGFont()) {
</ins><span class="cx">         ASSERT(context); // FIXME: Thread a RenderObject&amp; to this point so we don't have to dereference anything.
</span><span class="cx">         run.setRenderingContext(SVGTextRunRenderingContext::create(*context));
</span><span class="cx">     }
</span><span class="lines">@@ -5311,7 +5311,7 @@
</span><span class="cx">             directionalOverride |= isOverride(style.unicodeBidi());
</span><span class="cx">     }
</span><span class="cx">     TextRun run(characters, length, 0, 0, expansion, textDirection, directionalOverride);
</span><del>-    if (textRunNeedsRenderingContext(font)) {
</del><ins>+    if (font.isSVGFont()) {
</ins><span class="cx">         ASSERT(context); // FIXME: Thread a RenderObject&amp; to this point so we don't have to dereference anything.
</span><span class="cx">         run.setRenderingContext(SVGTextRunRenderingContext::create(*context));
</span><span class="cx">     }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingSimpleLineLayoutcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/SimpleLineLayout.cpp (158859 => 158860)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/SimpleLineLayout.cpp        2013-11-07 19:34:01 UTC (rev 158859)
+++ trunk/Source/WebCore/rendering/SimpleLineLayout.cpp        2013-11-07 19:45:13 UTC (rev 158860)
</span><span class="lines">@@ -155,6 +155,8 @@
</span><span class="cx">         return false;
</span><span class="cx">     if (style.font().codePath(TextRun(textRenderer.text())) != Font::Simple)
</span><span class="cx">         return false;
</span><ins>+    if (style.font().isSVGFont())
+        return false;
</ins><span class="cx"> 
</span><span class="cx">     // We assume that all lines have metrics based purely on the primary font.
</span><span class="cx">     auto&amp; primaryFontData = *style.font().primaryFont();
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgSVGInlineTextBoxcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/SVGInlineTextBox.cpp (158859 => 158860)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/svg/SVGInlineTextBox.cpp        2013-11-07 19:34:01 UTC (rev 158859)
+++ trunk/Source/WebCore/rendering/svg/SVGInlineTextBox.cpp        2013-11-07 19:45:13 UTC (rev 158860)
</span><span class="lines">@@ -407,7 +407,7 @@
</span><span class="cx">                 , direction()
</span><span class="cx">                 , dirOverride() || style-&gt;rtlOrdering() == VisualOrder /* directionalOverride */);
</span><span class="cx"> 
</span><del>-    if (textRunNeedsRenderingContext(style-&gt;font()))
</del><ins>+    if (style-&gt;font().isSVGFont())
</ins><span class="cx">         run.setRenderingContext(SVGTextRunRenderingContext::create(renderer()));
</span><span class="cx"> 
</span><span class="cx">     run.disableRoundingHacks();
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgSVGTextMetricscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/SVGTextMetrics.cpp (158859 => 158860)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/svg/SVGTextMetrics.cpp        2013-11-07 19:34:01 UTC (rev 158859)
+++ trunk/Source/WebCore/rendering/svg/SVGTextMetrics.cpp        2013-11-07 19:45:13 UTC (rev 158860)
</span><span class="lines">@@ -75,7 +75,7 @@
</span><span class="cx">                 , style.direction()
</span><span class="cx">                 , isOverride(style.unicodeBidi()) /* directionalOverride */);
</span><span class="cx"> 
</span><del>-    if (textRunNeedsRenderingContext(style.font()))
</del><ins>+    if (style.font().isSVGFont())
</ins><span class="cx">         run.setRenderingContext(SVGTextRunRenderingContext::create(*text));
</span><span class="cx"> 
</span><span class="cx">     run.disableRoundingHacks();
</span><span class="lines">@@ -99,7 +99,7 @@
</span><span class="cx"> {
</span><span class="cx">     ASSERT(text);
</span><span class="cx"> 
</span><del>-    bool needsContext = textRunNeedsRenderingContext(text-&gt;style().font());
</del><ins>+    bool needsContext = text-&gt;style().font().isSVGFont();
</ins><span class="cx">     float scalingFactor = text-&gt;scalingFactor();
</span><span class="cx">     ASSERT(scalingFactor);
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgSVGTextRunRenderingContexth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/SVGTextRunRenderingContext.h (158859 => 158860)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/svg/SVGTextRunRenderingContext.h        2013-11-07 19:34:01 UTC (rev 158859)
+++ trunk/Source/WebCore/rendering/svg/SVGTextRunRenderingContext.h        2013-11-07 19:45:13 UTC (rev 158860)
</span><span class="lines">@@ -66,14 +66,6 @@
</span><span class="cx"> #endif
</span><span class="cx"> };
</span><span class="cx"> 
</span><del>-inline bool textRunNeedsRenderingContext(const Font&amp; font)
-{
-    // Only save the extra data if SVG Fonts are used, which depend on them.
-    // FIXME: SVG Fonts won't work as segmented fonts at the moment, if that's fixed, we need to check for them as well below.
-    ASSERT(font.primaryFont());
-    return font.primaryFont()-&gt;isSVGFont();
-}
-
</del><span class="cx"> } // namespace WebCore
</span><span class="cx"> 
</span><span class="cx"> #endif // SVGTextRunRenderingContext_h
</span></span></pre>
</div>
</div>

</body>
</html>