Changeset 107325 in webkit

Timestamp:

Feb 9, 2012, 5:36:54 PM (15 years ago)

Author:

cevans@google.com

Message:

Merge 106968
BUG=112847
Review URL: ​https://chromiumcodereview.appspot.com/9375039

Location:

branches/chromium/963

Files:

• LayoutTests/fast/multicol/span/split-inline-wrong-post-block-crash-expected.txt (copied) (copied from trunk/LayoutTests/fast/multicol/span/split-inline-wrong-post-block-crash-expected.txt )
• LayoutTests/fast/multicol/span/split-inline-wrong-post-block-crash.html (copied) (copied from trunk/LayoutTests/fast/multicol/span/split-inline-wrong-post-block-crash.html )
• Source/WebCore/rendering/RenderInline.cpp (modified) (1 diff)

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

@@ -386 +386 @@
     }
 
-    RenderBlock* post = block->createAnonymousBlock();
+    RenderBlock* post = block->createAnonymousBlockWithSameTypeAs(pre);
 
     RenderObject* boxFirst = madeNewBeforeBlock ? block->firstChild() : pre->nextSibling();