Changeset 148468 in webkit

Timestamp:

Apr 15, 2013 2:25:35 PM (11 years ago)

Author:

igor.o@sisa.samsung.com

Message:

Call directly RenderBlock::deleteLineBoxTree
​https://bugs.webkit.org/show_bug.cgi?id=102761

Reviewed by Darin Adler.

Instead of implementing RenderLineBoxList::deleteLineBoxTree logic inside
RenderBlock::determineStartPosition, we can reuse the code. The commentaries added
in the changeset #86628 are not valid anymore, nextRootBox is casting m_nextLineBox
and nextLineBox is returning m_nextLineBox.

• rendering/RenderBlockLineLayout.cpp:

(WebCore::RenderBlock::determineStartPosition):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/RenderBlockLineLayout.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-04-15  Igor Oliveira  <igor.o@sisa.samsung.com>
+
+        Call directly RenderBlock::deleteLineBoxTree
+        https://bugs.webkit.org/show_bug.cgi?id=102761
+
+        Reviewed by Darin Adler.
+
+        Instead of implementing RenderLineBoxList::deleteLineBoxTree logic inside 
+        RenderBlock::determineStartPosition, we can reuse the code. The commentaries added
+        in the changeset #86628 are not valid anymore, nextRootBox is casting m_nextLineBox 
+        and nextLineBox is returning m_nextLineBox.
+
+        * rendering/RenderBlockLineLayout.cpp:
+        (WebCore::RenderBlock::determineStartPosition):
+
 2013-04-15  Anders Carlsson  <andersca@apple.com>
 

trunk/Source/WebCore/rendering/RenderBlockLineLayout.cpp

@@ -2125 +2125 @@
 
     if (layoutState.isFullLayout()) {
-        // FIXME: This should just call deleteLineBoxTree, but that causes
-        // crashes for fast/repaint tests.
-        RenderArena* arena = renderArena();
-        curr = firstRootBox();
-        while (curr) {
-            // Note: This uses nextRootBox() insted of nextLineBox() like deleteLineBoxTree does.
-            RootInlineBox* next = curr->nextRootBox();
-            curr->deleteLine(arena);
-            curr = next;
-        }
+        m_lineBoxes.deleteLineBoxTree(renderArena());
+        curr = 0;
+
         ASSERT(!firstLineBox() && !lastLineBox());
     } else {