[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
inferno at chromium.org
inferno at chromium.org
Wed Dec 22 13:39:28 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit cae3d43e8f171d64a288b678546dbe5b0086ad1f
Author: inferno at chromium.org <inferno at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Sep 22 19:03:50 2010 +0000
2010-09-22 Abhishek Arya <inferno at chromium.org>
Reviewed by Dave Hyatt.
Fix wrong casts for table cell since its parent is not a RenderBlock. Remove
the redundant destroy call for empty anonymous columns or column span block.
https://bugs.webkit.org/show_bug.cgi?id=46245
Tests: fast/table/table-anonymous-block-destroy-crash.html
fast/table/table-columns-blocks-calc-crash.html
* rendering/RenderBlock.cpp:
(WebCore::RenderBlock::addChildToAnonymousColumnBlocks):
(WebCore::RenderBlock::columnsBlockForSpanningElement):
(WebCore::RenderBlock::removeChild):
2010-09-22 Abhishek Arya <inferno at chromium.org>
Reviewed by Dave Hyatt.
Tests that removing an anonymous block from a table cell does not result in crash.
Also, tests that calculating columns block for a table cell does not result in crash.
Rebaseline existing multicol span tests since we don't explicitly remove an empty
anonymous columns or column span blocks.
https://bugs.webkit.org/show_bug.cgi?id=46245
* fast/table/table-anonymous-block-destroy-crash-expected.txt: Added.
* fast/table/table-anonymous-block-destroy-crash.html: Added.
* fast/table/table-columns-blocks-calc-crash-expected.txt: Added.
* fast/table/table-columns-blocks-calc-crash.html: Added.
* platform/mac/fast/multicol/span/span-as-immediate-child-property-removal-expected.checksum:
* platform/mac/fast/multicol/span/span-as-immediate-child-property-removal-expected.png:
* platform/mac/fast/multicol/span/span-as-immediate-child-property-removal-expected.txt:
* platform/mac/fast/multicol/span/span-as-immediate-columns-child-removal-expected.checksum:
* platform/mac/fast/multicol/span/span-as-immediate-columns-child-removal-expected.png:
* platform/mac/fast/multicol/span/span-as-immediate-columns-child-removal-expected.txt:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@68062 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 7f67917..bcebd17 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,24 @@
+2010-09-22 Abhishek Arya <inferno at chromium.org>
+
+ Reviewed by Dave Hyatt.
+
+ Tests that removing an anonymous block from a table cell does not result in crash.
+ Also, tests that calculating columns block for a table cell does not result in crash.
+ Rebaseline existing multicol span tests since we don't explicitly remove an empty
+ anonymous columns or column span blocks.
+ https://bugs.webkit.org/show_bug.cgi?id=46245
+
+ * fast/table/table-anonymous-block-destroy-crash-expected.txt: Added.
+ * fast/table/table-anonymous-block-destroy-crash.html: Added.
+ * fast/table/table-columns-blocks-calc-crash-expected.txt: Added.
+ * fast/table/table-columns-blocks-calc-crash.html: Added.
+ * platform/mac/fast/multicol/span/span-as-immediate-child-property-removal-expected.checksum:
+ * platform/mac/fast/multicol/span/span-as-immediate-child-property-removal-expected.png:
+ * platform/mac/fast/multicol/span/span-as-immediate-child-property-removal-expected.txt:
+ * platform/mac/fast/multicol/span/span-as-immediate-columns-child-removal-expected.checksum:
+ * platform/mac/fast/multicol/span/span-as-immediate-columns-child-removal-expected.png:
+ * platform/mac/fast/multicol/span/span-as-immediate-columns-child-removal-expected.txt:
+
2010-09-22 Oliver Hunt <oliver at apple.com>
Reviewed by Gavin Barraclough.
diff --git a/LayoutTests/editing/selection/5136696-expected.txt b/LayoutTests/fast/table/table-anonymous-block-destroy-crash-expected.txt
similarity index 100%
copy from LayoutTests/editing/selection/5136696-expected.txt
copy to LayoutTests/fast/table/table-anonymous-block-destroy-crash-expected.txt
diff --git a/LayoutTests/fast/table/table-anonymous-block-destroy-crash.html b/LayoutTests/fast/table/table-anonymous-block-destroy-crash.html
new file mode 100644
index 0000000..3062058
--- /dev/null
+++ b/LayoutTests/fast/table/table-anonymous-block-destroy-crash.html
@@ -0,0 +1,26 @@
+<html>
+ <head>
+ <style>
+ div
+ {
+ -webkit-column-span: all;
+ -webkit-columns: 2;
+ display: table-cell;
+ }
+ div:last-of-type
+ {
+ display: table-caption;
+ }
+ </style>
+ </head>
+ <body>
+ <div>
+ <div></div>
+ </div>
+ PASS
+ <script>
+ if (window.layoutTestController)
+ layoutTestController.dumpAsText();
+ </script>
+ </body>
+</html>
diff --git a/LayoutTests/editing/selection/5136696-expected.txt b/LayoutTests/fast/table/table-columns-blocks-calc-crash-expected.txt
similarity index 100%
copy from LayoutTests/editing/selection/5136696-expected.txt
copy to LayoutTests/fast/table/table-columns-blocks-calc-crash-expected.txt
diff --git a/LayoutTests/fast/table/table-columns-blocks-calc-crash.html b/LayoutTests/fast/table/table-columns-blocks-calc-crash.html
new file mode 100644
index 0000000..5f5e387
--- /dev/null
+++ b/LayoutTests/fast/table/table-columns-blocks-calc-crash.html
@@ -0,0 +1,22 @@
+<html>
+ <head>
+ <style>
+ div
+ {
+ -webkit-column-span: all;
+ display: table-cell;
+ }
+ </style>
+ </head>
+ <body>
+ <div>
+ <div></div>
+ </div>
+ PASS
+ <script>
+ if (window.layoutTestController)
+ layoutTestController.dumpAsText();
+ </script>
+ </body>
+</html>
+
diff --git a/LayoutTests/platform/mac/fast/multicol/span/span-as-immediate-child-property-removal-expected.checksum b/LayoutTests/platform/mac/fast/multicol/span/span-as-immediate-child-property-removal-expected.checksum
index 907541a..52722ff 100644
--- a/LayoutTests/platform/mac/fast/multicol/span/span-as-immediate-child-property-removal-expected.checksum
+++ b/LayoutTests/platform/mac/fast/multicol/span/span-as-immediate-child-property-removal-expected.checksum
@@ -1 +1 @@
-a8f1f5c8bab19f5ff7981cac57c8a7cc
\ No newline at end of file
+aa23c8acbac7be26252004d964608af0
\ No newline at end of file
diff --git a/LayoutTests/platform/mac/fast/multicol/span/span-as-immediate-child-property-removal-expected.png b/LayoutTests/platform/mac/fast/multicol/span/span-as-immediate-child-property-removal-expected.png
index f57629b..888142a 100644
Binary files a/LayoutTests/platform/mac/fast/multicol/span/span-as-immediate-child-property-removal-expected.png and b/LayoutTests/platform/mac/fast/multicol/span/span-as-immediate-child-property-removal-expected.png differ
diff --git a/LayoutTests/platform/mac/fast/multicol/span/span-as-immediate-child-property-removal-expected.txt b/LayoutTests/platform/mac/fast/multicol/span/span-as-immediate-child-property-removal-expected.txt
index d98f48c..2f0ef3e 100644
--- a/LayoutTests/platform/mac/fast/multicol/span/span-as-immediate-child-property-removal-expected.txt
+++ b/LayoutTests/platform/mac/fast/multicol/span/span-as-immediate-child-property-removal-expected.txt
@@ -1,19 +1,22 @@
-layer at (0,0) size 785x2380
+layer at (0,0) size 785x2543
RenderView at (0,0) size 785x600
-layer at (0,0) size 785x2380
- RenderBlock {HTML} at (0,0) size 785x2380
- RenderBody {BODY} at (8,8) size 769x2356
+layer at (0,0) size 785x2543
+ RenderBlock {HTML} at (0,0) size 785x2543
+ RenderBody {BODY} at (8,8) size 769x2519
RenderBlock (anonymous) at (0,0) size 769x36
RenderText {#text} at (0,0) size 760x36
text run at (0,0) width 760: "In this test, all of the spanning elements have their spans turned off dynamically, and so they should just be in the column"
text run at (0,18) width 33: "flow."
RenderText {#text} at (0,0) size 0x0
-layer at (8,60) size 760x348
- RenderBlock {DIV} at (0,52) size 760x348 [border: (5px solid #800000)]
- RenderBlock {H2} at (5,5) size 367x28 [bgcolor=#EEEEEE]
+layer at (8,60) size 760x367
+ RenderBlock {DIV} at (0,52) size 760x367 [border: (5px solid #800000)]
+ RenderBlock (anonymous multi-column span) at (5,5) size 750x0
+layer at (13,84) size 750x338
+ RenderBlock (anonymous multi-column) at (5,24) size 750x338
+ RenderBlock {H2} at (0,0) size 367x28 [bgcolor=#EEEEEE]
RenderText {#text} at (0,0) size 276x28
text run at (0,0) width 276: "This is a spanning element."
- RenderBlock (anonymous) at (5,52) size 367x615
+ RenderBlock (anonymous) at (0,47) size 367x615
RenderText {#text} at (0,0) size 363x615
text run at (0,0) width 354: "Lorem ipsum dolor sit amet, consectetuer adipiscing elit."
text run at (0,18) width 351: "Nulla varius enim ac mi. Curabitur sollicitudin felis quis"
@@ -51,10 +54,60 @@ layer at (8,60) size 760x348
text run at (0,561) width 354: "Lorem ipsum dolor sit amet, consectetuer adipiscing elit."
text run at (0,579) width 354: "Lorem ipsum dolor sit amet, consectetuer adipiscing elit."
text run at (0,597) width 154: "Nulla varius enim ac mi."
-layer at (8,424) size 760x364
- RenderBlock {DIV} at (0,416) size 760x364 [border: (5px solid #800000)]
- RenderBlock (anonymous) at (5,5) size 367x624
- RenderText {#text} at (0,0) size 363x624
+layer at (8,443) size 760x382
+ RenderBlock {DIV} at (0,435) size 760x382 [border: (5px solid #800000)]
+ RenderBlock (anonymous multi-column span) at (5,311) size 750x0
+layer at (13,448) size 750x306
+ RenderBlock (anonymous multi-column) at (5,5) size 750x306
+ RenderText {#text} at (0,0) size 363x612
+ text run at (0,0) width 354: "Lorem ipsum dolor sit amet, consectetuer adipiscing elit."
+ text run at (0,18) width 351: "Nulla varius enim ac mi. Curabitur sollicitudin felis quis"
+ text run at (0,36) width 325: "lectus. Quisque adipiscing rhoncus sem. Proin nulla"
+ text run at (0,54) width 358: "purus, vulputate vel, varius ut, euismod et, nisi. Sed vitae"
+ text run at (0,72) width 343: "felis vel orci sagittis aliquam. Cras convallis adipiscing"
+ text run at (0,90) width 340: "sem. Nam nonummy enim. Nullam bibendum lobortis"
+ text run at (0,108) width 344: "neque. Vestibulum velit orci, tempus euismod, pretium"
+ text run at (0,126) width 343: "quis, interdum vitae, nulla. Phasellus eget ante et tortor"
+ text run at (0,144) width 343: "condimentum vestibulum. Suspendisse hendrerit quam"
+ text run at (0,162) width 362: "nec felis. Sed varius turpis vitae pede. Lorem ipsum dolor"
+ text run at (0,180) width 233: "sit amet, consectetuer adipiscing elit. "
+ text run at (233,180) width 121: "Lorem ipsum dolor"
+ text run at (0,198) width 363: "sit amet, consectetuer adipiscing elit. Nulla varius enim ac"
+ text run at (0,216) width 318: "mi. Curabitur sollicitudin felis quis lectus. Quisque"
+ text run at (0,234) width 356: "adipiscing rhoncus sem. Proin nulla purus, vulputate vel,"
+ text run at (0,252) width 354: "varius ut, euismod et, nisi. Sed vitae felis vel orci sagittis"
+ text run at (0,270) width 351: "aliquam. Cras convallis adipiscing sem. Nam nonummy"
+ text run at (0,288) width 358: "enim. Nullam bibendum lobortis neque. Vestibulum velit"
+ text run at (0,306) width 361: "orci, tempus euismod, pretium quis, interdum vitae, nulla."
+ text run at (0,324) width 339: "Phasellus eget ante et tortor condimentum vestibulum."
+ text run at (0,342) width 345: "Suspendisse hendrerit quam nec felis. Sed varius turpis"
+ text run at (0,360) width 331: "vitae pede. Lorem ipsum dolor sit amet, consectetuer"
+ text run at (0,378) width 95: "adipiscing elit. "
+ text run at (95,378) width 259: "Lorem ipsum dolor sit amet, consectetuer"
+ text run at (0,396) width 313: "adipiscing elit. Nulla varius enim ac mi. Curabitur"
+ text run at (0,414) width 352: "sollicitudin felis quis lectus. Quisque adipiscing rhoncus"
+ text run at (0,432) width 353: "sem. Proin nulla purus, vulputate vel, varius ut, euismod"
+ text run at (0,450) width 326: "et, nisi. Sed vitae felis vel orci sagittis aliquam. Cras"
+ text run at (0,468) width 350: "convallis adipiscing sem. Nam nonummy enim. Nullam"
+ text run at (0,486) width 349: "bibendum lobortis neque. Vestibulum velit orci, tempus"
+ text run at (0,504) width 343: "euismod, pretium quis, interdum vitae, nulla. Phasellus"
+ text run at (0,522) width 357: "eget ante et tortor condimentum vestibulum. Suspendisse"
+ text run at (0,540) width 336: "hendrerit quam nec felis. Sed varius turpis vitae pede."
+ text run at (0,558) width 354: "Lorem ipsum dolor sit amet, consectetuer adipiscing elit."
+ text run at (0,576) width 354: "Lorem ipsum dolor sit amet, consectetuer adipiscing elit."
+ text run at (0,594) width 154: "Nulla varius enim ac mi."
+layer at (13,773) size 750x28
+ RenderBlock (anonymous multi-column) at (5,330) size 750x28
+ RenderBlock {H2} at (0,0) size 367x28 [bgcolor=#EEEEEE]
+ RenderText {#text} at (0,0) size 276x28
+ text run at (0,0) width 276: "This is a spanning element."
+layer at (8,841) size 760x417
+ RenderBlock {DIV} at (0,833) size 760x417 [border: (5px solid #800000)]
+ RenderBlock (anonymous multi-column span) at (5,163) size 750x0
+layer at (13,862) size 750x126
+ RenderBlock (anonymous multi-column) at (5,21) size 750x126
+ RenderBlock {P} at (0,0) size 367x234
+ RenderText {#text} at (0,0) size 363x234
text run at (0,0) width 354: "Lorem ipsum dolor sit amet, consectetuer adipiscing elit."
text run at (0,18) width 351: "Nulla varius enim ac mi. Curabitur sollicitudin felis quis"
text run at (0,36) width 325: "lectus. Quisque adipiscing rhoncus sem. Proin nulla"
@@ -68,36 +121,14 @@ layer at (8,424) size 760x364
text run at (0,180) width 233: "sit amet, consectetuer adipiscing elit. "
text run at (233,180) width 121: "Lorem ipsum dolor"
text run at (0,198) width 363: "sit amet, consectetuer adipiscing elit. Nulla varius enim ac"
- text run at (0,216) width 318: "mi. Curabitur sollicitudin felis quis lectus. Quisque"
- text run at (0,234) width 356: "adipiscing rhoncus sem. Proin nulla purus, vulputate vel,"
- text run at (0,252) width 354: "varius ut, euismod et, nisi. Sed vitae felis vel orci sagittis"
- text run at (0,270) width 351: "aliquam. Cras convallis adipiscing sem. Nam nonummy"
- text run at (0,288) width 358: "enim. Nullam bibendum lobortis neque. Vestibulum velit"
- text run at (0,306) width 361: "orci, tempus euismod, pretium quis, interdum vitae, nulla."
- text run at (0,324) width 339: "Phasellus eget ante et tortor condimentum vestibulum."
- text run at (0,354) width 345: "Suspendisse hendrerit quam nec felis. Sed varius turpis"
- text run at (0,372) width 331: "vitae pede. Lorem ipsum dolor sit amet, consectetuer"
- text run at (0,390) width 95: "adipiscing elit. "
- text run at (95,390) width 259: "Lorem ipsum dolor sit amet, consectetuer"
- text run at (0,408) width 313: "adipiscing elit. Nulla varius enim ac mi. Curabitur"
- text run at (0,426) width 352: "sollicitudin felis quis lectus. Quisque adipiscing rhoncus"
- text run at (0,444) width 353: "sem. Proin nulla purus, vulputate vel, varius ut, euismod"
- text run at (0,462) width 326: "et, nisi. Sed vitae felis vel orci sagittis aliquam. Cras"
- text run at (0,480) width 350: "convallis adipiscing sem. Nam nonummy enim. Nullam"
- text run at (0,498) width 349: "bibendum lobortis neque. Vestibulum velit orci, tempus"
- text run at (0,516) width 343: "euismod, pretium quis, interdum vitae, nulla. Phasellus"
- text run at (0,534) width 357: "eget ante et tortor condimentum vestibulum. Suspendisse"
- text run at (0,552) width 336: "hendrerit quam nec felis. Sed varius turpis vitae pede."
- text run at (0,570) width 354: "Lorem ipsum dolor sit amet, consectetuer adipiscing elit."
- text run at (0,588) width 354: "Lorem ipsum dolor sit amet, consectetuer adipiscing elit."
- text run at (0,606) width 154: "Nulla varius enim ac mi."
- RenderBlock {H2} at (5,648) size 367x28 [bgcolor=#EEEEEE]
+ text run at (0,216) width 20: "mi."
+layer at (13,1007) size 750x230
+ RenderBlock (anonymous multi-column) at (5,166) size 750x230
+ RenderBlock {H2} at (0,0) size 367x28 [bgcolor=#EEEEEE]
RenderText {#text} at (0,0) size 276x28
text run at (0,0) width 276: "This is a spanning element."
-layer at (8,804) size 760x373
- RenderBlock {DIV} at (0,796) size 760x373 [border: (5px solid #800000)]
- RenderBlock {P} at (5,5) size 367x234
- RenderText {#text} at (0,0) size 363x234
+ RenderBlock {P} at (0,47) size 367x399
+ RenderText {#text} at (0,0) size 363x399
text run at (0,0) width 354: "Lorem ipsum dolor sit amet, consectetuer adipiscing elit."
text run at (0,18) width 351: "Nulla varius enim ac mi. Curabitur sollicitudin felis quis"
text run at (0,36) width 325: "lectus. Quisque adipiscing rhoncus sem. Proin nulla"
@@ -108,41 +139,25 @@ layer at (8,804) size 760x373
text run at (0,126) width 343: "quis, interdum vitae, nulla. Phasellus eget ante et tortor"
text run at (0,144) width 343: "condimentum vestibulum. Suspendisse hendrerit quam"
text run at (0,162) width 362: "nec felis. Sed varius turpis vitae pede. Lorem ipsum dolor"
- text run at (0,180) width 233: "sit amet, consectetuer adipiscing elit. "
- text run at (233,180) width 121: "Lorem ipsum dolor"
- text run at (0,198) width 363: "sit amet, consectetuer adipiscing elit. Nulla varius enim ac"
- text run at (0,216) width 20: "mi."
- RenderBlock {H2} at (5,258) size 367x28 [bgcolor=#EEEEEE]
- RenderText {#text} at (0,0) size 276x28
- text run at (0,0) width 276: "This is a spanning element."
- RenderBlock {P} at (5,305) size 367x405
- RenderText {#text} at (0,0) size 363x405
- text run at (0,0) width 354: "Lorem ipsum dolor sit amet, consectetuer adipiscing elit."
- text run at (0,18) width 351: "Nulla varius enim ac mi. Curabitur sollicitudin felis quis"
- text run at (0,36) width 325: "lectus. Quisque adipiscing rhoncus sem. Proin nulla"
- text run at (0,63) width 358: "purus, vulputate vel, varius ut, euismod et, nisi. Sed vitae"
- text run at (0,81) width 343: "felis vel orci sagittis aliquam. Cras convallis adipiscing"
- text run at (0,99) width 340: "sem. Nam nonummy enim. Nullam bibendum lobortis"
- text run at (0,117) width 344: "neque. Vestibulum velit orci, tempus euismod, pretium"
- text run at (0,135) width 343: "quis, interdum vitae, nulla. Phasellus eget ante et tortor"
- text run at (0,153) width 343: "condimentum vestibulum. Suspendisse hendrerit quam"
- text run at (0,171) width 362: "nec felis. Sed varius turpis vitae pede. Lorem ipsum dolor"
- text run at (0,189) width 233: "sit amet, consectetuer adipiscing elit. "
- text run at (233,189) width 121: "Lorem ipsum dolor"
- text run at (0,207) width 363: "sit amet, consectetuer adipiscing elit. Nulla varius enim ac"
- text run at (0,225) width 318: "mi. Curabitur sollicitudin felis quis lectus. Quisque"
- text run at (0,243) width 356: "adipiscing rhoncus sem. Proin nulla purus, vulputate vel,"
- text run at (0,261) width 354: "varius ut, euismod et, nisi. Sed vitae felis vel orci sagittis"
- text run at (0,279) width 351: "aliquam. Cras convallis adipiscing sem. Nam nonummy"
- text run at (0,297) width 358: "enim. Nullam bibendum lobortis neque. Vestibulum velit"
- text run at (0,315) width 361: "orci, tempus euismod, pretium quis, interdum vitae, nulla."
- text run at (0,333) width 339: "Phasellus eget ante et tortor condimentum vestibulum."
- text run at (0,351) width 345: "Suspendisse hendrerit quam nec felis. Sed varius turpis"
- text run at (0,369) width 331: "vitae pede. Lorem ipsum dolor sit amet, consectetuer"
- text run at (0,387) width 91: "adipiscing elit."
-layer at (8,1193) size 760x382
- RenderBlock {DIV} at (0,1185) size 760x382 [border: (5px solid #800000)]
- RenderBlock (anonymous) at (5,5) size 367x234
+ text run at (0,183) width 233: "sit amet, consectetuer adipiscing elit. "
+ text run at (233,183) width 121: "Lorem ipsum dolor"
+ text run at (0,201) width 363: "sit amet, consectetuer adipiscing elit. Nulla varius enim ac"
+ text run at (0,219) width 318: "mi. Curabitur sollicitudin felis quis lectus. Quisque"
+ text run at (0,237) width 356: "adipiscing rhoncus sem. Proin nulla purus, vulputate vel,"
+ text run at (0,255) width 354: "varius ut, euismod et, nisi. Sed vitae felis vel orci sagittis"
+ text run at (0,273) width 351: "aliquam. Cras convallis adipiscing sem. Nam nonummy"
+ text run at (0,291) width 358: "enim. Nullam bibendum lobortis neque. Vestibulum velit"
+ text run at (0,309) width 361: "orci, tempus euismod, pretium quis, interdum vitae, nulla."
+ text run at (0,327) width 339: "Phasellus eget ante et tortor condimentum vestibulum."
+ text run at (0,345) width 345: "Suspendisse hendrerit quam nec felis. Sed varius turpis"
+ text run at (0,363) width 331: "vitae pede. Lorem ipsum dolor sit amet, consectetuer"
+ text run at (0,381) width 91: "adipiscing elit."
+layer at (8,1274) size 760x410
+ RenderBlock {DIV} at (0,1266) size 760x410 [border: (5px solid #800000)]
+ RenderBlock (anonymous multi-column span) at (5,131) size 750x0
+layer at (13,1279) size 750x126
+ RenderBlock (anonymous multi-column) at (5,5) size 750x126
+ RenderBlock (anonymous) at (0,0) size 367x234
RenderText {#text} at (0,0) size 363x234
text run at (0,0) width 354: "Lorem ipsum dolor sit amet, consectetuer adipiscing elit."
text run at (0,18) width 351: "Nulla varius enim ac mi. Curabitur sollicitudin felis quis"
@@ -158,14 +173,16 @@ layer at (8,1193) size 760x382
text run at (233,180) width 121: "Lorem ipsum dolor"
text run at (0,198) width 363: "sit amet, consectetuer adipiscing elit. Nulla varius enim ac"
text run at (0,216) width 20: "mi."
- RenderBlock {H2} at (5,258) size 367x28 [bgcolor=#EEEEEE]
+layer at (13,1424) size 750x239
+ RenderBlock (anonymous multi-column) at (5,150) size 750x239
+ RenderBlock {H2} at (0,0) size 367x28 [bgcolor=#EEEEEE]
RenderText {#text} at (0,0) size 276x28
text run at (0,0) width 276: "This is a spanning element."
- RenderBlock (anonymous) at (5,305) size 367x198
+ RenderBlock (anonymous) at (0,47) size 367x210
RenderInline {SPAN} at (0,0) size 42x18
RenderText {#text} at (0,0) size 42x18
text run at (0,0) width 42: "Lorem"
- RenderText {#text} at (42,0) size 362x198
+ RenderText {#text} at (42,0) size 362x210
text run at (42,0) width 312: " ipsum dolor sit amet, consectetuer adipiscing elit."
text run at (0,18) width 351: "Nulla varius enim ac mi. Curabitur sollicitudin felis quis"
text run at (0,36) width 325: "lectus. Quisque adipiscing rhoncus sem. Proin nulla"
@@ -176,8 +193,8 @@ layer at (8,1193) size 760x382
text run at (0,126) width 343: "quis, interdum vitae, nulla. Phasellus eget ante et tortor"
text run at (0,144) width 343: "condimentum vestibulum. Suspendisse hendrerit quam"
text run at (0,162) width 362: "nec felis. Sed varius turpis vitae pede. Lorem ipsum dolor"
- text run at (0,180) width 229: "sit amet, consectetuer adipiscing elit."
- RenderBlock {P} at (5,519) size 367x198
+ text run at (0,192) width 229: "sit amet, consectetuer adipiscing elit."
+ RenderBlock {P} at (0,273) size 367x198
RenderText {#text} at (0,0) size 362x198
text run at (0,0) width 354: "Lorem ipsum dolor sit amet, consectetuer adipiscing elit."
text run at (0,18) width 351: "Nulla varius enim ac mi. Curabitur sollicitudin felis quis"
@@ -190,9 +207,12 @@ layer at (8,1193) size 760x382
text run at (0,144) width 343: "condimentum vestibulum. Suspendisse hendrerit quam"
text run at (0,162) width 362: "nec felis. Sed varius turpis vitae pede. Lorem ipsum dolor"
text run at (0,180) width 229: "sit amet, consectetuer adipiscing elit."
-layer at (8,1591) size 760x373
- RenderBlock {DIV} at (0,1583) size 760x373 [border: (5px solid #800000)]
- RenderBlock (anonymous) at (5,5) size 367x198
+layer at (8,1700) size 760x392
+ RenderBlock {DIV} at (0,1692) size 760x392 [border: (5px solid #800000)]
+ RenderBlock (anonymous multi-column span) at (5,221) size 750x0
+layer at (13,1705) size 750x216
+ RenderBlock (anonymous multi-column) at (5,5) size 750x216
+ RenderBlock (anonymous) at (0,0) size 367x198
RenderInline {SPAN} at (0,0) size 362x198
RenderText {#text} at (0,0) size 362x198
text run at (0,0) width 354: "Lorem ipsum dolor sit amet, consectetuer adipiscing elit."
@@ -206,16 +226,16 @@ layer at (8,1591) size 760x373
text run at (0,144) width 343: "condimentum vestibulum. Suspendisse hendrerit quam"
text run at (0,162) width 362: "nec felis. Sed varius turpis vitae pede. Lorem ipsum dolor"
text run at (0,180) width 229: "sit amet, consectetuer adipiscing elit."
- RenderBlock (anonymous) at (5,203) size 367x36
+ RenderBlock (anonymous) at (0,198) size 367x36
RenderBlock {SPAN} at (0,0) size 367x36
RenderText {#text} at (0,0) size 354x36
text run at (0,0) width 354: "Lorem ipsum dolor sit amet, consectetuer adipiscing elit."
text run at (0,18) width 154: "Nulla varius enim ac mi."
- RenderBlock (anonymous) at (5,239) size 367x201
+ RenderBlock (anonymous) at (0,234) size 367x198
RenderInline {SPAN} at (0,0) size 42x18
RenderText {#text} at (0,0) size 42x18
text run at (0,0) width 42: "Lorem"
- RenderText {#text} at (42,0) size 362x201
+ RenderText {#text} at (42,0) size 362x198
text run at (42,0) width 312: " ipsum dolor sit amet, consectetuer adipiscing elit."
text run at (0,18) width 351: "Nulla varius enim ac mi. Curabitur sollicitudin felis quis"
text run at (0,36) width 325: "lectus. Quisque adipiscing rhoncus sem. Proin nulla"
@@ -223,29 +243,34 @@ layer at (8,1591) size 760x373
text run at (0,72) width 343: "felis vel orci sagittis aliquam. Cras convallis adipiscing"
text run at (0,90) width 340: "sem. Nam nonummy enim. Nullam bibendum lobortis"
text run at (0,108) width 344: "neque. Vestibulum velit orci, tempus euismod, pretium"
- text run at (0,129) width 343: "quis, interdum vitae, nulla. Phasellus eget ante et tortor"
- text run at (0,147) width 343: "condimentum vestibulum. Suspendisse hendrerit quam"
- text run at (0,165) width 362: "nec felis. Sed varius turpis vitae pede. Lorem ipsum dolor"
- text run at (0,183) width 229: "sit amet, consectetuer adipiscing elit."
- RenderBlock {H2} at (5,459) size 367x28 [bgcolor=#EEEEEE]
+ text run at (0,126) width 343: "quis, interdum vitae, nulla. Phasellus eget ante et tortor"
+ text run at (0,144) width 343: "condimentum vestibulum. Suspendisse hendrerit quam"
+ text run at (0,162) width 362: "nec felis. Sed varius turpis vitae pede. Lorem ipsum dolor"
+ text run at (0,180) width 229: "sit amet, consectetuer adipiscing elit."
+layer at (13,1940) size 750x131
+ RenderBlock (anonymous multi-column) at (5,240) size 750x131
+ RenderBlock {H2} at (0,0) size 367x28 [bgcolor=#EEEEEE]
RenderText {#text} at (0,0) size 276x28
text run at (0,0) width 276: "This is a spanning element."
- RenderBlock {P} at (5,506) size 367x198
- RenderText {#text} at (0,0) size 362x198
+ RenderBlock {P} at (0,47) size 367x210
+ RenderText {#text} at (0,0) size 362x210
text run at (0,0) width 354: "Lorem ipsum dolor sit amet, consectetuer adipiscing elit."
text run at (0,18) width 351: "Nulla varius enim ac mi. Curabitur sollicitudin felis quis"
text run at (0,36) width 325: "lectus. Quisque adipiscing rhoncus sem. Proin nulla"
text run at (0,54) width 358: "purus, vulputate vel, varius ut, euismod et, nisi. Sed vitae"
- text run at (0,72) width 343: "felis vel orci sagittis aliquam. Cras convallis adipiscing"
- text run at (0,90) width 340: "sem. Nam nonummy enim. Nullam bibendum lobortis"
- text run at (0,108) width 344: "neque. Vestibulum velit orci, tempus euismod, pretium"
- text run at (0,126) width 343: "quis, interdum vitae, nulla. Phasellus eget ante et tortor"
- text run at (0,144) width 343: "condimentum vestibulum. Suspendisse hendrerit quam"
- text run at (0,162) width 362: "nec felis. Sed varius turpis vitae pede. Lorem ipsum dolor"
- text run at (0,180) width 229: "sit amet, consectetuer adipiscing elit."
-layer at (8,1980) size 760x384
- RenderBlock {DIV} at (0,1972) size 760x384 [border: (5px solid #800000)]
- RenderBlock {P} at (5,5) size 367x198
+ text run at (0,84) width 343: "felis vel orci sagittis aliquam. Cras convallis adipiscing"
+ text run at (0,102) width 340: "sem. Nam nonummy enim. Nullam bibendum lobortis"
+ text run at (0,120) width 344: "neque. Vestibulum velit orci, tempus euismod, pretium"
+ text run at (0,138) width 343: "quis, interdum vitae, nulla. Phasellus eget ante et tortor"
+ text run at (0,156) width 343: "condimentum vestibulum. Suspendisse hendrerit quam"
+ text run at (0,174) width 362: "nec felis. Sed varius turpis vitae pede. Lorem ipsum dolor"
+ text run at (0,192) width 229: "sit amet, consectetuer adipiscing elit."
+layer at (8,2108) size 760x419
+ RenderBlock {DIV} at (0,2100) size 760x419 [border: (5px solid #800000)]
+ RenderBlock (anonymous multi-column span) at (5,271) size 750x0
+layer at (13,2129) size 750x234
+ RenderBlock (anonymous multi-column) at (5,21) size 750x234
+ RenderBlock {P} at (0,0) size 367x198
RenderText {#text} at (0,0) size 362x198
text run at (0,0) width 354: "Lorem ipsum dolor sit amet, consectetuer adipiscing elit."
text run at (0,18) width 351: "Nulla varius enim ac mi. Curabitur sollicitudin felis quis"
@@ -258,11 +283,11 @@ layer at (8,1980) size 760x384
text run at (0,144) width 343: "condimentum vestibulum. Suspendisse hendrerit quam"
text run at (0,162) width 362: "nec felis. Sed varius turpis vitae pede. Lorem ipsum dolor"
text run at (0,180) width 229: "sit amet, consectetuer adipiscing elit."
- RenderBlock {P} at (5,219) size 367x36
- RenderText {#text} at (0,0) size 354x36
+ RenderBlock {P} at (0,214) size 367x38
+ RenderText {#text} at (0,0) size 354x38
text run at (0,0) width 354: "Lorem ipsum dolor sit amet, consectetuer adipiscing elit."
- text run at (0,18) width 154: "Nulla varius enim ac mi."
- RenderBlock {P} at (5,271) size 367x198
+ text run at (0,20) width 154: "Nulla varius enim ac mi."
+ RenderBlock {P} at (0,268) size 367x198
RenderText {#text} at (0,0) size 362x198
text run at (0,0) width 354: "Lorem ipsum dolor sit amet, consectetuer adipiscing elit."
text run at (0,18) width 351: "Nulla varius enim ac mi. Curabitur sollicitudin felis quis"
@@ -275,28 +300,30 @@ layer at (8,1980) size 760x384
text run at (0,144) width 343: "condimentum vestibulum. Suspendisse hendrerit quam"
text run at (0,162) width 362: "nec felis. Sed varius turpis vitae pede. Lorem ipsum dolor"
text run at (0,180) width 229: "sit amet, consectetuer adipiscing elit."
- RenderBlock {H2} at (5,488) size 367x28 [bgcolor=#EEEEEE]
+layer at (13,2382) size 750x140
+ RenderBlock (anonymous multi-column) at (5,274) size 750x140
+ RenderBlock {H2} at (0,0) size 367x28 [bgcolor=#EEEEEE]
RenderText {#text} at (0,0) size 276x28
text run at (0,0) width 276: "This is a spanning element."
- RenderBlock (anonymous) at (5,535) size 367x18
+ RenderBlock (anonymous) at (0,47) size 367x18
RenderInline {SPAN} at (0,0) size 354x18
RenderText {#text} at (0,0) size 354x18
text run at (0,0) width 354: "Lorem ipsum dolor sit amet, consectetuer adipiscing elit."
- RenderBlock (anonymous) at (5,553) size 367x18
+ RenderBlock (anonymous) at (0,65) size 367x18
RenderBlock {SPAN} at (0,0) size 367x18
RenderText {#text} at (0,0) size 154x18
text run at (0,0) width 154: "Nulla varius enim ac mi."
- RenderBlock (anonymous) at (5,571) size 367x180
- RenderInline {SPAN} at (0,0) size 362x180
- RenderText {#text} at (0,0) size 362x180
+ RenderBlock (anonymous) at (0,83) size 367x183
+ RenderInline {SPAN} at (0,0) size 362x183
+ RenderText {#text} at (0,0) size 362x183
text run at (0,0) width 362: "Curabitur sollicitudin felis quis lectus. Quisque adipiscing"
text run at (0,18) width 350: "rhoncus sem. Proin nulla purus, vulputate vel, varius ut,"
text run at (0,36) width 350: "euismod et, nisi. Sed vitae felis vel orci sagittis aliquam."
- text run at (0,54) width 332: "Cras convallis adipiscing sem. Nam nonummy enim."
- text run at (0,72) width 351: "Nullam bibendum lobortis neque. Vestibulum velit orci,"
- text run at (0,90) width 329: "tempus euismod, pretium quis, interdum vitae, nulla."
- text run at (0,108) width 339: "Phasellus eget ante et tortor condimentum vestibulum."
- text run at (0,126) width 345: "Suspendisse hendrerit quam nec felis. Sed varius turpis"
- text run at (0,144) width 331: "vitae pede. Lorem ipsum dolor sit amet, consectetuer"
- text run at (0,162) width 91: "adipiscing elit."
+ text run at (0,57) width 332: "Cras convallis adipiscing sem. Nam nonummy enim."
+ text run at (0,75) width 351: "Nullam bibendum lobortis neque. Vestibulum velit orci,"
+ text run at (0,93) width 329: "tempus euismod, pretium quis, interdum vitae, nulla."
+ text run at (0,111) width 339: "Phasellus eget ante et tortor condimentum vestibulum."
+ text run at (0,129) width 345: "Suspendisse hendrerit quam nec felis. Sed varius turpis"
+ text run at (0,147) width 331: "vitae pede. Lorem ipsum dolor sit amet, consectetuer"
+ text run at (0,165) width 91: "adipiscing elit."
RenderText {#text} at (0,0) size 0x0
diff --git a/LayoutTests/platform/mac/fast/multicol/span/span-as-immediate-columns-child-removal-expected.checksum b/LayoutTests/platform/mac/fast/multicol/span/span-as-immediate-columns-child-removal-expected.checksum
index cce55c7..8e7551d 100644
--- a/LayoutTests/platform/mac/fast/multicol/span/span-as-immediate-columns-child-removal-expected.checksum
+++ b/LayoutTests/platform/mac/fast/multicol/span/span-as-immediate-columns-child-removal-expected.checksum
@@ -1 +1 @@
-b88f5f4ebcb4d2dc3cffae4b6eebdf13
\ No newline at end of file
+a5e116ba9abcf162d721c26e2b3b0e83
\ No newline at end of file
diff --git a/LayoutTests/platform/mac/fast/multicol/span/span-as-immediate-columns-child-removal-expected.png b/LayoutTests/platform/mac/fast/multicol/span/span-as-immediate-columns-child-removal-expected.png
index db8516d..d444e8f 100644
Binary files a/LayoutTests/platform/mac/fast/multicol/span/span-as-immediate-columns-child-removal-expected.png and b/LayoutTests/platform/mac/fast/multicol/span/span-as-immediate-columns-child-removal-expected.png differ
diff --git a/LayoutTests/platform/mac/fast/multicol/span/span-as-immediate-columns-child-removal-expected.txt b/LayoutTests/platform/mac/fast/multicol/span/span-as-immediate-columns-child-removal-expected.txt
index 83f0aed..4e36a42 100644
--- a/LayoutTests/platform/mac/fast/multicol/span/span-as-immediate-columns-child-removal-expected.txt
+++ b/LayoutTests/platform/mac/fast/multicol/span/span-as-immediate-columns-child-removal-expected.txt
@@ -1,89 +1,98 @@
-layer at (0,0) size 785x2164
+layer at (0,0) size 785x2226
RenderView at (0,0) size 785x600
-layer at (0,0) size 785x2164
- RenderBlock {HTML} at (0,0) size 785x2164
- RenderBody {BODY} at (8,16) size 769x2132
+layer at (0,0) size 785x2226
+ RenderBlock {HTML} at (0,0) size 785x2226
+ RenderBody {BODY} at (8,16) size 769x2194
layer at (8,16) size 760x316
RenderBlock {DIV} at (0,0) size 760x316 [border: (5px solid #800000)]
- RenderText {#text} at (5,5) size 363x612
- text run at (5,5) width 354: "Lorem ipsum dolor sit amet, consectetuer adipiscing elit."
- text run at (5,23) width 351: "Nulla varius enim ac mi. Curabitur sollicitudin felis quis"
- text run at (5,41) width 325: "lectus. Quisque adipiscing rhoncus sem. Proin nulla"
- text run at (5,59) width 358: "purus, vulputate vel, varius ut, euismod et, nisi. Sed vitae"
- text run at (5,77) width 343: "felis vel orci sagittis aliquam. Cras convallis adipiscing"
- text run at (5,95) width 340: "sem. Nam nonummy enim. Nullam bibendum lobortis"
- text run at (5,113) width 344: "neque. Vestibulum velit orci, tempus euismod, pretium"
- text run at (5,131) width 343: "quis, interdum vitae, nulla. Phasellus eget ante et tortor"
- text run at (5,149) width 343: "condimentum vestibulum. Suspendisse hendrerit quam"
- text run at (5,167) width 362: "nec felis. Sed varius turpis vitae pede. Lorem ipsum dolor"
- text run at (5,185) width 233: "sit amet, consectetuer adipiscing elit. "
- text run at (238,185) width 121: "Lorem ipsum dolor"
- text run at (5,203) width 363: "sit amet, consectetuer adipiscing elit. Nulla varius enim ac"
- text run at (5,221) width 318: "mi. Curabitur sollicitudin felis quis lectus. Quisque"
- text run at (5,239) width 356: "adipiscing rhoncus sem. Proin nulla purus, vulputate vel,"
- text run at (5,257) width 354: "varius ut, euismod et, nisi. Sed vitae felis vel orci sagittis"
- text run at (5,275) width 351: "aliquam. Cras convallis adipiscing sem. Nam nonummy"
- text run at (5,293) width 358: "enim. Nullam bibendum lobortis neque. Vestibulum velit"
- text run at (5,311) width 361: "orci, tempus euismod, pretium quis, interdum vitae, nulla."
- text run at (5,329) width 339: "Phasellus eget ante et tortor condimentum vestibulum."
- text run at (5,347) width 345: "Suspendisse hendrerit quam nec felis. Sed varius turpis"
- text run at (5,365) width 331: "vitae pede. Lorem ipsum dolor sit amet, consectetuer"
- text run at (5,383) width 95: "adipiscing elit. "
- text run at (100,383) width 259: "Lorem ipsum dolor sit amet, consectetuer"
- text run at (5,401) width 313: "adipiscing elit. Nulla varius enim ac mi. Curabitur"
- text run at (5,419) width 352: "sollicitudin felis quis lectus. Quisque adipiscing rhoncus"
- text run at (5,437) width 353: "sem. Proin nulla purus, vulputate vel, varius ut, euismod"
- text run at (5,455) width 326: "et, nisi. Sed vitae felis vel orci sagittis aliquam. Cras"
- text run at (5,473) width 350: "convallis adipiscing sem. Nam nonummy enim. Nullam"
- text run at (5,491) width 349: "bibendum lobortis neque. Vestibulum velit orci, tempus"
- text run at (5,509) width 343: "euismod, pretium quis, interdum vitae, nulla. Phasellus"
- text run at (5,527) width 357: "eget ante et tortor condimentum vestibulum. Suspendisse"
- text run at (5,545) width 336: "hendrerit quam nec felis. Sed varius turpis vitae pede."
- text run at (5,563) width 354: "Lorem ipsum dolor sit amet, consectetuer adipiscing elit."
- text run at (5,581) width 354: "Lorem ipsum dolor sit amet, consectetuer adipiscing elit."
- text run at (5,599) width 154: "Nulla varius enim ac mi."
+ RenderBlock (anonymous multi-column span) at (5,5) size 750x0
+layer at (13,21) size 750x306
+ RenderBlock (anonymous multi-column) at (5,5) size 750x306
+ RenderText {#text} at (0,0) size 363x612
+ text run at (0,0) width 354: "Lorem ipsum dolor sit amet, consectetuer adipiscing elit."
+ text run at (0,18) width 351: "Nulla varius enim ac mi. Curabitur sollicitudin felis quis"
+ text run at (0,36) width 325: "lectus. Quisque adipiscing rhoncus sem. Proin nulla"
+ text run at (0,54) width 358: "purus, vulputate vel, varius ut, euismod et, nisi. Sed vitae"
+ text run at (0,72) width 343: "felis vel orci sagittis aliquam. Cras convallis adipiscing"
+ text run at (0,90) width 340: "sem. Nam nonummy enim. Nullam bibendum lobortis"
+ text run at (0,108) width 344: "neque. Vestibulum velit orci, tempus euismod, pretium"
+ text run at (0,126) width 343: "quis, interdum vitae, nulla. Phasellus eget ante et tortor"
+ text run at (0,144) width 343: "condimentum vestibulum. Suspendisse hendrerit quam"
+ text run at (0,162) width 362: "nec felis. Sed varius turpis vitae pede. Lorem ipsum dolor"
+ text run at (0,180) width 233: "sit amet, consectetuer adipiscing elit. "
+ text run at (233,180) width 121: "Lorem ipsum dolor"
+ text run at (0,198) width 363: "sit amet, consectetuer adipiscing elit. Nulla varius enim ac"
+ text run at (0,216) width 318: "mi. Curabitur sollicitudin felis quis lectus. Quisque"
+ text run at (0,234) width 356: "adipiscing rhoncus sem. Proin nulla purus, vulputate vel,"
+ text run at (0,252) width 354: "varius ut, euismod et, nisi. Sed vitae felis vel orci sagittis"
+ text run at (0,270) width 351: "aliquam. Cras convallis adipiscing sem. Nam nonummy"
+ text run at (0,288) width 358: "enim. Nullam bibendum lobortis neque. Vestibulum velit"
+ text run at (0,306) width 361: "orci, tempus euismod, pretium quis, interdum vitae, nulla."
+ text run at (0,324) width 339: "Phasellus eget ante et tortor condimentum vestibulum."
+ text run at (0,342) width 345: "Suspendisse hendrerit quam nec felis. Sed varius turpis"
+ text run at (0,360) width 331: "vitae pede. Lorem ipsum dolor sit amet, consectetuer"
+ text run at (0,378) width 95: "adipiscing elit. "
+ text run at (95,378) width 259: "Lorem ipsum dolor sit amet, consectetuer"
+ text run at (0,396) width 313: "adipiscing elit. Nulla varius enim ac mi. Curabitur"
+ text run at (0,414) width 352: "sollicitudin felis quis lectus. Quisque adipiscing rhoncus"
+ text run at (0,432) width 353: "sem. Proin nulla purus, vulputate vel, varius ut, euismod"
+ text run at (0,450) width 326: "et, nisi. Sed vitae felis vel orci sagittis aliquam. Cras"
+ text run at (0,468) width 350: "convallis adipiscing sem. Nam nonummy enim. Nullam"
+ text run at (0,486) width 349: "bibendum lobortis neque. Vestibulum velit orci, tempus"
+ text run at (0,504) width 343: "euismod, pretium quis, interdum vitae, nulla. Phasellus"
+ text run at (0,522) width 357: "eget ante et tortor condimentum vestibulum. Suspendisse"
+ text run at (0,540) width 336: "hendrerit quam nec felis. Sed varius turpis vitae pede."
+ text run at (0,558) width 354: "Lorem ipsum dolor sit amet, consectetuer adipiscing elit."
+ text run at (0,576) width 354: "Lorem ipsum dolor sit amet, consectetuer adipiscing elit."
+ text run at (0,594) width 154: "Nulla varius enim ac mi."
layer at (8,348) size 760x316
RenderBlock {DIV} at (0,332) size 760x316 [border: (5px solid #800000)]
- RenderText {#text} at (5,5) size 363x612
- text run at (5,5) width 354: "Lorem ipsum dolor sit amet, consectetuer adipiscing elit."
- text run at (5,23) width 351: "Nulla varius enim ac mi. Curabitur sollicitudin felis quis"
- text run at (5,41) width 325: "lectus. Quisque adipiscing rhoncus sem. Proin nulla"
- text run at (5,59) width 358: "purus, vulputate vel, varius ut, euismod et, nisi. Sed vitae"
- text run at (5,77) width 343: "felis vel orci sagittis aliquam. Cras convallis adipiscing"
- text run at (5,95) width 340: "sem. Nam nonummy enim. Nullam bibendum lobortis"
- text run at (5,113) width 344: "neque. Vestibulum velit orci, tempus euismod, pretium"
- text run at (5,131) width 343: "quis, interdum vitae, nulla. Phasellus eget ante et tortor"
- text run at (5,149) width 343: "condimentum vestibulum. Suspendisse hendrerit quam"
- text run at (5,167) width 362: "nec felis. Sed varius turpis vitae pede. Lorem ipsum dolor"
- text run at (5,185) width 233: "sit amet, consectetuer adipiscing elit. "
- text run at (238,185) width 121: "Lorem ipsum dolor"
- text run at (5,203) width 363: "sit amet, consectetuer adipiscing elit. Nulla varius enim ac"
- text run at (5,221) width 318: "mi. Curabitur sollicitudin felis quis lectus. Quisque"
- text run at (5,239) width 356: "adipiscing rhoncus sem. Proin nulla purus, vulputate vel,"
- text run at (5,257) width 354: "varius ut, euismod et, nisi. Sed vitae felis vel orci sagittis"
- text run at (5,275) width 351: "aliquam. Cras convallis adipiscing sem. Nam nonummy"
- text run at (5,293) width 358: "enim. Nullam bibendum lobortis neque. Vestibulum velit"
- text run at (5,311) width 361: "orci, tempus euismod, pretium quis, interdum vitae, nulla."
- text run at (5,329) width 339: "Phasellus eget ante et tortor condimentum vestibulum."
- text run at (5,347) width 345: "Suspendisse hendrerit quam nec felis. Sed varius turpis"
- text run at (5,365) width 331: "vitae pede. Lorem ipsum dolor sit amet, consectetuer"
- text run at (5,383) width 95: "adipiscing elit. "
- text run at (100,383) width 259: "Lorem ipsum dolor sit amet, consectetuer"
- text run at (5,401) width 313: "adipiscing elit. Nulla varius enim ac mi. Curabitur"
- text run at (5,419) width 352: "sollicitudin felis quis lectus. Quisque adipiscing rhoncus"
- text run at (5,437) width 353: "sem. Proin nulla purus, vulputate vel, varius ut, euismod"
- text run at (5,455) width 326: "et, nisi. Sed vitae felis vel orci sagittis aliquam. Cras"
- text run at (5,473) width 350: "convallis adipiscing sem. Nam nonummy enim. Nullam"
- text run at (5,491) width 349: "bibendum lobortis neque. Vestibulum velit orci, tempus"
- text run at (5,509) width 343: "euismod, pretium quis, interdum vitae, nulla. Phasellus"
- text run at (5,527) width 357: "eget ante et tortor condimentum vestibulum. Suspendisse"
- text run at (5,545) width 336: "hendrerit quam nec felis. Sed varius turpis vitae pede."
- text run at (5,563) width 354: "Lorem ipsum dolor sit amet, consectetuer adipiscing elit."
- text run at (5,581) width 354: "Lorem ipsum dolor sit amet, consectetuer adipiscing elit."
- text run at (5,599) width 154: "Nulla varius enim ac mi."
-layer at (8,680) size 760x350
- RenderBlock {DIV} at (0,664) size 760x350 [border: (5px solid #800000)]
- RenderBlock {P} at (5,5) size 367x234
+ RenderBlock (anonymous multi-column span) at (5,311) size 750x0
+layer at (13,353) size 750x306
+ RenderBlock (anonymous multi-column) at (5,5) size 750x306
+ RenderText {#text} at (0,0) size 363x612
+ text run at (0,0) width 354: "Lorem ipsum dolor sit amet, consectetuer adipiscing elit."
+ text run at (0,18) width 351: "Nulla varius enim ac mi. Curabitur sollicitudin felis quis"
+ text run at (0,36) width 325: "lectus. Quisque adipiscing rhoncus sem. Proin nulla"
+ text run at (0,54) width 358: "purus, vulputate vel, varius ut, euismod et, nisi. Sed vitae"
+ text run at (0,72) width 343: "felis vel orci sagittis aliquam. Cras convallis adipiscing"
+ text run at (0,90) width 340: "sem. Nam nonummy enim. Nullam bibendum lobortis"
+ text run at (0,108) width 344: "neque. Vestibulum velit orci, tempus euismod, pretium"
+ text run at (0,126) width 343: "quis, interdum vitae, nulla. Phasellus eget ante et tortor"
+ text run at (0,144) width 343: "condimentum vestibulum. Suspendisse hendrerit quam"
+ text run at (0,162) width 362: "nec felis. Sed varius turpis vitae pede. Lorem ipsum dolor"
+ text run at (0,180) width 233: "sit amet, consectetuer adipiscing elit. "
+ text run at (233,180) width 121: "Lorem ipsum dolor"
+ text run at (0,198) width 363: "sit amet, consectetuer adipiscing elit. Nulla varius enim ac"
+ text run at (0,216) width 318: "mi. Curabitur sollicitudin felis quis lectus. Quisque"
+ text run at (0,234) width 356: "adipiscing rhoncus sem. Proin nulla purus, vulputate vel,"
+ text run at (0,252) width 354: "varius ut, euismod et, nisi. Sed vitae felis vel orci sagittis"
+ text run at (0,270) width 351: "aliquam. Cras convallis adipiscing sem. Nam nonummy"
+ text run at (0,288) width 358: "enim. Nullam bibendum lobortis neque. Vestibulum velit"
+ text run at (0,306) width 361: "orci, tempus euismod, pretium quis, interdum vitae, nulla."
+ text run at (0,324) width 339: "Phasellus eget ante et tortor condimentum vestibulum."
+ text run at (0,342) width 345: "Suspendisse hendrerit quam nec felis. Sed varius turpis"
+ text run at (0,360) width 331: "vitae pede. Lorem ipsum dolor sit amet, consectetuer"
+ text run at (0,378) width 95: "adipiscing elit. "
+ text run at (95,378) width 259: "Lorem ipsum dolor sit amet, consectetuer"
+ text run at (0,396) width 313: "adipiscing elit. Nulla varius enim ac mi. Curabitur"
+ text run at (0,414) width 352: "sollicitudin felis quis lectus. Quisque adipiscing rhoncus"
+ text run at (0,432) width 353: "sem. Proin nulla purus, vulputate vel, varius ut, euismod"
+ text run at (0,450) width 326: "et, nisi. Sed vitae felis vel orci sagittis aliquam. Cras"
+ text run at (0,468) width 350: "convallis adipiscing sem. Nam nonummy enim. Nullam"
+ text run at (0,486) width 349: "bibendum lobortis neque. Vestibulum velit orci, tempus"
+ text run at (0,504) width 343: "euismod, pretium quis, interdum vitae, nulla. Phasellus"
+ text run at (0,522) width 357: "eget ante et tortor condimentum vestibulum. Suspendisse"
+ text run at (0,540) width 336: "hendrerit quam nec felis. Sed varius turpis vitae pede."
+ text run at (0,558) width 354: "Lorem ipsum dolor sit amet, consectetuer adipiscing elit."
+ text run at (0,576) width 354: "Lorem ipsum dolor sit amet, consectetuer adipiscing elit."
+ text run at (0,594) width 154: "Nulla varius enim ac mi."
+layer at (8,680) size 760x382
+ RenderBlock {DIV} at (0,664) size 760x382 [border: (5px solid #800000)]
+ RenderBlock (anonymous multi-column span) at (5,163) size 750x0
+layer at (13,701) size 750x126
+ RenderBlock (anonymous multi-column) at (5,21) size 750x126
+ RenderBlock {P} at (0,0) size 367x234
RenderText {#text} at (0,0) size 363x234
text run at (0,0) width 354: "Lorem ipsum dolor sit amet, consectetuer adipiscing elit."
text run at (0,18) width 351: "Nulla varius enim ac mi. Curabitur sollicitudin felis quis"
@@ -99,7 +108,9 @@ layer at (8,680) size 760x350
text run at (233,180) width 121: "Lorem ipsum dolor"
text run at (0,198) width 363: "sit amet, consectetuer adipiscing elit. Nulla varius enim ac"
text run at (0,216) width 20: "mi."
- RenderBlock {P} at (5,255) size 367x396
+layer at (13,843) size 750x198
+ RenderBlock (anonymous multi-column) at (5,163) size 750x198
+ RenderBlock {P} at (0,0) size 367x396
RenderText {#text} at (0,0) size 363x396
text run at (0,0) width 354: "Lorem ipsum dolor sit amet, consectetuer adipiscing elit."
text run at (0,18) width 351: "Nulla varius enim ac mi. Curabitur sollicitudin felis quis"
@@ -124,9 +135,12 @@ layer at (8,680) size 760x350
text run at (0,342) width 345: "Suspendisse hendrerit quam nec felis. Sed varius turpis"
text run at (0,360) width 331: "vitae pede. Lorem ipsum dolor sit amet, consectetuer"
text run at (0,378) width 91: "adipiscing elit."
-layer at (8,1046) size 760x350
- RenderBlock {DIV} at (0,1030) size 760x350 [border: (5px solid #800000)]
- RenderBlock (anonymous) at (5,5) size 367x234
+layer at (8,1078) size 760x350
+ RenderBlock {DIV} at (0,1062) size 760x350 [border: (5px solid #800000)]
+ RenderBlock (anonymous multi-column span) at (5,131) size 750x0
+layer at (13,1083) size 750x126
+ RenderBlock (anonymous multi-column) at (5,5) size 750x126
+ RenderBlock (anonymous) at (0,0) size 367x234
RenderText {#text} at (0,0) size 363x234
text run at (0,0) width 354: "Lorem ipsum dolor sit amet, consectetuer adipiscing elit."
text run at (0,18) width 351: "Nulla varius enim ac mi. Curabitur sollicitudin felis quis"
@@ -142,23 +156,25 @@ layer at (8,1046) size 760x350
text run at (233,180) width 121: "Lorem ipsum dolor"
text run at (0,198) width 363: "sit amet, consectetuer adipiscing elit. Nulla varius enim ac"
text run at (0,216) width 20: "mi."
- RenderBlock (anonymous) at (5,239) size 367x214
+layer at (13,1209) size 750x198
+ RenderBlock (anonymous multi-column) at (5,131) size 750x198
+ RenderBlock (anonymous) at (0,0) size 367x198
RenderInline {SPAN} at (0,0) size 42x18
RenderText {#text} at (0,0) size 42x18
text run at (0,0) width 42: "Lorem"
- RenderText {#text} at (42,0) size 362x214
+ RenderText {#text} at (42,0) size 362x198
text run at (42,0) width 312: " ipsum dolor sit amet, consectetuer adipiscing elit."
text run at (0,18) width 351: "Nulla varius enim ac mi. Curabitur sollicitudin felis quis"
text run at (0,36) width 325: "lectus. Quisque adipiscing rhoncus sem. Proin nulla"
text run at (0,54) width 358: "purus, vulputate vel, varius ut, euismod et, nisi. Sed vitae"
text run at (0,72) width 343: "felis vel orci sagittis aliquam. Cras convallis adipiscing"
- text run at (0,106) width 340: "sem. Nam nonummy enim. Nullam bibendum lobortis"
- text run at (0,124) width 344: "neque. Vestibulum velit orci, tempus euismod, pretium"
- text run at (0,142) width 343: "quis, interdum vitae, nulla. Phasellus eget ante et tortor"
- text run at (0,160) width 343: "condimentum vestibulum. Suspendisse hendrerit quam"
- text run at (0,178) width 362: "nec felis. Sed varius turpis vitae pede. Lorem ipsum dolor"
- text run at (0,196) width 229: "sit amet, consectetuer adipiscing elit."
- RenderBlock {P} at (5,469) size 367x198
+ text run at (0,90) width 340: "sem. Nam nonummy enim. Nullam bibendum lobortis"
+ text run at (0,108) width 344: "neque. Vestibulum velit orci, tempus euismod, pretium"
+ text run at (0,126) width 343: "quis, interdum vitae, nulla. Phasellus eget ante et tortor"
+ text run at (0,144) width 343: "condimentum vestibulum. Suspendisse hendrerit quam"
+ text run at (0,162) width 362: "nec felis. Sed varius turpis vitae pede. Lorem ipsum dolor"
+ text run at (0,180) width 229: "sit amet, consectetuer adipiscing elit."
+ RenderBlock {P} at (0,198) size 367x198
RenderText {#text} at (0,0) size 362x198
text run at (0,0) width 354: "Lorem ipsum dolor sit amet, consectetuer adipiscing elit."
text run at (0,18) width 351: "Nulla varius enim ac mi. Curabitur sollicitudin felis quis"
@@ -171,9 +187,12 @@ layer at (8,1046) size 760x350
text run at (0,144) width 343: "condimentum vestibulum. Suspendisse hendrerit quam"
text run at (0,162) width 362: "nec felis. Sed varius turpis vitae pede. Lorem ipsum dolor"
text run at (0,180) width 229: "sit amet, consectetuer adipiscing elit."
-layer at (8,1412) size 760x350
- RenderBlock {DIV} at (0,1396) size 760x350 [border: (5px solid #800000)]
- RenderBlock (anonymous) at (5,5) size 367x198
+layer at (8,1444) size 760x366
+ RenderBlock {DIV} at (0,1428) size 760x366 [border: (5px solid #800000)]
+ RenderBlock (anonymous multi-column span) at (5,221) size 750x0
+layer at (13,1449) size 750x216
+ RenderBlock (anonymous multi-column) at (5,5) size 750x216
+ RenderBlock (anonymous) at (0,0) size 367x198
RenderInline {SPAN} at (0,0) size 362x198
RenderText {#text} at (0,0) size 362x198
text run at (0,0) width 354: "Lorem ipsum dolor sit amet, consectetuer adipiscing elit."
@@ -187,28 +206,30 @@ layer at (8,1412) size 760x350
text run at (0,144) width 343: "condimentum vestibulum. Suspendisse hendrerit quam"
text run at (0,162) width 362: "nec felis. Sed varius turpis vitae pede. Lorem ipsum dolor"
text run at (0,180) width 229: "sit amet, consectetuer adipiscing elit."
- RenderBlock (anonymous) at (5,203) size 367x36
+ RenderBlock (anonymous) at (0,198) size 367x36
RenderBlock {SPAN} at (0,0) size 367x36
RenderText {#text} at (0,0) size 354x36
text run at (0,0) width 354: "Lorem ipsum dolor sit amet, consectetuer adipiscing elit."
text run at (0,18) width 154: "Nulla varius enim ac mi."
- RenderBlock (anonymous) at (5,239) size 367x214
+ RenderBlock (anonymous) at (0,234) size 367x198
RenderInline {SPAN} at (0,0) size 42x18
RenderText {#text} at (0,0) size 42x18
text run at (0,0) width 42: "Lorem"
- RenderText {#text} at (42,0) size 362x214
+ RenderText {#text} at (42,0) size 362x198
text run at (42,0) width 312: " ipsum dolor sit amet, consectetuer adipiscing elit."
text run at (0,18) width 351: "Nulla varius enim ac mi. Curabitur sollicitudin felis quis"
text run at (0,36) width 325: "lectus. Quisque adipiscing rhoncus sem. Proin nulla"
text run at (0,54) width 358: "purus, vulputate vel, varius ut, euismod et, nisi. Sed vitae"
text run at (0,72) width 343: "felis vel orci sagittis aliquam. Cras convallis adipiscing"
- text run at (0,106) width 340: "sem. Nam nonummy enim. Nullam bibendum lobortis"
- text run at (0,124) width 344: "neque. Vestibulum velit orci, tempus euismod, pretium"
- text run at (0,142) width 343: "quis, interdum vitae, nulla. Phasellus eget ante et tortor"
- text run at (0,160) width 343: "condimentum vestibulum. Suspendisse hendrerit quam"
- text run at (0,178) width 362: "nec felis. Sed varius turpis vitae pede. Lorem ipsum dolor"
- text run at (0,196) width 229: "sit amet, consectetuer adipiscing elit."
- RenderBlock {P} at (5,469) size 367x198
+ text run at (0,90) width 340: "sem. Nam nonummy enim. Nullam bibendum lobortis"
+ text run at (0,108) width 344: "neque. Vestibulum velit orci, tempus euismod, pretium"
+ text run at (0,126) width 343: "quis, interdum vitae, nulla. Phasellus eget ante et tortor"
+ text run at (0,144) width 343: "condimentum vestibulum. Suspendisse hendrerit quam"
+ text run at (0,162) width 362: "nec felis. Sed varius turpis vitae pede. Lorem ipsum dolor"
+ text run at (0,180) width 229: "sit amet, consectetuer adipiscing elit."
+layer at (13,1681) size 750x108
+ RenderBlock (anonymous multi-column) at (5,237) size 750x108
+ RenderBlock {P} at (0,0) size 367x198
RenderText {#text} at (0,0) size 362x198
text run at (0,0) width 354: "Lorem ipsum dolor sit amet, consectetuer adipiscing elit."
text run at (0,18) width 351: "Nulla varius enim ac mi. Curabitur sollicitudin felis quis"
@@ -221,9 +242,12 @@ layer at (8,1412) size 760x350
text run at (0,144) width 343: "condimentum vestibulum. Suspendisse hendrerit quam"
text run at (0,162) width 362: "nec felis. Sed varius turpis vitae pede. Lorem ipsum dolor"
text run at (0,180) width 229: "sit amet, consectetuer adipiscing elit."
-layer at (8,1778) size 760x370
- RenderBlock {DIV} at (0,1762) size 760x370 [border: (5px solid #800000)]
- RenderBlock {P} at (5,5) size 367x198
+layer at (8,1826) size 760x384
+ RenderBlock {DIV} at (0,1810) size 760x384 [border: (5px solid #800000)]
+ RenderBlock (anonymous multi-column span) at (5,271) size 750x0
+layer at (13,1847) size 750x234
+ RenderBlock (anonymous multi-column) at (5,21) size 750x234
+ RenderBlock {P} at (0,0) size 367x198
RenderText {#text} at (0,0) size 362x198
text run at (0,0) width 354: "Lorem ipsum dolor sit amet, consectetuer adipiscing elit."
text run at (0,18) width 351: "Nulla varius enim ac mi. Curabitur sollicitudin felis quis"
@@ -236,32 +260,34 @@ layer at (8,1778) size 760x370
text run at (0,144) width 343: "condimentum vestibulum. Suspendisse hendrerit quam"
text run at (0,162) width 362: "nec felis. Sed varius turpis vitae pede. Lorem ipsum dolor"
text run at (0,180) width 229: "sit amet, consectetuer adipiscing elit."
- RenderBlock {P} at (5,219) size 367x36
- RenderText {#text} at (0,0) size 354x36
+ RenderBlock {P} at (0,214) size 367x38
+ RenderText {#text} at (0,0) size 354x38
text run at (0,0) width 354: "Lorem ipsum dolor sit amet, consectetuer adipiscing elit."
- text run at (0,18) width 154: "Nulla varius enim ac mi."
- RenderBlock {P} at (5,271) size 367x202
- RenderText {#text} at (0,0) size 362x202
+ text run at (0,20) width 154: "Nulla varius enim ac mi."
+ RenderBlock {P} at (0,268) size 367x198
+ RenderText {#text} at (0,0) size 362x198
text run at (0,0) width 354: "Lorem ipsum dolor sit amet, consectetuer adipiscing elit."
text run at (0,18) width 351: "Nulla varius enim ac mi. Curabitur sollicitudin felis quis"
text run at (0,36) width 325: "lectus. Quisque adipiscing rhoncus sem. Proin nulla"
text run at (0,54) width 358: "purus, vulputate vel, varius ut, euismod et, nisi. Sed vitae"
text run at (0,72) width 343: "felis vel orci sagittis aliquam. Cras convallis adipiscing"
- text run at (0,94) width 340: "sem. Nam nonummy enim. Nullam bibendum lobortis"
- text run at (0,112) width 344: "neque. Vestibulum velit orci, tempus euismod, pretium"
- text run at (0,130) width 343: "quis, interdum vitae, nulla. Phasellus eget ante et tortor"
- text run at (0,148) width 343: "condimentum vestibulum. Suspendisse hendrerit quam"
- text run at (0,166) width 362: "nec felis. Sed varius turpis vitae pede. Lorem ipsum dolor"
- text run at (0,184) width 229: "sit amet, consectetuer adipiscing elit."
- RenderBlock (anonymous) at (5,489) size 367x18
+ text run at (0,90) width 340: "sem. Nam nonummy enim. Nullam bibendum lobortis"
+ text run at (0,108) width 344: "neque. Vestibulum velit orci, tempus euismod, pretium"
+ text run at (0,126) width 343: "quis, interdum vitae, nulla. Phasellus eget ante et tortor"
+ text run at (0,144) width 343: "condimentum vestibulum. Suspendisse hendrerit quam"
+ text run at (0,162) width 362: "nec felis. Sed varius turpis vitae pede. Lorem ipsum dolor"
+ text run at (0,180) width 229: "sit amet, consectetuer adipiscing elit."
+layer at (13,2097) size 750x108
+ RenderBlock (anonymous multi-column) at (5,271) size 750x108
+ RenderBlock (anonymous) at (0,0) size 367x18
RenderInline {SPAN} at (0,0) size 354x18
RenderText {#text} at (0,0) size 354x18
text run at (0,0) width 354: "Lorem ipsum dolor sit amet, consectetuer adipiscing elit."
- RenderBlock (anonymous) at (5,507) size 367x18
+ RenderBlock (anonymous) at (0,18) size 367x18
RenderBlock {SPAN} at (0,0) size 367x18
RenderText {#text} at (0,0) size 154x18
text run at (0,0) width 154: "Nulla varius enim ac mi."
- RenderBlock (anonymous) at (5,525) size 367x180
+ RenderBlock (anonymous) at (0,36) size 367x180
RenderInline {SPAN} at (0,0) size 362x180
RenderText {#text} at (0,0) size 362x180
text run at (0,0) width 362: "Curabitur sollicitudin felis quis lectus. Quisque adipiscing"
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index f5b3609..717030f 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,19 @@
+2010-09-22 Abhishek Arya <inferno at chromium.org>
+
+ Reviewed by Dave Hyatt.
+
+ Fix wrong casts for table cell since its parent is not a RenderBlock. Remove
+ the redundant destroy call for empty anonymous columns or column span block.
+ https://bugs.webkit.org/show_bug.cgi?id=46245
+
+ Tests: fast/table/table-anonymous-block-destroy-crash.html
+ fast/table/table-columns-blocks-calc-crash.html
+
+ * rendering/RenderBlock.cpp:
+ (WebCore::RenderBlock::addChildToAnonymousColumnBlocks):
+ (WebCore::RenderBlock::columnsBlockForSpanningElement):
+ (WebCore::RenderBlock::removeChild):
+
2010-09-22 Matt Perry <mpcomplete at chromium.org>
Reviewed by Darin Fisher.
diff --git a/WebCore/rendering/RenderBlock.cpp b/WebCore/rendering/RenderBlock.cpp
index 60e1b6e..791a01a 100644
--- a/WebCore/rendering/RenderBlock.cpp
+++ b/WebCore/rendering/RenderBlock.cpp
@@ -333,7 +333,7 @@ void RenderBlock::addChildToAnonymousColumnBlocks(RenderObject* newChild, Render
ASSERT(!continuation()); // We don't yet support column spans that aren't immediate children of the multi-column block.
// The goal is to locate a suitable box in which to place our child.
- RenderBlock* beforeChildParent = toRenderBlock(beforeChild ? beforeChild->parent() : lastChild());
+ RenderBlock* beforeChildParent = toRenderBlock(beforeChild && beforeChild->parent()->isRenderBlock() ? beforeChild->parent() : lastChild());
// If the new child is floating or positioned it can just go in that block.
if (newChild->isFloatingOrPositioned())
@@ -610,7 +610,7 @@ RenderBlock* RenderBlock::columnsBlockForSpanningElement(RenderObject* newChild)
&& !newChild->isInline() && !isAnonymousColumnSpanBlock()) {
if (style()->specifiesColumns())
columnsBlockAncestor = this;
- else
+ else if (parent() && parent()->isRenderBlock())
columnsBlockAncestor = toRenderBlock(parent())->containingColumnsBlock(false);
}
return columnsBlockAncestor;
@@ -1007,9 +1007,6 @@ void RenderBlock::removeChild(RenderObject* oldChild)
// If this was our last child be sure to clear out our line boxes.
if (childrenInline())
lineBoxes()->deleteLineBoxes(renderArena());
- // If we're now an empty anonymous columns or column span block, then go ahead and delete ourselves.
- else if ((isAnonymousColumnsBlock() || isAnonymousColumnSpanBlock()) && parent() && parent()->isRenderBlock() && !continuation())
- destroy();
}
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list