Skip to site navigation (Press enter)

[webkit-changes] [109421] branches/chromium/1025

cevans Thu, 01 Mar 2012 14:07:39 -0800

Title: [109421] branches/chromium/1025

Revision: 109421
Author: [email protected]
Date: 2012-03-01 14:07:29 -0800 (Thu, 01 Mar 2012)

Log Message

Merge 108543
BUG=113497
Review URL: https://chromiumcodereview.appspot.com/9564028


Modified Paths

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


Added Paths

branches/chromium/1025/LayoutTests/fast/multicol/span/clone-flexbox-expected.txt
branches/chromium/1025/LayoutTests/fast/multicol/span/clone-flexbox.html
branches/chromium/1025/LayoutTests/fast/multicol/span/clone-summary-expected.png
branches/chromium/1025/LayoutTests/fast/multicol/span/clone-summary-expected.txt
branches/chromium/1025/LayoutTests/fast/multicol/span/clone-summary.html
branches/chromium/1025/LayoutTests/fast/multicol/span/textbox-not-removed-crash-expected.txt
branches/chromium/1025/LayoutTests/fast/multicol/span/textbox-not-removed-crash.html

Diff

Copied: branches/chromium/1025/LayoutTests/fast/multicol/span/clone-flexbox-expected.txt (from rev 108543, trunk/LayoutTests/fast/multicol/span/clone-flexbox-expected.txt) (0 => 109421)


