Changeset 117477 in webkit


Ignore:
Timestamp:
May 17, 2012 12:07:57 PM (12 years ago)
Author:
robert@webkit.org
Message:

CSS 2.1 failure: table-height-algorithm-023 and -024 fail
https://bugs.webkit.org/show_bug.cgi?id=85405

Reviewed by Eric Seidel.

Source/WebCore:

Treat vertical-align: [length] the same as vertical-align: baseline.

Tests: css2.1/20110323/table-height-algorithm-023.htm

css2.1/20110323/table-height-algorithm-024.htm
fast/table/mozilla-bug10296-vertical-align-1.html
fast/table/mozilla-bug10296-vertical-align-2.html

  • rendering/RenderTableSection.cpp:

(WebCore::RenderTableSection::calcRowLogicalHeight):
(WebCore::RenderTableSection::layoutRows):

LayoutTests:

  • css2.1/20110323/table-height-algorithm-023.htm: Added.
  • css2.1/20110323/table-height-algorithm-024.htm: Added.

Tests from the CSS test suite.

  • fast/table/mozilla-bug10296-vertical-align-1.html: Added.
  • fast/table/mozilla-bug10296-vertical-align-2.html: Added.

I split out the part of bug10296-1.html that gets rebaselined here so that the new results
are visible. I also changed the text so that the expected result is less mysterious.

  • platform/chromium-linux-x86/css2.1/20110323/table-height-algorithm-023-expected.png: Added.
  • platform/chromium-linux-x86/css2.1/20110323/table-height-algorithm-023-expected.txt: Added.
  • platform/chromium-linux-x86/css2.1/20110323/table-height-algorithm-024-expected.png: Added.
  • platform/chromium-linux-x86/css2.1/20110323/table-height-algorithm-024-expected.txt: Added.
  • platform/chromium-linux-x86/fast/table/mozilla-bug10296-vertical-align-1-expected.png: Added.
  • platform/chromium-linux-x86/fast/table/mozilla-bug10296-vertical-align-1-expected.txt: Added.
  • platform/chromium-linux-x86/fast/table/mozilla-bug10296-vertical-align-2-expected.png: Added.
  • platform/chromium-linux-x86/fast/table/mozilla-bug10296-vertical-align-2-expected.txt: Added.
  • platform/chromium-win/tables/mozilla/bugs/bug10296-1-expected.txt:
Location:
trunk
Files:
13 added
9 edited

Legend:

