<!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>[208465] 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/208465">208465</a></dd>
<dt>Author</dt> <dd>zalan@apple.com</dd>
<dt>Date</dt> <dd>2016-11-09 12:21:49 -0800 (Wed, 09 Nov 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>RenderFlowThread::flowThreadRelativeWillBeRemoved should take RenderObject& instead of RenderObject*
https://bugs.webkit.org/show_bug.cgi?id=164543
Reviewed by Simon Fraser.
No change in functionality.
* rendering/RenderBlockFlow.cpp:
(WebCore::RenderBlockFlow::removeChild):
* rendering/RenderFlowThread.h:
* rendering/RenderMultiColumnFlowThread.cpp:
(WebCore::RenderMultiColumnFlowThread::handleSpannerRemoval):
(WebCore::RenderMultiColumnFlowThread::flowThreadRelativeWillBeRemoved):
* rendering/RenderMultiColumnFlowThread.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderBlockFlowcpp">trunk/Source/WebCore/rendering/RenderBlockFlow.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderFlowThreadh">trunk/Source/WebCore/rendering/RenderFlowThread.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderMultiColumnFlowThreadcpp">trunk/Source/WebCore/rendering/RenderMultiColumnFlowThread.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderMultiColumnFlowThreadh">trunk/Source/WebCore/rendering/RenderMultiColumnFlowThread.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (208464 => 208465)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-11-09 20:18:46 UTC (rev 208464)
+++ trunk/Source/WebCore/ChangeLog 2016-11-09 20:21:49 UTC (rev 208465)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2016-11-09 Zalan Bujtas <zalan@apple.com>
+
+ RenderFlowThread::flowThreadRelativeWillBeRemoved should take RenderObject& instead of RenderObject*
+ https://bugs.webkit.org/show_bug.cgi?id=164543
+
+ Reviewed by Simon Fraser.
+
+ No change in functionality.
+
+ * rendering/RenderBlockFlow.cpp:
+ (WebCore::RenderBlockFlow::removeChild):
+ * rendering/RenderFlowThread.h:
+ * rendering/RenderMultiColumnFlowThread.cpp:
+ (WebCore::RenderMultiColumnFlowThread::handleSpannerRemoval):
+ (WebCore::RenderMultiColumnFlowThread::flowThreadRelativeWillBeRemoved):
+ * rendering/RenderMultiColumnFlowThread.h:
+
</ins><span class="cx"> 2016-11-09 Jer Noble <jer.noble@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION (r208149): Media scrubber is not displayed in media controls
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBlockFlowcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBlockFlow.cpp (208464 => 208465)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBlockFlow.cpp 2016-11-09 20:18:46 UTC (rev 208464)
+++ trunk/Source/WebCore/rendering/RenderBlockFlow.cpp 2016-11-09 20:21:49 UTC (rev 208465)
</span><span class="lines">@@ -3883,7 +3883,7 @@
</span><span class="cx"> if (!documentBeingDestroyed()) {
</span><span class="cx"> RenderFlowThread* flowThread = multiColumnFlowThread();
</span><span class="cx"> if (flowThread && flowThread != &oldChild)
</span><del>- flowThread->flowThreadRelativeWillBeRemoved(&oldChild);
</del><ins>+ flowThread->flowThreadRelativeWillBeRemoved(oldChild);
</ins><span class="cx"> }
</span><span class="cx"> RenderBlock::removeChild(oldChild);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderFlowThreadh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderFlowThread.h (208464 => 208465)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderFlowThread.h 2016-11-09 20:18:46 UTC (rev 208464)
+++ trunk/Source/WebCore/rendering/RenderFlowThread.h 2016-11-09 20:21:49 UTC (rev 208465)
</span><span class="lines">@@ -94,7 +94,7 @@
</span><span class="cx"> // Called when a descendant of the flow thread has been inserted.
</span><span class="cx"> virtual void flowThreadDescendantInserted(RenderObject&) { }
</span><span class="cx"> // Called when a sibling or descendant of the flow thread is about to be removed.
</span><del>- virtual void flowThreadRelativeWillBeRemoved(RenderObject*) { }
</del><ins>+ virtual void flowThreadRelativeWillBeRemoved(RenderObject&) { }
</ins><span class="cx"> // Called when a descendant box's layout is finished and it has been positioned within its container.
</span><span class="cx"> virtual void flowThreadDescendantBoxLaidOut(RenderBox*) { }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderMultiColumnFlowThreadcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderMultiColumnFlowThread.cpp (208464 => 208465)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderMultiColumnFlowThread.cpp 2016-11-09 20:18:46 UTC (rev 208464)
+++ trunk/Source/WebCore/rendering/RenderMultiColumnFlowThread.cpp 2016-11-09 20:21:49 UTC (rev 208465)
</span><span class="lines">@@ -421,16 +421,16 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void RenderMultiColumnFlowThread::handleSpannerRemoval(RenderObject* spanner)
</del><ins>+void RenderMultiColumnFlowThread::handleSpannerRemoval(RenderObject& spanner)
</ins><span class="cx"> {
</span><span class="cx"> // The placeholder may already have been removed, but if it hasn't, do so now.
</span><del>- if (RenderMultiColumnSpannerPlaceholder* placeholder = m_spannerMap.get(downcast<RenderBox>(spanner))) {
</del><ins>+ if (RenderMultiColumnSpannerPlaceholder* placeholder = m_spannerMap.get(&downcast<RenderBox>(spanner))) {
</ins><span class="cx"> placeholder->parent()->removeChild(*placeholder);
</span><del>- m_spannerMap.remove(downcast<RenderBox>(spanner));
</del><ins>+ m_spannerMap.remove(&downcast<RenderBox>(spanner));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- if (RenderObject* next = spanner->nextSibling()) {
- if (RenderObject* previous = spanner->previousSibling()) {
</del><ins>+ if (RenderObject* next = spanner.nextSibling()) {
+ if (RenderObject* previous = spanner.previousSibling()) {
</ins><span class="cx"> if (previous->isRenderMultiColumnSet() && next->isRenderMultiColumnSet()) {
</span><span class="cx"> // Merge two sets that no longer will be separated by a spanner.
</span><span class="cx"> next->destroy();
</span><span class="lines">@@ -440,21 +440,21 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void RenderMultiColumnFlowThread::flowThreadRelativeWillBeRemoved(RenderObject* relative)
</del><ins>+void RenderMultiColumnFlowThread::flowThreadRelativeWillBeRemoved(RenderObject& relative)
</ins><span class="cx"> {
</span><span class="cx"> if (m_beingEvacuated)
</span><span class="cx"> return;
</span><span class="cx"> invalidateRegions();
</span><del>- if (is<RenderMultiColumnSpannerPlaceholder>(*relative)) {
</del><ins>+ if (is<RenderMultiColumnSpannerPlaceholder>(relative)) {
</ins><span class="cx"> // Remove the map entry for this spanner, but leave the actual spanner renderer alone. Also
</span><span class="cx"> // keep the reference to the spanner, since the placeholder may be about to be re-inserted
</span><span class="cx"> // in the tree.
</span><del>- ASSERT(relative->isDescendantOf(this));
- m_spannerMap.remove(downcast<RenderMultiColumnSpannerPlaceholder>(*relative).spanner());
</del><ins>+ ASSERT(relative.isDescendantOf(this));
+ m_spannerMap.remove(downcast<RenderMultiColumnSpannerPlaceholder>(relative).spanner());
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><del>- if (relative->style().columnSpan() == ColumnSpanAll) {
- if (relative->parent() != parent())
</del><ins>+ if (relative.style().columnSpan() == ColumnSpanAll) {
+ if (relative.parent() != parent())
</ins><span class="cx"> return; // not a valid spanner.
</span><span class="cx">
</span><span class="cx"> handleSpannerRemoval(relative);
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderMultiColumnFlowThreadh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderMultiColumnFlowThread.h (208464 => 208465)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderMultiColumnFlowThread.h 2016-11-09 20:18:46 UTC (rev 208464)
+++ trunk/Source/WebCore/rendering/RenderMultiColumnFlowThread.h 2016-11-09 20:21:49 UTC (rev 208465)
</span><span class="lines">@@ -114,7 +114,7 @@
</span><span class="cx"> void willBeRemovedFromTree() override;
</span><span class="cx"> RenderObject* resolveMovedChild(RenderObject* child) const override;
</span><span class="cx"> void flowThreadDescendantInserted(RenderObject&) override;
</span><del>- void flowThreadRelativeWillBeRemoved(RenderObject*) override;
</del><ins>+ void flowThreadRelativeWillBeRemoved(RenderObject&) override;
</ins><span class="cx"> void flowThreadDescendantBoxLaidOut(RenderBox*) override;
</span><span class="cx"> void computeLogicalHeight(LayoutUnit logicalHeight, LayoutUnit logicalTop, LogicalExtentComputedValues&) const override;
</span><span class="cx"> LayoutUnit initialLogicalWidth() const override;
</span><span class="lines">@@ -125,7 +125,7 @@
</span><span class="cx"> bool addForcedRegionBreak(const RenderBlock*, LayoutUnit, RenderBox* breakChild, bool isBefore, LayoutUnit* offsetBreakAdjustment = 0) override;
</span><span class="cx"> bool isPageLogicalHeightKnown() const override;
</span><span class="cx">
</span><del>- void handleSpannerRemoval(RenderObject* spanner);
</del><ins>+ void handleSpannerRemoval(RenderObject& spanner);
</ins><span class="cx"> RenderObject* processPossibleSpannerDescendant(RenderObject*& subtreeRoot, RenderObject& descendant);
</span><span class="cx">
</span><span class="cx"> private:
</span></span></pre>
</div>
</div>
</body>
</html>