Changeset 208465 in webkit

Timestamp:

Nov 9, 2016 12:21:49 PM (7 years ago)

Author:

Alan Bujtas

Message:

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:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/RenderBlockFlow.cpp (modified) (1 diff)
• rendering/RenderFlowThread.h (modified) (1 diff)
• rendering/RenderMultiColumnFlowThread.cpp (modified) (2 diffs)
• rendering/RenderMultiColumnFlowThread.h (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+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:
+
 2016-11-09  Jer Noble  <jer.noble@apple.com>
 

trunk/Source/WebCore/rendering/RenderBlockFlow.cpp

@@ -3884 +3884 @@
         RenderFlowThread* flowThread = multiColumnFlowThread();
         if (flowThread && flowThread != &oldChild)
-            flowThread->flowThreadRelativeWillBeRemoved(&oldChild);
+            flowThread->flowThreadRelativeWillBeRemoved(oldChild);
     }
     RenderBlock::removeChild(oldChild);

trunk/Source/WebCore/rendering/RenderFlowThread.h

@@ -95 +95 @@
     virtual void flowThreadDescendantInserted(RenderObject&) { }
     // Called when a sibling or descendant of the flow thread is about to be removed.
-    virtual void flowThreadRelativeWillBeRemoved(RenderObject*) { }
+    virtual void flowThreadRelativeWillBeRemoved(RenderObject&) { }
     // Called when a descendant box's layout is finished and it has been positioned within its container.
     virtual void flowThreadDescendantBoxLaidOut(RenderBox*) { }

trunk/Source/WebCore/rendering/RenderMultiColumnFlowThread.cpp

@@ -422 +422 @@
 }
 
-void RenderMultiColumnFlowThread::handleSpannerRemoval(RenderObject* spanner)
+void RenderMultiColumnFlowThread::handleSpannerRemoval(RenderObject& spanner)
 {
      // The placeholder may already have been removed, but if it hasn't, do so now.
-    if (RenderMultiColumnSpannerPlaceholder* placeholder = m_spannerMap.get(downcast<RenderBox>(spanner))) {
+    if (RenderMultiColumnSpannerPlaceholder* placeholder = m_spannerMap.get(&downcast<RenderBox>(spanner))) {
         placeholder->parent()->removeChild(*placeholder);
-        m_spannerMap.remove(downcast<RenderBox>(spanner));
-    }
-
-    if (RenderObject* next = spanner->nextSibling()) {
-        if (RenderObject* previous = spanner->previousSibling()) {
+        m_spannerMap.remove(&downcast<RenderBox>(spanner));
+    }
+
+    if (RenderObject* next = spanner.nextSibling()) {
+        if (RenderObject* previous = spanner.previousSibling()) {
             if (previous->isRenderMultiColumnSet() && next->isRenderMultiColumnSet()) {
                 // Merge two sets that no longer will be separated by a spanner.
@@ -441 +441 @@
 }
 
-void RenderMultiColumnFlowThread::flowThreadRelativeWillBeRemoved(RenderObject* relative)
+void RenderMultiColumnFlowThread::flowThreadRelativeWillBeRemoved(RenderObject& relative)
 {
     if (m_beingEvacuated)
         return;
     invalidateRegions();
-    if (is<RenderMultiColumnSpannerPlaceholder>(*relative)) {
+    if (is<RenderMultiColumnSpannerPlaceholder>(relative)) {
         // Remove the map entry for this spanner, but leave the actual spanner renderer alone. Also
         // keep the reference to the spanner, since the placeholder may be about to be re-inserted
         // in the tree.
-        ASSERT(relative->isDescendantOf(this));
-        m_spannerMap.remove(downcast<RenderMultiColumnSpannerPlaceholder>(*relative).spanner());
+        ASSERT(relative.isDescendantOf(this));
+        m_spannerMap.remove(downcast<RenderMultiColumnSpannerPlaceholder>(relative).spanner());
         return;
     }
-    if (relative->style().columnSpan() == ColumnSpanAll) {
-        if (relative->parent() != parent())
+    if (relative.style().columnSpan() == ColumnSpanAll) {
+        if (relative.parent() != parent())
             return; // not a valid spanner.
         

trunk/Source/WebCore/rendering/RenderMultiColumnFlowThread.h

@@ -115 +115 @@
     RenderObject* resolveMovedChild(RenderObject* child) const override;
     void flowThreadDescendantInserted(RenderObject&) override;
-    void flowThreadRelativeWillBeRemoved(RenderObject*) override;
+    void flowThreadRelativeWillBeRemoved(RenderObject&) override;
     void flowThreadDescendantBoxLaidOut(RenderBox*) override;
     void computeLogicalHeight(LayoutUnit logicalHeight, LayoutUnit logicalTop, LogicalExtentComputedValues&) const override;
@@ -126 +126 @@
     bool isPageLogicalHeightKnown() const override;
 
-    void handleSpannerRemoval(RenderObject* spanner);
+    void handleSpannerRemoval(RenderObject& spanner);
     RenderObject* processPossibleSpannerDescendant(RenderObject*& subtreeRoot, RenderObject& descendant);