Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
CSS 2.1 failure: fixed-table-layout-006 fails
https://bugs.webkit.org/show_bug.cgi?id=78412 Reviewed by Julien Chaffraix. Source/WebCore: Tests: css2.1/20110323/fixed-table-layout-006.htm fast/css/fixed-table-layout-cell-padding.htm In fixed tables, positive width specified on a column should include borders and padding. See the thread at http://lists.w3.org/Archives/Public/www-style/2011Oct/0502.html. The discussion there resulted in a whole new set of tests for section 17.5.2.1 in the CSS 2.1 spec. See http://test.csswg.org/harness/test/CSS21_DEV/section/17.5.2.1/. This patch allows WebKit to pass all of them, and all tests for the 17.5.2.1 section as a whole. I'll land them all separately. * rendering/FixedTableLayout.cpp: (WebCore::FixedTableLayout::calcWidthArray): Include border width and cell padding in the width of the column. Note that borderAndPaddingLogicalWidth() returns the border width for separate and collapsed borders as appropriate. LayoutTests: * css2.1/20110323/fixed-table-layout-006-expected.html: Added. * css2.1/20110323/fixed-table-layout-006.htm: Added. * css2.1/20110323/fixed-table-layout-013-expected.html: The reference test relied on the broken behaviour we're fixing here. * fast/css/fixed-table-layout-cell-padding-expected.html: Added. * fast/css/fixed-table-layout-cell-padding.htm: Added. * platform/chromium-linux/fast/repaint/scroll-inside-table-cell-expected.png: * platform/chromium-linux/fast/repaint/scroll-relative-table-inside-table-cell-expected.png: * platform/chromium-linux/tables/mozilla/bugs/bug2123-expected.png: * platform/chromium-linux/tables/mozilla/bugs/bug2509-expected.png: * platform/chromium-linux/tables/mozilla/bugs/bug34176-expected.png: * platform/chromium-linux/tables/mozilla/bugs/bug44505-expected.png: * platform/chromium-linux/tables/mozilla/bugs/bug44505-expected.txt: Progression against FF is most evident in this test. The table with the black 'div' cell content is proportioned the same as mozilla now. * platform/chromium-linux/tables/mozilla_expected_failures/bugs/bug59252-expected.png: * platform/chromium-linux/tables/mozilla_expected_failures/bugs/bug7243-expected.png: * platform/chromium-win/fast/table/cell-pref-width-invalidation-expected.txt: * platform/chromium-win/tables/mozilla/bugs/bug2123-expected.txt: * platform/chromium-win/tables/mozilla/bugs/bug2509-expected.txt: * platform/chromium-win/tables/mozilla/bugs/bug34176-expected.txt: * platform/chromium-win/tables/mozilla_expected_failures/bugs/bug59252-expected.txt: * platform/chromium-win/tables/mozilla_expected_failures/bugs/bug7243-expected.txt: * platform/chromium/test_expectations.txt: Update expectations until rebaseline * platform/gtk/test_expectations.txt: ditto * platform/mac/Skipped: Skip until rebaselined * platform/qt/test_expectations.txt: Update expectations until rebaseline * platform/win/Skipped: Skip until rebaselined * tables/hittesting/filltable-stress.html: Adjusted to traverse the cells for hit-testing given their new dimensions. Canonical link: https://commits.webkit.org/99234@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@111742 268f45cc-cd09-0410-ab3c-d52691b4dbfc
- Loading branch information
Showing
with
342 additions
and 62 deletions.
- +36 −0 LayoutTests/ChangeLog
- +47 −0 LayoutTests/css2.1/20110323/fixed-table-layout-006-expected.html
- +42 −0 LayoutTests/css2.1/20110323/fixed-table-layout-006.htm
- +1 −1 LayoutTests/css2.1/20110323/fixed-table-layout-013-expected.html
- +43 −0 LayoutTests/fast/css/fixed-table-layout-cell-padding-expected.html
- +39 −0 LayoutTests/fast/css/fixed-table-layout-cell-padding.htm
- BIN LayoutTests/platform/chromium-linux/fast/repaint/scroll-inside-table-cell-expected.png
- BIN ...utTests/platform/chromium-linux/fast/repaint/scroll-relative-table-inside-table-cell-expected.png
- BIN LayoutTests/platform/chromium-linux/tables/mozilla/bugs/bug2123-expected.png
- BIN LayoutTests/platform/chromium-linux/tables/mozilla/bugs/bug2509-expected.png
- BIN LayoutTests/platform/chromium-linux/tables/mozilla/bugs/bug34176-expected.png
- BIN LayoutTests/platform/chromium-linux/tables/mozilla/bugs/bug44505-expected.png
- +20 −20 LayoutTests/platform/chromium-linux/tables/mozilla/bugs/bug44505-expected.txt
- BIN LayoutTests/platform/chromium-linux/tables/mozilla_expected_failures/bugs/bug59252-expected.png
- BIN LayoutTests/platform/chromium-linux/tables/mozilla_expected_failures/bugs/bug7243-expected.png
- +4 −4 LayoutTests/platform/chromium-win/fast/table/cell-pref-width-invalidation-expected.txt
- +15 −15 LayoutTests/platform/chromium-win/tables/mozilla/bugs/bug2123-expected.txt
- +4 −4 LayoutTests/platform/chromium-win/tables/mozilla/bugs/bug2509-expected.txt
- +2 −2 LayoutTests/platform/chromium-win/tables/mozilla/bugs/bug34176-expected.txt
- +10 −10 LayoutTests/platform/chromium-win/tables/mozilla_expected_failures/bugs/bug59252-expected.txt
- +3 −3 LayoutTests/platform/chromium-win/tables/mozilla_expected_failures/bugs/bug7243-expected.txt
- +11 −0 LayoutTests/platform/chromium/test_expectations.txt
- +10 −0 LayoutTests/platform/gtk/test_expectations.txt
- +11 −0 LayoutTests/platform/mac/Skipped
- +8 −0 LayoutTests/platform/qt/test_expectations.txt
- +11 −0 LayoutTests/platform/win/Skipped
- +2 −2 LayoutTests/tables/hittesting/filltable-stress.html
- +20 −0 Source/WebCore/ChangeLog
- +3 −1 Source/WebCore/rendering/FixedTableLayout.cpp
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| @@ -0,0 +1,47 @@ | ||
| <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd"> | ||
| <html> | ||
| <head> | ||
| <title>CSS Test: Reference Result</title> | ||
| <style type="text/css"> | ||
| table | ||
| { | ||
| border-collapse: separate; | ||
| border-spacing: 0; | ||
| } | ||
| td | ||
| { | ||
| height: 100px; | ||
| padding: 0; | ||
| width: 10px; | ||
| } | ||
| #blue | ||
| { | ||
| background: blue; | ||
| } | ||
| #orange | ||
| { | ||
| background: orange; | ||
| } | ||
| </style> | ||
| </head> | ||
| <body> | ||
| <p>Test passes if all of the blue lines below appear to have the same width.</p> | ||
| <table> | ||
| <tr> | ||
| <td id="blue"></td> | ||
| <td id="orange"></td> | ||
| <td id="blue"></td> | ||
| <td id="orange"></td> | ||
| <td id="blue"></td> | ||
| <td id="orange"></td> | ||
| <td id="blue"></td> | ||
| <td id="orange"></td> | ||
| <td id="blue"></td> | ||
| <td id="orange"></td> | ||
| <td id="blue"></td> | ||
| <td id="orange"></td> | ||
| <td id="blue"></td> | ||
| </tr> | ||
| </table> | ||
| </body> | ||
| </html> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| @@ -0,0 +1,42 @@ | ||
| <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd"> | ||
| <html> | ||
| <head> | ||
| <title>CSS Test: Remaining table width is divided evenly among non auto-sized columns (minus borders and cell spacing)</title> | ||
| <link rel="author" title="Microsoft" href="http://www.microsoft.com/"> | ||
| <link rel="help" href="http://www.w3.org/TR/CSS21/tables.html#fixed-table-layout"> | ||
| <meta name="flags" content=""> | ||
| <meta name="assert" content="Any remaining horizontal table space is divided evenly among columns which do not have specified widths (minus borders and cell spacing)."> | ||
| <style type="text/css"> | ||
| table | ||
| { | ||
| background: blue; | ||
| border-collapse: separate; | ||
| border-spacing: 10px 0; | ||
| table-layout: fixed; | ||
| width: 130px; | ||
| } | ||
| td | ||
| { | ||
| background: blue; | ||
| border-left: 10px solid orange; | ||
| border-right: 10px solid orange; | ||
| height: 100px; | ||
| padding: 0; | ||
| } | ||
| #specified | ||
| { | ||
| width: 10px; | ||
| } | ||
| </style> | ||
| </head> | ||
| <body> | ||
| <p>Test passes if all of the blue lines below appear to have the same width.</p> | ||
| <table> | ||
| <tr> | ||
| <td id="specified"></td> | ||
| <td></td> | ||
| <td></td> | ||
| </tr> | ||
| </table> | ||
| </body> | ||
| </html> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| @@ -12,7 +12,7 @@ | ||
| #cell | ||
| { | ||
| background: black; | ||
| width: 98px; | ||
| } | ||
| #div1 | ||
| { | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| @@ -0,0 +1,43 @@ | ||
| <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd"> | ||
| <html> | ||
| <head> | ||
| <title>CSS Test: Reference Result</title> | ||
| <style type="text/css"> | ||
| table | ||
| { | ||
| table-layout: fixed; | ||
| border-collapse: separate; | ||
| border-spacing: 0; | ||
| } | ||
| td | ||
| { | ||
| height: 100px; | ||
| padding: 0; | ||
| } | ||
| #blue | ||
| { | ||
| background: blue; | ||
| width: 30px; | ||
| } | ||
| #orange | ||
| { | ||
| background: orange; | ||
| width: 10px; | ||
| } | ||
| </style> | ||
| </head> | ||
| <body> | ||
| <p>Test passes if all of the blue lines below appear to have the same width.</p> | ||
| <table> | ||
| <tr> | ||
| <td id="orange"></td> | ||
| <td id="blue"></td> | ||
| <td id="orange"></td> | ||
| <td id="blue"></td> | ||
| <td id="orange"></td> | ||
| <td id="blue"></td> | ||
| <td id="orange"></td> | ||
| </tr> | ||
| </table> | ||
| </body> | ||
| </html> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| @@ -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: Cell padding is included in column width</title> | ||
| <style type="text/css"> | ||
| table | ||
| { | ||
| background: orange; | ||
| border-collapse: separate; | ||
| border-spacing: 10px 0; | ||
| table-layout: fixed; | ||
| width: 130px; | ||
| } | ||
| td | ||
| { | ||
| background: blue; | ||
| height: 100px; | ||
| padding-left: 10px; | ||
| padding-right: 10px; | ||
| padding-top: 0; | ||
| padding-bottom: 0; | ||
| } | ||
| #specified | ||
| { | ||
| width: 10px; | ||
| } | ||
| </style> | ||
| </head> | ||
| <body> | ||
| <p>Test passes if all of the blue lines below appear to have the same width.</p> | ||
| <table> | ||
| <tr> | ||
| <td id="specified"></td> | ||
| <td></td> | ||
| <td></td> | ||
| </tr> | ||
| </table> | ||
| </body> | ||
| </html> |
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.