CSS 2.1 failure: border-conflict-element-*
authorrobert@webkit.org <robert@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sun, 27 Nov 2011 18:32:37 +0000 (18:32 +0000)
committerrobert@webkit.org <robert@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sun, 27 Nov 2011 18:32:37 +0000 (18:32 +0000)
https://bugs.webkit.org/show_bug.cgi?id=71244

Source/WebCore:

Reviewed by Julien Chaffraix.

From http://www.w3.org/TR/CSS21/tables.html#border-conflict-resolution :
  "When two adjacent cells have the same border-width and the same border-style in a
  'border-collapse: collapse' table, then the color of the border from the leftmost cell wins
  (if the table's 'direction' is 'ltr'; right, if it is 'rtl') and the color of the border
  from the topmost cell wins."

So WebCore::compareBorders needs to account for the position of the cell when
deciding which border wins the comparison. This will ensure that the winning border is
sorted to the appropriate position in the sorted list of borders for painting.

When conflicting collapsed borders are in the same cell, the following order of
precedence is used (where 4 has highest precedence):

                   __3__
                  |     |
                4 |     | 1
                  |_____|
                     2

This fixes the following failing tests from the border-conflict-element-* set
in the CSS 2.1 test suite:
  border-conflict-element-001d.htm
  border-conflict-element-0037.htm

One test in the suite is known to be wrong, so a corrected version has been landed outside the
css2.1 folder:
  border-conflict-element-002.htm

This change entails rebaselining quite a few tests, see the LayoutTests ChangeLog for a full
explanation of the rebaselines.

* rendering/RenderTableCell.cpp:
(WebCore::compareBorders): Compare the cells' position from the left (in 'ltr') and right (in 'rtl')
                           of the table and the cells' position from the top of the table when nothing
                           else in the style, width, or grouping of the borders determines precedence.
                           If the conflicting borders are in the same cell, apply the same logic to the position of the borders.
(WebCore::RenderTableCell::collapsedStartBorder): Pass the cell's position and its table's direction to CollapsedBorderValue
(WebCore::RenderTableCell::collapsedEndBorder): ditto
(WebCore::RenderTableCell::collapsedBeforeBorder): ditto
(WebCore::RenderTableCell::collapsedAfterBorder): ditto
* rendering/style/CollapsedBorderValue.h:
(WebCore::CollapsedBorderValue::CollapsedBorderValue): Learn the position of the border's cell and the direction of its table
(WebCore::CollapsedBorderValue::columnOffset): the cell's offset from the top of the table
(WebCore::CollapsedBorderValue::rowOffset): the cell's offset from the start of the table
(WebCore::CollapsedBorderValue::edge): which edge of the cell the border is on
(WebCore::CollapsedBorderValue::operator==): cells with the same position in the table are equal

LayoutTests:

Add all the passing border-conflict-element* tests from the CSS 2.1 test suite.

Add a corrected version of the CSS suite test border-conflict-element-002.htm, which can sit here until
  the corrected version is landed upstream. See http://lists.w3.org/Archives/Public/public-css-testsuite/2011Nov/0002.html

Rebaseline all t170602-bdr-conflct-w-* tests. The rendering of the collapsed borders in these
  tests now obeys the order of precedence for the position of the cell and the precendece of the position
  of the borders within the same cell.

Rebaseline tables/mozilla/collapsing_borders/bug41262-4.html: ditto
           tables/mozilla/marvin/table_rules_all.html : ditto
           tables/mozilla/marvin/table_rules_none.html : ditto
           tables/mozilla_expected_failures/marvin/table_rules_cols.html : ditto
           tables/mozilla_expected_failures/marvin/table_rules_rows.html : ditto

Rebaseline two border-conflict-style-* tests: ditto

Rebaseline fast/borders/border-antialiasing.html, the result is too small to confirm the difference but
  presume it is one of the above.

Reviewed by Julien Chaffraix.

* css2.1/20110323/border-conflict-element-001.htm: Added.
* css2.1/20110323/border-conflict-element-001a.htm: Added.
* css2.1/20110323/border-conflict-element-001b.htm: Added.
* css2.1/20110323/border-conflict-element-001c.htm: Added.
* css2.1/20110323/border-conflict-element-001d.htm: Added.
* css2.1/20110323/border-conflict-element-003.htm: Added.
* css2.1/20110323/border-conflict-element-004.htm: Added.
* css2.1/20110323/border-conflict-element-005.htm: Added.
* css2.1/20110323/border-conflict-element-006.htm: Added.
* css2.1/20110323/border-conflict-element-007.htm: Added.
* css2.1/20110323/border-conflict-element-008.htm: Added.
* css2.1/20110323/border-conflict-element-009.htm: Added.
* css2.1/20110323/border-conflict-element-010.htm: Added.
* css2.1/20110323/border-conflict-element-011.htm: Added.
* css2.1/20110323/border-conflict-element-012.htm: Added.
* css2.1/20110323/border-conflict-element-013.htm: Added.
* css2.1/20110323/border-conflict-element-014.htm: Added.
* css2.1/20110323/border-conflict-element-015.htm: Added.
* css2.1/20110323/border-conflict-element-016.htm: Added.
* css2.1/20110323/border-conflict-element-017.htm: Added.
* css2.1/20110323/border-conflict-element-018.htm: Added.
* css2.1/20110323/border-conflict-element-019.htm: Added.
* css2.1/20110323/border-conflict-element-020.htm: Added.
* css2.1/20110323/border-conflict-element-021.htm: Added.
* css2.1/20110323/border-conflict-element-022.htm: Added.
* css2.1/20110323/border-conflict-element-023.htm: Added.
* css2.1/20110323/border-conflict-element-024.htm: Added.
* css2.1/20110323/border-conflict-element-025.htm: Added.
* css2.1/20110323/border-conflict-element-026.htm: Added.
* css2.1/20110323/border-conflict-element-027.htm: Added.
* css2.1/20110323/border-conflict-element-028.htm: Added.
* css2.1/20110323/border-conflict-element-029.htm: Added.
* css2.1/20110323/border-conflict-element-030.htm: Added.
* css2.1/20110323/border-conflict-element-031.htm: Added.
* css2.1/20110323/border-conflict-element-032.htm: Added.
* css2.1/20110323/border-conflict-element-033.htm: Added.
* css2.1/20110323/border-conflict-element-034.htm: Added.
* css2.1/20110323/border-conflict-element-035.htm: Added.
* css2.1/20110323/border-conflict-element-036.htm: Added.
* css2.1/20110323/border-conflict-element-037.htm: Added.
* css2.1/20110323/border-conflict-element-038.htm: Added.
* css2.1/20110323/border-conflict-element-039.htm: Added.
* css2.1/20110323/support/swatch-blue.png: Added.
* css2.1/20110323/support/swatch-green.png: Added.
* css2.1/20110323/support/swatch-lime.png: Added.
* css2.1/20110323/support/swatch-orange.png: Added.
* css2.1/20110323/support/swatch-red.png: Added.
* css2.1/20110323/support/swatch-teal.png: Added.
* css2.1/20110323/support/swatch-white.png: Added.
* css2.1/20110323/support/swatch-yellow.png: Added.
* fast/css/border-conflict-element-002.htm: Added.
* platform/chromium-linux/css2.1/20110323/border-conflict-style-079-expected.png:
* platform/chromium-linux/css2.1/20110323/border-conflict-style-088-expected.png:
* platform/chromium-linux/css2.1/20110323/floating-replaced-height-008-expected.png: Addition of support/swatch-white.png rebaselines result.
* platform/chromium-linux/css2.1/t170602-bdr-conflct-w-05-d-expected.png:
* platform/chromium-linux/css2.1/t170602-bdr-conflct-w-06-d-expected.png:
* platform/chromium-linux/css2.1/t170602-bdr-conflct-w-07-d-expected.png:
* platform/chromium-linux/css2.1/t170602-bdr-conflct-w-08-d-expected.png:
* platform/chromium-linux/css2.1/t170602-bdr-conflct-w-15-d-expected.png:
* platform/chromium-linux/css2.1/t170602-bdr-conflct-w-16-d-expected.png:
* platform/chromium-linux/css2.1/t170602-bdr-conflct-w-17-d-expected.png:
* platform/chromium-linux/css2.1/t170602-bdr-conflct-w-18-d-expected.png:
* platform/chromium-linux/css2.1/t170602-bdr-conflct-w-25-d-expected.png:
* platform/chromium-linux/css2.1/t170602-bdr-conflct-w-26-d-expected.png:
* platform/chromium-linux/css2.1/t170602-bdr-conflct-w-27-d-expected.png:
* platform/chromium-linux/css2.1/t170602-bdr-conflct-w-28-d-expected.png:
* platform/chromium-linux/css2.1/t170602-bdr-conflct-w-35-d-expected.png:
* platform/chromium-linux/css2.1/t170602-bdr-conflct-w-36-d-expected.png:
* platform/chromium-linux/css2.1/t170602-bdr-conflct-w-37-d-expected.png:
* platform/chromium-linux/css2.1/t170602-bdr-conflct-w-38-d-expected.png:
* platform/chromium-linux/css2.1/t170602-bdr-conflct-w-45-d-expected.png:
* platform/chromium-linux/css2.1/t170602-bdr-conflct-w-46-d-expected.png:
* platform/chromium-linux/css2.1/t170602-bdr-conflct-w-47-d-expected.png:
* platform/chromium-linux/css2.1/t170602-bdr-conflct-w-48-d-expected.png:
* platform/chromium-linux/css2.1/t170602-bdr-conflct-w-51-d-expected.png:
* platform/chromium-linux/css2.1/t170602-bdr-conflct-w-52-d-expected.png:
* platform/chromium-linux/css2.1/t170602-bdr-conflct-w-53-d-expected.png:
* platform/chromium-linux/css2.1/t170602-bdr-conflct-w-54-d-expected.png:
* platform/chromium-linux/css2.1/t170602-bdr-conflct-w-55-d-expected.png:
* platform/chromium-linux/css2.1/t170602-bdr-conflct-w-56-d-expected.png:
* platform/chromium-linux/css2.1/t170602-bdr-conflct-w-57-d-expected.png:
* platform/chromium-linux/css2.1/t170602-bdr-conflct-w-58-d-expected.png:
* platform/chromium-linux/css2.1/t170602-bdr-conflct-w-59-d-expected.png:
* platform/chromium-linux/css2.1/t170602-bdr-conflct-w-61-d-expected.png:
* platform/chromium-linux/css2.1/t170602-bdr-conflct-w-62-d-expected.png:
* platform/chromium-linux/css2.1/t170602-bdr-conflct-w-63-d-expected.png:
* platform/chromium-linux/css2.1/t170602-bdr-conflct-w-64-d-expected.png:
* platform/chromium-linux/css2.1/t170602-bdr-conflct-w-65-d-expected.png:
* platform/chromium-linux/css2.1/t170602-bdr-conflct-w-66-d-expected.png:
* platform/chromium-linux/css2.1/t170602-bdr-conflct-w-67-d-expected.png:
* platform/chromium-linux/css2.1/t170602-bdr-conflct-w-68-d-expected.png:
* platform/chromium-linux/css2.1/t170602-bdr-conflct-w-69-d-expected.png:
* platform/chromium-linux/css2.1/t170602-bdr-conflct-w-71-d-expected.png:
* platform/chromium-linux/css2.1/t170602-bdr-conflct-w-72-d-expected.png:
* platform/chromium-linux/css2.1/t170602-bdr-conflct-w-73-d-expected.png:
* platform/chromium-linux/css2.1/t170602-bdr-conflct-w-74-d-expected.png:
* platform/chromium-linux/css2.1/t170602-bdr-conflct-w-75-d-expected.png:
* platform/chromium-linux/css2.1/t170602-bdr-conflct-w-76-d-expected.png:
* platform/chromium-linux/css2.1/t170602-bdr-conflct-w-77-d-expected.png:
* platform/chromium-linux/css2.1/t170602-bdr-conflct-w-78-d-expected.png:
* platform/chromium-linux/css2.1/t170602-bdr-conflct-w-79-d-expected.png:
* platform/chromium-linux/css2.1/t170602-bdr-conflct-w-81-d-expected.png:
* platform/chromium-linux/css2.1/t170602-bdr-conflct-w-82-d-expected.png:
* platform/chromium-linux/css2.1/t170602-bdr-conflct-w-83-d-expected.png:
* platform/chromium-linux/css2.1/t170602-bdr-conflct-w-84-d-expected.png:
* platform/chromium-linux/css2.1/t170602-bdr-conflct-w-85-d-expected.png:
* platform/chromium-linux/css2.1/t170602-bdr-conflct-w-86-d-expected.png:
* platform/chromium-linux/css2.1/t170602-bdr-conflct-w-87-d-expected.png:
* platform/chromium-linux/css2.1/t170602-bdr-conflct-w-88-d-expected.png:
* platform/chromium-linux/css2.1/t170602-bdr-conflct-w-89-d-expected.png:
* platform/chromium-linux/css2.1/t170602-bdr-conflct-w-95-d-expected.png:
* platform/chromium-linux/css2.1/t170602-bdr-conflct-w-96-d-expected.png:
* platform/chromium-linux/css2.1/t170602-bdr-conflct-w-97-d-expected.png:
* platform/chromium-linux/css2.1/t170602-bdr-conflct-w-98-d-expected.png:
* platform/chromium-linux/fast/borders/border-antialiasing-expected.png:
* platform/chromium-linux/tables/mozilla/collapsing_borders/bug41262-4-expected.png:
* platform/chromium-linux/tables/mozilla/marvin/table_rules_all-expected.png:
* platform/chromium-linux/tables/mozilla/marvin/table_rules_none-expected.png:
* platform/chromium-linux/tables/mozilla_expected_failures/marvin/table_rules_cols-expected.png:
* platform/chromium-linux/tables/mozilla_expected_failures/marvin/table_rules_rows-expected.png:
* platform/chromium/css2.1/20110323/border-conflict-element-001-expected.png: Added.
* platform/chromium/css2.1/20110323/border-conflict-element-001-expected.txt: Added.
* platform/chromium/css2.1/20110323/border-conflict-element-001a-expected.png: Added.
* platform/chromium/css2.1/20110323/border-conflict-element-001a-expected.txt: Added.
* platform/chromium/css2.1/20110323/border-conflict-element-001b-expected.png: Added.
* platform/chromium/css2.1/20110323/border-conflict-element-001b-expected.txt: Added.
* platform/chromium/css2.1/20110323/border-conflict-element-001c-expected.png: Added.
* platform/chromium/css2.1/20110323/border-conflict-element-001c-expected.txt: Added.
* platform/chromium/css2.1/20110323/border-conflict-element-001d-expected.png: Added.
* platform/chromium/css2.1/20110323/border-conflict-element-001d-expected.txt: Added.
* platform/chromium/css2.1/20110323/border-conflict-element-003-expected.png: Added.
* platform/chromium/css2.1/20110323/border-conflict-element-003-expected.txt: Added.
* platform/chromium/css2.1/20110323/border-conflict-element-004-expected.png: Added.
* platform/chromium/css2.1/20110323/border-conflict-element-004-expected.txt: Added.
* platform/chromium/css2.1/20110323/border-conflict-element-005-expected.png: Added.
* platform/chromium/css2.1/20110323/border-conflict-element-005-expected.txt: Added.
* platform/chromium/css2.1/20110323/border-conflict-element-006-expected.png: Added.
* platform/chromium/css2.1/20110323/border-conflict-element-006-expected.txt: Added.
* platform/chromium/css2.1/20110323/border-conflict-element-007-expected.png: Added.
* platform/chromium/css2.1/20110323/border-conflict-element-007-expected.txt: Added.
* platform/chromium/css2.1/20110323/border-conflict-element-008-expected.png: Added.
* platform/chromium/css2.1/20110323/border-conflict-element-008-expected.txt: Added.
* platform/chromium/css2.1/20110323/border-conflict-element-009-expected.png: Added.
* platform/chromium/css2.1/20110323/border-conflict-element-009-expected.txt: Added.
* platform/chromium/css2.1/20110323/border-conflict-element-010-expected.png: Added.
* platform/chromium/css2.1/20110323/border-conflict-element-010-expected.txt: Added.
* platform/chromium/css2.1/20110323/border-conflict-element-011-expected.png: Added.
* platform/chromium/css2.1/20110323/border-conflict-element-011-expected.txt: Added.
* platform/chromium/css2.1/20110323/border-conflict-element-012-expected.png: Added.
* platform/chromium/css2.1/20110323/border-conflict-element-012-expected.txt: Added.
* platform/chromium/css2.1/20110323/border-conflict-element-013-expected.png: Added.
* platform/chromium/css2.1/20110323/border-conflict-element-013-expected.txt: Added.
* platform/chromium/css2.1/20110323/border-conflict-element-014-expected.png: Added.
* platform/chromium/css2.1/20110323/border-conflict-element-014-expected.txt: Added.
* platform/chromium/css2.1/20110323/border-conflict-element-015-expected.png: Added.
* platform/chromium/css2.1/20110323/border-conflict-element-015-expected.txt: Added.
* platform/chromium/css2.1/20110323/border-conflict-element-016-expected.png: Added.
* platform/chromium/css2.1/20110323/border-conflict-element-016-expected.txt: Added.
* platform/chromium/css2.1/20110323/border-conflict-element-017-expected.png: Added.
* platform/chromium/css2.1/20110323/border-conflict-element-017-expected.txt: Added.
* platform/chromium/css2.1/20110323/border-conflict-element-018-expected.png: Added.
* platform/chromium/css2.1/20110323/border-conflict-element-018-expected.txt: Added.
* platform/chromium/css2.1/20110323/border-conflict-element-019-expected.png: Added.
* platform/chromium/css2.1/20110323/border-conflict-element-019-expected.txt: Added.
* platform/chromium/css2.1/20110323/border-conflict-element-020-expected.png: Added.
* platform/chromium/css2.1/20110323/border-conflict-element-020-expected.txt: Added.
* platform/chromium/css2.1/20110323/border-conflict-element-021-expected.png: Added.
* platform/chromium/css2.1/20110323/border-conflict-element-021-expected.txt: Added.
* platform/chromium/css2.1/20110323/border-conflict-element-022-expected.png: Added.
* platform/chromium/css2.1/20110323/border-conflict-element-022-expected.txt: Added.
* platform/chromium/css2.1/20110323/border-conflict-element-023-expected.png: Added.
* platform/chromium/css2.1/20110323/border-conflict-element-023-expected.txt: Added.
* platform/chromium/css2.1/20110323/border-conflict-element-024-expected.png: Added.
* platform/chromium/css2.1/20110323/border-conflict-element-024-expected.txt: Added.
* platform/chromium/css2.1/20110323/border-conflict-element-025-expected.png: Added.
* platform/chromium/css2.1/20110323/border-conflict-element-025-expected.txt: Added.
* platform/chromium/css2.1/20110323/border-conflict-element-026-expected.png: Added.
* platform/chromium/css2.1/20110323/border-conflict-element-026-expected.txt: Added.
* platform/chromium/css2.1/20110323/border-conflict-element-027-expected.png: Added.
* platform/chromium/css2.1/20110323/border-conflict-element-027-expected.txt: Added.
* platform/chromium/css2.1/20110323/border-conflict-element-028-expected.png: Added.
* platform/chromium/css2.1/20110323/border-conflict-element-028-expected.txt: Added.
* platform/chromium/css2.1/20110323/border-conflict-element-029-expected.png: Added.
* platform/chromium/css2.1/20110323/border-conflict-element-029-expected.txt: Added.
* platform/chromium/css2.1/20110323/border-conflict-element-030-expected.png: Added.
* platform/chromium/css2.1/20110323/border-conflict-element-030-expected.txt: Added.
* platform/chromium/css2.1/20110323/border-conflict-element-031-expected.png: Added.
* platform/chromium/css2.1/20110323/border-conflict-element-031-expected.txt: Added.
* platform/chromium/css2.1/20110323/border-conflict-element-032-expected.png: Added.
* platform/chromium/css2.1/20110323/border-conflict-element-032-expected.txt: Added.
* platform/chromium/css2.1/20110323/border-conflict-element-033-expected.png: Added.
* platform/chromium/css2.1/20110323/border-conflict-element-033-expected.txt: Added.
* platform/chromium/css2.1/20110323/border-conflict-element-034-expected.png: Added.
* platform/chromium/css2.1/20110323/border-conflict-element-034-expected.txt: Added.
* platform/chromium/css2.1/20110323/border-conflict-element-035-expected.png: Added.
* platform/chromium/css2.1/20110323/border-conflict-element-035-expected.txt: Added.
* platform/chromium/css2.1/20110323/border-conflict-element-036-expected.png: Added.
* platform/chromium/css2.1/20110323/border-conflict-element-036-expected.txt: Added.
* platform/chromium/css2.1/20110323/border-conflict-element-037-expected.png: Added.
* platform/chromium/css2.1/20110323/border-conflict-element-037-expected.txt: Added.
* platform/chromium/css2.1/20110323/border-conflict-element-038-expected.png: Added.
* platform/chromium/css2.1/20110323/border-conflict-element-038-expected.txt: Added.
* platform/chromium/css2.1/20110323/border-conflict-element-039-expected.png: Added.
* platform/chromium/css2.1/20110323/border-conflict-element-039-expected.txt: Added.
* platform/chromium/fast/css/border-conflict-element-002-expected.png: Added.
* platform/chromium/fast/css/border-conflict-element-002-expected.txt: Added.

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

211 files changed:
LayoutTests/ChangeLog
LayoutTests/css2.1/20110323/border-conflict-element-001.htm [new file with mode: 0644]
LayoutTests/css2.1/20110323/border-conflict-element-001a.htm [new file with mode: 0644]
LayoutTests/css2.1/20110323/border-conflict-element-001b.htm [new file with mode: 0644]
LayoutTests/css2.1/20110323/border-conflict-element-001c.htm [new file with mode: 0644]
LayoutTests/css2.1/20110323/border-conflict-element-001d.htm [new file with mode: 0644]
LayoutTests/css2.1/20110323/border-conflict-element-003.htm [new file with mode: 0644]
LayoutTests/css2.1/20110323/border-conflict-element-004.htm [new file with mode: 0644]
LayoutTests/css2.1/20110323/border-conflict-element-005.htm [new file with mode: 0644]
LayoutTests/css2.1/20110323/border-conflict-element-006.htm [new file with mode: 0644]
LayoutTests/css2.1/20110323/border-conflict-element-007.htm [new file with mode: 0644]
LayoutTests/css2.1/20110323/border-conflict-element-008.htm [new file with mode: 0644]
LayoutTests/css2.1/20110323/border-conflict-element-009.htm [new file with mode: 0644]
LayoutTests/css2.1/20110323/border-conflict-element-010.htm [new file with mode: 0644]
LayoutTests/css2.1/20110323/border-conflict-element-011.htm [new file with mode: 0644]
LayoutTests/css2.1/20110323/border-conflict-element-012.htm [new file with mode: 0644]
LayoutTests/css2.1/20110323/border-conflict-element-013.htm [new file with mode: 0644]
LayoutTests/css2.1/20110323/border-conflict-element-014.htm [new file with mode: 0644]
LayoutTests/css2.1/20110323/border-conflict-element-015.htm [new file with mode: 0644]
LayoutTests/css2.1/20110323/border-conflict-element-016.htm [new file with mode: 0644]
LayoutTests/css2.1/20110323/border-conflict-element-017.htm [new file with mode: 0644]
LayoutTests/css2.1/20110323/border-conflict-element-018.htm [new file with mode: 0644]
LayoutTests/css2.1/20110323/border-conflict-element-019.htm [new file with mode: 0644]
LayoutTests/css2.1/20110323/border-conflict-element-020.htm [new file with mode: 0644]
LayoutTests/css2.1/20110323/border-conflict-element-021.htm [new file with mode: 0644]
LayoutTests/css2.1/20110323/border-conflict-element-022.htm [new file with mode: 0644]
LayoutTests/css2.1/20110323/border-conflict-element-023.htm [new file with mode: 0644]
LayoutTests/css2.1/20110323/border-conflict-element-024.htm [new file with mode: 0644]
LayoutTests/css2.1/20110323/border-conflict-element-025.htm [new file with mode: 0644]
LayoutTests/css2.1/20110323/border-conflict-element-026.htm [new file with mode: 0644]
LayoutTests/css2.1/20110323/border-conflict-element-027.htm [new file with mode: 0644]
LayoutTests/css2.1/20110323/border-conflict-element-028.htm [new file with mode: 0644]
LayoutTests/css2.1/20110323/border-conflict-element-029.htm [new file with mode: 0644]
LayoutTests/css2.1/20110323/border-conflict-element-030.htm [new file with mode: 0644]
LayoutTests/css2.1/20110323/border-conflict-element-031.htm [new file with mode: 0644]
LayoutTests/css2.1/20110323/border-conflict-element-032.htm [new file with mode: 0644]
LayoutTests/css2.1/20110323/border-conflict-element-033.htm [new file with mode: 0644]
LayoutTests/css2.1/20110323/border-conflict-element-034.htm [new file with mode: 0644]
LayoutTests/css2.1/20110323/border-conflict-element-035.htm [new file with mode: 0644]
LayoutTests/css2.1/20110323/border-conflict-element-036.htm [new file with mode: 0644]
LayoutTests/css2.1/20110323/border-conflict-element-037.htm [new file with mode: 0644]
LayoutTests/css2.1/20110323/border-conflict-element-038.htm [new file with mode: 0644]
LayoutTests/css2.1/20110323/border-conflict-element-039.htm [new file with mode: 0644]
LayoutTests/css2.1/20110323/support/swatch-blue.png [new file with mode: 0644]
LayoutTests/css2.1/20110323/support/swatch-green.png [new file with mode: 0644]
LayoutTests/css2.1/20110323/support/swatch-lime.png [new file with mode: 0644]
LayoutTests/css2.1/20110323/support/swatch-orange.png [new file with mode: 0644]
LayoutTests/css2.1/20110323/support/swatch-red.png [new file with mode: 0644]
LayoutTests/css2.1/20110323/support/swatch-teal.png [new file with mode: 0644]
LayoutTests/css2.1/20110323/support/swatch-white.png [new file with mode: 0644]
LayoutTests/css2.1/20110323/support/swatch-yellow.png [new file with mode: 0644]
LayoutTests/fast/css/border-conflict-element-002.htm [new file with mode: 0644]
LayoutTests/platform/chromium-linux/css2.1/20110323/border-conflict-style-079-expected.png
LayoutTests/platform/chromium-linux/css2.1/20110323/border-conflict-style-088-expected.png
LayoutTests/platform/chromium-linux/css2.1/20110323/floating-replaced-height-008-expected.png
LayoutTests/platform/chromium-linux/css2.1/t170602-bdr-conflct-w-05-d-expected.png
LayoutTests/platform/chromium-linux/css2.1/t170602-bdr-conflct-w-06-d-expected.png
LayoutTests/platform/chromium-linux/css2.1/t170602-bdr-conflct-w-07-d-expected.png
LayoutTests/platform/chromium-linux/css2.1/t170602-bdr-conflct-w-08-d-expected.png
LayoutTests/platform/chromium-linux/css2.1/t170602-bdr-conflct-w-15-d-expected.png
LayoutTests/platform/chromium-linux/css2.1/t170602-bdr-conflct-w-16-d-expected.png
LayoutTests/platform/chromium-linux/css2.1/t170602-bdr-conflct-w-17-d-expected.png
LayoutTests/platform/chromium-linux/css2.1/t170602-bdr-conflct-w-18-d-expected.png
LayoutTests/platform/chromium-linux/css2.1/t170602-bdr-conflct-w-25-d-expected.png
LayoutTests/platform/chromium-linux/css2.1/t170602-bdr-conflct-w-26-d-expected.png
LayoutTests/platform/chromium-linux/css2.1/t170602-bdr-conflct-w-27-d-expected.png
LayoutTests/platform/chromium-linux/css2.1/t170602-bdr-conflct-w-28-d-expected.png
LayoutTests/platform/chromium-linux/css2.1/t170602-bdr-conflct-w-35-d-expected.png
LayoutTests/platform/chromium-linux/css2.1/t170602-bdr-conflct-w-36-d-expected.png
LayoutTests/platform/chromium-linux/css2.1/t170602-bdr-conflct-w-37-d-expected.png
LayoutTests/platform/chromium-linux/css2.1/t170602-bdr-conflct-w-38-d-expected.png
LayoutTests/platform/chromium-linux/css2.1/t170602-bdr-conflct-w-45-d-expected.png
LayoutTests/platform/chromium-linux/css2.1/t170602-bdr-conflct-w-46-d-expected.png
LayoutTests/platform/chromium-linux/css2.1/t170602-bdr-conflct-w-47-d-expected.png
LayoutTests/platform/chromium-linux/css2.1/t170602-bdr-conflct-w-48-d-expected.png
LayoutTests/platform/chromium-linux/css2.1/t170602-bdr-conflct-w-51-d-expected.png
LayoutTests/platform/chromium-linux/css2.1/t170602-bdr-conflct-w-52-d-expected.png
LayoutTests/platform/chromium-linux/css2.1/t170602-bdr-conflct-w-53-d-expected.png
LayoutTests/platform/chromium-linux/css2.1/t170602-bdr-conflct-w-54-d-expected.png
LayoutTests/platform/chromium-linux/css2.1/t170602-bdr-conflct-w-55-d-expected.png
LayoutTests/platform/chromium-linux/css2.1/t170602-bdr-conflct-w-56-d-expected.png
LayoutTests/platform/chromium-linux/css2.1/t170602-bdr-conflct-w-57-d-expected.png
LayoutTests/platform/chromium-linux/css2.1/t170602-bdr-conflct-w-58-d-expected.png
LayoutTests/platform/chromium-linux/css2.1/t170602-bdr-conflct-w-59-d-expected.png
LayoutTests/platform/chromium-linux/css2.1/t170602-bdr-conflct-w-61-d-expected.png
LayoutTests/platform/chromium-linux/css2.1/t170602-bdr-conflct-w-62-d-expected.png
LayoutTests/platform/chromium-linux/css2.1/t170602-bdr-conflct-w-63-d-expected.png
LayoutTests/platform/chromium-linux/css2.1/t170602-bdr-conflct-w-64-d-expected.png
LayoutTests/platform/chromium-linux/css2.1/t170602-bdr-conflct-w-65-d-expected.png
LayoutTests/platform/chromium-linux/css2.1/t170602-bdr-conflct-w-66-d-expected.png
LayoutTests/platform/chromium-linux/css2.1/t170602-bdr-conflct-w-67-d-expected.png
LayoutTests/platform/chromium-linux/css2.1/t170602-bdr-conflct-w-68-d-expected.png
LayoutTests/platform/chromium-linux/css2.1/t170602-bdr-conflct-w-69-d-expected.png
LayoutTests/platform/chromium-linux/css2.1/t170602-bdr-conflct-w-71-d-expected.png
LayoutTests/platform/chromium-linux/css2.1/t170602-bdr-conflct-w-72-d-expected.png
LayoutTests/platform/chromium-linux/css2.1/t170602-bdr-conflct-w-73-d-expected.png
LayoutTests/platform/chromium-linux/css2.1/t170602-bdr-conflct-w-74-d-expected.png
LayoutTests/platform/chromium-linux/css2.1/t170602-bdr-conflct-w-75-d-expected.png
LayoutTests/platform/chromium-linux/css2.1/t170602-bdr-conflct-w-76-d-expected.png
LayoutTests/platform/chromium-linux/css2.1/t170602-bdr-conflct-w-77-d-expected.png
LayoutTests/platform/chromium-linux/css2.1/t170602-bdr-conflct-w-78-d-expected.png
LayoutTests/platform/chromium-linux/css2.1/t170602-bdr-conflct-w-79-d-expected.png
LayoutTests/platform/chromium-linux/css2.1/t170602-bdr-conflct-w-81-d-expected.png
LayoutTests/platform/chromium-linux/css2.1/t170602-bdr-conflct-w-82-d-expected.png
LayoutTests/platform/chromium-linux/css2.1/t170602-bdr-conflct-w-83-d-expected.png
LayoutTests/platform/chromium-linux/css2.1/t170602-bdr-conflct-w-84-d-expected.png
LayoutTests/platform/chromium-linux/css2.1/t170602-bdr-conflct-w-85-d-expected.png
LayoutTests/platform/chromium-linux/css2.1/t170602-bdr-conflct-w-86-d-expected.png
LayoutTests/platform/chromium-linux/css2.1/t170602-bdr-conflct-w-87-d-expected.png
LayoutTests/platform/chromium-linux/css2.1/t170602-bdr-conflct-w-88-d-expected.png
LayoutTests/platform/chromium-linux/css2.1/t170602-bdr-conflct-w-89-d-expected.png
LayoutTests/platform/chromium-linux/css2.1/t170602-bdr-conflct-w-95-d-expected.png
LayoutTests/platform/chromium-linux/css2.1/t170602-bdr-conflct-w-96-d-expected.png
LayoutTests/platform/chromium-linux/css2.1/t170602-bdr-conflct-w-97-d-expected.png
LayoutTests/platform/chromium-linux/css2.1/t170602-bdr-conflct-w-98-d-expected.png
LayoutTests/platform/chromium-linux/fast/borders/border-antialiasing-expected.png
LayoutTests/platform/chromium-linux/tables/mozilla/collapsing_borders/bug41262-4-expected.png
LayoutTests/platform/chromium-linux/tables/mozilla/marvin/table_rules_all-expected.png
LayoutTests/platform/chromium-linux/tables/mozilla/marvin/table_rules_none-expected.png
LayoutTests/platform/chromium-linux/tables/mozilla_expected_failures/marvin/table_rules_cols-expected.png
LayoutTests/platform/chromium-linux/tables/mozilla_expected_failures/marvin/table_rules_rows-expected.png
LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-001-expected.png [new file with mode: 0644]
LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-001-expected.txt [new file with mode: 0644]
LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-001a-expected.png [new file with mode: 0644]
LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-001a-expected.txt [new file with mode: 0644]
LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-001b-expected.png [new file with mode: 0644]
LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-001b-expected.txt [new file with mode: 0644]
LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-001c-expected.png [new file with mode: 0644]
LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-001c-expected.txt [new file with mode: 0644]
LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-001d-expected.png [new file with mode: 0644]
LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-001d-expected.txt [new file with mode: 0644]
LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-003-expected.png [new file with mode: 0644]
LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-003-expected.txt [new file with mode: 0644]
LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-004-expected.png [new file with mode: 0644]
LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-004-expected.txt [new file with mode: 0644]
LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-005-expected.png [new file with mode: 0644]
LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-005-expected.txt [new file with mode: 0644]
LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-006-expected.png [new file with mode: 0644]
LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-006-expected.txt [new file with mode: 0644]
LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-007-expected.png [new file with mode: 0644]
LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-007-expected.txt [new file with mode: 0644]
LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-008-expected.png [new file with mode: 0644]
LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-008-expected.txt [new file with mode: 0644]
LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-009-expected.png [new file with mode: 0644]
LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-009-expected.txt [new file with mode: 0644]
LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-010-expected.png [new file with mode: 0644]
LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-010-expected.txt [new file with mode: 0644]
LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-011-expected.png [new file with mode: 0644]
LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-011-expected.txt [new file with mode: 0644]
LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-012-expected.png [new file with mode: 0644]
LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-012-expected.txt [new file with mode: 0644]
LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-013-expected.png [new file with mode: 0644]
LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-013-expected.txt [new file with mode: 0644]
LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-014-expected.png [new file with mode: 0644]
LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-014-expected.txt [new file with mode: 0644]
LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-015-expected.png [new file with mode: 0644]
LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-015-expected.txt [new file with mode: 0644]
LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-016-expected.png [new file with mode: 0644]
LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-016-expected.txt [new file with mode: 0644]
LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-017-expected.png [new file with mode: 0644]
LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-017-expected.txt [new file with mode: 0644]
LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-018-expected.png [new file with mode: 0644]
LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-018-expected.txt [new file with mode: 0644]
LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-019-expected.png [new file with mode: 0644]
LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-019-expected.txt [new file with mode: 0644]
LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-020-expected.png [new file with mode: 0644]
LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-020-expected.txt [new file with mode: 0644]
LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-021-expected.png [new file with mode: 0644]
LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-021-expected.txt [new file with mode: 0644]
LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-022-expected.png [new file with mode: 0644]
LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-022-expected.txt [new file with mode: 0644]
LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-023-expected.png [new file with mode: 0644]
LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-023-expected.txt [new file with mode: 0644]
LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-024-expected.png [new file with mode: 0644]
LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-024-expected.txt [new file with mode: 0644]
LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-025-expected.png [new file with mode: 0644]
LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-025-expected.txt [new file with mode: 0644]
LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-026-expected.png [new file with mode: 0644]
LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-026-expected.txt [new file with mode: 0644]
LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-027-expected.png [new file with mode: 0644]
LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-027-expected.txt [new file with mode: 0644]
LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-028-expected.png [new file with mode: 0644]
LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-028-expected.txt [new file with mode: 0644]
LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-029-expected.png [new file with mode: 0644]
LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-029-expected.txt [new file with mode: 0644]
LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-030-expected.png [new file with mode: 0644]
LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-030-expected.txt [new file with mode: 0644]
LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-031-expected.png [new file with mode: 0644]
LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-031-expected.txt [new file with mode: 0644]
LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-032-expected.png [new file with mode: 0644]
LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-032-expected.txt [new file with mode: 0644]
LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-033-expected.png [new file with mode: 0644]
LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-033-expected.txt [new file with mode: 0644]
LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-034-expected.png [new file with mode: 0644]
LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-034-expected.txt [new file with mode: 0644]
LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-035-expected.png [new file with mode: 0644]
LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-035-expected.txt [new file with mode: 0644]
LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-036-expected.png [new file with mode: 0644]
LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-036-expected.txt [new file with mode: 0644]
LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-037-expected.png [new file with mode: 0644]
LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-037-expected.txt [new file with mode: 0644]
LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-038-expected.png [new file with mode: 0644]
LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-038-expected.txt [new file with mode: 0644]
LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-039-expected.png [new file with mode: 0644]
LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-039-expected.txt [new file with mode: 0644]
LayoutTests/platform/chromium/fast/css/border-conflict-element-002-expected.png [new file with mode: 0644]
LayoutTests/platform/chromium/fast/css/border-conflict-element-002-expected.txt [new file with mode: 0644]
Source/WebCore/ChangeLog
Source/WebCore/rendering/RenderTableCell.cpp
Source/WebCore/rendering/style/CollapsedBorderValue.h
Source/WebCore/rendering/style/RenderStyleConstants.h

index 60e4b0f..7552115 100644 (file)
@@ -1,3 +1,237 @@
+2011-11-27  Robert Hogan  <robert@webkit.org>
+
+        CSS 2.1 failure: border-conflict-element-*
+        https://bugs.webkit.org/show_bug.cgi?id=71244
+
+        Add all the passing border-conflict-element* tests from the CSS 2.1 test suite.
+
+        Add a corrected version of the CSS suite test border-conflict-element-002.htm, which can sit here until 
+          the corrected version is landed upstream. See http://lists.w3.org/Archives/Public/public-css-testsuite/2011Nov/0002.html
+
+        Rebaseline all t170602-bdr-conflct-w-* tests. The rendering of the collapsed borders in these
+          tests now obeys the order of precedence for the position of the cell and the precendece of the position
+          of the borders within the same cell.
+
+        Rebaseline tables/mozilla/collapsing_borders/bug41262-4.html: ditto
+                   tables/mozilla/marvin/table_rules_all.html : ditto
+                   tables/mozilla/marvin/table_rules_none.html : ditto
+                   tables/mozilla_expected_failures/marvin/table_rules_cols.html : ditto
+                   tables/mozilla_expected_failures/marvin/table_rules_rows.html : ditto
+
+        Rebaseline two border-conflict-style-* tests: ditto
+
+        Rebaseline fast/borders/border-antialiasing.html, the result is too small to confirm the difference but
+          presume it is one of the above.
+
+        Reviewed by Julien Chaffraix.
+
+        * css2.1/20110323/border-conflict-element-001.htm: Added.
+        * css2.1/20110323/border-conflict-element-001a.htm: Added.
+        * css2.1/20110323/border-conflict-element-001b.htm: Added.
+        * css2.1/20110323/border-conflict-element-001c.htm: Added.
+        * css2.1/20110323/border-conflict-element-001d.htm: Added.
+        * css2.1/20110323/border-conflict-element-003.htm: Added.
+        * css2.1/20110323/border-conflict-element-004.htm: Added.
+        * css2.1/20110323/border-conflict-element-005.htm: Added.
+        * css2.1/20110323/border-conflict-element-006.htm: Added.
+        * css2.1/20110323/border-conflict-element-007.htm: Added.
+        * css2.1/20110323/border-conflict-element-008.htm: Added.
+        * css2.1/20110323/border-conflict-element-009.htm: Added.
+        * css2.1/20110323/border-conflict-element-010.htm: Added.
+        * css2.1/20110323/border-conflict-element-011.htm: Added.
+        * css2.1/20110323/border-conflict-element-012.htm: Added.
+        * css2.1/20110323/border-conflict-element-013.htm: Added.
+        * css2.1/20110323/border-conflict-element-014.htm: Added.
+        * css2.1/20110323/border-conflict-element-015.htm: Added.
+        * css2.1/20110323/border-conflict-element-016.htm: Added.
+        * css2.1/20110323/border-conflict-element-017.htm: Added.
+        * css2.1/20110323/border-conflict-element-018.htm: Added.
+        * css2.1/20110323/border-conflict-element-019.htm: Added.
+        * css2.1/20110323/border-conflict-element-020.htm: Added.
+        * css2.1/20110323/border-conflict-element-021.htm: Added.
+        * css2.1/20110323/border-conflict-element-022.htm: Added.
+        * css2.1/20110323/border-conflict-element-023.htm: Added.
+        * css2.1/20110323/border-conflict-element-024.htm: Added.
+        * css2.1/20110323/border-conflict-element-025.htm: Added.
+        * css2.1/20110323/border-conflict-element-026.htm: Added.
+        * css2.1/20110323/border-conflict-element-027.htm: Added.
+        * css2.1/20110323/border-conflict-element-028.htm: Added.
+        * css2.1/20110323/border-conflict-element-029.htm: Added.
+        * css2.1/20110323/border-conflict-element-030.htm: Added.
+        * css2.1/20110323/border-conflict-element-031.htm: Added.
+        * css2.1/20110323/border-conflict-element-032.htm: Added.
+        * css2.1/20110323/border-conflict-element-033.htm: Added.
+        * css2.1/20110323/border-conflict-element-034.htm: Added.
+        * css2.1/20110323/border-conflict-element-035.htm: Added.
+        * css2.1/20110323/border-conflict-element-036.htm: Added.
+        * css2.1/20110323/border-conflict-element-037.htm: Added.
+        * css2.1/20110323/border-conflict-element-038.htm: Added.
+        * css2.1/20110323/border-conflict-element-039.htm: Added.
+        * css2.1/20110323/support/swatch-blue.png: Added.
+        * css2.1/20110323/support/swatch-green.png: Added.
+        * css2.1/20110323/support/swatch-lime.png: Added.
+        * css2.1/20110323/support/swatch-orange.png: Added.
+        * css2.1/20110323/support/swatch-red.png: Added.
+        * css2.1/20110323/support/swatch-teal.png: Added.
+        * css2.1/20110323/support/swatch-white.png: Added.
+        * css2.1/20110323/support/swatch-yellow.png: Added.
+        * fast/css/border-conflict-element-002.htm: Added.
+        * platform/chromium-linux/css2.1/20110323/border-conflict-style-079-expected.png:
+        * platform/chromium-linux/css2.1/20110323/border-conflict-style-088-expected.png:
+        * platform/chromium-linux/css2.1/20110323/floating-replaced-height-008-expected.png: Addition of support/swatch-white.png rebaselines result.
+        * platform/chromium-linux/css2.1/t170602-bdr-conflct-w-05-d-expected.png:
+        * platform/chromium-linux/css2.1/t170602-bdr-conflct-w-06-d-expected.png:
+        * platform/chromium-linux/css2.1/t170602-bdr-conflct-w-07-d-expected.png:
+        * platform/chromium-linux/css2.1/t170602-bdr-conflct-w-08-d-expected.png:
+        * platform/chromium-linux/css2.1/t170602-bdr-conflct-w-15-d-expected.png:
+        * platform/chromium-linux/css2.1/t170602-bdr-conflct-w-16-d-expected.png:
+        * platform/chromium-linux/css2.1/t170602-bdr-conflct-w-17-d-expected.png:
+        * platform/chromium-linux/css2.1/t170602-bdr-conflct-w-18-d-expected.png:
+        * platform/chromium-linux/css2.1/t170602-bdr-conflct-w-25-d-expected.png:
+        * platform/chromium-linux/css2.1/t170602-bdr-conflct-w-26-d-expected.png:
+        * platform/chromium-linux/css2.1/t170602-bdr-conflct-w-27-d-expected.png:
+        * platform/chromium-linux/css2.1/t170602-bdr-conflct-w-28-d-expected.png:
+        * platform/chromium-linux/css2.1/t170602-bdr-conflct-w-35-d-expected.png:
+        * platform/chromium-linux/css2.1/t170602-bdr-conflct-w-36-d-expected.png:
+        * platform/chromium-linux/css2.1/t170602-bdr-conflct-w-37-d-expected.png:
+        * platform/chromium-linux/css2.1/t170602-bdr-conflct-w-38-d-expected.png:
+        * platform/chromium-linux/css2.1/t170602-bdr-conflct-w-45-d-expected.png:
+        * platform/chromium-linux/css2.1/t170602-bdr-conflct-w-46-d-expected.png:
+        * platform/chromium-linux/css2.1/t170602-bdr-conflct-w-47-d-expected.png:
+        * platform/chromium-linux/css2.1/t170602-bdr-conflct-w-48-d-expected.png:
+        * platform/chromium-linux/css2.1/t170602-bdr-conflct-w-51-d-expected.png:
+        * platform/chromium-linux/css2.1/t170602-bdr-conflct-w-52-d-expected.png:
+        * platform/chromium-linux/css2.1/t170602-bdr-conflct-w-53-d-expected.png:
+        * platform/chromium-linux/css2.1/t170602-bdr-conflct-w-54-d-expected.png:
+        * platform/chromium-linux/css2.1/t170602-bdr-conflct-w-55-d-expected.png:
+        * platform/chromium-linux/css2.1/t170602-bdr-conflct-w-56-d-expected.png:
+        * platform/chromium-linux/css2.1/t170602-bdr-conflct-w-57-d-expected.png:
+        * platform/chromium-linux/css2.1/t170602-bdr-conflct-w-58-d-expected.png:
+        * platform/chromium-linux/css2.1/t170602-bdr-conflct-w-59-d-expected.png:
+        * platform/chromium-linux/css2.1/t170602-bdr-conflct-w-61-d-expected.png:
+        * platform/chromium-linux/css2.1/t170602-bdr-conflct-w-62-d-expected.png:
+        * platform/chromium-linux/css2.1/t170602-bdr-conflct-w-63-d-expected.png:
+        * platform/chromium-linux/css2.1/t170602-bdr-conflct-w-64-d-expected.png:
+        * platform/chromium-linux/css2.1/t170602-bdr-conflct-w-65-d-expected.png:
+        * platform/chromium-linux/css2.1/t170602-bdr-conflct-w-66-d-expected.png:
+        * platform/chromium-linux/css2.1/t170602-bdr-conflct-w-67-d-expected.png:
+        * platform/chromium-linux/css2.1/t170602-bdr-conflct-w-68-d-expected.png:
+        * platform/chromium-linux/css2.1/t170602-bdr-conflct-w-69-d-expected.png:
+        * platform/chromium-linux/css2.1/t170602-bdr-conflct-w-71-d-expected.png:
+        * platform/chromium-linux/css2.1/t170602-bdr-conflct-w-72-d-expected.png:
+        * platform/chromium-linux/css2.1/t170602-bdr-conflct-w-73-d-expected.png:
+        * platform/chromium-linux/css2.1/t170602-bdr-conflct-w-74-d-expected.png:
+        * platform/chromium-linux/css2.1/t170602-bdr-conflct-w-75-d-expected.png:
+        * platform/chromium-linux/css2.1/t170602-bdr-conflct-w-76-d-expected.png:
+        * platform/chromium-linux/css2.1/t170602-bdr-conflct-w-77-d-expected.png:
+        * platform/chromium-linux/css2.1/t170602-bdr-conflct-w-78-d-expected.png:
+        * platform/chromium-linux/css2.1/t170602-bdr-conflct-w-79-d-expected.png:
+        * platform/chromium-linux/css2.1/t170602-bdr-conflct-w-81-d-expected.png:
+        * platform/chromium-linux/css2.1/t170602-bdr-conflct-w-82-d-expected.png:
+        * platform/chromium-linux/css2.1/t170602-bdr-conflct-w-83-d-expected.png:
+        * platform/chromium-linux/css2.1/t170602-bdr-conflct-w-84-d-expected.png:
+        * platform/chromium-linux/css2.1/t170602-bdr-conflct-w-85-d-expected.png:
+        * platform/chromium-linux/css2.1/t170602-bdr-conflct-w-86-d-expected.png:
+        * platform/chromium-linux/css2.1/t170602-bdr-conflct-w-87-d-expected.png:
+        * platform/chromium-linux/css2.1/t170602-bdr-conflct-w-88-d-expected.png:
+        * platform/chromium-linux/css2.1/t170602-bdr-conflct-w-89-d-expected.png:
+        * platform/chromium-linux/css2.1/t170602-bdr-conflct-w-95-d-expected.png:
+        * platform/chromium-linux/css2.1/t170602-bdr-conflct-w-96-d-expected.png:
+        * platform/chromium-linux/css2.1/t170602-bdr-conflct-w-97-d-expected.png:
+        * platform/chromium-linux/css2.1/t170602-bdr-conflct-w-98-d-expected.png:
+        * platform/chromium-linux/fast/borders/border-antialiasing-expected.png:
+        * platform/chromium-linux/tables/mozilla/collapsing_borders/bug41262-4-expected.png:
+        * platform/chromium-linux/tables/mozilla/marvin/table_rules_all-expected.png:
+        * platform/chromium-linux/tables/mozilla/marvin/table_rules_none-expected.png:
+        * platform/chromium-linux/tables/mozilla_expected_failures/marvin/table_rules_cols-expected.png:
+        * platform/chromium-linux/tables/mozilla_expected_failures/marvin/table_rules_rows-expected.png:
+        * platform/chromium/css2.1/20110323/border-conflict-element-001-expected.png: Added.
+        * platform/chromium/css2.1/20110323/border-conflict-element-001-expected.txt: Added.
+        * platform/chromium/css2.1/20110323/border-conflict-element-001a-expected.png: Added.
+        * platform/chromium/css2.1/20110323/border-conflict-element-001a-expected.txt: Added.
+        * platform/chromium/css2.1/20110323/border-conflict-element-001b-expected.png: Added.
+        * platform/chromium/css2.1/20110323/border-conflict-element-001b-expected.txt: Added.
+        * platform/chromium/css2.1/20110323/border-conflict-element-001c-expected.png: Added.
+        * platform/chromium/css2.1/20110323/border-conflict-element-001c-expected.txt: Added.
+        * platform/chromium/css2.1/20110323/border-conflict-element-001d-expected.png: Added.
+        * platform/chromium/css2.1/20110323/border-conflict-element-001d-expected.txt: Added.
+        * platform/chromium/css2.1/20110323/border-conflict-element-003-expected.png: Added.
+        * platform/chromium/css2.1/20110323/border-conflict-element-003-expected.txt: Added.
+        * platform/chromium/css2.1/20110323/border-conflict-element-004-expected.png: Added.
+        * platform/chromium/css2.1/20110323/border-conflict-element-004-expected.txt: Added.
+        * platform/chromium/css2.1/20110323/border-conflict-element-005-expected.png: Added.
+        * platform/chromium/css2.1/20110323/border-conflict-element-005-expected.txt: Added.
+        * platform/chromium/css2.1/20110323/border-conflict-element-006-expected.png: Added.
+        * platform/chromium/css2.1/20110323/border-conflict-element-006-expected.txt: Added.
+        * platform/chromium/css2.1/20110323/border-conflict-element-007-expected.png: Added.
+        * platform/chromium/css2.1/20110323/border-conflict-element-007-expected.txt: Added.
+        * platform/chromium/css2.1/20110323/border-conflict-element-008-expected.png: Added.
+        * platform/chromium/css2.1/20110323/border-conflict-element-008-expected.txt: Added.
+        * platform/chromium/css2.1/20110323/border-conflict-element-009-expected.png: Added.
+        * platform/chromium/css2.1/20110323/border-conflict-element-009-expected.txt: Added.
+        * platform/chromium/css2.1/20110323/border-conflict-element-010-expected.png: Added.
+        * platform/chromium/css2.1/20110323/border-conflict-element-010-expected.txt: Added.
+        * platform/chromium/css2.1/20110323/border-conflict-element-011-expected.png: Added.
+        * platform/chromium/css2.1/20110323/border-conflict-element-011-expected.txt: Added.
+        * platform/chromium/css2.1/20110323/border-conflict-element-012-expected.png: Added.
+        * platform/chromium/css2.1/20110323/border-conflict-element-012-expected.txt: Added.
+        * platform/chromium/css2.1/20110323/border-conflict-element-013-expected.png: Added.
+        * platform/chromium/css2.1/20110323/border-conflict-element-013-expected.txt: Added.
+        * platform/chromium/css2.1/20110323/border-conflict-element-014-expected.png: Added.
+        * platform/chromium/css2.1/20110323/border-conflict-element-014-expected.txt: Added.
+        * platform/chromium/css2.1/20110323/border-conflict-element-015-expected.png: Added.
+        * platform/chromium/css2.1/20110323/border-conflict-element-015-expected.txt: Added.
+        * platform/chromium/css2.1/20110323/border-conflict-element-016-expected.png: Added.
+        * platform/chromium/css2.1/20110323/border-conflict-element-016-expected.txt: Added.
+        * platform/chromium/css2.1/20110323/border-conflict-element-017-expected.png: Added.
+        * platform/chromium/css2.1/20110323/border-conflict-element-017-expected.txt: Added.
+        * platform/chromium/css2.1/20110323/border-conflict-element-018-expected.png: Added.
+        * platform/chromium/css2.1/20110323/border-conflict-element-018-expected.txt: Added.
+        * platform/chromium/css2.1/20110323/border-conflict-element-019-expected.png: Added.
+        * platform/chromium/css2.1/20110323/border-conflict-element-019-expected.txt: Added.
+        * platform/chromium/css2.1/20110323/border-conflict-element-020-expected.png: Added.
+        * platform/chromium/css2.1/20110323/border-conflict-element-020-expected.txt: Added.
+        * platform/chromium/css2.1/20110323/border-conflict-element-021-expected.png: Added.
+        * platform/chromium/css2.1/20110323/border-conflict-element-021-expected.txt: Added.
+        * platform/chromium/css2.1/20110323/border-conflict-element-022-expected.png: Added.
+        * platform/chromium/css2.1/20110323/border-conflict-element-022-expected.txt: Added.
+        * platform/chromium/css2.1/20110323/border-conflict-element-023-expected.png: Added.
+        * platform/chromium/css2.1/20110323/border-conflict-element-023-expected.txt: Added.
+        * platform/chromium/css2.1/20110323/border-conflict-element-024-expected.png: Added.
+        * platform/chromium/css2.1/20110323/border-conflict-element-024-expected.txt: Added.
+        * platform/chromium/css2.1/20110323/border-conflict-element-025-expected.png: Added.
+        * platform/chromium/css2.1/20110323/border-conflict-element-025-expected.txt: Added.
+        * platform/chromium/css2.1/20110323/border-conflict-element-026-expected.png: Added.
+        * platform/chromium/css2.1/20110323/border-conflict-element-026-expected.txt: Added.
+        * platform/chromium/css2.1/20110323/border-conflict-element-027-expected.png: Added.
+        * platform/chromium/css2.1/20110323/border-conflict-element-027-expected.txt: Added.
+        * platform/chromium/css2.1/20110323/border-conflict-element-028-expected.png: Added.
+        * platform/chromium/css2.1/20110323/border-conflict-element-028-expected.txt: Added.
+        * platform/chromium/css2.1/20110323/border-conflict-element-029-expected.png: Added.
+        * platform/chromium/css2.1/20110323/border-conflict-element-029-expected.txt: Added.
+        * platform/chromium/css2.1/20110323/border-conflict-element-030-expected.png: Added.
+        * platform/chromium/css2.1/20110323/border-conflict-element-030-expected.txt: Added.
+        * platform/chromium/css2.1/20110323/border-conflict-element-031-expected.png: Added.
+        * platform/chromium/css2.1/20110323/border-conflict-element-031-expected.txt: Added.
+        * platform/chromium/css2.1/20110323/border-conflict-element-032-expected.png: Added.
+        * platform/chromium/css2.1/20110323/border-conflict-element-032-expected.txt: Added.
+        * platform/chromium/css2.1/20110323/border-conflict-element-033-expected.png: Added.
+        * platform/chromium/css2.1/20110323/border-conflict-element-033-expected.txt: Added.
+        * platform/chromium/css2.1/20110323/border-conflict-element-034-expected.png: Added.
+        * platform/chromium/css2.1/20110323/border-conflict-element-034-expected.txt: Added.
+        * platform/chromium/css2.1/20110323/border-conflict-element-035-expected.png: Added.
+        * platform/chromium/css2.1/20110323/border-conflict-element-035-expected.txt: Added.
+        * platform/chromium/css2.1/20110323/border-conflict-element-036-expected.png: Added.
+        * platform/chromium/css2.1/20110323/border-conflict-element-036-expected.txt: Added.
+        * platform/chromium/css2.1/20110323/border-conflict-element-037-expected.png: Added.
+        * platform/chromium/css2.1/20110323/border-conflict-element-037-expected.txt: Added.
+        * platform/chromium/css2.1/20110323/border-conflict-element-038-expected.png: Added.
+        * platform/chromium/css2.1/20110323/border-conflict-element-038-expected.txt: Added.
+        * platform/chromium/css2.1/20110323/border-conflict-element-039-expected.png: Added.
+        * platform/chromium/css2.1/20110323/border-conflict-element-039-expected.txt: Added.
+        * platform/chromium/fast/css/border-conflict-element-002-expected.png: Added.
+        * platform/chromium/fast/css/border-conflict-element-002-expected.txt: Added.
+
 2011-11-27  Lauro Neto  <lauro.neto@openbossa.org>
 
         REGRESSION(r97881): It broke fast/dom/error-to-string-stack-overflow.html
diff --git a/LayoutTests/css2.1/20110323/border-conflict-element-001.htm b/LayoutTests/css2.1/20110323/border-conflict-element-001.htm
new file mode 100644 (file)
index 0000000..64cdbd8
--- /dev/null
@@ -0,0 +1,50 @@
+<!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 (element) - cell vs. cell - element with highest priority is the dominant border</title>
+        <link rel="author" title="Microsoft" href="http://www.microsoft.com/">
+        <link rel="help" href="http://www.w3.org/TR/CSS21/tables.html#border-conflict-resolution">
+        <meta name="flags" content="">
+        <meta name="assert" content="With adjacent cells of same border-style and width, border collapsing favors the cell furthest to the top and left (in a 'left-to-right' table).">
+        <style type="text/css">
+            table
+            {
+                border-collapse: collapse;
+                height: 2in;
+                width: 2in;
+            }
+            td
+            {
+                border: 5px solid black;
+            }
+            .collapsing1
+            {
+                border-left: red;
+            }
+            #collapsing2
+            {
+                border-top: red;
+            }
+        </style>
+    </head>
+    <body>
+        <p>Test passes if there is no red visible on the page.</p>
+        <table>
+            <tr>
+                <td></td>
+                <td></td>
+                <td></td>
+            </tr>
+            <tr>
+                <td></td>
+                <td class="collapsing1"></td>
+                <td class="collapsing1"></td>
+            </tr>
+            <tr>
+                <td></td>
+                <td id="collapsing2"></td>
+                <td></td>
+            </tr>
+        </table>
+    </body>
+</html>
\ No newline at end of file
diff --git a/LayoutTests/css2.1/20110323/border-conflict-element-001a.htm b/LayoutTests/css2.1/20110323/border-conflict-element-001a.htm
new file mode 100644 (file)
index 0000000..2f18dec
--- /dev/null
@@ -0,0 +1,75 @@
+<!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 - adjacent cells with same border-style and border-width</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/">
+  <link rel="help" href="http://www.w3.org/TR/CSS21/tables.html#border-conflict-resolution" title="17.6.2.1 Border conflict resolution">
+  <meta content="" name="flags">
+  <meta content="When two adjacent cells have the same border-width and the same border-style in a 'border-collapse: collapse' table, then the color of the border from the leftmost cell wins (if the table's 'direction' is 'ltr'; right, if it is 'rtl') and the color of the border from the topmost cell wins." name="assert">
+
+  <style type="text/css">
+  table
+  {
+  border-collapse: collapse;
+  margin: 40px auto auto 40px;
+  }
+
+  td
+  {
+  border-style: solid solid solid solid;
+  border-width: 40px 40px 40px 40px;
+  padding: 0px;
+  }
+
+  td#one {border-color: green green green green;}
+  td#two {border-color: green green green red;}
+  td#three {border-color: green green green red;}
+  td#four {border-color: green green green red;}
+
+  td#five {border-color: red green green green;}
+  td#six {border-color: red green green red;}
+  td#seven {border-color: red green green red;}
+  td#eight {border-color: red green green red;}
+
+  td#nine {border-color: red green green green;}
+  td#ten {border-color: red green green red;}
+  td#eleven {border-color: red green green red;}
+  td#twelve {border-color: red green green red;}
+
+  td#thirteen {border-color: red green green green;}
+  td#fourteen {border-color: red green green red;}
+  td#fifteen {border-color: red green green red;}
+  td#sixteen {border-color: red green green red;}
+  </style>
+
+ </head>
+
+ <body>
+
+  <p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+
+  <table>
+
+   <tr>
+    <td id="one"></td> <td id="two"></td> <td id="three"></td> <td id="four"></td>
+   </tr>
+
+   <tr>
+    <td id="five"></td> <td id="six"></td> <td id="seven"></td> <td id="eight"></td>
+   </tr>
+
+   <tr>
+    <td id="nine"></td> <td id="ten"></td> <td id="eleven"></td> <td id="twelve"></td>
+   </tr>
+
+   <tr>
+    <td id="thirteen"></td> <td id="fourteen"></td> <td id="fifteen"></td> <td id="sixteen"></td>
+   </tr>
+
+  </table>
+
+ </body>
+</html>
\ No newline at end of file
diff --git a/LayoutTests/css2.1/20110323/border-conflict-element-001b.htm b/LayoutTests/css2.1/20110323/border-conflict-element-001b.htm
new file mode 100644 (file)
index 0000000..e54f240
--- /dev/null
@@ -0,0 +1,76 @@
+<!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 - adjacent cells with same border-style and border-width</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/">
+  <link rel="help" href="http://www.w3.org/TR/CSS21/tables.html#border-conflict-resolution" title="17.6.2.1 Border conflict resolution">
+  <meta content="" name="flags">
+  <meta content="When two adjacent cells have the same border-width and the same border-style in a 'border-collapse: collapse' table, then the color of the border from the topmost cell wins." name="assert">
+
+  <style type="text/css">
+  table
+  {
+  border-collapse: collapse;
+  margin: 40px auto auto 40px;
+  }
+
+  td
+  {
+  border-style: solid none solid none;
+  border-width: 40px 0px 40px 0px;
+  padding: 0px;
+  width: 50px;
+  }
+
+  td#one {border-color: green red green red;}
+  td#two {border-color: green red green red;}
+  td#three {border-color: green red green red;}
+  td#four {border-color: green red green red;}
+
+  td#five {border-color: red red green red;}
+  td#six {border-color: red red green red;}
+  td#seven {border-color: red red green red;}
+  td#eight {border-color: red red green red;}
+
+  td#nine {border-color: red red green red;}
+  td#ten {border-color: red red green red;}
+  td#eleven {border-color: red red green red;}
+  td#twelve {border-color: red red green red;}
+
+  td#thirteen {border-color: red red green red;}
+  td#fourteen {border-color: red red green red;}
+  td#fifteen {border-color: red red green red;}
+  td#sixteen {border-color: red red green red;}
+  </style>
+
+ </head>
+
+ <body>
+
+  <p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+
+  <table>
+
+   <tr>
+    <td id="one"></td> <td id="two"></td> <td id="three"></td> <td id="four"></td>
+   </tr>
+
+   <tr>
+    <td id="five"></td> <td id="six"></td> <td id="seven"></td> <td id="eight"></td>
+   </tr>
+
+   <tr>
+    <td id="nine"></td> <td id="ten"></td> <td id="eleven"></td> <td id="twelve"></td>
+   </tr>
+
+   <tr>
+    <td id="thirteen"></td> <td id="fourteen"></td> <td id="fifteen"></td> <td id="sixteen"></td>
+   </tr>
+
+  </table>
+
+ </body>
+</html>
\ No newline at end of file
diff --git a/LayoutTests/css2.1/20110323/border-conflict-element-001c.htm b/LayoutTests/css2.1/20110323/border-conflict-element-001c.htm
new file mode 100644 (file)
index 0000000..b66525c
--- /dev/null
@@ -0,0 +1,76 @@
+<!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 - adjacent cells with same border-style and border-width</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/">
+  <link rel="help" href="http://www.w3.org/TR/CSS21/tables.html#border-conflict-resolution" title="17.6.2.1 Border conflict resolution">
+  <meta content="" name="flags">
+  <meta content="When two adjacent cells have the same border-width and the same border-style in a 'border-collapse: collapse' table, then the color of the border from the leftmost cell wins (if the table's 'direction' is 'ltr'; rightmost, if it is 'rtl')." name="assert">
+
+  <style type="text/css">
+  table
+  {
+  border-collapse: collapse;
+  margin: 40px auto auto 40px;
+  }
+
+  td
+  {
+  border-style: none solid none solid;
+  border-width: 0px 40px 0px 40px;
+  height: 50px;
+  padding: 0px;
+  }
+
+  td#one {border-color: red green red green;}
+  td#two {border-color: red green red red;}
+  td#three {border-color: red green red red;}
+  td#four {border-color: red green red red;}
+
+  td#five {border-color: red green red green;}
+  td#six {border-color: red green red red;}
+  td#seven {border-color: red green red red;}
+  td#eight {border-color: red green red red;}
+
+  td#nine {border-color: red green red green;}
+  td#ten {border-color: red green red red;}
+  td#eleven {border-color: red green red red;}
+  td#twelve {border-color: red green red red;}
+
+  td#thirteen {border-color: red green red green;}
+  td#fourteen {border-color: red green red red;}
+  td#fifteen {border-color: red green red red;}
+  td#sixteen {border-color: red green red red;}
+  </style>
+
+ </head>
+
+ <body>
+
+  <p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+
+  <table>
+
+   <tr>
+    <td id="one"></td> <td id="two"></td> <td id="three"></td> <td id="four"></td>
+   </tr>
+
+   <tr>
+    <td id="five"></td> <td id="six"></td> <td id="seven"></td> <td id="eight"></td>
+   </tr>
+
+   <tr>
+    <td id="nine"></td> <td id="ten"></td> <td id="eleven"></td> <td id="twelve"></td>
+   </tr>
+
+   <tr>
+    <td id="thirteen"></td> <td id="fourteen"></td> <td id="fifteen"></td> <td id="sixteen"></td>
+   </tr>
+
+  </table>
+
+ </body>
+</html>
\ No newline at end of file
diff --git a/LayoutTests/css2.1/20110323/border-conflict-element-001d.htm b/LayoutTests/css2.1/20110323/border-conflict-element-001d.htm
new file mode 100644 (file)
index 0000000..9e1b60d
--- /dev/null
@@ -0,0 +1,130 @@
+<!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 - adjacent cells with same border-style and border-width</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/">
+  <link rel="help" href="http://www.w3.org/TR/CSS21/tables.html#border-conflict-resolution" title="17.6.2.1 Border conflict resolution">
+  <meta content="ahem image" name="flags">
+  <meta content="When two adjacent cells have the same border-width and the same border-style in a 'border-collapse: collapse' table, then the color of the border from the leftmost cell wins (if the table's 'direction' is 'ltr'; right, if it is 'rtl') and the color of the border from the topmost cell wins." name="assert">
+
+  <style type="text/css">
+  table
+  {
+  border-collapse: collapse;
+  color: white;
+  font: 1.25em/1 Ahem;
+  margin: auto auto 2em 2em;
+  }
+
+  td {padding: 0px;}
+
+  table#test td
+  {
+  border-style: solid;
+  border-width: 1em;
+  }
+
+  td#one {border-color: blue blue blue blue;}
+  td#two {border-color: yellow yellow yellow red;}
+  td#three {border-color: green green green red;}
+  td#four {border-color: orange orange orange red;}
+
+  td#five {border-color: red yellow yellow yellow;}
+  td#six {border-color: red green green red;}
+  td#seven {border-color: red orange orange red;}
+  td#eight {border-color: red blue blue red;}
+
+  td#nine {border-color: red green green green;}
+  td#ten {border-color: red orange orange red;}
+  td#eleven {border-color: red blue blue red;}
+  td#twelve {border-color: red yellow yellow red;}
+
+  td#thirteen {border-color: red orange orange orange;}
+  td#fourteen {border-color: red blue blue red;}
+  td#fifteen {border-color: red yellow yellow red;}
+  td#sixteen {border-color: red green green red;}
+
+  img
+  {
+  height: 1em;
+  vertical-align: bottom; 
+  /* 
+  With 'vertical-align: bottom', swatch-[color] images "sit" 
+  at the bottom of the cell's line box and not on its baseline 
+  */
+  width: 1em;
+  }
+  </style>
+
+ </head>
+
+ <body>
+
+  <p>Test passes if both grids are <strong>perfectly identical</strong>.</p>
+
+  <table id="test">
+
+   <tr>
+    <td id="one">B</td> <td id="two">Y</td> <td id="three">G</td> <td id="four">O</td>
+   </tr>
+
+   <tr>
+     <td id="five">Y</td> <td id="six">G</td> <td id="seven">O</td> <td id="eight">B</td>
+   </tr>
+
+   <tr>
+     <td id="nine">G</td> <td id="ten">O</td> <td id="eleven">B</td> <td id="twelve">Y</td>
+   </tr>
+
+   <tr>
+     <td id="thirteen">O</td> <td id="fourteen">B</td> <td id="fifteen">Y</td> <td id="sixteen">G</td>
+   </tr>
+
+  </table>
+
+
+  <table id="reference">
+
+   <tr>
+    <td><img src="support/swatch-blue.png" alt="Image download support must be enabled"><img src="support/swatch-blue.png" alt="Image download support must be enabled"><img src="support/swatch-blue.png" alt="Image download support must be enabled"><img src="support/swatch-yellow.png" alt="Image download support must be enabled"><img src="support/swatch-yellow.png" alt="Image download support must be enabled"><img src="support/swatch-green.png" alt="Image download support must be enabled"><img src="support/swatch-green.png" alt="Image download support must be enabled"><img src="support/swatch-orange.png" alt="Image download support must be enabled"><img src="support/swatch-orange.png" alt="Image download support must be enabled"></td>
+   </tr>
+
+   <tr>
+    <td><img src="support/swatch-blue.png" alt="Image download support must be enabled">B<img src="support/swatch-blue.png" alt="Image download support must be enabled">Y<img src="support/swatch-yellow.png" alt="Image download support must be enabled">G<img src="support/swatch-green.png" alt="Image download support must be enabled">O<img src="support/swatch-orange.png" alt="Image download support must be enabled"></td>
+   </tr>
+
+   <tr>
+    <td><img src="support/swatch-blue.png" alt="Image download support must be enabled"><img src="support/swatch-blue.png" alt="Image download support must be enabled"><img src="support/swatch-blue.png" alt="Image download support must be enabled"><img src="support/swatch-yellow.png" alt="Image download support must be enabled"><img src="support/swatch-yellow.png" alt="Image download support must be enabled"><img src="support/swatch-green.png" alt="Image download support must be enabled"><img src="support/swatch-green.png" alt="Image download support must be enabled"><img src="support/swatch-orange.png" alt="Image download support must be enabled"><img src="support/swatch-orange.png" alt="Image download support must be enabled"></td>
+   </tr>
+
+   <tr>
+    <td><img src="support/swatch-yellow.png" alt="Image download support must be enabled">Y<img src="support/swatch-yellow.png" alt="Image download support must be enabled">G<img src="support/swatch-green.png" alt="Image download support must be enabled">O<img src="support/swatch-orange.png" alt="Image download support must be enabled">B<img src="support/swatch-blue.png" alt="Image download support must be enabled"></td>
+   </tr>
+
+   <tr>
+    <td><img src="support/swatch-yellow.png" alt="Image download support must be enabled"><img src="support/swatch-yellow.png" alt="Image download support must be enabled"><img src="support/swatch-yellow.png" alt="Image download support must be enabled"><img src="support/swatch-green.png" alt="Image download support must be enabled"><img src="support/swatch-green.png" alt="Image download support must be enabled"><img src="support/swatch-orange.png" alt="Image download support must be enabled"><img src="support/swatch-orange.png" alt="Image download support must be enabled"><img src="support/swatch-blue.png" alt="Image download support must be enabled"><img src="support/swatch-blue.png" alt="Image download support must be enabled"></td>
+   </tr>
+
+   <tr>
+    <td><img src="support/swatch-green.png" alt="Image download support must be enabled">G<img src="support/swatch-green.png" alt="Image download support must be enabled">O<img src="support/swatch-orange.png" alt="Image download support must be enabled">B<img src="support/swatch-blue.png" alt="Image download support must be enabled">Y<img src="support/swatch-yellow.png" alt="Image download support must be enabled"></td>
+   </tr>
+
+   <tr>
+    <td><img src="support/swatch-green.png" alt="Image download support must be enabled"><img src="support/swatch-green.png" alt="Image download support must be enabled"><img src="support/swatch-green.png" alt="Image download support must be enabled"><img src="support/swatch-orange.png" alt="Image download support must be enabled"><img src="support/swatch-orange.png" alt="Image download support must be enabled"><img src="support/swatch-blue.png" alt="Image download support must be enabled"><img src="support/swatch-blue.png" alt="Image download support must be enabled"><img src="support/swatch-yellow.png" alt="Image download support must be enabled"><img src="support/swatch-yellow.png" alt="Image download support must be enabled"></td>
+   </tr>
+
+   <tr>
+    <td><img src="support/swatch-orange.png" alt="Image download support must be enabled">O<img src="support/swatch-orange.png" alt="Image download support must be enabled">B<img src="support/swatch-blue.png" alt="Image download support must be enabled">Y<img src="support/swatch-yellow.png" alt="Image download support must be enabled">G<img src="support/swatch-green.png" alt="Image download support must be enabled"></td>
+   </tr>
+
+   <tr>
+    <td><img src="support/swatch-orange.png" alt="Image download support must be enabled"><img src="support/swatch-orange.png" alt="Image download support must be enabled"><img src="support/swatch-orange.png" alt="Image download support must be enabled"><img src="support/swatch-blue.png" alt="Image download support must be enabled"><img src="support/swatch-blue.png" alt="Image download support must be enabled"><img src="support/swatch-yellow.png" alt="Image download support must be enabled"><img src="support/swatch-yellow.png" alt="Image download support must be enabled"><img src="support/swatch-green.png" alt="Image download support must be enabled"><img src="support/swatch-green.png" alt="Image download support must be enabled"></td>
+   </tr>
+
+  </table>
+
+ </body>
+</html>
\ No newline at end of file
diff --git a/LayoutTests/css2.1/20110323/border-conflict-element-003.htm b/LayoutTests/css2.1/20110323/border-conflict-element-003.htm
new file mode 100644 (file)
index 0000000..6b6a382
--- /dev/null
@@ -0,0 +1,34 @@
+<!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 element): cell in row - element with highest priority is the dominant border</title>
+        <link rel="author" title="Microsoft" href="http://www.microsoft.com/">
+        <link rel="help" href="http://www.w3.org/TR/CSS21/tables.html#border-conflict-resolution">
+        <meta name="flags" content="">
+        <meta name="assert" content="With embedded elements (cell, row) of same border-style and width, border collapsing favors the cell.">
+        <style type="text/css">
+            table
+            {
+                border-collapse: collapse;
+                height: 2in;
+                width: 2in;
+            }
+            tr
+            {
+                border: 5px solid red;
+            }
+            td
+            {
+                border: 5px solid black;
+            }
+        </style>
+    </head>
+    <body>
+        <p>Test passes if there is no red visible on the page.</p>
+        <table>
+            <tr>
+                <td></td>
+            </tr>
+        </table>
+    </body>
+</html>
\ No newline at end of file
diff --git a/LayoutTests/css2.1/20110323/border-conflict-element-004.htm b/LayoutTests/css2.1/20110323/border-conflict-element-004.htm
new file mode 100644 (file)
index 0000000..1e40e79
--- /dev/null
@@ -0,0 +1,52 @@
+<!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 element): cell vs. row - element with highest priority is the dominant border</title>
+        <link rel="author" title="Microsoft" href="http://www.microsoft.com/">
+        <link rel="help" href="http://www.w3.org/TR/CSS21/tables.html#border-conflict-resolution">
+        <meta name="flags" content="">
+        <meta name="assert" content="With adjacent elements (cell, row) of same border-style and width, border collapsing favors the cell.">
+        <style type="text/css">
+            table
+            {
+                border-collapse: collapse;
+                height: 2in;
+                width: 2in;
+            }
+            #collapsing1
+            {
+                border-bottom: 5px solid red;
+                border-top: 5px solid black;
+            }
+            #collapsing2
+            {
+                border-bottom: 5px solid black;
+                border-top: 5px solid red;
+            }
+            td
+            {
+                border-left: 5px solid black;
+                border-right: 5px solid black;
+            }
+            #test
+            {
+                border-bottom: 5px solid black;
+                border-top: 5px solid black;
+            }
+        </style>
+    </head>
+    <body>
+        <p>Test passes if there is no red visible on the page.</p>
+        <table>
+            <tr id="collapsing1">
+                <td></td>
+            </tr>
+            <tr>
+               <td id="test"></td>
+            </tr>
+            <tr id="collapsing2">
+                <td></td>
+            </tr>
+        </table>
+    </body>
+</html>
\ No newline at end of file
diff --git a/LayoutTests/css2.1/20110323/border-conflict-element-005.htm b/LayoutTests/css2.1/20110323/border-conflict-element-005.htm
new file mode 100644 (file)
index 0000000..d82d54d
--- /dev/null
@@ -0,0 +1,36 @@
+<!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 element): cell in row group - element with highest priority is the dominant border</title>
+        <link rel="author" title="Microsoft" href="http://www.microsoft.com/">
+        <link rel="help" href="http://www.w3.org/TR/CSS21/tables.html#border-conflict-resolution">
+        <meta name="flags" content="">
+        <meta name="assert" content="With embedded elements (cell, row group) of same border-style and width, border collapsing favors the cell.">
+        <style type="text/css">
+            table
+            {
+                border-collapse: collapse;
+                height: 2in;
+                width: 2in;
+            }
+            tbody
+            {
+                border: 5px solid red;
+            }
+            td
+            {
+                border: 5px solid black;
+            }
+        </style>
+    </head>
+    <body>
+        <p>Test passes if there is no red visible on the page.</p>
+        <table>
+            <tbody>
+                <tr>
+                   <td></td>
+                </tr>
+            </tbody>
+        </table>
+    </body>
+</html>
\ No newline at end of file
diff --git a/LayoutTests/css2.1/20110323/border-conflict-element-006.htm b/LayoutTests/css2.1/20110323/border-conflict-element-006.htm
new file mode 100644 (file)
index 0000000..1d1a7c1
--- /dev/null
@@ -0,0 +1,57 @@
+<!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 element): cell vs. row group - element with highest priority is the dominant border</title>
+        <link rel="author" title="Microsoft" href="http://www.microsoft.com/">
+        <link rel="help" href="http://www.w3.org/TR/CSS21/tables.html#border-conflict-resolution">
+        <meta name="flags" content="">
+        <meta name="assert" content="With adjacent elements (cell, row group) of same border-style and width, border collapsing favors the cell.">
+        <style type="text/css">
+            table
+            {
+                border-collapse: collapse;
+                height: 2in;
+                width: 2in;
+            }
+            tbody
+            {
+                border-left: 5px solid black;
+                border-right: 5px solid black;
+            }
+            #collapsing1
+            {
+                border-bottom: 5px solid red;
+                border-top: 5px solid black;
+            }
+            #collapsing2
+            {
+                border-bottom: 5px solid black;
+                border-top: 5px solid red;
+            }
+            #test
+            {
+                border: 5px solid black;
+            }
+        </style>
+    </head>
+    <body>
+        <p>Test passes if there is no red visible on the page.</p>
+        <table>
+            <tbody id="collapsing1">
+                <tr>
+                    <td></td>
+                </tr>
+            </tbody>
+            <tbody>
+                <tr>
+                   <td id="test"></td>
+                </tr>
+            </tbody>
+            <tbody id="collapsing2">
+                <tr>
+                    <td></td>
+                </tr>
+            </tbody>
+        </table>
+    </body>
+</html>
\ No newline at end of file
diff --git a/LayoutTests/css2.1/20110323/border-conflict-element-007.htm b/LayoutTests/css2.1/20110323/border-conflict-element-007.htm
new file mode 100644 (file)
index 0000000..cc5fa49
--- /dev/null
@@ -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: Border Conflict Resolution (by element): cell in column - element with highest priority is the dominant border</title>
+        <link rel="author" title="Microsoft" href="http://www.microsoft.com/">
+        <link rel="help" href="http://www.w3.org/TR/CSS21/tables.html#border-conflict-resolution">
+        <meta name="flags" content="">
+        <meta name="assert" content="With embedded elements (cell, column) of same border-style and width, border collapsing favors the cell.">
+        <style type="text/css">
+            table
+            {
+                border-collapse: collapse;
+                height: 2in;
+                width: 2in;
+            }
+            col
+            {
+                border: 5px solid red;
+            }
+            td
+            {
+                border: 5px solid black;
+            }
+        </style>
+    </head>
+    <body>
+        <p>Test passes if there is no red visible on the page.</p>
+        <table>
+            <col>
+            <tr>
+                <td></td>
+            </tr>
+        </table>
+    </body>
+</html>
\ No newline at end of file
diff --git a/LayoutTests/css2.1/20110323/border-conflict-element-008.htm b/LayoutTests/css2.1/20110323/border-conflict-element-008.htm
new file mode 100644 (file)
index 0000000..7ee1cbf
--- /dev/null
@@ -0,0 +1,50 @@
+<!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 element): cell vs. column - element with highest priority is the dominant border</title>
+        <link rel="author" title="Microsoft" href="http://www.microsoft.com/">
+        <link rel="help" href="http://www.w3.org/TR/CSS21/tables.html#border-conflict-resolution">
+        <meta name="flags" content="">
+        <meta name="assert" content="With adjacent elements (cell, column) of same border-style and width, border collapsing favors the cell.">
+        <style type="text/css">
+            table
+            {
+                border-collapse: collapse;
+                height: 2in;
+                width: 2in;
+            }
+            col
+            {
+                border-bottom: 5px solid black;
+                border-top: 5px solid black;
+            }
+            #collapsing1
+            {
+                border-left: 5px solid black;
+                border-right: 5px solid red;
+            }
+            #collapsing2
+            {
+                border-left: 5px solid red;
+                border-right: 5px solid black;
+            }
+            #test
+            {
+                border: 5px solid black;
+            }
+        </style>
+    </head>
+    <body>
+        <p>Test passes if there is no red visible on the page.</p>
+        <table>
+            <col id="collapsing1">
+            <col>
+            <col id="collapsing2">
+            <tr>
+                <td></td>
+                <td id="test"></td>
+                <td></td>
+            </tr>
+        </table>
+    </body>
+</html>
\ No newline at end of file
diff --git a/LayoutTests/css2.1/20110323/border-conflict-element-009.htm b/LayoutTests/css2.1/20110323/border-conflict-element-009.htm
new file mode 100644 (file)
index 0000000..9ac26b2
--- /dev/null
@@ -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: Border Conflict Resolution (by element): cell in column group - element with highest priority is the dominant border</title>
+        <link rel="author" title="Microsoft" href="http://www.microsoft.com/">
+        <link rel="help" href="http://www.w3.org/TR/CSS21/tables.html#border-conflict-resolution">
+        <meta name="flags" content="">
+        <meta name="assert" content="With embedded elements (cell, column group) of same border-style and width, border collapsing favors the cell.">
+        <style type="text/css">
+            table
+            {
+                border-collapse: collapse;
+                height: 2in;
+                width: 2in;
+            }
+            colgroup
+            {
+                border: 5px solid red;
+            }
+            td
+            {
+                border: 5px solid black;
+            }
+        </style>
+    </head>
+    <body>
+        <p>Test passes if there is no red visible on the page.</p>
+        <table>
+            <colgroup></colgroup>
+            <tr>
+                <td></td>
+            </tr>
+        </table>
+    </body>
+</html>
\ No newline at end of file
diff --git a/LayoutTests/css2.1/20110323/border-conflict-element-010.htm b/LayoutTests/css2.1/20110323/border-conflict-element-010.htm
new file mode 100644 (file)
index 0000000..68512cb
--- /dev/null
@@ -0,0 +1,50 @@
+<!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 element): cell vs. column group - element with highest priority is the dominant border</title>
+        <link rel="author" title="Microsoft" href="http://www.microsoft.com/">
+        <link rel="help" href="http://www.w3.org/TR/CSS21/tables.html#border-conflict-resolution">
+        <meta name="flags" content="">
+        <meta name="assert" content="With adjacent elements (cell, column group) of same border-style and width, border collapsing favors the cell.">
+        <style type="text/css">
+            table
+            {
+                border-collapse: collapse;
+                height: 2in;
+                width: 2in;
+            }
+            colgroup
+            {
+                border-bottom: 5px solid black;
+                border-top: 5px solid black;
+            }
+            #collapsing1
+            {
+                border-left: 5px solid black;
+                border-right: 5px solid red;
+            }
+            #collapsing2
+            {
+                border-left: 5px solid red;
+                border-right: 5px solid black;
+            }
+            #test
+            {
+                border: 5px solid black;
+            }
+        </style>
+    </head>
+    <body>
+        <p>Test passes if there is no red visible on the page.</p>
+        <table>
+            <colgroup id="collapsing1"></colgroup>
+            <colgroup></colgroup>
+            <colgroup id="collapsing2"></colgroup>
+            <tr>
+                <td></td>
+                <td id="test"></td>
+                <td></td>
+            </tr>
+        </table>
+    </body>
+</html>
\ No newline at end of file
diff --git a/LayoutTests/css2.1/20110323/border-conflict-element-011.htm b/LayoutTests/css2.1/20110323/border-conflict-element-011.htm
new file mode 100644 (file)
index 0000000..4b58f00
--- /dev/null
@@ -0,0 +1,31 @@
+<!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 element): cell vs. table - element with highest priority is the dominant border</title>
+        <link rel="author" title="Microsoft" href="http://www.microsoft.com/">
+        <link rel="help" href="http://www.w3.org/TR/CSS21/tables.html#border-conflict-resolution">
+        <meta name="flags" content="">
+        <meta name="assert" content="With embedded elements (cell, table) of same border-style and width, border collapsing favors the cell.">
+        <style type="text/css">
+            table
+            {
+                border: 5px solid red;
+                border-collapse: collapse;
+                height: 2in;
+                width: 2in;
+            }
+            td
+            {
+                border: 5px solid black;
+            }
+        </style>
+    </head>
+    <body>
+        <p>Test passes if there is no red visible on the page.</p>
+        <table>
+            <tr>
+                <td></td>
+            </tr>
+        </table>
+    </body>
+</html>
\ No newline at end of file
diff --git a/LayoutTests/css2.1/20110323/border-conflict-element-012.htm b/LayoutTests/css2.1/20110323/border-conflict-element-012.htm
new file mode 100644 (file)
index 0000000..d4cf117
--- /dev/null
@@ -0,0 +1,53 @@
+<!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 element): row vs. cell - element with highest priority is the dominant border</title>
+        <link rel="author" title="Microsoft" href="http://www.microsoft.com/">
+        <link rel="help" href="http://www.w3.org/TR/CSS21/tables.html#border-conflict-resolution">
+        <meta name="flags" content="">
+        <meta name="assert" content="With adjacent elements (row, cell) of same border-style and width, border collapsing favors the cell.">
+        <style type="text/css">
+            table
+            {
+                border-collapse: collapse;
+                height: 2in;
+                width: 2in;
+            }
+            #test
+            {
+                border-bottom: 5px solid red;
+                border-top: 5px solid red;
+            }
+            td
+            {
+                border-left: 5px solid black;
+                border-right: 5px solid black;
+            }
+            .winning
+            {
+                border-bottom: 5px solid black;
+                border-top: 5px solid black;
+            }
+        </style>
+    </head>
+    <body>
+        <p>Test passes if there is no red visible on the page.</p>
+        <table>
+            <tr>
+                <td class="winning"></td>
+                <td class="winning"></td>
+                <td class="winning"></td>
+            </tr>
+            <tr id="test">
+                <td></td>
+                <td></td>
+                <td></td>
+            </tr>
+            <tr>
+                <td class="winning"></td>
+                <td class="winning"></td>
+                <td class="winning"></td>
+            </tr>
+        </table>
+    </body>
+</html>
\ No newline at end of file
diff --git a/LayoutTests/css2.1/20110323/border-conflict-element-013.htm b/LayoutTests/css2.1/20110323/border-conflict-element-013.htm
new file mode 100644 (file)
index 0000000..3e5991c
--- /dev/null
@@ -0,0 +1,52 @@
+<!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 element): row vs. row - element with highest priority is the dominant border</title>
+        <link rel="author" title="Microsoft" href="http://www.microsoft.com/">
+        <link rel="help" href="http://www.w3.org/TR/CSS21/tables.html#border-conflict-resolution">
+        <meta name="flags" content="">
+        <meta name="assert" content="With adjacent elements (row, row) of same border-style and width, border collapsing favors the row furthest to the top.">
+        <style type="text/css">
+            table
+            {
+                border-collapse: collapse;
+                height: 2in;
+                width: 2in;
+            }
+            tr
+            {
+                border-bottom: 5px solid black;
+                border-top: 5px solid black;
+            }
+            .collapsing
+            {
+                border-top: 5px solid red;
+            }
+            td
+            {
+                border-left: 5px solid black;
+                border-right: 5px solid black;
+            }
+        </style>
+    </head>
+    <body>
+        <p>Test passes if there is no red visible on the page.</p>
+        <table>
+            <tr>
+                <td></td>
+                <td></td>
+                <td></td>
+            </tr>
+            <tr class="collapsing">
+                <td></td>
+                <td></td>
+                <td></td>
+            </tr>
+            <tr class="collapsing">
+                <td></td>
+                <td></td>
+                <td></td>
+            </tr>
+        </table>
+    </body>
+</html>
\ No newline at end of file
diff --git a/LayoutTests/css2.1/20110323/border-conflict-element-014.htm b/LayoutTests/css2.1/20110323/border-conflict-element-014.htm
new file mode 100644 (file)
index 0000000..fc2c726
--- /dev/null
@@ -0,0 +1,36 @@
+<!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 element): row in row group - element with highest priority is the dominant border</title>
+        <link rel="author" title="Microsoft" href="http://www.microsoft.com/">
+        <link rel="help" href="http://www.w3.org/TR/CSS21/tables.html#border-conflict-resolution">
+        <meta name="flags" content="">
+        <meta name="assert" content="With embedded elements (row, row group) of same border-style and width, border collapsing favors the row.">
+        <style type="text/css">
+            table
+            {
+                border-collapse: collapse;
+                height: 2in;
+                width: 2in;
+            }
+            tbody
+            {
+                border: 5px solid red;
+            }
+            tr
+            {
+                border: 5px solid black;
+            }
+        </style>
+    </head>
+    <body>
+        <p>Test passes if there is no red visible on the page.</p>
+        <table>
+            <tbody>
+                <tr>
+                    <td></td>
+                </tr>
+            </tbody>
+        </table>
+    </body>
+</html>
\ No newline at end of file
diff --git a/LayoutTests/css2.1/20110323/border-conflict-element-015.htm b/LayoutTests/css2.1/20110323/border-conflict-element-015.htm
new file mode 100644 (file)
index 0000000..e031d6b
--- /dev/null
@@ -0,0 +1,57 @@
+<!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 element): row vs. row group - element with highest priority is the dominant border</title>
+        <link rel="author" title="Microsoft" href="http://www.microsoft.com/">
+        <link rel="help" href="http://www.w3.org/TR/CSS21/tables.html#border-conflict-resolution">
+        <meta name="flags" content="">
+        <meta name="assert" content="With adjacent elements (row, row group) of same border-style and width, border collapsing favors the row.">
+        <style type="text/css">
+            table
+            {
+                border-collapse: collapse;
+                height: 2in;
+                width: 2in;
+            }
+            tbody
+            {
+                border-left: 5px solid black;
+                border-right: 5px solid black;
+            }
+            #collapsing1
+            {
+                border-bottom: 5px solid red;
+                border-top: 5px solid black;
+            }
+            #collapsing2
+            {
+                border-bottom: 5px solid black;
+                border-top: 5px solid red;
+            }
+            #test
+            {
+               border: 5px solid black;
+            }
+        </style>
+    </head>
+    <body>
+        <p>Test passes if there is no red visible on the page.</p>
+        <table>
+            <tbody id="collapsing1">
+                <tr>
+                    <td></td>
+                </tr>
+            </tbody>
+            <tbody>
+                <tr id="test">
+                    <td></td>
+                </tr>
+            </tbody>
+             <tbody id="collapsing2">
+                <tr>
+                    <td></td>
+                </tr>
+            </tbody>
+        </table>
+    </body>
+</html>
\ No newline at end of file
diff --git a/LayoutTests/css2.1/20110323/border-conflict-element-016.htm b/LayoutTests/css2.1/20110323/border-conflict-element-016.htm
new file mode 100644 (file)
index 0000000..aa981f1
--- /dev/null
@@ -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: Border Conflict Resolution (by element): row vs. column - element with highest priority is the dominant border</title>
+        <link rel="author" title="Microsoft" href="http://www.microsoft.com/">
+        <link rel="help" href="http://www.w3.org/TR/CSS21/tables.html#border-conflict-resolution">
+        <meta name="flags" content="">
+        <meta name="assert" content="With embedded elements (row, column) of same border-style and width, border collapsing favors the row.">
+        <style type="text/css">
+            table
+            {
+                border-collapse: collapse;
+                height: 2in;
+                width: 2in;
+            }
+            col
+            {
+                border: 5px solid red;
+            }
+            tr
+            {
+                border: 5px solid black;
+            }
+        </style>
+    </head>
+    <body>
+        <p>Test passes if there is no red visible on the page.</p>
+        <table>
+            <col>
+            <tr>
+                <td></td>
+            </tr>
+        </table>
+    </body>
+</html>
\ No newline at end of file
diff --git a/LayoutTests/css2.1/20110323/border-conflict-element-017.htm b/LayoutTests/css2.1/20110323/border-conflict-element-017.htm
new file mode 100644 (file)
index 0000000..f994aed
--- /dev/null
@@ -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: Border Conflict Resolution (by element): row vs. column group - element with highest priority is the dominant border</title>
+        <link rel="author" title="Microsoft" href="http://www.microsoft.com/">
+        <link rel="help" href="http://www.w3.org/TR/CSS21/tables.html#border-conflict-resolution">
+        <meta name="flags" content="">
+        <meta name="assert" content="With embedded elements (row, column group) of same border-style and width, border collapsing favors the row.">
+        <style type="text/css">
+            table
+            {
+                border-collapse: collapse;
+                height: 2in;
+                width: 2in;
+            }
+            colgroup
+            {
+                border: 5px solid red;
+            }
+            tr
+            {
+                border: 5px solid black;
+            }
+        </style>
+    </head>
+    <body>
+        <p>Test passes if there is no red visible on the page.</p>
+        <table>
+            <colgroup></colgroup>
+            <tr>
+                <td></td>
+            </tr>
+        </table>
+    </body>
+</html>
\ No newline at end of file
diff --git a/LayoutTests/css2.1/20110323/border-conflict-element-018.htm b/LayoutTests/css2.1/20110323/border-conflict-element-018.htm
new file mode 100644 (file)
index 0000000..f9fa51d
--- /dev/null
@@ -0,0 +1,31 @@
+<!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 element): row vs. table - element with highest priority is the dominant border</title>
+        <link rel="author" title="Microsoft" href="http://www.microsoft.com/">
+        <link rel="help" href="http://www.w3.org/TR/CSS21/tables.html#border-conflict-resolution">
+        <meta name="flags" content="">
+        <meta name="assert" content="With embedded elements (row, table) of same border-style and width, border collapsing favors the row.">
+        <style type="text/css">
+            table
+            {
+                border: 5px solid red;
+                border-collapse: collapse;
+                height: 2in;
+                width: 2in;
+            }
+            tr
+            {
+                border: 5px solid black;
+            }
+        </style>
+    </head>
+    <body>
+        <p>Test passes if there is no red visible on the page.</p>
+        <table>
+            <tr>
+                <td></td>
+            </tr>
+        </table>
+    </body>
+</html>
\ No newline at end of file
diff --git a/LayoutTests/css2.1/20110323/border-conflict-element-019.htm b/LayoutTests/css2.1/20110323/border-conflict-element-019.htm
new file mode 100644 (file)
index 0000000..1c14b1a
--- /dev/null
@@ -0,0 +1,59 @@
+<!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 element): row group vs. cell - element with highest priority is the dominant border</title>
+        <link rel="author" title="Microsoft" href="http://www.microsoft.com/">
+        <link rel="help" href="http://www.w3.org/TR/CSS21/tables.html#border-conflict-resolution">
+        <meta name="flags" content="">
+        <meta name="assert" content="With embedded elements (row group, cell) of same border-style and width, border collapsing favors the cell.">
+        <style type="text/css">
+            table
+            {
+                border-collapse: collapse;
+                height: 2in;
+                width: 2in;
+            }
+            #test
+            {
+                border-bottom: 5px solid red;
+                border-top: 5px solid red;
+            }
+            td
+            {
+                border-left: 5px solid black;
+                border-right: 5px solid black;
+            }
+            .winning
+            {
+                border-bottom: 5px solid black;
+                border-top: 5px solid black;
+            }
+        </style>
+    </head>
+    <body>
+        <p>Test passes if there is no red visible on the page.</p>
+        <table>
+            <tbody>
+                <tr>
+                    <td class="winning"></td>
+                    <td class="winning"></td>
+                    <td class="winning"></td>
+                </tr>
+            </tbody>
+            <tbody id="test">
+                <tr>
+                    <td></td>
+                    <td></td>
+                    <td></td>
+                </tr>
+            </tbody>
+            <tbody>
+                <tr>
+                    <td class="winning"></td>
+                    <td class="winning"></td>
+                    <td class="winning"></td>
+                </tr>
+            </tbody>
+        </table>
+    </body>
+</html>
\ No newline at end of file
diff --git a/LayoutTests/css2.1/20110323/border-conflict-element-020.htm b/LayoutTests/css2.1/20110323/border-conflict-element-020.htm
new file mode 100644 (file)
index 0000000..3400175
--- /dev/null
@@ -0,0 +1,53 @@
+<!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 element): row group vs. row - element with highest priority is the dominant border</title>
+        <link rel="author" title="Microsoft" href="http://www.microsoft.com/">
+        <link rel="help" href="http://www.w3.org/TR/CSS21/tables.html#border-conflict-resolution">
+        <meta name="flags" content="">
+        <meta name="assert" content="With adjacent elements (row group, row) of same border-style and width, border collapsing favors the row.">
+        <style type="text/css">
+            table
+            {
+                border-collapse: collapse;
+                height: 2in;
+                width: 2in;
+            }
+            #test
+            {
+                border-bottom: 5px solid red;
+                border-top: 5px solid red;
+            }
+            .winning
+            {
+                border-bottom: 5px solid black;
+                border-top: 5px solid black;
+            }
+            td
+            {
+                border-left: 5px solid black;
+                border-right: 5px solid black;
+            }
+        </style>
+    </head>
+    <body>
+        <p>Test passes if there is no red visible on the page.</p>
+        <table>
+            <tbody>
+                <tr class="winning">
+                    <td></td>
+                </tr>
+            </tbody>
+            <tbody id="test">
+                <tr>
+                    <td></td>
+                </tr>
+            </tbody>
+            <tbody>
+                <tr class="winning">
+                    <td></td>
+                </tr>
+            </tbody>
+        </table>
+    </body>
+</html>
\ No newline at end of file
diff --git a/LayoutTests/css2.1/20110323/border-conflict-element-021.htm b/LayoutTests/css2.1/20110323/border-conflict-element-021.htm
new file mode 100644 (file)
index 0000000..a7ace06
--- /dev/null
@@ -0,0 +1,46 @@
+<!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 element): row group vs. row group - element with highest priority is the dominant border</title>
+        <link rel="author" title="Microsoft" href="http://www.microsoft.com/">
+        <link rel="help" href="http://www.w3.org/TR/CSS21/tables.html#border-conflict-resolution">
+        <meta name="flags" content="">
+        <meta name="assert" content="With adjacent elements (row group, row group) of same border-style and width, border collapsing favors the row group furthest to the top.">
+        <style type="text/css">
+            table
+            {
+                border-collapse: collapse;
+                height: 2in;
+                width: 2in;
+            }
+            tbody
+            {
+                border: 5px solid black;
+            }
+            .collapsing
+            {
+                border-top: 5px solid red;
+            }
+        </style>
+    </head>
+    <body>
+        <p>Test passes if there is no red visible on the page.</p>
+        <table>
+            <tbody>
+                <tr>
+                    <td></td>
+                </tr>
+            </tbody>
+            <tbody class="collapsing">
+                <tr>
+                    <td></td>
+                </tr>
+            </tbody>
+            <tbody class="collapsing">
+                <tr>
+                    <td></td>
+                </tr>
+            </tbody>
+        </table>
+    </body>
+</html>
\ No newline at end of file
diff --git a/LayoutTests/css2.1/20110323/border-conflict-element-022.htm b/LayoutTests/css2.1/20110323/border-conflict-element-022.htm
new file mode 100644 (file)
index 0000000..11280bd
--- /dev/null
@@ -0,0 +1,37 @@
+<!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 element): row group vs. column - element with highest priority is the dominant border</title>
+        <link rel="author" title="Microsoft" href="http://www.microsoft.com/">
+        <link rel="help" href="http://www.w3.org/TR/CSS21/tables.html#border-conflict-resolution">
+        <meta name="flags" content="">
+        <meta name="assert" content="With embedded elements (row group, column) of same border-style and width, border collapsing favors the row group.">
+        <style type="text/css">
+            table
+            {
+                border-collapse: collapse;
+                height: 2in;
+                width: 2in;
+            }
+            tbody
+            {
+                border: 5px solid black;
+            }
+            col
+            {
+                border: 5px solid red;
+            }
+        </style>
+    </head>
+    <body>
+        <p>Test passes if there is no red visible on the page.</p>
+        <table>
+            <col>
+            <tbody>
+                <tr>
+                    <td></td>
+                </tr>
+            </tbody>
+        </table>
+    </body>
+</html>
\ No newline at end of file
diff --git a/LayoutTests/css2.1/20110323/border-conflict-element-023.htm b/LayoutTests/css2.1/20110323/border-conflict-element-023.htm
new file mode 100644 (file)
index 0000000..c11bf4b
--- /dev/null
@@ -0,0 +1,37 @@
+<!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 element): row group vs. column group - element with highest priority is the dominant border</title>
+        <link rel="author" title="Microsoft" href="http://www.microsoft.com/">
+        <link rel="help" href="http://www.w3.org/TR/CSS21/tables.html#border-conflict-resolution">
+        <meta name="flags" content="">
+        <meta name="assert" content="With embedded elements (row group, column group) of same border-style and width, border collapsing favors the row group.">
+        <style type="text/css">
+            table
+            {
+                border-collapse: collapse;
+                height: 2in;
+                width: 2in;
+            }
+            tbody
+            {
+                border: 5px solid black;
+            }
+            colgroup
+            {
+                border: 5px solid red;
+            }
+        </style>
+    </head>
+    <body>
+        <p>Test passes if there is no red visible on the page.</p>
+        <table>
+            <colgroup></colgroup>
+            <tbody>
+                <tr>
+                    <td></td>
+                </tr>
+            </tbody>
+        </table>
+    </body>
+</html>
\ No newline at end of file
diff --git a/LayoutTests/css2.1/20110323/border-conflict-element-024.htm b/LayoutTests/css2.1/20110323/border-conflict-element-024.htm
new file mode 100644 (file)
index 0000000..76fa031
--- /dev/null
@@ -0,0 +1,33 @@
+<!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 element): row group vs. table - element with highest priority is the dominant border</title>
+        <link rel="author" title="Microsoft" href="http://www.microsoft.com/">
+        <link rel="help" href="http://www.w3.org/TR/CSS21/tables.html#border-conflict-resolution">
+        <meta name="flags" content="">
+        <meta name="assert" content="With embedded elements (row group, table) of same border-style and width, border collapsing favors the row group.">
+        <style type="text/css">
+            table
+            {
+                border: 5px solid red;
+                border-collapse: collapse;
+                height: 2in;
+                width: 2in;
+            }
+            tbody
+            {
+                border: 5px solid black;
+            }
+        </style>
+    </head>
+    <body>
+        <p>Test passes if there is no red visible on the page.</p>
+        <table>
+            <tbody>
+                <tr>
+                    <td></td>
+                </tr>
+            </tbody>
+        </table>
+    </body>
+</html>
\ No newline at end of file
diff --git a/LayoutTests/css2.1/20110323/border-conflict-element-025.htm b/LayoutTests/css2.1/20110323/border-conflict-element-025.htm
new file mode 100644 (file)
index 0000000..ca7b650
--- /dev/null
@@ -0,0 +1,46 @@
+<!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 element): column vs. cell - element with highest priority is the dominant border</title>
+        <link rel="author" title="Microsoft" href="http://www.microsoft.com/">
+        <link rel="help" href="http://www.w3.org/TR/CSS21/tables.html#border-conflict-resolution">
+        <meta name="flags" content="">
+        <meta name="assert" content="With adjacent elements (column, cell) of same border-style and width, border collapsing favors the cell.">
+        <style type="text/css">
+            table
+            {
+                border-collapse: collapse;
+                height: 2in;
+                width: 2in;
+            }
+            #test
+            {
+                border-left: 5px solid red;
+                border-right: 5px solid red;
+            }
+            td
+            {
+                border-bottom: 5px solid black;
+                border-top: 5px solid black;
+            }
+            .winning
+            {
+                border-left: 5px solid black;
+                border-right: 5px solid black;
+            }
+        </style>
+    </head>
+    <body>
+        <p>Test passes if there is no red visible on the page.</p>
+        <table>
+            <col>
+            <col id="test">
+            <col>
+            <tr>
+                <td class="winning"></td>
+                <td></td>
+                <td class="winning"></td>
+            </tr>
+        </table>
+    </body>
+</html>
\ No newline at end of file
diff --git a/LayoutTests/css2.1/20110323/border-conflict-element-026.htm b/LayoutTests/css2.1/20110323/border-conflict-element-026.htm
new file mode 100644 (file)
index 0000000..2272420
--- /dev/null
@@ -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: Border Conflict Resolution (by element): column vs. row - element with highest priority is the dominant border</title>
+        <link rel="author" title="Microsoft" href="http://www.microsoft.com/">
+        <link rel="help" href="http://www.w3.org/TR/CSS21/tables.html#border-conflict-resolution">
+        <meta name="flags" content="">
+        <meta name="assert" content="With adjacent elements (column, row) of same border-style and width, border collapsing favors the row.">
+        <style type="text/css">
+            table
+            {
+                border-collapse: collapse;
+                height: 2in;
+                width: 2in;
+            }
+            tr
+            {
+                border: 5px solid black;
+            }
+            col
+            {
+                border: 5px solid red;
+            }
+        </style>
+    </head>
+    <body>
+        <p>Test passes if there is no red visible on the page.</p>
+        <table>
+            <col>
+            <tr>
+                <td></td>
+            </tr>
+        </table>
+    </body>
+</html>
\ No newline at end of file
diff --git a/LayoutTests/css2.1/20110323/border-conflict-element-027.htm b/LayoutTests/css2.1/20110323/border-conflict-element-027.htm
new file mode 100644 (file)
index 0000000..c65eb60
--- /dev/null
@@ -0,0 +1,37 @@
+<!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 element): column vs. row group - element with highest priority is the dominant border</title>
+        <link rel="author" title="Microsoft" href="http://www.microsoft.com/">
+        <link rel="help" href="http://www.w3.org/TR/CSS21/tables.html#border-conflict-resolution">
+        <meta name="flags" content="">
+        <meta name="assert" content="With embedded elements (column, row group) of same border-style and width, border collapsing favors the row group.">
+        <style type="text/css">
+            table
+            {
+                border-collapse: collapse;
+                height: 2in;
+                width: 2in;
+            }
+            col
+            {
+                border: 5px solid red;
+            }
+            tbody
+            {
+                border: 5px solid black;
+            }
+        </style>
+    </head>
+    <body>
+        <p>Test passes if there is no red visible on the page.</p>
+        <table>
+            <col>
+            <tbody>
+                <tr>
+                    <td></td>
+                </tr>
+            </tbody>
+        </table>
+    </body>
+</html>
\ No newline at end of file
diff --git a/LayoutTests/css2.1/20110323/border-conflict-element-028.htm b/LayoutTests/css2.1/20110323/border-conflict-element-028.htm
new file mode 100644 (file)
index 0000000..047fea5
--- /dev/null
@@ -0,0 +1,46 @@
+<!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 element): column vs. column - element with highest priority is the dominant border</title>
+        <link rel="author" title="Microsoft" href="http://www.microsoft.com/">
+        <link rel="help" href="http://www.w3.org/TR/CSS21/tables.html#border-conflict-resolution">
+        <meta name="flags" content="">
+        <meta name="assert" content="With adjacent elements (column, column) of same border-style and width, border collapsing favors the column farthest to the left (in a 'left-to-right' table.">
+        <style type="text/css">
+            table
+            {
+                border-collapse: collapse;
+                height: 2in;
+                width: 2in;
+            }
+            col
+            {
+                border-bottom: 5px solid black;
+                border-top: 5px solid black;
+            }
+            #winning
+            {
+                border-left: 5px solid black;
+                border-right: 5px solid black;
+            }
+            .collapsing
+            {
+                 border-left: 5px solid red;
+                 border-right: 5px solid black;
+            }
+        </style>
+    </head>
+    <body>
+        <p>Test passes if there is no red visible on the page.</p>
+        <table>
+            <col id="winning">
+            <col class="collapsing">
+            <col class="collapsing">
+            <tr>
+                <td></td>
+                <td></td>
+                <td></td>
+            </tr>
+        </table>
+    </body>
+</html>
\ No newline at end of file
diff --git a/LayoutTests/css2.1/20110323/border-conflict-element-029.htm b/LayoutTests/css2.1/20110323/border-conflict-element-029.htm
new file mode 100644 (file)
index 0000000..6119510
--- /dev/null
@@ -0,0 +1,51 @@
+<!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 element): column vs. column - element with highest priority is the dominant border (rtl table)</title>
+        <link rel="author" title="Microsoft" href="http://www.microsoft.com/">
+        <link rel="help" href="http://www.w3.org/TR/CSS21/tables.html#border-conflict-resolution">
+        <meta name="flags" content="">
+        <meta name="assert" content="With adjacent elements (column, column) of same border-style and width, border collapsing favors the column farthest to the right in a 'right-to-left' table.">
+        <style type="text/css">
+            table
+            {
+                border-collapse: collapse;
+                direction: rtl;
+                height: 2in;
+                width: 2in;
+            }
+            col
+            {
+                border-bottom: 5px solid black;
+                border-top: 5px solid black;
+            }
+            #winning
+            {
+                border-left: 5px solid black;
+                border-right: 5px solid black;
+            }
+            .collapsing
+            {
+                 border-left: 5px solid black;
+                 border-right: 5px solid red;
+            }
+            td
+            {
+                direction: ltr;
+            }
+        </style>
+    </head>
+    <body>
+        <p>Test passes if there is no red visible on the page.</p>
+        <table>
+            <col id="winning">
+            <col class="collapsing">
+            <col class="collapsing">
+            <tr>
+                <td></td>
+                <td></td>
+                <td></td>
+            </tr>
+        </table>
+    </body>
+</html>
\ No newline at end of file
diff --git a/LayoutTests/css2.1/20110323/border-conflict-element-030.htm b/LayoutTests/css2.1/20110323/border-conflict-element-030.htm
new file mode 100644 (file)
index 0000000..facb141
--- /dev/null
@@ -0,0 +1,37 @@
+<!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 element): column in column group - element with highest priority is the dominant border</title>
+        <link rel="author" title="Microsoft" href="http://www.microsoft.com/">
+        <link rel="help" href="http://www.w3.org/TR/CSS21/tables.html#border-conflict-resolution">
+        <meta name="flags" content="">
+        <meta name="assert" content="With embedded elements (column, column group) of same border-style and width, border collapsing favors the column.">
+        <style type="text/css">
+            table
+            {
+                border-collapse: collapse;
+                height: 2in;
+                width: 2in;
+            }
+            colgroup
+            {
+                border: 5px solid red;
+            }
+            col
+            {
+                border: 5px solid black;
+            }
+        </style>
+    </head>
+    <body>
+        <p>Test passes if there is no red visible on the page.</p>
+        <table>
+            <colgroup>
+                <col>
+            </colgroup>
+            <tr>
+                <td></td>
+            </tr>
+        </table>
+    </body>
+</html>
\ No newline at end of file
diff --git a/LayoutTests/css2.1/20110323/border-conflict-element-031.htm b/LayoutTests/css2.1/20110323/border-conflict-element-031.htm
new file mode 100644 (file)
index 0000000..1340d88
--- /dev/null
@@ -0,0 +1,57 @@
+<!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 element): column vs. column group - element with highest priority is the dominant border</title>
+        <link rel="author" title="Microsoft" href="http://www.microsoft.com/">
+        <link rel="help" href="http://www.w3.org/TR/CSS21/tables.html#border-conflict-resolution">
+        <meta name="flags" content="">
+        <meta name="assert" content="With adjacent elements (column, column group) of same border-style and width, border collapsing favors the column.">
+        <style type="text/css">
+            table
+            {
+                border-collapse: collapse;
+                height: 2in;
+                width: 2in;
+            }
+            #collapsing1
+            {
+                border-left: 5px solid black;
+                border-right: 5px solid red;
+            }
+            #collapsing2
+            {
+                border-left: 5px solid red;
+                border-right: 5px solid black;
+            }
+            col
+            {
+                border-bottom: 5px solid black;
+                border-top: 5px solid black;
+            }
+            #test
+            {
+                border-left: 5px solid black;
+                border-right: 5px solid black;
+            }
+        </style>
+    </head>
+    <body>
+        <p>Test passes if there is no red visible on the page.</p>
+        <table>
+            <colgroup id="collapsing1">
+                <col>
+            </colgroup>
+            <colgroup>
+                <col id="test">
+            </colgroup>
+            <colgroup id="collapsing2">
+                <col>
+            </colgroup>
+            <tr>
+                <td></td>
+                <td></td>
+                <td></td>
+            </tr>
+        </table>
+    </body>
+</html>
\ No newline at end of file
diff --git a/LayoutTests/css2.1/20110323/border-conflict-element-032.htm b/LayoutTests/css2.1/20110323/border-conflict-element-032.htm
new file mode 100644 (file)
index 0000000..7fd0016
--- /dev/null
@@ -0,0 +1,32 @@
+<!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 element): column vs. table - element with highest priority is the dominant border</title>
+        <link rel="author" title="Microsoft" href="http://www.microsoft.com/">
+        <link rel="help" href="http://www.w3.org/TR/CSS21/tables.html#border-conflict-resolution">
+        <meta name="flags" content="">
+        <meta name="assert" content="With embedded elements (column, table) of same border-style and width, border collapsing favors the column.">
+        <style type="text/css">
+            table
+            {
+                border: 5px solid red;
+                border-collapse: collapse;
+                height: 2in;
+                width: 2in;
+            }
+            col
+            {
+                border: 5px solid black;
+            }
+        </style>
+    </head>
+    <body>
+        <p>Test passes if there is no red visible on the page.</p>
+        <table>
+            <col>
+            <tr>
+                <td></td>
+            </tr>
+        </table>
+    </body>
+</html>
\ No newline at end of file
diff --git a/LayoutTests/css2.1/20110323/border-conflict-element-033.htm b/LayoutTests/css2.1/20110323/border-conflict-element-033.htm
new file mode 100644 (file)
index 0000000..6ad23ce
--- /dev/null
@@ -0,0 +1,52 @@
+<!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 element): column group vs. cell - element with highest priority is the dominant border</title>
+        <link rel="author" title="Microsoft" href="http://www.microsoft.com/">
+        <link rel="help" href="http://www.w3.org/TR/CSS21/tables.html#border-conflict-resolution">
+        <meta name="flags" content="">
+        <meta name="assert" content="With adjacent elements (column group, cell) of same border-style and width, border collapsing favors the cell.">
+        <style type="text/css">
+            table
+            {
+                border-collapse: collapse;
+                height: 2in;
+                width: 2in;
+            }
+            #test
+            {
+                border-left: 5px solid red;
+                border-right: 5px solid red;
+            }
+            td
+            {
+                border-bottom: 5px solid black;
+                border-top: 5px solid black;
+            }
+            .winning
+            {
+                border-left: 5px solid black;
+                border-right: 5px solid black;
+            }
+        </style>
+    </head>
+    <body>
+        <p>Test passes if there is no red visible on the page.</p>
+        <table>
+            <colgroup>
+                <col>
+            </colgroup>
+            <colgroup id="test">
+                <col>
+            </colgroup>
+            <colgroup>
+                <col>
+            </colgroup>
+            <tr>
+                <td class="winning"></td>
+                <td></td>
+                <td class="winning"></td>
+            </tr>
+        </table>
+    </body>
+</html>
\ No newline at end of file
diff --git a/LayoutTests/css2.1/20110323/border-conflict-element-034.htm b/LayoutTests/css2.1/20110323/border-conflict-element-034.htm
new file mode 100644 (file)
index 0000000..b57e90f
--- /dev/null
@@ -0,0 +1,37 @@
+<!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 element): column group vs. row - element with highest priority is the dominant border</title>
+        <link rel="author" title="Microsoft" href="http://www.microsoft.com/">
+        <link rel="help" href="http://www.w3.org/TR/CSS21/tables.html#border-conflict-resolution">
+        <meta name="flags" content="">
+        <meta name="assert" content="With embedded elements (column group, row) of same border-style and width, border collapsing favors the row.">
+        <style type="text/css">
+            table
+            {
+                border-collapse: collapse;
+                height: 2in;
+                width: 2in;
+            }
+            colgroup
+            {
+                border: 5px solid red;
+            }
+            tr
+            {
+                border: 5px solid black;
+            }
+        </style>
+    </head>
+    <body>
+        <p>Test passes if there is no red visible on the page.</p>
+        <table>
+            <colgroup>
+                <col>
+            </colgroup>
+            <tr>
+                <td></td>
+            </tr>
+        </table>
+    </body>
+</html>
\ No newline at end of file
diff --git a/LayoutTests/css2.1/20110323/border-conflict-element-035.htm b/LayoutTests/css2.1/20110323/border-conflict-element-035.htm
new file mode 100644 (file)
index 0000000..2d2a0df
--- /dev/null
@@ -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: Border Conflict Resolution (by element): column group vs. row group - element with highest priority is the dominant border</title>
+        <link rel="author" title="Microsoft" href="http://www.microsoft.com/">
+        <link rel="help" href="http://www.w3.org/TR/CSS21/tables.html#border-conflict-resolution">
+        <meta name="flags" content="">
+        <meta name="assert" content="With embedded elements (column group, row group) of same border-style and width, border collapsing favors the row group.">
+        <style type="text/css">
+            table
+            {
+                border-collapse: collapse;
+                height: 2in;
+                width: 2in;
+            }
+            colgroup
+            {
+                border: 5px solid red;
+            }
+            tbody
+            {
+                border: 5px solid black;
+            }
+        </style>
+    </head>
+    <body>
+        <p>Test passes if there is no red visible on the page.</p>
+        <table>
+            <colgroup>
+                <col>
+            </colgroup>
+            <tbody>
+                <tr>
+                    <td></td>
+                </tr>
+            </tbody>
+        </table>
+    </body>
+</html>
\ No newline at end of file
diff --git a/LayoutTests/css2.1/20110323/border-conflict-element-036.htm b/LayoutTests/css2.1/20110323/border-conflict-element-036.htm
new file mode 100644 (file)
index 0000000..3a159e3
--- /dev/null
@@ -0,0 +1,52 @@
+<!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 element): column group vs. column - element with highest priority is the dominant border</title>
+        <link rel="author" title="Microsoft" href="http://www.microsoft.com/">
+        <link rel="help" href="http://www.w3.org/TR/CSS21/tables.html#border-conflict-resolution">
+        <meta name="flags" content="">
+        <meta name="assert" content="With adjacent elements (column group, column) of same border-style and width, border collapsing favors the column.">
+        <style type="text/css">
+            table
+            {
+                border-collapse: collapse;
+                height: 2in;
+                width: 2in;
+            }
+            #test
+            {
+                border-left: 5px solid red;
+                border-right: 5px solid red;
+            }
+            col
+            {
+                border-bottom: 5px solid black;
+                border-top: 5px solid black;
+            }
+            .winning
+            {
+                border-left: 5px solid black;
+                border-right: 5px solid black;
+            }
+        </style>
+    </head>
+    <body>
+        <p>Test passes if there is no red visible on the page.</p>
+        <table>
+            <colgroup>
+                <col class="winning">
+            </colgroup>
+            <colgroup id="test">
+                <col>
+            </colgroup>
+            <colgroup>
+                <col class="winning">
+            </colgroup>
+            <tr>
+                <td></td>
+                <td></td>
+                <td></td>
+            </tr>
+        </table>
+    </body>
+</html>
\ No newline at end of file
diff --git a/LayoutTests/css2.1/20110323/border-conflict-element-037.htm b/LayoutTests/css2.1/20110323/border-conflict-element-037.htm
new file mode 100644 (file)
index 0000000..43ffda1
--- /dev/null
@@ -0,0 +1,52 @@
+<!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 element): column group vs. column group - element with highest priority is the dominant border</title>
+        <link rel="author" title="Microsoft" href="http://www.microsoft.com/">
+        <link rel="help" href="http://www.w3.org/TR/CSS21/tables.html#border-conflict-resolution">
+        <meta name="flags" content="">
+        <meta name="assert" content="With adjacent elements (column group, column group) of same border-style and width, border collapsing favors the column group farthest to the left (in a 'ltr' table).">
+        <style type="text/css">
+            table
+            {
+                border-collapse: collapse;
+                height: 2in;
+                width: 2in;
+            }
+            colgroup
+            {
+                border-bottom: 5px solid black;
+                border-top: 5px solid black;
+            }
+            .collapsing
+            {
+                border-left: 5px solid red;
+                border-right: 5px solid black;
+            }
+            #winning
+            {
+                border-left: 5px solid black;
+                border-right: 5px solid black;
+            }
+        </style>
+    </head>
+    <body>
+        <p>Test passes if there is no red visible on the page.</p>
+        <table>
+            <colgroup id="winning">
+                <col>
+            </colgroup>
+            <colgroup class="collapsing">
+                <col>
+            </colgroup>
+            <colgroup class="collapsing">
+                <col>
+            </colgroup>
+            <tr>
+                <td></td>
+                <td></td>
+                <td></td>
+            </tr>
+        </table>
+    </body>
+</html>
\ No newline at end of file
diff --git a/LayoutTests/css2.1/20110323/border-conflict-element-038.htm b/LayoutTests/css2.1/20110323/border-conflict-element-038.htm
new file mode 100644 (file)
index 0000000..9242221
--- /dev/null
@@ -0,0 +1,57 @@
+<!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 element): column group vs. column group - element with highest priority is the dominant border (rtl table)</title>
+        <link rel="author" title="Microsoft" href="http://www.microsoft.com/">
+        <link rel="help" href="http://www.w3.org/TR/CSS21/tables.html#border-conflict-resolution">
+        <meta name="flags" content="">
+        <meta name="assert" content="With adjacent elements (column group, column group) of same border-style and width, border collapsing favors the column group farthest to the right in a 'right-to-left' table.">
+        <style type="text/css">
+            table
+            {
+                border-collapse: collapse;
+                direction: rtl;
+                height: 2in;
+                width: 2in;
+            }
+            colgroup
+            {
+                border-bottom: 5px solid black;
+                border-top: 5px solid black;
+            }
+            #winning
+            {
+                border-left: 5px solid black;
+                border-right: 5px solid black;
+            }
+            .collapsing
+            {
+                border-left: 5px solid black;
+                border-right: 5px solid red;
+            }
+            td
+            {
+                direction: ltr;
+            }
+        </style>
+    </head>
+    <body>
+        <p>Test passes if there is no red visible on the page.</p>
+        <table>
+            <colgroup id="winning">
+                <col>
+            </colgroup>
+            <colgroup class="collapsing">
+                <col>
+            </colgroup>
+            <colgroup class="collapsing">
+                <col>
+            </colgroup>
+            <tr>
+                <td></td>
+                <td></td>
+                <td></td>
+            </tr>
+        </table>
+    </body>
+</html>
\ No newline at end of file
diff --git a/LayoutTests/css2.1/20110323/border-conflict-element-039.htm b/LayoutTests/css2.1/20110323/border-conflict-element-039.htm
new file mode 100644 (file)
index 0000000..830aee1
--- /dev/null
@@ -0,0 +1,34 @@
+<!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 element): column group vs. table - element with highest priority is the dominant border</title>
+        <link rel="author" title="Microsoft" href="http://www.microsoft.com/">
+        <link rel="help" href="http://www.w3.org/TR/CSS21/tables.html#border-conflict-resolution">
+        <meta name="flags" content="">
+        <meta name="assert" content="With embedded elements (column group, table) of same border-style and width, border collapsing favors the column group.">
+        <style type="text/css">
+            table
+            {
+                border: 5px solid red;
+                border-collapse: collapse;
+                height: 2in;
+                width: 2in;
+            }
+            colgroup
+            {
+                border: 5px solid black;
+            }
+        </style>
+    </head>
+    <body>
+        <p>Test passes if there is no red visible on the page.</p>
+        <table>
+            <colgroup>
+                <col>
+            </colgroup>
+            <tr>
+                <td></td>
+            </tr>
+        </table>
+    </body>
+</html>
\ No newline at end of file
diff --git a/LayoutTests/css2.1/20110323/support/swatch-blue.png b/LayoutTests/css2.1/20110323/support/swatch-blue.png
new file mode 100644 (file)
index 0000000..bf27596
Binary files /dev/null and b/LayoutTests/css2.1/20110323/support/swatch-blue.png differ
diff --git a/LayoutTests/css2.1/20110323/support/swatch-green.png b/LayoutTests/css2.1/20110323/support/swatch-green.png
new file mode 100644 (file)
index 0000000..0aa79b0
Binary files /dev/null and b/LayoutTests/css2.1/20110323/support/swatch-green.png differ
diff --git a/LayoutTests/css2.1/20110323/support/swatch-lime.png b/LayoutTests/css2.1/20110323/support/swatch-lime.png
new file mode 100644 (file)
index 0000000..55fd7fd
Binary files /dev/null and b/LayoutTests/css2.1/20110323/support/swatch-lime.png differ
diff --git a/LayoutTests/css2.1/20110323/support/swatch-orange.png b/LayoutTests/css2.1/20110323/support/swatch-orange.png
new file mode 100644 (file)
index 0000000..d3cd498
Binary files /dev/null and b/LayoutTests/css2.1/20110323/support/swatch-orange.png differ
diff --git a/LayoutTests/css2.1/20110323/support/swatch-red.png b/LayoutTests/css2.1/20110323/support/swatch-red.png
new file mode 100644 (file)
index 0000000..1caf25c
Binary files /dev/null and b/LayoutTests/css2.1/20110323/support/swatch-red.png differ
diff --git a/LayoutTests/css2.1/20110323/support/swatch-teal.png b/LayoutTests/css2.1/20110323/support/swatch-teal.png
new file mode 100644 (file)
index 0000000..0293ce8
Binary files /dev/null and b/LayoutTests/css2.1/20110323/support/swatch-teal.png differ
diff --git a/LayoutTests/css2.1/20110323/support/swatch-white.png b/LayoutTests/css2.1/20110323/support/swatch-white.png
new file mode 100644 (file)
index 0000000..1a7d432
Binary files /dev/null and b/LayoutTests/css2.1/20110323/support/swatch-white.png differ
diff --git a/LayoutTests/css2.1/20110323/support/swatch-yellow.png b/LayoutTests/css2.1/20110323/support/swatch-yellow.png
new file mode 100644 (file)
index 0000000..1591aa0
Binary files /dev/null and b/LayoutTests/css2.1/20110323/support/swatch-yellow.png differ
diff --git a/LayoutTests/fast/css/border-conflict-element-002.htm b/LayoutTests/fast/css/border-conflict-element-002.htm
new file mode 100644 (file)
index 0000000..2fd4ce0
--- /dev/null
@@ -0,0 +1,53 @@
+<!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 (element) - cell vs. cell - element with highest priority is the dominant border (rtl table)</title>
+        <link rel="author" title="Microsoft" href="http://www.microsoft.com/">
+        <link rel="help" href="http://www.w3.org/TR/CSS21/tables.html#border-conflict-resolution">
+        <meta name="flags" content="">
+        <meta name="assert" content="With adjacent cells of same border-style and width, border collapsing favors the cell furthest to the top right for a 'right-to-left' table.">
+        <meta name="assert" content="This is a corrected version of the CSS suite test, which can sit here until the corrected version is landed upstream. See http://lists.w3.org/Archives/Public/public-css-testsuite/2011Nov/0002.html">
+        <style type="text/css">
+            table
+            {
+                border-collapse: collapse;
+                direction: rtl;
+                height: 2in;
+                width: 2in;
+            }
+            td
+            {
+                border: 5px solid black;
+                direction: ltr;
+            }
+            .collapsing1
+            {
+                border-right: 5px solid red;
+            }
+            #collapsing2
+            {
+                border-top: 5px solid red;
+            }
+        </style>
+    </head>
+    <body>
+        <p>Test passes if there is no red visible on the page.</p>
+        <table>
+            <tr>
+                <td></td>
+                <td></td>
+                <td></td>
+            </tr>
+            <tr>
+                <td></td>
+                <td class="collapsing1"></td>
+                <td class="collapsing1"></td>
+            </tr>
+            <tr>
+                <td></td>
+                <td id="collapsing2"></td>
+                <td></td>
+            </tr>
+        </table>
+    </body>
+</html>
\ No newline at end of file
index 9d32963..0b4910a 100644 (file)
Binary files a/LayoutTests/platform/chromium-linux/css2.1/20110323/border-conflict-style-079-expected.png and b/LayoutTests/platform/chromium-linux/css2.1/20110323/border-conflict-style-079-expected.png differ
index 8d77d70..4cc8a92 100644 (file)
Binary files a/LayoutTests/platform/chromium-linux/css2.1/20110323/border-conflict-style-088-expected.png and b/LayoutTests/platform/chromium-linux/css2.1/20110323/border-conflict-style-088-expected.png differ
index 1730ff9..1758c98 100644 (file)
Binary files a/LayoutTests/platform/chromium-linux/css2.1/20110323/floating-replaced-height-008-expected.png and b/LayoutTests/platform/chromium-linux/css2.1/20110323/floating-replaced-height-008-expected.png differ
index 87a1262..0e2e118 100644 (file)
Binary files a/LayoutTests/platform/chromium-linux/css2.1/t170602-bdr-conflct-w-05-d-expected.png and b/LayoutTests/platform/chromium-linux/css2.1/t170602-bdr-conflct-w-05-d-expected.png differ
index 3551e51..239a96e 100644 (file)
Binary files a/LayoutTests/platform/chromium-linux/css2.1/t170602-bdr-conflct-w-06-d-expected.png and b/LayoutTests/platform/chromium-linux/css2.1/t170602-bdr-conflct-w-06-d-expected.png differ
index 77a22e6..2394a67 100644 (file)
Binary files a/LayoutTests/platform/chromium-linux/css2.1/t170602-bdr-conflct-w-07-d-expected.png and b/LayoutTests/platform/chromium-linux/css2.1/t170602-bdr-conflct-w-07-d-expected.png differ
index 83bcc73..2df6192 100644 (file)
Binary files a/LayoutTests/platform/chromium-linux/css2.1/t170602-bdr-conflct-w-08-d-expected.png and b/LayoutTests/platform/chromium-linux/css2.1/t170602-bdr-conflct-w-08-d-expected.png differ
index 2fa5df9..d67b636 100644 (file)
Binary files a/LayoutTests/platform/chromium-linux/css2.1/t170602-bdr-conflct-w-15-d-expected.png and b/LayoutTests/platform/chromium-linux/css2.1/t170602-bdr-conflct-w-15-d-expected.png differ
index 790e33c..463c4c7 100644 (file)
Binary files a/LayoutTests/platform/chromium-linux/css2.1/t170602-bdr-conflct-w-16-d-expected.png and b/LayoutTests/platform/chromium-linux/css2.1/t170602-bdr-conflct-w-16-d-expected.png differ
index 7eb71a8..9f13f5b 100644 (file)
Binary files a/LayoutTests/platform/chromium-linux/css2.1/t170602-bdr-conflct-w-17-d-expected.png and b/LayoutTests/platform/chromium-linux/css2.1/t170602-bdr-conflct-w-17-d-expected.png differ
index a923aee..e60644d 100644 (file)
Binary files a/LayoutTests/platform/chromium-linux/css2.1/t170602-bdr-conflct-w-18-d-expected.png and b/LayoutTests/platform/chromium-linux/css2.1/t170602-bdr-conflct-w-18-d-expected.png differ
index 12a3c51..97fcfc0 100644 (file)
Binary files a/LayoutTests/platform/chromium-linux/css2.1/t170602-bdr-conflct-w-25-d-expected.png and b/LayoutTests/platform/chromium-linux/css2.1/t170602-bdr-conflct-w-25-d-expected.png differ
index 0496b3b..9aeb2d3 100644 (file)
Binary files a/LayoutTests/platform/chromium-linux/css2.1/t170602-bdr-conflct-w-26-d-expected.png and b/LayoutTests/platform/chromium-linux/css2.1/t170602-bdr-conflct-w-26-d-expected.png differ
index fa33476..880092a 100644 (file)
Binary files a/LayoutTests/platform/chromium-linux/css2.1/t170602-bdr-conflct-w-27-d-expected.png and b/LayoutTests/platform/chromium-linux/css2.1/t170602-bdr-conflct-w-27-d-expected.png differ
index 5e018c0..1e6ea61 100644 (file)
Binary files a/LayoutTests/platform/chromium-linux/css2.1/t170602-bdr-conflct-w-28-d-expected.png and b/LayoutTests/platform/chromium-linux/css2.1/t170602-bdr-conflct-w-28-d-expected.png differ
index b6c3ca1..8094f3c 100644 (file)
Binary files a/LayoutTests/platform/chromium-linux/css2.1/t170602-bdr-conflct-w-35-d-expected.png and b/LayoutTests/platform/chromium-linux/css2.1/t170602-bdr-conflct-w-35-d-expected.png differ
index 862674e..73fbe63 100644 (file)
Binary files a/LayoutTests/platform/chromium-linux/css2.1/t170602-bdr-conflct-w-36-d-expected.png and b/LayoutTests/platform/chromium-linux/css2.1/t170602-bdr-conflct-w-36-d-expected.png differ
index 4d9f4e3..95af19a 100644 (file)
Binary files a/LayoutTests/platform/chromium-linux/css2.1/t170602-bdr-conflct-w-37-d-expected.png and b/LayoutTests/platform/chromium-linux/css2.1/t170602-bdr-conflct-w-37-d-expected.png differ
index 4a64f34..11def7c 100644 (file)
Binary files a/LayoutTests/platform/chromium-linux/css2.1/t170602-bdr-conflct-w-38-d-expected.png and b/LayoutTests/platform/chromium-linux/css2.1/t170602-bdr-conflct-w-38-d-expected.png differ
index caf5cd7..3e04c4b 100644 (file)
Binary files a/LayoutTests/platform/chromium-linux/css2.1/t170602-bdr-conflct-w-45-d-expected.png and b/LayoutTests/platform/chromium-linux/css2.1/t170602-bdr-conflct-w-45-d-expected.png differ
index 174e4a7..b7100a8 100644 (file)
Binary files a/LayoutTests/platform/chromium-linux/css2.1/t170602-bdr-conflct-w-46-d-expected.png and b/LayoutTests/platform/chromium-linux/css2.1/t170602-bdr-conflct-w-46-d-expected.png differ
index adc4722..df34ba2 100644 (file)
Binary files a/LayoutTests/platform/chromium-linux/css2.1/t170602-bdr-conflct-w-47-d-expected.png and b/LayoutTests/platform/chromium-linux/css2.1/t170602-bdr-conflct-w-47-d-expected.png differ
index 5f6c5a1..0ddb2dd 100644 (file)
Binary files a/LayoutTests/platform/chromium-linux/css2.1/t170602-bdr-conflct-w-48-d-expected.png and b/LayoutTests/platform/chromium-linux/css2.1/t170602-bdr-conflct-w-48-d-expected.png differ
index 06a5e01..1840805 100644 (file)
Binary files a/LayoutTests/platform/chromium-linux/css2.1/t170602-bdr-conflct-w-51-d-expected.png and b/LayoutTests/platform/chromium-linux/css2.1/t170602-bdr-conflct-w-51-d-expected.png differ
index d01c7c7..4e10fd7 100644 (file)
Binary files a/LayoutTests/platform/chromium-linux/css2.1/t170602-bdr-conflct-w-52-d-expected.png and b/LayoutTests/platform/chromium-linux/css2.1/t170602-bdr-conflct-w-52-d-expected.png differ
index 2793656..ff62995 100644 (file)
Binary files a/LayoutTests/platform/chromium-linux/css2.1/t170602-bdr-conflct-w-53-d-expected.png and b/LayoutTests/platform/chromium-linux/css2.1/t170602-bdr-conflct-w-53-d-expected.png differ
index fdf5f72..b59f197 100644 (file)
Binary files a/LayoutTests/platform/chromium-linux/css2.1/t170602-bdr-conflct-w-54-d-expected.png and b/LayoutTests/platform/chromium-linux/css2.1/t170602-bdr-conflct-w-54-d-expected.png differ
index 4ce7ac5..153d372 100644 (file)
Binary files a/LayoutTests/platform/chromium-linux/css2.1/t170602-bdr-conflct-w-55-d-expected.png and b/LayoutTests/platform/chromium-linux/css2.1/t170602-bdr-conflct-w-55-d-expected.png differ
index 9163333..087b1e5 100644 (file)
Binary files a/LayoutTests/platform/chromium-linux/css2.1/t170602-bdr-conflct-w-56-d-expected.png and b/LayoutTests/platform/chromium-linux/css2.1/t170602-bdr-conflct-w-56-d-expected.png differ
index 79fbfd3..8be2dab 100644 (file)
Binary files a/LayoutTests/platform/chromium-linux/css2.1/t170602-bdr-conflct-w-57-d-expected.png and b/LayoutTests/platform/chromium-linux/css2.1/t170602-bdr-conflct-w-57-d-expected.png differ
index cca33db..bab04ba 100644 (file)
Binary files a/LayoutTests/platform/chromium-linux/css2.1/t170602-bdr-conflct-w-58-d-expected.png and b/LayoutTests/platform/chromium-linux/css2.1/t170602-bdr-conflct-w-58-d-expected.png differ
index 35db46e..d5dabfc 100644 (file)
Binary files a/LayoutTests/platform/chromium-linux/css2.1/t170602-bdr-conflct-w-59-d-expected.png and b/LayoutTests/platform/chromium-linux/css2.1/t170602-bdr-conflct-w-59-d-expected.png differ
index d4fbbbc..14a6bb7 100644 (file)
Binary files a/LayoutTests/platform/chromium-linux/css2.1/t170602-bdr-conflct-w-61-d-expected.png and b/LayoutTests/platform/chromium-linux/css2.1/t170602-bdr-conflct-w-61-d-expected.png differ
index fad50a4..f7e1cb7 100644 (file)
Binary files a/LayoutTests/platform/chromium-linux/css2.1/t170602-bdr-conflct-w-62-d-expected.png and b/LayoutTests/platform/chromium-linux/css2.1/t170602-bdr-conflct-w-62-d-expected.png differ
index 02c3f57..ffdb218 100644 (file)
Binary files a/LayoutTests/platform/chromium-linux/css2.1/t170602-bdr-conflct-w-63-d-expected.png and b/LayoutTests/platform/chromium-linux/css2.1/t170602-bdr-conflct-w-63-d-expected.png differ
index a70a01b..28cc924 100644 (file)
Binary files a/LayoutTests/platform/chromium-linux/css2.1/t170602-bdr-conflct-w-64-d-expected.png and b/LayoutTests/platform/chromium-linux/css2.1/t170602-bdr-conflct-w-64-d-expected.png differ
index 44b58d7..3c3e952 100644 (file)
Binary files a/LayoutTests/platform/chromium-linux/css2.1/t170602-bdr-conflct-w-65-d-expected.png and b/LayoutTests/platform/chromium-linux/css2.1/t170602-bdr-conflct-w-65-d-expected.png differ
index f99dcbb..a9a4ff6 100644 (file)
Binary files a/LayoutTests/platform/chromium-linux/css2.1/t170602-bdr-conflct-w-66-d-expected.png and b/LayoutTests/platform/chromium-linux/css2.1/t170602-bdr-conflct-w-66-d-expected.png differ
index 334e11e..07df65d 100644 (file)
Binary files a/LayoutTests/platform/chromium-linux/css2.1/t170602-bdr-conflct-w-67-d-expected.png and b/LayoutTests/platform/chromium-linux/css2.1/t170602-bdr-conflct-w-67-d-expected.png differ
index 236d206..fe4a665 100644 (file)
Binary files a/LayoutTests/platform/chromium-linux/css2.1/t170602-bdr-conflct-w-68-d-expected.png and b/LayoutTests/platform/chromium-linux/css2.1/t170602-bdr-conflct-w-68-d-expected.png differ
index 097a182..adcf4ab 100644 (file)
Binary files a/LayoutTests/platform/chromium-linux/css2.1/t170602-bdr-conflct-w-69-d-expected.png and b/LayoutTests/platform/chromium-linux/css2.1/t170602-bdr-conflct-w-69-d-expected.png differ
index 6818a81..bc6dec3 100644 (file)
Binary files a/LayoutTests/platform/chromium-linux/css2.1/t170602-bdr-conflct-w-71-d-expected.png and b/LayoutTests/platform/chromium-linux/css2.1/t170602-bdr-conflct-w-71-d-expected.png differ
index 11611b1..293d5b4 100644 (file)
Binary files a/LayoutTests/platform/chromium-linux/css2.1/t170602-bdr-conflct-w-72-d-expected.png and b/LayoutTests/platform/chromium-linux/css2.1/t170602-bdr-conflct-w-72-d-expected.png differ
index 42591f4..ff507e1 100644 (file)
Binary files a/LayoutTests/platform/chromium-linux/css2.1/t170602-bdr-conflct-w-73-d-expected.png and b/LayoutTests/platform/chromium-linux/css2.1/t170602-bdr-conflct-w-73-d-expected.png differ
index 6257d9b..be006cc 100644 (file)
Binary files a/LayoutTests/platform/chromium-linux/css2.1/t170602-bdr-conflct-w-74-d-expected.png and b/LayoutTests/platform/chromium-linux/css2.1/t170602-bdr-conflct-w-74-d-expected.png differ
index ba10884..fa3b78d 100644 (file)
Binary files a/LayoutTests/platform/chromium-linux/css2.1/t170602-bdr-conflct-w-75-d-expected.png and b/LayoutTests/platform/chromium-linux/css2.1/t170602-bdr-conflct-w-75-d-expected.png differ
index cdcfacf..4c87357 100644 (file)
Binary files a/LayoutTests/platform/chromium-linux/css2.1/t170602-bdr-conflct-w-76-d-expected.png and b/LayoutTests/platform/chromium-linux/css2.1/t170602-bdr-conflct-w-76-d-expected.png differ
index fc20260..07fbb04 100644 (file)
Binary files a/LayoutTests/platform/chromium-linux/css2.1/t170602-bdr-conflct-w-77-d-expected.png and b/LayoutTests/platform/chromium-linux/css2.1/t170602-bdr-conflct-w-77-d-expected.png differ
index 9923895..685ac22 100644 (file)
Binary files a/LayoutTests/platform/chromium-linux/css2.1/t170602-bdr-conflct-w-78-d-expected.png and b/LayoutTests/platform/chromium-linux/css2.1/t170602-bdr-conflct-w-78-d-expected.png differ
index f92dabe..715dd54 100644 (file)
Binary files a/LayoutTests/platform/chromium-linux/css2.1/t170602-bdr-conflct-w-79-d-expected.png and b/LayoutTests/platform/chromium-linux/css2.1/t170602-bdr-conflct-w-79-d-expected.png differ
index 5b3407d..a6a1858 100644 (file)
Binary files a/LayoutTests/platform/chromium-linux/css2.1/t170602-bdr-conflct-w-81-d-expected.png and b/LayoutTests/platform/chromium-linux/css2.1/t170602-bdr-conflct-w-81-d-expected.png differ
index cd2ab45..8060dfb 100644 (file)
Binary files a/LayoutTests/platform/chromium-linux/css2.1/t170602-bdr-conflct-w-82-d-expected.png and b/LayoutTests/platform/chromium-linux/css2.1/t170602-bdr-conflct-w-82-d-expected.png differ
index fc36b98..1e89079 100644 (file)
Binary files a/LayoutTests/platform/chromium-linux/css2.1/t170602-bdr-conflct-w-83-d-expected.png and b/LayoutTests/platform/chromium-linux/css2.1/t170602-bdr-conflct-w-83-d-expected.png differ
index 2823de5..c9d98f5 100644 (file)
Binary files a/LayoutTests/platform/chromium-linux/css2.1/t170602-bdr-conflct-w-84-d-expected.png and b/LayoutTests/platform/chromium-linux/css2.1/t170602-bdr-conflct-w-84-d-expected.png differ
index 28a1582..c6b8268 100644 (file)
Binary files a/LayoutTests/platform/chromium-linux/css2.1/t170602-bdr-conflct-w-85-d-expected.png and b/LayoutTests/platform/chromium-linux/css2.1/t170602-bdr-conflct-w-85-d-expected.png differ
index 3897029..6d8b0e7 100644 (file)
Binary files a/LayoutTests/platform/chromium-linux/css2.1/t170602-bdr-conflct-w-86-d-expected.png and b/LayoutTests/platform/chromium-linux/css2.1/t170602-bdr-conflct-w-86-d-expected.png differ
index 44b4f52..084f0d9 100644 (file)
Binary files a/LayoutTests/platform/chromium-linux/css2.1/t170602-bdr-conflct-w-87-d-expected.png and b/LayoutTests/platform/chromium-linux/css2.1/t170602-bdr-conflct-w-87-d-expected.png differ
index a90c098..be99e7e 100644 (file)
Binary files a/LayoutTests/platform/chromium-linux/css2.1/t170602-bdr-conflct-w-88-d-expected.png and b/LayoutTests/platform/chromium-linux/css2.1/t170602-bdr-conflct-w-88-d-expected.png differ
index 64a9fd8..e207b59 100644 (file)
Binary files a/LayoutTests/platform/chromium-linux/css2.1/t170602-bdr-conflct-w-89-d-expected.png and b/LayoutTests/platform/chromium-linux/css2.1/t170602-bdr-conflct-w-89-d-expected.png differ
index 525831a..cfe5977 100644 (file)
Binary files a/LayoutTests/platform/chromium-linux/css2.1/t170602-bdr-conflct-w-95-d-expected.png and b/LayoutTests/platform/chromium-linux/css2.1/t170602-bdr-conflct-w-95-d-expected.png differ
index d09c479..c591b9a 100644 (file)
Binary files a/LayoutTests/platform/chromium-linux/css2.1/t170602-bdr-conflct-w-96-d-expected.png and b/LayoutTests/platform/chromium-linux/css2.1/t170602-bdr-conflct-w-96-d-expected.png differ
index c068e10..8297c3c 100644 (file)
Binary files a/LayoutTests/platform/chromium-linux/css2.1/t170602-bdr-conflct-w-97-d-expected.png and b/LayoutTests/platform/chromium-linux/css2.1/t170602-bdr-conflct-w-97-d-expected.png differ
index c4bf6b3..9e32efe 100644 (file)
Binary files a/LayoutTests/platform/chromium-linux/css2.1/t170602-bdr-conflct-w-98-d-expected.png and b/LayoutTests/platform/chromium-linux/css2.1/t170602-bdr-conflct-w-98-d-expected.png differ
index 313b8d5..21927e0 100644 (file)
Binary files a/LayoutTests/platform/chromium-linux/fast/borders/border-antialiasing-expected.png and b/LayoutTests/platform/chromium-linux/fast/borders/border-antialiasing-expected.png differ
index 934962c..35e89c1 100644 (file)
Binary files a/LayoutTests/platform/chromium-linux/tables/mozilla/collapsing_borders/bug41262-4-expected.png and b/LayoutTests/platform/chromium-linux/tables/mozilla/collapsing_borders/bug41262-4-expected.png differ
index 2570834..530e60b 100644 (file)
Binary files a/LayoutTests/platform/chromium-linux/tables/mozilla/marvin/table_rules_all-expected.png and b/LayoutTests/platform/chromium-linux/tables/mozilla/marvin/table_rules_all-expected.png differ
index 93f37bd..a91b2dd 100644 (file)
Binary files a/LayoutTests/platform/chromium-linux/tables/mozilla/marvin/table_rules_none-expected.png and b/LayoutTests/platform/chromium-linux/tables/mozilla/marvin/table_rules_none-expected.png differ
index 5474738..cedb55c 100644 (file)
Binary files a/LayoutTests/platform/chromium-linux/tables/mozilla_expected_failures/marvin/table_rules_cols-expected.png and b/LayoutTests/platform/chromium-linux/tables/mozilla_expected_failures/marvin/table_rules_cols-expected.png differ
index 8ea7b78..2db5707 100644 (file)
Binary files a/LayoutTests/platform/chromium-linux/tables/mozilla_expected_failures/marvin/table_rules_rows-expected.png and b/LayoutTests/platform/chromium-linux/tables/mozilla_expected_failures/marvin/table_rules_rows-expected.png differ
diff --git a/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-001-expected.png b/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-001-expected.png
new file mode 100644 (file)
index 0000000..e252a7a
Binary files /dev/null and b/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-001-expected.png differ
diff --git a/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-001-expected.txt b/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-001-expected.txt
new file mode 100644 (file)
index 0000000..05faf35
--- /dev/null
@@ -0,0 +1,22 @@
+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+layer at (0,0) size 800x252
+  RenderBlock {HTML} at (0,0) size 800x252
+    RenderBody {BODY} at (8,16) size 784x228
+      RenderBlock {P} at (0,0) size 784x20
+        RenderText {#text} at (0,0) size 290x19
+          text run at (0,0) width 290: "Test passes if there is no red visible on the page."
+      RenderTable {TABLE} at (0,36) size 192x192 [border: (2px none #808080)]
+        RenderTableSection {TBODY} at (2,2) size 187x187
+          RenderTableRow {TR} at (0,0) size 187x62
+            RenderTableCell {TD} at (0,27) size 62x7 [border: (3px solid #000000)] [r=0 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (62,27) size 62x7 [border: (3px solid #000000)] [r=0 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (124,27) size 63x7 [border: (3px solid #000000)] [r=0 c=2 rs=1 cs=1]
+          RenderTableRow {TR} at (0,62) size 187x62
+            RenderTableCell {TD} at (0,89) size 62x7 [border: (3px solid #000000)] [r=1 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (62,89) size 62x7 [border: (3px solid #000000) (3px none #FF0000)] [r=1 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (124,89) size 63x7 [border: (3px solid #000000) (3px none #FF0000)] [r=1 c=2 rs=1 cs=1]
+          RenderTableRow {TR} at (0,124) size 187x63
+            RenderTableCell {TD} at (0,152) size 62x7 [border: (3px solid #000000)] [r=2 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (62,152) size 62x7 [border: (3px none #FF0000) (2px solid #000000)] [r=2 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (124,152) size 63x7 [border: (3px solid #000000)] [r=2 c=2 rs=1 cs=1]
diff --git a/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-001a-expected.png b/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-001a-expected.png
new file mode 100644 (file)
index 0000000..edb5070
Binary files /dev/null and b/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-001a-expected.png differ
diff --git a/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-001a-expected.txt b/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-001a-expected.txt
new file mode 100644 (file)
index 0000000..a8584b4
--- /dev/null
@@ -0,0 +1,35 @@
+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+layer at (0,0) size 800x284
+  RenderBlock {HTML} at (0,0) size 800x284
+    RenderBody {BODY} at (8,16) size 784x260
+      RenderBlock {P} at (0,0) size 784x20
+        RenderText {#text} at (0,0) size 282x19
+          text run at (0,0) width 282: "Test passes if there is a filled green square and "
+        RenderInline {STRONG} at (0,0) size 42x19
+          RenderText {#text} at (282,0) size 42x19
+            text run at (282,0) width 42: "no red"
+        RenderText {#text} at (324,0) size 4x19
+          text run at (324,0) width 4: "."
+      RenderTable {TABLE} at (40,60) size 200x200 [border: (20px none #808080)]
+        RenderTableSection {TBODY} at (20,20) size 160x160
+          RenderTableRow {TR} at (0,0) size 160x40
+            RenderTableCell {TD} at (0,0) size 40x40 [border: (20px solid #008000)] [r=0 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (40,0) size 40x40 [border: (20px solid #008000) (20px solid #FF0000)] [r=0 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (80,0) size 40x40 [border: (20px solid #008000) (20px solid #FF0000)] [r=0 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (120,0) size 40x40 [border: (20px solid #008000) (20px solid #FF0000)] [r=0 c=3 rs=1 cs=1]
+          RenderTableRow {TR} at (0,40) size 160x40
+            RenderTableCell {TD} at (0,40) size 40x40 [border: (20px solid #FF0000) (20px solid #008000)] [r=1 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (40,40) size 40x40 [border: (20px solid #FF0000) (20px solid #008000) (20px solid #FF0000)] [r=1 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (80,40) size 40x40 [border: (20px solid #FF0000) (20px solid #008000) (20px solid #FF0000)] [r=1 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (120,40) size 40x40 [border: (20px solid #FF0000) (20px solid #008000) (20px solid #FF0000)] [r=1 c=3 rs=1 cs=1]
+          RenderTableRow {TR} at (0,80) size 160x40
+            RenderTableCell {TD} at (0,80) size 40x40 [border: (20px solid #FF0000) (20px solid #008000)] [r=2 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (40,80) size 40x40 [border: (20px solid #FF0000) (20px solid #008000) (20px solid #FF0000)] [r=2 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (80,80) size 40x40 [border: (20px solid #FF0000) (20px solid #008000) (20px solid #FF0000)] [r=2 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (120,80) size 40x40 [border: (20px solid #FF0000) (20px solid #008000) (20px solid #FF0000)] [r=2 c=3 rs=1 cs=1]
+          RenderTableRow {TR} at (0,120) size 160x40
+            RenderTableCell {TD} at (0,120) size 40x40 [border: (20px solid #FF0000) (20px solid #008000)] [r=3 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (40,120) size 40x40 [border: (20px solid #FF0000) (20px solid #008000) (20px solid #FF0000)] [r=3 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (80,120) size 40x40 [border: (20px solid #FF0000) (20px solid #008000) (20px solid #FF0000)] [r=3 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (120,120) size 40x40 [border: (20px solid #FF0000) (20px solid #008000) (20px solid #FF0000)] [r=3 c=3 rs=1 cs=1]
diff --git a/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-001b-expected.png b/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-001b-expected.png
new file mode 100644 (file)
index 0000000..edb5070
Binary files /dev/null and b/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-001b-expected.png differ
diff --git a/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-001b-expected.txt b/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-001b-expected.txt
new file mode 100644 (file)
index 0000000..d87aebd
--- /dev/null
@@ -0,0 +1,35 @@
+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+layer at (0,0) size 800x284
+  RenderBlock {HTML} at (0,0) size 800x284
+    RenderBody {BODY} at (8,16) size 784x260
+      RenderBlock {P} at (0,0) size 784x20
+        RenderText {#text} at (0,0) size 282x19
+          text run at (0,0) width 282: "Test passes if there is a filled green square and "
+        RenderInline {STRONG} at (0,0) size 42x19
+          RenderText {#text} at (282,0) size 42x19
+            text run at (282,0) width 42: "no red"
+        RenderText {#text} at (324,0) size 4x19
+          text run at (324,0) width 4: "."
+      RenderTable {TABLE} at (40,60) size 200x200 [border: (20px none #808080)]
+        RenderTableSection {TBODY} at (0,20) size 200x160
+          RenderTableRow {TR} at (0,0) size 200x40
+            RenderTableCell {TD} at (0,0) size 50x40 [border: (20px solid #008000) none (20px solid #008000) none] [r=0 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (50,0) size 50x40 [border: (20px solid #008000) none (20px solid #008000) none] [r=0 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (100,0) size 50x40 [border: (20px solid #008000) none (20px solid #008000) none] [r=0 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (150,0) size 50x40 [border: (20px solid #008000) none (20px solid #008000) none] [r=0 c=3 rs=1 cs=1]
+          RenderTableRow {TR} at (0,40) size 200x40
+            RenderTableCell {TD} at (0,40) size 50x40 [border: (20px solid #FF0000) none (20px solid #008000) none] [r=1 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (50,40) size 50x40 [border: (20px solid #FF0000) none (20px solid #008000) none] [r=1 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (100,40) size 50x40 [border: (20px solid #FF0000) none (20px solid #008000) none] [r=1 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (150,40) size 50x40 [border: (20px solid #FF0000) none (20px solid #008000) none] [r=1 c=3 rs=1 cs=1]
+          RenderTableRow {TR} at (0,80) size 200x40
+            RenderTableCell {TD} at (0,80) size 50x40 [border: (20px solid #FF0000) none (20px solid #008000) none] [r=2 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (50,80) size 50x40 [border: (20px solid #FF0000) none (20px solid #008000) none] [r=2 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (100,80) size 50x40 [border: (20px solid #FF0000) none (20px solid #008000) none] [r=2 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (150,80) size 50x40 [border: (20px solid #FF0000) none (20px solid #008000) none] [r=2 c=3 rs=1 cs=1]
+          RenderTableRow {TR} at (0,120) size 200x40
+            RenderTableCell {TD} at (0,120) size 50x40 [border: (20px solid #FF0000) none (20px solid #008000) none] [r=3 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (50,120) size 50x40 [border: (20px solid #FF0000) none (20px solid #008000) none] [r=3 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (100,120) size 50x40 [border: (20px solid #FF0000) none (20px solid #008000) none] [r=3 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (150,120) size 50x40 [border: (20px solid #FF0000) none (20px solid #008000) none] [r=3 c=3 rs=1 cs=1]
diff --git a/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-001c-expected.png b/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-001c-expected.png
new file mode 100644 (file)
index 0000000..edb5070
Binary files /dev/null and b/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-001c-expected.png differ
diff --git a/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-001c-expected.txt b/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-001c-expected.txt
new file mode 100644 (file)
index 0000000..4426276
--- /dev/null
@@ -0,0 +1,35 @@
+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+layer at (0,0) size 800x284
+  RenderBlock {HTML} at (0,0) size 800x284
+    RenderBody {BODY} at (8,16) size 784x260
+      RenderBlock {P} at (0,0) size 784x20
+        RenderText {#text} at (0,0) size 282x19
+          text run at (0,0) width 282: "Test passes if there is a filled green square and "
+        RenderInline {STRONG} at (0,0) size 42x19
+          RenderText {#text} at (282,0) size 42x19
+            text run at (282,0) width 42: "no red"
+        RenderText {#text} at (324,0) size 4x19
+          text run at (324,0) width 4: "."
+      RenderTable {TABLE} at (40,60) size 200x200 [border: none]
+        RenderTableSection {TBODY} at (20,0) size 160x200
+          RenderTableRow {TR} at (0,0) size 160x50
+            RenderTableCell {TD} at (0,25) size 40x0 [border: none (20px solid #008000) none (20px solid #008000)] [r=0 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (40,25) size 40x0 [border: none (20px solid #008000) none (20px solid #FF0000)] [r=0 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (80,25) size 40x0 [border: none (20px solid #008000) none (20px solid #FF0000)] [r=0 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (120,25) size 40x0 [border: none (20px solid #008000) none (20px solid #FF0000)] [r=0 c=3 rs=1 cs=1]
+          RenderTableRow {TR} at (0,50) size 160x50
+            RenderTableCell {TD} at (0,75) size 40x0 [border: none (20px solid #008000) none (20px solid #008000)] [r=1 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (40,75) size 40x0 [border: none (20px solid #008000) none (20px solid #FF0000)] [r=1 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (80,75) size 40x0 [border: none (20px solid #008000) none (20px solid #FF0000)] [r=1 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (120,75) size 40x0 [border: none (20px solid #008000) none (20px solid #FF0000)] [r=1 c=3 rs=1 cs=1]
+          RenderTableRow {TR} at (0,100) size 160x50
+            RenderTableCell {TD} at (0,125) size 40x0 [border: none (20px solid #008000) none (20px solid #008000)] [r=2 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (40,125) size 40x0 [border: none (20px solid #008000) none (20px solid #FF0000)] [r=2 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (80,125) size 40x0 [border: none (20px solid #008000) none (20px solid #FF0000)] [r=2 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (120,125) size 40x0 [border: none (20px solid #008000) none (20px solid #FF0000)] [r=2 c=3 rs=1 cs=1]
+          RenderTableRow {TR} at (0,150) size 160x50
+            RenderTableCell {TD} at (0,175) size 40x0 [border: none (20px solid #008000) none (20px solid #008000)] [r=3 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (40,175) size 40x0 [border: none (20px solid #008000) none (20px solid #FF0000)] [r=3 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (80,175) size 40x0 [border: none (20px solid #008000) none (20px solid #FF0000)] [r=3 c=2 rs=1 cs=1]
+            RenderTableCell {TD} at (120,175) size 40x0 [border: none (20px solid #008000) none (20px solid #FF0000)] [r=3 c=3 rs=1 cs=1]
diff --git a/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-001d-expected.png b/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-001d-expected.png
new file mode 100644 (file)
index 0000000..f7d4306
Binary files /dev/null and b/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-001d-expected.png differ
diff --git a/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-001d-expected.txt b/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-001d-expected.txt
new file mode 100644 (file)
index 0000000..a1feff9
--- /dev/null
@@ -0,0 +1,184 @@
+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+layer at (0,0) size 800x492
+  RenderBlock {HTML} at (0,0) size 800x492
+    RenderBody {BODY} at (8,16) size 784x436
+      RenderBlock {P} at (0,0) size 784x20
+        RenderText {#text} at (0,0) size 172x19
+          text run at (0,0) width 172: "Test passes if both grids are "
+        RenderInline {STRONG} at (0,0) size 119x19
+          RenderText {#text} at (172,0) size 119x19
+            text run at (172,0) width 119: "perfectly identical"
+        RenderText {#text} at (291,0) size 4x19
+          text run at (291,0) width 4: "."
+      RenderTable {TABLE} at (40,36) size 180x180 [color=#FFFFFF] [border: (10px none #808080)]
+        RenderTableSection {TBODY} at (10,10) size 160x160
+          RenderTableRow {TR} at (0,0) size 160x40
+            RenderTableCell {TD} at (0,0) size 40x40 [border: (10px solid #0000FF)] [r=0 c=0 rs=1 cs=1]
+              RenderText {#text} at (10,10) size 20x20
+                text run at (10,10) width 20: "B"
+            RenderTableCell {TD} at (40,0) size 40x40 [border: (10px solid #FFFF00) (10px solid #FF0000)] [r=0 c=1 rs=1 cs=1]
+              RenderText {#text} at (10,10) size 20x20
+                text run at (10,10) width 20: "Y"
+            RenderTableCell {TD} at (80,0) size 40x40 [border: (10px solid #008000) (10px solid #FF0000)] [r=0 c=2 rs=1 cs=1]
+              RenderText {#text} at (10,10) size 20x20
+                text run at (10,10) width 20: "G"
+            RenderTableCell {TD} at (120,0) size 40x40 [border: (10px solid #FFA500) (10px solid #FF0000)] [r=0 c=3 rs=1 cs=1]
+              RenderText {#text} at (10,10) size 20x20
+                text run at (10,10) width 20: "O"
+          RenderTableRow {TR} at (0,40) size 160x40
+            RenderTableCell {TD} at (0,40) size 40x40 [border: (10px solid #FF0000) (10px solid #FFFF00)] [r=1 c=0 rs=1 cs=1]
+              RenderText {#text} at (10,10) size 20x20
+                text run at (10,10) width 20: "Y"
+            RenderTableCell {TD} at (40,40) size 40x40 [border: (10px solid #FF0000) (10px solid #008000) (10px solid #FF0000)] [r=1 c=1 rs=1 cs=1]
+              RenderText {#text} at (10,10) size 20x20
+                text run at (10,10) width 20: "G"
+            RenderTableCell {TD} at (80,40) size 40x40 [border: (10px solid #FF0000) (10px solid #FFA500) (10px solid #FF0000)] [r=1 c=2 rs=1 cs=1]
+              RenderText {#text} at (10,10) size 20x20
+                text run at (10,10) width 20: "O"
+            RenderTableCell {TD} at (120,40) size 40x40 [border: (10px solid #FF0000) (10px solid #0000FF) (10px solid #FF0000)] [r=1 c=3 rs=1 cs=1]
+              RenderText {#text} at (10,10) size 20x20
+                text run at (10,10) width 20: "B"
+          RenderTableRow {TR} at (0,80) size 160x40
+            RenderTableCell {TD} at (0,80) size 40x40 [border: (10px solid #FF0000) (10px solid #008000)] [r=2 c=0 rs=1 cs=1]
+              RenderText {#text} at (10,10) size 20x20
+                text run at (10,10) width 20: "G"
+            RenderTableCell {TD} at (40,80) size 40x40 [border: (10px solid #FF0000) (10px solid #FFA500) (10px solid #FF0000)] [r=2 c=1 rs=1 cs=1]
+              RenderText {#text} at (10,10) size 20x20
+                text run at (10,10) width 20: "O"
+            RenderTableCell {TD} at (80,80) size 40x40 [border: (10px solid #FF0000) (10px solid #0000FF) (10px solid #FF0000)] [r=2 c=2 rs=1 cs=1]
+              RenderText {#text} at (10,10) size 20x20
+                text run at (10,10) width 20: "B"
+            RenderTableCell {TD} at (120,80) size 40x40 [border: (10px solid #FF0000) (10px solid #FFFF00) (10px solid #FF0000)] [r=2 c=3 rs=1 cs=1]
+              RenderText {#text} at (10,10) size 20x20
+                text run at (10,10) width 20: "Y"
+          RenderTableRow {TR} at (0,120) size 160x40
+            RenderTableCell {TD} at (0,120) size 40x40 [border: (10px solid #FF0000) (10px solid #FFA500)] [r=3 c=0 rs=1 cs=1]
+              RenderText {#text} at (10,10) size 20x20
+                text run at (10,10) width 20: "O"
+            RenderTableCell {TD} at (40,120) size 40x40 [border: (10px solid #FF0000) (10px solid #0000FF) (10px solid #FF0000)] [r=3 c=1 rs=1 cs=1]
+              RenderText {#text} at (10,10) size 20x20
+                text run at (10,10) width 20: "B"
+            RenderTableCell {TD} at (80,120) size 40x40 [border: (10px solid #FF0000) (10px solid #FFFF00) (10px solid #FF0000)] [r=3 c=2 rs=1 cs=1]
+              RenderText {#text} at (10,10) size 20x20
+                text run at (10,10) width 20: "Y"
+            RenderTableCell {TD} at (120,120) size 40x40 [border: (10px solid #FF0000) (10px solid #008000) (10px solid #FF0000)] [r=3 c=3 rs=1 cs=1]
+              RenderText {#text} at (10,10) size 20x20
+                text run at (10,10) width 20: "G"
+      RenderTable {TABLE} at (40,256) size 180x180 [color=#FFFFFF]
+        RenderTableSection {TBODY} at (0,0) size 180x180
+          RenderTableRow {TR} at (0,0) size 180x20
+            RenderTableCell {TD} at (0,0) size 180x20 [r=0 c=0 rs=1 cs=1]
+              RenderImage {IMG} at (0,0) size 20x20
+              RenderImage {IMG} at (20,0) size 20x20
+              RenderImage {IMG} at (40,0) size 20x20
+              RenderImage {IMG} at (60,0) size 20x20
+              RenderImage {IMG} at (80,0) size 20x20
+              RenderImage {IMG} at (100,0) size 20x20
+              RenderImage {IMG} at (120,0) size 20x20
+              RenderImage {IMG} at (140,0) size 20x20
+              RenderImage {IMG} at (160,0) size 20x20
+          RenderTableRow {TR} at (0,20) size 180x20
+            RenderTableCell {TD} at (0,20) size 180x20 [r=1 c=0 rs=1 cs=1]
+              RenderImage {IMG} at (0,0) size 20x20
+              RenderText {#text} at (20,0) size 20x20
+                text run at (20,0) width 20: "B"
+              RenderImage {IMG} at (40,0) size 20x20
+              RenderText {#text} at (60,0) size 20x20
+                text run at (60,0) width 20: "Y"
+              RenderImage {IMG} at (80,0) size 20x20
+              RenderText {#text} at (100,0) size 20x20
+                text run at (100,0) width 20: "G"
+              RenderImage {IMG} at (120,0) size 20x20
+              RenderText {#text} at (140,0) size 20x20
+                text run at (140,0) width 20: "O"
+              RenderImage {IMG} at (160,0) size 20x20
+          RenderTableRow {TR} at (0,40) size 180x20
+            RenderTableCell {TD} at (0,40) size 180x20 [r=2 c=0 rs=1 cs=1]
+              RenderImage {IMG} at (0,0) size 20x20
+              RenderImage {IMG} at (20,0) size 20x20
+              RenderImage {IMG} at (40,0) size 20x20
+              RenderImage {IMG} at (60,0) size 20x20
+              RenderImage {IMG} at (80,0) size 20x20
+              RenderImage {IMG} at (100,0) size 20x20
+              RenderImage {IMG} at (120,0) size 20x20
+              RenderImage {IMG} at (140,0) size 20x20
+              RenderImage {IMG} at (160,0) size 20x20
+          RenderTableRow {TR} at (0,60) size 180x20
+            RenderTableCell {TD} at (0,60) size 180x20 [r=3 c=0 rs=1 cs=1]
+              RenderImage {IMG} at (0,0) size 20x20
+              RenderText {#text} at (20,0) size 20x20
+                text run at (20,0) width 20: "Y"
+              RenderImage {IMG} at (40,0) size 20x20
+              RenderText {#text} at (60,0) size 20x20
+                text run at (60,0) width 20: "G"
+              RenderImage {IMG} at (80,0) size 20x20
+              RenderText {#text} at (100,0) size 20x20
+                text run at (100,0) width 20: "O"
+              RenderImage {IMG} at (120,0) size 20x20
+              RenderText {#text} at (140,0) size 20x20
+                text run at (140,0) width 20: "B"
+              RenderImage {IMG} at (160,0) size 20x20
+          RenderTableRow {TR} at (0,80) size 180x20
+            RenderTableCell {TD} at (0,80) size 180x20 [r=4 c=0 rs=1 cs=1]
+              RenderImage {IMG} at (0,0) size 20x20
+              RenderImage {IMG} at (20,0) size 20x20
+              RenderImage {IMG} at (40,0) size 20x20
+              RenderImage {IMG} at (60,0) size 20x20
+              RenderImage {IMG} at (80,0) size 20x20
+              RenderImage {IMG} at (100,0) size 20x20
+              RenderImage {IMG} at (120,0) size 20x20
+              RenderImage {IMG} at (140,0) size 20x20
+              RenderImage {IMG} at (160,0) size 20x20
+          RenderTableRow {TR} at (0,100) size 180x20
+            RenderTableCell {TD} at (0,100) size 180x20 [r=5 c=0 rs=1 cs=1]
+              RenderImage {IMG} at (0,0) size 20x20
+              RenderText {#text} at (20,0) size 20x20
+                text run at (20,0) width 20: "G"
+              RenderImage {IMG} at (40,0) size 20x20
+              RenderText {#text} at (60,0) size 20x20
+                text run at (60,0) width 20: "O"
+              RenderImage {IMG} at (80,0) size 20x20
+              RenderText {#text} at (100,0) size 20x20
+                text run at (100,0) width 20: "B"
+              RenderImage {IMG} at (120,0) size 20x20
+              RenderText {#text} at (140,0) size 20x20
+                text run at (140,0) width 20: "Y"
+              RenderImage {IMG} at (160,0) size 20x20
+          RenderTableRow {TR} at (0,120) size 180x20
+            RenderTableCell {TD} at (0,120) size 180x20 [r=6 c=0 rs=1 cs=1]
+              RenderImage {IMG} at (0,0) size 20x20
+              RenderImage {IMG} at (20,0) size 20x20
+              RenderImage {IMG} at (40,0) size 20x20
+              RenderImage {IMG} at (60,0) size 20x20
+              RenderImage {IMG} at (80,0) size 20x20
+              RenderImage {IMG} at (100,0) size 20x20
+              RenderImage {IMG} at (120,0) size 20x20
+              RenderImage {IMG} at (140,0) size 20x20
+              RenderImage {IMG} at (160,0) size 20x20
+          RenderTableRow {TR} at (0,140) size 180x20
+            RenderTableCell {TD} at (0,140) size 180x20 [r=7 c=0 rs=1 cs=1]
+              RenderImage {IMG} at (0,0) size 20x20
+              RenderText {#text} at (20,0) size 20x20
+                text run at (20,0) width 20: "O"
+              RenderImage {IMG} at (40,0) size 20x20
+              RenderText {#text} at (60,0) size 20x20
+                text run at (60,0) width 20: "B"
+              RenderImage {IMG} at (80,0) size 20x20
+              RenderText {#text} at (100,0) size 20x20
+                text run at (100,0) width 20: "Y"
+              RenderImage {IMG} at (120,0) size 20x20
+              RenderText {#text} at (140,0) size 20x20
+                text run at (140,0) width 20: "G"
+              RenderImage {IMG} at (160,0) size 20x20
+          RenderTableRow {TR} at (0,160) size 180x20
+            RenderTableCell {TD} at (0,160) size 180x20 [r=8 c=0 rs=1 cs=1]
+              RenderImage {IMG} at (0,0) size 20x20
+              RenderImage {IMG} at (20,0) size 20x20
+              RenderImage {IMG} at (40,0) size 20x20
+              RenderImage {IMG} at (60,0) size 20x20
+              RenderImage {IMG} at (80,0) size 20x20
+              RenderImage {IMG} at (100,0) size 20x20
+              RenderImage {IMG} at (120,0) size 20x20
+              RenderImage {IMG} at (140,0) size 20x20
+              RenderImage {IMG} at (160,0) size 20x20
diff --git a/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-003-expected.png b/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-003-expected.png
new file mode 100644 (file)
index 0000000..46d5336
Binary files /dev/null and b/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-003-expected.png differ
diff --git a/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-003-expected.txt b/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-003-expected.txt
new file mode 100644 (file)
index 0000000..ece2141
--- /dev/null
@@ -0,0 +1,12 @@
+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+layer at (0,0) size 800x252
+  RenderBlock {HTML} at (0,0) size 800x252
+    RenderBody {BODY} at (8,16) size 784x228
+      RenderBlock {P} at (0,0) size 784x20
+        RenderText {#text} at (0,0) size 290x19
+          text run at (0,0) width 290: "Test passes if there is no red visible on the page."
+      RenderTable {TABLE} at (0,36) size 192x192 [border: (2px none #808080)]
+        RenderTableSection {TBODY} at (2,2) size 187x187
+          RenderTableRow {TR} at (0,0) size 187x187 [border: (5px solid #FF0000)]
+            RenderTableCell {TD} at (0,90) size 187x7 [border: (3px solid #000000)] [r=0 c=0 rs=1 cs=1]
diff --git a/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-004-expected.png b/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-004-expected.png
new file mode 100644 (file)
index 0000000..68f441c
Binary files /dev/null and b/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-004-expected.png differ
diff --git a/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-004-expected.txt b/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-004-expected.txt
new file mode 100644 (file)
index 0000000..944d5cd
--- /dev/null
@@ -0,0 +1,16 @@
+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+layer at (0,0) size 800x252
+  RenderBlock {HTML} at (0,0) size 800x252
+    RenderBody {BODY} at (8,16) size 784x228
+      RenderBlock {P} at (0,0) size 784x20
+        RenderText {#text} at (0,0) size 290x19
+          text run at (0,0) width 290: "Test passes if there is no red visible on the page."
+      RenderTable {TABLE} at (0,36) size 192x192 [border: (2px none #808080)]
+        RenderTableSection {TBODY} at (2,2) size 187x187
+          RenderTableRow {TR} at (0,0) size 187x62 [border: (5px solid #000000) none (5px solid #FF0000) none]
+            RenderTableCell {TD} at (0,27) size 187x7 [border: (3px none #000000) (2px solid #000000) (2px none #000000) (3px solid #000000)] [r=0 c=0 rs=1 cs=1]
+          RenderTableRow {TR} at (0,62) size 187x62
+            RenderTableCell {TD} at (0,89) size 187x7 [border: (3px solid #000000)] [r=1 c=0 rs=1 cs=1]
+          RenderTableRow {TR} at (0,124) size 187x63 [border: (5px solid #FF0000) none (5px solid #000000) none]
+            RenderTableCell {TD} at (0,152) size 187x7 [border: (3px none #000000) (2px solid #000000) (2px none #000000) (3px solid #000000)] [r=2 c=0 rs=1 cs=1]
diff --git a/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-005-expected.png b/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-005-expected.png
new file mode 100644 (file)
index 0000000..46d5336
Binary files /dev/null and b/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-005-expected.png differ
diff --git a/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-005-expected.txt b/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-005-expected.txt
new file mode 100644 (file)
index 0000000..a7c1b1c
--- /dev/null
@@ -0,0 +1,12 @@
+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+layer at (0,0) size 800x252
+  RenderBlock {HTML} at (0,0) size 800x252
+    RenderBody {BODY} at (8,16) size 784x228
+      RenderBlock {P} at (0,0) size 784x20
+        RenderText {#text} at (0,0) size 290x19
+          text run at (0,0) width 290: "Test passes if there is no red visible on the page."
+      RenderTable {TABLE} at (0,36) size 192x192 [border: (2px none #808080)]
+        RenderTableSection {TBODY} at (2,2) size 187x187 [border: (5px solid #FF0000)]
+          RenderTableRow {TR} at (0,0) size 187x187
+            RenderTableCell {TD} at (0,90) size 187x7 [border: (3px solid #000000)] [r=0 c=0 rs=1 cs=1]
diff --git a/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-006-expected.png b/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-006-expected.png
new file mode 100644 (file)
index 0000000..6bc32f8
Binary files /dev/null and b/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-006-expected.png differ
diff --git a/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-006-expected.txt b/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-006-expected.txt
new file mode 100644 (file)
index 0000000..0a69dce
--- /dev/null
@@ -0,0 +1,18 @@
+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+layer at (0,0) size 800x252
+  RenderBlock {HTML} at (0,0) size 800x252
+    RenderBody {BODY} at (8,16) size 784x228
+      RenderBlock {P} at (0,0) size 784x20
+        RenderText {#text} at (0,0) size 290x19
+          text run at (0,0) width 290: "Test passes if there is no red visible on the page."
+      RenderTable {TABLE} at (0,36) size 192x192 [border: (2px none #808080)]
+        RenderTableSection {TBODY} at (2,2) size 187x173 [border: (5px solid #000000) (5px solid #FF0000) (5px solid #000000)]
+          RenderTableRow {TR} at (0,0) size 187x173
+            RenderTableCell {TD} at (0,83) size 187x7 [border: (3px none #000000)] [r=0 c=0 rs=1 cs=1]
+        RenderTableSection {TBODY} at (2,175) size 187x7 [border: none (5px solid #000000) none (5px solid #000000)]
+          RenderTableRow {TR} at (0,0) size 187x7
+            RenderTableCell {TD} at (0,0) size 187x7 [border: (3px solid #000000)] [r=0 c=0 rs=1 cs=1]
+        RenderTableSection {TBODY} at (2,182) size 187x7 [border: (5px solid #FF0000) (5px solid #000000)]
+          RenderTableRow {TR} at (0,0) size 187x7
+            RenderTableCell {TD} at (0,0) size 187x7 [border: (3px none #000000)] [r=0 c=0 rs=1 cs=1]
diff --git a/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-007-expected.png b/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-007-expected.png
new file mode 100644 (file)
index 0000000..46d5336
Binary files /dev/null and b/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-007-expected.png differ
diff --git a/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-007-expected.txt b/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-007-expected.txt
new file mode 100644 (file)
index 0000000..7a10323
--- /dev/null
@@ -0,0 +1,14 @@
+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+layer at (0,0) size 800x252
+  RenderBlock {HTML} at (0,0) size 800x252
+    RenderBody {BODY} at (8,16) size 784x228
+      RenderBlock {P} at (0,0) size 784x20
+        RenderText {#text} at (0,0) size 290x19
+          text run at (0,0) width 290: "Test passes if there is no red visible on the page."
+      RenderTable {TABLE} at (0,36) size 192x192 [border: (2px none #808080)]
+        RenderTableCol {COLGROUP} at (0,0) size 0x0
+          RenderTableCol {COL} at (0,0) size 0x0 [border: (5px solid #FF0000)]
+        RenderTableSection {TBODY} at (2,2) size 187x187
+          RenderTableRow {TR} at (0,0) size 187x187
+            RenderTableCell {TD} at (0,90) size 187x7 [border: (3px solid #000000)] [r=0 c=0 rs=1 cs=1]
diff --git a/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-008-expected.png b/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-008-expected.png
new file mode 100644 (file)
index 0000000..ef16620
Binary files /dev/null and b/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-008-expected.png differ
diff --git a/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-008-expected.txt b/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-008-expected.txt
new file mode 100644 (file)
index 0000000..569eb6f
--- /dev/null
@@ -0,0 +1,18 @@
+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+layer at (0,0) size 800x252
+  RenderBlock {HTML} at (0,0) size 800x252
+    RenderBody {BODY} at (8,16) size 784x228
+      RenderBlock {P} at (0,0) size 784x20
+        RenderText {#text} at (0,0) size 290x19
+          text run at (0,0) width 290: "Test passes if there is no red visible on the page."
+      RenderTable {TABLE} at (0,36) size 192x192 [border: (2px none #808080)]
+        RenderTableCol {COLGROUP} at (0,0) size 0x0
+          RenderTableCol {COL} at (0,0) size 0x0 [border: (5px solid #000000) (5px solid #FF0000) (5px solid #000000)]
+          RenderTableCol {COL} at (0,0) size 0x0 [border: (5px solid #000000) none (5px solid #000000) none]
+          RenderTableCol {COL} at (0,0) size 0x0 [border: (5px solid #000000) (5px solid #FF0000)]
+        RenderTableSection {TBODY} at (2,2) size 187x187
+          RenderTableRow {TR} at (0,0) size 187x187
+            RenderTableCell {TD} at (0,90) size 62x7 [border: (3px none #000000)] [r=0 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (62,90) size 62x7 [border: (3px solid #000000)] [r=0 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (124,90) size 63x7 [border: (3px none #000000)] [r=0 c=2 rs=1 cs=1]
diff --git a/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-009-expected.png b/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-009-expected.png
new file mode 100644 (file)
index 0000000..46d5336
Binary files /dev/null and b/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-009-expected.png differ
diff --git a/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-009-expected.txt b/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-009-expected.txt
new file mode 100644 (file)
index 0000000..1e3fa9e
--- /dev/null
@@ -0,0 +1,13 @@
+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+layer at (0,0) size 800x252
+  RenderBlock {HTML} at (0,0) size 800x252
+    RenderBody {BODY} at (8,16) size 784x228
+      RenderBlock {P} at (0,0) size 784x20
+        RenderText {#text} at (0,0) size 290x19
+          text run at (0,0) width 290: "Test passes if there is no red visible on the page."
+      RenderTable {TABLE} at (0,36) size 192x192 [border: (2px none #808080)]
+        RenderTableCol {COLGROUP} at (0,0) size 0x0 [border: (5px solid #FF0000)]
+        RenderTableSection {TBODY} at (2,2) size 187x187
+          RenderTableRow {TR} at (0,0) size 187x187
+            RenderTableCell {TD} at (0,90) size 187x7 [border: (3px solid #000000)] [r=0 c=0 rs=1 cs=1]
diff --git a/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-010-expected.png b/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-010-expected.png
new file mode 100644 (file)
index 0000000..ef16620
Binary files /dev/null and b/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-010-expected.png differ
diff --git a/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-010-expected.txt b/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-010-expected.txt
new file mode 100644 (file)
index 0000000..61871cb
--- /dev/null
@@ -0,0 +1,17 @@
+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+layer at (0,0) size 800x252
+  RenderBlock {HTML} at (0,0) size 800x252
+    RenderBody {BODY} at (8,16) size 784x228
+      RenderBlock {P} at (0,0) size 784x20
+        RenderText {#text} at (0,0) size 290x19
+          text run at (0,0) width 290: "Test passes if there is no red visible on the page."
+      RenderTable {TABLE} at (0,36) size 192x192 [border: (2px none #808080)]
+        RenderTableCol {COLGROUP} at (0,0) size 0x0 [border: (5px solid #000000) (5px solid #FF0000) (5px solid #000000)]
+        RenderTableCol {COLGROUP} at (0,0) size 0x0 [border: (5px solid #000000) none (5px solid #000000) none]
+        RenderTableCol {COLGROUP} at (0,0) size 0x0 [border: (5px solid #000000) (5px solid #FF0000)]
+        RenderTableSection {TBODY} at (2,2) size 187x187
+          RenderTableRow {TR} at (0,0) size 187x187
+            RenderTableCell {TD} at (0,90) size 62x7 [border: (3px none #000000)] [r=0 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (62,90) size 62x7 [border: (3px solid #000000)] [r=0 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (124,90) size 63x7 [border: (3px none #000000)] [r=0 c=2 rs=1 cs=1]
diff --git a/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-011-expected.png b/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-011-expected.png
new file mode 100644 (file)
index 0000000..46d5336
Binary files /dev/null and b/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-011-expected.png differ
diff --git a/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-011-expected.txt b/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-011-expected.txt
new file mode 100644 (file)
index 0000000..1ef5f35
--- /dev/null
@@ -0,0 +1,12 @@
+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+layer at (0,0) size 800x252
+  RenderBlock {HTML} at (0,0) size 800x252
+    RenderBody {BODY} at (8,16) size 784x228
+      RenderBlock {P} at (0,0) size 784x20
+        RenderText {#text} at (0,0) size 290x19
+          text run at (0,0) width 290: "Test passes if there is no red visible on the page."
+      RenderTable {TABLE} at (0,36) size 192x192 [border: (2px solid #FF0000)]
+        RenderTableSection {TBODY} at (2,2) size 187x187
+          RenderTableRow {TR} at (0,0) size 187x187
+            RenderTableCell {TD} at (0,90) size 187x7 [border: (3px solid #000000)] [r=0 c=0 rs=1 cs=1]
diff --git a/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-012-expected.png b/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-012-expected.png
new file mode 100644 (file)
index 0000000..e252a7a
Binary files /dev/null and b/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-012-expected.png differ
diff --git a/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-012-expected.txt b/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-012-expected.txt
new file mode 100644 (file)
index 0000000..65e3aad
--- /dev/null
@@ -0,0 +1,22 @@
+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+layer at (0,0) size 800x252
+  RenderBlock {HTML} at (0,0) size 800x252
+    RenderBody {BODY} at (8,16) size 784x228
+      RenderBlock {P} at (0,0) size 784x20
+        RenderText {#text} at (0,0) size 290x19
+          text run at (0,0) width 290: "Test passes if there is no red visible on the page."
+      RenderTable {TABLE} at (0,36) size 192x192 [border: (2px none #808080)]
+        RenderTableSection {TBODY} at (2,2) size 187x187
+          RenderTableRow {TR} at (0,0) size 187x62
+            RenderTableCell {TD} at (0,27) size 62x7 [border: (3px solid #000000)] [r=0 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (62,27) size 62x7 [border: (3px solid #000000)] [r=0 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (124,27) size 63x7 [border: (3px solid #000000)] [r=0 c=2 rs=1 cs=1]
+          RenderTableRow {TR} at (0,62) size 187x62 [border: (5px solid #FF0000) none (5px solid #FF0000) none]
+            RenderTableCell {TD} at (0,89) size 62x7 [border: (3px none #000000) (2px solid #000000) (2px none #000000) (3px solid #000000)] [r=1 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (62,89) size 62x7 [border: (3px none #000000) (2px solid #000000) (2px none #000000) (3px solid #000000)] [r=1 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (124,89) size 63x7 [border: (3px none #000000) (2px solid #000000) (2px none #000000) (3px solid #000000)] [r=1 c=2 rs=1 cs=1]
+          RenderTableRow {TR} at (0,124) size 187x63
+            RenderTableCell {TD} at (0,152) size 62x7 [border: (3px solid #000000)] [r=2 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (62,152) size 62x7 [border: (3px solid #000000)] [r=2 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (124,152) size 63x7 [border: (3px solid #000000)] [r=2 c=2 rs=1 cs=1]
diff --git a/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-013-expected.png b/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-013-expected.png
new file mode 100644 (file)
index 0000000..e252a7a
Binary files /dev/null and b/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-013-expected.png differ
diff --git a/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-013-expected.txt b/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-013-expected.txt
new file mode 100644 (file)
index 0000000..8676c73
--- /dev/null
@@ -0,0 +1,22 @@
+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+layer at (0,0) size 800x252
+  RenderBlock {HTML} at (0,0) size 800x252
+    RenderBody {BODY} at (8,16) size 784x228
+      RenderBlock {P} at (0,0) size 784x20
+        RenderText {#text} at (0,0) size 290x19
+          text run at (0,0) width 290: "Test passes if there is no red visible on the page."
+      RenderTable {TABLE} at (0,36) size 192x192 [border: (2px none #808080)]
+        RenderTableSection {TBODY} at (2,2) size 187x187
+          RenderTableRow {TR} at (0,0) size 187x62 [border: (5px solid #000000) none (5px solid #000000) none]
+            RenderTableCell {TD} at (0,27) size 62x7 [border: (3px none #000000) (2px solid #000000) (2px none #000000) (3px solid #000000)] [r=0 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (62,27) size 62x7 [border: (3px none #000000) (2px solid #000000) (2px none #000000) (3px solid #000000)] [r=0 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (124,27) size 63x7 [border: (3px none #000000) (2px solid #000000) (2px none #000000) (3px solid #000000)] [r=0 c=2 rs=1 cs=1]
+          RenderTableRow {TR} at (0,62) size 187x62 [border: (5px solid #FF0000) none (5px solid #000000) none]
+            RenderTableCell {TD} at (0,89) size 62x7 [border: (3px none #000000) (2px solid #000000) (2px none #000000) (3px solid #000000)] [r=1 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (62,89) size 62x7 [border: (3px none #000000) (2px solid #000000) (2px none #000000) (3px solid #000000)] [r=1 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (124,89) size 63x7 [border: (3px none #000000) (2px solid #000000) (2px none #000000) (3px solid #000000)] [r=1 c=2 rs=1 cs=1]
+          RenderTableRow {TR} at (0,124) size 187x63 [border: (5px solid #FF0000) none (5px solid #000000) none]
+            RenderTableCell {TD} at (0,152) size 62x7 [border: (3px none #000000) (2px solid #000000) (2px none #000000) (3px solid #000000)] [r=2 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (62,152) size 62x7 [border: (3px none #000000) (2px solid #000000) (2px none #000000) (3px solid #000000)] [r=2 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (124,152) size 63x7 [border: (3px none #000000) (2px solid #000000) (2px none #000000) (3px solid #000000)] [r=2 c=2 rs=1 cs=1]
diff --git a/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-014-expected.png b/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-014-expected.png
new file mode 100644 (file)
index 0000000..46d5336
Binary files /dev/null and b/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-014-expected.png differ
diff --git a/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-014-expected.txt b/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-014-expected.txt
new file mode 100644 (file)
index 0000000..0f90742
--- /dev/null
@@ -0,0 +1,12 @@
+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+layer at (0,0) size 800x252
+  RenderBlock {HTML} at (0,0) size 800x252
+    RenderBody {BODY} at (8,16) size 784x228
+      RenderBlock {P} at (0,0) size 784x20
+        RenderText {#text} at (0,0) size 290x19
+          text run at (0,0) width 290: "Test passes if there is no red visible on the page."
+      RenderTable {TABLE} at (0,36) size 192x192 [border: (2px none #808080)]
+        RenderTableSection {TBODY} at (2,2) size 187x187 [border: (5px solid #FF0000)]
+          RenderTableRow {TR} at (0,0) size 187x187 [border: (5px solid #000000)]
+            RenderTableCell {TD} at (0,90) size 187x7 [border: (3px none #000000)] [r=0 c=0 rs=1 cs=1]
diff --git a/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-015-expected.png b/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-015-expected.png
new file mode 100644 (file)
index 0000000..6bc32f8
Binary files /dev/null and b/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-015-expected.png differ
diff --git a/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-015-expected.txt b/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-015-expected.txt
new file mode 100644 (file)
index 0000000..db2436c
--- /dev/null
@@ -0,0 +1,18 @@
+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+layer at (0,0) size 800x252
+  RenderBlock {HTML} at (0,0) size 800x252
+    RenderBody {BODY} at (8,16) size 784x228
+      RenderBlock {P} at (0,0) size 784x20
+        RenderText {#text} at (0,0) size 290x19
+          text run at (0,0) width 290: "Test passes if there is no red visible on the page."
+      RenderTable {TABLE} at (0,36) size 192x192 [border: (2px none #808080)]
+        RenderTableSection {TBODY} at (2,2) size 187x173 [border: (5px solid #000000) (5px solid #FF0000) (5px solid #000000)]
+          RenderTableRow {TR} at (0,0) size 187x173
+            RenderTableCell {TD} at (0,83) size 187x7 [border: (3px none #000000)] [r=0 c=0 rs=1 cs=1]
+        RenderTableSection {TBODY} at (2,175) size 187x7 [border: none (5px solid #000000) none (5px solid #000000)]
+          RenderTableRow {TR} at (0,0) size 187x7 [border: (5px solid #000000)]
+            RenderTableCell {TD} at (0,0) size 187x7 [border: (3px none #000000)] [r=0 c=0 rs=1 cs=1]
+        RenderTableSection {TBODY} at (2,182) size 187x7 [border: (5px solid #FF0000) (5px solid #000000)]
+          RenderTableRow {TR} at (0,0) size 187x7
+            RenderTableCell {TD} at (0,0) size 187x7 [border: (3px none #000000)] [r=0 c=0 rs=1 cs=1]
diff --git a/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-016-expected.png b/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-016-expected.png
new file mode 100644 (file)
index 0000000..46d5336
Binary files /dev/null and b/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-016-expected.png differ
diff --git a/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-016-expected.txt b/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-016-expected.txt
new file mode 100644 (file)
index 0000000..0b8f704
--- /dev/null
@@ -0,0 +1,14 @@
+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+layer at (0,0) size 800x252
+  RenderBlock {HTML} at (0,0) size 800x252
+    RenderBody {BODY} at (8,16) size 784x228
+      RenderBlock {P} at (0,0) size 784x20
+        RenderText {#text} at (0,0) size 290x19
+          text run at (0,0) width 290: "Test passes if there is no red visible on the page."
+      RenderTable {TABLE} at (0,36) size 192x192 [border: (2px none #808080)]
+        RenderTableCol {COLGROUP} at (0,0) size 0x0
+          RenderTableCol {COL} at (0,0) size 0x0 [border: (5px solid #FF0000)]
+        RenderTableSection {TBODY} at (2,2) size 187x187
+          RenderTableRow {TR} at (0,0) size 187x187 [border: (5px solid #000000)]
+            RenderTableCell {TD} at (0,90) size 187x7 [border: (3px none #000000)] [r=0 c=0 rs=1 cs=1]
diff --git a/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-017-expected.png b/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-017-expected.png
new file mode 100644 (file)
index 0000000..46d5336
Binary files /dev/null and b/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-017-expected.png differ
diff --git a/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-017-expected.txt b/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-017-expected.txt
new file mode 100644 (file)
index 0000000..3fca7b2
--- /dev/null
@@ -0,0 +1,13 @@
+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+layer at (0,0) size 800x252
+  RenderBlock {HTML} at (0,0) size 800x252
+    RenderBody {BODY} at (8,16) size 784x228
+      RenderBlock {P} at (0,0) size 784x20
+        RenderText {#text} at (0,0) size 290x19
+          text run at (0,0) width 290: "Test passes if there is no red visible on the page."
+      RenderTable {TABLE} at (0,36) size 192x192 [border: (2px none #808080)]
+        RenderTableCol {COLGROUP} at (0,0) size 0x0 [border: (5px solid #FF0000)]
+        RenderTableSection {TBODY} at (2,2) size 187x187
+          RenderTableRow {TR} at (0,0) size 187x187 [border: (5px solid #000000)]
+            RenderTableCell {TD} at (0,90) size 187x7 [border: (3px none #000000)] [r=0 c=0 rs=1 cs=1]
diff --git a/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-018-expected.png b/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-018-expected.png
new file mode 100644 (file)
index 0000000..46d5336
Binary files /dev/null and b/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-018-expected.png differ
diff --git a/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-018-expected.txt b/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-018-expected.txt
new file mode 100644 (file)
index 0000000..db2659e
--- /dev/null
@@ -0,0 +1,12 @@
+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+layer at (0,0) size 800x252
+  RenderBlock {HTML} at (0,0) size 800x252
+    RenderBody {BODY} at (8,16) size 784x228
+      RenderBlock {P} at (0,0) size 784x20
+        RenderText {#text} at (0,0) size 290x19
+          text run at (0,0) width 290: "Test passes if there is no red visible on the page."
+      RenderTable {TABLE} at (0,36) size 192x192 [border: (2px solid #FF0000)]
+        RenderTableSection {TBODY} at (2,2) size 187x187
+          RenderTableRow {TR} at (0,0) size 187x187 [border: (5px solid #000000)]
+            RenderTableCell {TD} at (0,90) size 187x7 [border: (3px none #000000)] [r=0 c=0 rs=1 cs=1]
diff --git a/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-019-expected.png b/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-019-expected.png
new file mode 100644 (file)
index 0000000..b81cdf7
Binary files /dev/null and b/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-019-expected.png differ
diff --git a/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-019-expected.txt b/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-019-expected.txt
new file mode 100644 (file)
index 0000000..69bcb1b
--- /dev/null
@@ -0,0 +1,24 @@
+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+layer at (0,0) size 800x252
+  RenderBlock {HTML} at (0,0) size 800x252
+    RenderBody {BODY} at (8,16) size 784x228
+      RenderBlock {P} at (0,0) size 784x20
+        RenderText {#text} at (0,0) size 290x19
+          text run at (0,0) width 290: "Test passes if there is no red visible on the page."
+      RenderTable {TABLE} at (0,36) size 192x192 [border: (2px none #808080)]
+        RenderTableSection {TBODY} at (2,2) size 187x173
+          RenderTableRow {TR} at (0,0) size 187x173
+            RenderTableCell {TD} at (0,83) size 62x7 [border: (3px solid #000000)] [r=0 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (62,83) size 62x7 [border: (3px solid #000000)] [r=0 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (124,83) size 63x7 [border: (3px solid #000000)] [r=0 c=2 rs=1 cs=1]
+        RenderTableSection {TBODY} at (2,175) size 187x7 [border: (5px solid #FF0000) none (5px solid #FF0000) none]
+          RenderTableRow {TR} at (0,0) size 187x7
+            RenderTableCell {TD} at (0,0) size 62x7 [border: (3px none #000000) (2px solid #000000) (2px none #000000) (3px solid #000000)] [r=0 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (62,0) size 62x7 [border: (3px none #000000) (2px solid #000000) (2px none #000000) (3px solid #000000)] [r=0 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (124,0) size 63x7 [border: (3px none #000000) (2px solid #000000) (2px none #000000) (3px solid #000000)] [r=0 c=2 rs=1 cs=1]
+        RenderTableSection {TBODY} at (2,182) size 187x7
+          RenderTableRow {TR} at (0,0) size 187x7
+            RenderTableCell {TD} at (0,0) size 62x7 [border: (3px solid #000000)] [r=0 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (62,0) size 62x7 [border: (3px solid #000000)] [r=0 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (124,0) size 63x7 [border: (3px solid #000000)] [r=0 c=2 rs=1 cs=1]
diff --git a/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-020-expected.png b/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-020-expected.png
new file mode 100644 (file)
index 0000000..6bc32f8
Binary files /dev/null and b/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-020-expected.png differ
diff --git a/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-020-expected.txt b/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-020-expected.txt
new file mode 100644 (file)
index 0000000..bcbb392
--- /dev/null
@@ -0,0 +1,18 @@
+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+layer at (0,0) size 800x252
+  RenderBlock {HTML} at (0,0) size 800x252
+    RenderBody {BODY} at (8,16) size 784x228
+      RenderBlock {P} at (0,0) size 784x20
+        RenderText {#text} at (0,0) size 290x19
+          text run at (0,0) width 290: "Test passes if there is no red visible on the page."
+      RenderTable {TABLE} at (0,36) size 192x192 [border: (2px none #808080)]
+        RenderTableSection {TBODY} at (2,2) size 187x173
+          RenderTableRow {TR} at (0,0) size 187x173 [border: (5px solid #000000) none (5px solid #000000) none]
+            RenderTableCell {TD} at (0,83) size 187x7 [border: (3px none #000000) (2px solid #000000) (2px none #000000) (3px solid #000000)] [r=0 c=0 rs=1 cs=1]
+        RenderTableSection {TBODY} at (2,175) size 187x7 [border: (5px solid #FF0000) none (5px solid #FF0000) none]
+          RenderTableRow {TR} at (0,0) size 187x7
+            RenderTableCell {TD} at (0,0) size 187x7 [border: (3px none #000000) (2px solid #000000) (2px none #000000) (3px solid #000000)] [r=0 c=0 rs=1 cs=1]
+        RenderTableSection {TBODY} at (2,182) size 187x7
+          RenderTableRow {TR} at (0,0) size 187x7 [border: (5px solid #000000) none (5px solid #000000) none]
+            RenderTableCell {TD} at (0,0) size 187x7 [border: (3px none #000000) (2px solid #000000) (2px none #000000) (3px solid #000000)] [r=0 c=0 rs=1 cs=1]
diff --git a/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-021-expected.png b/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-021-expected.png
new file mode 100644 (file)
index 0000000..6bc32f8
Binary files /dev/null and b/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-021-expected.png differ
diff --git a/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-021-expected.txt b/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-021-expected.txt
new file mode 100644 (file)
index 0000000..c0c0ba1
--- /dev/null
@@ -0,0 +1,18 @@
+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+layer at (0,0) size 800x252
+  RenderBlock {HTML} at (0,0) size 800x252
+    RenderBody {BODY} at (8,16) size 784x228
+      RenderBlock {P} at (0,0) size 784x20
+        RenderText {#text} at (0,0) size 290x19
+          text run at (0,0) width 290: "Test passes if there is no red visible on the page."
+      RenderTable {TABLE} at (0,36) size 192x192 [border: (2px none #808080)]
+        RenderTableSection {TBODY} at (2,2) size 187x173 [border: (5px solid #000000)]
+          RenderTableRow {TR} at (0,0) size 187x173
+            RenderTableCell {TD} at (0,83) size 187x7 [border: (3px none #000000)] [r=0 c=0 rs=1 cs=1]
+        RenderTableSection {TBODY} at (2,175) size 187x7 [border: (5px solid #FF0000) (5px solid #000000)]
+          RenderTableRow {TR} at (0,0) size 187x7
+            RenderTableCell {TD} at (0,0) size 187x7 [border: (3px none #000000)] [r=0 c=0 rs=1 cs=1]
+        RenderTableSection {TBODY} at (2,182) size 187x7 [border: (5px solid #FF0000) (5px solid #000000)]
+          RenderTableRow {TR} at (0,0) size 187x7
+            RenderTableCell {TD} at (0,0) size 187x7 [border: (3px none #000000)] [r=0 c=0 rs=1 cs=1]
diff --git a/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-022-expected.png b/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-022-expected.png
new file mode 100644 (file)
index 0000000..46d5336
Binary files /dev/null and b/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-022-expected.png differ
diff --git a/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-022-expected.txt b/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-022-expected.txt
new file mode 100644 (file)
index 0000000..1ef7f1b
--- /dev/null
@@ -0,0 +1,14 @@
+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+layer at (0,0) size 800x252
+  RenderBlock {HTML} at (0,0) size 800x252
+    RenderBody {BODY} at (8,16) size 784x228
+      RenderBlock {P} at (0,0) size 784x20
+        RenderText {#text} at (0,0) size 290x19
+          text run at (0,0) width 290: "Test passes if there is no red visible on the page."
+      RenderTable {TABLE} at (0,36) size 192x192 [border: (2px none #808080)]
+        RenderTableCol {COLGROUP} at (0,0) size 0x0
+          RenderTableCol {COL} at (0,0) size 0x0 [border: (5px solid #FF0000)]
+        RenderTableSection {TBODY} at (2,2) size 187x187 [border: (5px solid #000000)]
+          RenderTableRow {TR} at (0,0) size 187x187
+            RenderTableCell {TD} at (0,90) size 187x7 [border: (3px none #000000)] [r=0 c=0 rs=1 cs=1]
diff --git a/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-023-expected.png b/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-023-expected.png
new file mode 100644 (file)
index 0000000..46d5336
Binary files /dev/null and b/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-023-expected.png differ
diff --git a/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-023-expected.txt b/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-023-expected.txt
new file mode 100644 (file)
index 0000000..b66a075
--- /dev/null
@@ -0,0 +1,13 @@
+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+layer at (0,0) size 800x252
+  RenderBlock {HTML} at (0,0) size 800x252
+    RenderBody {BODY} at (8,16) size 784x228
+      RenderBlock {P} at (0,0) size 784x20
+        RenderText {#text} at (0,0) size 290x19
+          text run at (0,0) width 290: "Test passes if there is no red visible on the page."
+      RenderTable {TABLE} at (0,36) size 192x192 [border: (2px none #808080)]
+        RenderTableCol {COLGROUP} at (0,0) size 0x0 [border: (5px solid #FF0000)]
+        RenderTableSection {TBODY} at (2,2) size 187x187 [border: (5px solid #000000)]
+          RenderTableRow {TR} at (0,0) size 187x187
+            RenderTableCell {TD} at (0,90) size 187x7 [border: (3px none #000000)] [r=0 c=0 rs=1 cs=1]
diff --git a/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-024-expected.png b/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-024-expected.png
new file mode 100644 (file)
index 0000000..46d5336
Binary files /dev/null and b/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-024-expected.png differ
diff --git a/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-024-expected.txt b/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-024-expected.txt
new file mode 100644 (file)
index 0000000..c62c44a
--- /dev/null
@@ -0,0 +1,12 @@
+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+layer at (0,0) size 800x252
+  RenderBlock {HTML} at (0,0) size 800x252
+    RenderBody {BODY} at (8,16) size 784x228
+      RenderBlock {P} at (0,0) size 784x20
+        RenderText {#text} at (0,0) size 290x19
+          text run at (0,0) width 290: "Test passes if there is no red visible on the page."
+      RenderTable {TABLE} at (0,36) size 192x192 [border: (2px solid #FF0000)]
+        RenderTableSection {TBODY} at (2,2) size 187x187 [border: (5px solid #000000)]
+          RenderTableRow {TR} at (0,0) size 187x187
+            RenderTableCell {TD} at (0,90) size 187x7 [border: (3px none #000000)] [r=0 c=0 rs=1 cs=1]
diff --git a/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-025-expected.png b/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-025-expected.png
new file mode 100644 (file)
index 0000000..ef16620
Binary files /dev/null and b/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-025-expected.png differ
diff --git a/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-025-expected.txt b/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-025-expected.txt
new file mode 100644 (file)
index 0000000..1863129
--- /dev/null
@@ -0,0 +1,18 @@
+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+layer at (0,0) size 800x252
+  RenderBlock {HTML} at (0,0) size 800x252
+    RenderBody {BODY} at (8,16) size 784x228
+      RenderBlock {P} at (0,0) size 784x20
+        RenderText {#text} at (0,0) size 290x19
+          text run at (0,0) width 290: "Test passes if there is no red visible on the page."
+      RenderTable {TABLE} at (0,36) size 192x192 [border: (2px none #808080)]
+        RenderTableCol {COLGROUP} at (0,0) size 0x0
+          RenderTableCol {COL} at (0,0) size 0x0
+          RenderTableCol {COL} at (0,0) size 0x0 [border: (5px solid #FF0000) none (5px solid #FF0000)]
+          RenderTableCol {COL} at (0,0) size 0x0
+        RenderTableSection {TBODY} at (2,2) size 187x187
+          RenderTableRow {TR} at (0,0) size 187x187
+            RenderTableCell {TD} at (0,90) size 62x7 [border: (3px solid #000000)] [r=0 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (62,90) size 62x7 [border: (3px solid #000000) (2px none #000000) (2px solid #000000) (3px none #000000)] [r=0 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (124,90) size 63x7 [border: (3px solid #000000)] [r=0 c=2 rs=1 cs=1]
diff --git a/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-026-expected.png b/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-026-expected.png
new file mode 100644 (file)
index 0000000..46d5336
Binary files /dev/null and b/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-026-expected.png differ
diff --git a/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-026-expected.txt b/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-026-expected.txt
new file mode 100644 (file)
index 0000000..0b8f704
--- /dev/null
@@ -0,0 +1,14 @@
+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+layer at (0,0) size 800x252
+  RenderBlock {HTML} at (0,0) size 800x252
+    RenderBody {BODY} at (8,16) size 784x228
+      RenderBlock {P} at (0,0) size 784x20
+        RenderText {#text} at (0,0) size 290x19
+          text run at (0,0) width 290: "Test passes if there is no red visible on the page."
+      RenderTable {TABLE} at (0,36) size 192x192 [border: (2px none #808080)]
+        RenderTableCol {COLGROUP} at (0,0) size 0x0
+          RenderTableCol {COL} at (0,0) size 0x0 [border: (5px solid #FF0000)]
+        RenderTableSection {TBODY} at (2,2) size 187x187
+          RenderTableRow {TR} at (0,0) size 187x187 [border: (5px solid #000000)]
+            RenderTableCell {TD} at (0,90) size 187x7 [border: (3px none #000000)] [r=0 c=0 rs=1 cs=1]
diff --git a/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-027-expected.png b/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-027-expected.png
new file mode 100644 (file)
index 0000000..46d5336
Binary files /dev/null and b/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-027-expected.png differ
diff --git a/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-027-expected.txt b/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-027-expected.txt
new file mode 100644 (file)
index 0000000..1ef7f1b
--- /dev/null
@@ -0,0 +1,14 @@
+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+layer at (0,0) size 800x252
+  RenderBlock {HTML} at (0,0) size 800x252
+    RenderBody {BODY} at (8,16) size 784x228
+      RenderBlock {P} at (0,0) size 784x20
+        RenderText {#text} at (0,0) size 290x19
+          text run at (0,0) width 290: "Test passes if there is no red visible on the page."
+      RenderTable {TABLE} at (0,36) size 192x192 [border: (2px none #808080)]
+        RenderTableCol {COLGROUP} at (0,0) size 0x0
+          RenderTableCol {COL} at (0,0) size 0x0 [border: (5px solid #FF0000)]
+        RenderTableSection {TBODY} at (2,2) size 187x187 [border: (5px solid #000000)]
+          RenderTableRow {TR} at (0,0) size 187x187
+            RenderTableCell {TD} at (0,90) size 187x7 [border: (3px none #000000)] [r=0 c=0 rs=1 cs=1]
diff --git a/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-028-expected.png b/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-028-expected.png
new file mode 100644 (file)
index 0000000..ef16620
Binary files /dev/null and b/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-028-expected.png differ
diff --git a/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-028-expected.txt b/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-028-expected.txt
new file mode 100644 (file)
index 0000000..e209011
--- /dev/null
@@ -0,0 +1,18 @@
+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+layer at (0,0) size 800x252
+  RenderBlock {HTML} at (0,0) size 800x252
+    RenderBody {BODY} at (8,16) size 784x228
+      RenderBlock {P} at (0,0) size 784x20
+        RenderText {#text} at (0,0) size 290x19
+          text run at (0,0) width 290: "Test passes if there is no red visible on the page."
+      RenderTable {TABLE} at (0,36) size 192x192 [border: (2px none #808080)]
+        RenderTableCol {COLGROUP} at (0,0) size 0x0
+          RenderTableCol {COL} at (0,0) size 0x0 [border: (5px solid #000000)]
+          RenderTableCol {COL} at (0,0) size 0x0 [border: (5px solid #000000) (5px solid #FF0000)]
+          RenderTableCol {COL} at (0,0) size 0x0 [border: (5px solid #000000) (5px solid #FF0000)]
+        RenderTableSection {TBODY} at (2,2) size 187x187
+          RenderTableRow {TR} at (0,0) size 187x187
+            RenderTableCell {TD} at (0,90) size 62x7 [border: (3px none #000000)] [r=0 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (62,90) size 62x7 [border: (3px none #000000)] [r=0 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (124,90) size 63x7 [border: (3px none #000000)] [r=0 c=2 rs=1 cs=1]
diff --git a/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-029-expected.png b/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-029-expected.png
new file mode 100644 (file)
index 0000000..0f18e25
Binary files /dev/null and b/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-029-expected.png differ
diff --git a/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-029-expected.txt b/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-029-expected.txt
new file mode 100644 (file)
index 0000000..97d4ec9
--- /dev/null
@@ -0,0 +1,18 @@
+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+layer at (0,0) size 800x252
+  RenderBlock {HTML} at (0,0) size 800x252
+    RenderBody {BODY} at (8,16) size 784x228
+      RenderBlock {P} at (0,0) size 784x20
+        RenderText {#text} at (0,0) size 290x19
+          text run at (0,0) width 290: "Test passes if there is no red visible on the page."
+      RenderTable {TABLE} at (0,36) size 192x192 [border: (2px none #808080)]
+        RenderTableCol {COLGROUP} at (0,0) size 0x0
+          RenderTableCol {COL} at (0,0) size 0x0 [border: (5px solid #000000)]
+          RenderTableCol {COL} at (0,0) size 0x0 [border: (5px solid #000000) (5px solid #FF0000) (5px solid #000000)]
+          RenderTableCol {COL} at (0,0) size 0x0 [border: (5px solid #000000) (5px solid #FF0000) (5px solid #000000)]
+        RenderTableSection {TBODY} at (2,2) size 187x187
+          RenderTableRow {TR} at (0,0) size 187x187
+            RenderTableCell {TD} at (125,90) size 62x7 [border: (3px none #000000)] [r=0 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (63,90) size 62x7 [border: (3px none #000000)] [r=0 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (0,90) size 63x7 [border: (3px none #000000)] [r=0 c=2 rs=1 cs=1]
diff --git a/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-030-expected.png b/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-030-expected.png
new file mode 100644 (file)
index 0000000..46d5336
Binary files /dev/null and b/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-030-expected.png differ
diff --git a/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-030-expected.txt b/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-030-expected.txt
new file mode 100644 (file)
index 0000000..4fd608f
--- /dev/null
@@ -0,0 +1,14 @@
+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+layer at (0,0) size 800x252
+  RenderBlock {HTML} at (0,0) size 800x252
+    RenderBody {BODY} at (8,16) size 784x228
+      RenderBlock {P} at (0,0) size 784x20
+        RenderText {#text} at (0,0) size 290x19
+          text run at (0,0) width 290: "Test passes if there is no red visible on the page."
+      RenderTable {TABLE} at (0,36) size 192x192 [border: (2px none #808080)]
+        RenderTableCol {COLGROUP} at (0,0) size 0x0 [border: (5px solid #FF0000)]
+          RenderTableCol {COL} at (0,0) size 0x0 [border: (5px solid #000000)]
+        RenderTableSection {TBODY} at (2,2) size 187x187
+          RenderTableRow {TR} at (0,0) size 187x187
+            RenderTableCell {TD} at (0,90) size 187x7 [border: (3px none #000000)] [r=0 c=0 rs=1 cs=1]
diff --git a/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-031-expected.png b/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-031-expected.png
new file mode 100644 (file)
index 0000000..a01bc46
Binary files /dev/null and b/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-031-expected.png differ
diff --git a/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-031-expected.txt b/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-031-expected.txt
new file mode 100644 (file)
index 0000000..cedb6ee
--- /dev/null
@@ -0,0 +1,20 @@
+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+layer at (0,0) size 800x252
+  RenderBlock {HTML} at (0,0) size 800x252
+    RenderBody {BODY} at (8,16) size 784x228
+      RenderBlock {P} at (0,0) size 784x20
+        RenderText {#text} at (0,0) size 290x19
+          text run at (0,0) width 290: "Test passes if there is no red visible on the page."
+      RenderTable {TABLE} at (0,36) size 192x192 [border: (2px none #808080)]
+        RenderTableCol {COLGROUP} at (0,0) size 0x0 [border: (5px solid #FF0000) none (5px solid #000000)]
+          RenderTableCol {COL} at (0,0) size 0x0 [border: (5px solid #000000) none (5px solid #000000) none]
+        RenderTableCol {COLGROUP} at (0,0) size 0x0
+          RenderTableCol {COL} at (0,0) size 0x0 [border: (5px solid #000000)]
+        RenderTableCol {COLGROUP} at (0,0) size 0x0 [border: (5px solid #000000) none (5px solid #FF0000)]
+          RenderTableCol {COL} at (0,0) size 0x0 [border: (5px solid #000000) none (5px solid #000000) none]
+        RenderTableSection {TBODY} at (0,2) size 192x187
+          RenderTableRow {TR} at (0,0) size 192x187
+            RenderTableCell {TD} at (0,90) size 64x7 [border: (3px none #000000)] [r=0 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (64,90) size 64x7 [border: (3px none #000000)] [r=0 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (128,90) size 64x7 [border: (3px none #000000)] [r=0 c=2 rs=1 cs=1]
diff --git a/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-032-expected.png b/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-032-expected.png
new file mode 100644 (file)
index 0000000..46d5336
Binary files /dev/null and b/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-032-expected.png differ
diff --git a/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-032-expected.txt b/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-032-expected.txt
new file mode 100644 (file)
index 0000000..678c4c4
--- /dev/null
@@ -0,0 +1,14 @@
+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+layer at (0,0) size 800x252
+  RenderBlock {HTML} at (0,0) size 800x252
+    RenderBody {BODY} at (8,16) size 784x228
+      RenderBlock {P} at (0,0) size 784x20
+        RenderText {#text} at (0,0) size 290x19
+          text run at (0,0) width 290: "Test passes if there is no red visible on the page."
+      RenderTable {TABLE} at (0,36) size 192x192 [border: (2px solid #FF0000)]
+        RenderTableCol {COLGROUP} at (0,0) size 0x0
+          RenderTableCol {COL} at (0,0) size 0x0 [border: (5px solid #000000)]
+        RenderTableSection {TBODY} at (2,2) size 187x187
+          RenderTableRow {TR} at (0,0) size 187x187
+            RenderTableCell {TD} at (0,90) size 187x7 [border: (3px none #000000)] [r=0 c=0 rs=1 cs=1]
diff --git a/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-033-expected.png b/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-033-expected.png
new file mode 100644 (file)
index 0000000..ef16620
Binary files /dev/null and b/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-033-expected.png differ
diff --git a/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-033-expected.txt b/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-033-expected.txt
new file mode 100644 (file)
index 0000000..8afb074
--- /dev/null
@@ -0,0 +1,20 @@
+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+layer at (0,0) size 800x252
+  RenderBlock {HTML} at (0,0) size 800x252
+    RenderBody {BODY} at (8,16) size 784x228
+      RenderBlock {P} at (0,0) size 784x20
+        RenderText {#text} at (0,0) size 290x19
+          text run at (0,0) width 290: "Test passes if there is no red visible on the page."
+      RenderTable {TABLE} at (0,36) size 192x192 [border: (2px none #808080)]
+        RenderTableCol {COLGROUP} at (0,0) size 0x0
+          RenderTableCol {COL} at (0,0) size 0x0
+        RenderTableCol {COLGROUP} at (0,0) size 0x0 [border: (5px solid #FF0000) none (5px solid #FF0000)]
+          RenderTableCol {COL} at (0,0) size 0x0
+        RenderTableCol {COLGROUP} at (0,0) size 0x0
+          RenderTableCol {COL} at (0,0) size 0x0
+        RenderTableSection {TBODY} at (2,2) size 187x187
+          RenderTableRow {TR} at (0,0) size 187x187
+            RenderTableCell {TD} at (0,90) size 62x7 [border: (3px solid #000000)] [r=0 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (62,90) size 62x7 [border: (3px solid #000000) (2px none #000000) (2px solid #000000) (3px none #000000)] [r=0 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (124,90) size 63x7 [border: (3px solid #000000)] [r=0 c=2 rs=1 cs=1]
diff --git a/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-034-expected.png b/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-034-expected.png
new file mode 100644 (file)
index 0000000..46d5336
Binary files /dev/null and b/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-034-expected.png differ
diff --git a/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-034-expected.txt b/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-034-expected.txt
new file mode 100644 (file)
index 0000000..d75940e
--- /dev/null
@@ -0,0 +1,14 @@
+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+layer at (0,0) size 800x252
+  RenderBlock {HTML} at (0,0) size 800x252
+    RenderBody {BODY} at (8,16) size 784x228
+      RenderBlock {P} at (0,0) size 784x20
+        RenderText {#text} at (0,0) size 290x19
+          text run at (0,0) width 290: "Test passes if there is no red visible on the page."
+      RenderTable {TABLE} at (0,36) size 192x192 [border: (2px none #808080)]
+        RenderTableCol {COLGROUP} at (0,0) size 0x0 [border: (5px solid #FF0000)]
+          RenderTableCol {COL} at (0,0) size 0x0
+        RenderTableSection {TBODY} at (2,2) size 187x187
+          RenderTableRow {TR} at (0,0) size 187x187 [border: (5px solid #000000)]
+            RenderTableCell {TD} at (0,90) size 187x7 [border: (3px none #000000)] [r=0 c=0 rs=1 cs=1]
diff --git a/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-035-expected.png b/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-035-expected.png
new file mode 100644 (file)
index 0000000..46d5336
Binary files /dev/null and b/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-035-expected.png differ
diff --git a/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-035-expected.txt b/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-035-expected.txt
new file mode 100644 (file)
index 0000000..24b84b0
--- /dev/null
@@ -0,0 +1,14 @@
+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+layer at (0,0) size 800x252
+  RenderBlock {HTML} at (0,0) size 800x252
+    RenderBody {BODY} at (8,16) size 784x228
+      RenderBlock {P} at (0,0) size 784x20
+        RenderText {#text} at (0,0) size 290x19
+          text run at (0,0) width 290: "Test passes if there is no red visible on the page."
+      RenderTable {TABLE} at (0,36) size 192x192 [border: (2px none #808080)]
+        RenderTableCol {COLGROUP} at (0,0) size 0x0 [border: (5px solid #FF0000)]
+          RenderTableCol {COL} at (0,0) size 0x0
+        RenderTableSection {TBODY} at (2,2) size 187x187 [border: (5px solid #000000)]
+          RenderTableRow {TR} at (0,0) size 187x187
+            RenderTableCell {TD} at (0,90) size 187x7 [border: (3px none #000000)] [r=0 c=0 rs=1 cs=1]
diff --git a/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-036-expected.png b/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-036-expected.png
new file mode 100644 (file)
index 0000000..ef16620
Binary files /dev/null and b/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-036-expected.png differ
diff --git a/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-036-expected.txt b/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-036-expected.txt
new file mode 100644 (file)
index 0000000..d5fea7f
--- /dev/null
@@ -0,0 +1,20 @@
+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+layer at (0,0) size 800x252
+  RenderBlock {HTML} at (0,0) size 800x252
+    RenderBody {BODY} at (8,16) size 784x228
+      RenderBlock {P} at (0,0) size 784x20
+        RenderText {#text} at (0,0) size 290x19
+          text run at (0,0) width 290: "Test passes if there is no red visible on the page."
+      RenderTable {TABLE} at (0,36) size 192x192 [border: (2px none #808080)]
+        RenderTableCol {COLGROUP} at (0,0) size 0x0
+          RenderTableCol {COL} at (0,0) size 0x0 [border: (5px solid #000000)]
+        RenderTableCol {COLGROUP} at (0,0) size 0x0 [border: (5px solid #FF0000) none (5px solid #FF0000)]
+          RenderTableCol {COL} at (0,0) size 0x0 [border: (5px solid #000000) none (5px solid #000000) none]
+        RenderTableCol {COLGROUP} at (0,0) size 0x0
+          RenderTableCol {COL} at (0,0) size 0x0 [border: (5px solid #000000)]
+        RenderTableSection {TBODY} at (2,2) size 187x187
+          RenderTableRow {TR} at (0,0) size 187x187
+            RenderTableCell {TD} at (0,90) size 62x7 [border: (3px none #000000)] [r=0 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (62,90) size 62x7 [border: (3px none #000000)] [r=0 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (124,90) size 63x7 [border: (3px none #000000)] [r=0 c=2 rs=1 cs=1]
diff --git a/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-037-expected.png b/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-037-expected.png
new file mode 100644 (file)
index 0000000..34494e2
Binary files /dev/null and b/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-037-expected.png differ
diff --git a/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-037-expected.txt b/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-037-expected.txt
new file mode 100644 (file)
index 0000000..ddaa1cb
--- /dev/null
@@ -0,0 +1,20 @@
+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+layer at (0,0) size 800x252
+  RenderBlock {HTML} at (0,0) size 800x252
+    RenderBody {BODY} at (8,16) size 784x228
+      RenderBlock {P} at (0,0) size 784x20
+        RenderText {#text} at (0,0) size 290x19
+          text run at (0,0) width 290: "Test passes if there is no red visible on the page."
+      RenderTable {TABLE} at (0,36) size 192x192
+        RenderTableCol {COLGROUP} at (0,0) size 0x0 [border: (5px solid #000000)]
+          RenderTableCol {COL} at (0,0) size 0x0
+        RenderTableCol {COLGROUP} at (0,0) size 0x0 [border: (5px solid #000000) (5px solid #FF0000)]
+          RenderTableCol {COL} at (0,0) size 0x0
+        RenderTableCol {COLGROUP} at (0,0) size 0x0 [border: (5px solid #000000) (5px solid #FF0000)]
+          RenderTableCol {COL} at (0,0) size 0x0
+        RenderTableSection {TBODY} at (0,0) size 192x192
+          RenderTableRow {TR} at (0,0) size 192x192
+            RenderTableCell {TD} at (0,92) size 64x7 [border: (3px none #000000)] [r=0 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (64,92) size 64x7 [border: (3px none #000000)] [r=0 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (128,92) size 64x7 [border: (3px none #000000)] [r=0 c=2 rs=1 cs=1]
diff --git a/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-038-expected.png b/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-038-expected.png
new file mode 100644 (file)
index 0000000..34494e2
Binary files /dev/null and b/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-038-expected.png differ
diff --git a/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-038-expected.txt b/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-038-expected.txt
new file mode 100644 (file)
index 0000000..7604ecc
--- /dev/null
@@ -0,0 +1,20 @@
+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+layer at (0,0) size 800x252
+  RenderBlock {HTML} at (0,0) size 800x252
+    RenderBody {BODY} at (8,16) size 784x228
+      RenderBlock {P} at (0,0) size 784x20
+        RenderText {#text} at (0,0) size 290x19
+          text run at (0,0) width 290: "Test passes if there is no red visible on the page."
+      RenderTable {TABLE} at (0,36) size 192x192
+        RenderTableCol {COLGROUP} at (0,0) size 0x0 [border: (5px solid #000000)]
+          RenderTableCol {COL} at (0,0) size 0x0
+        RenderTableCol {COLGROUP} at (0,0) size 0x0 [border: (5px solid #000000) (5px solid #FF0000) (5px solid #000000)]
+          RenderTableCol {COL} at (0,0) size 0x0
+        RenderTableCol {COLGROUP} at (0,0) size 0x0 [border: (5px solid #000000) (5px solid #FF0000) (5px solid #000000)]
+          RenderTableCol {COL} at (0,0) size 0x0
+        RenderTableSection {TBODY} at (0,0) size 192x192
+          RenderTableRow {TR} at (0,0) size 192x192
+            RenderTableCell {TD} at (128,92) size 64x7 [border: (3px none #000000)] [r=0 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (64,92) size 64x7 [border: (3px none #000000)] [r=0 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (0,92) size 64x7 [border: (3px none #000000)] [r=0 c=2 rs=1 cs=1]
diff --git a/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-039-expected.png b/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-039-expected.png
new file mode 100644 (file)
index 0000000..46d5336
Binary files /dev/null and b/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-039-expected.png differ
diff --git a/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-039-expected.txt b/LayoutTests/platform/chromium/css2.1/20110323/border-conflict-element-039-expected.txt
new file mode 100644 (file)
index 0000000..9b92f1f
--- /dev/null
@@ -0,0 +1,14 @@
+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+layer at (0,0) size 800x252
+  RenderBlock {HTML} at (0,0) size 800x252
+    RenderBody {BODY} at (8,16) size 784x228
+      RenderBlock {P} at (0,0) size 784x20
+        RenderText {#text} at (0,0) size 290x19
+          text run at (0,0) width 290: "Test passes if there is no red visible on the page."
+      RenderTable {TABLE} at (0,36) size 192x192 [border: (2px solid #FF0000)]
+        RenderTableCol {COLGROUP} at (0,0) size 0x0 [border: (5px solid #000000)]
+          RenderTableCol {COL} at (0,0) size 0x0
+        RenderTableSection {TBODY} at (2,2) size 187x187
+          RenderTableRow {TR} at (0,0) size 187x187
+            RenderTableCell {TD} at (0,90) size 187x7 [border: (3px none #000000)] [r=0 c=0 rs=1 cs=1]
diff --git a/LayoutTests/platform/chromium/fast/css/border-conflict-element-002-expected.png b/LayoutTests/platform/chromium/fast/css/border-conflict-element-002-expected.png
new file mode 100644 (file)
index 0000000..be4c908
Binary files /dev/null and b/LayoutTests/platform/chromium/fast/css/border-conflict-element-002-expected.png differ
diff --git a/LayoutTests/platform/chromium/fast/css/border-conflict-element-002-expected.txt b/LayoutTests/platform/chromium/fast/css/border-conflict-element-002-expected.txt
new file mode 100644 (file)
index 0000000..6b41138
--- /dev/null
@@ -0,0 +1,22 @@
+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+layer at (0,0) size 800x252
+  RenderBlock {HTML} at (0,0) size 800x252
+    RenderBody {BODY} at (8,16) size 784x228
+      RenderBlock {P} at (0,0) size 784x20
+        RenderText {#text} at (0,0) size 290x19
+          text run at (0,0) width 290: "Test passes if there is no red visible on the page."
+      RenderTable {TABLE} at (0,36) size 192x192 [border: (2px none #808080)]
+        RenderTableSection {TBODY} at (2,2) size 187x187
+          RenderTableRow {TR} at (0,0) size 187x62
+            RenderTableCell {TD} at (125,27) size 62x7 [border: (3px solid #000000)] [r=0 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (63,27) size 62x7 [border: (3px solid #000000)] [r=0 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (0,27) size 63x7 [border: (3px solid #000000)] [r=0 c=2 rs=1 cs=1]
+          RenderTableRow {TR} at (0,62) size 187x62
+            RenderTableCell {TD} at (125,89) size 62x7 [border: (3px solid #000000)] [r=1 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (63,89) size 62x7 [border: (3px solid #000000) (2px solid #FF0000) (2px solid #000000)] [r=1 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (0,89) size 63x7 [border: (3px solid #000000) (2px solid #FF0000) (2px solid #000000)] [r=1 c=2 rs=1 cs=1]
+          RenderTableRow {TR} at (0,124) size 187x63
+            RenderTableCell {TD} at (125,152) size 62x7 [border: (3px solid #000000)] [r=2 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (63,152) size 62x7 [border: (3px solid #FF0000) (2px solid #000000)] [r=2 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (0,152) size 63x7 [border: (3px solid #000000)] [r=2 c=2 rs=1 cs=1]
index 4cf3273..ee04eed 100644 (file)
@@ -1,3 +1,57 @@
+2011-11-27  Robert Hogan  <robert@webkit.org>
+
+        CSS 2.1 failure: border-conflict-element-*
+        https://bugs.webkit.org/show_bug.cgi?id=71244
+
+        Reviewed by Julien Chaffraix.
+        
+        From http://www.w3.org/TR/CSS21/tables.html#border-conflict-resolution :
+          "When two adjacent cells have the same border-width and the same border-style in a 
+          'border-collapse: collapse' table, then the color of the border from the leftmost cell wins
+          (if the table's 'direction' is 'ltr'; right, if it is 'rtl') and the color of the border
+          from the topmost cell wins."
+
+        So WebCore::compareBorders needs to account for the position of the cell when 
+        deciding which border wins the comparison. This will ensure that the winning border is 
+        sorted to the appropriate position in the sorted list of borders for painting.
+
+        When conflicting collapsed borders are in the same cell, the following order of
+        precedence is used (where 4 has highest precedence):
+
+                           __3__
+                          |     |
+                        4 |     | 1
+                          |_____|
+                             2
+
+        This fixes the following failing tests from the border-conflict-element-* set
+        in the CSS 2.1 test suite:
+          border-conflict-element-001d.htm
+          border-conflict-element-0037.htm
+
+        One test in the suite is known to be wrong, so a corrected version has been landed outside the 
+        css2.1 folder:
+          border-conflict-element-002.htm
+
+        This change entails rebaselining quite a few tests, see the LayoutTests ChangeLog for a full
+        explanation of the rebaselines.
+
+        * rendering/RenderTableCell.cpp:
+        (WebCore::compareBorders): Compare the cells' position from the left (in 'ltr') and right (in 'rtl')
+                                   of the table and the cells' position from the top of the table when nothing
+                                   else in the style, width, or grouping of the borders determines precedence.
+                                   If the conflicting borders are in the same cell, apply the same logic to the position of the borders.
+        (WebCore::RenderTableCell::collapsedStartBorder): Pass the cell's position and its table's direction to CollapsedBorderValue
+        (WebCore::RenderTableCell::collapsedEndBorder): ditto
+        (WebCore::RenderTableCell::collapsedBeforeBorder): ditto
+        (WebCore::RenderTableCell::collapsedAfterBorder): ditto
+        * rendering/style/CollapsedBorderValue.h:
+        (WebCore::CollapsedBorderValue::CollapsedBorderValue): Learn the position of the border's cell and the direction of its table
+        (WebCore::CollapsedBorderValue::columnOffset): the cell's offset from the top of the table
+        (WebCore::CollapsedBorderValue::rowOffset): the cell's offset from the start of the table
+        (WebCore::CollapsedBorderValue::edge): which edge of the cell the border is on
+        (WebCore::CollapsedBorderValue::operator==): cells with the same position in the table are equal
+
 2011-11-26  Pavel Feldman  <pfeldman@google.com>
 
         Web Inspector: remove disconnectFromBackend from the protocol.
index 2041c19..9186bf0 100644 (file)
@@ -339,8 +339,9 @@ void RenderTableCell::styleDidChange(StyleDifference diff, const RenderStyle* ol
 // are discarded in favor of wider ones. If several have the same 'border-width' then styles are preferred 
 // in this order: 'double', 'solid', 'dashed', 'dotted', 'ridge', 'outset', 'groove', and the lowest: 'inset'.
 // (4) If border styles differ only in color, then a style set on a cell wins over one on a row, 
-// which wins over a row group, column, column group and, lastly, table. It is undefined which color 
-// is used when two elements of the same type disagree.
+// which wins over a row group, column, column group and, lastly, table. When two elements of the same type 
+// conflict, then the one further to the left (if the table's 'direction' is 'ltr'; right, if it is 'rtl')
+// and further to the top wins.
 static int compareBorders(const CollapsedBorderValue& border1, const CollapsedBorderValue& border2)
 {
     // Sanity check the values passed in. The null border have lowest priority.
@@ -377,11 +378,26 @@ static int compareBorders(const CollapsedBorderValue& border1, const CollapsedBo
     // The borders have equal width.  Sort by border style.
     if (border1.style() != border2.style())
         return border1.style() < border2.style() ? -1 : 1;
-    
-    // The border have the same width and style.  Rely on precedence (cell over row over row group, etc.)
-    if (border1.precedence() == border2.precedence())
+
+    // The borders have the same width and style. Sort by precedence (cell over row over row group, etc.)
+    if (border1.precedence() != border2.precedence())
+        return border1.precedence() < border2.precedence() ? -1 : 1;
+
+    // The borders have the same precedence. Sort by position in the table
+
+    // The one further to the top wins.
+    if (border1.columnOffset() != border2.columnOffset())
+        return border1.columnOffset() > border2.columnOffset() ? -1 : 1;
+
+    // The one further to the left if 'ltr' and right if 'rtl' and to the top wins.
+    // Note that rtl tables treat the rightmost column as '0' so the calculation is the same for both.
+    if (border1.rowOffset() != border2.rowOffset())
+        return border1.rowOffset() > border2.rowOffset() ? -1 : 1;
+
+    // The borders are in the same cell. Prefer the border nearest to the top and left.
+    if (border1.edge() == border2.edge()) 
         return 0;
-    return border1.precedence() < border2.precedence() ? -1 : 1;
+    return border1.edge() < border2.edge() ? -1 : 1;
 }
 
 static CollapsedBorderValue chooseBorder(const CollapsedBorderValue& border1, const CollapsedBorderValue& border2)
@@ -399,22 +415,23 @@ CollapsedBorderValue RenderTableCell::collapsedStartBorder() const
     // (1) Our start border.
     int start = CSSProperty::resolveDirectionAwareProperty(CSSPropertyWebkitBorderStartColor, table->style()->direction(), table->style()->writingMode());
     int end = CSSProperty::resolveDirectionAwareProperty(CSSPropertyWebkitBorderEndColor, table->style()->direction(), table->style()->writingMode());
-    CollapsedBorderValue result(style()->borderStart(), style()->visitedDependentColor(start), BCELL);
+    CollapsedBorderValue result(style()->borderStart(), style()->visitedDependentColor(start), BCELL, col(), row(), BSTARTEDGE);
 
     // (2) The end border of the preceding cell.
-    if (RenderTableCell* prevCell = table->cellBefore(this)) {
-        CollapsedBorderValue prevCellBorder = CollapsedBorderValue(prevCell->style()->borderEnd(), prevCell->style()->visitedDependentColor(end), BCELL);
+    RenderTableCell* prevCell = table->cellBefore(this);
+    if (prevCell) {
+        CollapsedBorderValue prevCellBorder = CollapsedBorderValue(prevCell->style()->borderEnd(), prevCell->style()->visitedDependentColor(end), BCELL, prevCell->col(), prevCell->row(), BENDEDGE);
         result = chooseBorder(prevCellBorder, result);
         if (!result.exists())
             return result;
     } else if (isStartColumn) {
         // (3) Our row's start border.
-        result = chooseBorder(result, CollapsedBorderValue(parent()->style()->borderStart(), parent()->style()->visitedDependentColor(start), BROW));
+        result = chooseBorder(result, CollapsedBorderValue(parent()->style()->borderStart(), parent()->style()->visitedDependentColor(start), BROW, col(), row(), BSTARTEDGE));
         if (!result.exists())
             return result;
-        
+
         // (4) Our row group's start border.
-        result = chooseBorder(result, CollapsedBorderValue(section()->style()->borderStart(), section()->style()->visitedDependentColor(start), BROWGROUP));
+        result = chooseBorder(result, CollapsedBorderValue(section()->style()->borderStart(), section()->style()->visitedDependentColor(start), BROWGROUP, col(), row(), BSTARTEDGE));
         if (!result.exists())
             return result;
     }
@@ -424,11 +441,11 @@ CollapsedBorderValue RenderTableCell::collapsedStartBorder() const
     bool endColEdge;
     RenderTableCol* colElt = table->colElement(col(), &startColEdge, &endColEdge);
     if (colElt && startColEdge) {
-        result = chooseBorder(result, CollapsedBorderValue(colElt->style()->borderStart(), colElt->style()->visitedDependentColor(start), BCOL));
+        result = chooseBorder(result, CollapsedBorderValue(colElt->style()->borderStart(), colElt->style()->visitedDependentColor(start), BCOL, col(), row(), BSTARTEDGE));
         if (!result.exists())
             return result;
         if (colElt->parent()->isTableCol() && !colElt->previousSibling()) {
-            result = chooseBorder(result, CollapsedBorderValue(colElt->parent()->style()->borderStart(), colElt->parent()->style()->visitedDependentColor(start), BCOLGROUP));
+            result = chooseBorder(result, CollapsedBorderValue(colElt->parent()->style()->borderStart(), colElt->parent()->style()->visitedDependentColor(start), BCOLGROUP, col(), row(), BSTARTEDGE));
             if (!result.exists())
                 return result;
         }
@@ -436,20 +453,19 @@ CollapsedBorderValue RenderTableCell::collapsedStartBorder() const
     
     // (6) The end border of the preceding column.
     if (!isStartColumn) {
-        colElt = table->colElement(col() -1, &startColEdge, &endColEdge);
+        colElt = table->colElement(col() - 1, &startColEdge, &endColEdge);
         if (colElt && endColEdge) {
-            CollapsedBorderValue endBorder = CollapsedBorderValue(colElt->style()->borderEnd(), colElt->style()->visitedDependentColor(end), BCOL);
+            CollapsedBorderValue endBorder = CollapsedBorderValue(colElt->style()->borderEnd(), colElt->style()->visitedDependentColor(end), BCOL, col() - 1, row(), BENDEDGE);
             result = chooseBorder(endBorder, result);
             if (!result.exists())
                 return result;
         }
     } else {
         // (7) The table's start border.
-        result = chooseBorder(result, CollapsedBorderValue(table->style()->borderStart(), table->style()->visitedDependentColor(start), BTABLE));
+        result = chooseBorder(result, CollapsedBorderValue(table->style()->borderStart(), table->style()->visitedDependentColor(start), BTABLE, col(), row(), BSTARTEDGE));
         if (!result.exists())
             return result;
     }
-    
     return result;
 }
 
@@ -462,25 +478,25 @@ CollapsedBorderValue RenderTableCell::collapsedEndBorder() const
     // (1) Our end border.
     int start = CSSProperty::resolveDirectionAwareProperty(CSSPropertyWebkitBorderStartColor, table->style()->direction(), table->style()->writingMode());
     int end = CSSProperty::resolveDirectionAwareProperty(CSSPropertyWebkitBorderEndColor, table->style()->direction(), table->style()->writingMode());
-    CollapsedBorderValue result = CollapsedBorderValue(style()->borderEnd(), style()->visitedDependentColor(end), BCELL);
+    CollapsedBorderValue result = CollapsedBorderValue(style()->borderEnd(), style()->visitedDependentColor(end), BCELL, col(), row(), BENDEDGE);
     
     // (2) The start border of the following cell.
     if (!isEndColumn) {
         RenderTableCell* nextCell = table->cellAfter(this);
         if (nextCell && nextCell->style()) {
-            CollapsedBorderValue startBorder = CollapsedBorderValue(nextCell->style()->borderStart(), nextCell->style()->visitedDependentColor(start), BCELL);
+            CollapsedBorderValue startBorder = CollapsedBorderValue(nextCell->style()->borderStart(), nextCell->style()->visitedDependentColor(start), BCELL, nextCell->col(), nextCell->row(), BSTARTEDGE);
             result = chooseBorder(result, startBorder);
             if (!result.exists())
                 return result;
         }
     } else {
         // (3) Our row's end border.
-        result = chooseBorder(result, CollapsedBorderValue(parent()->style()->borderEnd(), parent()->style()->visitedDependentColor(end), BROW));
+        result = chooseBorder(result, CollapsedBorderValue(parent()->style()->borderEnd(), parent()->style()->visitedDependentColor(end), BROW, col(), row(), BENDEDGE));
         if (!result.exists())
             return result;
         
         // (4) Our row group's end border.
-        result = chooseBorder(result, CollapsedBorderValue(section()->style()->borderEnd(), section()->style()->visitedDependentColor(end), BROWGROUP));
+        result = chooseBorder(result, CollapsedBorderValue(section()->style()->borderEnd(), section()->style()->visitedDependentColor(end), BROWGROUP, col(), row(), BENDEDGE));
         if (!result.exists())
             return result;
     }
@@ -490,11 +506,11 @@ CollapsedBorderValue RenderTableCell::collapsedEndBorder() const
     bool endColEdge;
     RenderTableCol* colElt = table->colElement(col() + colSpan() - 1, &startColEdge, &endColEdge);
     if (colElt && endColEdge) {
-        result = chooseBorder(result, CollapsedBorderValue(colElt->style()->borderEnd(), colElt->style()->visitedDependentColor(end), BCOL));
+        result = chooseBorder(result, CollapsedBorderValue(colElt->style()->borderEnd(), colElt->style()->visitedDependentColor(end), BCOL, col(), row(), BENDEDGE));
         if (!result.exists())
             return result;
         if (colElt->parent()->isTableCol() && !colElt->nextSibling()) {
-            result = chooseBorder(result, CollapsedBorderValue(colElt->parent()->style()->borderEnd(), colElt->parent()->style()->visitedDependentColor(end), BCOLGROUP));
+            result = chooseBorder(result, CollapsedBorderValue(colElt->parent()->style()->borderEnd(), colElt->parent()->style()->visitedDependentColor(end), BCOLGROUP, col(), row(), BENDEDGE));
             if (!result.exists())
                 return result;
         }
@@ -504,14 +520,14 @@ CollapsedBorderValue RenderTableCell::collapsedEndBorder() const
     if (!isEndColumn) {
         colElt = table->colElement(col() + colSpan(), &startColEdge, &endColEdge);
         if (colElt && startColEdge) {
-            CollapsedBorderValue startBorder = CollapsedBorderValue(colElt->style()->borderStart(), colElt->style()->visitedDependentColor(start), BCOL);
+            CollapsedBorderValue startBorder = CollapsedBorderValue(colElt->style()->borderStart(), colElt->style()->visitedDependentColor(start), BCOL, col() + colSpan(), row(), BSTARTEDGE);
             result = chooseBorder(result, startBorder);
             if (!result.exists())
                 return result;
         }
     } else {
         // (7) The table's end border.
-        result = chooseBorder(result, CollapsedBorderValue(table->style()->borderEnd(), table->style()->visitedDependentColor(end), BTABLE));
+        result = chooseBorder(result, CollapsedBorderValue(table->style()->borderEnd(), table->style()->visitedDependentColor(end), BTABLE, col(), row(), BENDEDGE));
         if (!result.exists())
             return result;
     }
@@ -527,18 +543,20 @@ CollapsedBorderValue RenderTableCell::collapsedBeforeBorder() const
     // (1) Our before border.
     int before = CSSProperty::resolveDirectionAwareProperty(CSSPropertyWebkitBorderBeforeColor, table->style()->direction(), table->style()->writingMode());
     int after = CSSProperty::resolveDirectionAwareProperty(CSSPropertyWebkitBorderAfterColor, table->style()->direction(), table->style()->writingMode());
-    CollapsedBorderValue result = CollapsedBorderValue(style()->borderBefore(), style()->visitedDependentColor(before), BCELL);
+    CollapsedBorderValue result = CollapsedBorderValue(style()->borderBefore(), style()->visitedDependentColor(before), BCELL, col(), row(), BBEFOREEDGE);
     
     RenderTableCell* prevCell = table->cellAbove(this);
     if (prevCell) {
         // (2) A before cell's after border.
-        result = chooseBorder(CollapsedBorderValue(prevCell->style()->borderAfter(), prevCell->style()->visitedDependentColor(after), BCELL), result);
+        CollapsedBorderValue prevCellBorder = CollapsedBorderValue(prevCell->style()->borderAfter(), prevCell->style()->visitedDependentColor(after), BCELL, prevCell->col(), prevCell->row(), BAFTEREDGE);
+        result = chooseBorder(prevCellBorder, result);
         if (!result.exists())
             return result;
     }
+
     
     // (3) Our row's before border.
-    result = chooseBorder(result, CollapsedBorderValue(parent()->style()->borderBefore(), parent()->style()->visitedDependentColor(before), BROW));
+    result = chooseBorder(result, CollapsedBorderValue(parent()->style()->borderBefore(), parent()->style()->visitedDependentColor(before), BROW, col(), row(), BBEFOREEDGE));
     if (!result.exists())
         return result;
     
@@ -551,7 +569,7 @@ CollapsedBorderValue RenderTableCell::collapsedBeforeBorder() const
             prevRow = prevCell->section()->lastChild();
     
         if (prevRow) {
-            result = chooseBorder(CollapsedBorderValue(prevRow->style()->borderAfter(), prevRow->style()->visitedDependentColor(after), BROW), result);
+            result = chooseBorder(result, CollapsedBorderValue(prevRow->style()->borderAfter(), prevRow->style()->visitedDependentColor(after), BROW, prevCell->col(), prevCell->row(), BAFTEREDGE));
             if (!result.exists())
                 return result;
         }
@@ -561,14 +579,14 @@ CollapsedBorderValue RenderTableCell::collapsedBeforeBorder() const
     RenderTableSection* currSection = section();
     if (!row()) {
         // (5) Our row group's before border.
-        result = chooseBorder(result, CollapsedBorderValue(currSection->style()->borderBefore(), currSection->style()->visitedDependentColor(before), BROWGROUP));
+        result = chooseBorder(result, CollapsedBorderValue(currSection->style()->borderBefore(), currSection->style()->visitedDependentColor(before), BROWGROUP, col(), row() + rowSpan(), BBEFOREEDGE));
         if (!result.exists())
             return result;
         
         // (6) Previous row group's after border.
         currSection = table->sectionAbove(currSection);
-        if (currSection) {
-            result = chooseBorder(CollapsedBorderValue(currSection->style()->borderAfter(), currSection->style()->visitedDependentColor(after), BROWGROUP), result);
+        if (currSection && currSection->numRows()) {
+            result = chooseBorder(CollapsedBorderValue(currSection->style()->borderAfter(), currSection->style()->visitedDependentColor(after), BROWGROUP, col(), row(), BAFTEREDGE), result);
             if (!result.exists())
                 return result;
         }
@@ -578,18 +596,18 @@ CollapsedBorderValue RenderTableCell::collapsedBeforeBorder() const
         // (8) Our column and column group's before borders.
         RenderTableCol* colElt = table->colElement(col());
         if (colElt) {
-            result = chooseBorder(result, CollapsedBorderValue(colElt->style()->borderBefore(), colElt->style()->visitedDependentColor(before), BCOL));
+            result = chooseBorder(result, CollapsedBorderValue(colElt->style()->borderBefore(), colElt->style()->visitedDependentColor(before), BCOL, col(), row(), BBEFOREEDGE));
             if (!result.exists())
                 return result;
             if (colElt->parent()->isTableCol()) {
-                result = chooseBorder(result, CollapsedBorderValue(colElt->parent()->style()->borderBefore(), colElt->parent()->style()->visitedDependentColor(before), BCOLGROUP));
+                result = chooseBorder(result, CollapsedBorderValue(colElt->parent()->style()->borderBefore(), colElt->parent()->style()->visitedDependentColor(before), BCOLGROUP, col(), row(), BBEFOREEDGE));
                 if (!result.exists())
                     return result;
             }
         }
         
         // (9) The table's before border.
-        result = chooseBorder(result, CollapsedBorderValue(table->style()->borderBefore(), table->style()->visitedDependentColor(before), BTABLE));
+        result = chooseBorder(result, CollapsedBorderValue(table->style()->borderBefore(), table->style()->visitedDependentColor(before), BTABLE, col(), row(), BBEFOREEDGE));
         if (!result.exists())
             return result;
     }
@@ -605,24 +623,24 @@ CollapsedBorderValue RenderTableCell::collapsedAfterBorder() const
     // (1) Our after border.
     int before = CSSProperty::resolveDirectionAwareProperty(CSSPropertyWebkitBorderBeforeColor, table->style()->direction(), table->style()->writingMode());
     int after = CSSProperty::resolveDirectionAwareProperty(CSSPropertyWebkitBorderAfterColor, table->style()->direction(), table->style()->writingMode());
-    CollapsedBorderValue result = CollapsedBorderValue(style()->borderAfter(), style()->visitedDependentColor(after), BCELL);
+    CollapsedBorderValue result = CollapsedBorderValue(style()->borderAfter(), style()->visitedDependentColor(after), BCELL, col(), row(), BAFTEREDGE);
     
     RenderTableCell* nextCell = table->cellBelow(this);
     if (nextCell) {
         // (2) An after cell's before border.
-        result = chooseBorder(result, CollapsedBorderValue(nextCell->style()->borderBefore(), nextCell->style()->visitedDependentColor(before), BCELL));
+        result = chooseBorder(result, CollapsedBorderValue(nextCell->style()->borderBefore(), nextCell->style()->visitedDependentColor(before), BCELL, nextCell->col(), nextCell->row(), BBEFOREEDGE));
         if (!result.exists())
             return result;
     }
     
     // (3) Our row's after border. (FIXME: Deal with rowspan!)
-    result = chooseBorder(result, CollapsedBorderValue(parent()->style()->borderAfter(), parent()->style()->visitedDependentColor(after), BROW));
+    result = chooseBorder(result, CollapsedBorderValue(parent()->style()->borderAfter(), parent()->style()->visitedDependentColor(after), BROW, col(), row(), BAFTEREDGE));
     if (!result.exists())
         return result;
     
     // (4) The next row's before border.
     if (nextCell) {
-        result = chooseBorder(result, CollapsedBorderValue(nextCell->parent()->style()->borderBefore(), nextCell->parent()->style()->visitedDependentColor(before), BROW));
+        result = chooseBorder(result, CollapsedBorderValue(nextCell->parent()->style()->borderBefore(), nextCell->parent()->style()->visitedDependentColor(before), BROW, nextCell->col(), nextCell->row(), BBEFOREEDGE));
         if (!result.exists())
             return result;
     }
@@ -631,14 +649,14 @@ CollapsedBorderValue RenderTableCell::collapsedAfterBorder() const
     RenderTableSection* currSection = section();
     if (row() + rowSpan() >= currSection->numRows()) {
         // (5) Our row group's after border.
-        result = chooseBorder(result, CollapsedBorderValue(currSection->style()->borderAfter(), currSection->style()->visitedDependentColor(after), BROWGROUP));
+        result = chooseBorder(result, CollapsedBorderValue(currSection->style()->borderAfter(), currSection->style()->visitedDependentColor(after), BROWGROUP, col(), row(), BAFTEREDGE));
         if (!result.exists())
             return result;
         
         // (6) Following row group's before border.
         currSection = table->sectionBelow(currSection);
         if (currSection) {
-            result = chooseBorder(result, CollapsedBorderValue(currSection->style()->borderBefore(), currSection->style()->visitedDependentColor(before), BROWGROUP));
+            result = chooseBorder(result, CollapsedBorderValue(currSection->style()->borderBefore(), currSection->style()->visitedDependentColor(before), BROWGROUP, col(), row() + rowSpan(), BBEFOREEDGE));
             if (!result.exists())
                 return result;
         }
@@ -648,21 +666,21 @@ CollapsedBorderValue RenderTableCell::collapsedAfterBorder() const
         // (8) Our column and column group's after borders.
         RenderTableCol* colElt = table->colElement(col());
         if (colElt) {
-            result = chooseBorder(result, CollapsedBorderValue(colElt->style()->borderAfter(), colElt->style()->visitedDependentColor(after), BCOL));
+            result = chooseBorder(result, CollapsedBorderValue(colElt->style()->borderAfter(), colElt->style()->visitedDependentColor(after), BCOL, col(), row(), BAFTEREDGE));
             if (!result.exists()) return result;
             if (colElt->parent()->isTableCol()) {
-                result = chooseBorder(result, CollapsedBorderValue(colElt->parent()->style()->borderAfter(), colElt->parent()->style()->visitedDependentColor(after), BCOLGROUP));
+                result = chooseBorder(result, CollapsedBorderValue(colElt->parent()->style()->borderAfter(), colElt->parent()->style()->visitedDependentColor(after), BCOLGROUP, col(), row(), BAFTEREDGE));
                 if (!result.exists())
                     return result;
             }
         }
         
         // (9) The table's after border.
-        result = chooseBorder(result, CollapsedBorderValue(table->style()->borderAfter(), table->style()->visitedDependentColor(after), BTABLE));
+        result = chooseBorder(result, CollapsedBorderValue(table->style()->borderAfter(), table->style()->visitedDependentColor(after), BTABLE, col(), row(), BAFTEREDGE));
         if (!result.exists())
             return result;
     }
-    
+   
     return result;    
 }
 
index e00902f..e24fcbd 100644 (file)
@@ -36,10 +36,23 @@ public:
     {
     }
 
+    CollapsedBorderValue(const BorderValue& b, Color c, EBorderPrecedence p, unsigned rowOffset, unsigned columnOffset, EEdgePrecedence edge)
+        : m_border(b)
+        , m_borderColor(c)
+        , m_precedence(p)
+        , m_rowOffset(rowOffset)
+        , m_columnOffset(columnOffset)
+        , m_edge(edge)
+    {
+    }
+
     CollapsedBorderValue(const BorderValue& b, Color c, EBorderPrecedence p)
         : m_border(b)
         , m_borderColor(c)
         , m_precedence(p)
+        , m_rowOffset(0)
+        , m_columnOffset(0)
+        , m_edge(BAFTEREDGE)
     {
     }
 
@@ -49,16 +62,22 @@ public:
     const Color& color() const { return m_borderColor; }
     bool isTransparent() const { return m_border.isTransparent(); }
     EBorderPrecedence precedence() const { return m_precedence; }
+    unsigned columnOffset() const { return m_columnOffset; }
+    unsigned rowOffset() const { return m_rowOffset; }
+    EEdgePrecedence edge() const { return m_edge; }
 
     bool operator==(const CollapsedBorderValue& o) const
     {
-        return m_border == o.m_border && m_borderColor == o.m_borderColor && m_precedence == o.m_precedence;
+        return m_border == o.m_border && m_borderColor == o.m_borderColor && m_precedence == o.m_precedence && m_rowOffset == o.m_rowOffset && m_columnOffset == o.m_columnOffset && m_edge == o.m_edge;
     }
 
 private:
     BorderValue m_border;
     Color m_borderColor;
     EBorderPrecedence m_precedence;
+    unsigned m_rowOffset;
+    unsigned m_columnOffset;
+    EEdgePrecedence m_edge;
 };
 
 } // namespace WebCore
index a22b7fb..afcf5cb 100644 (file)
@@ -98,6 +98,8 @@ enum EBorderStyle { BNONE, BHIDDEN, INSET, GROOVE, OUTSET, RIDGE, DOTTED, DASHED
 
 enum EBorderPrecedence { BOFF, BTABLE, BCOLGROUP, BCOL, BROWGROUP, BROW, BCELL };
 
+enum EEdgePrecedence { BAFTEREDGE, BENDEDGE, BBEFOREEDGE, BSTARTEDGE };
+
 enum OutlineIsAuto { AUTO_OFF = 0, AUTO_ON };
 
 enum EPosition {