<!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>[182864] 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/182864">182864</a></dd>
<dt>Author</dt> <dd>dbates@webkit.org</dd>
<dt>Date</dt> <dd>2015-04-15 15:35:42 -0700 (Wed, 15 Apr 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Clean up: Have SVGTextLayoutEngine::beginTextPathLayout() take a reference to a
RenderSVGTextPath instead of a pointer
https://bugs.webkit.org/show_bug.cgi?id=143787
Reviewed by Andreas Kling.
SVGTextLayoutEngine::beginTextPathLayout() assumes that the passed RenderObject is a
non-null pointer to a RenderSVGTextPath object. Instead we should have this function take a
reference to a RenderSVGTextPath object to help callers catch bad usage and better document
the expectation of a valid RenderSVGTextPath object.
* rendering/svg/SVGRootInlineBox.cpp:
(WebCore::SVGRootInlineBox::layoutCharactersInTextBoxes): Downcast the renderer of the
inline box to a RenderSVGTextPath object and pass it to SVGTextLayoutEngine::beginTextPathLayout().
We ensured that this cast is safe earlier in this function.
SVGTextLayoutEngine::beginTextPathLayout().
* rendering/svg/SVGTextLayoutEngine.cpp:
(WebCore::SVGTextLayoutEngine::beginTextPathLayout): Change type of first parameter from
RenderObject* to RenderSVGTextPath. Remove ASSERT() that was checking for a non-null
RenderObject pointer since we are passing the renderer by reference and a well-formed
reference must refer to a valid object.
* rendering/svg/SVGTextLayoutEngine.h: Substitute RenderSVGTextPath& for RenderObject*.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorerenderingsvgSVGRootInlineBoxcpp">trunk/Source/WebCore/rendering/svg/SVGRootInlineBox.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingsvgSVGTextLayoutEnginecpp">trunk/Source/WebCore/rendering/svg/SVGTextLayoutEngine.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingsvgSVGTextLayoutEngineh">trunk/Source/WebCore/rendering/svg/SVGTextLayoutEngine.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (182863 => 182864)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-04-15 21:49:25 UTC (rev 182863)
+++ trunk/Source/WebCore/ChangeLog 2015-04-15 22:35:42 UTC (rev 182864)
</span><span class="lines">@@ -1,3 +1,28 @@
</span><ins>+2015-04-15 Daniel Bates <dabates@apple.com>
+
+ Clean up: Have SVGTextLayoutEngine::beginTextPathLayout() take a reference to a
+ RenderSVGTextPath instead of a pointer
+ https://bugs.webkit.org/show_bug.cgi?id=143787
+
+ Reviewed by Andreas Kling.
+
+ SVGTextLayoutEngine::beginTextPathLayout() assumes that the passed RenderObject is a
+ non-null pointer to a RenderSVGTextPath object. Instead we should have this function take a
+ reference to a RenderSVGTextPath object to help callers catch bad usage and better document
+ the expectation of a valid RenderSVGTextPath object.
+
+ * rendering/svg/SVGRootInlineBox.cpp:
+ (WebCore::SVGRootInlineBox::layoutCharactersInTextBoxes): Downcast the renderer of the
+ inline box to a RenderSVGTextPath object and pass it to SVGTextLayoutEngine::beginTextPathLayout().
+ We ensured that this cast is safe earlier in this function.
+ SVGTextLayoutEngine::beginTextPathLayout().
+ * rendering/svg/SVGTextLayoutEngine.cpp:
+ (WebCore::SVGTextLayoutEngine::beginTextPathLayout): Change type of first parameter from
+ RenderObject* to RenderSVGTextPath. Remove ASSERT() that was checking for a non-null
+ RenderObject pointer since we are passing the renderer by reference and a well-formed
+ reference must refer to a valid object.
+ * rendering/svg/SVGTextLayoutEngine.h: Substitute RenderSVGTextPath& for RenderObject*.
+
</ins><span class="cx"> 2015-04-13 Jer Noble <jer.noble@apple.com>
</span><span class="cx">
</span><span class="cx"> [Fullscreen] ChromeClient::exitVideoFullscreen() should take a pointer to a HTMLVideoElement.
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgSVGRootInlineBoxcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/SVGRootInlineBox.cpp (182863 => 182864)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/svg/SVGRootInlineBox.cpp 2015-04-15 21:49:25 UTC (rev 182863)
+++ trunk/Source/WebCore/rendering/svg/SVGRootInlineBox.cpp 2015-04-15 22:35:42 UTC (rev 182864)
</span><span class="lines">@@ -26,6 +26,7 @@
</span><span class="cx">
</span><span class="cx"> #include "GraphicsContext.h"
</span><span class="cx"> #include "RenderSVGText.h"
</span><ins>+#include "RenderSVGTextPath.h"
</ins><span class="cx"> #include "SVGInlineFlowBox.h"
</span><span class="cx"> #include "SVGInlineTextBox.h"
</span><span class="cx"> #include "SVGNames.h"
</span><span class="lines">@@ -119,7 +120,7 @@
</span><span class="cx"> SVGTextLayoutEngine lineLayout(characterLayout.layoutAttributes());
</span><span class="cx"> layoutCharactersInTextBoxes(&flowBox, lineLayout);
</span><span class="cx">
</span><del>- characterLayout.beginTextPathLayout(&child->renderer(), lineLayout);
</del><ins>+ characterLayout.beginTextPathLayout(downcast<RenderSVGTextPath>(child->renderer()), lineLayout);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> layoutCharactersInTextBoxes(&flowBox, characterLayout);
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgSVGTextLayoutEnginecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/SVGTextLayoutEngine.cpp (182863 => 182864)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/svg/SVGTextLayoutEngine.cpp 2015-04-15 21:49:25 UTC (rev 182863)
+++ trunk/Source/WebCore/rendering/svg/SVGTextLayoutEngine.cpp 2015-04-15 22:35:42 UTC (rev 182864)
</span><span class="lines">@@ -161,12 +161,9 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void SVGTextLayoutEngine::beginTextPathLayout(RenderObject* object, SVGTextLayoutEngine& lineLayout)
</del><ins>+void SVGTextLayoutEngine::beginTextPathLayout(RenderSVGTextPath& textPath, SVGTextLayoutEngine& lineLayout)
</ins><span class="cx"> {
</span><del>- ASSERT(object);
-
</del><span class="cx"> m_inPathLayout = true;
</span><del>- RenderSVGTextPath& textPath = downcast<RenderSVGTextPath>(*object);
</del><span class="cx">
</span><span class="cx"> m_textPath = textPath.layoutPath();
</span><span class="cx"> if (m_textPath.isEmpty())
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgSVGTextLayoutEngineh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/SVGTextLayoutEngine.h (182863 => 182864)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/svg/SVGTextLayoutEngine.h 2015-04-15 21:49:25 UTC (rev 182863)
+++ trunk/Source/WebCore/rendering/svg/SVGTextLayoutEngine.h 2015-04-15 22:35:42 UTC (rev 182864)
</span><span class="lines">@@ -30,6 +30,7 @@
</span><span class="cx"> class RenderObject;
</span><span class="cx"> class RenderStyle;
</span><span class="cx"> class RenderSVGInlineText;
</span><ins>+class RenderSVGTextPath;
</ins><span class="cx"> class SVGElement;
</span><span class="cx"> class SVGInlineTextBox;
</span><span class="cx"> class SVGRenderStyle;
</span><span class="lines">@@ -50,7 +51,7 @@
</span><span class="cx"> Vector<SVGTextLayoutAttributes*>& layoutAttributes() { return m_layoutAttributes; }
</span><span class="cx"> SVGTextChunkBuilder& chunkLayoutBuilder() { return m_chunkLayoutBuilder; }
</span><span class="cx">
</span><del>- void beginTextPathLayout(RenderObject*, SVGTextLayoutEngine& lineLayout);
</del><ins>+ void beginTextPathLayout(RenderSVGTextPath&, SVGTextLayoutEngine& lineLayout);
</ins><span class="cx"> void endTextPathLayout();
</span><span class="cx">
</span><span class="cx"> void layoutInlineTextBox(SVGInlineTextBox*);
</span></span></pre>
</div>
</div>
</body>
</html>