Tables with just border-style set on the cells do not get a grid

author robert@webkit.org <robert@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>

Sat, 25 Aug 2012 16:20:23 +0000 (16:20 +0000)

committer younghwan cho <yhwan.cho@samsung.com>

Mon, 1 Apr 2013 04:49:46 +0000 (13:49 +0900)
author robert@webkit.org <robert@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 25 Aug 2012 16:20:23 +0000 (16:20 +0000)
committer younghwan cho <yhwan.cho@samsung.com>
Mon, 1 Apr 2013 04:49:46 +0000 (13:49 +0900)
diff --git a/LayoutTests/fast/css/table-rules-attribute-none-with-cell-borders-expected.html b/LayoutTests/fast/css/table-rules-attribute-none-with-cell-borders-expected.html

new file mode 100644 (file)

index 0000000..694ee6d
--- /dev/null
+++ b/LayoutTests/fast/css/table-rules-attribute-none-with-cell-borders-expected.html
@@ -0,0 +1,39 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html>
+    <head>
+        <title>CSS Test: Table columns - HTML table 'rules' none attribute with cell borders</title>
+        <meta name="assert" content="The first table should have two vertical lines intersecting two horizontal lines.">
+        <style type="text/css">
+            table
+            {
+                border-collapse: collapse;
+                border-style: solid;
+                border-color: black;
+            }
+            td
+            {
+                border-width: 3px;
+                border-style: solid;
+                border-color: black;
+                height: 2em;
+                width: 2em;
+            }
+        </style>
+    </head>
+    <body>
+        <table rules="all">
+            <tr>
+                <td></td>
+                <td></td>
+            </tr>
+            <tr>
+                <td></td>
+                <td></td>
+            </tr>
+            <tr>
+                <td></td>
+                <td></td>
+            </tr>
+        </table>
+    </body>
+</html>
+\ No newline at end of file
diff --git a/LayoutTests/fast/css/table-rules-attribute-none-with-cell-borders.html b/LayoutTests/fast/css/table-rules-attribute-none-with-cell-borders.html

new file mode 100644 (file)

index 0000000..177d6af
--- /dev/null
+++ b/LayoutTests/fast/css/table-rules-attribute-none-with-cell-borders.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html>
+    <head>
+        <title>CSS Test: Table columns - HTML table 'rules' none attribute with cell borders</title>
+        <meta name="assert" content="The first table should have two vertical lines intersecting two horizontal lines.">
+        <style type="text/css">
+            table
+            {
+                border-collapse: collapse;
+            }
+            td
+            {
+                border-style: solid;
+                height: 2em;
+                width: 2em;
+            }
+        </style>
+    </head>
+    <body>
+        <table>
+            <tr>
+                <td></td>
+                <td></td>
+            </tr>
+            <tr>
+                <td></td>
+                <td></td>
+            </tr>
+            <tr>
+                <td></td>
+                <td></td>
+            </tr>
+        </table>
+    </body>
+</html>
+\ No newline at end of file
diff --git a/Source/WebCore/html/HTMLTableElement.cpp b/Source/WebCore/html/HTMLTableElement.cpp

index 283786b..317550e 100644 (file)
--- a/Source/WebCore/html/HTMLTableElement.cpp
+++ b/Source/WebCore/html/HTMLTableElement.cpp
@@ -508,7 +508,7 @@ PassRefPtr<StylePropertySet> HTMLTableElement::createSharedCellStyle()
          style->setProperty(CSSPropertyBorderColor, cssValuePool().createInheritedValue());
          break;
      case NoBorders:
-        style->setProperty(CSSPropertyBorderWidth, cssValuePool().createValue(0, CSSPrimitiveValue::CSS_PX));
+        // If 'rules=none' then allow any borders set at cell level to take effect.
          break;
      }
  
diff --git a/Source/WebCore/rendering/RenderTreeAsText.cpp b/Source/WebCore/rendering/RenderTreeAsText.cpp

index 8af6a27..c1585b1 100644 (file)
--- a/Source/WebCore/rendering/RenderTreeAsText.cpp
+++ b/Source/WebCore/rendering/RenderTreeAsText.cpp
@@ -315,19 +315,16 @@ void RenderTreeAsText::writeRenderObject(TextStream& ts, const RenderObject& o,
          if (box.borderTop() || box.borderRight() || box.borderBottom() || box.borderLeft()) {
              ts << " [border:";
  
-            BorderValue prevBorder;
-            if (o.style()->borderTop() != prevBorder) {
-                prevBorder = o.style()->borderTop();
-                if (!box.borderTop())
-                    ts << " none";
-                else {
-                    ts << " (" << box.borderTop() << "px ";
-                    printBorderStyle(ts, o.style()->borderTopStyle());
-                    Color col = o.style()->borderTopColor();
-                    if (!col.isValid())
-                        col = o.style()->color();
-                    ts << col.nameForRenderTreeAsText() << ")";
-                }
+            BorderValue prevBorder = o.style()->borderTop();
+            if (!box.borderTop())
+                ts << " none";
+            else {
+                ts << " (" << box.borderTop() << "px ";
+                printBorderStyle(ts, o.style()->borderTopStyle());
+                Color col = o.style()->borderTopColor();
+                if (!col.isValid())
+                    col = o.style()->color();
+                ts << col.nameForRenderTreeAsText() << ")";
              }
  
              if (o.style()->borderRight() != prevBorder) {
author	robert@webkit.org <robert@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
	Sat, 25 Aug 2012 16:20:23 +0000 (16:20 +0000)
committer	younghwan cho <yhwan.cho@samsung.com>
	Mon, 1 Apr 2013 04:49:46 +0000 (13:49 +0900)
LayoutTests/fast/css/table-rules-attribute-none-with-cell-borders-expected.html	[new file with mode: 0644]	patch \| blob
LayoutTests/fast/css/table-rules-attribute-none-with-cell-borders.html	[new file with mode: 0644]	patch \| blob
Source/WebCore/html/HTMLTableElement.cpp		patch \| blob \| history
Source/WebCore/rendering/RenderTreeAsText.cpp		patch \| blob \| history