Attachment #142763 for bug #85652

View Details Raw Unified Return to Bug 85652

| Differences between



2012-05-18  Robert Hogan  <robert@webkit.org>

        CSS 2.1 failure: table-height-algorithm-012 fails
        https://bugs.webkit.org/show_bug.cgi?id=85652

        Reviewed by NOBODY (OOPS!).

        Test: css2.1/20110323/table-height-algorithm-012.htm

        A spanning cell with Vertical-align set to 'baseline' should align the cell's content baseline 
        (which is the bottom of the first line of text or in-flow content) with the baseline of the first of the rows it spans.

        * rendering/RenderTableSection.cpp:
        (WebCore::RenderTableSection::layoutRows):

2012-05-18  Tony Chang  <tony@chromium.org>

        remove the CSS_GRID_LAYOUT compiler define, but default grid layout to off

Lines 630-636 void RenderTableSection::layoutRows() a/Source/WebCore/rendering/RenderTableSection.cpp_sec1
- a/Source/WebCore/rendering/RenderTableSection.cpp -1 / +1 lines
630	case BASELINE: {	630	case BASELINE: {
631	LayoutUnit b = cell->cellBaselinePosition();	631	LayoutUnit b = cell->cellBaselinePosition();
632	if (b > cell->borderBefore() + cell->paddingBefore())	632	if (b > cell->borderBefore() + cell->paddingBefore())
633	intrinsicPaddingBefore = getBaseline(r) - (b - oldIntrinsicPaddingBefore);	633	intrinsicPaddingBefore = getBaseline(cell->rowIndex()) - (b - oldIntrinsicPaddingBefore);
634	break;	634	break;
635	}	635	}
636	case TOP:	636	case TOP:



2012-05-18  Robert Hogan  <robert@webkit.org>

        CSS 2.1 failure: table-height-algorithm-012 fails
        https://bugs.webkit.org/show_bug.cgi?id=85652

        Reviewed by NOBODY (OOPS!).

        * css2.1/20110323/table-height-algorithm-012.htm: Added.
        * platform/chromium-linux-x86/css2.1/20110323/table-height-algorithm-012-expected.png: Added.
        * platform/chromium-linux-x86/css2.1/20110323/table-height-algorithm-012-expected.txt: Added.

2012-05-18  Tony Chang  <tony@chromium.org>

        remove the CSS_GRID_LAYOUT compiler define, but default grid layout to off



<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
<html>
    <head>
        <title>CSS Test: Vertical-align set to 'baseline' with a spanning cell</title>
        <link rel="author" title="Microsoft" href="http://www.microsoft.com/">
        <link rel="help" href="http://www.w3.org/TR/CSS21/tables.html#height-layout">
        <meta name="flags" content="">
        <meta name="assert" content="A spanning cell with Vertical-align set to 'baseline' aligns the cell's content baseline (which is the bottom of the first line of text or in-flow content) with the baseline of the first of the rows it spans.">
        <style type="text/css">
            td
            {
                vertical-align: baseline;
            }
            #small
            {
                font-size: small;
            }
            #large
            {
                font-size: large;
            }
        </style>
    </head>
    <body>
        <p>Test passes if the bottom of "Filler Text" below is aligned.</p>
        <table>
            <tr>
                <td>
                    <div id="small">Filler Text</div>
                </td>
                <td rowspan="2" colspan="2">
                    <div id="large">Filler Text</div>
                </td>
            </tr>
            <tr>
                <td></td>
            </tr>
        </table>
    </body>
</html>



layer at (0,0) size 800x600
  RenderView at (0,0) size 800x600
