<!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>[168270] releases/WebKitGTK/webkit-2.4</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/168270">168270</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2014-05-05 03:01:18 -0700 (Mon, 05 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/166420">r166420</a> - Clear SVGInlineTextBox fragments when the text changes.
https://bugs.webkit.org/show_bug.cgi?id=130879
Reviewed by Darin Adler.
Ported from Blink: https://src.chromium.org/viewvc/blink?revision=150456&view=revision
Source/WebCore:
This patch modifies SVGInlineTextBox::dirtyLineBoxes to clear all
following text boxes when invoked. Typically this method is called
when the underlying text string changes, and that change needs to
be propagated to all the boxes that use the text beyond the point
where the text is first modified.
Also cleans up final function keywords for SVGRootInlineBox.
Test: svg/custom/unicode-in-tspan-multi-svg-crash.html
* rendering/InlineTextBox.h: Added (non-recursive) dirtyOwnLineBoxes() function
(WebCore::InlineTextBox::dirtyOwnLineBoxes): Calls dirtyLineBoxes()
* rendering/svg/SVGInlineTextBox.h: Added (non-recursive) dirtyOwnLineBoxes() function
(WebCore::SVGInlineTextBox::dirtyOwnLineBoxes):
* rendering/svg/SVGInlineTextBox.cpp:
(WebCore::SVGInlineTextBox::dirtyOwnLineBoxes): Non-recursive part of dirtyLineBoxes()
(WebCore::SVGInlineTextBox::dirtyLineBoxes): Calls dirtyOwnLineBoxes() in a loop
* rendering/svg/SVGRootInlineBox.h:
LayoutTests:
When failing, this test will render garbage characters or crash.
* svg/custom/unicode-in-tspan-multi-svg-crash-expected.txt: Added.
* svg/custom/unicode-in-tspan-multi-svg-crash.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit24LayoutTestsChangeLog">releases/WebKitGTK/webkit-2.4/LayoutTests/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit24SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.4/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit24SourceWebCorerenderingInlineTextBoxh">releases/WebKitGTK/webkit-2.4/Source/WebCore/rendering/InlineTextBox.h</a></li>
<li><a href="#releasesWebKitGTKwebkit24SourceWebCorerenderingsvgSVGInlineTextBoxcpp">releases/WebKitGTK/webkit-2.4/Source/WebCore/rendering/svg/SVGInlineTextBox.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit24SourceWebCorerenderingsvgSVGInlineTextBoxh">releases/WebKitGTK/webkit-2.4/Source/WebCore/rendering/svg/SVGInlineTextBox.h</a></li>
<li><a href="#releasesWebKitGTKwebkit24SourceWebCorerenderingsvgSVGRootInlineBoxh">releases/WebKitGTK/webkit-2.4/Source/WebCore/rendering/svg/SVGRootInlineBox.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit24LayoutTestssvgcustomunicodeintspanmultisvgcrashexpectedtxt">releases/WebKitGTK/webkit-2.4/LayoutTests/svg/custom/unicode-in-tspan-multi-svg-crash-expected.txt</a></li>
<li><a href="#releasesWebKitGTKwebkit24LayoutTestssvgcustomunicodeintspanmultisvgcrashhtml">releases/WebKitGTK/webkit-2.4/LayoutTests/svg/custom/unicode-in-tspan-multi-svg-crash.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit24LayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/LayoutTests/ChangeLog (168269 => 168270)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/LayoutTests/ChangeLog 2014-05-05 09:58:03 UTC (rev 168269)
+++ releases/WebKitGTK/webkit-2.4/LayoutTests/ChangeLog 2014-05-05 10:01:18 UTC (rev 168270)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2014-03-28 Myles C. Maxfield <mmaxfield@apple.com>
+
+ Clear SVGInlineTextBox fragments when the text changes.
+ https://bugs.webkit.org/show_bug.cgi?id=130879
+
+ Reviewed by Darin Adler.
+
+ Ported from Blink: https://src.chromium.org/viewvc/blink?revision=150456&view=revision
+
+ When failing, this test will render garbage characters or crash.
+
+ * svg/custom/unicode-in-tspan-multi-svg-crash-expected.txt: Added.
+ * svg/custom/unicode-in-tspan-multi-svg-crash.html: Added.
+
</ins><span class="cx"> 2014-03-01 David Kilzer <ddkilzer@apple.com>
</span><span class="cx">
</span><span class="cx"> Fix lifetime handling of SVGPropertyTearOffs
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit24LayoutTestssvgcustomunicodeintspanmultisvgcrashexpectedtxt"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.4/LayoutTests/svg/custom/unicode-in-tspan-multi-svg-crash-expected.txt (0 => 168270)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/LayoutTests/svg/custom/unicode-in-tspan-multi-svg-crash-expected.txt (rev 0)
+++ releases/WebKitGTK/webkit-2.4/LayoutTests/svg/custom/unicode-in-tspan-multi-svg-crash-expected.txt 2014-05-05 10:01:18 UTC (rev 168270)
</span><span class="lines">@@ -0,0 +1 @@
</span><ins>+Test Passes if there is no crash in Debug or Asan builds. There should be no characters preceding "Test".
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit24LayoutTestssvgcustomunicodeintspanmultisvgcrashhtml"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.4/LayoutTests/svg/custom/unicode-in-tspan-multi-svg-crash.html (0 => 168270)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/LayoutTests/svg/custom/unicode-in-tspan-multi-svg-crash.html (rev 0)
+++ releases/WebKitGTK/webkit-2.4/LayoutTests/svg/custom/unicode-in-tspan-multi-svg-crash.html 2014-05-05 10:01:18 UTC (rev 168270)
</span><span class="lines">@@ -0,0 +1,38 @@
</span><ins>+<!DOCTYPE html>
+<html>
+ <script>
+ if (window.testRunner)
+ testRunner.dumpAsText(false);
+
+ onload = function() {
+ tSpanElement = document.getElementById('tSpanInFirstRoot');
+ tSpanElement.appendChild(document.createTextNode(unescape('%ufe9e%ue28f%ue47e')));
+
+ document.body.offsetTop;
+ document.body.style.zoom=0.9;
+
+ document.designMode='on';
+ filterInFirstRoot = document.getElementById('filterInFirstRoot');
+ useElement = document.getElementById('useElement');
+ window.getSelection().setBaseAndExtent(filterInFirstRoot, useElement, 5);
+ document.execCommand('ForwardDelete');
+ document.designMode='off';
+ }
+ </script>
+ <body>
+ <svg xmlns="http://www.w3.org/2000/svg">
+ <text>
+ <filter id="filterInFirstRoot"/>
+ <tspan id="tSpanInFirstRoot"/>
+ </text>
+ <path filter="url(#filterInSecondRoot)"/>
+ </svg>
+
+ <svg xmlns="http://www.w3.org/2000/svg">
+ <use id="useElement"/>
+ <filter id="filterInSecondRoot"/>
+ </svg>
+
+ <p>Test Passes if there is no crash in Debug or Asan builds. There should be no characters preceding "Test".</p>
+ </body>
+</html>
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit24SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Source/WebCore/ChangeLog (168269 => 168270)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Source/WebCore/ChangeLog 2014-05-05 09:58:03 UTC (rev 168269)
+++ releases/WebKitGTK/webkit-2.4/Source/WebCore/ChangeLog 2014-05-05 10:01:18 UTC (rev 168270)
</span><span class="lines">@@ -1,3 +1,31 @@
</span><ins>+2014-03-28 Myles C. Maxfield <mmaxfield@apple.com>
+
+ Clear SVGInlineTextBox fragments when the text changes.
+ https://bugs.webkit.org/show_bug.cgi?id=130879
+
+ Reviewed by Darin Adler.
+
+ Ported from Blink: https://src.chromium.org/viewvc/blink?revision=150456&view=revision
+
+ This patch modifies SVGInlineTextBox::dirtyLineBoxes to clear all
+ following text boxes when invoked. Typically this method is called
+ when the underlying text string changes, and that change needs to
+ be propagated to all the boxes that use the text beyond the point
+ where the text is first modified.
+
+ Also cleans up final function keywords for SVGRootInlineBox.
+
+ Test: svg/custom/unicode-in-tspan-multi-svg-crash.html
+
+ * rendering/InlineTextBox.h: Added (non-recursive) dirtyOwnLineBoxes() function
+ (WebCore::InlineTextBox::dirtyOwnLineBoxes): Calls dirtyLineBoxes()
+ * rendering/svg/SVGInlineTextBox.h: Added (non-recursive) dirtyOwnLineBoxes() function
+ (WebCore::SVGInlineTextBox::dirtyOwnLineBoxes):
+ * rendering/svg/SVGInlineTextBox.cpp:
+ (WebCore::SVGInlineTextBox::dirtyOwnLineBoxes): Non-recursive part of dirtyLineBoxes()
+ (WebCore::SVGInlineTextBox::dirtyLineBoxes): Calls dirtyOwnLineBoxes() in a loop
+ * rendering/svg/SVGRootInlineBox.h:
+
</ins><span class="cx"> 2014-02-02 Andreas Kling <akling@apple.com>
</span><span class="cx">
</span><span class="cx"> Minor SVGRootInlineBox cleanup.
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit24SourceWebCorerenderingInlineTextBoxh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Source/WebCore/rendering/InlineTextBox.h (168269 => 168270)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Source/WebCore/rendering/InlineTextBox.h 2014-05-05 09:58:03 UTC (rev 168269)
+++ releases/WebKitGTK/webkit-2.4/Source/WebCore/rendering/InlineTextBox.h 2014-05-05 10:01:18 UTC (rev 168270)
</span><span class="lines">@@ -98,6 +98,8 @@
</span><span class="cx"> LayoutUnit logicalLeftVisualOverflow() const { return logicalOverflowRect().x(); }
</span><span class="cx"> LayoutUnit logicalRightVisualOverflow() const { return logicalOverflowRect().maxX(); }
</span><span class="cx">
</span><ins>+ virtual void dirtyOwnLineBoxes() { dirtyLineBoxes(); }
+
</ins><span class="cx"> #ifndef NDEBUG
</span><span class="cx"> virtual void showBox(int = 0) const;
</span><span class="cx"> virtual const char* boxName() const;
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit24SourceWebCorerenderingsvgSVGInlineTextBoxcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Source/WebCore/rendering/svg/SVGInlineTextBox.cpp (168269 => 168270)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Source/WebCore/rendering/svg/SVGInlineTextBox.cpp 2014-05-05 09:58:03 UTC (rev 168269)
+++ releases/WebKitGTK/webkit-2.4/Source/WebCore/rendering/svg/SVGInlineTextBox.cpp 2014-05-05 10:01:18 UTC (rev 168270)
</span><span class="lines">@@ -58,7 +58,7 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void SVGInlineTextBox::dirtyLineBoxes()
</del><ins>+void SVGInlineTextBox::dirtyOwnLineBoxes()
</ins><span class="cx"> {
</span><span class="cx"> InlineTextBox::dirtyLineBoxes();
</span><span class="cx">
</span><span class="lines">@@ -66,6 +66,16 @@
</span><span class="cx"> clearTextFragments();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void SVGInlineTextBox::dirtyLineBoxes()
+{
+ dirtyOwnLineBoxes();
+
+ // And clear any following text fragments as the text on which they
+ // depend may now no longer exist, or glyph positions may be wrong
+ for (InlineTextBox* nextBox = nextTextBox(); nextBox; nextBox = nextBox->nextTextBox())
+ nextBox->dirtyOwnLineBoxes();
+}
+
</ins><span class="cx"> int SVGInlineTextBox::offsetForPosition(float, bool) const
</span><span class="cx"> {
</span><span class="cx"> // SVG doesn't use the standard offset <-> position selection system, as it's not suitable for SVGs complex needs.
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit24SourceWebCorerenderingsvgSVGInlineTextBoxh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Source/WebCore/rendering/svg/SVGInlineTextBox.h (168269 => 168270)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Source/WebCore/rendering/svg/SVGInlineTextBox.h 2014-05-05 09:58:03 UTC (rev 168269)
+++ releases/WebKitGTK/webkit-2.4/Source/WebCore/rendering/svg/SVGInlineTextBox.h 2014-05-05 10:01:18 UTC (rev 168270)
</span><span class="lines">@@ -58,7 +58,8 @@
</span><span class="cx"> Vector<SVGTextFragment>& textFragments() { return m_textFragments; }
</span><span class="cx"> const Vector<SVGTextFragment>& textFragments() const { return m_textFragments; }
</span><span class="cx">
</span><del>- virtual void dirtyLineBoxes() override;
</del><ins>+ virtual void dirtyOwnLineBoxes() override final;
+ virtual void dirtyLineBoxes() override final;
</ins><span class="cx">
</span><span class="cx"> bool startsNewTextChunk() const { return m_startsNewTextChunk; }
</span><span class="cx"> void setStartsNewTextChunk(bool newTextChunk) { m_startsNewTextChunk = newTextChunk; }
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit24SourceWebCorerenderingsvgSVGRootInlineBoxh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Source/WebCore/rendering/svg/SVGRootInlineBox.h (168269 => 168270)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Source/WebCore/rendering/svg/SVGRootInlineBox.h 2014-05-05 09:58:03 UTC (rev 168269)
+++ releases/WebKitGTK/webkit-2.4/Source/WebCore/rendering/svg/SVGRootInlineBox.h 2014-05-05 10:01:18 UTC (rev 168270)
</span><span class="lines">@@ -39,17 +39,17 @@
</span><span class="cx">
</span><span class="cx"> RenderSVGText& renderSVGText();
</span><span class="cx">
</span><del>- virtual float virtualLogicalHeight() const override { return m_logicalHeight; }
</del><ins>+ virtual float virtualLogicalHeight() const override final { return m_logicalHeight; }
</ins><span class="cx"> void setLogicalHeight(float height) { m_logicalHeight = height; }
</span><span class="cx">
</span><del>- virtual void paint(PaintInfo&, const LayoutPoint&, LayoutUnit lineTop, LayoutUnit lineBottom) override;
</del><ins>+ virtual void paint(PaintInfo&, const LayoutPoint&, LayoutUnit lineTop, LayoutUnit lineBottom) override final;
</ins><span class="cx">
</span><span class="cx"> void computePerCharacterLayoutInformation();
</span><span class="cx">
</span><span class="cx"> InlineBox* closestLeafChildForPosition(const LayoutPoint&);
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- virtual bool isSVGRootInlineBox() const override { return true; }
</del><ins>+ virtual bool isSVGRootInlineBox() const override final { return true; }
</ins><span class="cx"> void reorderValueLists(Vector<SVGTextLayoutAttributes*>&);
</span><span class="cx"> void layoutCharactersInTextBoxes(InlineFlowBox*, SVGTextLayoutEngine&);
</span><span class="cx"> void layoutChildBoxes(InlineFlowBox*, FloatRect* = 0);
</span></span></pre>
</div>
</div>
</body>
</html>