Changeset 107333 in webkit

Timestamp:

Feb 9, 2012, 5:57:26 PM (15 years ago)

Author:

cevans@google.com

Message:

Merge 106150
BUG=104317
Review URL: ​https://chromiumcodereview.appspot.com/9371039

Location:

branches/chromium/963

Files:

• LayoutTests/fast/css-generated-content/float-first-letter-siblings-convert-to-inline-expected.txt (copied) (copied from trunk/LayoutTests/fast/css-generated-content/float-first-letter-siblings-convert-to-inline-expected.txt )
• LayoutTests/fast/css-generated-content/float-first-letter-siblings-convert-to-inline.html (copied) (copied from trunk/LayoutTests/fast/css-generated-content/float-first-letter-siblings-convert-to-inline.html )
• LayoutTests/fast/css-generated-content/positioned-div-with-floating-after-content-crash-expected.txt (copied) (copied from trunk/LayoutTests/fast/css-generated-content/positioned-div-with-floating-after-content-crash-expected.txt )
• LayoutTests/fast/css-generated-content/positioned-div-with-floating-after-content-crash.html (copied) (copied from trunk/LayoutTests/fast/css-generated-content/positioned-div-with-floating-after-content-crash.html )
• LayoutTests/fast/css-generated-content/resources/positioned-div-with-floating-after-content-crash-frame1.html (copied) (copied from trunk/LayoutTests/fast/css-generated-content/resources/positioned-div-with-floating-after-content-crash-frame1.html )
• LayoutTests/fast/css-generated-content/resources/positioned-div-with-floating-after-content-crash-frame2.html (copied) (copied from trunk/LayoutTests/fast/css-generated-content/resources/positioned-div-with-floating-after-content-crash-frame2.html )
• Source/WebCore/rendering/RenderBlock.cpp (modified) (2 diffs)
• Source/WebCore/rendering/RenderBlock.h (modified) (1 diff)

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

@@ -1018 +1018 @@
     return prev->isAnonymousColumnsBlock() == next->isAnonymousColumnsBlock()
            && prev->isAnonymousColumnSpanBlock() == next->isAnonymousColumnSpanBlock();
+}
+
+void RenderBlock::collapseAnonymousBoxChild(RenderBlock* parent, RenderObject* child)
+{
+    parent->setNeedsLayoutAndPrefWidthsRecalc();
+    parent->setChildrenInline(child->childrenInline());
+    RenderBlock* anonBlock = toRenderBlock(parent->children()->removeChildNode(parent, child, child->hasLayer()));
+    anonBlock->moveAllChildrenTo(parent, child->hasLayer());
+    // Delete the now-empty block's lines and nuke it.
+    if (!parent->documentBeingDestroyed())
+        anonBlock->deleteLineBoxTree();
+    anonBlock->destroy();
 }
 
@@ -1076 +1088 @@
         // box.  We can go ahead and pull the content right back up into our
         // box.
-        setNeedsLayoutAndPrefWidthsRecalc();
-        setChildrenInline(child->childrenInline());
-        RenderBlock* anonBlock = toRenderBlock(children()->removeChildNode(this, child, child->hasLayer()));
-        anonBlock->moveAllChildrenTo(this, child->hasLayer());
-        // Delete the now-empty block's lines and nuke it.
-        anonBlock->deleteLineBoxTree();
-        anonBlock->destroy();
+        collapseAnonymousBoxChild(this, child);
+    } else if ((prev && prev->isAnonymousBlock()) || (next && next->isAnonymousBlock())) {
+        // It's possible that the removal has knocked us down to a single anonymous
+        // block with pseudo-style element siblings (e.g. first-letter). If these
+        // are floating, then we need to pull the content up also.
+        RenderBlock* anonBlock = toRenderBlock((prev && prev->isAnonymousBlock()) ? prev : next);
+        if ((anonBlock->previousSibling() || anonBlock->nextSibling())
+            && (!anonBlock->previousSibling() || (anonBlock->previousSibling()->style()->styleType() != NOPSEUDO && anonBlock->previousSibling()->isFloating()))
+            && (!anonBlock->nextSibling() || (anonBlock->nextSibling()->style()->styleType() != NOPSEUDO && anonBlock->nextSibling()->isFloating()))) {
+            collapseAnonymousBoxChild(this, anonBlock);
+        }
     }
 

branches/chromium/963/Source/WebCore/rendering/RenderBlock.h

@@ -450 +450 @@
     virtual void removeLeftoverAnonymousBlock(RenderBlock* child);
 
+    static void collapseAnonymousBoxChild(RenderBlock* parent, RenderObject* child);
+
     virtual void dirtyLinesFromChangedChild(RenderObject* child) { m_lineBoxes.dirtyLinesFromChangedChild(this, child); }