Title: [208465] trunk/Source/WebCore
Revision
208465
Author
[email protected]
Date
2016-11-09 12:21:49 -0800 (Wed, 09 Nov 2016)

Log 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:

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (208464 => 208465)


--- 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)
@@ -1,3 +1,20 @@
+2016-11-09  Zalan Bujtas  <[email protected]>
+
+        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  <[email protected]>
 
         REGRESSION (r208149): Media scrubber is not displayed in media controls

Modified: trunk/Source/WebCore/rendering/RenderBlockFlow.cpp (208464 => 208465)


--- 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)
@@ -3883,7 +3883,7 @@
     if (!documentBeingDestroyed()) {
         RenderFlowThread* flowThread = multiColumnFlowThread();
         if (flowThread && flowThread != &oldChild)
-            flowThread->flowThreadRelativeWillBeRemoved(&oldChild);
+            flowThread->flowThreadRelativeWillBeRemoved(oldChild);
     }
     RenderBlock::removeChild(oldChild);
 }

Modified: trunk/Source/WebCore/rendering/RenderFlowThread.h (208464 => 208465)


--- 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)
@@ -94,7 +94,7 @@
     // Called when a descendant of the flow thread has been inserted.
     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*) { }
 

Modified: trunk/Source/WebCore/rendering/RenderMultiColumnFlowThread.cpp (208464 => 208465)


--- 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)
@@ -421,16 +421,16 @@
     }
 }
 
-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));
+        m_spannerMap.remove(&downcast<RenderBox>(spanner));
     }
 
-    if (RenderObject* next = spanner->nextSibling()) {
-        if (RenderObject* previous = spanner->previousSibling()) {
+    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.
                 next->destroy();
@@ -440,21 +440,21 @@
     }
 }
 
-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.
         
         handleSpannerRemoval(relative);

Modified: trunk/Source/WebCore/rendering/RenderMultiColumnFlowThread.h (208464 => 208465)


--- 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)
@@ -114,7 +114,7 @@
     void willBeRemovedFromTree() override;
     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;
     LayoutUnit initialLogicalWidth() const override;
@@ -125,7 +125,7 @@
     bool addForcedRegionBreak(const RenderBlock*, LayoutUnit, RenderBox* breakChild, bool isBefore, LayoutUnit* offsetBreakAdjustment = 0) override;
     bool isPageLogicalHeightKnown() const override;
 
-    void handleSpannerRemoval(RenderObject* spanner);
+    void handleSpannerRemoval(RenderObject& spanner);
     RenderObject* processPossibleSpannerDescendant(RenderObject*& subtreeRoot, RenderObject& descendant);
     
 private:
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to