Changeset 109448 in webkit

Timestamp:

Mar 1, 2012, 3:29:32 PM (15 years ago)

Author:

cevans@google.com

Message:

Merge 108548
BUG=113415
Review URL: ​https://chromiumcodereview.appspot.com/9562039

Location:

branches/chromium/963

Files:

• LayoutTests/fast/css-generated-content/before-content-with-list-marker-in-anon-block-crash-expected.txt (copied) (copied from trunk/LayoutTests/fast/css-generated-content/before-content-with-list-marker-in-anon-block-crash-expected.txt )
• LayoutTests/fast/css-generated-content/before-content-with-list-marker-in-anon-block-crash.html (copied) (copied from trunk/LayoutTests/fast/css-generated-content/before-content-with-list-marker-in-anon-block-crash.html )
• LayoutTests/platform/chromium-win/editing/execCommand/create-list-with-hr-expected.txt (modified) (1 diff)
• LayoutTests/platform/gtk/editing/execCommand/create-list-with-hr-expected.txt (modified) (1 diff)
• LayoutTests/platform/mac/editing/execCommand/create-list-with-hr-expected.txt (modified) (1 diff)
• LayoutTests/platform/qt/editing/execCommand/create-list-with-hr-expected.txt (modified) (1 diff)
• Source/WebCore/rendering/RenderListItem.cpp (modified) (1 diff)

branches/chromium/963/LayoutTests/platform/chromium-win/editing/execCommand/create-list-with-hr-expected.txt

@@ -22 +22 @@
         RenderBlock {UL} at (0,0) size 784x30
           RenderListItem {LI} at (40,0) size 744x30
-            RenderBlock (anonymous) at (0,0) size 744x0
             RenderBlock {HR} at (0,0) size 744x2 [border: (1px inset #000000)]
             RenderBlock (anonymous) at (0,10) size 744x20

branches/chromium/963/LayoutTests/platform/gtk/editing/execCommand/create-list-with-hr-expected.txt

@@ -22 +22 @@
         RenderBlock {UL} at (0,0) size 784x28
           RenderListItem {LI} at (40,0) size 744x28
-            RenderBlock (anonymous) at (0,0) size 744x0
             RenderBlock {HR} at (0,0) size 744x2 [border: (1px inset #000000)]
             RenderBlock (anonymous) at (0,10) size 744x18

branches/chromium/963/LayoutTests/platform/mac/editing/execCommand/create-list-with-hr-expected.txt

@@ -22 +22 @@
         RenderBlock {UL} at (0,0) size 784x28
           RenderListItem {LI} at (40,0) size 744x28
-            RenderBlock (anonymous) at (0,0) size 744x0
             RenderBlock {HR} at (0,0) size 744x2 [border: (1px inset #000000)]
             RenderBlock (anonymous) at (0,10) size 744x18

branches/chromium/963/LayoutTests/platform/qt/editing/execCommand/create-list-with-hr-expected.txt

@@ -22 +22 @@
         RenderBlock {UL} at (0,0) size 784x31
           RenderListItem {LI} at (40,0) size 744x31
-            RenderBlock (anonymous) at (0,0) size 744x0
             RenderBlock {HR} at (0,0) size 744x2 [border: (1px inset #000000)]
             RenderBlock (anonymous) at (0,10) size 744x21

branches/chromium/963/Source/WebCore/rendering/RenderListItem.cpp

@@ -218 +218 @@
             updateFirstLetter();
             m_marker->remove();
+            // If markerPar is an anonymous block that will lose all its children, destroy it
+            if (markerPar && (markerPar != lineBoxParent) && markerPar->isAnonymousBlock() && !(toRenderBlock(markerPar)->firstChild()))
+                markerPar->destroy();
             if (!lineBoxParent)
                 lineBoxParent = this;