<!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>[176478] 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/176478">176478</a></dd>
<dt>Author</dt> <dd>akling@apple.com</dd>
<dt>Date</dt> <dd>2014-11-21 15:39:16 -0800 (Fri, 21 Nov 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>RenderElement::removeChild() doesn't need a return value.
<https://webkit.org/b/138985>
Reviewed by Pantti Koivisto.
Nobody uses the return value from RenderElement::removeChild().
Change it to return void and remove all the unnecessary plumbing.
* rendering/RenderBlock.cpp:
(WebCore::RenderBlock::removeChild):
* rendering/RenderBlock.h:
* rendering/RenderBlockFlow.cpp:
(WebCore::RenderBlockFlow::removeChild):
* rendering/RenderBlockFlow.h:
* rendering/RenderButton.cpp:
(WebCore::RenderButton::removeChild):
* rendering/RenderButton.h:
* rendering/RenderElement.cpp:
(WebCore::RenderElement::removeChild):
(WebCore::RenderElement::removeChildInternal):
* rendering/RenderElement.h:
* rendering/RenderMenuList.cpp:
(RenderMenuList::removeChild):
* rendering/RenderMenuList.h:
* rendering/RenderRuby.cpp:
(WebCore::RenderRubyAsInline::removeChild):
(WebCore::RenderRubyAsBlock::removeChild):
* rendering/RenderRuby.h:
* rendering/RenderRubyRun.cpp:
(WebCore::RenderRubyRun::removeChild):
* rendering/RenderRubyRun.h:
* rendering/mathml/RenderMathMLRoot.cpp:
(WebCore::RenderMathMLRootWrapper::removeChildWithoutRestructuring):
(WebCore::RenderMathMLRootWrapper::removeChild):
* rendering/mathml/RenderMathMLRoot.h:
* rendering/mathml/RenderMathMLScripts.cpp:
(WebCore::RenderMathMLScripts::removeChildInternal):
(WebCore::RenderMathMLScripts::removeChild):
(WebCore::RenderMathMLScriptsWrapper::removeChildInternal):
(WebCore::RenderMathMLScriptsWrapper::removeChild):
* rendering/mathml/RenderMathMLScripts.h:
* rendering/svg/RenderSVGContainer.cpp:
(WebCore::RenderSVGContainer::removeChild):
* rendering/svg/RenderSVGContainer.h:
* rendering/svg/RenderSVGInline.cpp:
(WebCore::RenderSVGInline::removeChild):
* rendering/svg/RenderSVGInline.h:
* rendering/svg/RenderSVGRoot.cpp:
(WebCore::RenderSVGRoot::removeChild):
* rendering/svg/RenderSVGRoot.h:
* rendering/svg/RenderSVGText.cpp:
(WebCore::RenderSVGText::removeChild):
* rendering/svg/RenderSVGText.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderBlockcpp">trunk/Source/WebCore/rendering/RenderBlock.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderBlockh">trunk/Source/WebCore/rendering/RenderBlock.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderBlockFlowcpp">trunk/Source/WebCore/rendering/RenderBlockFlow.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderBlockFlowh">trunk/Source/WebCore/rendering/RenderBlockFlow.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderButtoncpp">trunk/Source/WebCore/rendering/RenderButton.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderButtonh">trunk/Source/WebCore/rendering/RenderButton.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderElementcpp">trunk/Source/WebCore/rendering/RenderElement.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderElementh">trunk/Source/WebCore/rendering/RenderElement.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderMenuListcpp">trunk/Source/WebCore/rendering/RenderMenuList.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderMenuListh">trunk/Source/WebCore/rendering/RenderMenuList.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderRubycpp">trunk/Source/WebCore/rendering/RenderRuby.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderRubyh">trunk/Source/WebCore/rendering/RenderRuby.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderRubyRuncpp">trunk/Source/WebCore/rendering/RenderRubyRun.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderRubyRunh">trunk/Source/WebCore/rendering/RenderRubyRun.h</a></li>
<li><a href="#trunkSourceWebCorerenderingmathmlRenderMathMLRootcpp">trunk/Source/WebCore/rendering/mathml/RenderMathMLRoot.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingmathmlRenderMathMLRooth">trunk/Source/WebCore/rendering/mathml/RenderMathMLRoot.h</a></li>
<li><a href="#trunkSourceWebCorerenderingmathmlRenderMathMLScriptscpp">trunk/Source/WebCore/rendering/mathml/RenderMathMLScripts.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingmathmlRenderMathMLScriptsh">trunk/Source/WebCore/rendering/mathml/RenderMathMLScripts.h</a></li>
<li><a href="#trunkSourceWebCorerenderingsvgRenderSVGContainercpp">trunk/Source/WebCore/rendering/svg/RenderSVGContainer.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingsvgRenderSVGContainerh">trunk/Source/WebCore/rendering/svg/RenderSVGContainer.h</a></li>
<li><a href="#trunkSourceWebCorerenderingsvgRenderSVGInlinecpp">trunk/Source/WebCore/rendering/svg/RenderSVGInline.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingsvgRenderSVGInlineh">trunk/Source/WebCore/rendering/svg/RenderSVGInline.h</a></li>
<li><a href="#trunkSourceWebCorerenderingsvgRenderSVGRootcpp">trunk/Source/WebCore/rendering/svg/RenderSVGRoot.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingsvgRenderSVGRooth">trunk/Source/WebCore/rendering/svg/RenderSVGRoot.h</a></li>
<li><a href="#trunkSourceWebCorerenderingsvgRenderSVGTextcpp">trunk/Source/WebCore/rendering/svg/RenderSVGText.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingsvgRenderSVGTexth">trunk/Source/WebCore/rendering/svg/RenderSVGText.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (176477 => 176478)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-11-21 23:38:19 UTC (rev 176477)
+++ trunk/Source/WebCore/ChangeLog 2014-11-21 23:39:16 UTC (rev 176478)
</span><span class="lines">@@ -1,3 +1,59 @@
</span><ins>+2014-11-21 Andreas Kling <akling@apple.com>
+
+ RenderElement::removeChild() doesn't need a return value.
+ <https://webkit.org/b/138985>
+
+ Reviewed by Pantti Koivisto.
+
+ Nobody uses the return value from RenderElement::removeChild().
+ Change it to return void and remove all the unnecessary plumbing.
+
+ * rendering/RenderBlock.cpp:
+ (WebCore::RenderBlock::removeChild):
+ * rendering/RenderBlock.h:
+ * rendering/RenderBlockFlow.cpp:
+ (WebCore::RenderBlockFlow::removeChild):
+ * rendering/RenderBlockFlow.h:
+ * rendering/RenderButton.cpp:
+ (WebCore::RenderButton::removeChild):
+ * rendering/RenderButton.h:
+ * rendering/RenderElement.cpp:
+ (WebCore::RenderElement::removeChild):
+ (WebCore::RenderElement::removeChildInternal):
+ * rendering/RenderElement.h:
+ * rendering/RenderMenuList.cpp:
+ (RenderMenuList::removeChild):
+ * rendering/RenderMenuList.h:
+ * rendering/RenderRuby.cpp:
+ (WebCore::RenderRubyAsInline::removeChild):
+ (WebCore::RenderRubyAsBlock::removeChild):
+ * rendering/RenderRuby.h:
+ * rendering/RenderRubyRun.cpp:
+ (WebCore::RenderRubyRun::removeChild):
+ * rendering/RenderRubyRun.h:
+ * rendering/mathml/RenderMathMLRoot.cpp:
+ (WebCore::RenderMathMLRootWrapper::removeChildWithoutRestructuring):
+ (WebCore::RenderMathMLRootWrapper::removeChild):
+ * rendering/mathml/RenderMathMLRoot.h:
+ * rendering/mathml/RenderMathMLScripts.cpp:
+ (WebCore::RenderMathMLScripts::removeChildInternal):
+ (WebCore::RenderMathMLScripts::removeChild):
+ (WebCore::RenderMathMLScriptsWrapper::removeChildInternal):
+ (WebCore::RenderMathMLScriptsWrapper::removeChild):
+ * rendering/mathml/RenderMathMLScripts.h:
+ * rendering/svg/RenderSVGContainer.cpp:
+ (WebCore::RenderSVGContainer::removeChild):
+ * rendering/svg/RenderSVGContainer.h:
+ * rendering/svg/RenderSVGInline.cpp:
+ (WebCore::RenderSVGInline::removeChild):
+ * rendering/svg/RenderSVGInline.h:
+ * rendering/svg/RenderSVGRoot.cpp:
+ (WebCore::RenderSVGRoot::removeChild):
+ * rendering/svg/RenderSVGRoot.h:
+ * rendering/svg/RenderSVGText.cpp:
+ (WebCore::RenderSVGText::removeChild):
+ * rendering/svg/RenderSVGText.h:
+
</ins><span class="cx"> 2014-11-21 Tim Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION (r176351): Parts of apple.com/contact aren't Lookup-able
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBlockcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBlock.cpp (176477 => 176478)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBlock.cpp 2014-11-21 23:38:19 UTC (rev 176477)
+++ trunk/Source/WebCore/rendering/RenderBlock.cpp 2014-11-21 23:39:16 UTC (rev 176478)
</span><span class="lines">@@ -687,12 +687,14 @@
</span><span class="cx"> child->destroy();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RenderObject* RenderBlock::removeChild(RenderObject& oldChild)
</del><ins>+void RenderBlock::removeChild(RenderObject& oldChild)
</ins><span class="cx"> {
</span><span class="cx"> // No need to waste time in merging or removing empty anonymous blocks.
</span><span class="cx"> // We can just bail out if our document is getting destroyed.
</span><del>- if (documentBeingDestroyed())
- return RenderBox::removeChild(oldChild);
</del><ins>+ if (documentBeingDestroyed()) {
+ RenderBox::removeChild(oldChild);
+ return;
+ }
</ins><span class="cx">
</span><span class="cx"> // If this child is a block, and if our previous and next siblings are
</span><span class="cx"> // both anonymous blocks with inline content, then we can go ahead and
</span><span class="lines">@@ -745,7 +747,7 @@
</span><span class="cx">
</span><span class="cx"> invalidateLineLayoutPath();
</span><span class="cx">
</span><del>- RenderObject* nextSibling = RenderBox::removeChild(oldChild);
</del><ins>+ RenderBox::removeChild(oldChild);
</ins><span class="cx">
</span><span class="cx"> RenderObject* child = prev ? prev : next;
</span><span class="cx"> if (canMergeAnonymousBlocks && child && !child->previousSibling() && !child->nextSibling() && canCollapseAnonymousBlockChild()) {
</span><span class="lines">@@ -753,7 +755,6 @@
</span><span class="cx"> // box. We can go ahead and pull the content right back up into our
</span><span class="cx"> // box.
</span><span class="cx"> collapseAnonymousBoxChild(*this, downcast<RenderBlock>(child));
</span><del>- nextSibling = nullptr;
</del><span class="cx"> } else if (((prev && prev->isAnonymousBlock()) || (next && next->isAnonymousBlock())) && canCollapseAnonymousBlockChild()) {
</span><span class="cx"> // It's possible that the removal has knocked us down to a single anonymous
</span><span class="cx"> // block with pseudo-style element siblings (e.g. first-letter). If these
</span><span class="lines">@@ -763,13 +764,10 @@
</span><span class="cx"> && (!anonBlock->previousSibling() || (anonBlock->previousSibling()->style().styleType() != NOPSEUDO && anonBlock->previousSibling()->isFloating() && !anonBlock->previousSibling()->previousSibling()))
</span><span class="cx"> && (!anonBlock->nextSibling() || (anonBlock->nextSibling()->style().styleType() != NOPSEUDO && anonBlock->nextSibling()->isFloating() && !anonBlock->nextSibling()->nextSibling()))) {
</span><span class="cx"> collapseAnonymousBoxChild(*this, anonBlock);
</span><del>- nextSibling = nullptr;
</del><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!firstChild()) {
</span><del>- nextSibling = nullptr;
-
</del><span class="cx"> // If this was our last child be sure to clear out our line boxes.
</span><span class="cx"> if (childrenInline())
</span><span class="cx"> deleteLines();
</span><span class="lines">@@ -800,8 +798,6 @@
</span><span class="cx"> destroy();
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>-
- return nextSibling;
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool RenderBlock::isSelfCollapsingBlock() const
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBlockh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBlock.h (176477 => 176478)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBlock.h 2014-11-21 23:38:19 UTC (rev 176477)
+++ trunk/Source/WebCore/rendering/RenderBlock.h 2014-11-21 23:39:16 UTC (rev 176478)
</span><span class="lines">@@ -75,7 +75,7 @@
</span><span class="cx"> virtual void deleteLines();
</span><span class="cx">
</span><span class="cx"> virtual void addChild(RenderObject* newChild, RenderObject* beforeChild = 0) override;
</span><del>- virtual RenderObject* removeChild(RenderObject&) override;
</del><ins>+ virtual void removeChild(RenderObject&) override;
</ins><span class="cx">
</span><span class="cx"> virtual void layoutBlock(bool relayoutChildren, LayoutUnit pageLogicalHeight = 0);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBlockFlowcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBlockFlow.cpp (176477 => 176478)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBlockFlow.cpp 2014-11-21 23:38:19 UTC (rev 176477)
+++ trunk/Source/WebCore/rendering/RenderBlockFlow.cpp 2014-11-21 23:39:16 UTC (rev 176478)
</span><span class="lines">@@ -3706,14 +3706,14 @@
</span><span class="cx"> RenderBlock::addChild(newChild, beforeChild);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RenderObject* RenderBlockFlow::removeChild(RenderObject& oldChild)
</del><ins>+void RenderBlockFlow::removeChild(RenderObject& oldChild)
</ins><span class="cx"> {
</span><span class="cx"> if (!documentBeingDestroyed()) {
</span><span class="cx"> RenderFlowThread* flowThread = multiColumnFlowThread();
</span><span class="cx"> if (flowThread && flowThread != &oldChild)
</span><span class="cx"> flowThread->flowThreadRelativeWillBeRemoved(&oldChild);
</span><span class="cx"> }
</span><del>- return RenderBlock::removeChild(oldChild);
</del><ins>+ RenderBlock::removeChild(oldChild);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void RenderBlockFlow::checkForPaginationLogicalHeightChange(bool& relayoutChildren, LayoutUnit& pageLogicalHeight, bool& pageLogicalHeightChanged)
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBlockFlowh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBlockFlow.h (176477 => 176478)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBlockFlow.h 2014-11-21 23:38:19 UTC (rev 176477)
+++ trunk/Source/WebCore/rendering/RenderBlockFlow.h 2014-11-21 23:39:16 UTC (rev 176478)
</span><span class="lines">@@ -377,7 +377,7 @@
</span><span class="cx"> bool hasNextPage(LayoutUnit logicalOffset, PageBoundaryRule = ExcludePageBoundary) const;
</span><span class="cx">
</span><span class="cx"> virtual void addChild(RenderObject* newChild, RenderObject* beforeChild = 0) override;
</span><del>- virtual RenderObject* removeChild(RenderObject&) override;
</del><ins>+ virtual void removeChild(RenderObject&) override;
</ins><span class="cx">
</span><span class="cx"> void createMultiColumnFlowThread();
</span><span class="cx"> void destroyMultiColumnFlowThread();
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderButtoncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderButton.cpp (176477 => 176478)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderButton.cpp 2014-11-21 23:38:19 UTC (rev 176477)
+++ trunk/Source/WebCore/rendering/RenderButton.cpp 2014-11-21 23:39:16 UTC (rev 176478)
</span><span class="lines">@@ -77,18 +77,17 @@
</span><span class="cx"> m_inner->addChild(newChild, beforeChild);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RenderObject* RenderButton::removeChild(RenderObject& oldChild)
</del><ins>+void RenderButton::removeChild(RenderObject& oldChild)
</ins><span class="cx"> {
</span><span class="cx"> // m_inner should be the only child, but checking for direct children who
</span><span class="cx"> // are not m_inner prevents security problems when that assumption is
</span><span class="cx"> // violated.
</span><span class="cx"> if (&oldChild == m_inner || !m_inner || oldChild.parent() == this) {
</span><span class="cx"> ASSERT(&oldChild == m_inner || !m_inner);
</span><del>- RenderObject* next = RenderFlexibleBox::removeChild(oldChild);
</del><ins>+ RenderFlexibleBox::removeChild(oldChild);
</ins><span class="cx"> m_inner = nullptr;
</span><del>- return next;
</del><span class="cx"> } else
</span><del>- return m_inner->removeChild(oldChild);
</del><ins>+ m_inner->removeChild(oldChild);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void RenderButton::styleWillChange(StyleDifference diff, const RenderStyle& newStyle)
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderButtonh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderButton.h (176477 => 176478)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderButton.h 2014-11-21 23:38:19 UTC (rev 176477)
+++ trunk/Source/WebCore/rendering/RenderButton.h 2014-11-21 23:39:16 UTC (rev 176478)
</span><span class="lines">@@ -43,7 +43,7 @@
</span><span class="cx"> virtual bool canBeSelectionLeaf() const override;
</span><span class="cx">
</span><span class="cx"> virtual void addChild(RenderObject* newChild, RenderObject *beforeChild = 0) override;
</span><del>- virtual RenderObject* removeChild(RenderObject&) override;
</del><ins>+ virtual void removeChild(RenderObject&) override;
</ins><span class="cx"> virtual void removeLeftoverAnonymousBlock(RenderBlock*) override { }
</span><span class="cx"> virtual bool createsAnonymousWrapper() const override { return true; }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderElement.cpp (176477 => 176478)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderElement.cpp 2014-11-21 23:38:19 UTC (rev 176477)
+++ trunk/Source/WebCore/rendering/RenderElement.cpp 2014-11-21 23:39:16 UTC (rev 176478)
</span><span class="lines">@@ -514,9 +514,9 @@
</span><span class="cx"> SVGRenderSupport::childAdded(*this, *newChild);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RenderObject* RenderElement::removeChild(RenderObject& oldChild)
</del><ins>+void RenderElement::removeChild(RenderObject& oldChild)
</ins><span class="cx"> {
</span><del>- return removeChildInternal(oldChild, NotifyChildren);
</del><ins>+ removeChildInternal(oldChild, NotifyChildren);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void RenderElement::destroyLeftoverChildren()
</span><span class="lines">@@ -585,7 +585,7 @@
</span><span class="cx"> cache->childrenChanged(this, newChild);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RenderObject* RenderElement::removeChildInternal(RenderObject& oldChild, NotifyChildrenType notifyChildren)
</del><ins>+void RenderElement::removeChildInternal(RenderObject& oldChild, NotifyChildrenType notifyChildren)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(canHaveChildren() || canHaveGeneratedChildren());
</span><span class="cx"> ASSERT(oldChild.parent() == this);
</span><span class="lines">@@ -646,8 +646,6 @@
</span><span class="cx">
</span><span class="cx"> if (AXObjectCache* cache = document().existingAXObjectCache())
</span><span class="cx"> cache->childrenChanged(this);
</span><del>-
- return nextSibling;
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void addLayers(RenderElement& renderer, RenderLayer* parentLayer, RenderElement*& newObject, RenderLayer*& beforeChild)
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderElement.h (176477 => 176478)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderElement.h 2014-11-21 23:38:19 UTC (rev 176477)
+++ trunk/Source/WebCore/rendering/RenderElement.h 2014-11-21 23:39:16 UTC (rev 176478)
</span><span class="lines">@@ -84,7 +84,7 @@
</span><span class="cx"> virtual bool isChildAllowed(const RenderObject&, const RenderStyle&) const { return true; }
</span><span class="cx"> virtual void addChild(RenderObject* newChild, RenderObject* beforeChild = 0);
</span><span class="cx"> virtual void addChildIgnoringContinuation(RenderObject* newChild, RenderObject* beforeChild = 0) { return addChild(newChild, beforeChild); }
</span><del>- virtual RenderObject* removeChild(RenderObject&);
</del><ins>+ virtual void removeChild(RenderObject&);
</ins><span class="cx">
</span><span class="cx"> // The following functions are used when the render tree hierarchy changes to make sure layers get
</span><span class="cx"> // properly added and removed. Since containership can be implemented by any subclass, and since a hierarchy
</span><span class="lines">@@ -96,7 +96,7 @@
</span><span class="cx">
</span><span class="cx"> enum NotifyChildrenType { NotifyChildren, DontNotifyChildren };
</span><span class="cx"> void insertChildInternal(RenderObject*, RenderObject* beforeChild, NotifyChildrenType);
</span><del>- RenderObject* removeChildInternal(RenderObject&, NotifyChildrenType);
</del><ins>+ void removeChildInternal(RenderObject&, NotifyChildrenType);
</ins><span class="cx">
</span><span class="cx"> virtual RenderElement* hoverAncestor() const;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderMenuListcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderMenuList.cpp (176477 => 176478)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderMenuList.cpp 2014-11-21 23:38:19 UTC (rev 176477)
+++ trunk/Source/WebCore/rendering/RenderMenuList.cpp 2014-11-21 23:39:16 UTC (rev 176478)
</span><span class="lines">@@ -181,14 +181,13 @@
</span><span class="cx"> cache->childrenChanged(this, newChild);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RenderObject* RenderMenuList::removeChild(RenderObject& oldChild)
</del><ins>+void RenderMenuList::removeChild(RenderObject& oldChild)
</ins><span class="cx"> {
</span><span class="cx"> if (&oldChild == m_innerBlock || !m_innerBlock) {
</span><del>- RenderObject* next = RenderFlexibleBox::removeChild(oldChild);
</del><ins>+ RenderFlexibleBox::removeChild(oldChild);
</ins><span class="cx"> m_innerBlock = 0;
</span><del>- return next;
</del><span class="cx"> } else
</span><del>- return m_innerBlock->removeChild(oldChild);
</del><ins>+ m_innerBlock->removeChild(oldChild);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void RenderMenuList::styleDidChange(StyleDifference diff, const RenderStyle* oldStyle)
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderMenuListh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderMenuList.h (176477 => 176478)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderMenuList.h 2014-11-21 23:38:19 UTC (rev 176477)
+++ trunk/Source/WebCore/rendering/RenderMenuList.h 2014-11-21 23:39:16 UTC (rev 176478)
</span><span class="lines">@@ -66,7 +66,7 @@
</span><span class="cx"> virtual bool isMenuList() const override { return true; }
</span><span class="cx">
</span><span class="cx"> virtual void addChild(RenderObject* newChild, RenderObject* beforeChild = 0) override;
</span><del>- virtual RenderObject* removeChild(RenderObject&) override;
</del><ins>+ virtual void removeChild(RenderObject&) override;
</ins><span class="cx"> virtual bool createsAnonymousWrapper() const override { return true; }
</span><span class="cx">
</span><span class="cx"> virtual void updateFromElement() override;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderRubycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderRuby.cpp (176477 => 176478)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderRuby.cpp 2014-11-21 23:38:19 UTC (rev 176477)
+++ trunk/Source/WebCore/rendering/RenderRuby.cpp 2014-11-21 23:39:16 UTC (rev 176478)
</span><span class="lines">@@ -199,7 +199,7 @@
</span><span class="cx"> lastRun->addChild(child);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RenderObject* RenderRubyAsInline::removeChild(RenderObject& child)
</del><ins>+void RenderRubyAsInline::removeChild(RenderObject& child)
</ins><span class="cx"> {
</span><span class="cx"> // If the child's parent is *this (must be a ruby run or generated content or anonymous block),
</span><span class="cx"> // just use the normal remove method.
</span><span class="lines">@@ -207,20 +207,20 @@
</span><span class="cx"> #ifndef ASSERT_DISABLED
</span><span class="cx"> ASSERT(isRubyChildForNormalRemoval(child));
</span><span class="cx"> #endif
</span><del>- return RenderInline::removeChild(child);
</del><ins>+ RenderInline::removeChild(child);
+ return;
</ins><span class="cx"> }
</span><span class="cx"> // If the child's parent is an anoymous block (must be generated :before/:after content)
</span><span class="cx"> // just use the block's remove method.
</span><span class="cx"> if (isAnonymousRubyInlineBlock(child.parent())) {
</span><span class="cx"> ASSERT(child.isBeforeContent() || child.isAfterContent());
</span><del>- RenderObject* next = child.parent()->removeChild(child);
</del><ins>+ child.parent()->removeChild(child);
</ins><span class="cx"> removeChild(*child.parent());
</span><del>- return next;
</del><ins>+ return;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Otherwise find the containing run and remove it from there.
</span><del>- RenderRubyRun& run = findRubyRunParent(child);
- return run.removeChild(child);
</del><ins>+ findRubyRunParent(child).removeChild(child);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> //=== ruby as block object ===
</span><span class="lines">@@ -305,7 +305,7 @@
</span><span class="cx"> lastRun->addChild(child);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RenderObject* RenderRubyAsBlock::removeChild(RenderObject& child)
</del><ins>+void RenderRubyAsBlock::removeChild(RenderObject& child)
</ins><span class="cx"> {
</span><span class="cx"> // If the child's parent is *this (must be a ruby run or generated content or anonymous block),
</span><span class="cx"> // just use the normal remove method.
</span><span class="lines">@@ -313,20 +313,20 @@
</span><span class="cx"> #ifndef ASSERT_DISABLED
</span><span class="cx"> ASSERT(isRubyChildForNormalRemoval(child));
</span><span class="cx"> #endif
</span><del>- return RenderBlockFlow::removeChild(child);
</del><ins>+ RenderBlockFlow::removeChild(child);
+ return;
</ins><span class="cx"> }
</span><span class="cx"> // If the child's parent is an anoymous block (must be generated :before/:after content)
</span><span class="cx"> // just use the block's remove method.
</span><span class="cx"> if (isAnonymousRubyInlineBlock(child.parent())) {
</span><span class="cx"> ASSERT(child.isBeforeContent() || child.isAfterContent());
</span><del>- RenderObject* next = child.parent()->removeChild(child);
</del><ins>+ child.parent()->removeChild(child);
</ins><span class="cx"> removeChild(*child.parent());
</span><del>- return next;
</del><ins>+ return;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Otherwise find the containing run and remove it from there.
</span><del>- RenderRubyRun& run = findRubyRunParent(child);
- return run.removeChild(child);
</del><ins>+ findRubyRunParent(child).removeChild(child);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderRubyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderRuby.h (176477 => 176478)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderRuby.h 2014-11-21 23:38:19 UTC (rev 176477)
+++ trunk/Source/WebCore/rendering/RenderRuby.h 2014-11-21 23:39:16 UTC (rev 176478)
</span><span class="lines">@@ -57,7 +57,7 @@
</span><span class="cx"> virtual ~RenderRubyAsInline();
</span><span class="cx">
</span><span class="cx"> virtual void addChild(RenderObject* child, RenderObject* beforeChild = 0) override;
</span><del>- virtual RenderObject* removeChild(RenderObject& child) override;
</del><ins>+ virtual void removeChild(RenderObject& child) override;
</ins><span class="cx">
</span><span class="cx"> protected:
</span><span class="cx"> virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle) override;
</span><span class="lines">@@ -77,7 +77,7 @@
</span><span class="cx"> Element& element() const { return downcast<Element>(nodeForNonAnonymous()); }
</span><span class="cx">
</span><span class="cx"> virtual void addChild(RenderObject* child, RenderObject* beforeChild = 0) override;
</span><del>- virtual RenderObject* removeChild(RenderObject& child) override;
</del><ins>+ virtual void removeChild(RenderObject& child) override;
</ins><span class="cx">
</span><span class="cx"> protected:
</span><span class="cx"> virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle) override;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderRubyRuncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderRubyRun.cpp (176477 => 176478)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderRubyRun.cpp 2014-11-21 23:38:19 UTC (rev 176477)
+++ trunk/Source/WebCore/rendering/RenderRubyRun.cpp 2014-11-21 23:39:16 UTC (rev 176478)
</span><span class="lines">@@ -156,7 +156,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RenderObject* RenderRubyRun::removeChild(RenderObject& child)
</del><ins>+void RenderRubyRun::removeChild(RenderObject& child)
</ins><span class="cx"> {
</span><span class="cx"> // If the child is a ruby text, then merge the ruby base with the base of
</span><span class="cx"> // the right sibling run, if possible.
</span><span class="lines">@@ -178,13 +178,13 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- RenderObject* next = RenderBlockFlow::removeChild(child);
</del><ins>+ RenderBlockFlow::removeChild(child);
</ins><span class="cx">
</span><span class="cx"> if (!beingDestroyed() && !documentBeingDestroyed()) {
</span><span class="cx"> // Check if our base (if any) is now empty. If so, destroy it.
</span><span class="cx"> RenderBlock* base = rubyBase();
</span><span class="cx"> if (base && !base->firstChild()) {
</span><del>- next = RenderBlockFlow::removeChild(*base);
</del><ins>+ RenderBlockFlow::removeChild(*base);
</ins><span class="cx"> base->deleteLines();
</span><span class="cx"> base->destroy();
</span><span class="cx"> }
</span><span class="lines">@@ -194,11 +194,8 @@
</span><span class="cx"> parent()->removeChild(*this);
</span><span class="cx"> deleteLines();
</span><span class="cx"> destroy();
</span><del>- next = nullptr;
</del><span class="cx"> }
</span><span class="cx"> }
</span><del>-
- return next;
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RenderRubyBase* RenderRubyRun::createRubyBase() const
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderRubyRunh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderRubyRun.h (176477 => 176478)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderRubyRun.h 2014-11-21 23:38:19 UTC (rev 176477)
+++ trunk/Source/WebCore/rendering/RenderRubyRun.h 2014-11-21 23:39:16 UTC (rev 176478)
</span><span class="lines">@@ -58,7 +58,7 @@
</span><span class="cx">
</span><span class="cx"> virtual bool isChildAllowed(const RenderObject&, const RenderStyle&) const override;
</span><span class="cx"> virtual void addChild(RenderObject* child, RenderObject* beforeChild = 0) override;
</span><del>- virtual RenderObject* removeChild(RenderObject&) override;
</del><ins>+ virtual void removeChild(RenderObject&) override;
</ins><span class="cx">
</span><span class="cx"> virtual RenderBlock* firstLineBlock() const override;
</span><span class="cx"> virtual void updateFirstLetter() override;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingmathmlRenderMathMLRootcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/mathml/RenderMathMLRoot.cpp (176477 => 176478)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/mathml/RenderMathMLRoot.cpp 2014-11-21 23:38:19 UTC (rev 176477)
+++ trunk/Source/WebCore/rendering/mathml/RenderMathMLRoot.cpp 2014-11-21 23:39:16 UTC (rev 176478)
</span><span class="lines">@@ -349,19 +349,17 @@
</span><span class="cx"> return newBlock;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RenderObject* RenderMathMLRootWrapper::removeChildWithoutRestructuring(RenderObject& child)
</del><ins>+void RenderMathMLRootWrapper::removeChildWithoutRestructuring(RenderObject& child)
</ins><span class="cx"> {
</span><del>- return RenderMathMLBlock::removeChild(child);
</del><ins>+ RenderMathMLBlock::removeChild(child);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-RenderObject* RenderMathMLRootWrapper::removeChild(RenderObject& child)
</del><ins>+void RenderMathMLRootWrapper::removeChild(RenderObject& child)
</ins><span class="cx"> {
</span><del>- RenderObject* next = RenderMathMLBlock::removeChild(child);
</del><ins>+ RenderMathMLBlock::removeChild(child);
</ins><span class="cx">
</span><span class="cx"> if (!(beingDestroyed() || documentBeingDestroyed()))
</span><span class="cx"> downcast<RenderMathMLRoot>(*parent()).restructureWrappers();
</span><del>-
- return next;
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingmathmlRenderMathMLRooth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/mathml/RenderMathMLRoot.h (176477 => 176478)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/mathml/RenderMathMLRoot.h 2014-11-21 23:38:19 UTC (rev 176477)
+++ trunk/Source/WebCore/rendering/mathml/RenderMathMLRoot.h 2014-11-21 23:39:16 UTC (rev 176478)
</span><span class="lines">@@ -83,8 +83,8 @@
</span><span class="cx"> : RenderMathMLRow(document, WTF::move(style)) { }
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- RenderObject* removeChildWithoutRestructuring(RenderObject&);
- virtual RenderObject* removeChild(RenderObject&) override;
</del><ins>+ void removeChildWithoutRestructuring(RenderObject&);
+ virtual void removeChild(RenderObject&) override;
</ins><span class="cx"> static RenderPtr<RenderMathMLRootWrapper> createAnonymousWrapper(RenderMathMLRoot* renderObject);
</span><span class="cx"> virtual bool isRenderMathMLRootWrapper() const override { return true; }
</span><span class="cx"> virtual const char* renderName() const override { return "RenderMathMLRootWrapper"; }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingmathmlRenderMathMLScriptscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/mathml/RenderMathMLScripts.cpp (176477 => 176478)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/mathml/RenderMathMLScripts.cpp 2014-11-21 23:38:19 UTC (rev 176477)
+++ trunk/Source/WebCore/rendering/mathml/RenderMathMLScripts.cpp 2014-11-21 23:39:16 UTC (rev 176478)
</span><span class="lines">@@ -198,10 +198,12 @@
</span><span class="cx"> wrapper.addChildInternal(false, child, wrapper.firstChild());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RenderObject* RenderMathMLScripts::removeChildInternal(bool doNotRestructure, RenderObject& child)
</del><ins>+void RenderMathMLScripts::removeChildInternal(bool doNotRestructure, RenderObject& child)
</ins><span class="cx"> {
</span><del>- if (doNotRestructure)
- return RenderMathMLBlock::removeChild(child);
</del><ins>+ if (doNotRestructure) {
+ RenderMathMLBlock::removeChild(child);
+ return;
+ }
</ins><span class="cx">
</span><span class="cx"> ASSERT(isPrescript(child));
</span><span class="cx">
</span><span class="lines">@@ -220,7 +222,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- return RenderMathMLBlock::removeChild(child);
</del><ins>+ RenderMathMLBlock::removeChild(child);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void RenderMathMLScripts::addChild(RenderObject* child, RenderObject* beforeChild)
</span><span class="lines">@@ -235,18 +237,16 @@
</span><span class="cx"> fixAnonymousStyles();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RenderObject* RenderMathMLScripts::removeChild(RenderObject& child)
</del><ins>+void RenderMathMLScripts::removeChild(RenderObject& child)
</ins><span class="cx"> {
</span><span class="cx"> if (beingDestroyed() || documentBeingDestroyed()) {
</span><span class="cx"> // The renderer is being destroyed so we remove the child normally.
</span><del>- return RenderMathMLBlock::removeChild(child);
</del><ins>+ RenderMathMLBlock::removeChild(child);
+ return;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- RenderObject* next = removeChildInternal(false, child);
-
</del><ins>+ removeChildInternal(false, child);
</ins><span class="cx"> fixAnonymousStyles();
</span><del>-
- return next;
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void RenderMathMLScripts::styleDidChange(StyleDifference diff, const RenderStyle* oldStyle)
</span><span class="lines">@@ -461,10 +461,12 @@
</span><span class="cx"> parentNode->fixAnonymousStyles();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RenderObject* RenderMathMLScriptsWrapper::removeChildInternal(bool doNotRestructure, RenderObject& child)
</del><ins>+void RenderMathMLScriptsWrapper::removeChildInternal(bool doNotRestructure, RenderObject& child)
</ins><span class="cx"> {
</span><del>- if (doNotRestructure)
- return RenderMathMLBlock::removeChild(child);
</del><ins>+ if (doNotRestructure) {
+ RenderMathMLBlock::removeChild(child);
+ return;
+ }
</ins><span class="cx">
</span><span class="cx"> RenderMathMLScripts* parentNode = downcast<RenderMathMLScripts>(parent());
</span><span class="cx">
</span><span class="lines">@@ -479,11 +481,11 @@
</span><span class="cx"> wrapper.removeChildInternal(false, *script);
</span><span class="cx"> RenderMathMLBlock::addChild(script);
</span><span class="cx"> }
</span><del>- return sibling;
</del><ins>+ return;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // We remove the child and shift the successors in the current sequence of scripts.
</span><del>- RenderObject* next = RenderMathMLBlock::removeChild(child);
</del><ins>+ RenderMathMLBlock::removeChild(child);
</ins><span class="cx"> RenderMathMLScriptsWrapper* subSupPair = this;
</span><span class="cx"> for (RenderObject* nextSibling = subSupPair->nextSibling(); nextSibling && !isPrescript(*nextSibling); nextSibling = nextSibling->nextSibling()) {
</span><span class="cx"> RenderMathMLScriptsWrapper& nextSubSupPair = downcast<RenderMathMLScriptsWrapper>(*nextSibling);
</span><span class="lines">@@ -498,21 +500,19 @@
</span><span class="cx"> parentNode->removeChildInternal(true, *subSupPair);
</span><span class="cx"> subSupPair->destroy();
</span><span class="cx"> }
</span><del>-
- return next;
</del><span class="cx"> }
</span><span class="cx">
</span><del>-RenderObject* RenderMathMLScriptsWrapper::removeChild(RenderObject& child)
</del><ins>+void RenderMathMLScriptsWrapper::removeChild(RenderObject& child)
</ins><span class="cx"> {
</span><span class="cx"> if (beingDestroyed() || documentBeingDestroyed()) {
</span><span class="cx"> // The renderer is being destroyed so we remove the child normally.
</span><del>- return RenderMathMLBlock::removeChild(child);
</del><ins>+ RenderMathMLBlock::removeChild(child);
+ return;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RenderMathMLScripts* parentNode = downcast<RenderMathMLScripts>(parent());
</span><del>- RenderObject* next = removeChildInternal(false, child);
</del><ins>+ removeChildInternal(false, child);
</ins><span class="cx"> parentNode->fixAnonymousStyles();
</span><del>- return next;
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingmathmlRenderMathMLScriptsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/mathml/RenderMathMLScripts.h (176477 => 176478)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/mathml/RenderMathMLScripts.h 2014-11-21 23:38:19 UTC (rev 176477)
+++ trunk/Source/WebCore/rendering/mathml/RenderMathMLScripts.h 2014-11-21 23:39:16 UTC (rev 176478)
</span><span class="lines">@@ -43,7 +43,7 @@
</span><span class="cx"> enum WrapperType { Base, SubSupPair };
</span><span class="cx">
</span><span class="cx"> virtual void addChild(RenderObject* child, RenderObject* beforeChild = 0) override;
</span><del>- virtual RenderObject* removeChild(RenderObject&) override;
</del><ins>+ virtual void removeChild(RenderObject&) override;
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> RenderMathMLScriptsWrapper(Document& document, PassRef<RenderStyle> style, WrapperType kind)
</span><span class="lines">@@ -55,7 +55,7 @@
</span><span class="cx"> static RenderMathMLScriptsWrapper* createAnonymousWrapper(RenderMathMLScripts* renderObject, WrapperType);
</span><span class="cx">
</span><span class="cx"> void addChildInternal(bool normalInsertion, RenderObject* child, RenderObject* beforeChild = 0);
</span><del>- RenderObject* removeChildInternal(bool normalRemoval, RenderObject& child);
</del><ins>+ void removeChildInternal(bool normalRemoval, RenderObject& child);
</ins><span class="cx">
</span><span class="cx"> virtual const char* renderName() const override { return m_kind == Base ? "Base Wrapper" : "SubSupPair Wrapper"; }
</span><span class="cx"> virtual bool isRenderMathMLScriptsWrapper() const override final { return true; }
</span><span class="lines">@@ -73,7 +73,7 @@
</span><span class="cx"> public:
</span><span class="cx"> RenderMathMLScripts(Element&, PassRef<RenderStyle>);
</span><span class="cx"> virtual void addChild(RenderObject* child, RenderObject* beforeChild = 0) override;
</span><del>- virtual RenderObject* removeChild(RenderObject&) override;
</del><ins>+ virtual void removeChild(RenderObject&) override;
</ins><span class="cx">
</span><span class="cx"> virtual RenderMathMLOperator* unembellishedOperator() override;
</span><span class="cx"> virtual int firstLineBaseline() const override;
</span><span class="lines">@@ -83,7 +83,7 @@
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> void addChildInternal(bool normalInsertion, RenderObject* child, RenderObject* beforeChild = 0);
</span><del>- RenderObject* removeChildInternal(bool normalRemoval, RenderObject& child);
</del><ins>+ void removeChildInternal(bool normalRemoval, RenderObject& child);
</ins><span class="cx">
</span><span class="cx"> virtual bool isRenderMathMLScripts() const override { return true; }
</span><span class="cx"> virtual const char* renderName() const override { return "RenderMathMLScripts"; }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgRenderSVGContainercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/RenderSVGContainer.cpp (176477 => 176478)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/svg/RenderSVGContainer.cpp 2014-11-21 23:38:19 UTC (rev 176477)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGContainer.cpp 2014-11-21 23:39:16 UTC (rev 176478)
</span><span class="lines">@@ -93,10 +93,10 @@
</span><span class="cx"> SVGResourcesCache::clientWasAddedToTree(*child);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RenderObject* RenderSVGContainer::removeChild(RenderObject& child)
</del><ins>+void RenderSVGContainer::removeChild(RenderObject& child)
</ins><span class="cx"> {
</span><span class="cx"> SVGResourcesCache::clientWillBeRemovedFromTree(child);
</span><del>- return RenderSVGModelObject::removeChild(child);
</del><ins>+ RenderSVGModelObject::removeChild(child);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgRenderSVGContainerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/RenderSVGContainer.h (176477 => 176478)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/svg/RenderSVGContainer.h 2014-11-21 23:38:19 UTC (rev 176477)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGContainer.h 2014-11-21 23:39:16 UTC (rev 176478)
</span><span class="lines">@@ -49,7 +49,7 @@
</span><span class="cx"> virtual void layout() override;
</span><span class="cx">
</span><span class="cx"> virtual void addChild(RenderObject* child, RenderObject* beforeChild = 0) override final;
</span><del>- virtual RenderObject* removeChild(RenderObject&) override final;
</del><ins>+ virtual void removeChild(RenderObject&) override final;
</ins><span class="cx"> virtual void addFocusRingRects(Vector<IntRect>&, const LayoutPoint& additionalOffset, const RenderLayerModelObject* paintContainer = 0) override final;
</span><span class="cx">
</span><span class="cx"> virtual FloatRect objectBoundingBox() const override final { return m_objectBoundingBox; }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgRenderSVGInlinecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/RenderSVGInline.cpp (176477 => 176478)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/svg/RenderSVGInline.cpp 2014-11-21 23:38:19 UTC (rev 176477)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGInline.cpp 2014-11-21 23:39:16 UTC (rev 176478)
</span><span class="lines">@@ -129,19 +129,20 @@
</span><span class="cx"> textAncestor->subtreeChildWasAdded(child);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RenderObject* RenderSVGInline::removeChild(RenderObject& child)
</del><ins>+void RenderSVGInline::removeChild(RenderObject& child)
</ins><span class="cx"> {
</span><span class="cx"> SVGResourcesCache::clientWillBeRemovedFromTree(child);
</span><span class="cx">
</span><span class="cx"> auto* textAncestor = RenderSVGText::locateRenderSVGTextAncestor(*this);
</span><del>- if (!textAncestor)
- return RenderInline::removeChild(child);
</del><ins>+ if (!textAncestor) {
+ RenderInline::removeChild(child);
+ return;
+ }
</ins><span class="cx">
</span><span class="cx"> Vector<SVGTextLayoutAttributes*, 2> affectedAttributes;
</span><span class="cx"> textAncestor->subtreeChildWillBeRemoved(&child, affectedAttributes);
</span><del>- RenderObject* next = RenderInline::removeChild(child);
</del><ins>+ RenderInline::removeChild(child);
</ins><span class="cx"> textAncestor->subtreeChildWasRemoved(affectedAttributes);
</span><del>- return next;
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgRenderSVGInlineh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/RenderSVGInline.h (176477 => 176478)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/svg/RenderSVGInline.h 2014-11-21 23:38:19 UTC (rev 176477)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGInline.h 2014-11-21 23:39:16 UTC (rev 176478)
</span><span class="lines">@@ -62,7 +62,7 @@
</span><span class="cx"> virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle) override final;
</span><span class="cx">
</span><span class="cx"> virtual void addChild(RenderObject* child, RenderObject* beforeChild = 0) override final;
</span><del>- virtual RenderObject* removeChild(RenderObject&) override final;
</del><ins>+ virtual void removeChild(RenderObject&) override final;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgRenderSVGRootcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/RenderSVGRoot.cpp (176477 => 176478)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/svg/RenderSVGRoot.cpp 2014-11-21 23:38:19 UTC (rev 176477)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGRoot.cpp 2014-11-21 23:39:16 UTC (rev 176478)
</span><span class="lines">@@ -310,10 +310,10 @@
</span><span class="cx"> SVGResourcesCache::clientWasAddedToTree(*child);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RenderObject* RenderSVGRoot::removeChild(RenderObject& child)
</del><ins>+void RenderSVGRoot::removeChild(RenderObject& child)
</ins><span class="cx"> {
</span><span class="cx"> SVGResourcesCache::clientWillBeRemovedFromTree(child);
</span><del>- return RenderReplaced::removeChild(child);
</del><ins>+ RenderReplaced::removeChild(child);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // RenderBox methods will expect coordinates w/o any transforms in coordinates
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgRenderSVGRooth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/RenderSVGRoot.h (176477 => 176478)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/svg/RenderSVGRoot.h 2014-11-21 23:38:19 UTC (rev 176477)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGRoot.h 2014-11-21 23:39:16 UTC (rev 176478)
</span><span class="lines">@@ -80,7 +80,7 @@
</span><span class="cx"> virtual void willBeDestroyed() override;
</span><span class="cx"> virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle) override;
</span><span class="cx"> virtual void addChild(RenderObject* child, RenderObject* beforeChild = 0) override;
</span><del>- virtual RenderObject* removeChild(RenderObject&) override;
</del><ins>+ virtual void removeChild(RenderObject&) override;
</ins><span class="cx">
</span><span class="cx"> virtual const AffineTransform& localToParentTransform() const override;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgRenderSVGTextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/RenderSVGText.cpp (176477 => 176478)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/svg/RenderSVGText.cpp 2014-11-21 23:38:19 UTC (rev 176477)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGText.cpp 2014-11-21 23:39:16 UTC (rev 176478)
</span><span class="lines">@@ -539,16 +539,15 @@
</span><span class="cx"> subtreeChildWasAdded(child);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RenderObject* RenderSVGText::removeChild(RenderObject& child)
</del><ins>+void RenderSVGText::removeChild(RenderObject& child)
</ins><span class="cx"> {
</span><span class="cx"> SVGResourcesCache::clientWillBeRemovedFromTree(child);
</span><span class="cx">
</span><span class="cx"> Vector<SVGTextLayoutAttributes*, 2> affectedAttributes;
</span><span class="cx"> FontCachePurgePreventer fontCachePurgePreventer;
</span><span class="cx"> subtreeChildWillBeRemoved(&child, affectedAttributes);
</span><del>- RenderObject* next = RenderSVGBlock::removeChild(child);
</del><ins>+ RenderSVGBlock::removeChild(child);
</ins><span class="cx"> subtreeChildWasRemoved(affectedAttributes);
</span><del>- return next;
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Fix for <rdar://problem/8048875>. We should not render :first-line CSS Style
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgRenderSVGTexth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/RenderSVGText.h (176477 => 176478)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/svg/RenderSVGText.h 2014-11-21 23:38:19 UTC (rev 176477)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGText.h 2014-11-21 23:39:16 UTC (rev 176478)
</span><span class="lines">@@ -84,7 +84,7 @@
</span><span class="cx"> virtual void mapLocalToContainer(const RenderLayerModelObject* repaintContainer, TransformState&, MapCoordinatesFlags = ApplyContainerFlip, bool* wasFixed = 0) const override;
</span><span class="cx"> virtual const RenderObject* pushMappingToContainer(const RenderLayerModelObject* ancestorToStopAt, RenderGeometryMap&) const override;
</span><span class="cx"> virtual void addChild(RenderObject* child, RenderObject* beforeChild = nullptr) override;
</span><del>- virtual RenderObject* removeChild(RenderObject&) override;
</del><ins>+ virtual void removeChild(RenderObject&) override;
</ins><span class="cx"> virtual void willBeDestroyed() override;
</span><span class="cx">
</span><span class="cx"> virtual const AffineTransform& localToParentTransform() const override { return m_localTransform; }
</span></span></pre>
</div>
</div>
</body>
</html>