<!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>[182111] 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/182111">182111</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2015-03-28 04:59:49 -0700 (Sat, 28 Mar 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>nullptr cleanup in InlineFooBox classes
https://bugs.webkit.org/show_bug.cgi?id=143178
Patch by Joonghun Park <jh718.park@samsung.com> on 2015-03-28
Reviewed by Csaba Osztrogonác.
No new tests, no behavior changes
Replace 0 with nullptr in InlineFooBox classes.
* rendering/InlineBox.cpp:
(WebCore::InlineBox::prevLeafChildIgnoringLineBreak):
* rendering/InlineFlowBox.cpp:
(WebCore::InlineFlowBox::removeChild):
(WebCore::InlineFlowBox::deleteLine):
(WebCore::InlineFlowBox::placeBoxesInInlineDirection):
(WebCore::InlineFlowBox::addTextBoxVisualOverflow):
* rendering/InlineFlowBox.h:
(WebCore::InlineFlowBox::InlineFlowBox):
* rendering/InlineTextBox.h:
(WebCore::InlineTextBox::InlineTextBox):
* rendering/RootInlineBox.cpp:
(WebCore::RootInlineBox::getLogicalStartBoxWithNode):
(WebCore::RootInlineBox::getLogicalEndBoxWithNode):
* rendering/RootInlineBox.h:
* rendering/svg/SVGInlineTextBox.cpp:
(WebCore::SVGInlineTextBox::SVGInlineTextBox):
(WebCore::SVGInlineTextBox::releasePaintingResource):
(WebCore::SVGInlineTextBox::restoreGraphicsContextAfterTextPainting):
* rendering/svg/SVGRootInlineBox.cpp:
(WebCore::SVGRootInlineBox::closestLeafChildForPosition):
(WebCore::findFirstAndLastAttributesInVector):
* rendering/svg/SVGRootInlineBox.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorerenderingInlineBoxcpp">trunk/Source/WebCore/rendering/InlineBox.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingInlineFlowBoxcpp">trunk/Source/WebCore/rendering/InlineFlowBox.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingInlineFlowBoxh">trunk/Source/WebCore/rendering/InlineFlowBox.h</a></li>
<li><a href="#trunkSourceWebCorerenderingInlineTextBoxh">trunk/Source/WebCore/rendering/InlineTextBox.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRootInlineBoxcpp">trunk/Source/WebCore/rendering/RootInlineBox.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRootInlineBoxh">trunk/Source/WebCore/rendering/RootInlineBox.h</a></li>
<li><a href="#trunkSourceWebCorerenderingsvgSVGInlineTextBoxcpp">trunk/Source/WebCore/rendering/svg/SVGInlineTextBox.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingsvgSVGRootInlineBoxcpp">trunk/Source/WebCore/rendering/svg/SVGRootInlineBox.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingsvgSVGRootInlineBoxh">trunk/Source/WebCore/rendering/svg/SVGRootInlineBox.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (182110 => 182111)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-03-28 09:57:07 UTC (rev 182110)
+++ trunk/Source/WebCore/ChangeLog 2015-03-28 11:59:49 UTC (rev 182111)
</span><span class="lines">@@ -1,3 +1,38 @@
</span><ins>+2015-03-28 Joonghun Park <jh718.park@samsung.com>
+
+ nullptr cleanup in InlineFooBox classes
+ https://bugs.webkit.org/show_bug.cgi?id=143178
+
+ Reviewed by Csaba Osztrogonác.
+
+ No new tests, no behavior changes
+
+ Replace 0 with nullptr in InlineFooBox classes.
+
+ * rendering/InlineBox.cpp:
+ (WebCore::InlineBox::prevLeafChildIgnoringLineBreak):
+ * rendering/InlineFlowBox.cpp:
+ (WebCore::InlineFlowBox::removeChild):
+ (WebCore::InlineFlowBox::deleteLine):
+ (WebCore::InlineFlowBox::placeBoxesInInlineDirection):
+ (WebCore::InlineFlowBox::addTextBoxVisualOverflow):
+ * rendering/InlineFlowBox.h:
+ (WebCore::InlineFlowBox::InlineFlowBox):
+ * rendering/InlineTextBox.h:
+ (WebCore::InlineTextBox::InlineTextBox):
+ * rendering/RootInlineBox.cpp:
+ (WebCore::RootInlineBox::getLogicalStartBoxWithNode):
+ (WebCore::RootInlineBox::getLogicalEndBoxWithNode):
+ * rendering/RootInlineBox.h:
+ * rendering/svg/SVGInlineTextBox.cpp:
+ (WebCore::SVGInlineTextBox::SVGInlineTextBox):
+ (WebCore::SVGInlineTextBox::releasePaintingResource):
+ (WebCore::SVGInlineTextBox::restoreGraphicsContextAfterTextPainting):
+ * rendering/svg/SVGRootInlineBox.cpp:
+ (WebCore::SVGRootInlineBox::closestLeafChildForPosition):
+ (WebCore::findFirstAndLastAttributesInVector):
+ * rendering/svg/SVGRootInlineBox.h:
+
</ins><span class="cx"> 2015-03-27 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> More modern loops in RenderLayer.cpp
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingInlineBoxcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/InlineBox.cpp (182110 => 182111)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/InlineBox.cpp 2015-03-28 09:57:07 UTC (rev 182110)
+++ trunk/Source/WebCore/rendering/InlineBox.cpp 2015-03-28 11:59:49 UTC (rev 182111)
</span><span class="lines">@@ -253,7 +253,7 @@
</span><span class="cx"> {
</span><span class="cx"> InlineBox* leaf = prevLeafChild();
</span><span class="cx"> if (leaf && leaf->isLineBreak())
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx"> return leaf;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingInlineFlowBoxcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/InlineFlowBox.cpp (182110 => 182111)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/InlineFlowBox.cpp 2015-03-28 09:57:07 UTC (rev 182110)
+++ trunk/Source/WebCore/rendering/InlineFlowBox.cpp 2015-03-28 11:59:49 UTC (rev 182111)
</span><span class="lines">@@ -198,7 +198,7 @@
</span><span class="cx"> if (child->prevOnLine())
</span><span class="cx"> child->prevOnLine()->setNextOnLine(child->nextOnLine());
</span><span class="cx">
</span><del>- child->setParent(0);
</del><ins>+ child->setParent(nullptr);
</ins><span class="cx">
</span><span class="cx"> checkConsistency();
</span><span class="cx"> }
</span><span class="lines">@@ -206,19 +206,19 @@
</span><span class="cx"> void InlineFlowBox::deleteLine()
</span><span class="cx"> {
</span><span class="cx"> InlineBox* child = firstChild();
</span><del>- InlineBox* next = 0;
</del><ins>+ InlineBox* next = nullptr;
</ins><span class="cx"> while (child) {
</span><span class="cx"> ASSERT(this == child->parent());
</span><span class="cx"> next = child->nextOnLine();
</span><span class="cx"> #ifndef NDEBUG
</span><del>- child->setParent(0);
</del><ins>+ child->setParent(nullptr);
</ins><span class="cx"> #endif
</span><span class="cx"> child->deleteLine();
</span><span class="cx"> child = next;
</span><span class="cx"> }
</span><span class="cx"> #ifndef NDEBUG
</span><del>- m_firstChild = 0;
- m_lastChild = 0;
</del><ins>+ m_firstChild = nullptr;
+ m_lastChild = nullptr;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> removeLineBoxFromRenderObject();
</span><span class="lines">@@ -372,7 +372,7 @@
</span><span class="cx"> float minLogicalLeft = startLogicalLeft;
</span><span class="cx"> float maxLogicalRight = logicalLeft;
</span><span class="cx">
</span><del>- placeBoxRangeInInlineDirection(firstChild(), 0, logicalLeft, minLogicalLeft, maxLogicalRight, needsWordSpacing);
</del><ins>+ placeBoxRangeInInlineDirection(firstChild(), nullptr, logicalLeft, minLogicalLeft, maxLogicalRight, needsWordSpacing);
</ins><span class="cx">
</span><span class="cx"> logicalLeft += borderLogicalRight() + paddingLogicalRight();
</span><span class="cx"> endPlacingBoxRangesInInlineDirection(startLogicalLeft, logicalLeft, minLogicalLeft, maxLogicalRight);
</span><span class="lines">@@ -882,7 +882,7 @@
</span><span class="cx"> const RenderStyle& lineStyle = this->lineStyle();
</span><span class="cx">
</span><span class="cx"> GlyphOverflowAndFallbackFontsMap::iterator it = textBoxDataMap.find(&textBox);
</span><del>- GlyphOverflow* glyphOverflow = it == textBoxDataMap.end() ? 0 : &it->value.second;
</del><ins>+ GlyphOverflow* glyphOverflow = it == textBoxDataMap.end() ? nullptr : &it->value.second;
</ins><span class="cx"> bool isFlippedLine = lineStyle.isFlippedLinesWritingMode();
</span><span class="cx">
</span><span class="cx"> int topGlyphEdge = glyphOverflow ? (isFlippedLine ? glyphOverflow->bottom : glyphOverflow->top) : 0;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingInlineFlowBoxh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/InlineFlowBox.h (182110 => 182111)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/InlineFlowBox.h 2015-03-28 09:57:07 UTC (rev 182110)
+++ trunk/Source/WebCore/rendering/InlineFlowBox.h 2015-03-28 11:59:49 UTC (rev 182111)
</span><span class="lines">@@ -42,10 +42,10 @@
</span><span class="cx"> public:
</span><span class="cx"> explicit InlineFlowBox(RenderBoxModelObject& renderer)
</span><span class="cx"> : InlineBox(renderer)
</span><del>- , m_firstChild(0)
- , m_lastChild(0)
- , m_prevLineBox(0)
- , m_nextLineBox(0)
</del><ins>+ , m_firstChild(nullptr)
+ , m_lastChild(nullptr)
+ , m_prevLineBox(nullptr)
+ , m_nextLineBox(nullptr)
</ins><span class="cx"> , m_includeLogicalLeftEdge(false)
</span><span class="cx"> , m_includeLogicalRightEdge(false)
</span><span class="cx"> , m_descendantsHaveSameLineHeightAndBaseline(true)
</span><span class="lines">@@ -92,7 +92,7 @@
</span><span class="cx"> InlineBox* lastLeafChild() const;
</span><span class="cx">
</span><span class="cx"> typedef void (*CustomInlineBoxRangeReverse)(void* userData, Vector<InlineBox*>::iterator first, Vector<InlineBox*>::iterator last);
</span><del>- void collectLeafBoxesInLogicalOrder(Vector<InlineBox*>&, CustomInlineBoxRangeReverse customReverseImplementation = 0, void* userData = 0) const;
</del><ins>+ void collectLeafBoxesInLogicalOrder(Vector<InlineBox*>&, CustomInlineBoxRangeReverse customReverseImplementation = nullptr, void* userData = nullptr) const;
</ins><span class="cx">
</span><span class="cx"> virtual void setConstructed() override final
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingInlineTextBoxh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/InlineTextBox.h (182110 => 182111)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/InlineTextBox.h 2015-03-28 09:57:07 UTC (rev 182110)
+++ trunk/Source/WebCore/rendering/InlineTextBox.h 2015-03-28 11:59:49 UTC (rev 182111)
</span><span class="lines">@@ -40,8 +40,8 @@
</span><span class="cx"> public:
</span><span class="cx"> explicit InlineTextBox(RenderText& renderer)
</span><span class="cx"> : InlineBox(renderer)
</span><del>- , m_prevTextBox(0)
- , m_nextTextBox(0)
</del><ins>+ , m_prevTextBox(nullptr)
+ , m_nextTextBox(nullptr)
</ins><span class="cx"> , m_start(0)
</span><span class="cx"> , m_len(0)
</span><span class="cx"> , m_truncation(cNoTruncation)
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRootInlineBoxcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RootInlineBox.cpp (182110 => 182111)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RootInlineBox.cpp 2015-03-28 09:57:07 UTC (rev 182110)
+++ trunk/Source/WebCore/rendering/RootInlineBox.cpp 2015-03-28 11:59:49 UTC (rev 182111)
</span><span class="lines">@@ -1134,8 +1134,8 @@
</span><span class="cx"> return startBox->renderer().node();
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>- startBox = 0;
- return 0;
</del><ins>+ startBox = nullptr;
+ return nullptr;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Node* RootInlineBox::getLogicalEndBoxWithNode(InlineBox*& endBox) const
</span><span class="lines">@@ -1148,8 +1148,8 @@
</span><span class="cx"> return endBox->renderer().node();
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>- endBox = 0;
- return 0;
</del><ins>+ endBox = nullptr;
+ return nullptr;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(TREE_DEBUGGING)
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRootInlineBoxh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RootInlineBox.h (182110 => 182111)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RootInlineBox.h 2015-03-28 09:57:07 UTC (rev 182110)
+++ trunk/Source/WebCore/rendering/RootInlineBox.h 2015-03-28 11:59:49 UTC (rev 182111)
</span><span class="lines">@@ -102,7 +102,7 @@
</span><span class="cx">
</span><span class="cx"> bool lineCanAccommodateEllipsis(bool ltr, int blockEdge, int lineBoxEdge, int ellipsisWidth);
</span><span class="cx"> // Return the truncatedWidth, the width of the truncated text + ellipsis.
</span><del>- float placeEllipsis(const AtomicString& ellipsisStr, bool ltr, float blockLeftEdge, float blockRightEdge, float ellipsisWidth, InlineBox* markupBox = 0);
</del><ins>+ float placeEllipsis(const AtomicString& ellipsisStr, bool ltr, float blockLeftEdge, float blockRightEdge, float ellipsisWidth, InlineBox* markupBox = nullptr);
</ins><span class="cx"> // Return the position of the EllipsisBox or -1.
</span><span class="cx"> virtual float placeEllipsisBox(bool ltr, float blockLeftEdge, float blockRightEdge, float ellipsisWidth, float &truncatedWidth, bool& foundBox) override final;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgSVGInlineTextBoxcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/SVGInlineTextBox.cpp (182110 => 182111)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/svg/SVGInlineTextBox.cpp 2015-03-28 09:57:07 UTC (rev 182110)
+++ trunk/Source/WebCore/rendering/svg/SVGInlineTextBox.cpp 2015-03-28 11:59:49 UTC (rev 182111)
</span><span class="lines">@@ -54,7 +54,7 @@
</span><span class="cx"> , m_logicalHeight(0)
</span><span class="cx"> , m_paintingResourceMode(ApplyToDefaultMode)
</span><span class="cx"> , m_startsNewTextChunk(false)
</span><del>- , m_paintingResource(0)
</del><ins>+ , m_paintingResource(nullptr)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -373,7 +373,7 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(m_paintingResource);
</span><span class="cx">
</span><del>- m_paintingResource->postApplyResource(parent()->renderer(), context, m_paintingResourceMode, path, /*RenderSVGShape*/ 0);
</del><ins>+ m_paintingResource->postApplyResource(parent()->renderer(), context, m_paintingResourceMode, path, /*RenderSVGShape*/ nullptr);
</ins><span class="cx"> m_paintingResource = nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -397,12 +397,12 @@
</span><span class="cx">
</span><span class="cx"> void SVGInlineTextBox::restoreGraphicsContextAfterTextPainting(GraphicsContext*& context, TextRun& textRun)
</span><span class="cx"> {
</span><del>- releasePaintingResource(context, /* path */0);
</del><ins>+ releasePaintingResource(context, /* path */nullptr);
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(SVG_FONTS)
</span><span class="cx"> TextRun::RenderingContext* renderingContext = textRun.renderingContext();
</span><span class="cx"> if (renderingContext)
</span><del>- static_cast<SVGTextRunRenderingContext*>(renderingContext)->setActivePaintingResource(0);
</del><ins>+ static_cast<SVGTextRunRenderingContext*>(renderingContext)->setActivePaintingResource(nullptr);
</ins><span class="cx"> #else
</span><span class="cx"> UNUSED_PARAM(textRun);
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgSVGRootInlineBoxcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/SVGRootInlineBox.cpp (182110 => 182111)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/svg/SVGRootInlineBox.cpp 2015-03-28 09:57:07 UTC (rev 182110)
+++ trunk/Source/WebCore/rendering/svg/SVGRootInlineBox.cpp 2015-03-28 11:59:49 UTC (rev 182111)
</span><span class="lines">@@ -195,7 +195,7 @@
</span><span class="cx"> return firstLeaf;
</span><span class="cx">
</span><span class="cx"> // FIXME: Check for vertical text!
</span><del>- InlineBox* closestLeaf = 0;
</del><ins>+ InlineBox* closestLeaf = nullptr;
</ins><span class="cx"> for (InlineBox* leaf = firstLeaf; leaf; leaf = leaf->nextLeafChild()) {
</span><span class="cx"> if (!leaf->isSVGInlineTextBox())
</span><span class="cx"> continue;
</span><span class="lines">@@ -238,8 +238,8 @@
</span><span class="cx"> static inline void findFirstAndLastAttributesInVector(Vector<SVGTextLayoutAttributes*>& attributes, RenderSVGInlineText* firstContext, RenderSVGInlineText* lastContext,
</span><span class="cx"> SVGTextLayoutAttributes*& first, SVGTextLayoutAttributes*& last)
</span><span class="cx"> {
</span><del>- first = 0;
- last = 0;
</del><ins>+ first = nullptr;
+ last = nullptr;
</ins><span class="cx">
</span><span class="cx"> unsigned attributesSize = attributes.size();
</span><span class="cx"> for (unsigned i = 0; i < attributesSize; ++i) {
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgSVGRootInlineBoxh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/SVGRootInlineBox.h (182110 => 182111)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/svg/SVGRootInlineBox.h 2015-03-28 09:57:07 UTC (rev 182110)
+++ trunk/Source/WebCore/rendering/svg/SVGRootInlineBox.h 2015-03-28 11:59:49 UTC (rev 182111)
</span><span class="lines">@@ -51,7 +51,7 @@
</span><span class="cx"> virtual bool isSVGRootInlineBox() const override { return true; }
</span><span class="cx"> void reorderValueLists(Vector<SVGTextLayoutAttributes*>&);
</span><span class="cx"> void layoutCharactersInTextBoxes(InlineFlowBox*, SVGTextLayoutEngine&);
</span><del>- void layoutChildBoxes(InlineFlowBox*, FloatRect* = 0);
</del><ins>+ void layoutChildBoxes(InlineFlowBox*, FloatRect* = nullptr);
</ins><span class="cx"> void layoutRootBox(const FloatRect&);
</span><span class="cx">
</span><span class="cx"> float m_logicalHeight;
</span></span></pre>
</div>
</div>
</body>
</html>