Changeset 52838 in webkit

Timestamp:

Jan 5, 2010 4:07:56 PM (14 years ago)

Author:

eric@webkit.org

Message:

2010-01-05 James Robinson <​jamesr@chromium.org>

Reviewed by David Hyatt.

Cleans up line box clearing when a RenderBlock loses its last child.
​https://bugs.webkit.org/show_bug.cgi?id=33228

The 'fullLayout' flag in RenderBlock::layoutInlineChildren() is pretty vague, hopefully this will be easier for the next person to figure out.

No new tests.

• rendering/RenderBlock.cpp: (WebCore::RenderBlock::removeChild):
• rendering/RenderBlockLineLayout.cpp: (WebCore::RenderBlock::layoutInlineChildren):

Location:

trunk/WebCore

Files:

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

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-01-05  James Robinson  <jamesr@chromium.org>
+
+        Reviewed by David Hyatt.
+
+        Cleans up line box clearing when a RenderBlock loses its last child.
+        https://bugs.webkit.org/show_bug.cgi?id=33228
+
+        The 'fullLayout' flag in RenderBlock::layoutInlineChildren() is pretty vague, hopefully this will be easier for the next person to figure out.
+
+
+        No new tests.
+
+        * rendering/RenderBlock.cpp:
+        (WebCore::RenderBlock::removeChild):
+        * rendering/RenderBlockLineLayout.cpp:
+        (WebCore::RenderBlock::layoutInlineChildren):
+
 2010-01-05  Alexander Pavlov  <apavlov@chromium.org>
 

trunk/WebCore/rendering/RenderBlock.cpp

@@ -555 +555 @@
         anonBlock->destroy();
     }
+
+    // If this was our last child be sure to clear out our line boxes.
+    if (childrenInline() && !firstChild())
+        lineBoxes()->deleteLineBoxes(renderArena());
 }
 

trunk/WebCore/rendering/RenderBlockLineLayout.cpp

@@ -824 +824 @@
     // Figure out if we should clear out our line boxes.
     // FIXME: Handle resize eventually!
-    bool fullLayout = !firstLineBox() || !firstChild() || selfNeedsLayout() || relayoutChildren;
+    bool fullLayout = !firstLineBox() || selfNeedsLayout() || relayoutChildren;
     if (fullLayout)
         lineBoxes()->deleteLineBoxes(renderArena());