layer at (0,0) size 800x87
  RenderBlock {HTML} at (0,0) size 800x87
    RenderBody {BODY} at (8,16) size 784x63
      RenderBlock {P} at (0,0) size 784x20
        RenderText {#text} at (0,0) size 345x19
          text run at (0,0) width 345: "Test passes if the bottom of \"Filler Text\" below is aligned."
      RenderTable {TABLE} at (0,36) size 136x27
        RenderTableSection {TBODY} at (0,0) size 136x27
          RenderTableRow {TR} at (0,2) size 136x18
            RenderTableCell {TD} at (2,2) size 54x18 [r=0 c=0 rs=1 cs=1]
              RenderBlock {DIV} at (1,1) size 52x16
                RenderText {#text} at (0,0) size 52x15
                  text run at (0,0) width 52: "Filler Text"
            RenderTableCell {TD} at (58,-2) size 76x23 [r=0 c=1 rs=2 cs=2]
              RenderBlock {DIV} at (1,1) size 74x21
                RenderText {#text} at (0,0) size 74x20
                  text run at (0,0) width 74: "Filler Text"
          RenderTableRow {TR} at (0,22) size 136x3
            RenderTableCell {TD} at (2,22) size 54x2 [r=1 c=0 rs=1 cs=1]

Return to Bug 85652

Lines 1-3 a/Source/WebCore/ChangeLog_sec1
- a/Source/WebCore/ChangeLog +15 lines
		1	2012-05-18 Robert Hogan <robert@webkit.org>
		2
		3	CSS 2.1 failure: table-height-algorithm-012 fails
		4	https://bugs.webkit.org/show_bug.cgi?id=85652
		5
		6	Reviewed by NOBODY (OOPS!).
		7
		8	Test: css2.1/20110323/table-height-algorithm-012.htm
		9
		10	A spanning cell with Vertical-align set to 'baseline' should align the cell's content baseline
		11	(which is the bottom of the first line of text or in-flow content) with the baseline of the first of the rows it spans.
		12
		13	* rendering/RenderTableSection.cpp:
		14	(WebCore::RenderTableSection::layoutRows):
		15
1	2012-05-18 Tony Chang <tony@chromium.org>	16	2012-05-18 Tony Chang <tony@chromium.org>
2		17
3	remove the CSS_GRID_LAYOUT compiler define, but default grid layout to off	18	remove the CSS_GRID_LAYOUT compiler define, but default grid layout to off

Lines 1-3 a/LayoutTests/ChangeLog_sec1
- a/LayoutTests/ChangeLog +11 lines
		1	2012-05-18 Robert Hogan <robert@webkit.org>
		2
		3	CSS 2.1 failure: table-height-algorithm-012 fails
		4	https://bugs.webkit.org/show_bug.cgi?id=85652
		5
		6	Reviewed by NOBODY (OOPS!).
		7
		8	* css2.1/20110323/table-height-algorithm-012.htm: Added.
		9	* platform/chromium-linux-x86/css2.1/20110323/table-height-algorithm-012-expected.png: Added.
		10	* platform/chromium-linux-x86/css2.1/20110323/table-height-algorithm-012-expected.txt: Added.
		11
1	2012-05-18 Tony Chang <tony@chromium.org>	12	2012-05-18 Tony Chang <tony@chromium.org>
2		13
3	remove the CSS_GRID_LAYOUT compiler define, but default grid layout to off	14	remove the CSS_GRID_LAYOUT compiler define, but default grid layout to off

Line 0 a/LayoutTests/css2.1/20110323/table-height-algorithm-012.htm_sec1
- a/LayoutTests/css2.1/20110323/table-height-algorithm-012.htm +40 lines
	1	<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
	2	<html>
	3	<head>
	4	<title>CSS Test: Vertical-align set to 'baseline' with a spanning cell</title>
	5	<link rel="author" title="Microsoft" href="http://www.microsoft.com/">
	6	<link rel="help" href="http://www.w3.org/TR/CSS21/tables.html#height-layout">
	7	<meta name="flags" content="">
	8	<meta name="assert" content="A spanning cell with Vertical-align set to 'baseline' aligns the cell's content baseline (which is the bottom of the first line of text or in-flow content) with the baseline of the first of the rows it spans.">
	9	<style type="text/css">
	10	td
	11	{
	12	vertical-align: baseline;
	13	}
	14	#small
	15	{
	16	font-size: small;
	17	}
	18	#large
	19	{
	20	font-size: large;
	21	}
	22	</style>
	23	</head>
	24	<body>
	25	<p>Test passes if the bottom of "Filler Text" below is aligned.</p>
	26	<table>
	27	<tr>
	28	<td>
	29	<div id="small">Filler Text</div>
	30	</td>
	31	<td rowspan="2" colspan="2">
	32	<div id="large">Filler Text</div>
	33	</td>
	34	</tr>
	35	<tr>
	36	<td></td>
	37	</tr>
	38	</table>
	39	</body>
	40	</html>

Line 0 a/LayoutTests/platform/chromium-linux-x86/css2.1/20110323/table-height-algorithm-012-expected.txt_sec1
- a/LayoutTests/platform/chromium-linux-x86/css2.1/20110323/table-height-algorithm-012-expected.txt +21 lines
	1	layer at (0,0) size 800x600
	2	RenderView at (0,0) size 800x600
	3	layer at (0,0) size 800x87
	4	RenderBlock {HTML} at (0,0) size 800x87
	5	RenderBody {BODY} at (8,16) size 784x63
	6	RenderBlock {P} at (0,0) size 784x20
	7	RenderText {#text} at (0,0) size 345x19
	8	text run at (0,0) width 345: "Test passes if the bottom of \"Filler Text\" below is aligned."
	9	RenderTable {TABLE} at (0,36) size 136x27
	10	RenderTableSection {TBODY} at (0,0) size 136x27
	11	RenderTableRow {TR} at (0,2) size 136x18
	12	RenderTableCell {TD} at (2,2) size 54x18 [r=0 c=0 rs=1 cs=1]
	13	RenderBlock {DIV} at (1,1) size 52x16
	14	RenderText {#text} at (0,0) size 52x15
	15	text run at (0,0) width 52: "Filler Text"
	16	RenderTableCell {TD} at (58,-2) size 76x23 [r=0 c=1 rs=2 cs=2]
	17	RenderBlock {DIV} at (1,1) size 74x21
	18	RenderText {#text} at (0,0) size 74x20
	19	text run at (0,0) width 74: "Filler Text"
	20	RenderTableRow {TR} at (0,22) size 136x3
	21	RenderTableCell {TD} at (2,22) size 54x2 [r=1 c=0 rs=1 cs=1]