| Index: LayoutTests/platform/linux/tables/mozilla_expected_failures/core/conflicts-expected.txt
|
| diff --git a/LayoutTests/platform/linux/tables/mozilla_expected_failures/core/conflicts-expected.txt b/LayoutTests/platform/linux/tables/mozilla_expected_failures/core/conflicts-expected.txt
|
| index 82c15deb8ceb34de2925a37dd5aa18555461dcef..6731e45e5033ff946369ed2e7cda9da9d9d9ee0a 100644
|
| --- a/LayoutTests/platform/linux/tables/mozilla_expected_failures/core/conflicts-expected.txt
|
| +++ b/LayoutTests/platform/linux/tables/mozilla_expected_failures/core/conflicts-expected.txt
|
| @@ -17,7 +17,7 @@ layer at (0,0) size 785x1418 backgroundClip at (0,0) size 785x600 clip at (0,0)
|
| text run at (6,6) width 20: "foo"
|
| RenderBlock {HR} at (0,86) size 402x2 [border: (1px inset #EEEEEE)]
|
| RenderBlock (anonymous) at (0,96) size 769x40
|
| - RenderBR {BR} at (0,0) size 0x19
|
| + LayoutBR {BR} at (0,0) size 0x19
|
| RenderText {#text} at (0,20) size 325x19
|
| text run at (0,20) width 325: "fixed table - percent cell wins over fix cell (and in IE5)"
|
| LayoutTable {TABLE} at (0,136) size 500x56 [border: (1px outset #808080)]
|
| @@ -37,7 +37,7 @@ layer at (0,0) size 785x1418 backgroundClip at (0,0) size 785x600 clip at (0,0)
|
| RenderText {#text} at (2,2) size 26x19
|
| text run at (2,2) width 26: "auto"
|
| RenderBlock (anonymous) at (0,192) size 769x40
|
| - RenderBR {BR} at (0,0) size 0x19
|
| + LayoutBR {BR} at (0,0) size 0x19
|
| RenderText {#text} at (0,20) size 325x19
|
| text run at (0,20) width 325: "fixed table - percent cell wins over fix cell (and in IE5)"
|
| LayoutTable {TABLE} at (0,232) size 300x56 [border: (1px outset #808080)]
|
| @@ -57,7 +57,7 @@ layer at (0,0) size 785x1418 backgroundClip at (0,0) size 785x600 clip at (0,0)
|
| RenderText {#text} at (2,2) size 26x19
|
| text run at (2,2) width 26: "auto"
|
| RenderBlock (anonymous) at (0,288) size 769x40
|
| - RenderBR {BR} at (0,0) size 0x19
|
| + LayoutBR {BR} at (0,0) size 0x19
|
| RenderText {#text} at (0,20) size 325x19
|
| text run at (0,20) width 325: "fixed table - percent cell wins over fix cell (and in IE5)"
|
| LayoutTable {TABLE} at (0,328) size 500x56 [border: (1px outset #808080)]
|
| @@ -79,7 +79,7 @@ layer at (0,0) size 785x1418 backgroundClip at (0,0) size 785x600 clip at (0,0)
|
| RenderText {#text} at (2,2) size 26x19
|
| text run at (2,2) width 26: "auto"
|
| RenderBlock (anonymous) at (0,384) size 769x40
|
| - RenderBR {BR} at (0,0) size 0x19
|
| + LayoutBR {BR} at (0,0) size 0x19
|
| RenderText {#text} at (0,20) size 325x19
|
| text run at (0,20) width 325: "fixed table - percent cell wins over fix cell (and in IE5)"
|
| LayoutTable {TABLE} at (0,424) size 500x56 [border: (1px outset #808080)]
|
| @@ -101,7 +101,7 @@ layer at (0,0) size 785x1418 backgroundClip at (0,0) size 785x600 clip at (0,0)
|
| RenderText {#text} at (2,2) size 26x19
|
| text run at (2,2) width 26: "auto"
|
| RenderBlock (anonymous) at (0,480) size 769x40
|
| - RenderBR {BR} at (0,0) size 0x19
|
| + LayoutBR {BR} at (0,0) size 0x19
|
| RenderText {#text} at (0,20) size 325x19
|
| text run at (0,20) width 325: "fixed table - percent cell wins over fix cell (and in IE5)"
|
| LayoutTable {TABLE} at (0,520) size 500x56 [border: (1px outset #808080)]
|
| @@ -123,7 +123,7 @@ layer at (0,0) size 785x1418 backgroundClip at (0,0) size 785x600 clip at (0,0)
|
| RenderText {#text} at (2,2) size 26x19
|
| text run at (2,2) width 26: "auto"
|
| RenderBlock (anonymous) at (0,576) size 769x40
|
| - RenderBR {BR} at (0,0) size 0x19
|
| + LayoutBR {BR} at (0,0) size 0x19
|
| RenderText {#text} at (0,20) size 325x19
|
| text run at (0,20) width 325: "fixed table - percent cell wins over fix cell (and in IE5)"
|
| LayoutTable {TABLE} at (0,616) size 500x56 [border: (1px outset #808080)]
|
| @@ -145,7 +145,7 @@ layer at (0,0) size 785x1418 backgroundClip at (0,0) size 785x600 clip at (0,0)
|
| RenderText {#text} at (2,2) size 26x19
|
| text run at (2,2) width 26: "auto"
|
| RenderBlock (anonymous) at (0,672) size 769x40
|
| - RenderBR {BR} at (0,0) size 0x19
|
| + LayoutBR {BR} at (0,0) size 0x19
|
| RenderText {#text} at (0,20) size 285x19
|
| text run at (0,20) width 285: "fixed table - % wins over fixed even on colspan"
|
| LayoutTable {TABLE} at (0,712) size 300x56 [border: (1px outset #808080)]
|
| @@ -165,7 +165,7 @@ layer at (0,0) size 785x1418 backgroundClip at (0,0) size 785x600 clip at (0,0)
|
| RenderText {#text} at (2,2) size 26x19
|
| text run at (2,2) width 26: "auto"
|
| RenderBlock (anonymous) at (0,768) size 769x40
|
| - RenderBR {BR} at (0,0) size 0x19
|
| + LayoutBR {BR} at (0,0) size 0x19
|
| RenderText {#text} at (0,20) size 285x19
|
| text run at (0,20) width 285: "fixed table - % wins over fixed even on colspan"
|
| LayoutTable {TABLE} at (0,808) size 300x56 [border: (1px outset #808080)]
|
| @@ -185,7 +185,7 @@ layer at (0,0) size 785x1418 backgroundClip at (0,0) size 785x600 clip at (0,0)
|
| RenderText {#text} at (2,2) size 20x19
|
| text run at (2,2) width 20: "bar"
|
| RenderBlock (anonymous) at (0,864) size 769x40
|
| - RenderBR {BR} at (0,0) size 0x19
|
| + LayoutBR {BR} at (0,0) size 0x19
|
| RenderText {#text} at (0,20) size 350x19
|
| text run at (0,20) width 350: "auto table - percent colspan wins over fixed colspan XXX"
|
| LayoutTable {TABLE} at (0,904) size 769x56 [border: (1px outset #808080)]
|
| @@ -205,7 +205,7 @@ layer at (0,0) size 785x1418 backgroundClip at (0,0) size 785x600 clip at (0,0)
|
| RenderText {#text} at (2,2) size 26x19
|
| text run at (2,2) width 26: "auto"
|
| RenderBlock (anonymous) at (0,960) size 769x40
|
| - RenderBR {BR} at (0,0) size 0x19
|
| + LayoutBR {BR} at (0,0) size 0x19
|
| RenderText {#text} at (0,20) size 313x19
|
| text run at (0,20) width 313: "auto table - percent colspan wins over fixed colspan"
|
| LayoutTable {TABLE} at (0,1000) size 769x82 [border: (1px outset #808080)]
|
| @@ -235,7 +235,7 @@ layer at (0,0) size 785x1418 backgroundClip at (0,0) size 785x600 clip at (0,0)
|
| RenderText {#text} at (2,2) size 26x19
|
| text run at (2,2) width 26: "auto"
|
| RenderBlock (anonymous) at (0,1082) size 769x40
|
| - RenderBR {BR} at (0,0) size 0x19
|
| + LayoutBR {BR} at (0,0) size 0x19
|
| RenderText {#text} at (0,20) size 313x19
|
| text run at (0,20) width 313: "auto table - percent colspan wins over fixed colspan"
|
| LayoutTable {TABLE} at (0,1122) size 769x82 [border: (1px outset #808080)]
|
| @@ -265,7 +265,7 @@ layer at (0,0) size 785x1418 backgroundClip at (0,0) size 785x600 clip at (0,0)
|
| RenderText {#text} at (2,2) size 26x19
|
| text run at (2,2) width 26: "auto"
|
| RenderBlock (anonymous) at (0,1204) size 769x40
|
| - RenderBR {BR} at (0,0) size 0x19
|
| + LayoutBR {BR} at (0,0) size 0x19
|
| RenderText {#text} at (0,20) size 313x19
|
| text run at (0,20) width 313: "auto table - percent colspan wins over fixed colspan"
|
| LayoutTable {TABLE} at (0,1244) size 769x82 [border: (1px outset #808080)]
|
| @@ -295,7 +295,7 @@ layer at (0,0) size 785x1418 backgroundClip at (0,0) size 785x600 clip at (0,0)
|
| RenderText {#text} at (2,2) size 26x19
|
| text run at (2,2) width 26: "auto"
|
| RenderBlock (anonymous) at (0,1326) size 769x40
|
| - RenderBR {BR} at (0,0) size 0x19
|
| + LayoutBR {BR} at (0,0) size 0x19
|
| RenderText {#text} at (0,20) size 356x19
|
| text run at (0,20) width 356: "percent cell/col percentage conflict goes to cell (and in IE5)"
|
| LayoutTable {TABLE} at (0,1366) size 500x36 [border: (1px outset #808080)]
|
|
|