Changeset 157824 in webkit

Timestamp:

Oct 22, 2013, 3:37:25 PM (12 years ago)

Author:

Antti Koivisto

Message:

Rename deleteLineBoxTree to deleteLines
​https://bugs.webkit.org/show_bug.cgi?id=123176

Reviewed by Andreas Kling.

RenderBlock::deleteLineBoxTree -> RenderBlock::deleteLines
RenderInline::deleteLineBoxTree -> RenderInline::deleteLines

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/RenderBlock.cpp (modified) (9 diffs)
• rendering/RenderBlock.h (modified) (1 diff)
• rendering/RenderBlockFlow.cpp (modified) (2 diffs)
• rendering/RenderBlockFlow.h (modified) (1 diff)
• rendering/RenderFullScreen.cpp (modified) (1 diff)
• rendering/RenderInline.cpp (modified) (2 diffs)
• rendering/RenderInline.h (modified) (1 diff)
• rendering/RenderRubyBase.cpp (modified) (1 diff)
• rendering/RenderRubyRun.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-10-22  Antti Koivisto  <antti@apple.com>
+
+        Rename deleteLineBoxTree to deleteLines
+        https://bugs.webkit.org/show_bug.cgi?id=123176
+
+        Reviewed by Andreas Kling.
+
+        RenderBlock::deleteLineBoxTree -> RenderBlock::deleteLines
+        RenderInline::deleteLineBoxTree -> RenderInline::deleteLines
+
 2013-10-22  Tim Horton  <timothy_horton@apple.com>
 

trunk/Source/WebCore/rendering/RenderBlock.cpp

@@ -503 +503 @@
     // to clear our line box tree.
     if (beforeChild && childrenInline())
-        deleteLineBoxTree();
+        deleteLines();
 
     // Now take all of the children from beforeChild to the end and remove
@@ -567 +567 @@
     
     // Delete our line boxes before we do the inline split into continuations.
-    block->deleteLineBoxTree();
+    block->deleteLines();
     
     bool madeNewBeforeBlock = false;
@@ -625 +625 @@
     
     // Delete the block's line boxes before we do the split.
-    block->deleteLineBoxTree();
+    block->deleteLines();
 
     if (beforeChild && beforeChild->parent() != this)
@@ -887 +887 @@
 }
 
-void RenderBlock::deleteLineBoxTree()
+void RenderBlock::deleteLines()
 {
     if (AXObjectCache* cache = document().existingAXObjectCache())
@@ -911 +911 @@
         return;
 
-    deleteLineBoxTree();
+    deleteLines();
 
     // Since we are going to have block children, we have to move
@@ -1046 +1046 @@
     child->moveAllChildrenTo(parent, nextSibling, child->hasLayer());
     // Delete the now-empty block's lines and nuke it.
-    child->deleteLineBoxTree();
+    child->deleteLines();
     if (childFlowThread && childFlowThread->isRenderNamedFlowThread())
         toRenderNamedFlowThread(childFlowThread)->removeFlowChildInfo(child);
@@ -1107 +1107 @@
             
             // Delete the now-empty block's lines and nuke it.
-            nextBlock->deleteLineBoxTree();
+            nextBlock->deleteLines();
             nextBlock->destroy();
             next = 0;
@@ -1136 +1136 @@
         // If this was our last child be sure to clear out our line boxes.
         if (childrenInline())
-            deleteLineBoxTree();
+            deleteLines();
 
         // If we are an empty anonymous block in the continuation chain,
@@ -1645 +1645 @@
     // and our line box tree is no longer valid.
     if (runIn->isRenderBlock())
-        toRenderBlock(runIn)->deleteLineBoxTree();
+        toRenderBlock(runIn)->deleteLines();
     else if (runIn->isRenderInline())
-        toRenderInline(runIn)->deleteLineBoxTree();
+        toRenderInline(runIn)->deleteLines();
     else
         ASSERT_NOT_REACHED();

trunk/Source/WebCore/rendering/RenderBlock.h

@@ -111 +111 @@
 
     // FIXME-BLOCKFLOW: Remove virtualizaion when all callers have moved to RenderBlockFlow
-    virtual void deleteLineBoxTree();
+    virtual void deleteLines();
 
     virtual void addChild(RenderObject* newChild, RenderObject* beforeChild = 0) OVERRIDE;

trunk/Source/WebCore/rendering/RenderBlockFlow.cpp

@@ -1612 +1612 @@
 }
 
-void RenderBlockFlow::deleteLineBoxTree()
+void RenderBlockFlow::deleteLines()
 {
     if (containsFloats())
@@ -1619 +1619 @@
     m_lineBoxes.deleteLineBoxTree(renderArena());
 
-    RenderBlock::deleteLineBoxTree();
+    RenderBlock::deleteLines();
 }
 

trunk/Source/WebCore/rendering/RenderBlockFlow.h

@@ -250 +250 @@
     bool containsFloat(RenderBox*) const;
 
-    virtual void deleteLineBoxTree() OVERRIDE;
+    virtual void deleteLines() OVERRIDE;
     virtual void computeOverflow(LayoutUnit oldClientAfterEdge, bool recomputeFloats = false) OVERRIDE;
 

trunk/Source/WebCore/rendering/RenderFullScreen.cpp

@@ -124 +124 @@
             // Since we are moving the |object| to a new parent |fullscreenRenderer|,
             // the line box tree underneath our |containingBlock| is not longer valid.
-            containingBlock->deleteLineBoxTree();
+            containingBlock->deleteLines();
 
             parent->addChild(fullscreenRenderer, object);

trunk/Source/WebCore/rendering/RenderInline.cpp

@@ -442 +442 @@
     
     // Delete our line boxes before we do the inline split into continuations.
-    block->deleteLineBoxTree();
+    block->deleteLines();
     
     bool madeNewBeforeBlock = false;
@@ -1340 +1340 @@
 }
 
-void RenderInline::deleteLineBoxTree()
+void RenderInline::deleteLines()
 {
     m_lineBoxes.deleteLineBoxTree(renderArena());

trunk/Source/WebCore/rendering/RenderInline.h

@@ -59 +59 @@
 
     void dirtyLineBoxes(bool fullLayout);
-    void deleteLineBoxTree();
+    void deleteLines();
 
     RenderLineBoxList& lineBoxes() { return m_lineBoxes; }

trunk/Source/WebCore/rendering/RenderRubyBase.cpp

@@ -118 +118 @@
         RenderBlock* anonBlockThere = toRenderBlock(lastChildThere);
         anonBlockHere->moveAllChildrenTo(anonBlockThere, true);
-        anonBlockHere->deleteLineBoxTree();
+        anonBlockHere->deleteLines();
         anonBlockHere->destroy();
     }

trunk/Source/WebCore/rendering/RenderRubyRun.cpp

@@ -186 +186 @@
         if (base && !base->firstChild()) {
             RenderBlockFlow::removeChild(*base);
-            base->deleteLineBoxTree();
+            base->deleteLines();
             base->destroy();
         }
@@ -193 +193 @@
         if (isEmpty()) {
             parent()->removeChild(*this);
-            deleteLineBoxTree();
+            deleteLines();
             destroy();
         }