--- branches/chromium/1025/LayoutTests/fast/multicol/span/clone-flexbox-expected.txt	                        (rev 0)
+++ branches/chromium/1025/LayoutTests/fast/multicol/span/clone-flexbox-expected.txt	2012-03-01 22:07:29 UTC (rev 109421)
@@ -0,0 +1,21 @@
+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+layer at (0,0) size 800x48
+  RenderBlock {HTML} at (0,0) size 800x48
+    RenderBody {BODY} at (8,8) size 784x32
+layer at (8,8) size 784x32
+  RenderBlock {DIV} at (0,0) size 784x32
+    RenderBlock (anonymous multi-column span) at (0,16) size 784x0 [color=#FFFFFF]
+      RenderBlock {DIV} at (0,0) size 784x0
+layer at (8,8) size 784x16
+  RenderBlock (anonymous multi-column) at (0,0) size 784x16
+    RenderFlexibleBox {DIV} at (0,0) size 117x16 [color=#FFFFFF]
+      RenderBlock (anonymous) at (0,0) size 16x16
+        RenderText {#text} at (0,0) size 16x16
+          text run at (0,0) width 16: "a"
+layer at (8,24) size 784x16
+  RenderBlock (anonymous multi-column) at (0,16) size 784x16
+    RenderFlexibleBox {DIV} at (0,0) size 117x16 [color=#FFFFFF]
+      RenderBlock (anonymous) at (0,0) size 16x16
+        RenderText {#text} at (0,0) size 16x16
+          text run at (0,0) width 16: "b"

Copied: branches/chromium/1025/LayoutTests/fast/multicol/span/clone-flexbox.html (from rev 108543, trunk/LayoutTests/fast/multicol/span/clone-flexbox.html) (0 => 109421)


--- branches/chromium/1025/LayoutTests/fast/multicol/span/clone-flexbox.html	                        (rev 0)
+++ branches/chromium/1025/LayoutTests/fast/multicol/span/clone-flexbox.html	2012-03-01 22:07:29 UTC (rev 109421)
@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<html>
+<body style="font-family: ahem; -webkit-font-smoothing: none;">
+<style>
+#container { -webkit-column-width: 100px; }
+#div1 { -webkit-column-span: all; }
+#flexbox1 { color: white; }
+</style>
+<script>
+document.body.offsetTop;
+var container = document.createElement('div');
+container.setAttribute('id', 'container');
+document.body.appendChild(container); 
+flexbox1 = document.createElement('div');
+flexbox1.setAttribute('id', 'flexbox1');
+container.appendChild(flexbox1);
+var div1 = document.createElement('div');
+div1.setAttribute('id', 'div1');
+flexbox1.style.display = '-webkit-flexbox';
+flexbox1.appendChild(document.createTextNode('a'));
+flexbox1.appendChild(div1);
+flexbox1.appendChild(document.createTextNode('b'));
+</script>
+</body>
+</html>

Copied: branches/chromium/1025/LayoutTests/fast/multicol/span/clone-summary-expected.png (from rev 108543, trunk/LayoutTests/fast/multicol/span/clone-summary-expected.png) (0 => 109421)


--- branches/chromium/1025/LayoutTests/fast/multicol/span/clone-summary-expected.png	                        (rev 0)
+++ branches/chromium/1025/LayoutTests/fast/multicol/span/clone-summary-expected.png	2012-03-01 22:07:29 UTC (rev 109421)
@@ -0,0 +1,5 @@
+\x89PNG
+
+
+IHDR X\x9Av\x82p)tEXtchecksum853de00567d121bea0b7bece66a5d61c`7\xFF\xFB IDATx\xEDױ
+ 1`\xFF\x9Db\x88\xAB\x9C^\xB2\xD2ܞw\xCB @\x80 @ 8\xC1\x86	 @\x80|\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2џ,\xA0IDAT @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\xE2 @\x80\xC8HFm\x88 @\x80\x81\xE9W\xACg̐IEND\xAEB`\x82
\ No newline at end of file

Copied: branches/chromium/1025/LayoutTests/fast/multicol/span/clone-summary-expected.txt (from rev 108543, trunk/LayoutTests/fast/multicol/span/clone-summary-expected.txt) (0 => 109421)


--- branches/chromium/1025/LayoutTests/fast/multicol/span/clone-summary-expected.txt	                        (rev 0)
+++ branches/chromium/1025/LayoutTests/fast/multicol/span/clone-summary-expected.txt	2012-03-01 22:07:29 UTC (rev 109421)
@@ -0,0 +1,19 @@
+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+layer at (0,0) size 800x48
+  RenderBlock {HTML} at (0,0) size 800x48
+    RenderBody {BODY} at (8,8) size 784x32
+layer at (8,8) size 784x32
+  RenderBlock {DIV} at (0,0) size 784x32
+    RenderBlock (anonymous multi-column span) at (0,16) size 784x0 [color=#FFFFFF]
+      RenderBlock {DIV} at (0,0) size 784x0
+layer at (8,8) size 784x16
+  RenderBlock (anonymous multi-column) at (0,0) size 784x16
+    RenderSummary {SUMMARY} at (0,0) size 117x16 [color=#FFFFFF]
+      RenderText {#text} at (0,0) size 16x16
+        text run at (0,0) width 16: "a"
+layer at (8,24) size 784x16
+  RenderBlock (anonymous multi-column) at (0,16) size 784x16
+    RenderSummary {SUMMARY} at (0,0) size 117x16 [color=#FFFFFF]
+      RenderText {#text} at (0,0) size 16x16
+        text run at (0,0) width 16: "b"

Copied: branches/chromium/1025/LayoutTests/fast/multicol/span/clone-summary.html (from rev 108543, trunk/LayoutTests/fast/multicol/span/clone-summary.html) (0 => 109421)


--- branches/chromium/1025/LayoutTests/fast/multicol/span/clone-summary.html	                        (rev 0)
+++ branches/chromium/1025/LayoutTests/fast/multicol/span/clone-summary.html	2012-03-01 22:07:29 UTC (rev 109421)
@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<html>
+<body style="font-family: ahem; -webkit-font-smoothing: none;">
+<style>
+#container { -webkit-column-width: 100px; }
+#div1 { -webkit-column-span: all; }
+#summary1 { color: white; } 
+</style>
+<script>
+document.body.offsetTop;
+var container = document.createElement('div');
+container.setAttribute('id', 'container');
+document.body.appendChild(container); 
+summary1 = document.createElement('summary');
+summary1.setAttribute('id', 'summary1');
+container.appendChild(summary1);
+var div1 = document.createElement('div');
+div1.setAttribute('id', 'div1');
+summary1.style.display = 'table-row';
+summary1.appendChild(document.createTextNode('a'));
+summary1.appendChild(div1);
+summary1.appendChild(document.createTextNode('b'));
+</script>
+</body>
+</html>

Copied: branches/chromium/1025/LayoutTests/fast/multicol/span/textbox-not-removed-crash-expected.txt (from rev 108543, trunk/LayoutTests/fast/multicol/span/textbox-not-removed-crash-expected.txt) (0 => 109421)


--- branches/chromium/1025/LayoutTests/fast/multicol/span/textbox-not-removed-crash-expected.txt	                        (rev 0)
+++ branches/chromium/1025/LayoutTests/fast/multicol/span/textbox-not-removed-crash-expected.txt	2012-03-01 22:07:29 UTC (rev 109421)
@@ -0,0 +1,2 @@
+Test passes if it does not crash.
+A

Copied: branches/chromium/1025/LayoutTests/fast/multicol/span/textbox-not-removed-crash.html (from rev 108543, trunk/LayoutTests/fast/multicol/span/textbox-not-removed-crash.html) (0 => 109421)


--- branches/chromium/1025/LayoutTests/fast/multicol/span/textbox-not-removed-crash.html	                        (rev 0)
+++ branches/chromium/1025/LayoutTests/fast/multicol/span/textbox-not-removed-crash.html	2012-03-01 22:07:29 UTC (rev 109421)
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<html>
+<head>
+<style>
+#test1 {
+    text-indent: -1em;
+    content: counter(c);
+    -webkit-column-count: 1;
+}
+#test3 {
+    -webkit-column-span: all;
+}
+</style>
+<script>
+if (window.layoutTestController)
+    layoutTestController.dumpAsText();
+
+function crash() {
+    test1 = document.createElement('div'); 
+    test1.setAttribute('id', 'test1'); 
+    document.body.appendChild(test1);
+    test2 = document.createElement('div'); 
+    test1.appendChild(test2);
+    test3 = document.createElement('div'); 
+    test3.setAttribute('id', 'test3');
+    test2.appendChild(test3);
+    test2.appendChild(document.createTextNode('A')); 
+    test2.style.display = '-webkit-box';
+    document.body.offsetTop;
+    test3.style.display = 'list-item';
+    document.body.offsetTop;
+    document.body.style.zoom = 2;
+}
+window._onload_ = crash;
+</script>
+</head>
+<body>
+Test passes if it does not crash.
+</body>
+</html>

Modified: branches/chromium/1025/Source/WebCore/rendering/RenderBlock.cpp (109420 => 109421)


--- branches/chromium/1025/Source/WebCore/rendering/RenderBlock.cpp	2012-03-01 22:07:28 UTC (rev 109420)
+++ branches/chromium/1025/Source/WebCore/rendering/RenderBlock.cpp	2012-03-01 22:07:29 UTC (rev 109421)
@@ -462,7 +462,8 @@
         cloneBlock->setChildrenInline(childrenInline());
     }
     else {
-        cloneBlock = new (renderArena()) RenderBlock(node());
+        RenderObject* cloneRenderer = node()->createRenderer(renderArena(), style());
+        cloneBlock = toRenderBlock(cloneRenderer);
         cloneBlock->setStyle(style());
 
         // This takes care of setting the right value of childrenInline in case
@@ -482,10 +483,16 @@
     if (!isAnonymousBlock())
         cloneBlock->setContinuation(oldCont);
 
+    if (!beforeChild && isAfterContent(lastChild()))
+        beforeChild = lastChild();
+
+    // If we are moving inline children from |this| to cloneBlock, then we need
+    // to clear our line box tree.
+    if (beforeChild && childrenInline())
+        deleteLineBoxTree();
+
     // Now take all of the children from beforeChild to the end and remove
     // them from |this| and place them in the clone.
-    if (!beforeChild && isAfterContent(lastChild()))
-        beforeChild = lastChild();
     moveChildrenTo(cloneBlock, beforeChild, 0, true);
     
     // Hook |clone| up as the continuation of the middle block.

_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes