Changeset 24452 in webkit

Timestamp:

Jul 19, 2007 1:09:18 PM (17 years ago)

Author:

antti

Message:

LayoutTests:

Reviewed by Darin.

Test for <rdar://problem/5257371>
Dashcode Client crash when clicking on placemarks in Maps widget in WebCore::DeprecatedPtrListImpl::addIterator

• fast/flexbox/inline-children-crash-expected.txt: Added.
• fast/flexbox/inline-children-crash.html: Added.

WebCore:

Reviewed by Darin.

Fix <rdar://problem/5257371>
Dashcode Client crash when clicking on placemarks in Maps widget in WebCore::DeprecatedPtrListImpl::addIterator

FlexibleBoxes should never have inline children. Don't move children out from last remaining anonymous block.

• rendering/RenderBlock.cpp: (WebCore::RenderBlock::removeChild): real fix
• rendering/RenderFlexibleBox.cpp: (WebCore::RenderFlexibleBox::layoutVerticalBox): just to be sure, this is checked elsewhere too

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/flexbox/inline-children-crash-expected.txt (added)
• LayoutTests/fast/flexbox/inline-children-crash.html (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/rendering/RenderBlock.cpp (modified) (1 diff)
• WebCore/rendering/RenderFlexibleBox.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2007-07-19  Antti  <antti@apple.com>
+
+        Reviewed by Darin.
+        
+        Test for <rdar://problem/5257371>
+        Dashcode Client crash when clicking on placemarks in Maps widget in WebCore::DeprecatedPtrListImpl::addIterator
+
+        * fast/flexbox/inline-children-crash-expected.txt: Added.
+        * fast/flexbox/inline-children-crash.html: Added.
+
 2007-07-19  Antti  <antti@apple.com>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2007-07-19  Antti  <antti@apple.com>
+
+        Reviewed by Darin.
+
+        Fix <rdar://problem/5257371>
+        Dashcode Client crash when clicking on placemarks in Maps widget in WebCore::DeprecatedPtrListImpl::addIterator
+        
+        FlexibleBoxes should never have inline children. Don't move children out from last remaining anonymous block.
+
+        * rendering/RenderBlock.cpp:
+        (WebCore::RenderBlock::removeChild): real fix
+        * rendering/RenderFlexibleBox.cpp:
+        (WebCore::RenderFlexibleBox::layoutVerticalBox): just to be sure, this is checked elsewhere too
+
 2007-07-19  Anders Carlsson  <andersca@apple.com>
 

trunk/WebCore/rendering/RenderBlock.cpp

@@ -358 +358 @@
 
     RenderObject* child = prev ? prev : next;
-    if (canDeleteAnonymousBlocks && child && !child->previousSibling() && !child->nextSibling()) {
+    if (canDeleteAnonymousBlocks && child && !child->previousSibling() && !child->nextSibling() && !isFlexibleBox()) {
         // The removal has knocked us down to containing only a single anonymous
         // box.  We can go ahead and pull the content right back up into our

trunk/WebCore/rendering/RenderFlexibleBox.cpp

@@ -705 +705 @@
                     
                     // Dirty all the positioned objects.
-                    static_cast<RenderBlock*>(child)->markPositionedObjectsForLayout();
-                    static_cast<RenderBlock*>(child)->clearTruncation();
+                    if (child->isRenderBlock()) {
+                        static_cast<RenderBlock*>(child)->markPositionedObjectsForLayout();
+                        static_cast<RenderBlock*>(child)->clearTruncation();
+                    }
                 }
                 child->layoutIfNeeded();