Diff
Modified: trunk/LayoutTests/ChangeLog (97277 => 97278)
--- trunk/LayoutTests/ChangeLog 2011-10-12 18:27:54 UTC (rev 97277)
+++ trunk/LayoutTests/ChangeLog 2011-10-12 18:28:55 UTC (rev 97278)
@@ -1,3 +1,17 @@
+2011-10-06 Robert Hogan <[email protected]>
+
+ CSS 2.1 failure: border-conflict-style-079
+ https://bugs.webkit.org/show_bug.cgi?id=69551
+
+ Reviewed by Antonio Gomes.
+
+ * css2.1/20110323/border-conflict-style-079.htm: Added.
+ * css2.1/20110323/border-conflict-style-088.htm: Added.
+ * platform/chromium-linux/css2.1/20110323/border-conflict-style-079-expected.png: Added.
+ * platform/chromium-linux/css2.1/20110323/border-conflict-style-079-expected.txt: Added.
+ * platform/chromium-linux/css2.1/20110323/border-conflict-style-088-expected.png: Added.
+ * platform/chromium-linux/css2.1/20110323/border-conflict-style-088-expected.txt: Added.
+
2011-10-12 Dimitri Glazkov <[email protected]>
[Chromium] Fix expectation ambiguities.
Added: trunk/LayoutTests/css2.1/20110323/border-conflict-style-079.htm (0 => 97278)
--- trunk/LayoutTests/css2.1/20110323/border-conflict-style-079.htm (rev 0)
+++ trunk/LayoutTests/css2.1/20110323/border-conflict-style-079.htm 2011-10-12 18:28:55 UTC (rev 97278)
@@ -0,0 +1,71 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html>
+ <head>
+ <title>CSS Test: Border Conflict Resolution (by border style): 'outset' vs. 'ridge' - border with highest priority border style should dominate</title>
+ <link rel="author" title="Microsoft" href=""
+ <link rel="help" href=""
+ <meta name="flags" content="">
+ <meta name="assert" content="The 'ridge' border is the dominant border when it is collapsed with an 'outset' border of the same size.">
+ <style type="text/css">
+ #table1
+ {
+ margin-bottom: 20px;
+ }
+ table
+ {
+ border-collapse: collapse;
+ }
+ td
+ {
+ border: 5px outset lime;
+ height: 3em;
+ width: 3em;
+ }
+ #center, #table1 td
+ {
+ border: 5px ridge lime;
+ }
+ #top
+ {
+ border-top: 5px outset red;
+ }
+ #left
+ {
+ border-left: 5px outset red;
+ }
+ #bottom
+ {
+ border-bottom: 5px outset red;
+ }
+ #right
+ {
+ border-right: 5px outset red;
+ }
+ </style>
+ </head>
+ <body>
+ <p>Test passes if the center box in the table below has a border similar to this:</p>
+ <table id="table1">
+ <tr>
+ <td></td>
+ </tr>
+ </table>
+ <table>
+ <tr>
+ <td>outset</td>
+ <td id="bottom">outset</td>
+ <td>outset</td>
+ </tr>
+ <tr>
+ <td id="right">outset</td>
+ <td id="center">ridge</td>
+ <td id="left">outset</td>
+ </tr>
+ <tr>
+ <td>outset</td>
+ <td id="top">outset</td>
+ <td>outset</td>
+ </tr>
+ </table>
+ </body>
+</html>
\ No newline at end of file
Property changes on: trunk/LayoutTests/css2.1/20110323/border-conflict-style-079.htm
___________________________________________________________________
Added: svn:eol-style
Added: trunk/LayoutTests/css2.1/20110323/border-conflict-style-088.htm (0 => 97278)
--- trunk/LayoutTests/css2.1/20110323/border-conflict-style-088.htm (rev 0)
+++ trunk/LayoutTests/css2.1/20110323/border-conflict-style-088.htm 2011-10-12 18:28:55 UTC (rev 97278)
@@ -0,0 +1,55 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html>
+ <head>
+ <title>CSS Test: Border Conflict Resolution (by border style): 'ridge' vs. 'outset' - border with highest priority border style should dominate</title>
+ <link rel="author" title="Microsoft" href=""
+ <link rel="help" href=""
+ <meta name="flags" content="">
+ <meta name="assert" content="The 'ridge' border is the dominant border when it is collapsed with an 'outset' border of the same size.">
+ <style type="text/css">
+ #table1
+ {
+ margin-bottom: 20px;
+ }
+ table
+ {
+ border-collapse: collapse;
+ }
+ td
+ {
+ border: 5px ridge lime;
+ height: 3em;
+ width: 3em;
+ }
+ #center
+ {
+ border: 5px outset red;
+ }
+ </style>
+ </head>
+ <body>
+ <p>Test passes if the center box in the table below has a border similar to this:</p>
+ <table id="table1">
+ <tr>
+ <td></td>
+ </tr>
+ </table>
+ <table>
+ <tr>
+ <td>ridge</td>
+ <td>ridge</td>
+ <td>ridge</td>
+ </tr>
+ <tr>
+ <td>ridge</td>
+ <td id="center">outset</td>
+ <td>ridge</td>
+ </tr>
+ <tr>
+ <td>ridge</td>
+ <td>ridge</td>
+ <td>ridge</td>
+ </tr>
+ </table>
+ </body>
+</html>
\ No newline at end of file
Property changes on: trunk/LayoutTests/css2.1/20110323/border-conflict-style-088.htm
___________________________________________________________________
Added: svn:eol-style
Added: trunk/LayoutTests/platform/chromium-linux/css2.1/20110323/border-conflict-style-079-expected.png
(Binary files differ)
Added: svn:mime-type
Added: trunk/LayoutTests/platform/chromium-linux/css2.1/20110323/border-conflict-style-079-expected.txt (0 => 97278)
--- trunk/LayoutTests/platform/chromium-linux/css2.1/20110323/border-conflict-style-079-expected.txt (rev 0)
+++ trunk/LayoutTests/platform/chromium-linux/css2.1/20110323/border-conflict-style-079-expected.txt 2011-10-12 18:28:55 UTC (rev 97278)
@@ -0,0 +1,44 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x310
+ RenderBlock {HTML} at (0,0) size 800x310
+ RenderBody {BODY} at (8,16) size 784x286
+ RenderBlock {P} at (0,0) size 784x20
+ RenderText {#text} at (0,0) size 446x19
+ text run at (0,0) width 446: "Test passes if the center box in the table below has a border similar to this:"
+ RenderTable {TABLE} at (0,36) size 60x60 [border: (2px none #808080)]
+ RenderTableSection {TBODY} at (2,2) size 55x55
+ RenderTableRow {TR} at (0,0) size 55x55
+ RenderTableCell {TD} at (0,24) size 55x7 [border: (3px ridge #00FF00)] [r=0 c=0 rs=1 cs=1]
+ RenderTable {TABLE} at (0,116) size 170x170 [border: (2px none #808080)]
+ RenderTableSection {TBODY} at (2,2) size 165x165
+ RenderTableRow {TR} at (0,0) size 165x55
+ RenderTableCell {TD} at (0,14) size 55x27 [border: (3px outset #00FF00)] [r=0 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 36x19
+ text run at (4,4) width 36: "outset"
+ RenderTableCell {TD} at (55,14) size 55x27 [border: (3px outset #00FF00) (2px outset #FF0000) (3px outset #00FF00)] [r=0 c=1 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 36x19
+ text run at (4,4) width 36: "outset"
+ RenderTableCell {TD} at (110,14) size 55x27 [border: (3px outset #00FF00)] [r=0 c=2 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 36x19
+ text run at (4,4) width 36: "outset"
+ RenderTableRow {TR} at (0,55) size 165x55
+ RenderTableCell {TD} at (0,69) size 55x27 [border: (3px outset #00FF00) (2px outset #FF0000) (2px outset #00FF00)] [r=1 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 36x19
+ text run at (4,4) width 36: "outset"
+ RenderTableCell {TD} at (55,69) size 55x27 [border: (3px ridge #00FF00)] [r=1 c=1 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 30x19
+ text run at (4,4) width 30: "ridge"
+ RenderTableCell {TD} at (110,69) size 55x27 [border: (3px outset #00FF00) (3px outset #FF0000)] [r=1 c=2 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 36x19
+ text run at (4,4) width 36: "outset"
+ RenderTableRow {TR} at (0,110) size 165x55
+ RenderTableCell {TD} at (0,124) size 55x27 [border: (3px outset #00FF00)] [r=2 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 36x19
+ text run at (4,4) width 36: "outset"
+ RenderTableCell {TD} at (55,124) size 55x27 [border: (3px outset #FF0000) (2px outset #00FF00)] [r=2 c=1 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 36x19
+ text run at (4,4) width 36: "outset"
+ RenderTableCell {TD} at (110,124) size 55x27 [border: (3px outset #00FF00)] [r=2 c=2 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 36x19
+ text run at (4,4) width 36: "outset"
Property changes on: trunk/LayoutTests/platform/chromium-linux/css2.1/20110323/border-conflict-style-079-expected.txt
___________________________________________________________________
Added: svn:eol-style
Added: trunk/LayoutTests/platform/chromium-linux/css2.1/20110323/border-conflict-style-088-expected.png
(Binary files differ)
Added: svn:mime-type
Added: trunk/LayoutTests/platform/chromium-linux/css2.1/20110323/border-conflict-style-088-expected.txt (0 => 97278)
--- trunk/LayoutTests/platform/chromium-linux/css2.1/20110323/border-conflict-style-088-expected.txt (rev 0)
+++ trunk/LayoutTests/platform/chromium-linux/css2.1/20110323/border-conflict-style-088-expected.txt 2011-10-12 18:28:55 UTC (rev 97278)
@@ -0,0 +1,44 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x310
+ RenderBlock {HTML} at (0,0) size 800x310
+ RenderBody {BODY} at (8,16) size 784x286
+ RenderBlock {P} at (0,0) size 784x20
+ RenderText {#text} at (0,0) size 446x19
+ text run at (0,0) width 446: "Test passes if the center box in the table below has a border similar to this:"
+ RenderTable {TABLE} at (0,36) size 60x60 [border: (2px none #808080)]
+ RenderTableSection {TBODY} at (2,2) size 55x55
+ RenderTableRow {TR} at (0,0) size 55x55
+ RenderTableCell {TD} at (0,24) size 55x7 [border: (3px ridge #00FF00)] [r=0 c=0 rs=1 cs=1]
+ RenderTable {TABLE} at (0,116) size 170x170 [border: (2px none #808080)]
+ RenderTableSection {TBODY} at (2,2) size 165x165
+ RenderTableRow {TR} at (0,0) size 165x55
+ RenderTableCell {TD} at (0,14) size 55x27 [border: (3px ridge #00FF00)] [r=0 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 30x19
+ text run at (4,4) width 30: "ridge"
+ RenderTableCell {TD} at (55,14) size 55x27 [border: (3px ridge #00FF00)] [r=0 c=1 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 30x19
+ text run at (4,4) width 30: "ridge"
+ RenderTableCell {TD} at (110,14) size 55x27 [border: (3px ridge #00FF00)] [r=0 c=2 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 30x19
+ text run at (4,4) width 30: "ridge"
+ RenderTableRow {TR} at (0,55) size 165x55
+ RenderTableCell {TD} at (0,69) size 55x27 [border: (3px ridge #00FF00)] [r=1 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 30x19
+ text run at (4,4) width 30: "ridge"
+ RenderTableCell {TD} at (55,69) size 55x27 [border: (3px outset #FF0000)] [r=1 c=1 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 36x19
+ text run at (4,4) width 36: "outset"
+ RenderTableCell {TD} at (110,69) size 55x27 [border: (3px ridge #00FF00)] [r=1 c=2 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 30x19
+ text run at (4,4) width 30: "ridge"
+ RenderTableRow {TR} at (0,110) size 165x55
+ RenderTableCell {TD} at (0,124) size 55x27 [border: (3px ridge #00FF00)] [r=2 c=0 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 30x19
+ text run at (4,4) width 30: "ridge"
+ RenderTableCell {TD} at (55,124) size 55x27 [border: (3px ridge #00FF00)] [r=2 c=1 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 30x19
+ text run at (4,4) width 30: "ridge"
+ RenderTableCell {TD} at (110,124) size 55x27 [border: (3px ridge #00FF00)] [r=2 c=2 rs=1 cs=1]
+ RenderText {#text} at (4,4) size 30x19
+ text run at (4,4) width 30: "ridge"
Property changes on: trunk/LayoutTests/platform/chromium-linux/css2.1/20110323/border-conflict-style-088-expected.txt
___________________________________________________________________
Added: svn:eol-style
Modified: trunk/Source/WebCore/ChangeLog (97277 => 97278)
--- trunk/Source/WebCore/ChangeLog 2011-10-12 18:27:54 UTC (rev 97277)
+++ trunk/Source/WebCore/ChangeLog 2011-10-12 18:28:55 UTC (rev 97278)
@@ -1,3 +1,14 @@
+2011-10-06 Robert Hogan <[email protected]>
+
+ CSS 2.1 failure: border-conflict-style-079
+ https://bugs.webkit.org/show_bug.cgi?id=69551
+
+ Reviewed by Antonio Gomes.
+
+ * css/CSSValueKeywords.in: ridge and outset were the wrong way round
+ * rendering/style/RenderStyleConstants.h: ditto
+
+
2011-10-12 Jian Li <[email protected]>
Support passing optional filename when FormData.append() is used to
Modified: trunk/Source/WebCore/css/CSSValueKeywords.in (97277 => 97278)
--- trunk/Source/WebCore/css/CSSValueKeywords.in 2011-10-12 18:27:54 UTC (rev 97277)
+++ trunk/Source/WebCore/css/CSSValueKeywords.in 2011-10-12 18:28:55 UTC (rev 97278)
@@ -20,8 +20,8 @@
hidden
inset
groove
+outset
ridge
-outset
dotted
dashed
solid
Modified: trunk/Source/WebCore/rendering/style/RenderStyleConstants.h (97277 => 97278)
--- trunk/Source/WebCore/rendering/style/RenderStyleConstants.h 2011-10-12 18:27:54 UTC (rev 97277)
+++ trunk/Source/WebCore/rendering/style/RenderStyleConstants.h 2011-10-12 18:28:55 UTC (rev 97278)
@@ -87,7 +87,7 @@
// These have been defined in the order of their precedence for border-collapsing. Do
// not change this order!
-enum EBorderStyle { BNONE, BHIDDEN, INSET, GROOVE, RIDGE, OUTSET, DOTTED, DASHED, SOLID, DOUBLE };
+enum EBorderStyle { BNONE, BHIDDEN, INSET, GROOVE, OUTSET, RIDGE, DOTTED, DASHED, SOLID, DOUBLE };
enum EBorderPrecedence { BOFF, BTABLE, BCOLGROUP, BCOL, BROWGROUP, BROW, BCELL };
