2007-06-25 Mitz Pettel <mitz@webkit.org>

        Reviewed by Maciej.

        - fix http://bugs.webkit.org/show_bug.cgi?id=14341
          rules="none" ignored in certain cases

        Covered by existing tests.

        * html/HTMLTableElement.cpp:
        (WebCore::HTMLTableElement::getSharedCellDecl):

2007-06-25  Mitz Pettel  <mitz@webkit.org>

        Reviewed by Maciej.

        - updated results for http://bugs.webkit.org/show_bug.cgi?id=14341
          rules="none" ignored in certain cases

        * tables/mozilla/marvin/table_rules_none-expected.checksum: Added.
        * tables/mozilla/marvin/table_rules_none-expected.png: Added.
        * tables/mozilla/marvin/table_rules_none-expected.txt: Added.
        * tables/mozilla/marvin/table_rules_none.html: Copied from LayoutTests/tables/mozilla_expected_failures/marvin/table_rules_none.html.
        * tables/mozilla/marvin/x_table_rules_none-expected.checksum: Added.
        * tables/mozilla/marvin/x_table_rules_none-expected.png: Added.
        * tables/mozilla/marvin/x_table_rules_none-expected.txt: Added.
        * tables/mozilla/marvin/x_table_rules_none.xml: Copied from LayoutTests/tables/mozilla_expected_failures/marvin/x_table_rules_none.xml.
        * tables/mozilla_expected_failures/core/table_rules-expected.checksum:
        * tables/mozilla_expected_failures/core/table_rules-expected.png:
        * tables/mozilla_expected_failures/core/table_rules-expected.txt:
        * tables/mozilla_expected_failures/marvin/table_rules_none-expected.checksum: Removed.
        * tables/mozilla_expected_failures/marvin/table_rules_none-expected.png: Removed.
        * tables/mozilla_expected_failures/marvin/table_rules_none-expected.txt: Removed.
        * tables/mozilla_expected_failures/marvin/table_rules_none.html: Removed.
        * tables/mozilla_expected_failures/marvin/x_table_rules_none-expected.checksum: Removed.
        * tables/mozilla_expected_failures/marvin/x_table_rules_none-expected.png: Removed.
        * tables/mozilla_expected_failures/marvin/x_table_rules_none-expected.txt: Removed.
        * tables/mozilla_expected_failures/marvin/x_table_rules_none.xml: Removed.

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

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 36a371b..7ea6e47 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,30 @@
+2007-06-25  Mitz Pettel  <mitz@webkit.org>
+
+        Reviewed by Maciej.
+
+        - updated results for http://bugs.webkit.org/show_bug.cgi?id=14341
+          rules="none" ignored in certain cases
+
+        * tables/mozilla/marvin/table_rules_none-expected.checksum: Added.
+        * tables/mozilla/marvin/table_rules_none-expected.png: Added.
+        * tables/mozilla/marvin/table_rules_none-expected.txt: Added.
+        * tables/mozilla/marvin/table_rules_none.html: Copied from LayoutTests/tables/mozilla_expected_failures/marvin/table_rules_none.html.
+        * tables/mozilla/marvin/x_table_rules_none-expected.checksum: Added.
+        * tables/mozilla/marvin/x_table_rules_none-expected.png: Added.
+        * tables/mozilla/marvin/x_table_rules_none-expected.txt: Added.
+        * tables/mozilla/marvin/x_table_rules_none.xml: Copied from LayoutTests/tables/mozilla_expected_failures/marvin/x_table_rules_none.xml.
+        * tables/mozilla_expected_failures/core/table_rules-expected.checksum:
+        * tables/mozilla_expected_failures/core/table_rules-expected.png:
+        * tables/mozilla_expected_failures/core/table_rules-expected.txt:
+        * tables/mozilla_expected_failures/marvin/table_rules_none-expected.checksum: Removed.
+        * tables/mozilla_expected_failures/marvin/table_rules_none-expected.png: Removed.
+        * tables/mozilla_expected_failures/marvin/table_rules_none-expected.txt: Removed.
+        * tables/mozilla_expected_failures/marvin/table_rules_none.html: Removed.
+        * tables/mozilla_expected_failures/marvin/x_table_rules_none-expected.checksum: Removed.
+        * tables/mozilla_expected_failures/marvin/x_table_rules_none-expected.png: Removed.
+        * tables/mozilla_expected_failures/marvin/x_table_rules_none-expected.txt: Removed.
+        * tables/mozilla_expected_failures/marvin/x_table_rules_none.xml: Removed.
+
 2007-06-23  Sam Weinig  <sam@webkit.org>
 
         Reviewed by Mitz.

