Reviewed by Darin.

        - test for http://bugzilla.opendarwin.org/show_bug.cgi?id=6960
          REGRESSION: Assertion failure in table_layout.cpp:216 calcWidthArray()

        * fast/table/fixed-table-non-cell-in-row.html: Added.
        * fast/table/fixed-table-non-cell-in-row-expected.txt: Added.
        * fast/table/fixed-table-non-cell-in-row-expected.png: Added.
        * fast/table/fixed-table-non-cell-in-row-expected.checksum: Added.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@12495 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 363908489637eb6b91d76a2824a063f0e3e0301e..0b553802822f1294acb457290ca61bd35ad10d22 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,15 @@
+2006-01-31  Mitz Pettel  <opendarwin.org@mitzpettel.com>
+
+        Reviewed by Darin.
+
+        - test for http://bugzilla.opendarwin.org/show_bug.cgi?id=6960
+          REGRESSION: Assertion failure in table_layout.cpp:216 calcWidthArray()
+
+        * fast/table/fixed-table-non-cell-in-row.html: Added.
+        * fast/table/fixed-table-non-cell-in-row-expected.txt: Added.
+        * fast/table/fixed-table-non-cell-in-row-expected.png: Added.
+        * fast/table/fixed-table-non-cell-in-row-expected.checksum: Added.
+
 2006-01-31  Anders Carlsson  <andersca@mac.com>
 
         Reviewed by John.

diff --git a/LayoutTests/fast/table/fixed-table-non-cell-in-row-expected.checksum b/LayoutTests/fast/table/fixed-table-non-cell-in-row-expected.checksum
new file mode 100644 (file)
index 0000000..d1cacca
--- /dev/null
+++ b/LayoutTests/fast/table/fixed-table-non-cell-in-row-expected.checksum
@@ -0,0 +1 @@
+7f2fff1c8cd78ded84df04bd15ba06be
\ No newline at end of file

diff --git a/LayoutTests/fast/table/fixed-table-non-cell-in-row-expected.png b/LayoutTests/fast/table/fixed-table-non-cell-in-row-expected.png
new file mode 100644 (file)
index 0000000..00a2bc8
Binary files /dev/null and b/LayoutTests/fast/table/fixed-table-non-cell-in-row-expected.png differ

diff --git a/LayoutTests/fast/table/fixed-table-non-cell-in-row-expected.txt b/LayoutTests/fast/table/fixed-table-non-cell-in-row-expected.txt
new file mode 100644 (file)
index 0000000..390206d
--- /dev/null
+++ b/LayoutTests/fast/table/fixed-table-non-cell-in-row-expected.txt
@@ -0,0 +1,22 @@
+layer at (0,0) size 800x600
+  RenderCanvas at (0,0) size 800x600
+layer at (0,0) size 800x600
+  RenderBlock {HTML} at (0,0) size 800x600
+    RenderBody {BODY} at (8,8) size 784x584
+      RenderBlock {P} at (0,0) size 784x36
+        RenderText {TEXT} at (0,0) size 63x18
+          text run at (0,0) width 63: "This tests "
+        RenderInline {A} at (0,0) size 60x18 [color=#0000EE]
+          RenderText {TEXT} at (63,0) size 60x18
+            text run at (63,0) width 60: "bug 6960"
+        RenderText {TEXT} at (123,0) size 756x36
+          text run at (123,0) width 633: ", which was an assertion that failed for fixed-layout tables with non-cells in them. This can arise with"
+          text run at (0,18) width 91: "forms, at least."
+      RenderBlock {P} at (0,52) size 784x18
+        RenderText {TEXT} at (0,0) size 428x18
+          text run at (0,0) width 428: "The test is simply that the empty table below does not cause a crash."
+      RenderTable {TABLE} at (0,86) size 100x100 [border: (3px solid #FF0000)]
+        RenderTableSection {TBODY} at (3,3) size 0x94
+          RenderTableRow {TR} at (0,0) size 0x0
+            RenderBlock {FORM} at (0,0) size 0x0
+            RenderTableCell {TD} at (2,46) size 90x2 [r=0 c=0 rs=1 cs=1]

diff --git a/LayoutTests/fast/table/fixed-table-non-cell-in-row.html b/LayoutTests/fast/table/fixed-table-non-cell-in-row.html
new file mode 100644 (file)
index 0000000..f20f6e0
--- /dev/null
+++ b/LayoutTests/fast/table/fixed-table-non-cell-in-row.html
@@ -0,0 +1,5 @@
+<p>This tests <a href="http://bugzilla.opendarwin.org/show_bug.cgi?id=6960">bug 6960</a>,
+which was an assertion that failed for fixed-layout tables with non-cells in them.
+This can arise with forms, at least.</p>
+<p>The test is simply that the empty table below does not cause a crash.</p>
+<table style="table-layout: fixed; width: 100px; height: 100px; border: solid red 3px"><tr><form><td></td></form></tr></table>