diff options
| author | victorw@chromium.org <victorw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-15 17:30:17 +0000 |
|---|---|---|
| committer | victorw@chromium.org <victorw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-15 17:30:17 +0000 |
| commit | 08b8f440a84673f70cdfbd52d3918c4a31d3ba90 (patch) | |
| tree | e83f9b78694562cb37afef8e123b0e1cdc9b8e78 | |
| parent | 96f139b81e8d561eceb896d72578fdfef6d0fa8e (diff) | |
| download | chromium_src-08b8f440a84673f70cdfbd52d3918c4a31d3ba90.zip chromium_src-08b8f440a84673f70cdfbd52d3918c4a31d3ba90.tar.gz chromium_src-08b8f440a84673f70cdfbd52d3918c4a31d3ba90.tar.bz2 | |
Rebaseline layout tests from webkit roll 49583
TBR=dglazkov
BUG=24851,24852,24855,24856
TEST=none
Review URL: http://codereview.chromium.org/271103
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29133 0039d316-1c4b-4281-b951-d872f2087c98
40 files changed, 391 insertions, 394 deletions
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/css1/font_properties/font-expected.txt b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/css1/font_properties/font-expected.txt index 1bd73c8..2ebdbdf 100644 --- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/css1/font_properties/font-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/css1/font_properties/font-expected.txt @@ -1,8 +1,8 @@ -layer at (0,0) size 785x4402 +layer at (0,0) size 785x4404 RenderView at (0,0) size 785x600 -layer at (0,0) size 785x4402 - RenderBlock {HTML} at (0,0) size 785x4402 - RenderBody {BODY} at (8,8) size 769x4386 [bgcolor=#CCCCCC] +layer at (0,0) size 785x4404 + RenderBlock {HTML} at (0,0) size 785x4404 + RenderBody {BODY} at (8,8) size 769x4388 [bgcolor=#CCCCCC] RenderBlock {P} at (0,0) size 769x16 RenderText {#text} at (0,0) size 274x15 text run at (0,0) width 274: "The style declarations which apply to the text below are:" @@ -107,9 +107,9 @@ layer at (0,0) size 785x4402 text run at (177,79) width 498: "Extra text is included for the purposes of testing this more" text run at (0,115) width 92: "effectively." RenderBlock {P} at (0,1592) size 769x50 - RenderText {#text} at (0,6) size 760x38 + RenderText {#text} at (0,6) size 757x38 text run at (0,6) width 305: "This element should be in a sans-serif font, with a weight of 400. " - text run at (305,6) width 455: "Its font-size should be 80% of 12px, or 9.6px, and its line-height shoud be 2.5 times that, or 24px." + text run at (305,6) width 452: "Its font-size should be 80% of 12px, or 10px, and its line-height shoud be 2.5 times that, or 25px." text run at (0,31) width 323: "Extra text is included for the purposes of testing this more effectively." RenderBlock {P} at (0,1660) size 769x270 RenderInline {SPAN} at (0,0) size 761x238 [bgcolor=#C0C0C0] @@ -121,18 +121,18 @@ layer at (0,0) size 785x4402 text run at (0,178) width 736: "has been set on an inline element and should therefore only cover the text, not the interline" text run at (0,232) width 64: "spacing." RenderText {#text} at (0,0) size 0x0 - RenderTable {TABLE} at (0,1948) size 769x2438 [border: (1px outset #808080)] - RenderTableSection {TBODY} at (1,1) size 767x2436 + RenderTable {TABLE} at (0,1948) size 769x2440 [border: (1px outset #808080)] + RenderTableSection {TBODY} at (1,1) size 767x2438 RenderTableRow {TR} at (0,0) size 767x28 RenderTableCell {TD} at (0,0) size 767x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] RenderInline {STRONG} at (0,0) size 159x19 RenderText {#text} at (4,4) size 159x19 text run at (4,4) width 159: "TABLE Testing Section" - RenderTableRow {TR} at (0,28) size 767x2408 - RenderTableCell {TD} at (0,1218) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] + RenderTableRow {TR} at (0,28) size 767x2410 + RenderTableCell {TD} at (0,1219) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] RenderText {#text} at (4,4) size 4x19 text run at (4,4) width 4: " " - RenderTableCell {TD} at (12,28) size 755x2408 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] + RenderTableCell {TD} at (12,28) size 755x2410 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] RenderBlock {P} at (4,4) size 747x40 RenderText {#text} at (0,0) size 738x39 text run at (0,0) width 531: "This element is unstyled, and should inherit a font-size of 12px from the BODY element. " @@ -211,13 +211,13 @@ layer at (0,0) size 785x4402 text run at (0,79) width 177: "element's font size). " text run at (177,79) width 498: "Extra text is included for the purposes of testing this more" text run at (0,115) width 92: "effectively." - RenderBlock {P} at (4,1884) size 747x64 - RenderText {#text} at (0,8) size 742x48 + RenderBlock {P} at (4,1884) size 747x66 + RenderText {#text} at (0,8) size 738x49 text run at (0,8) width 374: "This element should be in a sans-serif font, with a weight of 400. " - text run at (374,8) width 368: "Its font-size should be 80% of 12px, or 9.6px, and its line-height" - text run at (0,40) width 196: "shoud be 2.5 times that, or 24px. " - text run at (196,40) width 399: "Extra text is included for the purposes of testing this more effectively." - RenderBlock {P} at (4,1972) size 747x432 + text run at (374,8) width 364: "Its font-size should be 80% of 12px, or 10px, and its line-height" + text run at (0,41) width 196: "shoud be 2.5 times that, or 25px. " + text run at (196,41) width 399: "Extra text is included for the purposes of testing this more effectively." + RenderBlock {P} at (4,1974) size 747x432 RenderInline {SPAN} at (0,0) size 717x388 [bgcolor=#C0C0C0] RenderText {#text} at (0,22) size 717x388 text run at (0,22) width 702: "This element should be in a sans-serif font, italicized and small caps," diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/css2.1/t090501-c414-flt-ln-00-d-expected.checksum b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/css2.1/t090501-c414-flt-ln-00-d-expected.checksum index 27b7f1a..3ced0ba 100644 --- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/css2.1/t090501-c414-flt-ln-00-d-expected.checksum +++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/css2.1/t090501-c414-flt-ln-00-d-expected.checksum @@ -1 +1 @@ -82c076dc35cd5aadf832be00ee1f653b
\ No newline at end of file +a5c4d4e0c02a3a6cb53f3289acc48522
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/css2.1/t090501-c414-flt-ln-00-d-expected.png b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/css2.1/t090501-c414-flt-ln-00-d-expected.png Binary files differindex 17bf179..2fab402 100644 --- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/css2.1/t090501-c414-flt-ln-00-d-expected.png +++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/css2.1/t090501-c414-flt-ln-00-d-expected.png diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/css2.1/t090501-c414-flt-ln-01-d-g-expected.checksum b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/css2.1/t090501-c414-flt-ln-01-d-g-expected.checksum index a1bb212..d2197b2 100644 --- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/css2.1/t090501-c414-flt-ln-01-d-g-expected.checksum +++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/css2.1/t090501-c414-flt-ln-01-d-g-expected.checksum @@ -1 +1 @@ -7ba2678ff639f60b7779b32e50313216
\ No newline at end of file +88459f31246541f1908300d338d3eab0
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/css2.1/t090501-c414-flt-ln-01-d-g-expected.png b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/css2.1/t090501-c414-flt-ln-01-d-g-expected.png Binary files differindex a859732..b904389d 100644 --- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/css2.1/t090501-c414-flt-ln-01-d-g-expected.png +++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/css2.1/t090501-c414-flt-ln-01-d-g-expected.png diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/css2.1/t090501-c414-flt-ln-01-d-g-expected.txt b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/css2.1/t090501-c414-flt-ln-01-d-g-expected.txt index d321bf3..9e644d7 100644 --- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/css2.1/t090501-c414-flt-ln-01-d-g-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/css2.1/t090501-c414-flt-ln-01-d-g-expected.txt @@ -1,8 +1,8 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x470 - RenderBlock {HTML} at (0,0) size 800x470 - RenderBody {BODY} at (8,16) size 784x438 +layer at (0,0) size 800x486 + RenderBlock {HTML} at (0,0) size 800x486 + RenderBody {BODY} at (8,16) size 784x454 RenderBlock {P} at (0,0) size 784x60 [color=#000080] RenderText {#text} at (0,0) size 777x59 text run at (0,0) width 386: "The big coloured boxes should be level with the top of the small " @@ -11,54 +11,54 @@ layer at (0,0) size 800x470 text run at (36,20) width 368: "for the big box to fit on the small box's line, in which case the " text run at (404,20) width 373: "big box should be level with the bottom of the respective small" text run at (0,40) width 32: "box)." - RenderBlock {DIV} at (16,76) size 752x362 [color=#C0C0C0] [border: (5px solid #800080)] - RenderText {#text} at (133,21) size 444x19 - text run at (133,21) width 444: "dummy text dummy text dummy text dummy text dummy text dummy text " + RenderBlock {DIV} at (16,76) size 752x378 [color=#C0C0C0] [border: (5px solid #800080)] + RenderText {#text} at (133,22) size 444x19 + text run at (133,22) width 444: "dummy text dummy text dummy text dummy text dummy text dummy text " RenderInline {SPAN} at (0,0) size 19x25 [color=#FFFFFF] [bgcolor=#008080] [border: (3px solid #00FFFF)] - RenderText {#text} at (580,21) size 13x19 - text run at (580,21) width 13: "\x{21E6}" - RenderText {#text} at (596,21) size 4x19 - text run at (596,21) width 4: " " + RenderText {#text} at (580,22) size 13x19 + text run at (580,22) width 13: "\x{21E6}" + RenderText {#text} at (596,22) size 4x19 + text run at (596,22) width 4: " " RenderImage {IMG} at (21,21) size 112x112 [color=#FF0000] - RenderText {#text} at (600,21) size 585x39 - text run at (600,21) width 118: "dummy text dummy" - text run at (133,41) width 322: "text dummy text dummy text dummy text dummy text " + RenderText {#text} at (600,22) size 585x40 + text run at (600,22) width 118: "dummy text dummy" + text run at (133,43) width 322: "text dummy text dummy text dummy text dummy text " RenderInline {SPAN} at (0,0) size 19x25 [color=#FFFFFF] [bgcolor=#800080] [border: (3px solid #FF00FF)] - RenderText {#text} at (458,41) size 13x19 - text run at (458,41) width 13: "\x{21E8}" - RenderText {#text} at (474,41) size 4x19 - text run at (474,41) width 4: " " - RenderImage {IMG} at (619,41) size 112x112 [color=#FF0000] - RenderText {#text} at (478,41) size 710x299 - text run at (478,41) width 118: "dummy text dummy" - text run at (133,61) width 322: "text dummy text dummy text dummy text dummy text " - text run at (455,61) width 144: "dummy text dummy text" - text run at (133,81) width 296: "dummy text dummy text dummy text dummy text " - text run at (429,81) width 144: "dummy text dummy text" - text run at (133,101) width 296: "dummy text dummy text dummy text dummy text " - text run at (429,101) width 144: "dummy text dummy text" - text run at (133,121) width 296: "dummy text dummy text dummy text dummy text " - text run at (429,121) width 144: "dummy text dummy text" - text run at (21,141) width 296: "dummy text dummy text dummy text dummy text " - text run at (317,141) width 292: "dummy text dummy text dummy text dummy text" - text run at (21,161) width 148: "dummy text dummy text " - text run at (169,161) width 444: "dummy text dummy text dummy text dummy text dummy text dummy text " - text run at (613,161) width 118: "dummy text dummy" - text run at (21,181) width 322: "text dummy text dummy text dummy text dummy text " - text run at (343,181) width 366: "dummy text dummy text dummy text dummy text dummy text" - text run at (21,201) width 74: "dummy text " - text run at (95,201) width 444: "dummy text dummy text dummy text dummy text dummy text dummy text " - text run at (539,201) width 192: "dummy text dummy text dummy" - text run at (21,221) width 248: "text dummy text dummy text dummy text " - text run at (269,221) width 440: "dummy text dummy text dummy text dummy text dummy text dummy text" - text run at (21,241) width 444: "dummy text dummy text dummy text dummy text dummy text dummy text " - text run at (465,241) width 266: "dummy text dummy text dummy text dummy" - text run at (21,261) width 174: "text dummy text dummy text " - text run at (195,261) width 444: "dummy text dummy text dummy text dummy text dummy text dummy text " - text run at (639,261) width 70: "dummy text" - text run at (21,281) width 370: "dummy text dummy text dummy text dummy text dummy text " - text run at (391,281) width 340: "dummy text dummy text dummy text dummy text dummy" - text run at (21,301) width 100: "text dummy text " - text run at (121,301) width 444: "dummy text dummy text dummy text dummy text dummy text dummy text " - text run at (565,301) width 144: "dummy text dummy text" - text run at (21,321) width 292: "dummy text dummy text dummy text dummy text" + RenderText {#text} at (458,43) size 13x19 + text run at (458,43) width 13: "\x{21E8}" + RenderText {#text} at (474,43) size 4x19 + text run at (474,43) width 4: " " + RenderImage {IMG} at (619,42) size 112x112 [color=#FF0000] + RenderText {#text} at (478,43) size 710x313 + text run at (478,43) width 118: "dummy text dummy" + text run at (133,64) width 322: "text dummy text dummy text dummy text dummy text " + text run at (455,64) width 144: "dummy text dummy text" + text run at (133,85) width 296: "dummy text dummy text dummy text dummy text " + text run at (429,85) width 144: "dummy text dummy text" + text run at (133,106) width 296: "dummy text dummy text dummy text dummy text " + text run at (429,106) width 144: "dummy text dummy text" + text run at (133,127) width 296: "dummy text dummy text dummy text dummy text " + text run at (429,127) width 144: "dummy text dummy text" + text run at (21,148) width 296: "dummy text dummy text dummy text dummy text " + text run at (317,148) width 292: "dummy text dummy text dummy text dummy text" + text run at (21,169) width 148: "dummy text dummy text " + text run at (169,169) width 444: "dummy text dummy text dummy text dummy text dummy text dummy text " + text run at (613,169) width 118: "dummy text dummy" + text run at (21,190) width 322: "text dummy text dummy text dummy text dummy text " + text run at (343,190) width 366: "dummy text dummy text dummy text dummy text dummy text" + text run at (21,211) width 74: "dummy text " + text run at (95,211) width 444: "dummy text dummy text dummy text dummy text dummy text dummy text " + text run at (539,211) width 192: "dummy text dummy text dummy" + text run at (21,232) width 248: "text dummy text dummy text dummy text " + text run at (269,232) width 440: "dummy text dummy text dummy text dummy text dummy text dummy text" + text run at (21,253) width 444: "dummy text dummy text dummy text dummy text dummy text dummy text " + text run at (465,253) width 266: "dummy text dummy text dummy text dummy" + text run at (21,274) width 174: "text dummy text dummy text " + text run at (195,274) width 444: "dummy text dummy text dummy text dummy text dummy text dummy text " + text run at (639,274) width 70: "dummy text" + text run at (21,295) width 370: "dummy text dummy text dummy text dummy text dummy text " + text run at (391,295) width 340: "dummy text dummy text dummy text dummy text dummy" + text run at (21,316) width 100: "text dummy text " + text run at (121,316) width 444: "dummy text dummy text dummy text dummy text dummy text dummy text " + text run at (565,316) width 144: "dummy text dummy text" + text run at (21,337) width 292: "dummy text dummy text dummy text dummy text" diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/css2.1/t090501-c414-flt-ln-02-d-expected.checksum b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/css2.1/t090501-c414-flt-ln-02-d-expected.checksum index 4f76cde..c20dbe1 100644 --- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/css2.1/t090501-c414-flt-ln-02-d-expected.checksum +++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/css2.1/t090501-c414-flt-ln-02-d-expected.checksum @@ -1 +1 @@ -130ae61c816e923c8dbc72b307fdaac6
\ No newline at end of file +d0353547e98ff24df10f1178565a6516
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/css2.1/t090501-c414-flt-ln-02-d-expected.png b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/css2.1/t090501-c414-flt-ln-02-d-expected.png Binary files differindex 1ab7399..e999885 100644 --- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/css2.1/t090501-c414-flt-ln-02-d-expected.png +++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/css2.1/t090501-c414-flt-ln-02-d-expected.png diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/css2.1/t090501-c414-flt-ln-03-d-expected.checksum b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/css2.1/t090501-c414-flt-ln-03-d-expected.checksum index 8d5c40f..9baf1dc 100644 --- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/css2.1/t090501-c414-flt-ln-03-d-expected.checksum +++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/css2.1/t090501-c414-flt-ln-03-d-expected.checksum @@ -1 +1 @@ -6f1330e66c14d563ddc8c9cfdbc04bb9
\ No newline at end of file +6f61765bac3cc7fdb7b4be40b1ddd55d
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/css2.1/t090501-c414-flt-ln-03-d-expected.png b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/css2.1/t090501-c414-flt-ln-03-d-expected.png Binary files differindex 237a14a..7531b83c 100644 --- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/css2.1/t090501-c414-flt-ln-03-d-expected.png +++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/css2.1/t090501-c414-flt-ln-03-d-expected.png diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/svg/custom/svg-fonts-in-html-expected.checksum b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/svg/custom/svg-fonts-in-html-expected.checksum index 2ccaf1c..9a4382d 100644 --- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/svg/custom/svg-fonts-in-html-expected.checksum +++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/svg/custom/svg-fonts-in-html-expected.checksum @@ -1 +1 @@ -793446f56b2b8d51f16284e804e0534d
\ No newline at end of file +2dc82514d5e463fa9234511bbcccba22
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/svg/custom/svg-fonts-in-html-expected.png b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/svg/custom/svg-fonts-in-html-expected.png Binary files differindex 26c8a940..0e40c66 100644 --- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/svg/custom/svg-fonts-in-html-expected.png +++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/svg/custom/svg-fonts-in-html-expected.png diff --git a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/css2.1/t090501-c414-flt-ln-00-d-expected.checksum b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/css2.1/t090501-c414-flt-ln-00-d-expected.checksum new file mode 100644 index 0000000..a681e9c --- /dev/null +++ b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/css2.1/t090501-c414-flt-ln-00-d-expected.checksum @@ -0,0 +1 @@ +9aedf6905b729076588845dd3049ad23
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/css2.1/t090501-c414-flt-ln-00-d-expected.png b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/css2.1/t090501-c414-flt-ln-00-d-expected.png Binary files differnew file mode 100644 index 0000000..400a7e3 --- /dev/null +++ b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/css2.1/t090501-c414-flt-ln-00-d-expected.png diff --git a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/css2.1/t090501-c414-flt-ln-01-d-g-expected.checksum b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/css2.1/t090501-c414-flt-ln-01-d-g-expected.checksum new file mode 100644 index 0000000..b54a734 --- /dev/null +++ b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/css2.1/t090501-c414-flt-ln-01-d-g-expected.checksum @@ -0,0 +1 @@ +fe559e450425bbe9cd4ca0f8753f60ad
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/css2.1/t090501-c414-flt-ln-01-d-g-expected.png b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/css2.1/t090501-c414-flt-ln-01-d-g-expected.png Binary files differnew file mode 100644 index 0000000..e4c0433 --- /dev/null +++ b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/css2.1/t090501-c414-flt-ln-01-d-g-expected.png diff --git a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/css2.1/t090501-c414-flt-ln-02-d-expected.checksum b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/css2.1/t090501-c414-flt-ln-02-d-expected.checksum new file mode 100644 index 0000000..b88ba68 --- /dev/null +++ b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/css2.1/t090501-c414-flt-ln-02-d-expected.checksum @@ -0,0 +1 @@ +fe5f8f75153e7d8ae0883e306cac949a
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/css2.1/t090501-c414-flt-ln-02-d-expected.png b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/css2.1/t090501-c414-flt-ln-02-d-expected.png Binary files differnew file mode 100644 index 0000000..e37bd24 --- /dev/null +++ b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/css2.1/t090501-c414-flt-ln-02-d-expected.png diff --git a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/css2.1/t090501-c414-flt-ln-03-d-expected.checksum b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/css2.1/t090501-c414-flt-ln-03-d-expected.checksum new file mode 100644 index 0000000..d91457d --- /dev/null +++ b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/css2.1/t090501-c414-flt-ln-03-d-expected.checksum @@ -0,0 +1 @@ +cab52ac5af269f53a4338207c8dc727a
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/css2.1/t090501-c414-flt-ln-03-d-expected.png b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/css2.1/t090501-c414-flt-ln-03-d-expected.png Binary files differnew file mode 100644 index 0000000..149aa08 --- /dev/null +++ b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/css2.1/t090501-c414-flt-ln-03-d-expected.png diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/css1/font_properties/font-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/css1/font_properties/font-expected.txt index 06fe1fd..01f3f00 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/css1/font_properties/font-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/css1/font_properties/font-expected.txt @@ -1,8 +1,8 @@ -layer at (0,0) size 785x4402 +layer at (0,0) size 785x4404 RenderView at (0,0) size 785x600 -layer at (0,0) size 785x4402 - RenderBlock {HTML} at (0,0) size 785x4402 - RenderBody {BODY} at (8,8) size 769x4386 [bgcolor=#CCCCCC] +layer at (0,0) size 785x4404 + RenderBlock {HTML} at (0,0) size 785x4404 + RenderBody {BODY} at (8,8) size 769x4388 [bgcolor=#CCCCCC] RenderBlock {P} at (0,0) size 769x16 RenderText {#text} at (0,0) size 274x15 text run at (0,0) width 274: "The style declarations which apply to the text below are:" @@ -107,9 +107,9 @@ layer at (0,0) size 785x4402 text run at (177,79) width 498: "Extra text is included for the purposes of testing this more" text run at (0,115) width 92: "effectively." RenderBlock {P} at (0,1592) size 769x50 - RenderText {#text} at (0,6) size 760x38 + RenderText {#text} at (0,6) size 757x38 text run at (0,6) width 305: "This element should be in a sans-serif font, with a weight of 400. " - text run at (305,6) width 455: "Its font-size should be 80% of 12px, or 9.6px, and its line-height shoud be 2.5 times that, or 24px." + text run at (305,6) width 452: "Its font-size should be 80% of 12px, or 10px, and its line-height shoud be 2.5 times that, or 25px." text run at (0,31) width 321: "Extra text is included for the purposes of testing this more effectively." RenderBlock {P} at (0,1660) size 769x270 RenderInline {SPAN} at (0,0) size 761x238 [bgcolor=#C0C0C0] @@ -121,18 +121,18 @@ layer at (0,0) size 785x4402 text run at (0,178) width 736: "has been set on an inline element and should therefore only cover the text, not the interline" text run at (0,232) width 64: "spacing." RenderText {#text} at (0,0) size 0x0 - RenderTable {TABLE} at (0,1948) size 769x2438 [border: (1px outset #808080)] - RenderTableSection {TBODY} at (1,1) size 767x2436 + RenderTable {TABLE} at (0,1948) size 769x2440 [border: (1px outset #808080)] + RenderTableSection {TBODY} at (1,1) size 767x2438 RenderTableRow {TR} at (0,0) size 767x28 RenderTableCell {TD} at (0,0) size 767x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] RenderInline {STRONG} at (0,0) size 159x19 RenderText {#text} at (4,4) size 159x19 text run at (4,4) width 159: "TABLE Testing Section" - RenderTableRow {TR} at (0,28) size 767x2408 - RenderTableCell {TD} at (0,1218) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] + RenderTableRow {TR} at (0,28) size 767x2410 + RenderTableCell {TD} at (0,1219) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] RenderText {#text} at (4,4) size 4x19 text run at (4,4) width 4: " " - RenderTableCell {TD} at (12,28) size 755x2408 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] + RenderTableCell {TD} at (12,28) size 755x2410 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] RenderBlock {P} at (4,4) size 747x40 RenderText {#text} at (0,0) size 738x39 text run at (0,0) width 531: "This element is unstyled, and should inherit a font-size of 12px from the BODY element. " @@ -211,13 +211,13 @@ layer at (0,0) size 785x4402 text run at (0,79) width 177: "element's font size). " text run at (177,79) width 498: "Extra text is included for the purposes of testing this more" text run at (0,115) width 92: "effectively." - RenderBlock {P} at (4,1884) size 747x64 - RenderText {#text} at (0,8) size 742x48 + RenderBlock {P} at (4,1884) size 747x66 + RenderText {#text} at (0,8) size 738x49 text run at (0,8) width 374: "This element should be in a sans-serif font, with a weight of 400. " - text run at (374,8) width 368: "Its font-size should be 80% of 12px, or 9.6px, and its line-height" - text run at (0,40) width 196: "shoud be 2.5 times that, or 24px. " - text run at (196,40) width 399: "Extra text is included for the purposes of testing this more effectively." - RenderBlock {P} at (4,1972) size 747x432 + text run at (374,8) width 364: "Its font-size should be 80% of 12px, or 10px, and its line-height" + text run at (0,41) width 196: "shoud be 2.5 times that, or 25px. " + text run at (196,41) width 399: "Extra text is included for the purposes of testing this more effectively." + RenderBlock {P} at (4,1974) size 747x432 RenderInline {SPAN} at (0,0) size 717x388 [bgcolor=#C0C0C0] RenderText {#text} at (0,22) size 717x388 text run at (0,22) width 702: "This element should be in a sans-serif font, italicized and small caps," diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/css2.1/t090501-c414-flt-ln-00-d-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/css2.1/t090501-c414-flt-ln-00-d-expected.checksum index 107f4af..732e978 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/css2.1/t090501-c414-flt-ln-00-d-expected.checksum +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/css2.1/t090501-c414-flt-ln-00-d-expected.checksum @@ -1 +1 @@ -3efd2eec325b16aca7e988a323d2a24c
\ No newline at end of file +a11d36ac9a388f44fcd7b94a635a0402
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/css2.1/t090501-c414-flt-ln-00-d-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/css2.1/t090501-c414-flt-ln-00-d-expected.png Binary files differindex 021bafa..b2701da 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/css2.1/t090501-c414-flt-ln-00-d-expected.png +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/css2.1/t090501-c414-flt-ln-00-d-expected.png diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/css2.1/t090501-c414-flt-ln-00-d-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/css2.1/t090501-c414-flt-ln-00-d-expected.txt index 2241b20..a6b399c 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/css2.1/t090501-c414-flt-ln-00-d-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/css2.1/t090501-c414-flt-ln-00-d-expected.txt @@ -1,8 +1,8 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x470 - RenderBlock {HTML} at (0,0) size 800x470 - RenderBody {BODY} at (8,16) size 784x438 +layer at (0,0) size 800x486 + RenderBlock {HTML} at (0,0) size 800x486 + RenderBody {BODY} at (8,16) size 784x454 RenderBlock {P} at (0,0) size 784x60 [color=#000080] RenderText {#text} at (0,0) size 770x59 text run at (0,0) width 386: "The big coloured boxes should be level with the top of the small " @@ -12,57 +12,57 @@ layer at (0,0) size 800x470 text run at (412,20) width 358: "in which case the big box should be level with the bottom of" text run at (0,40) width 22: "the " text run at (22,40) width 131: "respective small box)." - RenderBlock {DIV} at (16,76) size 752x362 [color=#C0C0C0] [border: (5px solid #800080)] - RenderText {#text} at (171,21) size 444x19 - text run at (171,21) width 444: "dummy text dummy text dummy text dummy text dummy text dummy text " + RenderBlock {DIV} at (16,76) size 752x378 [color=#C0C0C0] [border: (5px solid #800080)] + RenderText {#text} at (171,22) size 444x19 + text run at (171,22) width 444: "dummy text dummy text dummy text dummy text dummy text dummy text " RenderInline {SPAN} at (0,0) size 17x25 [color=#FFFFFF] [bgcolor=#008080] [border: (3px solid #00FFFF)] - RenderText {#text} at (618,21) size 11x19 - text run at (618,21) width 11: "A" - RenderText {#text} at (632,21) size 4x19 - text run at (632,21) width 4: " " - RenderBlock (floating) {P} at (21,21) size 150x58 [color=#FFFFFF] [bgcolor=#008080] [border: (3px solid #00FFFF)] - RenderText {#text} at (19,19) size 44x19 - text run at (19,19) width 44: "AAAA" - RenderText {#text} at (636,21) size 535x39 - text run at (636,21) width 70: "dummy text" - text run at (171,41) width 370: "dummy text dummy text dummy text dummy text dummy text " + RenderText {#text} at (618,22) size 11x19 + text run at (618,22) width 11: "A" + RenderText {#text} at (632,22) size 4x19 + text run at (632,22) width 4: " " + RenderBlock (floating) {P} at (21,21) size 150x59 [color=#FFFFFF] [bgcolor=#008080] [border: (3px solid #00FFFF)] + RenderText {#text} at (19,20) size 44x19 + text run at (19,20) width 44: "AAAA" + RenderText {#text} at (636,22) size 535x40 + text run at (636,22) width 70: "dummy text" + text run at (171,43) width 370: "dummy text dummy text dummy text dummy text dummy text " RenderInline {SPAN} at (0,0) size 13x25 [color=#FFFFFF] [bgcolor=#800080] [border: (3px solid #FF00FF)] - RenderText {#text} at (544,41) size 10x19 - text run at (544,41) width 10: "B" + RenderText {#text} at (544,43) size 10x19 + text run at (544,43) width 10: "B" RenderText {#text} at (0,0) size 0x0 - RenderBlock (floating) {P} at (581,41) size 150x58 [color=#FFFFFF] [bgcolor=#800080] [border: (3px solid #FF00FF)] - RenderText {#text} at (19,19) size 40x19 - text run at (19,19) width 40: "BBBB" - RenderText {#text} at (171,61) size 710x279 - text run at (171,61) width 366: "dummy text dummy text dummy text dummy text dummy text" - text run at (21,81) width 74: "dummy text " - text run at (95,81) width 440: "dummy text dummy text dummy text dummy text dummy text dummy text" - text run at (21,101) width 444: "dummy text dummy text dummy text dummy text dummy text dummy text " - text run at (465,101) width 266: "dummy text dummy text dummy text dummy" - text run at (21,121) width 174: "text dummy text dummy text " - text run at (195,121) width 444: "dummy text dummy text dummy text dummy text dummy text dummy text " - text run at (639,121) width 70: "dummy text" - text run at (21,141) width 370: "dummy text dummy text dummy text dummy text dummy text " - text run at (391,141) width 340: "dummy text dummy text dummy text dummy text dummy" - text run at (21,161) width 100: "text dummy text " - text run at (121,161) width 444: "dummy text dummy text dummy text dummy text dummy text dummy text " - text run at (565,161) width 144: "dummy text dummy text" - text run at (21,181) width 296: "dummy text dummy text dummy text dummy text " - text run at (317,181) width 414: "dummy text dummy text dummy text dummy text dummy text dummy" - text run at (21,201) width 26: "text " - text run at (47,201) width 444: "dummy text dummy text dummy text dummy text dummy text dummy text " - text run at (491,201) width 218: "dummy text dummy text dummy text" - text run at (21,221) width 222: "dummy text dummy text dummy text " - text run at (243,221) width 444: "dummy text dummy text dummy text dummy text dummy text dummy text " - text run at (687,221) width 44: "dummy" - text run at (21,241) width 396: "text dummy text dummy text dummy text dummy text dummy text " - text run at (417,241) width 292: "dummy text dummy text dummy text dummy text" - text run at (21,261) width 148: "dummy text dummy text " - text run at (169,261) width 444: "dummy text dummy text dummy text dummy text dummy text dummy text " - text run at (613,261) width 118: "dummy text dummy" - text run at (21,281) width 322: "text dummy text dummy text dummy text dummy text " - text run at (343,281) width 366: "dummy text dummy text dummy text dummy text dummy text" - text run at (21,301) width 74: "dummy text " - text run at (95,301) width 444: "dummy text dummy text dummy text dummy text dummy text dummy text " - text run at (539,301) width 192: "dummy text dummy text dummy" - text run at (21,321) width 244: "text dummy text dummy text dummy text" + RenderBlock (floating) {P} at (581,42) size 150x59 [color=#FFFFFF] [bgcolor=#800080] [border: (3px solid #FF00FF)] + RenderText {#text} at (19,20) size 40x19 + text run at (19,20) width 40: "BBBB" + RenderText {#text} at (171,64) size 710x292 + text run at (171,64) width 366: "dummy text dummy text dummy text dummy text dummy text" + text run at (21,85) width 74: "dummy text " + text run at (95,85) width 440: "dummy text dummy text dummy text dummy text dummy text dummy text" + text run at (21,106) width 444: "dummy text dummy text dummy text dummy text dummy text dummy text " + text run at (465,106) width 266: "dummy text dummy text dummy text dummy" + text run at (21,127) width 174: "text dummy text dummy text " + text run at (195,127) width 444: "dummy text dummy text dummy text dummy text dummy text dummy text " + text run at (639,127) width 70: "dummy text" + text run at (21,148) width 370: "dummy text dummy text dummy text dummy text dummy text " + text run at (391,148) width 340: "dummy text dummy text dummy text dummy text dummy" + text run at (21,169) width 100: "text dummy text " + text run at (121,169) width 444: "dummy text dummy text dummy text dummy text dummy text dummy text " + text run at (565,169) width 144: "dummy text dummy text" + text run at (21,190) width 296: "dummy text dummy text dummy text dummy text " + text run at (317,190) width 414: "dummy text dummy text dummy text dummy text dummy text dummy" + text run at (21,211) width 26: "text " + text run at (47,211) width 444: "dummy text dummy text dummy text dummy text dummy text dummy text " + text run at (491,211) width 218: "dummy text dummy text dummy text" + text run at (21,232) width 222: "dummy text dummy text dummy text " + text run at (243,232) width 444: "dummy text dummy text dummy text dummy text dummy text dummy text " + text run at (687,232) width 44: "dummy" + text run at (21,253) width 396: "text dummy text dummy text dummy text dummy text dummy text " + text run at (417,253) width 292: "dummy text dummy text dummy text dummy text" + text run at (21,274) width 148: "dummy text dummy text " + text run at (169,274) width 444: "dummy text dummy text dummy text dummy text dummy text dummy text " + text run at (613,274) width 118: "dummy text dummy" + text run at (21,295) width 322: "text dummy text dummy text dummy text dummy text " + text run at (343,295) width 366: "dummy text dummy text dummy text dummy text dummy text" + text run at (21,316) width 74: "dummy text " + text run at (95,316) width 444: "dummy text dummy text dummy text dummy text dummy text dummy text " + text run at (539,316) width 192: "dummy text dummy text dummy" + text run at (21,337) width 244: "text dummy text dummy text dummy text" diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/css2.1/t090501-c414-flt-ln-01-d-g-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/css2.1/t090501-c414-flt-ln-01-d-g-expected.checksum index 835abe4..7bf9473 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/css2.1/t090501-c414-flt-ln-01-d-g-expected.checksum +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/css2.1/t090501-c414-flt-ln-01-d-g-expected.checksum @@ -1 +1 @@ -7cbe7e00e976766875e5064d0501360e
\ No newline at end of file +85a4be98fa075709804e96ff6fa65364
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/css2.1/t090501-c414-flt-ln-01-d-g-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/css2.1/t090501-c414-flt-ln-01-d-g-expected.png Binary files differindex 86edca8..50af146 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/css2.1/t090501-c414-flt-ln-01-d-g-expected.png +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/css2.1/t090501-c414-flt-ln-01-d-g-expected.png diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/css2.1/t090501-c414-flt-ln-01-d-g-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/css2.1/t090501-c414-flt-ln-01-d-g-expected.txt index 79ce1dd..66b5493 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/css2.1/t090501-c414-flt-ln-01-d-g-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/css2.1/t090501-c414-flt-ln-01-d-g-expected.txt @@ -1,8 +1,8 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x470 - RenderBlock {HTML} at (0,0) size 800x470 - RenderBody {BODY} at (8,16) size 784x438 +layer at (0,0) size 800x486 + RenderBlock {HTML} at (0,0) size 800x486 + RenderBody {BODY} at (8,16) size 784x454 RenderBlock {P} at (0,0) size 784x60 [color=#000080] RenderText {#text} at (0,0) size 777x59 text run at (0,0) width 386: "The big coloured boxes should be level with the top of the small " @@ -11,54 +11,54 @@ layer at (0,0) size 800x470 text run at (36,20) width 368: "for the big box to fit on the small box's line, in which case the " text run at (404,20) width 373: "big box should be level with the bottom of the respective small" text run at (0,40) width 32: "box)." - RenderBlock {DIV} at (16,76) size 752x362 [color=#C0C0C0] [border: (5px solid #800080)] - RenderText {#text} at (133,21) size 444x19 - text run at (133,21) width 444: "dummy text dummy text dummy text dummy text dummy text dummy text " + RenderBlock {DIV} at (16,76) size 752x378 [color=#C0C0C0] [border: (5px solid #800080)] + RenderText {#text} at (133,22) size 444x19 + text run at (133,22) width 444: "dummy text dummy text dummy text dummy text dummy text dummy text " RenderInline {SPAN} at (0,0) size 21x25 [color=#FFFFFF] [bgcolor=#008080] [border: (3px solid #00FFFF)] - RenderText {#text} at (580,21) size 15x19 - text run at (580,21) width 15: "\x{21E6}" - RenderText {#text} at (598,21) size 4x19 - text run at (598,21) width 4: " " + RenderText {#text} at (580,22) size 15x19 + text run at (580,22) width 15: "\x{21E6}" + RenderText {#text} at (598,22) size 4x19 + text run at (598,22) width 4: " " RenderImage {IMG} at (21,21) size 112x112 [color=#FF0000] - RenderText {#text} at (602,21) size 587x39 - text run at (602,21) width 118: "dummy text dummy" - text run at (133,41) width 322: "text dummy text dummy text dummy text dummy text " + RenderText {#text} at (602,22) size 587x40 + text run at (602,22) width 118: "dummy text dummy" + text run at (133,43) width 322: "text dummy text dummy text dummy text dummy text " RenderInline {SPAN} at (0,0) size 21x25 [color=#FFFFFF] [bgcolor=#800080] [border: (3px solid #FF00FF)] - RenderText {#text} at (458,41) size 15x19 - text run at (458,41) width 15: "\x{21E8}" - RenderText {#text} at (476,41) size 4x19 - text run at (476,41) width 4: " " - RenderImage {IMG} at (619,41) size 112x112 [color=#FF0000] - RenderText {#text} at (480,41) size 710x299 - text run at (480,41) width 118: "dummy text dummy" - text run at (133,61) width 322: "text dummy text dummy text dummy text dummy text " - text run at (455,61) width 144: "dummy text dummy text" - text run at (133,81) width 296: "dummy text dummy text dummy text dummy text " - text run at (429,81) width 144: "dummy text dummy text" - text run at (133,101) width 296: "dummy text dummy text dummy text dummy text " - text run at (429,101) width 144: "dummy text dummy text" - text run at (133,121) width 296: "dummy text dummy text dummy text dummy text " - text run at (429,121) width 144: "dummy text dummy text" - text run at (21,141) width 296: "dummy text dummy text dummy text dummy text " - text run at (317,141) width 292: "dummy text dummy text dummy text dummy text" - text run at (21,161) width 148: "dummy text dummy text " - text run at (169,161) width 444: "dummy text dummy text dummy text dummy text dummy text dummy text " - text run at (613,161) width 118: "dummy text dummy" - text run at (21,181) width 322: "text dummy text dummy text dummy text dummy text " - text run at (343,181) width 366: "dummy text dummy text dummy text dummy text dummy text" - text run at (21,201) width 74: "dummy text " - text run at (95,201) width 444: "dummy text dummy text dummy text dummy text dummy text dummy text " - text run at (539,201) width 192: "dummy text dummy text dummy" - text run at (21,221) width 248: "text dummy text dummy text dummy text " - text run at (269,221) width 440: "dummy text dummy text dummy text dummy text dummy text dummy text" - text run at (21,241) width 444: "dummy text dummy text dummy text dummy text dummy text dummy text " - text run at (465,241) width 266: "dummy text dummy text dummy text dummy" - text run at (21,261) width 174: "text dummy text dummy text " - text run at (195,261) width 444: "dummy text dummy text dummy text dummy text dummy text dummy text " - text run at (639,261) width 70: "dummy text" - text run at (21,281) width 370: "dummy text dummy text dummy text dummy text dummy text " - text run at (391,281) width 340: "dummy text dummy text dummy text dummy text dummy" - text run at (21,301) width 100: "text dummy text " - text run at (121,301) width 444: "dummy text dummy text dummy text dummy text dummy text dummy text " - text run at (565,301) width 144: "dummy text dummy text" - text run at (21,321) width 292: "dummy text dummy text dummy text dummy text" + RenderText {#text} at (458,43) size 15x19 + text run at (458,43) width 15: "\x{21E8}" + RenderText {#text} at (476,43) size 4x19 + text run at (476,43) width 4: " " + RenderImage {IMG} at (619,42) size 112x112 [color=#FF0000] + RenderText {#text} at (480,43) size 710x313 + text run at (480,43) width 118: "dummy text dummy" + text run at (133,64) width 322: "text dummy text dummy text dummy text dummy text " + text run at (455,64) width 144: "dummy text dummy text" + text run at (133,85) width 296: "dummy text dummy text dummy text dummy text " + text run at (429,85) width 144: "dummy text dummy text" + text run at (133,106) width 296: "dummy text dummy text dummy text dummy text " + text run at (429,106) width 144: "dummy text dummy text" + text run at (133,127) width 296: "dummy text dummy text dummy text dummy text " + text run at (429,127) width 144: "dummy text dummy text" + text run at (21,148) width 296: "dummy text dummy text dummy text dummy text " + text run at (317,148) width 292: "dummy text dummy text dummy text dummy text" + text run at (21,169) width 148: "dummy text dummy text " + text run at (169,169) width 444: "dummy text dummy text dummy text dummy text dummy text dummy text " + text run at (613,169) width 118: "dummy text dummy" + text run at (21,190) width 322: "text dummy text dummy text dummy text dummy text " + text run at (343,190) width 366: "dummy text dummy text dummy text dummy text dummy text" + text run at (21,211) width 74: "dummy text " + text run at (95,211) width 444: "dummy text dummy text dummy text dummy text dummy text dummy text " + text run at (539,211) width 192: "dummy text dummy text dummy" + text run at (21,232) width 248: "text dummy text dummy text dummy text " + text run at (269,232) width 440: "dummy text dummy text dummy text dummy text dummy text dummy text" + text run at (21,253) width 444: "dummy text dummy text dummy text dummy text dummy text dummy text " + text run at (465,253) width 266: "dummy text dummy text dummy text dummy" + text run at (21,274) width 174: "text dummy text dummy text " + text run at (195,274) width 444: "dummy text dummy text dummy text dummy text dummy text dummy text " + text run at (639,274) width 70: "dummy text" + text run at (21,295) width 370: "dummy text dummy text dummy text dummy text dummy text " + text run at (391,295) width 340: "dummy text dummy text dummy text dummy text dummy" + text run at (21,316) width 100: "text dummy text " + text run at (121,316) width 444: "dummy text dummy text dummy text dummy text dummy text dummy text " + text run at (565,316) width 144: "dummy text dummy text" + text run at (21,337) width 292: "dummy text dummy text dummy text dummy text" diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/css2.1/t090501-c414-flt-ln-02-d-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/css2.1/t090501-c414-flt-ln-02-d-expected.checksum index 0b43d2e..d56b33a 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/css2.1/t090501-c414-flt-ln-02-d-expected.checksum +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/css2.1/t090501-c414-flt-ln-02-d-expected.checksum @@ -1 +1 @@ -06aed4ae8269f585adb2b4718a9db0b3
\ No newline at end of file +1446ec88f202e4330cda8c5d0e93f509
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/css2.1/t090501-c414-flt-ln-02-d-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/css2.1/t090501-c414-flt-ln-02-d-expected.png Binary files differindex 845d235..671823e 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/css2.1/t090501-c414-flt-ln-02-d-expected.png +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/css2.1/t090501-c414-flt-ln-02-d-expected.png diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/css2.1/t090501-c414-flt-ln-02-d-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/css2.1/t090501-c414-flt-ln-02-d-expected.txt index 9762ebcd..edb1370 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/css2.1/t090501-c414-flt-ln-02-d-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/css2.1/t090501-c414-flt-ln-02-d-expected.txt @@ -1,8 +1,8 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x530 - RenderBlock {HTML} at (0,0) size 800x530 - RenderBody {BODY} at (8,16) size 784x498 +layer at (0,0) size 800x549 + RenderBlock {HTML} at (0,0) size 800x549 + RenderBody {BODY} at (8,16) size 784x517 RenderBlock {P} at (0,0) size 784x60 [color=#000080] RenderText {#text} at (0,0) size 781x59 text run at (0,0) width 386: "The big coloured boxes should be level with the top of the small " @@ -12,81 +12,81 @@ layer at (0,0) size 800x530 text run at (412,20) width 369: "in which case the big box should be as high as possible below" text run at (0,40) width 22: "the " text run at (22,40) width 66: "small box)." - RenderBlock {DIV} at (16,76) size 752x422 [color=#C0C0C0] [border: (5px solid #800080)] - RenderText {#text} at (171,21) size 518x19 - text run at (171,21) width 444: "dummy text dummy text dummy text dummy text dummy text dummy text " - text run at (615,21) width 74: "dummy text " + RenderBlock {DIV} at (16,76) size 752x441 [color=#C0C0C0] [border: (5px solid #800080)] + RenderText {#text} at (171,22) size 518x19 + text run at (171,22) width 444: "dummy text dummy text dummy text dummy text dummy text dummy text " + text run at (615,22) width 74: "dummy text " RenderInline {SPAN} at (0,0) size 14x25 [color=#FFFFFF] [bgcolor=#008080] [border: (3px solid #00FFFF)] - RenderText {#text} at (692,21) size 11x19 - text run at (692,21) width 11: "A" + RenderText {#text} at (692,22) size 11x19 + text run at (692,22) width 11: "A" RenderText {#text} at (0,0) size 0x0 - RenderBlock (floating) {P} at (21,21) size 150x58 [color=#FFFFFF] [bgcolor=#008080] [border: (3px solid #00FFFF)] - RenderText {#text} at (19,19) size 44x19 - text run at (19,19) width 44: "AAAA" - RenderText {#text} at (171,41) size 444x19 - text run at (171,41) width 444: "dummy text dummy text dummy text dummy text dummy text dummy text " + RenderBlock (floating) {P} at (21,21) size 150x59 [color=#FFFFFF] [bgcolor=#008080] [border: (3px solid #00FFFF)] + RenderText {#text} at (19,20) size 44x19 + text run at (19,20) width 44: "AAAA" + RenderText {#text} at (171,43) size 444x19 + text run at (171,43) width 444: "dummy text dummy text dummy text dummy text dummy text dummy text " RenderInline {SPAN} at (0,0) size 16x25 [color=#FFFFFF] [bgcolor=#800080] [border: (3px solid #FF00FF)] - RenderText {#text} at (618,41) size 10x19 - text run at (618,41) width 10: "B" - RenderText {#text} at (631,41) size 4x19 - text run at (631,41) width 4: " " - RenderBlock (floating) {P} at (581,61) size 150x58 [color=#FFFFFF] [bgcolor=#800080] [border: (3px solid #FF00FF)] - RenderText {#text} at (19,19) size 40x19 - text run at (19,19) width 40: "BBBB" - RenderText {#text} at (635,41) size 384x39 - text run at (635,41) width 70: "dummy text" - text run at (321,61) width 148: "dummy text dummy text " + RenderText {#text} at (618,43) size 10x19 + text run at (618,43) width 10: "B" + RenderText {#text} at (631,43) size 4x19 + text run at (631,43) width 4: " " + RenderBlock (floating) {P} at (581,63) size 150x59 [color=#FFFFFF] [bgcolor=#800080] [border: (3px solid #FF00FF)] + RenderText {#text} at (19,20) size 40x19 + text run at (19,20) width 40: "BBBB" + RenderText {#text} at (635,43) size 384x40 + text run at (635,43) width 70: "dummy text" + text run at (321,64) width 148: "dummy text dummy text " RenderInline {SPAN} at (0,0) size 17x25 [color=#FFFFFF] [bgcolor=#FFA500] [border: (3px solid #FFFF00)] - RenderText {#text} at (472,61) size 11x19 - text run at (472,61) width 11: "C" - RenderText {#text} at (486,61) size 4x19 - text run at (486,61) width 4: " " - RenderBlock (floating) {P} at (171,61) size 150x58 [color=#FFFFFF] [bgcolor=#FFA500] [border: (3px solid #FFFF00)] - RenderText {#text} at (19,19) size 44x19 - text run at (19,19) width 44: "CCCC" - RenderText {#text} at (490,61) size 239x59 - text run at (490,61) width 70: "dummy text" - text run at (321,81) width 218: "dummy text dummy text dummy text" - text run at (321,101) width 148: "dummy text dummy text " + RenderText {#text} at (472,64) size 11x19 + text run at (472,64) width 11: "C" + RenderText {#text} at (486,64) size 4x19 + text run at (486,64) width 4: " " + RenderBlock (floating) {P} at (171,63) size 150x59 [color=#FFFFFF] [bgcolor=#FFA500] [border: (3px solid #FFFF00)] + RenderText {#text} at (19,20) size 44x19 + text run at (19,20) width 44: "CCCC" + RenderText {#text} at (490,64) size 239x61 + text run at (490,64) width 70: "dummy text" + text run at (321,85) width 218: "dummy text dummy text dummy text" + text run at (321,106) width 148: "dummy text dummy text " RenderInline {SPAN} at (0,0) size 17x25 [color=#FFFFFF] [bgcolor=#008000] [border: (3px solid #00FF00)] - RenderText {#text} at (472,101) size 11x19 - text run at (472,101) width 11: "D" - RenderText {#text} at (486,101) size 4x19 - text run at (486,101) width 4: " " - RenderBlock (floating) {P} at (21,121) size 150x58 [color=#FFFFFF] [bgcolor=#008000] [border: (3px solid #00FF00)] - RenderText {#text} at (19,19) size 44x19 - text run at (19,19) width 44: "DDDD" - RenderText {#text} at (490,101) size 710x299 - text run at (490,101) width 70: "dummy text" - text run at (171,121) width 370: "dummy text dummy text dummy text dummy text dummy text " - text run at (541,121) width 144: "dummy text dummy text" - text run at (171,141) width 296: "dummy text dummy text dummy text dummy text " - text run at (467,141) width 218: "dummy text dummy text dummy text" - text run at (171,161) width 222: "dummy text dummy text dummy text " - text run at (393,161) width 292: "dummy text dummy text dummy text dummy text" - text run at (21,181) width 148: "dummy text dummy text " - text run at (169,181) width 444: "dummy text dummy text dummy text dummy text dummy text dummy text " - text run at (613,181) width 118: "dummy text dummy" - text run at (21,201) width 322: "text dummy text dummy text dummy text dummy text " - text run at (343,201) width 366: "dummy text dummy text dummy text dummy text dummy text" - text run at (21,221) width 74: "dummy text " - text run at (95,221) width 444: "dummy text dummy text dummy text dummy text dummy text dummy text " - text run at (539,221) width 192: "dummy text dummy text dummy" - text run at (21,241) width 248: "text dummy text dummy text dummy text " - text run at (269,241) width 440: "dummy text dummy text dummy text dummy text dummy text dummy text" - text run at (21,261) width 444: "dummy text dummy text dummy text dummy text dummy text dummy text " - text run at (465,261) width 266: "dummy text dummy text dummy text dummy" - text run at (21,281) width 174: "text dummy text dummy text " - text run at (195,281) width 444: "dummy text dummy text dummy text dummy text dummy text dummy text " - text run at (639,281) width 70: "dummy text" - text run at (21,301) width 370: "dummy text dummy text dummy text dummy text dummy text " - text run at (391,301) width 340: "dummy text dummy text dummy text dummy text dummy" - text run at (21,321) width 100: "text dummy text " - text run at (121,321) width 444: "dummy text dummy text dummy text dummy text dummy text dummy text " - text run at (565,321) width 144: "dummy text dummy text" - text run at (21,341) width 296: "dummy text dummy text dummy text dummy text " - text run at (317,341) width 414: "dummy text dummy text dummy text dummy text dummy text dummy" - text run at (21,361) width 26: "text " - text run at (47,361) width 444: "dummy text dummy text dummy text dummy text dummy text dummy text " - text run at (491,361) width 218: "dummy text dummy text dummy text" - text run at (21,381) width 218: "dummy text dummy text dummy text" + RenderText {#text} at (472,106) size 11x19 + text run at (472,106) width 11: "D" + RenderText {#text} at (486,106) size 4x19 + text run at (486,106) width 4: " " + RenderBlock (floating) {P} at (21,126) size 150x59 [color=#FFFFFF] [bgcolor=#008000] [border: (3px solid #00FF00)] + RenderText {#text} at (19,20) size 44x19 + text run at (19,20) width 44: "DDDD" + RenderText {#text} at (490,106) size 710x313 + text run at (490,106) width 70: "dummy text" + text run at (171,127) width 370: "dummy text dummy text dummy text dummy text dummy text " + text run at (541,127) width 144: "dummy text dummy text" + text run at (171,148) width 296: "dummy text dummy text dummy text dummy text " + text run at (467,148) width 218: "dummy text dummy text dummy text" + text run at (171,169) width 222: "dummy text dummy text dummy text " + text run at (393,169) width 292: "dummy text dummy text dummy text dummy text" + text run at (21,190) width 148: "dummy text dummy text " + text run at (169,190) width 444: "dummy text dummy text dummy text dummy text dummy text dummy text " + text run at (613,190) width 118: "dummy text dummy" + text run at (21,211) width 322: "text dummy text dummy text dummy text dummy text " + text run at (343,211) width 366: "dummy text dummy text dummy text dummy text dummy text" + text run at (21,232) width 74: "dummy text " + text run at (95,232) width 444: "dummy text dummy text dummy text dummy text dummy text dummy text " + text run at (539,232) width 192: "dummy text dummy text dummy" + text run at (21,253) width 248: "text dummy text dummy text dummy text " + text run at (269,253) width 440: "dummy text dummy text dummy text dummy text dummy text dummy text" + text run at (21,274) width 444: "dummy text dummy text dummy text dummy text dummy text dummy text " + text run at (465,274) width 266: "dummy text dummy text dummy text dummy" + text run at (21,295) width 174: "text dummy text dummy text " + text run at (195,295) width 444: "dummy text dummy text dummy text dummy text dummy text dummy text " + text run at (639,295) width 70: "dummy text" + text run at (21,316) width 370: "dummy text dummy text dummy text dummy text dummy text " + text run at (391,316) width 340: "dummy text dummy text dummy text dummy text dummy" + text run at (21,337) width 100: "text dummy text " + text run at (121,337) width 444: "dummy text dummy text dummy text dummy text dummy text dummy text " + text run at (565,337) width 144: "dummy text dummy text" + text run at (21,358) width 296: "dummy text dummy text dummy text dummy text " + text run at (317,358) width 414: "dummy text dummy text dummy text dummy text dummy text dummy" + text run at (21,379) width 26: "text " + text run at (47,379) width 444: "dummy text dummy text dummy text dummy text dummy text dummy text " + text run at (491,379) width 218: "dummy text dummy text dummy text" + text run at (21,400) width 218: "dummy text dummy text dummy text" diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/css2.1/t090501-c414-flt-ln-03-d-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/css2.1/t090501-c414-flt-ln-03-d-expected.checksum index 89b0eae..5b98337 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/css2.1/t090501-c414-flt-ln-03-d-expected.checksum +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/css2.1/t090501-c414-flt-ln-03-d-expected.checksum @@ -1 +1 @@ -ac3144093262d6312507e73a2d71dd11
\ No newline at end of file +6f469a2b2a1d153c8dae0f05aaf82c29
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/css2.1/t090501-c414-flt-ln-03-d-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/css2.1/t090501-c414-flt-ln-03-d-expected.png Binary files differindex 92706c8..d43d931 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/css2.1/t090501-c414-flt-ln-03-d-expected.png +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/css2.1/t090501-c414-flt-ln-03-d-expected.png diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/css2.1/t090501-c414-flt-ln-03-d-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/css2.1/t090501-c414-flt-ln-03-d-expected.txt index c38ce3b..f44107a 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/css2.1/t090501-c414-flt-ln-03-d-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/css2.1/t090501-c414-flt-ln-03-d-expected.txt @@ -1,8 +1,8 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x450 - RenderBlock {HTML} at (0,0) size 800x450 - RenderBody {BODY} at (8,16) size 784x418 +layer at (0,0) size 800x465 + RenderBlock {HTML} at (0,0) size 800x465 + RenderBody {BODY} at (8,16) size 784x433 RenderBlock {P} at (0,0) size 784x60 [color=#000080] RenderText {#text} at (0,0) size 781x59 text run at (0,0) width 386: "The big coloured boxes should be level with the top of the small " @@ -12,56 +12,56 @@ layer at (0,0) size 800x450 text run at (412,20) width 369: "in which case the big box should be as high as possible below" text run at (0,40) width 22: "the " text run at (22,40) width 66: "small box)." - RenderBlock {DIV} at (16,76) size 752x342 [color=#C0C0C0] [border: (5px solid #800080)] - RenderText {#text} at (171,21) size 296x19 - text run at (171,21) width 296: "dummy text dummy text dummy text dummy text " + RenderBlock {DIV} at (16,76) size 752x357 [color=#C0C0C0] [border: (5px solid #800080)] + RenderText {#text} at (171,22) size 296x19 + text run at (171,22) width 296: "dummy text dummy text dummy text dummy text " RenderInline {SPAN} at (0,0) size 17x25 [color=#FFFFFF] [bgcolor=#008080] [border: (3px solid #00FFFF)] - RenderText {#text} at (470,21) size 11x19 - text run at (470,21) width 11: "A" - RenderText {#text} at (484,21) size 4x19 - text run at (484,21) width 4: " " - RenderBlock (floating) {P} at (21,21) size 150x58 [color=#FFFFFF] [bgcolor=#008080] [border: (3px solid #00FFFF)] - RenderText {#text} at (19,19) size 44x19 - text run at (19,19) width 44: "AAAA" + RenderText {#text} at (470,22) size 11x19 + text run at (470,22) width 11: "A" + RenderText {#text} at (484,22) size 4x19 + text run at (484,22) width 4: " " + RenderBlock (floating) {P} at (21,21) size 150x59 [color=#FFFFFF] [bgcolor=#008080] [border: (3px solid #00FFFF)] + RenderText {#text} at (19,20) size 44x19 + text run at (19,20) width 44: "AAAA" RenderText {#text} at (0,0) size 0x0 RenderInline {SPAN} at (0,0) size 16x25 [color=#FFFFFF] [bgcolor=#800080] [border: (3px solid #FF00FF)] - RenderText {#text} at (491,21) size 10x19 - text run at (491,21) width 10: "B" - RenderText {#text} at (504,21) size 4x19 - text run at (504,21) width 4: " " - RenderBlock (floating) {P} at (581,21) size 150x58 [color=#FFFFFF] [bgcolor=#800080] [border: (3px solid #FF00FF)] - RenderText {#text} at (19,19) size 40x19 - text run at (19,19) width 40: "BBBB" - RenderText {#text} at (508,21) size 710x299 - text run at (508,21) width 70: "dummy text" - text run at (171,41) width 366: "dummy text dummy text dummy text dummy text dummy text" - text run at (171,61) width 366: "dummy text dummy text dummy text dummy text dummy text" - text run at (21,81) width 74: "dummy text " - text run at (95,81) width 444: "dummy text dummy text dummy text dummy text dummy text dummy text " - text run at (539,81) width 192: "dummy text dummy text dummy" - text run at (21,101) width 248: "text dummy text dummy text dummy text " - text run at (269,101) width 440: "dummy text dummy text dummy text dummy text dummy text dummy text" - text run at (21,121) width 444: "dummy text dummy text dummy text dummy text dummy text dummy text " - text run at (465,121) width 266: "dummy text dummy text dummy text dummy" - text run at (21,141) width 174: "text dummy text dummy text " - text run at (195,141) width 444: "dummy text dummy text dummy text dummy text dummy text dummy text " - text run at (639,141) width 70: "dummy text" - text run at (21,161) width 370: "dummy text dummy text dummy text dummy text dummy text " - text run at (391,161) width 340: "dummy text dummy text dummy text dummy text dummy" - text run at (21,181) width 100: "text dummy text " - text run at (121,181) width 444: "dummy text dummy text dummy text dummy text dummy text dummy text " - text run at (565,181) width 144: "dummy text dummy text" - text run at (21,201) width 296: "dummy text dummy text dummy text dummy text " - text run at (317,201) width 414: "dummy text dummy text dummy text dummy text dummy text dummy" - text run at (21,221) width 26: "text " - text run at (47,221) width 444: "dummy text dummy text dummy text dummy text dummy text dummy text " - text run at (491,221) width 218: "dummy text dummy text dummy text" - text run at (21,241) width 222: "dummy text dummy text dummy text " - text run at (243,241) width 444: "dummy text dummy text dummy text dummy text dummy text dummy text " - text run at (687,241) width 44: "dummy" - text run at (21,261) width 396: "text dummy text dummy text dummy text dummy text dummy text " - text run at (417,261) width 292: "dummy text dummy text dummy text dummy text" - text run at (21,281) width 148: "dummy text dummy text " - text run at (169,281) width 444: "dummy text dummy text dummy text dummy text dummy text dummy text " - text run at (613,281) width 118: "dummy text dummy" - text run at (21,301) width 318: "text dummy text dummy text dummy text dummy text" + RenderText {#text} at (491,22) size 10x19 + text run at (491,22) width 10: "B" + RenderText {#text} at (504,22) size 4x19 + text run at (504,22) width 4: " " + RenderBlock (floating) {P} at (581,21) size 150x59 [color=#FFFFFF] [bgcolor=#800080] [border: (3px solid #FF00FF)] + RenderText {#text} at (19,20) size 40x19 + text run at (19,20) width 40: "BBBB" + RenderText {#text} at (508,22) size 710x313 + text run at (508,22) width 70: "dummy text" + text run at (171,43) width 366: "dummy text dummy text dummy text dummy text dummy text" + text run at (171,64) width 366: "dummy text dummy text dummy text dummy text dummy text" + text run at (21,85) width 74: "dummy text " + text run at (95,85) width 444: "dummy text dummy text dummy text dummy text dummy text dummy text " + text run at (539,85) width 192: "dummy text dummy text dummy" + text run at (21,106) width 248: "text dummy text dummy text dummy text " + text run at (269,106) width 440: "dummy text dummy text dummy text dummy text dummy text dummy text" + text run at (21,127) width 444: "dummy text dummy text dummy text dummy text dummy text dummy text " + text run at (465,127) width 266: "dummy text dummy text dummy text dummy" + text run at (21,148) width 174: "text dummy text dummy text " + text run at (195,148) width 444: "dummy text dummy text dummy text dummy text dummy text dummy text " + text run at (639,148) width 70: "dummy text" + text run at (21,169) width 370: "dummy text dummy text dummy text dummy text dummy text " + text run at (391,169) width 340: "dummy text dummy text dummy text dummy text dummy" + text run at (21,190) width 100: "text dummy text " + text run at (121,190) width 444: "dummy text dummy text dummy text dummy text dummy text dummy text " + text run at (565,190) width 144: "dummy text dummy text" + text run at (21,211) width 296: "dummy text dummy text dummy text dummy text " + text run at (317,211) width 414: "dummy text dummy text dummy text dummy text dummy text dummy" + text run at (21,232) width 26: "text " + text run at (47,232) width 444: "dummy text dummy text dummy text dummy text dummy text dummy text " + text run at (491,232) width 218: "dummy text dummy text dummy text" + text run at (21,253) width 222: "dummy text dummy text dummy text " + text run at (243,253) width 444: "dummy text dummy text dummy text dummy text dummy text dummy text " + text run at (687,253) width 44: "dummy" + text run at (21,274) width 396: "text dummy text dummy text dummy text dummy text dummy text " + text run at (417,274) width 292: "dummy text dummy text dummy text dummy text" + text run at (21,295) width 148: "dummy text dummy text " + text run at (169,295) width 444: "dummy text dummy text dummy text dummy text dummy text dummy text " + text run at (613,295) width 118: "dummy text dummy" + text run at (21,316) width 318: "text dummy text dummy text dummy text dummy text" diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/scrolling-embedded-svg-file-image-repaint-problem-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/scrolling-embedded-svg-file-image-repaint-problem-expected.checksum index a1b5271..9346a11 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/scrolling-embedded-svg-file-image-repaint-problem-expected.checksum +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/scrolling-embedded-svg-file-image-repaint-problem-expected.checksum @@ -1 +1 @@ -f5a1a750b57e6107754cc5dbfd4a7d77
\ No newline at end of file +6de42ee0c57ccc3904ecdec39378e199
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/scrolling-embedded-svg-file-image-repaint-problem-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/scrolling-embedded-svg-file-image-repaint-problem-expected.png Binary files differindex 7eb5142..1abfc8a 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/scrolling-embedded-svg-file-image-repaint-problem-expected.png +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/scrolling-embedded-svg-file-image-repaint-problem-expected.png diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/scrolling-embedded-svg-file-image-repaint-problem-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/scrolling-embedded-svg-file-image-repaint-problem-expected.txt index 1fc5663..26c2380 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/scrolling-embedded-svg-file-image-repaint-problem-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/scrolling-embedded-svg-file-image-repaint-problem-expected.txt @@ -1,10 +1,10 @@ -layer at (0,0) size 1026x1034 +layer at (0,0) size 1026x1056 RenderView at (0,0) size 785x585 -layer at (0,0) size 1026x1034 - RenderBlock {HTML} at (0,0) size 785x1034 - RenderBody {BODY} at (8,16) size 769x1014 - RenderBlock {DIV} at (16,0) size 737x60 - RenderBlock {P} at (0,0) size 737x20 +layer at (0,0) size 1026x1056 + RenderBlock {HTML} at (0,0) size 785x1056 + RenderBody {BODY} at (8,16) size 769x1036 + RenderBlock {DIV} at (16,0) size 737x63 + RenderBlock {P} at (0,0) size 737x21 RenderInline {A} at (0,0) size 94x18 [color=#0000EE] RenderText {#text} at (261,1) size 94x18 text run at (261,1) width 94: "Full version" @@ -13,13 +13,13 @@ layer at (0,0) size 1026x1034 RenderInline {A} at (0,0) size 108x18 [color=#0000EE] RenderText {#text} at (367,1) size 108x18 text run at (367,1) width 108: "Basic version" - RenderBlock {P} at (0,20) size 737x20 + RenderBlock {P} at (0,21) size 737x21 RenderText {#text} at (173,1) size 152x18 text run at (173,1) width 152: "Specification link: " RenderInline {A} at (0,0) size 238x18 [color=#0000EE] RenderText {#text} at (325,1) size 238x18 text run at (325,1) width 238: "3.4 How groups are rendered" - RenderBlock {P} at (0,40) size 737x20 + RenderBlock {P} at (0,42) size 737x21 RenderInline {A} at (0,0) size 202x18 [color=#0000EE] RenderText {#text} at (153,1) size 202x18 text run at (153,1) width 202: "pservers-pattern-01-b \x{2190}" @@ -34,26 +34,26 @@ layer at (0,0) size 1026x1034 RenderText {#text} at (411,1) size 173x18 text run at (411,1) width 173: "\x{2192} script-handle-01-b" RenderText {#text} at (0,0) size 0x0 - RenderTable {TABLE} at (0,64) size 1018x550 - RenderTableSection {TBODY} at (0,0) size 1018x550 - RenderTableRow {TR} at (0,0) size 1018x550 - RenderTableCell {TD} at (0,0) size 1018x550 [r=0 c=0 rs=1 cs=3] - RenderTable {TABLE} at (10,10) size 998x530 - RenderTableSection {TBODY} at (0,0) size 998x530 + RenderTable {TABLE} at (0,67) size 1018x552 + RenderTableSection {TBODY} at (0,0) size 1018x552 + RenderTableRow {TR} at (0,0) size 1018x552 + RenderTableCell {TD} at (0,0) size 1018x552 [r=0 c=0 rs=1 cs=3] + RenderTable {TABLE} at (10,10) size 998x532 + RenderTableSection {TBODY} at (0,0) size 998x532 RenderTableRow {TR} at (0,2) size 998x106 RenderTableCell {TD} at (2,2) size 994x106 [r=0 c=0 rs=1 cs=2] RenderBlock {H1} at (8,29) size 978x48 RenderText {#text} at (311,5) size 356x38 text run at (311,5) width 356: "render-groups-01-b" - RenderTableRow {TR} at (0,110) size 998x36 [color=#FFFFFF] [bgcolor=#000000] - RenderTableCell {TD} at (2,110) size 496x36 [r=1 c=0 rs=1 cs=1] + RenderTableRow {TR} at (0,110) size 998x37 [color=#FFFFFF] [bgcolor=#000000] + RenderTableCell {TD} at (2,110) size 496x37 [r=1 c=0 rs=1 cs=1] RenderText {#text} at (199,9) size 98x18 text run at (199,9) width 98: "SVG Image" - RenderTableCell {TD} at (500,110) size 496x36 [r=1 c=1 rs=1 cs=1] + RenderTableCell {TD} at (500,110) size 496x37 [r=1 c=1 rs=1 cs=1] RenderText {#text} at (198,9) size 100x18 text run at (198,9) width 100: "PNG Image" - RenderTableRow {TR} at (0,148) size 998x380 - RenderTableCell {TD} at (2,148) size 496x380 [r=2 c=0 rs=1 cs=1] + RenderTableRow {TR} at (0,149) size 998x381 + RenderTableCell {TD} at (2,149) size 496x381 [r=2 c=0 rs=1 cs=1] RenderPartObject {EMBED} at (8,8) size 480x360 layer at (0,0) size 480x360 RenderView at (0,0) size 480x360 @@ -83,47 +83,47 @@ layer at (0,0) size 1026x1034 chunk 1 text run 1 at (10.00,340.00) startOffset 0 endOffset 16 width 261.00: "$Revision: 1.6 $" RenderPath {rect} at (0.50,0.50) size 479x359 [stroke={[type=SOLID] [color=#000000]}] [data="M1.00,1.00 L479.00,1.00 L479.00,359.00 L1.00,359.00 Z"] RenderText {#text} at (0,0) size 0x0 - RenderTableCell {TD} at (500,148) size 496x380 [r=2 c=1 rs=1 cs=1] + RenderTableCell {TD} at (500,149) size 496x381 [r=2 c=1 rs=1 cs=1] RenderImage {IMG} at (8,8) size 480x360 RenderText {#text} at (0,0) size 0x0 - RenderBlock {DIV} at (23,625) size 723x353 - RenderBlock {P} at (0,0) size 723x40 - RenderText {#text} at (0,1) size 708x38 + RenderBlock {DIV} at (23,630) size 723x369 + RenderBlock {P} at (0,0) size 723x42 + RenderText {#text} at (0,1) size 708x39 text run at (0,1) width 708: "Verifies implicit rendering order (paragraph 3.3) and grouping mechanism (paragraphs" - text run at (0,21) width 45: "3.4). " - text run at (45,21) width 467: "It also validates basic Shape, Image and text rendering." - RenderBlock {P} at (0,51) size 723x160 - RenderText {#text} at (0,1) size 706x158 + text run at (0,22) width 45: "3.4). " + text run at (45,22) width 467: "It also validates basic Shape, Image and text rendering." + RenderBlock {P} at (0,53) size 723x168 + RenderText {#text} at (0,1) size 706x165 text run at (0,1) width 162: "This test renders 3 " text run at (162,1) width 299: "elements: a text string \"SVG\", then " text run at (461,1) width 202: "a shape, then an image." - text run at (0,21) width 504: "Because of their definition order and coordinates, the image " - text run at (504,21) width 194: "should be on top of the" - text run at (0,41) width 428: "rectangle and the rectangle on top of the text. The " - text run at (428,41) width 247: "test validates that groups are" - text run at (0,61) width 376: "conceptually rendered offscreen before being " - text run at (376,61) width 330: "rendered on the canvas. This is done by" - text run at (0,81) width 363: "grouping the same overlapping objects and " - text run at (363,81) width 329: "rendering the group at half opacity. The" - text run at (0,101) width 367: "background pattern (vertical stripes) should " - text run at (367,101) width 293: "show throw all the group elements." - text run at (0,121) width 446: "However, none of the \"SVG\" should show through the " - text run at (446,121) width 213: "rectangle and none of the" - text run at (0,141) width 348: "rectangle should show through the image." - RenderBlock {P} at (0,222) size 723x100 - RenderText {#text} at (0,1) size 723x98 + text run at (0,22) width 504: "Because of their definition order and coordinates, the image " + text run at (504,22) width 194: "should be on top of the" + text run at (0,43) width 428: "rectangle and the rectangle on top of the text. The " + text run at (428,43) width 247: "test validates that groups are" + text run at (0,64) width 376: "conceptually rendered offscreen before being " + text run at (376,64) width 330: "rendered on the canvas. This is done by" + text run at (0,85) width 363: "grouping the same overlapping objects and " + text run at (363,85) width 329: "rendering the group at half opacity. The" + text run at (0,106) width 367: "background pattern (vertical stripes) should " + text run at (367,106) width 293: "show throw all the group elements." + text run at (0,127) width 446: "However, none of the \"SVG\" should show through the " + text run at (446,127) width 213: "rectangle and none of the" + text run at (0,148) width 348: "rectangle should show through the image." + RenderBlock {P} at (0,232) size 723x105 + RenderText {#text} at (0,1) size 723x102 text run at (0,1) width 658: "Prerequisites: the test assumes proper handling of the fill stroke, stroke-width," - text run at (0,21) width 723: "opacity, font-size rendering properties. It uses the rect, line, text and image elements," - text run at (0,41) width 25: "as " - text run at (25,41) width 657: "well as all the elements required for the test template. To ensure that the text" - text run at (0,61) width 73: "string is " - text run at (73,61) width 598: "overlapped by the other elements and to avoid a dependency on system" - text run at (0,81) width 223: "fonts, an SVG font is used." - RenderBlock {P} at (0,333) size 723x20 + text run at (0,22) width 723: "opacity, font-size rendering properties. It uses the rect, line, text and image elements," + text run at (0,43) width 25: "as " + text run at (25,43) width 657: "well as all the elements required for the test template. To ensure that the text" + text run at (0,64) width 73: "string is " + text run at (73,64) width 598: "overlapped by the other elements and to avoid a dependency on system" + text run at (0,85) width 223: "fonts, an SVG font is used." + RenderBlock {P} at (0,348) size 723x21 RenderText {#text} at (0,1) size 521x18 text run at (0,1) width 521: "The rendered image should match the reference image exactly." - RenderBlock {DIV} at (16,994) size 737x20 - RenderBlock {P} at (0,0) size 737x20 + RenderBlock {DIV} at (16,1015) size 737x21 + RenderBlock {P} at (0,0) size 737x21 RenderInline {A} at (0,0) size 202x18 [color=#0000EE] RenderText {#text} at (153,1) size 202x18 text run at (153,1) width 202: "pservers-pattern-01-b \x{2190}" @@ -138,4 +138,4 @@ layer at (0,0) size 1026x1034 RenderText {#text} at (411,1) size 173x18 text run at (411,1) width 173: "\x{2192} script-handle-01-b" RenderText {#text} at (0,0) size 0x0 -scrolled to 0,449 +scrolled to 0,471 diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/svg-fonts-in-html-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/svg-fonts-in-html-expected.checksum index 2b8aa29..71f575a 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/svg-fonts-in-html-expected.checksum +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/svg-fonts-in-html-expected.checksum @@ -1 +1 @@ -81aeebd771056ecd1f40fe7095b2651d
\ No newline at end of file +6c9220c84295b4f5b1037c9196db8b8d
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/svg-fonts-in-html-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/svg-fonts-in-html-expected.png Binary files differindex 912fb75..d804f84 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/svg-fonts-in-html-expected.png +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/svg-fonts-in-html-expected.png diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/svg-fonts-in-html-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/svg-fonts-in-html-expected.txt index 624fca9..6f1b9ab 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/svg-fonts-in-html-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/svg-fonts-in-html-expected.txt @@ -19,12 +19,12 @@ layer at (173,32) size 453x453 RenderInline {SPAN} at (0,0) size 0x0 RenderBlock {DIV} at (0,0) size 453x0 RenderInline {SPAN} at (0,0) size 0x0 -layer at (173,47) size 453x189 - RenderBlock (positioned) {H1} at (0,15) size 453x188 [color=#DD9955] - RenderInline {SPAN} at (0,0) size 340x189 - RenderText {#text} at (63,0) size 340x189 +layer at (173,47) size 453x190 + RenderBlock (positioned) {H1} at (0,15) size 453x190 [color=#DD9955] + RenderInline {SPAN} at (0,0) size 340x190 + RenderText {#text} at (63,0) size 340x190 text run at (63,0) width 327: "CSS ZEN" - text run at (56,94) width 340: "GARDEN" + text run at (56,95) width 340: "GARDEN" layer at (173,118) size 453x20 RenderBlock (positioned) {H2} at (0,86) size 453x20 [color=#EEFF00] RenderInline {SPAN} at (0,0) size 149x19 diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt index 86c80de..bf37eec 100644 --- a/webkit/tools/layout_tests/test_expectations.txt +++ b/webkit/tools/layout_tests/test_expectations.txt @@ -3168,13 +3168,6 @@ BUG24775 : LayoutTests/svg/custom/missing-xlink.svg = FAIL PASS BUG_DIMICH : LayoutTests/fast/events/add-event-without-document.html = TIMEOUT //WebKit roll 49562:49583 -BUG24851 : LayoutTests/css2.1/t090501-c414-flt-ln-00-d.html = FAIL -BUG24851 : LayoutTests/css2.1/t090501-c414-flt-ln-01-d-g.html = FAIL -BUG24851 : LayoutTests/css2.1/t090501-c414-flt-ln-02-d.html = FAIL -BUG24851 : LayoutTests/css2.1/t090501-c414-flt-ln-03-d.html = FAIL SKIP BUG_PFELDMAN : LayoutTests/inspector = FAIL -BUG24852 SLOW WIN LINUX : LayoutTests/css1/font_properties/font.html = FAIL BUG24854 WIN LINUX : LayoutTests/fast/forms/menulist-no-renderer-onmousedown.html = CRASH -BUG24855 WIN LINUX : LayoutTests/svg/custom/svg-fonts-in-html.html = FAIL -BUG24856 WIN : LayoutTests/svg/custom/scrolling-embedded-svg-file-image-repaint-problem.html = FAIL BUG_YAAR LINUX : LayoutTests/fast/replaced/border-radius-clip.html = FAIL |
