[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

abarth at webkit.org abarth at webkit.org
Wed Dec 22 12:45:05 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit e938049ac8f484fd2ef58127c4eba2ff597892e0
Author: abarth at webkit.org <abarth at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Aug 28 09:43:48 2010 +0000

    2010-08-28  Adam Barth  <abarth at webkit.org>
    
            Reviewed by Eric Seidel.
    
            HTMLTreeBuilder needs to call HTMLFormElement::setDemoted
            https://bugs.webkit.org/show_bug.cgi?id=44781
    
            This patch teaches the HTMLTreeBuilder about demoted form elements.
            Demoting a form element magically stops the form element from
            rendering.  Demoted form elements are a concept from the
            LegacyHTMLTreeBuilder, but they are somewhat of a hack because
            rendering should be DOM-based.  We'll likely look for a better solution
            in a future patch.
    
            * html/parser/HTMLConstructionSite.cpp:
            (WebCore::HTMLConstructionSite::insertHTMLFormElement):
            * html/parser/HTMLConstructionSite.h:
            * html/parser/HTMLTreeBuilder.cpp:
            (WebCore::HTMLTreeBuilder::processStartTagForInTable):
    2010-08-28  Adam Barth  <abarth at webkit.org>
    
            Reviewed by Eric Seidel.
    
            HTMLTreeBuilder needs to call HTMLFormElement::setDemoted
            https://bugs.webkit.org/show_bug.cgi?id=44781
    
            Update test expectations to account for demoted form elements.  I spot
            checked a bunch of these and this change is the reverse of the change
            to these expectations in http://trac.webkit.org/changeset/64712.  At
            the time, we thought these rendering changes were correct because the
            DOM was correct.  However, demoted form elements have magical
            non-DOM-based rendering.
    
            * platform/mac/fast/forms/form-added-to-table-expected.txt:
            * platform/mac/fast/forms/formmove3-expected.txt:
            * platform/mac/fast/forms/preserveFormDuringResidualStyle-expected.txt:
            * platform/mac/fast/table/fixed-table-non-cell-in-row-expected.txt:
            * platform/mac/fast/table/inline-form-assert-expected.txt:
            * platform/mac/fast/table/insert-cell-before-form-expected.txt:
            * platform/mac/fast/table/insert-row-before-form-expected.txt:
            * platform/mac/tables/mozilla/bugs/bug1318-expected.txt:
            * platform/mac/tables/mozilla/bugs/bug2516-expected.txt:
            * platform/mac/tables/mozilla/bugs/bug30559-expected.txt:
            * platform/mac/tables/mozilla/bugs/bug32447-expected.txt:
            * platform/mac/tables/mozilla/bugs/bug34538-expected.txt:
            * platform/mac/tables/mozilla/bugs/bug4527-expected.txt:
            * platform/mac/tables/mozilla/bugs/bug78162-expected.txt:
            * platform/mac/tables/mozilla/bugs/bug96334-expected.txt:
            * platform/mac/tables/mozilla/bugs/bug96343-expected.txt:
            * platform/mac/tables/mozilla_expected_failures/bugs/bug1725-expected.txt:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@66306 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index d6f51b3..662c528 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,35 @@
+2010-08-28  Adam Barth  <abarth at webkit.org>
+
+        Reviewed by Eric Seidel.
+
+        HTMLTreeBuilder needs to call HTMLFormElement::setDemoted
+        https://bugs.webkit.org/show_bug.cgi?id=44781
+
+        Update test expectations to account for demoted form elements.  I spot
+        checked a bunch of these and this change is the reverse of the change
+        to these expectations in http://trac.webkit.org/changeset/64712.  At
+        the time, we thought these rendering changes were correct because the
+        DOM was correct.  However, demoted form elements have magical
+        non-DOM-based rendering.
+
+        * platform/mac/fast/forms/form-added-to-table-expected.txt:
+        * platform/mac/fast/forms/formmove3-expected.txt:
+        * platform/mac/fast/forms/preserveFormDuringResidualStyle-expected.txt:
+        * platform/mac/fast/table/fixed-table-non-cell-in-row-expected.txt:
+        * platform/mac/fast/table/inline-form-assert-expected.txt:
+        * platform/mac/fast/table/insert-cell-before-form-expected.txt:
+        * platform/mac/fast/table/insert-row-before-form-expected.txt:
+        * platform/mac/tables/mozilla/bugs/bug1318-expected.txt:
+        * platform/mac/tables/mozilla/bugs/bug2516-expected.txt:
+        * platform/mac/tables/mozilla/bugs/bug30559-expected.txt:
+        * platform/mac/tables/mozilla/bugs/bug32447-expected.txt:
+        * platform/mac/tables/mozilla/bugs/bug34538-expected.txt:
+        * platform/mac/tables/mozilla/bugs/bug4527-expected.txt:
+        * platform/mac/tables/mozilla/bugs/bug78162-expected.txt:
+        * platform/mac/tables/mozilla/bugs/bug96334-expected.txt:
+        * platform/mac/tables/mozilla/bugs/bug96343-expected.txt:
+        * platform/mac/tables/mozilla_expected_failures/bugs/bug1725-expected.txt:
+
 2010-08-28  Chris Guillory   <chris.guillory at google.com>
 
         Reviewed by Chris Fleizach.
diff --git a/LayoutTests/platform/mac/fast/forms/form-added-to-table-expected.txt b/LayoutTests/platform/mac/fast/forms/form-added-to-table-expected.txt
index 583ec8a..fb72373 100644
--- a/LayoutTests/platform/mac/fast/forms/form-added-to-table-expected.txt
+++ b/LayoutTests/platform/mac/fast/forms/form-added-to-table-expected.txt
@@ -3,19 +3,11 @@ layer 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
-      RenderTable {TABLE} at (0,0) size 226x26
-        RenderTableSection {TBODY} at (0,0) size 226x26
+      RenderTable {TABLE} at (0,0) size 226x24
+        RenderTableSection {TBODY} at (0,0) size 226x24
           RenderTableRow {TR} at (0,2) size 226x20
             RenderTableCell {TD} at (2,2) size 222x20 [r=0 c=0 rs=1 cs=1]
               RenderText {#text} at (1,1) size 220x18
                 text run at (1,1) width 220: "This test passes if it does not crash."
-          RenderTableRow (anonymous) at (0,24) size 226x0
-            RenderTableCell (anonymous) at (2,24) size 222x0 [r=1 c=0 rs=1 cs=1]
-              RenderBlock (anonymous) at (0,0) size 222x0
-                RenderInline {FORM} at (0,0) size 0x0
-              RenderBlock (anonymous) at (0,0) size 222x0
-                RenderTable {TABLE} at (0,0) size 4x0
-              RenderBlock (anonymous) at (0,0) size 222x0
-                RenderInline {FORM} at (0,0) size 0x0
 selection start: position 0 of child 0 {#text} of child 0 {TD} of child 0 {TR} of child 0 {TBODY} of child 1 {TABLE} of body
 selection end:   position 1 of child 1 {TABLE} of body
diff --git a/LayoutTests/platform/mac/fast/forms/formmove3-expected.txt b/LayoutTests/platform/mac/fast/forms/formmove3-expected.txt
index 010c889..af163e0 100644
--- a/LayoutTests/platform/mac/fast/forms/formmove3-expected.txt
+++ b/LayoutTests/platform/mac/fast/forms/formmove3-expected.txt
@@ -14,13 +14,11 @@ layer at (0,0) size 800x600
           RenderInline {A} at (0,0) size 0x0
             RenderText {#text} at (0,0) size 0x0
         RenderBlock (anonymous) at (0,0) size 784x28
-          RenderTable {TABLE} at (0,0) size 69x28
-            RenderTableSection {TBODY} at (0,0) size 69x28
-              RenderTableRow {TR} at (0,2) size 69x24
+          RenderTable {TABLE} at (0,0) size 66x28
+            RenderTableSection {TBODY} at (0,0) size 66x28
+              RenderTableRow {TR} at (0,2) size 66x24
                 RenderTableCell {TD} at (2,13) size 2x2 [r=0 c=0 rs=1 cs=1]
-                RenderTableCell (anonymous) at (6,2) size 1x16 [r=0 c=1 rs=1 cs=1]
-                  RenderBlock {FORM} at (0,0) size 1x0
-                RenderTableCell {TD} at (9,2) size 58x24 [r=0 c=2 rs=1 cs=1]
+                RenderTableCell {TD} at (6,2) size 58x24 [r=0 c=1 rs=1 cs=1]
                   RenderButton {INPUT} at (3,3) size 52x18 [bgcolor=#C0C0C0]
                     RenderBlock (anonymous) at (8,2) size 36x13
                       RenderText at (0,0) size 36x13
diff --git a/LayoutTests/platform/mac/fast/forms/preserveFormDuringResidualStyle-expected.txt b/LayoutTests/platform/mac/fast/forms/preserveFormDuringResidualStyle-expected.txt
index 58ab791..05519c6 100644
--- a/LayoutTests/platform/mac/fast/forms/preserveFormDuringResidualStyle-expected.txt
+++ b/LayoutTests/platform/mac/fast/forms/preserveFormDuringResidualStyle-expected.txt
@@ -14,12 +14,10 @@ layer at (0,0) size 800x600
           RenderInline {FONT} at (0,0) size 0x0
             RenderText {#text} at (0,0) size 0x0
         RenderBlock (anonymous) at (0,0) size 784x25
-          RenderTable {TABLE} at (379,0) size 26x25
-            RenderTableSection {TBODY} at (0,0) size 26x25
-              RenderTableRow {TR} at (0,2) size 26x21
-                RenderTableCell (anonymous) at (2,2) size 1x16 [r=0 c=0 rs=1 cs=1]
-                  RenderBlock {FORM} at (0,0) size 1x0
-                RenderTableCell {TD} at (5,2) size 19x21 [r=0 c=1 rs=1 cs=1]
+          RenderTable {TABLE} at (380,0) size 23x25
+            RenderTableSection {TBODY} at (0,0) size 23x25
+              RenderTableRow {TR} at (0,2) size 23x21
+                RenderTableCell {TD} at (2,2) size 19x21 [r=0 c=0 rs=1 cs=1]
                   RenderImage {INPUT} at (1,1) size 17x19
                   RenderText {#text} at (0,0) size 0x0
                   RenderText {#text} at (0,0) size 0x0
diff --git a/LayoutTests/platform/mac/fast/table/fixed-table-non-cell-in-row-expected.txt b/LayoutTests/platform/mac/fast/table/fixed-table-non-cell-in-row-expected.txt
index 8cd5089..d9db4c0 100644
--- a/LayoutTests/platform/mac/fast/table/fixed-table-non-cell-in-row-expected.txt
+++ b/LayoutTests/platform/mac/fast/table/fixed-table-non-cell-in-row-expected.txt
@@ -18,6 +18,4 @@ layer at (0,0) size 800x600
       RenderTable {TABLE} at (0,86) size 100x100 [border: (3px solid #FF0000)]
         RenderTableSection {TBODY} at (3,3) size 94x94
           RenderTableRow {TR} at (0,2) size 94x90
-            RenderTableCell (anonymous) at (2,2) size 44x16 [r=0 c=0 rs=1 cs=1]
-              RenderBlock {FORM} at (0,0) size 44x0
-            RenderTableCell {TD} at (48,46) size 44x2 [r=0 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (2,46) size 90x2 [r=0 c=0 rs=1 cs=1]
diff --git a/LayoutTests/platform/mac/fast/table/inline-form-assert-expected.txt b/LayoutTests/platform/mac/fast/table/inline-form-assert-expected.txt
index 6d57456..74a2731 100644
--- a/LayoutTests/platform/mac/fast/table/inline-form-assert-expected.txt
+++ b/LayoutTests/platform/mac/fast/table/inline-form-assert-expected.txt
@@ -18,28 +18,19 @@ layer at (0,0) size 800x600
       RenderBlock {P} at (0,34) size 784x18
         RenderText {#text} at (0,0) size 175x18
           text run at (0,0) width 175: "No assert means test PASS."
-      RenderTable {TABLE} at (0,68) size 5x4
-        RenderTableSection (anonymous) at (0,0) size 5x4
-          RenderTableRow (anonymous) at (0,2) size 5x0
-            RenderTableCell (anonymous) at (2,2) size 1x0 [r=0 c=0 rs=1 cs=1]
-              RenderInline {FORM} at (0,0) size 0x0
-      RenderTable {TABLE} at (0,72) size 5x4
-        RenderTableSection {TBODY} at (0,0) size 5x4
-          RenderTableRow (anonymous) at (0,2) size 5x0
-            RenderTableCell (anonymous) at (2,2) size 1x0 [r=0 c=0 rs=1 cs=1]
-              RenderInline {FORM} at (0,0) size 0x0
-      RenderTable {TABLE} at (0,76) size 5x4
+      RenderTable {TABLE} at (0,68) size 4x0
+      RenderTable {TABLE} at (0,68) size 4x2
+        RenderTableSection {TBODY} at (0,0) size 4x2
+      RenderTable {TABLE} at (0,70) size 5x4
         RenderTableSection {THEAD} at (0,0) size 5x4
           RenderTableRow (anonymous) at (0,2) size 5x0
             RenderTableCell (anonymous) at (2,2) size 1x0 [r=0 c=0 rs=1 cs=1]
               RenderInline {FORM} at (0,0) size 0x0
-      RenderTable {TABLE} at (0,80) size 5x4
+      RenderTable {TABLE} at (0,74) size 5x4
         RenderTableSection {TFOOT} at (0,0) size 5x4
           RenderTableRow (anonymous) at (0,2) size 5x0
             RenderTableCell (anonymous) at (2,2) size 1x0 [r=0 c=0 rs=1 cs=1]
               RenderInline {FORM} at (0,0) size 0x0
-      RenderTable {TABLE} at (0,84) size 5x4
-        RenderTableSection {TBODY} at (0,0) size 5x4
-          RenderTableRow {TR} at (0,2) size 5x0
-            RenderTableCell (anonymous) at (2,2) size 1x0 [r=0 c=0 rs=1 cs=1]
-              RenderInline {FORM} at (0,0) size 0x0
+      RenderTable {TABLE} at (0,78) size 4x4
+        RenderTableSection {TBODY} at (0,0) size 4x4
+          RenderTableRow {TR} at (0,2) size 4x0
diff --git a/LayoutTests/platform/mac/fast/table/insert-cell-before-form-expected.txt b/LayoutTests/platform/mac/fast/table/insert-cell-before-form-expected.txt
index ace3c6a..47b7246 100644
--- a/LayoutTests/platform/mac/fast/table/insert-cell-before-form-expected.txt
+++ b/LayoutTests/platform/mac/fast/table/insert-cell-before-form-expected.txt
@@ -17,15 +17,13 @@ layer at (0,0) size 800x600
       RenderBlock {P} at (0,34) size 784x18
         RenderText {#text} at (0,0) size 270x18
           text run at (0,0) width 270: "There should be a line of green text below."
-      RenderTable {TABLE} at (0,68) size 151x30 [color=#FF0000]
-        RenderTableSection {TBODY} at (0,0) size 151x30
-          RenderTableRow {TR} at (0,2) size 151x26
-            RenderTableCell {TD} at (2,2) size 147x26 [r=0 c=0 rs=1 cs=1]
-              RenderTable {TABLE} at (1,1) size 145x24 [color=#000000]
-                RenderTableSection {TBODY} at (0,0) size 145x24
-                  RenderTableRow {TR} at (0,2) size 145x20 [color=#008000]
+      RenderTable {TABLE} at (0,68) size 148x30 [color=#FF0000]
+        RenderTableSection {TBODY} at (0,0) size 148x30
+          RenderTableRow {TR} at (0,2) size 148x26
+            RenderTableCell {TD} at (2,2) size 144x26 [r=0 c=0 rs=1 cs=1]
+              RenderTable {TABLE} at (1,1) size 142x24 [color=#000000]
+                RenderTableSection {TBODY} at (0,0) size 142x24
+                  RenderTableRow {TR} at (0,2) size 142x20 [color=#008000]
                     RenderTableCell {TD} at (2,2) size 138x20 [r=0 c=0 rs=1 cs=1]
                       RenderText {#text} at (1,1) size 136x18
                         text run at (1,1) width 136: "This should be green."
-                    RenderTableCell (anonymous) at (142,2) size 1x16 [r=0 c=1 rs=1 cs=1]
-                      RenderBlock {FORM} at (0,0) size 1x0
diff --git a/LayoutTests/platform/mac/fast/table/insert-row-before-form-expected.txt b/LayoutTests/platform/mac/fast/table/insert-row-before-form-expected.txt
index a34057e..d9ff7a8 100644
--- a/LayoutTests/platform/mac/fast/table/insert-row-before-form-expected.txt
+++ b/LayoutTests/platform/mac/fast/table/insert-row-before-form-expected.txt
@@ -17,16 +17,13 @@ layer at (0,0) size 800x600
       RenderBlock {P} at (0,34) size 784x18
         RenderText {#text} at (0,0) size 270x18
           text run at (0,0) width 270: "There should be a line of green text below."
-      RenderTable {TABLE} at (0,68) size 148x48 [color=#FF0000]
-        RenderTableSection {TBODY} at (0,0) size 148x48
-          RenderTableRow {TR} at (0,2) size 148x44
-            RenderTableCell {TD} at (2,2) size 144x44 [r=0 c=0 rs=1 cs=1]
-              RenderTable {TABLE} at (1,1) size 142x42 [color=#008000]
-                RenderTableSection {TBODY} at (0,0) size 142x42
+      RenderTable {TABLE} at (0,68) size 148x30 [color=#FF0000]
+        RenderTableSection {TBODY} at (0,0) size 148x30
+          RenderTableRow {TR} at (0,2) size 148x26
+            RenderTableCell {TD} at (2,2) size 144x26 [r=0 c=0 rs=1 cs=1]
+              RenderTable {TABLE} at (1,1) size 142x24 [color=#008000]
+                RenderTableSection {TBODY} at (0,0) size 142x24
                   RenderTableRow {TR} at (0,2) size 142x20
                     RenderTableCell {TD} at (2,2) size 138x20 [r=0 c=0 rs=1 cs=1]
                       RenderText {#text} at (1,1) size 136x18
                         text run at (1,1) width 136: "This should be green."
-                  RenderTableRow (anonymous) at (0,24) size 142x16
-                    RenderTableCell (anonymous) at (2,24) size 138x16 [r=1 c=0 rs=1 cs=1]
-                      RenderBlock {FORM} at (0,0) size 138x0
diff --git a/LayoutTests/platform/mac/tables/mozilla/bugs/bug1318-expected.txt b/LayoutTests/platform/mac/tables/mozilla/bugs/bug1318-expected.txt
index 7639471..423ed6c 100644
--- a/LayoutTests/platform/mac/tables/mozilla/bugs/bug1318-expected.txt
+++ b/LayoutTests/platform/mac/tables/mozilla/bugs/bug1318-expected.txt
@@ -3,12 +3,8 @@ layer 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
-      RenderTable {TABLE} at (0,0) size 784x156
-        RenderTableSection (anonymous) at (0,0) size 784x16
-          RenderTableRow (anonymous) at (0,0) size 784x16
-            RenderTableCell (anonymous) at (0,0) size 551x16 [r=0 c=0 rs=1 cs=1]
-              RenderBlock {FORM} at (0,0) size 551x0
-        RenderTableSection {TBODY} at (0,16) size 784x140
+      RenderTable {TABLE} at (0,0) size 784x140
+        RenderTableSection {TBODY} at (0,0) size 784x140
           RenderTableRow {TR} at (0,0) size 784x74
             RenderTableCell {TD} at (0,0) size 784x74 [r=0 c=0 rs=1 cs=4]
               RenderBR {BR} at (392,1) size 0x18
diff --git a/LayoutTests/platform/mac/tables/mozilla/bugs/bug2516-expected.txt b/LayoutTests/platform/mac/tables/mozilla/bugs/bug2516-expected.txt
index 8d0e364..e9a7710 100644
--- a/LayoutTests/platform/mac/tables/mozilla/bugs/bug2516-expected.txt
+++ b/LayoutTests/platform/mac/tables/mozilla/bugs/bug2516-expected.txt
@@ -3,16 +3,12 @@ layer 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
-      RenderTable {TABLE} at (0,0) size 133x54 [border: (1px outset #808080)]
-        RenderTableSection {TBODY} at (1,1) size 131x52
-          RenderTableRow {TR} at (0,2) size 131x48
-            RenderTableCell {TD} at (2,2) size 127x48 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
-              RenderTable {TABLE} at (2,2) size 123x44 [bgcolor=#FFCC99]
-                RenderTableSection (anonymous) at (0,0) size 123x20
-                  RenderTableRow (anonymous) at (0,2) size 123x16
-                    RenderTableCell (anonymous) at (2,2) size 31x16 [r=0 c=0 rs=1 cs=1]
-                      RenderBlock {FORM} at (0,0) size 31x0
-                RenderTableSection {TBODY} at (0,20) size 123x24
+      RenderTable {TABLE} at (0,0) size 133x34 [border: (1px outset #808080)]
+        RenderTableSection {TBODY} at (1,1) size 131x32
+          RenderTableRow {TR} at (0,2) size 131x28
+            RenderTableCell {TD} at (2,2) size 127x28 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
+              RenderTable {TABLE} at (2,2) size 123x24 [bgcolor=#FFCC99]
+                RenderTableSection {TBODY} at (0,0) size 123x24
                   RenderTableRow {TR} at (0,2) size 123x20
                     RenderTableCell {TD} at (2,2) size 31x20 [bgcolor=#FF6600] [r=0 c=0 rs=1 cs=1]
                       RenderText {#text} at (1,1) size 29x18
diff --git a/LayoutTests/platform/mac/tables/mozilla/bugs/bug30559-expected.txt b/LayoutTests/platform/mac/tables/mozilla/bugs/bug30559-expected.txt
index 6d799f7..f3ac454 100644
--- a/LayoutTests/platform/mac/tables/mozilla/bugs/bug30559-expected.txt
+++ b/LayoutTests/platform/mac/tables/mozilla/bugs/bug30559-expected.txt
@@ -7,20 +7,16 @@ layer at (0,0) size 800x600
         RenderText {#text} at (0,0) size 716x18
           text run at (0,0) width 716: "The bug causes the nested table containing the textarea to be positioned away from the left edge of the outer table "
         RenderBR {BR} at (716,14) size 0x0
-      RenderTable {TABLE} at (242,18) size 300x76 [border: (1px outset #808080)]
-        RenderTableSection {TBODY} at (1,1) size 298x74
-          RenderTableRow {TR} at (0,2) size 298x70
-            RenderTableCell {TD} at (2,2) size 294x70 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
-              RenderTable {TABLE} at (2,2) size 70x66 [border: (1px outset #808080)]
-                RenderTableSection (anonymous) at (1,1) size 68x20
-                  RenderTableRow (anonymous) at (0,2) size 68x16
-                    RenderTableCell (anonymous) at (2,2) size 64x16 [r=0 c=0 rs=1 cs=1]
-                      RenderBlock {FORM} at (0,0) size 64x0
-                RenderTableSection {TBODY} at (1,21) size 68x44
+      RenderTable {TABLE} at (242,18) size 300x56 [border: (1px outset #808080)]
+        RenderTableSection {TBODY} at (1,1) size 298x54
+          RenderTableRow {TR} at (0,2) size 298x50
+            RenderTableCell {TD} at (2,2) size 294x50 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
+              RenderTable {TABLE} at (2,2) size 70x46 [border: (1px outset #808080)]
+                RenderTableSection {TBODY} at (1,1) size 68x44
                   RenderTableRow {TR} at (0,2) size 68x40
                     RenderTableCell {TD} at (2,2) size 64x40 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
                       RenderText {#text} at (0,0) size 0x0
-layer at (262,58) size 56x32 clip at (263,59) size 54x30
+layer at (262,38) size 56x32 clip at (263,39) size 54x30
   RenderTextControl {TEXTAREA} at (4,4) size 56x32 [bgcolor=#FFFFFF] [border: (1px solid #000000)]
     RenderBlock {DIV} at (3,3) size 50x13
       RenderText {#text} at (0,0) size 18x13
diff --git a/LayoutTests/platform/mac/tables/mozilla/bugs/bug32447-expected.txt b/LayoutTests/platform/mac/tables/mozilla/bugs/bug32447-expected.txt
index a0582d6..78c90f3 100644
--- a/LayoutTests/platform/mac/tables/mozilla/bugs/bug32447-expected.txt
+++ b/LayoutTests/platform/mac/tables/mozilla/bugs/bug32447-expected.txt
@@ -3,13 +3,9 @@ layer 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
-layer at (8,8) size 33x44
-  RenderTable {TABLE} at (8,8) size 33x44
-    RenderTableSection (anonymous) at (0,0) size 33x20
-      RenderTableRow (anonymous) at (0,2) size 33x16
-        RenderTableCell (anonymous) at (2,2) size 29x16 [r=0 c=0 rs=1 cs=1]
-          RenderBlock {FORM} at (0,0) size 29x0
-    RenderTableSection {TBODY} at (0,20) size 33x24
+layer at (8,8) size 33x24
+  RenderTable {TABLE} at (8,8) size 33x24
+    RenderTableSection {TBODY} at (0,0) size 33x24
       RenderTableRow {TR} at (0,2) size 33x20
         RenderTableCell {TD} at (2,2) size 29x20 [r=0 c=0 rs=1 cs=1]
           RenderText {#text} at (1,1) size 27x18
diff --git a/LayoutTests/platform/mac/tables/mozilla/bugs/bug34538-expected.txt b/LayoutTests/platform/mac/tables/mozilla/bugs/bug34538-expected.txt
index a0582d6..78c90f3 100644
--- a/LayoutTests/platform/mac/tables/mozilla/bugs/bug34538-expected.txt
+++ b/LayoutTests/platform/mac/tables/mozilla/bugs/bug34538-expected.txt
@@ -3,13 +3,9 @@ layer 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
-layer at (8,8) size 33x44
-  RenderTable {TABLE} at (8,8) size 33x44
-    RenderTableSection (anonymous) at (0,0) size 33x20
-      RenderTableRow (anonymous) at (0,2) size 33x16
-        RenderTableCell (anonymous) at (2,2) size 29x16 [r=0 c=0 rs=1 cs=1]
-          RenderBlock {FORM} at (0,0) size 29x0
-    RenderTableSection {TBODY} at (0,20) size 33x24
+layer at (8,8) size 33x24
+  RenderTable {TABLE} at (8,8) size 33x24
+    RenderTableSection {TBODY} at (0,0) size 33x24
       RenderTableRow {TR} at (0,2) size 33x20
         RenderTableCell {TD} at (2,2) size 29x20 [r=0 c=0 rs=1 cs=1]
           RenderText {#text} at (1,1) size 27x18
diff --git a/LayoutTests/platform/mac/tables/mozilla/bugs/bug4527-expected.txt b/LayoutTests/platform/mac/tables/mozilla/bugs/bug4527-expected.txt
index 21b77ad..8f4ca37 100644
--- a/LayoutTests/platform/mac/tables/mozilla/bugs/bug4527-expected.txt
+++ b/LayoutTests/platform/mac/tables/mozilla/bugs/bug4527-expected.txt
@@ -6,14 +6,14 @@ layer at (0,0) size 800x600
       RenderBlock (anonymous) at (0,0) size 784x0
         RenderInline {BASEFONT} at (0,0) size 0x0
         RenderText {#text} at (0,0) size 0x0
-      RenderTable {TABLE} at (0,0) size 702x111
-        RenderTableSection {TBODY} at (0,0) size 702x111
-          RenderTableRow {TR} at (0,0) size 702x70
-            RenderTableCell {TD} at (0,0) size 232x85 [r=0 c=0 rs=2 cs=1]
+      RenderTable {TABLE} at (0,0) size 613x95
+        RenderTableSection {TBODY} at (0,0) size 613x95
+          RenderTableRow {TR} at (0,0) size 613x70
+            RenderTableCell {TD} at (0,5) size 126x85 [r=0 c=0 rs=2 cs=1]
               RenderInline {A} at (0,0) size 126x18 [color=#0000EE]
                 RenderImage {IMG} at (0,0) size 126x85
               RenderText {#text} at (0,0) size 0x0
-            RenderTableCell {TD} at (232,0) size 470x70 [r=0 c=1 rs=1 cs=3]
+            RenderTableCell {TD} at (126,0) size 487x70 [r=0 c=1 rs=1 cs=3]
               RenderInline {NOBR} at (0,0) size 19x18
                 RenderPartObject {IFRAME} at (0,0) size 468x60
                   layer at (0,0) size 468x60
@@ -29,24 +29,21 @@ layer at (0,0) size 800x600
                         RenderText {#text} at (0,0) size 0x0
                 RenderInline {A} at (0,0) size 19x18 [color=#0000EE]
                   RenderImage {IMG} at (468,0) size 19x60
-              RenderBR {BR} at (0,0) size 0x0
+              RenderBR {BR} at (487,60) size 0x0
               RenderImage {IMG} at (0,60) size 470x10
               RenderBR {BR} at (470,70) size 0x0
-          RenderTableRow (anonymous) at (0,70) size 702x16
-            RenderTableCell (anonymous) at (232,70) size 212x16 [r=1 c=1 rs=1 cs=1]
-              RenderBlock {FORM} at (0,0) size 212x0
-          RenderTableRow {TR} at (0,86) size 702x25
-            RenderTableCell {TD} at (0,86) size 232x25 [bgcolor=#CCCCCC] [r=2 c=0 rs=1 cs=1]
+          RenderTableRow {TR} at (0,70) size 613x25
+            RenderTableCell {TD} at (126,70) size 244x25 [bgcolor=#CCCCCC] [r=1 c=1 rs=1 cs=1]
               RenderImage {IMG} at (0,0) size 232x25
-            RenderTableCell {TD} at (232,87) size 212x23 [bgcolor=#CCCCCC] [r=2 c=1 rs=1 cs=1]
-              RenderTextControl {INPUT} at (56,2) size 75x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
-              RenderImage {INPUT} at (133,4) size 25x18
-            RenderTableCell {TD} at (444,86) size 258x25 [bgcolor=#CCCCCC] [r=2 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (370,71) size 109x23 [bgcolor=#CCCCCC] [r=1 c=2 rs=1 cs=1]
+              RenderTextControl {INPUT} at (4,2) size 75x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
+              RenderImage {INPUT} at (81,4) size 25x18
+            RenderTableCell {TD} at (479,70) size 134x25 [bgcolor=#CCCCCC] [r=1 c=3 rs=1 cs=1]
               RenderBlock {INPUT} at (3,4) size 12x13
               RenderImage {IMG} at (18,0) size 40x25
               RenderBlock {INPUT} at (61,4) size 12x13
               RenderText {#text} at (76,1) size 4x18
                 text run at (76,1) width 4: " "
               RenderImage {IMG} at (80,0) size 46x25
-layer at (299,100) size 69x13
+layer at (385,84) size 69x13
   RenderBlock {DIV} at (3,3) size 69x13
diff --git a/LayoutTests/platform/mac/tables/mozilla/bugs/bug78162-expected.txt b/LayoutTests/platform/mac/tables/mozilla/bugs/bug78162-expected.txt
index 1eaa2c2..a23e2c2 100644
--- a/LayoutTests/platform/mac/tables/mozilla/bugs/bug78162-expected.txt
+++ b/LayoutTests/platform/mac/tables/mozilla/bugs/bug78162-expected.txt
@@ -6,13 +6,11 @@ layer at (0,0) size 800x600
       RenderTable {TABLE} at (0,0) size 642x172 [border: (1px outset #808080)]
         RenderTableSection {TBODY} at (1,1) size 640x170
           RenderTableRow {TR} at (0,2) size 640x166
-            RenderTableCell {TD} at (2,73) size 124x24 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
-              RenderTable {TABLE} at (2,2) size 120x20
-                RenderTableSection {TBODY} at (0,0) size 120x20
-                  RenderTableRow {TR} at (0,2) size 120x16
-                    RenderTableCell (anonymous) at (2,2) size 38x16 [r=0 c=0 rs=1 cs=1]
-                      RenderBlock {FORM} at (0,0) size 38x0
-                    RenderTableCell {TD} at (42,9) size 76x2 [r=0 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (2,80) size 124x10 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
+              RenderTable {TABLE} at (2,2) size 120x6
+                RenderTableSection {TBODY} at (0,0) size 120x6
+                  RenderTableRow {TR} at (0,2) size 120x2
+                    RenderTableCell {TD} at (2,2) size 116x2 [r=0 c=0 rs=1 cs=1]
             RenderTableCell {TD} at (128,2) size 510x166 [border: (1px inset #808080)] [r=0 c=1 rs=1 cs=1]
               RenderTable {TABLE} at (2,2) size 506x162 [border: (1px outset #808080)]
                 RenderTableSection {TBODY} at (1,1) size 504x160
diff --git a/LayoutTests/platform/mac/tables/mozilla/bugs/bug96334-expected.txt b/LayoutTests/platform/mac/tables/mozilla/bugs/bug96334-expected.txt
index fa660ea..2f38d4a 100644
--- a/LayoutTests/platform/mac/tables/mozilla/bugs/bug96334-expected.txt
+++ b/LayoutTests/platform/mac/tables/mozilla/bugs/bug96334-expected.txt
@@ -3,16 +3,12 @@ layer at (0,0) size 999x585
 layer at (0,0) size 999x585
   RenderBlock {HTML} at (0,0) size 800x585
     RenderBody {BODY} at (8,8) size 784x569
-      RenderTable {TABLE} at (0,0) size 991x167 [border: (2px solid #0000FF)]
-        RenderTableSection {TBODY} at (2,2) size 987x163
-          RenderTableRow {TR} at (0,2) size 987x159
-            RenderTableCell {TD} at (2,2) size 207x159 [border: (1px solid #C0C0C0)] [r=0 c=0 rs=1 cs=1]
-              RenderTable {TABLE} at (2,2) size 203x155 [border: (2px solid #008000)]
-                RenderTableSection (anonymous) at (2,2) size 199x20
-                  RenderTableRow (anonymous) at (0,2) size 199x16
-                    RenderTableCell (anonymous) at (2,2) size 195x16 [r=0 c=0 rs=1 cs=1]
-                      RenderBlock {FORM} at (0,0) size 195x0
-                RenderTableSection {TBODY} at (2,22) size 199x131
+      RenderTable {TABLE} at (0,0) size 991x147 [border: (2px solid #0000FF)]
+        RenderTableSection {TBODY} at (2,2) size 987x143
+          RenderTableRow {TR} at (0,2) size 987x139
+            RenderTableCell {TD} at (2,2) size 207x139 [border: (1px solid #C0C0C0)] [r=0 c=0 rs=1 cs=1]
+              RenderTable {TABLE} at (2,2) size 203x135 [border: (2px solid #008000)]
+                RenderTableSection {TBODY} at (2,2) size 199x131
                   RenderTableRow {TR} at (0,2) size 199x87
                     RenderTableCell {TD} at (2,2) size 195x87 [border: (1px solid #C0C0C0)] [r=0 c=0 rs=1 cs=1]
                       RenderTable {TABLE} at (2,2) size 141x35 [border: (2px solid #FF0000)]
@@ -43,7 +39,7 @@ layer at (0,0) size 999x585
               RenderText {#text} at (2,2) size 770x36
                 text run at (2,2) width 770: "KEEPoTHEoTEXToHEREoASoLONGoASoPOSSIBLEooKEEPoTHEoTEXToHEREoASoLONGoASoPOSSIBLE"
                 text run at (2,20) width 618: "THIS SIMULATES THE PROBLEM ON THE WWW.MAPBLAST.COM/ \"CREATE MAP\""
-layer at (31,51) size 119x13 scrollWidth 131
+layer at (31,31) size 119x13 scrollWidth 131
   RenderBlock {DIV} at (3,3) size 119x13
     RenderText {#text} at (1,0) size 129x13
       text run at (1,0) width 129: "THIS NEEDS THIS VALUE"
diff --git a/LayoutTests/platform/mac/tables/mozilla/bugs/bug96343-expected.txt b/LayoutTests/platform/mac/tables/mozilla/bugs/bug96343-expected.txt
index a3eace2..d638da6 100644
--- a/LayoutTests/platform/mac/tables/mozilla/bugs/bug96343-expected.txt
+++ b/LayoutTests/platform/mac/tables/mozilla/bugs/bug96343-expected.txt
@@ -1,365 +1,194 @@
-layer at (0,0) size 785x2533
+layer at (0,0) size 785x1507
   RenderView at (0,0) size 785x600
-layer at (0,0) size 785x2533
-  RenderBlock {HTML} at (0,0) size 785x2533
-    RenderBody {BODY} at (8,8) size 769x2517
-      RenderTable {TABLE} at (0,0) size 227x839
-        RenderTableSection {TBODY} at (0,0) size 227x839
+layer at (0,0) size 785x1507
+  RenderBlock {HTML} at (0,0) size 785x1507
+    RenderBody {BODY} at (8,8) size 769x1491
+      RenderTable {TABLE} at (0,0) size 227x497
+        RenderTableSection {TBODY} at (0,0) size 227x497
           RenderTableRow {TR} at (0,2) size 227x20
             RenderTableCell {TD} at (2,2) size 223x20 [r=0 c=0 rs=1 cs=1]
               RenderText {#text} at (1,1) size 221x18
                 text run at (1,1) width 221: "Occasional height/width on images"
-          RenderTableRow (anonymous) at (0,24) size 227x16
-            RenderTableCell (anonymous) at (2,24) size 223x16 [r=1 c=0 rs=1 cs=1]
-              RenderBlock {FORM} at (0,0) size 223x0
-          RenderTableRow {TR} at (0,42) size 227x34
-            RenderTableCell {TD} at (2,42) size 223x34 [r=2 c=0 rs=1 cs=1]
+          RenderTableRow {TR} at (0,24) size 227x34
+            RenderTableCell {TD} at (2,24) size 223x34 [r=1 c=0 rs=1 cs=1]
               RenderImage {IMG} at (1,1) size 75x32
-          RenderTableRow (anonymous) at (0,78) size 227x16
-            RenderTableCell (anonymous) at (2,78) size 223x16 [r=3 c=0 rs=1 cs=1]
-              RenderBlock {FORM} at (0,0) size 223x0
-          RenderTableRow {TR} at (0,96) size 227x24
-            RenderTableCell {TD} at (2,96) size 223x24 [r=4 c=0 rs=1 cs=1]
+          RenderTableRow {TR} at (0,60) size 227x24
+            RenderTableCell {TD} at (2,60) size 223x24 [r=2 c=0 rs=1 cs=1]
               RenderImage {IMG} at (1,1) size 44x22
-          RenderTableRow (anonymous) at (0,122) size 227x16
-            RenderTableCell (anonymous) at (2,122) size 223x16 [r=5 c=0 rs=1 cs=1]
-              RenderBlock {FORM} at (0,0) size 223x0
-          RenderTableRow {TR} at (0,140) size 227x15
-            RenderTableCell {TD} at (2,140) size 223x15 [r=6 c=0 rs=1 cs=1]
+          RenderTableRow {TR} at (0,86) size 227x15
+            RenderTableCell {TD} at (2,86) size 223x15 [r=3 c=0 rs=1 cs=1]
               RenderImage {IMG} at (1,1) size 89x13
-          RenderTableRow (anonymous) at (0,157) size 227x16
-            RenderTableCell (anonymous) at (2,157) size 223x16 [r=7 c=0 rs=1 cs=1]
-              RenderBlock {FORM} at (0,0) size 223x0
-          RenderTableRow {TR} at (0,175) size 227x15
-            RenderTableCell {TD} at (2,175) size 223x15 [r=8 c=0 rs=1 cs=1]
+          RenderTableRow {TR} at (0,103) size 227x15
+            RenderTableCell {TD} at (2,103) size 223x15 [r=4 c=0 rs=1 cs=1]
               RenderImage {IMG} at (1,1) size 89x13
-          RenderTableRow (anonymous) at (0,192) size 227x16
-            RenderTableCell (anonymous) at (2,192) size 223x16 [r=9 c=0 rs=1 cs=1]
-              RenderBlock {FORM} at (0,0) size 223x0
-          RenderTableRow {TR} at (0,210) size 227x31
-            RenderTableCell {TD} at (2,210) size 223x31 [r=10 c=0 rs=1 cs=1]
+          RenderTableRow {TR} at (0,120) size 227x31
+            RenderTableCell {TD} at (2,120) size 223x31 [r=5 c=0 rs=1 cs=1]
               RenderImage {IMG} at (1,1) size 31x29
-          RenderTableRow (anonymous) at (0,243) size 227x16
-            RenderTableCell (anonymous) at (2,243) size 223x16 [r=11 c=0 rs=1 cs=1]
-              RenderBlock {FORM} at (0,0) size 223x0
-          RenderTableRow {TR} at (0,261) size 227x23
-            RenderTableCell {TD} at (2,261) size 223x23 [r=12 c=0 rs=1 cs=1]
+          RenderTableRow {TR} at (0,153) size 227x23
+            RenderTableCell {TD} at (2,153) size 223x23 [r=6 c=0 rs=1 cs=1]
               RenderImage {IMG} at (1,1) size 62x21
-          RenderTableRow (anonymous) at (0,286) size 227x16
-            RenderTableCell (anonymous) at (2,286) size 223x16 [r=13 c=0 rs=1 cs=1]
-              RenderBlock {FORM} at (0,0) size 223x0
-          RenderTableRow {TR} at (0,304) size 227x17
-            RenderTableCell {TD} at (2,304) size 223x17 [r=14 c=0 rs=1 cs=1]
+          RenderTableRow {TR} at (0,178) size 227x17
+            RenderTableCell {TD} at (2,178) size 223x17 [r=7 c=0 rs=1 cs=1]
               RenderImage {IMG} at (1,1) size 70x15
-          RenderTableRow (anonymous) at (0,323) size 227x16
-            RenderTableCell (anonymous) at (2,323) size 223x16 [r=15 c=0 rs=1 cs=1]
-              RenderBlock {FORM} at (0,0) size 223x0
-          RenderTableRow {TR} at (0,341) size 227x28
-            RenderTableCell {TD} at (2,341) size 223x28 [r=16 c=0 rs=1 cs=1]
+          RenderTableRow {TR} at (0,197) size 227x28
+            RenderTableCell {TD} at (2,197) size 223x28 [r=8 c=0 rs=1 cs=1]
               RenderImage {IMG} at (1,1) size 42x26
-          RenderTableRow (anonymous) at (0,371) size 227x16
-            RenderTableCell (anonymous) at (2,371) size 223x16 [r=17 c=0 rs=1 cs=1]
-              RenderBlock {FORM} at (0,0) size 223x0
-          RenderTableRow {TR} at (0,389) size 227x17
-            RenderTableCell {TD} at (2,389) size 223x17 [r=18 c=0 rs=1 cs=1]
+          RenderTableRow {TR} at (0,227) size 227x17
+            RenderTableCell {TD} at (2,227) size 223x17 [r=9 c=0 rs=1 cs=1]
               RenderImage {IMG} at (1,1) size 84x15
-          RenderTableRow (anonymous) at (0,408) size 227x16
-            RenderTableCell (anonymous) at (2,408) size 223x16 [r=19 c=0 rs=1 cs=1]
-              RenderBlock {FORM} at (0,0) size 223x0
-          RenderTableRow {TR} at (0,426) size 227x17
-            RenderTableCell {TD} at (2,426) size 223x17 [r=20 c=0 rs=1 cs=1]
+          RenderTableRow {TR} at (0,246) size 227x17
+            RenderTableCell {TD} at (2,246) size 223x17 [r=10 c=0 rs=1 cs=1]
               RenderImage {IMG} at (1,1) size 90x15
-          RenderTableRow (anonymous) at (0,445) size 227x16
-            RenderTableCell (anonymous) at (2,445) size 223x16 [r=21 c=0 rs=1 cs=1]
-              RenderBlock {FORM} at (0,0) size 223x0
-          RenderTableRow {TR} at (0,463) size 227x34
-            RenderTableCell {TD} at (2,463) size 223x34 [r=22 c=0 rs=1 cs=1]
+          RenderTableRow {TR} at (0,265) size 227x34
+            RenderTableCell {TD} at (2,265) size 223x34 [r=11 c=0 rs=1 cs=1]
               RenderImage {IMG} at (1,1) size 59x32
-          RenderTableRow (anonymous) at (0,499) size 227x16
-            RenderTableCell (anonymous) at (2,499) size 223x16 [r=23 c=0 rs=1 cs=1]
-              RenderBlock {FORM} at (0,0) size 223x0
-          RenderTableRow {TR} at (0,517) size 227x17
-            RenderTableCell {TD} at (2,517) size 223x17 [r=24 c=0 rs=1 cs=1]
+          RenderTableRow {TR} at (0,301) size 227x17
+            RenderTableCell {TD} at (2,301) size 223x17 [r=12 c=0 rs=1 cs=1]
               RenderImage {IMG} at (1,1) size 90x15
-          RenderTableRow (anonymous) at (0,536) size 227x16
-            RenderTableCell (anonymous) at (2,536) size 223x16 [r=25 c=0 rs=1 cs=1]
-              RenderBlock {FORM} at (0,0) size 223x0
-          RenderTableRow {TR} at (0,554) size 227x17
-            RenderTableCell {TD} at (2,554) size 223x17 [r=26 c=0 rs=1 cs=1]
+          RenderTableRow {TR} at (0,320) size 227x17
+            RenderTableCell {TD} at (2,320) size 223x17 [r=13 c=0 rs=1 cs=1]
               RenderImage {IMG} at (1,1) size 90x15
-          RenderTableRow (anonymous) at (0,573) size 227x16
-            RenderTableCell (anonymous) at (2,573) size 223x16 [r=27 c=0 rs=1 cs=1]
-              RenderBlock {FORM} at (0,0) size 223x0
-          RenderTableRow {TR} at (0,591) size 227x21
-            RenderTableCell {TD} at (2,591) size 223x21 [r=28 c=0 rs=1 cs=1]
+          RenderTableRow {TR} at (0,339) size 227x21
+            RenderTableCell {TD} at (2,339) size 223x21 [r=14 c=0 rs=1 cs=1]
               RenderImage {IMG} at (1,1) size 83x19
-          RenderTableRow (anonymous) at (0,614) size 227x16
-            RenderTableCell (anonymous) at (2,614) size 223x16 [r=29 c=0 rs=1 cs=1]
-              RenderBlock {FORM} at (0,0) size 223x0
-          RenderTableRow {TR} at (0,632) size 227x33
-            RenderTableCell {TD} at (2,632) size 223x33 [r=30 c=0 rs=1 cs=1]
+          RenderTableRow {TR} at (0,362) size 227x33
+            RenderTableCell {TD} at (2,362) size 223x33 [r=15 c=0 rs=1 cs=1]
               RenderImage {IMG} at (1,1) size 54x31
-          RenderTableRow (anonymous) at (0,667) size 227x16
-            RenderTableCell (anonymous) at (2,667) size 223x16 [r=31 c=0 rs=1 cs=1]
-              RenderBlock {FORM} at (0,0) size 223x0
-          RenderTableRow {TR} at (0,685) size 227x27
-            RenderTableCell {TD} at (2,685) size 223x27 [r=32 c=0 rs=1 cs=1]
+          RenderTableRow {TR} at (0,397) size 227x27
+            RenderTableCell {TD} at (2,397) size 223x27 [r=16 c=0 rs=1 cs=1]
               RenderImage {IMG} at (1,1) size 56x25
-          RenderTableRow (anonymous) at (0,714) size 227x16
-            RenderTableCell (anonymous) at (2,714) size 223x16 [r=33 c=0 rs=1 cs=1]
-              RenderBlock {FORM} at (0,0) size 223x0
-          RenderTableRow {TR} at (0,732) size 227x17
-            RenderTableCell {TD} at (2,732) size 223x17 [r=34 c=0 rs=1 cs=1]
+          RenderTableRow {TR} at (0,426) size 227x17
+            RenderTableCell {TD} at (2,426) size 223x17 [r=17 c=0 rs=1 cs=1]
               RenderImage {IMG} at (1,1) size 53x15
-          RenderTableRow (anonymous) at (0,751) size 227x16
-            RenderTableCell (anonymous) at (2,751) size 223x16 [r=35 c=0 rs=1 cs=1]
-              RenderBlock {FORM} at (0,0) size 223x0
-          RenderTableRow {TR} at (0,769) size 227x31
-            RenderTableCell {TD} at (2,769) size 223x31 [r=36 c=0 rs=1 cs=1]
+          RenderTableRow {TR} at (0,445) size 227x31
+            RenderTableCell {TD} at (2,445) size 223x31 [r=18 c=0 rs=1 cs=1]
               RenderImage {IMG} at (1,1) size 31x29
-          RenderTableRow (anonymous) at (0,802) size 227x16
-            RenderTableCell (anonymous) at (2,802) size 223x16 [r=37 c=0 rs=1 cs=1]
-              RenderBlock {FORM} at (0,0) size 223x0
-          RenderTableRow {TR} at (0,820) size 227x17
-            RenderTableCell {TD} at (2,820) size 223x17 [r=38 c=0 rs=1 cs=1]
+          RenderTableRow {TR} at (0,478) size 227x17
+            RenderTableCell {TD} at (2,478) size 223x17 [r=19 c=0 rs=1 cs=1]
               RenderImage {IMG} at (1,1) size 53x15
-      RenderTable {TABLE} at (0,839) size 265x839
-        RenderTableSection {TBODY} at (0,0) size 265x839
+      RenderTable {TABLE} at (0,497) size 265x497
+        RenderTableSection {TBODY} at (0,0) size 265x497
           RenderTableRow {TR} at (0,2) size 265x20
             RenderTableCell {TD} at (2,2) size 261x20 [r=0 c=0 rs=1 cs=1]
               RenderText {#text} at (1,1) size 259x18
                 text run at (1,1) width 259: "Images with height/width never specified"
-          RenderTableRow (anonymous) at (0,24) size 265x16
-            RenderTableCell (anonymous) at (2,24) size 261x16 [r=1 c=0 rs=1 cs=1]
-              RenderBlock {FORM} at (0,0) size 261x0
-          RenderTableRow {TR} at (0,42) size 265x34
-            RenderTableCell {TD} at (2,42) size 261x34 [r=2 c=0 rs=1 cs=1]
+          RenderTableRow {TR} at (0,24) size 265x34
+            RenderTableCell {TD} at (2,24) size 261x34 [r=1 c=0 rs=1 cs=1]
               RenderImage {IMG} at (1,1) size 75x32
-          RenderTableRow (anonymous) at (0,78) size 265x16
-            RenderTableCell (anonymous) at (2,78) size 261x16 [r=3 c=0 rs=1 cs=1]
-              RenderBlock {FORM} at (0,0) size 261x0
-          RenderTableRow {TR} at (0,96) size 265x24
-            RenderTableCell {TD} at (2,96) size 261x24 [r=4 c=0 rs=1 cs=1]
+          RenderTableRow {TR} at (0,60) size 265x24
+            RenderTableCell {TD} at (2,60) size 261x24 [r=2 c=0 rs=1 cs=1]
               RenderImage {IMG} at (1,1) size 44x22
-          RenderTableRow (anonymous) at (0,122) size 265x16
-            RenderTableCell (anonymous) at (2,122) size 261x16 [r=5 c=0 rs=1 cs=1]
-              RenderBlock {FORM} at (0,0) size 261x0
-          RenderTableRow {TR} at (0,140) size 265x15
-            RenderTableCell {TD} at (2,140) size 261x15 [r=6 c=0 rs=1 cs=1]
+          RenderTableRow {TR} at (0,86) size 265x15
+            RenderTableCell {TD} at (2,86) size 261x15 [r=3 c=0 rs=1 cs=1]
               RenderImage {IMG} at (1,1) size 89x13
-          RenderTableRow (anonymous) at (0,157) size 265x16
-            RenderTableCell (anonymous) at (2,157) size 261x16 [r=7 c=0 rs=1 cs=1]
-              RenderBlock {FORM} at (0,0) size 261x0
-          RenderTableRow {TR} at (0,175) size 265x15
-            RenderTableCell {TD} at (2,175) size 261x15 [r=8 c=0 rs=1 cs=1]
+          RenderTableRow {TR} at (0,103) size 265x15
+            RenderTableCell {TD} at (2,103) size 261x15 [r=4 c=0 rs=1 cs=1]
               RenderImage {IMG} at (1,1) size 89x13
-          RenderTableRow (anonymous) at (0,192) size 265x16
-            RenderTableCell (anonymous) at (2,192) size 261x16 [r=9 c=0 rs=1 cs=1]
-              RenderBlock {FORM} at (0,0) size 261x0
-          RenderTableRow {TR} at (0,210) size 265x31
-            RenderTableCell {TD} at (2,210) size 261x31 [r=10 c=0 rs=1 cs=1]
+          RenderTableRow {TR} at (0,120) size 265x31
+            RenderTableCell {TD} at (2,120) size 261x31 [r=5 c=0 rs=1 cs=1]
               RenderImage {IMG} at (1,1) size 31x29
-          RenderTableRow (anonymous) at (0,243) size 265x16
-            RenderTableCell (anonymous) at (2,243) size 261x16 [r=11 c=0 rs=1 cs=1]
-              RenderBlock {FORM} at (0,0) size 261x0
-          RenderTableRow {TR} at (0,261) size 265x23
-            RenderTableCell {TD} at (2,261) size 261x23 [r=12 c=0 rs=1 cs=1]
+          RenderTableRow {TR} at (0,153) size 265x23
+            RenderTableCell {TD} at (2,153) size 261x23 [r=6 c=0 rs=1 cs=1]
               RenderImage {IMG} at (1,1) size 62x21
-          RenderTableRow (anonymous) at (0,286) size 265x16
-            RenderTableCell (anonymous) at (2,286) size 261x16 [r=13 c=0 rs=1 cs=1]
-              RenderBlock {FORM} at (0,0) size 261x0
-          RenderTableRow {TR} at (0,304) size 265x17
-            RenderTableCell {TD} at (2,304) size 261x17 [r=14 c=0 rs=1 cs=1]
+          RenderTableRow {TR} at (0,178) size 265x17
+            RenderTableCell {TD} at (2,178) size 261x17 [r=7 c=0 rs=1 cs=1]
               RenderImage {IMG} at (1,1) size 70x15
-          RenderTableRow (anonymous) at (0,323) size 265x16
-            RenderTableCell (anonymous) at (2,323) size 261x16 [r=15 c=0 rs=1 cs=1]
-              RenderBlock {FORM} at (0,0) size 261x0
-          RenderTableRow {TR} at (0,341) size 265x28
-            RenderTableCell {TD} at (2,341) size 261x28 [r=16 c=0 rs=1 cs=1]
+          RenderTableRow {TR} at (0,197) size 265x28
+            RenderTableCell {TD} at (2,197) size 261x28 [r=8 c=0 rs=1 cs=1]
               RenderImage {IMG} at (1,1) size 42x26
-          RenderTableRow (anonymous) at (0,371) size 265x16
-            RenderTableCell (anonymous) at (2,371) size 261x16 [r=17 c=0 rs=1 cs=1]
-              RenderBlock {FORM} at (0,0) size 261x0
-          RenderTableRow {TR} at (0,389) size 265x17
-            RenderTableCell {TD} at (2,389) size 261x17 [r=18 c=0 rs=1 cs=1]
+          RenderTableRow {TR} at (0,227) size 265x17
+            RenderTableCell {TD} at (2,227) size 261x17 [r=9 c=0 rs=1 cs=1]
               RenderImage {IMG} at (1,1) size 84x15
-          RenderTableRow (anonymous) at (0,408) size 265x16
-            RenderTableCell (anonymous) at (2,408) size 261x16 [r=19 c=0 rs=1 cs=1]
-              RenderBlock {FORM} at (0,0) size 261x0
-          RenderTableRow {TR} at (0,426) size 265x17
-            RenderTableCell {TD} at (2,426) size 261x17 [r=20 c=0 rs=1 cs=1]
+          RenderTableRow {TR} at (0,246) size 265x17
+            RenderTableCell {TD} at (2,246) size 261x17 [r=10 c=0 rs=1 cs=1]
               RenderImage {IMG} at (1,1) size 90x15
-          RenderTableRow (anonymous) at (0,445) size 265x16
-            RenderTableCell (anonymous) at (2,445) size 261x16 [r=21 c=0 rs=1 cs=1]
-              RenderBlock {FORM} at (0,0) size 261x0
-          RenderTableRow {TR} at (0,463) size 265x34
-            RenderTableCell {TD} at (2,463) size 261x34 [r=22 c=0 rs=1 cs=1]
+          RenderTableRow {TR} at (0,265) size 265x34
+            RenderTableCell {TD} at (2,265) size 261x34 [r=11 c=0 rs=1 cs=1]
               RenderImage {IMG} at (1,1) size 59x32
-          RenderTableRow (anonymous) at (0,499) size 265x16
-            RenderTableCell (anonymous) at (2,499) size 261x16 [r=23 c=0 rs=1 cs=1]
-              RenderBlock {FORM} at (0,0) size 261x0
-          RenderTableRow {TR} at (0,517) size 265x17
-            RenderTableCell {TD} at (2,517) size 261x17 [r=24 c=0 rs=1 cs=1]
+          RenderTableRow {TR} at (0,301) size 265x17
+            RenderTableCell {TD} at (2,301) size 261x17 [r=12 c=0 rs=1 cs=1]
               RenderImage {IMG} at (1,1) size 90x15
-          RenderTableRow (anonymous) at (0,536) size 265x16
-            RenderTableCell (anonymous) at (2,536) size 261x16 [r=25 c=0 rs=1 cs=1]
-              RenderBlock {FORM} at (0,0) size 261x0
-          RenderTableRow {TR} at (0,554) size 265x17
-            RenderTableCell {TD} at (2,554) size 261x17 [r=26 c=0 rs=1 cs=1]
+          RenderTableRow {TR} at (0,320) size 265x17
+            RenderTableCell {TD} at (2,320) size 261x17 [r=13 c=0 rs=1 cs=1]
               RenderImage {IMG} at (1,1) size 90x15
-          RenderTableRow (anonymous) at (0,573) size 265x16
-            RenderTableCell (anonymous) at (2,573) size 261x16 [r=27 c=0 rs=1 cs=1]
-              RenderBlock {FORM} at (0,0) size 261x0
-          RenderTableRow {TR} at (0,591) size 265x21
-            RenderTableCell {TD} at (2,591) size 261x21 [r=28 c=0 rs=1 cs=1]
+          RenderTableRow {TR} at (0,339) size 265x21
+            RenderTableCell {TD} at (2,339) size 261x21 [r=14 c=0 rs=1 cs=1]
               RenderImage {IMG} at (1,1) size 83x19
-          RenderTableRow (anonymous) at (0,614) size 265x16
-            RenderTableCell (anonymous) at (2,614) size 261x16 [r=29 c=0 rs=1 cs=1]
-              RenderBlock {FORM} at (0,0) size 261x0
-          RenderTableRow {TR} at (0,632) size 265x33
-            RenderTableCell {TD} at (2,632) size 261x33 [r=30 c=0 rs=1 cs=1]
+          RenderTableRow {TR} at (0,362) size 265x33
+            RenderTableCell {TD} at (2,362) size 261x33 [r=15 c=0 rs=1 cs=1]
               RenderImage {IMG} at (1,1) size 54x31
-          RenderTableRow (anonymous) at (0,667) size 265x16
-            RenderTableCell (anonymous) at (2,667) size 261x16 [r=31 c=0 rs=1 cs=1]
-              RenderBlock {FORM} at (0,0) size 261x0
-          RenderTableRow {TR} at (0,685) size 265x27
-            RenderTableCell {TD} at (2,685) size 261x27 [r=32 c=0 rs=1 cs=1]
+          RenderTableRow {TR} at (0,397) size 265x27
+            RenderTableCell {TD} at (2,397) size 261x27 [r=16 c=0 rs=1 cs=1]
               RenderImage {IMG} at (1,1) size 56x25
-          RenderTableRow (anonymous) at (0,714) size 265x16
-            RenderTableCell (anonymous) at (2,714) size 261x16 [r=33 c=0 rs=1 cs=1]
-              RenderBlock {FORM} at (0,0) size 261x0
-          RenderTableRow {TR} at (0,732) size 265x17
-            RenderTableCell {TD} at (2,732) size 261x17 [r=34 c=0 rs=1 cs=1]
+          RenderTableRow {TR} at (0,426) size 265x17
+            RenderTableCell {TD} at (2,426) size 261x17 [r=17 c=0 rs=1 cs=1]
               RenderImage {IMG} at (1,1) size 53x15
-          RenderTableRow (anonymous) at (0,751) size 265x16
-            RenderTableCell (anonymous) at (2,751) size 261x16 [r=35 c=0 rs=1 cs=1]
-              RenderBlock {FORM} at (0,0) size 261x0
-          RenderTableRow {TR} at (0,769) size 265x31
-            RenderTableCell {TD} at (2,769) size 261x31 [r=36 c=0 rs=1 cs=1]
+          RenderTableRow {TR} at (0,445) size 265x31
+            RenderTableCell {TD} at (2,445) size 261x31 [r=18 c=0 rs=1 cs=1]
               RenderImage {IMG} at (1,1) size 31x29
-          RenderTableRow (anonymous) at (0,802) size 265x16
-            RenderTableCell (anonymous) at (2,802) size 261x16 [r=37 c=0 rs=1 cs=1]
-              RenderBlock {FORM} at (0,0) size 261x0
-          RenderTableRow {TR} at (0,820) size 265x17
-            RenderTableCell {TD} at (2,820) size 261x17 [r=38 c=0 rs=1 cs=1]
+          RenderTableRow {TR} at (0,478) size 265x17
+            RenderTableCell {TD} at (2,478) size 261x17 [r=19 c=0 rs=1 cs=1]
               RenderImage {IMG} at (1,1) size 53x15
-      RenderTable {TABLE} at (0,1678) size 274x839
-        RenderTableSection {TBODY} at (0,0) size 274x839
+      RenderTable {TABLE} at (0,994) size 274x497
+        RenderTableSection {TBODY} at (0,0) size 274x497
           RenderTableRow {TR} at (0,2) size 274x20
             RenderTableCell {TD} at (2,2) size 270x20 [r=0 c=0 rs=1 cs=1]
               RenderText {#text} at (1,1) size 268x18
                 text run at (1,1) width 268: "Images with height/width always specified"
-          RenderTableRow (anonymous) at (0,24) size 274x16
-            RenderTableCell (anonymous) at (2,24) size 270x16 [r=1 c=0 rs=1 cs=1]
-              RenderBlock {FORM} at (0,0) size 270x0
-          RenderTableRow {TR} at (0,42) size 274x34
-            RenderTableCell {TD} at (2,42) size 270x34 [r=2 c=0 rs=1 cs=1]
+          RenderTableRow {TR} at (0,24) size 274x34
+            RenderTableCell {TD} at (2,24) size 270x34 [r=1 c=0 rs=1 cs=1]
               RenderImage {IMG} at (1,1) size 75x32
-          RenderTableRow (anonymous) at (0,78) size 274x16
-            RenderTableCell (anonymous) at (2,78) size 270x16 [r=3 c=0 rs=1 cs=1]
-              RenderBlock {FORM} at (0,0) size 270x0
-          RenderTableRow {TR} at (0,96) size 274x24
-            RenderTableCell {TD} at (2,96) size 270x24 [r=4 c=0 rs=1 cs=1]
+          RenderTableRow {TR} at (0,60) size 274x24
+            RenderTableCell {TD} at (2,60) size 270x24 [r=2 c=0 rs=1 cs=1]
               RenderImage {IMG} at (1,1) size 44x22
-          RenderTableRow (anonymous) at (0,122) size 274x16
-            RenderTableCell (anonymous) at (2,122) size 270x16 [r=5 c=0 rs=1 cs=1]
-              RenderBlock {FORM} at (0,0) size 270x0
-          RenderTableRow {TR} at (0,140) size 274x15
-            RenderTableCell {TD} at (2,140) size 270x15 [r=6 c=0 rs=1 cs=1]
+          RenderTableRow {TR} at (0,86) size 274x15
+            RenderTableCell {TD} at (2,86) size 270x15 [r=3 c=0 rs=1 cs=1]
               RenderImage {IMG} at (1,1) size 89x13
-          RenderTableRow (anonymous) at (0,157) size 274x16
-            RenderTableCell (anonymous) at (2,157) size 270x16 [r=7 c=0 rs=1 cs=1]
-              RenderBlock {FORM} at (0,0) size 270x0
-          RenderTableRow {TR} at (0,175) size 274x15
-            RenderTableCell {TD} at (2,175) size 270x15 [r=8 c=0 rs=1 cs=1]
+          RenderTableRow {TR} at (0,103) size 274x15
+            RenderTableCell {TD} at (2,103) size 270x15 [r=4 c=0 rs=1 cs=1]
               RenderImage {IMG} at (1,1) size 89x13
-          RenderTableRow (anonymous) at (0,192) size 274x16
-            RenderTableCell (anonymous) at (2,192) size 270x16 [r=9 c=0 rs=1 cs=1]
-              RenderBlock {FORM} at (0,0) size 270x0
-          RenderTableRow {TR} at (0,210) size 274x31
-            RenderTableCell {TD} at (2,210) size 270x31 [r=10 c=0 rs=1 cs=1]
+          RenderTableRow {TR} at (0,120) size 274x31
+            RenderTableCell {TD} at (2,120) size 270x31 [r=5 c=0 rs=1 cs=1]
               RenderImage {IMG} at (1,1) size 31x29
-          RenderTableRow (anonymous) at (0,243) size 274x16
-            RenderTableCell (anonymous) at (2,243) size 270x16 [r=11 c=0 rs=1 cs=1]
-              RenderBlock {FORM} at (0,0) size 270x0
-          RenderTableRow {TR} at (0,261) size 274x23
-            RenderTableCell {TD} at (2,261) size 270x23 [r=12 c=0 rs=1 cs=1]
+          RenderTableRow {TR} at (0,153) size 274x23
+            RenderTableCell {TD} at (2,153) size 270x23 [r=6 c=0 rs=1 cs=1]
               RenderImage {IMG} at (1,1) size 62x21
-          RenderTableRow (anonymous) at (0,286) size 274x16
-            RenderTableCell (anonymous) at (2,286) size 270x16 [r=13 c=0 rs=1 cs=1]
-              RenderBlock {FORM} at (0,0) size 270x0
-          RenderTableRow {TR} at (0,304) size 274x17
-            RenderTableCell {TD} at (2,304) size 270x17 [r=14 c=0 rs=1 cs=1]
+          RenderTableRow {TR} at (0,178) size 274x17
+            RenderTableCell {TD} at (2,178) size 270x17 [r=7 c=0 rs=1 cs=1]
               RenderImage {IMG} at (1,1) size 70x15
-          RenderTableRow (anonymous) at (0,323) size 274x16
-            RenderTableCell (anonymous) at (2,323) size 270x16 [r=15 c=0 rs=1 cs=1]
-              RenderBlock {FORM} at (0,0) size 270x0
-          RenderTableRow {TR} at (0,341) size 274x28
-            RenderTableCell {TD} at (2,341) size 270x28 [r=16 c=0 rs=1 cs=1]
+          RenderTableRow {TR} at (0,197) size 274x28
+            RenderTableCell {TD} at (2,197) size 270x28 [r=8 c=0 rs=1 cs=1]
               RenderImage {IMG} at (1,1) size 42x26
-          RenderTableRow (anonymous) at (0,371) size 274x16
-            RenderTableCell (anonymous) at (2,371) size 270x16 [r=17 c=0 rs=1 cs=1]
-              RenderBlock {FORM} at (0,0) size 270x0
-          RenderTableRow {TR} at (0,389) size 274x17
-            RenderTableCell {TD} at (2,389) size 270x17 [r=18 c=0 rs=1 cs=1]
+          RenderTableRow {TR} at (0,227) size 274x17
+            RenderTableCell {TD} at (2,227) size 270x17 [r=9 c=0 rs=1 cs=1]
               RenderImage {IMG} at (1,1) size 84x15
-          RenderTableRow (anonymous) at (0,408) size 274x16
-            RenderTableCell (anonymous) at (2,408) size 270x16 [r=19 c=0 rs=1 cs=1]
-              RenderBlock {FORM} at (0,0) size 270x0
-          RenderTableRow {TR} at (0,426) size 274x17
-            RenderTableCell {TD} at (2,426) size 270x17 [r=20 c=0 rs=1 cs=1]
+          RenderTableRow {TR} at (0,246) size 274x17
+            RenderTableCell {TD} at (2,246) size 270x17 [r=10 c=0 rs=1 cs=1]
               RenderImage {IMG} at (1,1) size 90x15
-          RenderTableRow (anonymous) at (0,445) size 274x16
-            RenderTableCell (anonymous) at (2,445) size 270x16 [r=21 c=0 rs=1 cs=1]
-              RenderBlock {FORM} at (0,0) size 270x0
-          RenderTableRow {TR} at (0,463) size 274x34
-            RenderTableCell {TD} at (2,463) size 270x34 [r=22 c=0 rs=1 cs=1]
+          RenderTableRow {TR} at (0,265) size 274x34
+            RenderTableCell {TD} at (2,265) size 270x34 [r=11 c=0 rs=1 cs=1]
               RenderImage {IMG} at (1,1) size 59x32
-          RenderTableRow (anonymous) at (0,499) size 274x16
-            RenderTableCell (anonymous) at (2,499) size 270x16 [r=23 c=0 rs=1 cs=1]
-              RenderBlock {FORM} at (0,0) size 270x0
-          RenderTableRow {TR} at (0,517) size 274x17
-            RenderTableCell {TD} at (2,517) size 270x17 [r=24 c=0 rs=1 cs=1]
+          RenderTableRow {TR} at (0,301) size 274x17
+            RenderTableCell {TD} at (2,301) size 270x17 [r=12 c=0 rs=1 cs=1]
               RenderImage {IMG} at (1,1) size 90x15
-          RenderTableRow (anonymous) at (0,536) size 274x16
-            RenderTableCell (anonymous) at (2,536) size 270x16 [r=25 c=0 rs=1 cs=1]
-              RenderBlock {FORM} at (0,0) size 270x0
-          RenderTableRow {TR} at (0,554) size 274x17
-            RenderTableCell {TD} at (2,554) size 270x17 [r=26 c=0 rs=1 cs=1]
+          RenderTableRow {TR} at (0,320) size 274x17
+            RenderTableCell {TD} at (2,320) size 270x17 [r=13 c=0 rs=1 cs=1]
               RenderImage {IMG} at (1,1) size 90x15
-          RenderTableRow (anonymous) at (0,573) size 274x16
-            RenderTableCell (anonymous) at (2,573) size 270x16 [r=27 c=0 rs=1 cs=1]
-              RenderBlock {FORM} at (0,0) size 270x0
-          RenderTableRow {TR} at (0,591) size 274x21
-            RenderTableCell {TD} at (2,591) size 270x21 [r=28 c=0 rs=1 cs=1]
+          RenderTableRow {TR} at (0,339) size 274x21
+            RenderTableCell {TD} at (2,339) size 270x21 [r=14 c=0 rs=1 cs=1]
               RenderImage {IMG} at (1,1) size 83x19
-          RenderTableRow (anonymous) at (0,614) size 274x16
-            RenderTableCell (anonymous) at (2,614) size 270x16 [r=29 c=0 rs=1 cs=1]
-              RenderBlock {FORM} at (0,0) size 270x0
-          RenderTableRow {TR} at (0,632) size 274x33
-            RenderTableCell {TD} at (2,632) size 270x33 [r=30 c=0 rs=1 cs=1]
+          RenderTableRow {TR} at (0,362) size 274x33
+            RenderTableCell {TD} at (2,362) size 270x33 [r=15 c=0 rs=1 cs=1]
               RenderImage {IMG} at (1,1) size 54x31
-          RenderTableRow (anonymous) at (0,667) size 274x16
-            RenderTableCell (anonymous) at (2,667) size 270x16 [r=31 c=0 rs=1 cs=1]
-              RenderBlock {FORM} at (0,0) size 270x0
-          RenderTableRow {TR} at (0,685) size 274x27
-            RenderTableCell {TD} at (2,685) size 270x27 [r=32 c=0 rs=1 cs=1]
+          RenderTableRow {TR} at (0,397) size 274x27
+            RenderTableCell {TD} at (2,397) size 270x27 [r=16 c=0 rs=1 cs=1]
               RenderImage {IMG} at (1,1) size 56x25
-          RenderTableRow (anonymous) at (0,714) size 274x16
-            RenderTableCell (anonymous) at (2,714) size 270x16 [r=33 c=0 rs=1 cs=1]
-              RenderBlock {FORM} at (0,0) size 270x0
-          RenderTableRow {TR} at (0,732) size 274x17
-            RenderTableCell {TD} at (2,732) size 270x17 [r=34 c=0 rs=1 cs=1]
+          RenderTableRow {TR} at (0,426) size 274x17
+            RenderTableCell {TD} at (2,426) size 270x17 [r=17 c=0 rs=1 cs=1]
               RenderImage {IMG} at (1,1) size 53x15
-          RenderTableRow (anonymous) at (0,751) size 274x16
-            RenderTableCell (anonymous) at (2,751) size 270x16 [r=35 c=0 rs=1 cs=1]
-              RenderBlock {FORM} at (0,0) size 270x0
-          RenderTableRow {TR} at (0,769) size 274x31
-            RenderTableCell {TD} at (2,769) size 270x31 [r=36 c=0 rs=1 cs=1]
+          RenderTableRow {TR} at (0,445) size 274x31
+            RenderTableCell {TD} at (2,445) size 270x31 [r=18 c=0 rs=1 cs=1]
               RenderImage {IMG} at (1,1) size 31x29
-          RenderTableRow (anonymous) at (0,802) size 274x16
-            RenderTableCell (anonymous) at (2,802) size 270x16 [r=37 c=0 rs=1 cs=1]
-              RenderBlock {FORM} at (0,0) size 270x0
-          RenderTableRow {TR} at (0,820) size 274x17
-            RenderTableCell {TD} at (2,820) size 270x17 [r=38 c=0 rs=1 cs=1]
+          RenderTableRow {TR} at (0,478) size 274x17
+            RenderTableCell {TD} at (2,478) size 270x17 [r=19 c=0 rs=1 cs=1]
               RenderImage {IMG} at (1,1) size 53x15
diff --git a/LayoutTests/platform/mac/tables/mozilla_expected_failures/bugs/bug1725-expected.txt b/LayoutTests/platform/mac/tables/mozilla_expected_failures/bugs/bug1725-expected.txt
index 4ca3a66..df17b4a 100644
--- a/LayoutTests/platform/mac/tables/mozilla_expected_failures/bugs/bug1725-expected.txt
+++ b/LayoutTests/platform/mac/tables/mozilla_expected_failures/bugs/bug1725-expected.txt
@@ -3,8 +3,8 @@ layer 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
-      RenderTable {TABLE} at (0,0) size 600x296 [bgcolor=#FFC0CB]
-        RenderTableSection {TBODY} at (0,0) size 600x296
+      RenderTable {TABLE} at (0,0) size 600x280 [bgcolor=#FFC0CB]
+        RenderTableSection {TBODY} at (0,0) size 600x280
           RenderTableRow {TR} at (0,0) size 600x18
             RenderTableCell {TD} at (0,0) size 600x18 [bgcolor=#FFFF00] [r=0 c=0 rs=1 cs=3]
               RenderText {#text} at (0,0) size 8x18
@@ -17,11 +17,8 @@ layer at (0,0) size 800x600
             RenderTableCell {TD} at (0,36) size 155x18 [bgcolor=#00FFFF] [r=2 c=0 rs=40 cs=1]
               RenderText {#text} at (0,0) size 8x18
                 text run at (0,0) width 8: "3"
-          RenderTableRow (anonymous) at (0,36) size 600x16
-            RenderTableCell (anonymous) at (155,36) size 445x16 [r=3 c=1 rs=1 cs=1]
-              RenderBlock {FORM} at (0,0) size 445x0
-          RenderTableRow {TR} at (0,52) size 600x28
-            RenderTableCell {TD} at (155,52) size 445x28 [bgcolor=#FFA500] [r=4 c=1 rs=1 cs=1]
+          RenderTableRow {TR} at (0,36) size 600x28
+            RenderTableCell {TD} at (155,36) size 445x28 [bgcolor=#FFA500] [r=3 c=1 rs=1 cs=1]
               RenderTable {TABLE} at (0,0) size 440x28
                 RenderTableSection {TBODY} at (0,0) size 440x28
                   RenderTableRow {TR} at (0,2) size 440x24
@@ -33,22 +30,22 @@ layer at (0,0) size 800x600
                     RenderTableCell {TD} at (221,4) size 217x20 [r=0 c=1 rs=1 cs=1]
                       RenderText {#text} at (1,1) size 8x18
                         text run at (1,1) width 8: "4"
-          RenderTableRow {TR} at (0,80) size 600x18
-            RenderTableCell {TD} at (155,80) size 445x18 [bgcolor=#FF0000] [r=5 c=1 rs=1 cs=1]
+          RenderTableRow {TR} at (0,64) size 600x18
+            RenderTableCell {TD} at (155,64) size 445x18 [bgcolor=#FF0000] [r=4 c=1 rs=1 cs=1]
               RenderText {#text} at (0,0) size 8x18
                 text run at (0,0) width 8: "5"
-          RenderTableRow {TR} at (0,98) size 600x36
-            RenderTableCell {TD} at (155,98) size 445x36 [bgcolor=#FFFF00] [r=6 c=1 rs=1 cs=1]
+          RenderTableRow {TR} at (0,82) size 600x36
+            RenderTableCell {TD} at (155,82) size 445x36 [bgcolor=#FFFF00] [r=5 c=1 rs=1 cs=1]
               RenderText {#text} at (0,0) size 426x36
                 text run at (0,0) width 257: "If you have entered your feature criteria, "
                 text run at (257,0) width 169: "press the \"Submit Criteria\""
                 text run at (0,18) width 86: "button above."
-          RenderTableRow {TR} at (0,134) size 600x18
-            RenderTableCell {TD} at (155,134) size 445x18 [bgcolor=#D3D3D3] [r=7 c=1 rs=1 cs=1]
+          RenderTableRow {TR} at (0,118) size 600x18
+            RenderTableCell {TD} at (155,118) size 445x18 [bgcolor=#D3D3D3] [r=6 c=1 rs=1 cs=1]
               RenderText {#text} at (0,0) size 8x18
                 text run at (0,0) width 8: "6"
-          RenderTableRow {TR} at (0,152) size 600x54
-            RenderTableCell {TD} at (155,152) size 445x54 [r=8 c=1 rs=1 cs=1]
+          RenderTableRow {TR} at (0,136) size 600x54
+            RenderTableCell {TD} at (155,136) size 445x54 [r=7 c=1 rs=1 cs=1]
               RenderText {#text} at (0,0) size 438x54
                 text run at (0,0) width 262: "If you want to do a radius search instead, "
                 text run at (262,0) width 164: "press the \"Radius Search\""
@@ -56,12 +53,12 @@ layer at (0,0) size 800x600
                 text run at (48,18) width 279: "This will allow you to select a starting point "
                 text run at (327,18) width 111: "and enter a radius"
                 text run at (0,36) width 157: "with new feature criteria."
-          RenderTableRow {TR} at (0,206) size 600x18
-            RenderTableCell {TD} at (155,206) size 445x18 [r=9 c=1 rs=1 cs=1]
+          RenderTableRow {TR} at (0,190) size 600x18
+            RenderTableCell {TD} at (155,190) size 445x18 [r=8 c=1 rs=1 cs=1]
               RenderText {#text} at (0,0) size 4x18
                 text run at (0,0) width 4: " "
-          RenderTableRow {TR} at (0,224) size 600x72
-            RenderTableCell {TD} at (155,224) size 445x72 [r=10 c=1 rs=1 cs=1]
+          RenderTableRow {TR} at (0,208) size 600x72
+            RenderTableCell {TD} at (155,208) size 445x72 [r=9 c=1 rs=1 cs=1]
               RenderText {#text} at (0,0) size 436x72
                 text run at (0,0) width 436: "All information provided is deemed reliable but is not guaranteed and"
                 text run at (0,18) width 65: "should be "
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 34d7c90..72cbbb9 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,23 @@
+2010-08-28  Adam Barth  <abarth at webkit.org>
+
+        Reviewed by Eric Seidel.
+
+        HTMLTreeBuilder needs to call HTMLFormElement::setDemoted
+        https://bugs.webkit.org/show_bug.cgi?id=44781
+
+        This patch teaches the HTMLTreeBuilder about demoted form elements.
+        Demoting a form element magically stops the form element from
+        rendering.  Demoted form elements are a concept from the
+        LegacyHTMLTreeBuilder, but they are somewhat of a hack because
+        rendering should be DOM-based.  We'll likely look for a better solution
+        in a future patch.
+
+        * html/parser/HTMLConstructionSite.cpp:
+        (WebCore::HTMLConstructionSite::insertHTMLFormElement):
+        * html/parser/HTMLConstructionSite.h:
+        * html/parser/HTMLTreeBuilder.cpp:
+        (WebCore::HTMLTreeBuilder::processStartTagForInTable):
+
 2010-08-28  Chris Guillory   <chris.guillory at google.com>
 
         Reviewed by Chris Fleizach.
diff --git a/WebCore/html/parser/HTMLConstructionSite.cpp b/WebCore/html/parser/HTMLConstructionSite.cpp
index b45ec6e..975b1af 100644
--- a/WebCore/html/parser/HTMLConstructionSite.cpp
+++ b/WebCore/html/parser/HTMLConstructionSite.cpp
@@ -253,9 +253,13 @@ void HTMLConstructionSite::insertHTMLBodyElement(AtomicHTMLToken& token)
     m_openElements.pushHTMLBodyElement(attachToCurrent(createHTMLElement(token)));
 }
 
-void HTMLConstructionSite::insertHTMLFormElement(AtomicHTMLToken& token)
+void HTMLConstructionSite::insertHTMLFormElement(AtomicHTMLToken& token, bool isDemoted)
 {
-    insertHTMLElement(token);
+    RefPtr<Element> element = createHTMLElement(token);
+    ASSERT(element->hasTagName(formTag));
+    RefPtr<HTMLFormElement> form = static_pointer_cast<HTMLFormElement>(element.release());
+    form->setDemoted(isDemoted);
+    m_openElements.push(attachToCurrent(form.release()));
     ASSERT(currentElement()->isHTMLElement());
     ASSERT(currentElement()->hasTagName(formTag));
     m_form = static_cast<HTMLFormElement*>(currentElement());
diff --git a/WebCore/html/parser/HTMLConstructionSite.h b/WebCore/html/parser/HTMLConstructionSite.h
index 2e746b4..6bed6a7 100644
--- a/WebCore/html/parser/HTMLConstructionSite.h
+++ b/WebCore/html/parser/HTMLConstructionSite.h
@@ -57,7 +57,7 @@ public:
     void insertHTMLHtmlElement(AtomicHTMLToken&);
     void insertHTMLHeadElement(AtomicHTMLToken&);
     void insertHTMLBodyElement(AtomicHTMLToken&);
-    void insertHTMLFormElement(AtomicHTMLToken&);
+    void insertHTMLFormElement(AtomicHTMLToken&, bool isDemoted = false);
     void insertScriptElement(AtomicHTMLToken&);
     void insertTextNode(const String&);
     void insertForeignElement(AtomicHTMLToken&, const AtomicString& namespaceURI);
diff --git a/WebCore/html/parser/HTMLTreeBuilder.cpp b/WebCore/html/parser/HTMLTreeBuilder.cpp
index 868f967..0918196 100644
--- a/WebCore/html/parser/HTMLTreeBuilder.cpp
+++ b/WebCore/html/parser/HTMLTreeBuilder.cpp
@@ -1154,7 +1154,7 @@ void HTMLTreeBuilder::processStartTagForInTable(AtomicHTMLToken& token)
             return;
         // FIXME: This deviates from the spec:
         //        http://www.w3.org/Bugs/Public/show_bug.cgi?id=10216
-        m_tree.insertHTMLFormElement(token);
+        m_tree.insertHTMLFormElement(token, true);
         m_tree.openElements()->pop();
         return;
     }

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list