Changeset 86628 in webkit

Timestamp:

May 16, 2011 4:10:49 PM (13 years ago)

Author:

eric@webkit.org

Message:

2011-05-16 Eric Seidel <​eric@webkit.org>

Reviewed by Adam Barth.

Document why RenderBlockLineLayout has its own deleteLineBoxTree implementation
​https://bugs.webkit.org/show_bug.cgi?id=60925

I suspect this difference is really just papering over other bugs
but now that I finally understand the difference, I should at least
document it for others.

• rendering/RenderBlockLineLayout.cpp: (WebCore::deleteLineRange): (WebCore::RenderBlock::determineStartPosition):

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-05-16  Eric Seidel  <eric@webkit.org>
+
+        Reviewed by Adam Barth.
+
+        Document why RenderBlockLineLayout has its own deleteLineBoxTree implementation
+        https://bugs.webkit.org/show_bug.cgi?id=60925
+
+        I suspect this difference is really just papering over other bugs
+        but now that I finally understand the difference, I should at least
+        document it for others.
+
+        * rendering/RenderBlockLineLayout.cpp:
+        (WebCore::deleteLineRange):
+        (WebCore::RenderBlock::determineStartPosition):
+
 2011-05-16  Alok Priyadarshi  <alokp@chromium.org>
 

trunk/Source/WebCore/rendering/RenderBlockLineLayout.cpp

@@ -823 +823 @@
         repaintLogicalTop = min(repaintLogicalTop, boxToDelete->logicalTopVisualOverflow());
         repaintLogicalBottom = max(repaintLogicalBottom, boxToDelete->logicalBottomVisualOverflow());
+        // Note: deleteLineRange(renderArena(), firstRootBox()) is not identical to deleteLineBoxTree().
+        // deleteLineBoxTree uses nextLineBox() instead of nextRootBox() when traversing.
         RootInlineBox* next = boxToDelete->nextRootBox();
         boxToDelete->deleteLine(arena);
@@ -1256 +1258 @@
 
     if (fullLayout) {
-        // Nuke all our lines.
-        if (firstRootBox()) {
-            RenderArena* arena = renderArena();
-            curr = firstRootBox();
-            while (curr) {
-                RootInlineBox* next = curr->nextRootBox();
-                curr->deleteLine(arena);
-                curr = next;
-            }
-            ASSERT(!firstLineBox() && !lastLineBox());
-        }
+        // 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;
+        }
+        ASSERT(!firstLineBox() && !lastLineBox());
     } else {
         if (curr) {