Unmodified
Added
Removed
  • trunk/LayoutTests/ChangeLog

    r117475 r117477  
     12012-05-02  Robert Hogan  <robert@webkit.org>
     2
     3        CSS 2.1 failure: table-height-algorithm-023 and -024 fail
     4        https://bugs.webkit.org/show_bug.cgi?id=85405
     5
     6        Reviewed by Eric Seidel.
     7
     8        * css2.1/20110323/table-height-algorithm-023.htm: Added.
     9        * css2.1/20110323/table-height-algorithm-024.htm: Added.
     10            Tests from the CSS test suite.
     11        * fast/table/mozilla-bug10296-vertical-align-1.html: Added.
     12        * fast/table/mozilla-bug10296-vertical-align-2.html: Added.
     13            I split out the part of bug10296-1.html that gets rebaselined here so that the new results
     14            are visible. I also changed the text so that the expected result is less mysterious.
     15
     16        * platform/chromium-linux-x86/css2.1/20110323/table-height-algorithm-023-expected.png: Added.
     17        * platform/chromium-linux-x86/css2.1/20110323/table-height-algorithm-023-expected.txt: Added.
     18        * platform/chromium-linux-x86/css2.1/20110323/table-height-algorithm-024-expected.png: Added.
     19        * platform/chromium-linux-x86/css2.1/20110323/table-height-algorithm-024-expected.txt: Added.
     20        * platform/chromium-linux-x86/fast/table/mozilla-bug10296-vertical-align-1-expected.png: Added.
     21        * platform/chromium-linux-x86/fast/table/mozilla-bug10296-vertical-align-1-expected.txt: Added.
     22        * platform/chromium-linux-x86/fast/table/mozilla-bug10296-vertical-align-2-expected.png: Added.
     23        * platform/chromium-linux-x86/fast/table/mozilla-bug10296-vertical-align-2-expected.txt: Added.
     24        * platform/chromium-win/tables/mozilla/bugs/bug10296-1-expected.txt:
     25
    1262012-05-17  Raphael Kubo da Costa  <rakuco@webkit.org>
    227
  • trunk/LayoutTests/platform/chromium-win/tables/mozilla/bugs/bug10296-1-expected.txt

    r56259 r117477  
    947947              RenderText {#text} at (2,2) size 29x19
    948948                text run at (2,2) width 29: "Data"
    949             RenderTableCell {TD} at (356,2) size 94x61 [border: (1px solid #000000)] [r=0 c=5 rs=1 cs=1]
     949            RenderTableCell {TD} at (356,46) size 94x61 [border: (1px solid #000000)] [r=0 c=5 rs=1 cs=1]
    950950              RenderText {#text} at (2,3) size 90x55
    951951                text run at (2,3) width 90: "Data"
     
    962962              RenderText {#text} at (2,2) size 43x19
    963963                text run at (2,2) width 43: "Middle"
    964             RenderTableCell {TD} at (270,31) size 33x24 [border: (1px solid #000000)] [r=0 c=3 rs=1 cs=1]
     964            RenderTableCell {TD} at (270,75) size 33x24 [border: (1px solid #000000)] [r=0 c=3 rs=1 cs=1]
    965965              RenderText {#text} at (2,2) size 29x19
    966966                text run at (2,2) width 29: "Data"
     
    968968              RenderText {#text} at (2,2) size 45x19
    969969                text run at (2,2) width 45: "Bottom"
    970             RenderTableCell {TD} at (356,2) size 94x61 [border: (1px solid #000000)] [r=0 c=5 rs=1 cs=1]
     970            RenderTableCell {TD} at (356,46) size 94x61 [border: (1px solid #000000)] [r=0 c=5 rs=1 cs=1]
    971971              RenderText {#text} at (2,3) size 90x55
    972972                text run at (2,3) width 90: "Data"
     
    998998              RenderText {#text} at (2,2) size 25x19
    999999                text run at (2,2) width 25: "Top"
    1000             RenderTableCell {TD} at (33,2) size 94x61 [border: (1px solid #000000)] [r=0 c=1 rs=1 cs=1]
     1000            RenderTableCell {TD} at (33,46) size 94x61 [border: (1px solid #000000)] [r=0 c=1 rs=1 cs=1]
    10011001              RenderText {#text} at (2,3) size 90x55
    10021002                text run at (2,3) width 90: "Data"
     
    10041004              RenderText {#text} at (2,2) size 45x19
    10051005                text run at (2,2) width 45: "Bottom"
    1006             RenderTableCell {TD} at (180,2) size 33x24 [border: (1px solid #000000)] [r=0 c=3 rs=1 cs=1]
     1006            RenderTableCell {TD} at (180,75) size 33x24 [border: (1px solid #000000)] [r=0 c=3 rs=1 cs=1]
    10071007              RenderText {#text} at (2,2) size 29x19
    10081008                text run at (2,2) width 29: "Data"
  • trunk/LayoutTests/platform/efl/test_expectations.txt

    r117472 r117477  
    462462BUGWK86441 : fast/borders/border-antialiasing.html = IMAGE
    463463BUGWK86441 : fast/multicol/shadow-breaking.html = IMAGE
     464
     465// Requires rebaseline after https://bugs.webkit.org/show_bug.cgi?id=85405
     466BUGWK85405 : tables/mozilla/bugs/bug10296-1.html = TEXT
  • trunk/LayoutTests/platform/gtk/test_expectations.txt

    r117412 r117477  
    13341334BUGWK86441 : fast/multicol/shadow-breaking.html = IMAGE
    13351335
     1336// Requires rebaseline after https://bugs.webkit.org/show_bug.cgi?id=85405
     1337BUGWK85405 : tables/mozilla/bugs/bug10296-1.html = TEXT
     1338
    13361339//////////////////////////////////////////////////////////////////////////////////////////
    13371340// End of Tests failing
  • trunk/LayoutTests/platform/mac/test_expectations.txt

    r117412 r117477  
    231231// Needs rebaseline after bug 86441
    232232BUGWK86441 : fast/multicol/shadow-breaking.html = IMAGE
     233
     234// Requires rebaseline after https://bugs.webkit.org/show_bug.cgi?id=85405
     235BUGWK85405 : tables/mozilla/bugs/bug10296-1.html = TEXT
  • trunk/LayoutTests/platform/qt/test_expectations.txt

    r117412 r117477  
    7373BUGWK86441 : fast/borders/border-antialiasing.html = IMAGE
    7474BUGWK86441 : fast/multicol/shadow-breaking.html = IMAGE
     75
     76// Requires rebaseline after https://bugs.webkit.org/show_bug.cgi?id=85405
     77BUGWK85405 : tables/mozilla/bugs/bug10296-1.html = TEXT
  • trunk/LayoutTests/platform/win/Skipped

    r117394 r117477  
    17511751inspector/extensions/extensions-audits-content-script.html
    17521752
    1753 // Rebaseline required after https://bugs.webkit.org/show_bug.cgi?id=84167
     1753# Rebaseline required after https://bugs.webkit.org/show_bug.cgi?id=84167
    17541754editing/pasteboard/innerText-inline-table.html
    17551755editing/selection/iframe.html
     
    17601760fast/inline-block/001.html
    17611761tables/mozilla/bugs/bug2479-2.html
     1762
     1763# Requires rebaseline after https://bugs.webkit.org/show_bug.cgi?id=85405
     1764tables/mozilla/bugs/bug10296-1.html
  • trunk/Source/WebCore/ChangeLog

    r117476 r117477  
     12012-05-02  Robert Hogan  <robert@webkit.org>
     2
     3        CSS 2.1 failure: table-height-algorithm-023 and -024 fail
     4        https://bugs.webkit.org/show_bug.cgi?id=85405
     5
     6        Reviewed by Eric Seidel.
     7
     8        Treat vertical-align: [length] the same as vertical-align: baseline.
     9
     10        Tests: css2.1/20110323/table-height-algorithm-023.htm
     11               css2.1/20110323/table-height-algorithm-024.htm
     12               fast/table/mozilla-bug10296-vertical-align-1.html
     13               fast/table/mozilla-bug10296-vertical-align-2.html
     14
     15        * rendering/RenderTableSection.cpp:
     16        (WebCore::RenderTableSection::calcRowLogicalHeight):
     17        (WebCore::RenderTableSection::layoutRows):
     18
    1192012-05-17  Emil A Eklund  <eae@chromium.org>
    220
  • trunk/Source/WebCore/rendering/RenderTableSection.cpp

    r117388 r117477  
    371371            // find out the baseline
    372372            EVerticalAlign va = cell->style()->verticalAlign();
    373             if (va == BASELINE || va == TEXT_BOTTOM || va == TEXT_TOP || va == SUPER || va == SUB) {
     373            if (va == BASELINE || va == TEXT_BOTTOM || va == TEXT_TOP || va == SUPER || va == SUB || va == LENGTH) {
    374374                LayoutUnit baselinePosition = cell->cellBaselinePosition();
    375375                if (baselinePosition > cell->borderBefore() + cell->paddingBefore()) {
     
    610610                // If the baseline moved, we may have to update the data for our row. Find out the new baseline.
    611611                EVerticalAlign va = cell->style()->verticalAlign();
    612                 if (va == BASELINE || va == TEXT_BOTTOM || va == TEXT_TOP || va == SUPER || va == SUB) {
     612                if (va == BASELINE || va == TEXT_BOTTOM || va == TEXT_TOP || va == SUPER || va == SUB || va == LENGTH) {
    613613                    LayoutUnit baseline = cell->cellBaselinePosition();
    614614                    if (baseline > cell->borderBefore() + cell->paddingBefore())
     
    627627                case TEXT_TOP:
    628628                case TEXT_BOTTOM:
     629                case LENGTH:
    629630                case BASELINE: {
    630631                    LayoutUnit b = cell->cellBaselinePosition();
Note: See TracChangeset for help on using the changeset viewer.