diff --git a/LayoutTests/tables/mozilla/marvin/table_rules_none-expected.checksum b/LayoutTests/tables/mozilla/marvin/table_rules_none-expected.checksum
new file mode 100644 (file)
index 0000000..596ab2c
--- /dev/null
+++ b/LayoutTests/tables/mozilla/marvin/table_rules_none-expected.checksum
@@ -0,0 +1 @@
+79d0e02a71e6bc300bd28e971fe2a77f
\ No newline at end of file

diff --git a/LayoutTests/tables/mozilla/marvin/table_rules_none-expected.png b/LayoutTests/tables/mozilla/marvin/table_rules_none-expected.png
new file mode 100644 (file)
index 0000000..6d32d69
Binary files /dev/null and b/LayoutTests/tables/mozilla/marvin/table_rules_none-expected.png differ

diff --git a/LayoutTests/tables/mozilla/marvin/table_rules_none-expected.txt b/LayoutTests/tables/mozilla/marvin/table_rules_none-expected.txt
new file mode 100644 (file)
index 0000000..8d503ee
--- /dev/null
+++ b/LayoutTests/tables/mozilla/marvin/table_rules_none-expected.txt
@@ -0,0 +1,60 @@
+layer at (0,0) size 800x600
+  RenderView 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 414x108 [border: (2px outset #808080)]
+        RenderBlock {CAPTION} at (0,0) size 409x18
+          RenderText {#text} at (10,0) size 388x18
+            text run at (10,0) width 388: "Communicator 4.5 Installers for Mac and Windows Platforms"
+        RenderTableSection {TBODY} at (2,20) size 409x85
+          RenderTableRow {TR} at (0,0) size 409x23
+            RenderTableCell {TH} at (0,9) size 119x5 [border: (3px none #000000)] [r=0 c=0 rs=1 cs=1]
+            RenderTableCell {TH} at (119,0) size 109x23 [border: (3px none #000000)] [r=0 c=1 rs=1 cs=1]
+              RenderText {#text} at (1,4) size 107x18
+                text run at (1,4) width 107: "Macintosh PPC"
+            RenderTableCell {TH} at (228,0) size 86x23 [border: (3px none #000000)] [r=0 c=2 rs=1 cs=1]
+              RenderText {#text} at (1,4) size 84x18
+                text run at (1,4) width 84: "Windows 95"
+            RenderTableCell {TH} at (314,0) size 95x23 [border: (3px none #000000)] [r=0 c=3 rs=1 cs=1]
+              RenderText {#text} at (1,4) size 91x18
+                text run at (1,4) width 91: "Windows NT"
+          RenderTableRow {TR} at (0,23) size 409x20
+            RenderTableCell {TD} at (0,23) size 119x20 [border: none] [r=1 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,1) size 73x18
+                text run at (4,1) width 73: "Base Install"
+            RenderTableCell {TD} at (119,23) size 109x20 [r=1 c=1 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 21x18
+                text run at (1,1) width 21: "yes"
+            RenderTableCell {TD} at (228,23) size 86x20 [r=1 c=2 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 21x18
+                text run at (1,1) width 21: "yes"
+            RenderTableCell {TD} at (314,23) size 95x20 [border: none] [r=1 c=3 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 21x18
+                text run at (1,1) width 21: "yes"
+          RenderTableRow {TR} at (0,43) size 409x20
+            RenderTableCell {TD} at (0,43) size 119x20 [border: none] [r=2 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,1) size 103x18
+                text run at (4,1) width 103: "Complete Install"
+            RenderTableCell {TD} at (119,43) size 109x20 [r=2 c=1 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 21x18
+                text run at (1,1) width 21: "yes"
+            RenderTableCell {TD} at (228,43) size 86x20 [r=2 c=2 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 21x18
+                text run at (1,1) width 21: "yes"
+            RenderTableCell {TD} at (314,43) size 95x20 [border: none] [r=2 c=3 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 21x18
+                text run at (1,1) width 21: "yes"
+          RenderTableRow {TR} at (0,63) size 409x22
+            RenderTableCell {TD} at (0,63) size 119x22 [border: none] [r=3 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,1) size 114x18
+                text run at (4,1) width 114: "Pro Edition Install"
+            RenderTableCell {TD} at (119,63) size 109x22 [border: none] [r=3 c=1 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 21x18
+                text run at (1,1) width 21: "yes"
+            RenderTableCell {TD} at (228,63) size 86x22 [border: none] [r=3 c=2 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 21x18
+                text run at (1,1) width 21: "yes"
+            RenderTableCell {TD} at (314,63) size 95x22 [border: none] [r=3 c=3 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 21x18
+                text run at (1,1) width 21: "yes"

diff --git a/LayoutTests/tables/mozilla_expected_failures/marvin/table_rules_none.html b/LayoutTests/tables/mozilla/marvin/table_rules_none.html
similarity index 100%
rename from LayoutTests/tables/mozilla_expected_failures/marvin/table_rules_none.html
rename to LayoutTests/tables/mozilla/marvin/table_rules_none.html

diff --git a/LayoutTests/tables/mozilla/marvin/x_table_rules_none-expected.checksum b/LayoutTests/tables/mozilla/marvin/x_table_rules_none-expected.checksum
new file mode 100644 (file)
index 0000000..dd49d81
--- /dev/null
+++ b/LayoutTests/tables/mozilla/marvin/x_table_rules_none-expected.checksum
@@ -0,0 +1 @@
+f00e3ac0c2f9708d61ff04773148abdc
\ No newline at end of file

diff --git a/LayoutTests/tables/mozilla/marvin/x_table_rules_none-expected.png b/LayoutTests/tables/mozilla/marvin/x_table_rules_none-expected.png
new file mode 100644 (file)
index 0000000..9f6c16d
Binary files /dev/null and b/LayoutTests/tables/mozilla/marvin/x_table_rules_none-expected.png differ

diff --git a/LayoutTests/tables/mozilla/marvin/x_table_rules_none-expected.txt b/LayoutTests/tables/mozilla/marvin/x_table_rules_none-expected.txt
new file mode 100644 (file)
index 0000000..4cf076e
--- /dev/null
+++ b/LayoutTests/tables/mozilla/marvin/x_table_rules_none-expected.txt
@@ -0,0 +1,59 @@
+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+layer at (0,0) size 800x140
+  RenderBlock {html} at (0,0) size 800x140
+    RenderBody {body} at (8,16) size 784x116
+      RenderBlock {p} at (0,0) size 784x18
+        RenderText {#text} at (0,0) size 479x18
+          text run at (0,0) width 402: "There should be no rules between any rows and columns in the "
+          text run at (402,0) width 77: "table below."
+      RenderTable {table} at (0,34) size 182x82 [border: none]
+        RenderTableCol {colgroup} at (0,0) size 0x0
+          RenderTableCol {col} at (0,0) size 0x0
+        RenderTableCol {colgroup} at (0,0) size 0x0
+          RenderTableCol {col} at (0,0) size 0x0
+        RenderTableCol {colgroup} at (0,0) size 0x0
+          RenderTableCol {col} at (0,0) size 0x0
+        RenderTableSection {thead} at (0,0) size 181x21
+          RenderTableRow {tr} at (0,0) size 181x21
+            RenderTableCell {th} at (0,0) size 61x21 [border: (1px none #000000)] [r=0 c=0 rs=1 cs=1]
+              RenderText {#text} at (2,2) size 58x18
+                text run at (2,2) width 58: "THEAD"
+            RenderTableCell {th} at (61,0) size 60x21 [border: (1px none #000000)] [r=0 c=1 rs=1 cs=1]
+              RenderText {#text} at (1,2) size 58x18
+                text run at (1,2) width 58: "THEAD"
+            RenderTableCell {th} at (121,0) size 60x21 [border: (1px none #000000)] [r=0 c=2 rs=1 cs=1]
+              RenderText {#text} at (1,2) size 58x18
+                text run at (1,2) width 58: "THEAD"
+        RenderTableSection {tfoot} at (0,61) size 181x20
+          RenderTableRow {tr} at (0,0) size 181x20
+            RenderTableCell {td} at (0,0) size 61x20 [border: none] [r=0 c=0 rs=1 cs=1]
+              RenderText {#text} at (2,1) size 53x18
+                text run at (2,1) width 53: "TFOOT"
+            RenderTableCell {td} at (61,0) size 60x20 [r=0 c=1 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 53x18
+                text run at (1,1) width 53: "TFOOT"
+            RenderTableCell {td} at (121,0) size 60x20 [r=0 c=2 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 53x18
+                text run at (1,1) width 53: "TFOOT"
+        RenderTableSection {tbody} at (0,21) size 181x40
+          RenderTableRow {tr} at (0,0) size 181x20
+            RenderTableCell {td} at (0,0) size 61x20 [border: none] [r=0 c=0 rs=1 cs=1]
+              RenderText {#text} at (2,1) size 57x18
+                text run at (2,1) width 57: "TBODY"
+            RenderTableCell {td} at (61,0) size 60x20 [r=0 c=1 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 57x18
+                text run at (1,1) width 57: "TBODY"
+            RenderTableCell {td} at (121,0) size 60x20 [r=0 c=2 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 57x18
+                text run at (1,1) width 57: "TBODY"
+          RenderTableRow {tr} at (0,20) size 181x20
+            RenderTableCell {td} at (0,20) size 61x20 [border: none] [r=1 c=0 rs=1 cs=1]
+              RenderText {#text} at (2,1) size 57x18
+                text run at (2,1) width 57: "TBODY"
+            RenderTableCell {td} at (61,20) size 60x20 [r=1 c=1 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 57x18
+                text run at (1,1) width 57: "TBODY"
+            RenderTableCell {td} at (121,20) size 60x20 [r=1 c=2 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 57x18
+                text run at (1,1) width 57: "TBODY"

diff --git a/LayoutTests/tables/mozilla_expected_failures/marvin/x_table_rules_none.xml b/LayoutTests/tables/mozilla/marvin/x_table_rules_none.xml
similarity index 100%
rename from LayoutTests/tables/mozilla_expected_failures/marvin/x_table_rules_none.xml
rename to LayoutTests/tables/mozilla/marvin/x_table_rules_none.xml

diff --git a/LayoutTests/tables/mozilla_expected_failures/core/table_rules-expected.checksum b/LayoutTests/tables/mozilla_expected_failures/core/table_rules-expected.checksum
index 36dc38e..d695b77 100644 (file)
--- a/LayoutTests/tables/mozilla_expected_failures/core/table_rules-expected.checksum
+++ b/LayoutTests/tables/mozilla_expected_failures/core/table_rules-expected.checksum
@@ -1 +1 @@
-7f2c3bfc246b6f3283af69b26e24220c
\ No newline at end of file
+1d8f3ae53ebe106bf881a7db38f70195
\ No newline at end of file

diff --git a/LayoutTests/tables/mozilla_expected_failures/core/table_rules-expected.png b/LayoutTests/tables/mozilla_expected_failures/core/table_rules-expected.png
index dc946d0..d510c51 100644 (file)
Binary files a/LayoutTests/tables/mozilla_expected_failures/core/table_rules-expected.png and b/LayoutTests/tables/mozilla_expected_failures/core/table_rules-expected.png differ

diff --git a/LayoutTests/tables/mozilla_expected_failures/core/table_rules-expected.txt b/LayoutTests/tables/mozilla_expected_failures/core/table_rules-expected.txt
index 2836230..507baec 100644 (file)
--- a/LayoutTests/tables/mozilla_expected_failures/core/table_rules-expected.txt
+++ b/LayoutTests/tables/mozilla_expected_failures/core/table_rules-expected.txt
@@ -3,25 +3,25 @@ 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 68x43 [border: none]
-        RenderTableSection {TBODY} at (0,0) size 67x42
-          RenderTableRow {TR} at (0,0) size 67x21
-            RenderTableCell {TD} at (0,0) size 33x21 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
-              RenderText {#text} at (2,2) size 30x18
-                text run at (2,2) width 30: "rules"
-            RenderTableCell {TD} at (33,0) size 34x21 [border: (1px inset #808080)] [r=0 c=1 rs=1 cs=1]
-              RenderText {#text} at (2,2) size 31x18
-                text run at (2,2) width 31: "none"
-          RenderTableRow {TR} at (0,21) size 67x21
-            RenderTableCell {TD} at (0,21) size 33x21 [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1]
+      RenderTable {TABLE} at (0,0) size 67x42 [border: none]
+        RenderTableSection {TBODY} at (0,0) size 66x41
+          RenderTableRow {TR} at (0,0) size 66x21
+            RenderTableCell {TD} at (0,0) size 33x21 [border: (1px none #000000)] [r=0 c=0 rs=1 cs=1]
               RenderText {#text} at (2,2) size 30x18
                 text run at (2,2) width 30: "rules"
-            RenderTableCell {TD} at (33,21) size 34x21 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1]
-              RenderText {#text} at (2,2) size 31x18
-                text run at (2,2) width 31: "none"
-      RenderBlock (anonymous) at (0,43) size 784x18
+            RenderTableCell {TD} at (33,0) size 33x21 [border: (1px none #000000)] [r=0 c=1 rs=1 cs=1]
+              RenderText {#text} at (1,2) size 31x18
+                text run at (1,2) width 31: "none"
+          RenderTableRow {TR} at (0,21) size 66x20
+            RenderTableCell {TD} at (0,21) size 33x20 [border: none] [r=1 c=0 rs=1 cs=1]
+              RenderText {#text} at (2,1) size 30x18
+                text run at (2,1) width 30: "rules"
+            RenderTableCell {TD} at (33,21) size 33x20 [r=1 c=1 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 31x18
+                text run at (1,1) width 31: "none"
+      RenderBlock (anonymous) at (0,42) size 784x18
         RenderBR {BR} at (0,0) size 0x18
-      RenderTable {TABLE} at (0,61) size 114x83 [border: none]
+      RenderTable {TABLE} at (0,60) size 114x83 [border: none]
         RenderTableSection {TBODY} at (0,0) size 113x41 [border: (1px solid #808080) none (1px solid #808080) none]
           RenderTableRow {TR} at (0,0) size 113x21
             RenderTableCell {TD} at (0,0) size 33x21 [border: (1px none #000000)] [r=0 c=0 rs=1 cs=1]
@@ -52,9 +52,9 @@ layer at (0,0) size 800x600
             RenderTableCell {TD} at (33,21) size 80x20 [r=1 c=1 rs=1 cs=1]
               RenderText {#text} at (1,1) size 78x18
                 text run at (1,1) width 78: "row group 2"
-      RenderBlock (anonymous) at (0,144) size 784x18
+      RenderBlock (anonymous) at (0,143) size 784x18
         RenderBR {BR} at (0,0) size 0x18
-      RenderTable {TABLE} at (0,162) size 214x42 [border: none]
+      RenderTable {TABLE} at (0,161) size 214x42 [border: none]
         RenderTableCol {COLGROUP} at (0,0) size 0x0 [border: (1px solid #000000) none (1px solid #000000)]
           RenderTableCol {COL} at (0,0) size 0x0
           RenderTableCol {COL} at (0,0) size 0x0
@@ -88,9 +88,9 @@ layer at (0,0) size 800x600
             RenderTableCell {TD} at (139,21) size 74x20 [r=1 c=3 rs=1 cs=1]
               RenderText {#text} at (1,1) size 72x18
                 text run at (1,1) width 72: "col group 2"
-      RenderBlock (anonymous) at (0,204) size 784x18
+      RenderBlock (anonymous) at (0,203) size 784x18
         RenderBR {BR} at (0,0) size 0x18
-      RenderTable {TABLE} at (0,222) size 67x43 [border: none]
+      RenderTable {TABLE} at (0,221) size 67x43 [border: none]
         RenderTableSection {TBODY} at (0,0) size 66x42
           RenderTableRow {TR} at (0,0) size 66x21
             RenderTableCell {TD} at (0,0) size 33x21 [border: (1px solid #808080) none none (1px none #808080)] [r=0 c=0 rs=1 cs=1]
@@ -106,9 +106,9 @@ layer at (0,0) size 800x600
             RenderTableCell {TD} at (33,21) size 33x21 [border: (1px solid #808080) none none none] [r=1 c=1 rs=1 cs=1]
               RenderText {#text} at (1,2) size 31x18
                 text run at (1,2) width 31: "rows"
-      RenderBlock (anonymous) at (0,265) size 784x18
+      RenderBlock (anonymous) at (0,264) size 784x18
         RenderBR {BR} at (0,0) size 0x18
-      RenderTable {TABLE} at (0,283) size 62x42 [border: none]
+      RenderTable {TABLE} at (0,282) size 62x42 [border: none]
         RenderTableSection {TBODY} at (0,0) size 61x41
           RenderTableRow {TR} at (0,0) size 61x21
             RenderTableCell {TD} at (0,0) size 33x21 [border: (1px none #808080) none none (1px solid #808080)] [r=0 c=0 rs=1 cs=1]
@@ -124,9 +124,9 @@ layer at (0,0) size 800x600
             RenderTableCell {TD} at (33,21) size 28x20 [border: none none none (1px solid #808080)] [r=1 c=1 rs=1 cs=1]
               RenderText {#text} at (2,1) size 25x18
                 text run at (2,1) width 25: "cols"
-      RenderBlock (anonymous) at (0,325) size 784x18
+      RenderBlock (anonymous) at (0,324) size 784x18
         RenderBR {BR} at (0,0) size 0x18
-      RenderTable {TABLE} at (0,343) size 52x43 [border: none]
+      RenderTable {TABLE} at (0,342) size 52x43 [border: none]
         RenderTableSection {TBODY} at (0,0) size 51x42
           RenderTableRow {TR} at (0,0) size 51x21
             RenderTableCell {TD} at (0,0) size 33x21 [border: (1px solid #808080)] [r=0 c=0 rs=1 cs=1]
@@ -142,5 +142,5 @@ layer at (0,0) size 800x600
             RenderTableCell {TD} at (33,21) size 18x21 [border: (1px solid #808080)] [r=1 c=1 rs=1 cs=1]
               RenderText {#text} at (2,2) size 15x18
                 text run at (2,2) width 15: "all"
-      RenderBlock (anonymous) at (0,386) size 784x18
+      RenderBlock (anonymous) at (0,385) size 784x18
         RenderBR {BR} at (0,0) size 0x18

diff --git a/LayoutTests/tables/mozilla_expected_failures/marvin/table_rules_none-expected.checksum b/LayoutTests/tables/mozilla_expected_failures/marvin/table_rules_none-expected.checksum
deleted file mode 100644 (file)
index 77f633c..0000000
--- a/LayoutTests/tables/mozilla_expected_failures/marvin/table_rules_none-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-f646f3097e4bceea6925fcb32517fa0d
\ No newline at end of file

diff --git a/LayoutTests/tables/mozilla_expected_failures/marvin/table_rules_none-expected.png b/LayoutTests/tables/mozilla_expected_failures/marvin/table_rules_none-expected.png
deleted file mode 100644 (file)
index f7fe5cf..0000000
Binary files a/LayoutTests/tables/mozilla_expected_failures/marvin/table_rules_none-expected.png and /dev/null differ

diff --git a/LayoutTests/tables/mozilla_expected_failures/marvin/table_rules_none-expected.txt b/LayoutTests/tables/mozilla_expected_failures/marvin/table_rules_none-expected.txt
deleted file mode 100644 (file)
index 3656cc5..0000000
--- a/LayoutTests/tables/mozilla_expected_failures/marvin/table_rules_none-expected.txt
+++ /dev/null
@@ -1,60 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView 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 417x111 [border: (2px outset #808080)]
-        RenderBlock {CAPTION} at (0,0) size 412x18
-          RenderText {#text} at (12,0) size 388x18
-            text run at (12,0) width 388: "Communicator 4.5 Installers for Mac and Windows Platforms"
-        RenderTableSection {TBODY} at (2,20) size 412x88
-          RenderTableRow {TR} at (0,0) size 412x23
-            RenderTableCell {TH} at (0,9) size 119x5 [border: (3px inset #808080)] [r=0 c=0 rs=1 cs=1]
-            RenderTableCell {TH} at (119,0) size 110x23 [border: (3px inset #808080)] [r=0 c=1 rs=1 cs=1]
-              RenderText {#text} at (2,4) size 107x18
-                text run at (2,4) width 107: "Macintosh PPC"
-            RenderTableCell {TH} at (229,0) size 87x23 [border: (3px inset #808080)] [r=0 c=2 rs=1 cs=1]
-              RenderText {#text} at (2,4) size 84x18
-                text run at (2,4) width 84: "Windows 95"
-            RenderTableCell {TH} at (316,0) size 96x23 [border: (3px inset #808080)] [r=0 c=3 rs=1 cs=1]
-              RenderText {#text} at (2,4) size 91x18
-                text run at (2,4) width 91: "Windows NT"
-          RenderTableRow {TR} at (0,23) size 412x21
-            RenderTableCell {TD} at (0,23) size 119x21 [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,2) size 73x18
-                text run at (4,2) width 73: "Base Install"
-            RenderTableCell {TD} at (119,23) size 110x21 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1]
-              RenderText {#text} at (2,2) size 21x18
-                text run at (2,2) width 21: "yes"
-            RenderTableCell {TD} at (229,23) size 87x21 [border: (1px inset #808080)] [r=1 c=2 rs=1 cs=1]
-              RenderText {#text} at (2,2) size 21x18
-                text run at (2,2) width 21: "yes"
-            RenderTableCell {TD} at (316,23) size 96x21 [border: (1px inset #808080)] [r=1 c=3 rs=1 cs=1]
-              RenderText {#text} at (2,2) size 21x18
-                text run at (2,2) width 21: "yes"
-          RenderTableRow {TR} at (0,44) size 412x21
-            RenderTableCell {TD} at (0,44) size 119x21 [border: (1px inset #808080)] [r=2 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,2) size 103x18
-                text run at (4,2) width 103: "Complete Install"
-            RenderTableCell {TD} at (119,44) size 110x21 [border: (1px inset #808080)] [r=2 c=1 rs=1 cs=1]
-              RenderText {#text} at (2,2) size 21x18
-                text run at (2,2) width 21: "yes"
-            RenderTableCell {TD} at (229,44) size 87x21 [border: (1px inset #808080)] [r=2 c=2 rs=1 cs=1]
-              RenderText {#text} at (2,2) size 21x18
-                text run at (2,2) width 21: "yes"
-            RenderTableCell {TD} at (316,44) size 96x21 [border: (1px inset #808080)] [r=2 c=3 rs=1 cs=1]
-              RenderText {#text} at (2,2) size 21x18
-                text run at (2,2) width 21: "yes"
-          RenderTableRow {TR} at (0,65) size 412x23
-            RenderTableCell {TD} at (0,65) size 119x23 [border: (1px inset #808080)] [r=3 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,2) size 114x18
-                text run at (4,2) width 114: "Pro Edition Install"
-            RenderTableCell {TD} at (119,65) size 110x23 [border: (1px inset #808080)] [r=3 c=1 rs=1 cs=1]
-              RenderText {#text} at (2,2) size 21x18
-                text run at (2,2) width 21: "yes"
-            RenderTableCell {TD} at (229,65) size 87x23 [border: (1px inset #808080)] [r=3 c=2 rs=1 cs=1]
-              RenderText {#text} at (2,2) size 21x18
-                text run at (2,2) width 21: "yes"
-            RenderTableCell {TD} at (316,65) size 96x23 [border: (1px inset #808080)] [r=3 c=3 rs=1 cs=1]
-              RenderText {#text} at (2,2) size 21x18
-                text run at (2,2) width 21: "yes"

diff --git a/LayoutTests/tables/mozilla_expected_failures/marvin/x_table_rules_none-expected.checksum b/LayoutTests/tables/mozilla_expected_failures/marvin/x_table_rules_none-expected.checksum
deleted file mode 100644 (file)
index ff559b8..0000000
--- a/LayoutTests/tables/mozilla_expected_failures/marvin/x_table_rules_none-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-b6f3cf6e3bf72f167968716173c885e1
\ No newline at end of file

diff --git a/LayoutTests/tables/mozilla_expected_failures/marvin/x_table_rules_none-expected.png b/LayoutTests/tables/mozilla_expected_failures/marvin/x_table_rules_none-expected.png
deleted file mode 100644 (file)
index 9fa8e9c..0000000
Binary files a/LayoutTests/tables/mozilla_expected_failures/marvin/x_table_rules_none-expected.png and /dev/null differ

diff --git a/LayoutTests/tables/mozilla_expected_failures/marvin/x_table_rules_none-expected.txt b/LayoutTests/tables/mozilla_expected_failures/marvin/x_table_rules_none-expected.txt
deleted file mode 100644 (file)
index b30ec5d..0000000
--- a/LayoutTests/tables/mozilla_expected_failures/marvin/x_table_rules_none-expected.txt
+++ /dev/null
@@ -1,59 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x143
-  RenderBlock {html} at (0,0) size 800x143
-    RenderBody {body} at (8,16) size 784x119
-      RenderBlock {p} at (0,0) size 784x18
-        RenderText {#text} at (0,0) size 479x18
-          text run at (0,0) width 402: "There should be no rules between any rows and columns in the "
-          text run at (402,0) width 77: "table below."
-      RenderTable {table} at (0,34) size 184x85 [border: none]
-        RenderTableCol {colgroup} at (0,0) size 0x0
-          RenderTableCol {col} at (0,0) size 0x0
-        RenderTableCol {colgroup} at (0,0) size 0x0
-          RenderTableCol {col} at (0,0) size 0x0
-        RenderTableCol {colgroup} at (0,0) size 0x0
-          RenderTableCol {col} at (0,0) size 0x0
-        RenderTableSection {thead} at (0,0) size 183x21
-          RenderTableRow {tr} at (0,0) size 183x21
-            RenderTableCell {th} at (0,0) size 61x21 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
-              RenderText {#text} at (2,2) size 58x18
-                text run at (2,2) width 58: "THEAD"
-            RenderTableCell {th} at (61,0) size 61x21 [border: (1px inset #808080)] [r=0 c=1 rs=1 cs=1]
-              RenderText {#text} at (2,2) size 58x18
-                text run at (2,2) width 58: "THEAD"
-            RenderTableCell {th} at (122,0) size 61x21 [border: (1px inset #808080)] [r=0 c=2 rs=1 cs=1]
-              RenderText {#text} at (2,2) size 58x18
-                text run at (2,2) width 58: "THEAD"
-        RenderTableSection {tfoot} at (0,63) size 183x21
-          RenderTableRow {tr} at (0,0) size 183x21
-            RenderTableCell {td} at (0,0) size 61x21 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
-              RenderText {#text} at (2,2) size 53x18
-                text run at (2,2) width 53: "TFOOT"
-            RenderTableCell {td} at (61,0) size 61x21 [border: (1px inset #808080)] [r=0 c=1 rs=1 cs=1]
-              RenderText {#text} at (2,2) size 53x18
-                text run at (2,2) width 53: "TFOOT"
-            RenderTableCell {td} at (122,0) size 61x21 [border: (1px inset #808080)] [r=0 c=2 rs=1 cs=1]
-              RenderText {#text} at (2,2) size 53x18
-                text run at (2,2) width 53: "TFOOT"
-        RenderTableSection {tbody} at (0,21) size 183x42
-          RenderTableRow {tr} at (0,0) size 183x21
-            RenderTableCell {td} at (0,0) size 61x21 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
-              RenderText {#text} at (2,2) size 57x18
-                text run at (2,2) width 57: "TBODY"
-            RenderTableCell {td} at (61,0) size 61x21 [border: (1px inset #808080)] [r=0 c=1 rs=1 cs=1]
-              RenderText {#text} at (2,2) size 57x18
-                text run at (2,2) width 57: "TBODY"
-            RenderTableCell {td} at (122,0) size 61x21 [border: (1px inset #808080)] [r=0 c=2 rs=1 cs=1]
-              RenderText {#text} at (2,2) size 57x18
-                text run at (2,2) width 57: "TBODY"
-          RenderTableRow {tr} at (0,21) size 183x21
-            RenderTableCell {td} at (0,21) size 61x21 [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1]
-              RenderText {#text} at (2,2) size 57x18
-                text run at (2,2) width 57: "TBODY"
-            RenderTableCell {td} at (61,21) size 61x21 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1]
-              RenderText {#text} at (2,2) size 57x18
-                text run at (2,2) width 57: "TBODY"
-            RenderTableCell {td} at (122,21) size 61x21 [border: (1px inset #808080)] [r=1 c=2 rs=1 cs=1]
-              RenderText {#text} at (2,2) size 57x18
-                text run at (2,2) width 57: "TBODY"

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 1b837f2..90fa5b3 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2007-06-25  Mitz Pettel  <mitz@webkit.org>
+
+        Reviewed by Maciej.
+
+        - fix http://bugs.webkit.org/show_bug.cgi?id=14341
+          rules="none" ignored in certain cases
+
+        Covered by existing tests.
+
+        * html/HTMLTableElement.cpp:
+        (WebCore::HTMLTableElement::getSharedCellDecl):
+
 2007-06-24  Sam Weinig  <sam@webkit.org>
 
         Reviewed by Mitz.

diff --git a/WebCore/html/HTMLTableElement.cpp b/WebCore/html/HTMLTableElement.cpp
index 8c67bba..47183dd 100644 (file)
--- a/WebCore/html/HTMLTableElement.cpp
+++ b/WebCore/html/HTMLTableElement.cpp
@@ -529,7 +529,7 @@ CSSMutableStyleDeclaration* HTMLTableElement::getSharedCellDecl()
 {
     MappedAttribute attr(cellborderAttr, m_rulesAttr == AllRules ? "solid-all" : 
                                          (m_rulesAttr == ColsRules ? "solid-cols" : 
-                                         (m_rulesAttr == RowsRules ? "solid-rows" : (!m_borderAttr || m_rulesAttr == GroupsRules ? "none" : (m_borderColorAttr ? "solid" : "inset")))));
+                                         (m_rulesAttr == RowsRules ? "solid-rows" : (!m_borderAttr || m_rulesAttr == GroupsRules || m_rulesAttr == NoneRules ? "none" : (m_borderColorAttr ? "solid" : "inset")))));
 
     CSSMappedAttributeDeclaration* decl = getMappedAttributeDecl(ePersistent, &attr);
     if (!decl) {
@@ -552,7 +552,7 @@ CSSMutableStyleDeclaration* HTMLTableElement::getSharedCellDecl()
             decl->setProperty(CSS_PROP_BORDER_TOP_STYLE, CSS_VAL_SOLID, false);
             decl->setProperty(CSS_PROP_BORDER_BOTTOM_STYLE, CSS_VAL_SOLID, false);
             decl->setProperty(CSS_PROP_BORDER_COLOR, "inherit", false);
-        } else if (m_rulesAttr != GroupsRules && (m_borderAttr || m_rulesAttr == AllRules)) {
+        } else if (m_rulesAttr != GroupsRules && m_rulesAttr != NoneRules && (m_borderAttr || m_rulesAttr == AllRules)) {
             decl->setProperty(CSS_PROP_BORDER_WIDTH, "1px", false);
              int v = (m_borderColorAttr || m_rulesAttr == AllRules) ? CSS_VAL_SOLID : CSS_VAL_INSET;
             decl->setProperty(CSS_PROP_BORDER_TOP_STYLE, v, false);