diff options
| author | levin@chromium.org <levin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-18 01:43:43 +0000 |
|---|---|---|
| committer | levin@chromium.org <levin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-18 01:43:43 +0000 |
| commit | bb490ed52982c8245d5c1a7511bd3c43003d3c99 (patch) | |
| tree | 1146ae946100a4ec321c47830c1d8157f306fe0e /webkit | |
| parent | ddcafd9d6661c36d1a1665e32ebf8354c1ae3d0d (diff) | |
| download | chromium_src-bb490ed52982c8245d5c1a7511bd3c43003d3c99.zip chromium_src-bb490ed52982c8245d5c1a7511bd3c43003d3c99.tar.gz chromium_src-bb490ed52982c8245d5c1a7511bd3c43003d3c99.tar.bz2 | |
Update test expectations due to changes in WebKit.
Due to http://trac.webkit.org/changeset/47229
LayoutTests/css1/font_properties/font_family.html
Due to http://trac.webkit.org/changeset/47173
LayoutTests/fast/canvas/canvas-zoom.html
Due to http://trac.webkit.org/changeset/47255
LayoutTests/fast/block/float/avoidance-percent-width-compat.html
LayoutTests/fast/block/float/avoidance-percent-width-strict.html
LayoutTests/fast/block/float/035.html
LayoutTests/fast/block/float/float-avoidance.html
LayoutTests/tables/mozilla/bugs/bug106158-1.html
TEST=None
BUG=None
Review URL: http://codereview.chromium.org/172065
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@23607 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
36 files changed, 165 insertions, 102 deletions
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/css1/font_properties/font_family-expected.checksum b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/css1/font_properties/font_family-expected.checksum index e787337..729ba05 100644 --- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/css1/font_properties/font_family-expected.checksum +++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/css1/font_properties/font_family-expected.checksum @@ -1 +1 @@ -f6b16d3dfddc3189a6d51a00aa091586
\ No newline at end of file +3fcf101e606a2970a46a73e1d4854e36
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/css1/font_properties/font_family-expected.png b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/css1/font_properties/font_family-expected.png Binary files differindex 0b3745f..1c97d17 100644 --- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/css1/font_properties/font_family-expected.png +++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/css1/font_properties/font_family-expected.png diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/block/float/035-expected.checksum b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/block/float/035-expected.checksum new file mode 100644 index 0000000..36fca60 --- /dev/null +++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/block/float/035-expected.checksum @@ -0,0 +1 @@ +d40075d71381b41daae5022f72ae5fca
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/block/float/035-expected.png b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/block/float/035-expected.png Binary files differnew file mode 100644 index 0000000..58d37fd --- /dev/null +++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/block/float/035-expected.png diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/block/float/avoidance-percent-width-compat-expected.checksum b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/block/float/avoidance-percent-width-compat-expected.checksum new file mode 100644 index 0000000..b0aff1a --- /dev/null +++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/block/float/avoidance-percent-width-compat-expected.checksum @@ -0,0 +1 @@ +7ade8859ddaac99743256207e653e13a
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/block/float/avoidance-percent-width-compat-expected.png b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/block/float/avoidance-percent-width-compat-expected.png Binary files differnew file mode 100644 index 0000000..2a2c92a --- /dev/null +++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/block/float/avoidance-percent-width-compat-expected.png diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/block/float/avoidance-percent-width-strict-expected.checksum b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/block/float/avoidance-percent-width-strict-expected.checksum new file mode 100644 index 0000000..6bfc232 --- /dev/null +++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/block/float/avoidance-percent-width-strict-expected.checksum @@ -0,0 +1 @@ +7565e7248db965c5854af48bee56f52f
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/block/float/avoidance-percent-width-strict-expected.png b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/block/float/avoidance-percent-width-strict-expected.png Binary files differnew file mode 100644 index 0000000..c3decc0 --- /dev/null +++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/block/float/avoidance-percent-width-strict-expected.png diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/block/float/float-avoidance-expected.checksum b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/block/float/float-avoidance-expected.checksum index 83bc5d4..b04380f 100644 --- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/block/float/float-avoidance-expected.checksum +++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/block/float/float-avoidance-expected.checksum @@ -1 +1 @@ -356c8caa8398f734e2863fb709ca364d
\ No newline at end of file +42845ae07b2312fdc8e0b5e5725fb923
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/block/float/float-avoidance-expected.png b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/block/float/float-avoidance-expected.png Binary files differindex a2b7713..1b79084 100644 --- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/block/float/float-avoidance-expected.png +++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/block/float/float-avoidance-expected.png diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/block/float/float-avoidance-expected.txt b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/block/float/float-avoidance-expected.txt index 8995b7c..b06d839 100644 --- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/block/float/float-avoidance-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/block/float/float-avoidance-expected.txt @@ -1,8 +1,8 @@ -layer at (0,0) size 785x2408 +layer at (0,0) size 785x2444 RenderView at (0,0) size 785x600 -layer at (0,0) size 785x2408 - RenderBlock {HTML} at (0,0) size 785x2408 - RenderBody {BODY} at (8,8) size 769x2392 +layer at (0,0) size 785x2444 + RenderBlock {HTML} at (0,0) size 785x2444 + RenderBody {BODY} at (8,8) size 769x2428 RenderBlock (anonymous) at (0,0) size 769x40 RenderText {#text} at (0,0) size 754x39 text run at (0,0) width 517: "Test of objects that avoid floats to see what they do with percentage and auto widths. " @@ -129,7 +129,7 @@ layer at (0,0) size 785x2408 RenderText {#text} at (0,0) size 695x19 text run at (0,0) width 550: "The block-level table below has a percentage width and should still be even with the select. " text run at (550,0) width 145: "It spills out of the block." - RenderBlock {P} at (0,958) size 220x132 [border: (10px solid #FF0000)] + RenderBlock {P} at (0,958) size 220x154 [border: (10px solid #FF0000)] RenderBlock (anonymous) at (10,10) size 200x20 RenderText {#text} at (0,0) size 56x19 text run at (0,0) width 56: "Line One" @@ -139,7 +139,7 @@ layer at (0,0) size 785x2408 RenderText at (4,1) size 24x16 text run at (4,1) width 24: "One" RenderText {#text} at (0,0) size 0x0 - RenderTable {TABLE} at (110,30) size 200x72 [border: (2px outset #808080)] + RenderTable {TABLE} at (10,52) size 200x72 [border: (2px outset #808080)] RenderTableSection {TBODY} at (2,2) size 196x68 RenderTableRow {TR} at (0,2) size 196x64 RenderTableCell {TD} at (2,2) size 192x64 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1] @@ -147,13 +147,13 @@ layer at (0,0) size 785x2408 text run at (2,2) width 150: "Floating table that should" text run at (2,22) width 154: "shrink so it can be next to" text run at (2,42) width 85: "previous float." - RenderBlock (anonymous) at (10,102) size 200x20 + RenderBlock (anonymous) at (10,124) size 200x20 RenderBR {BR} at (0,0) size 0x19 - RenderBlock (anonymous) at (0,1106) size 769x20 + RenderBlock (anonymous) at (0,1128) size 769x20 RenderText {#text} at (0,0) size 705x19 text run at (0,0) width 517: "The block-level table below has an auto width and should still be even with the select. " text run at (517,0) width 188: "It shrinks to fit inside the block." - RenderBlock {P} at (0,1142) size 220x172 [border: (10px solid #FF0000)] + RenderBlock {P} at (0,1164) size 220x172 [border: (10px solid #FF0000)] RenderBlock (anonymous) at (10,10) size 200x20 RenderText {#text} at (0,0) size 56x19 text run at (0,0) width 56: "Line One" @@ -175,10 +175,10 @@ layer at (0,0) size 785x2408 text run at (2,82) width 85: "previous float." RenderBlock (anonymous) at (10,142) size 200x20 RenderBR {BR} at (0,0) size 0x19 - RenderBlock (anonymous) at (0,1330) size 769x20 + RenderBlock (anonymous) at (0,1352) size 769x20 RenderText {#text} at (0,0) size 507x19 text run at (0,0) width 507: "The floating overflow section with a percentage width should be even with the select." - RenderBlock {DIV} at (0,1350) size 220x140 [border: (10px solid #FF0000)] + RenderBlock {DIV} at (0,1372) size 220x140 [border: (10px solid #FF0000)] RenderText {#text} at (10,10) size 56x19 text run at (10,10) width 56: "Line One" RenderBR {BR} at (66,25) size 0x0 @@ -189,11 +189,11 @@ layer at (0,0) size 785x2408 RenderText {#text} at (0,0) size 0x0 RenderText {#text} at (0,0) size 0x0 RenderBR {BR} at (210,30) size 0x19 - RenderBlock (anonymous) at (0,1490) size 769x40 + RenderBlock (anonymous) at (0,1512) size 769x40 RenderText {#text} at (0,0) size 763x39 text run at (0,0) width 763: "The floating overflow section with an auto width should be even with the select and shrinks to use the available line width. THIS" text run at (0,20) width 172: "IS CURRENTLY BUGGY." - RenderBlock {DIV} at (0,1530) size 220x122 [border: (10px solid #FF0000)] + RenderBlock {DIV} at (0,1552) size 220x122 [border: (10px solid #FF0000)] RenderText {#text} at (10,10) size 56x19 text run at (10,10) width 56: "Line One" RenderBR {BR} at (66,25) size 0x0 @@ -204,10 +204,10 @@ layer at (0,0) size 785x2408 RenderText {#text} at (0,0) size 0x0 RenderText {#text} at (0,0) size 0x0 RenderBR {BR} at (110,30) size 0x19 - RenderBlock (anonymous) at (0,1652) size 769x20 + RenderBlock (anonymous) at (0,1674) size 769x20 RenderText {#text} at (0,0) size 616x19 text run at (0,0) width 616: "The block-level overflow section below has a percentage width and should still be even with the select." - RenderBlock {DIV} at (0,1672) size 220x160 [border: (10px solid #FF0000)] + RenderBlock {DIV} at (0,1694) size 220x160 [border: (10px solid #FF0000)] RenderBlock (anonymous) at (10,10) size 200x20 RenderText {#text} at (0,0) size 56x19 text run at (0,0) width 56: "Line One" @@ -219,12 +219,12 @@ layer at (0,0) size 785x2408 RenderText {#text} at (0,0) size 0x0 RenderBlock (anonymous) at (10,130) size 200x20 RenderBR {BR} at (0,0) size 0x19 - RenderBlock (anonymous) at (0,1832) size 769x40 + RenderBlock (anonymous) at (0,1854) size 769x40 RenderText {#text} at (0,0) size 733x39 text run at (0,0) width 587: "The block-level overflow section below has an auto width and should still be even with the select. " text run at (587,0) width 146: "It shrinks to fit inside the" text run at (0,20) width 38: "block." - RenderBlock {DIV} at (0,1872) size 220x160 [border: (10px solid #FF0000)] + RenderBlock {DIV} at (0,1894) size 220x160 [border: (10px solid #FF0000)] RenderBlock (anonymous) at (10,10) size 200x20 RenderText {#text} at (0,0) size 56x19 text run at (0,0) width 56: "Line One" @@ -236,10 +236,10 @@ layer at (0,0) size 785x2408 RenderText {#text} at (0,0) size 0x0 RenderBlock (anonymous) at (10,130) size 200x20 RenderBR {BR} at (0,0) size 0x19 - RenderBlock (anonymous) at (0,2032) size 769x20 + RenderBlock (anonymous) at (0,2054) size 769x20 RenderText {#text} at (0,0) size 420x19 text run at (0,0) width 420: "The floating hr with a percentage width should be even with the select." - RenderBlock {DIV} at (0,2052) size 220x62 [border: (10px solid #FF0000)] + RenderBlock {DIV} at (0,2074) size 220x62 [border: (10px solid #FF0000)] RenderText {#text} at (10,10) size 56x19 text run at (10,10) width 56: "Line One" RenderBR {BR} at (66,25) size 0x0 @@ -251,10 +251,10 @@ layer at (0,0) size 785x2408 RenderBlock (floating) {HR} at (112,32) size 82x2 [border: (1px inset #000000)] RenderText {#text} at (0,0) size 0x0 RenderBR {BR} at (196,30) size 0x19 - RenderBlock (anonymous) at (0,2114) size 769x20 + RenderBlock (anonymous) at (0,2136) size 769x20 RenderText {#text} at (0,0) size 735x19 text run at (0,0) width 735: "The floating hr below should still be even with the select and shrinks to use its intrinsic width (which is basically like 1-2px)." - RenderBlock {DIV} at (0,2134) size 220x62 [border: (10px solid #FF0000)] + RenderBlock {DIV} at (0,2156) size 220x62 [border: (10px solid #FF0000)] RenderText {#text} at (10,10) size 56x19 text run at (10,10) width 56: "Line One" RenderBR {BR} at (66,25) size 0x0 @@ -266,10 +266,10 @@ layer at (0,0) size 785x2408 RenderBlock (floating) {HR} at (112,32) size 2x2 [border: (1px inset #000000)] RenderText {#text} at (0,0) size 0x0 RenderBR {BR} at (116,30) size 0x19 - RenderBlock (anonymous) at (0,2196) size 769x20 + RenderBlock (anonymous) at (0,2218) size 769x20 RenderText {#text} at (0,0) size 529x19 text run at (0,0) width 529: "The block-level hr below has a percentage width and should still be even with the select." - RenderBlock {DIV} at (0,2216) size 220x78 [border: (10px solid #FF0000)] + RenderBlock {DIV} at (0,2238) size 220x92 [border: (10px solid #FF0000)] RenderBlock (anonymous) at (10,10) size 200x20 RenderText {#text} at (0,0) size 56x19 text run at (0,0) width 56: "Line One" @@ -279,14 +279,14 @@ layer at (0,0) size 785x2408 RenderText at (4,1) size 24x16 text run at (4,1) width 24: "One" RenderText {#text} at (0,0) size 0x0 - RenderBlock {HR} at (110,38) size 202x2 [border: (1px inset #000000)] - RenderBlock (anonymous) at (10,48) size 200x20 - RenderBR {BR} at (100,0) size 0x19 - RenderBlock (anonymous) at (0,2294) size 769x20 + RenderBlock {HR} at (10,52) size 202x2 [border: (1px inset #000000)] + RenderBlock (anonymous) at (10,62) size 200x20 + RenderBR {BR} at (0,0) size 0x19 + RenderBlock (anonymous) at (0,2330) size 769x20 RenderText {#text} at (0,0) size 590x19 text run at (0,0) width 500: "The block-level hr below has an auto width and should still be even with the select. " text run at (500,0) width 90: "It shrinks to fit." - RenderBlock {DIV} at (0,2314) size 220x78 [border: (10px solid #FF0000)] + RenderBlock {DIV} at (0,2350) size 220x78 [border: (10px solid #FF0000)] RenderBlock (anonymous) at (10,10) size 200x20 RenderText {#text} at (0,0) size 56x19 text run at (0,0) width 56: "Line One" @@ -299,7 +299,7 @@ layer at (0,0) size 785x2408 RenderBlock {HR} at (110,38) size 100x2 [border: (1px inset #000000)] RenderBlock (anonymous) at (10,48) size 200x20 RenderBR {BR} at (100,0) size 0x19 -layer at (118,1388) size 100x100 +layer at (118,1410) size 100x100 RenderBlock (floating) {DIV} at (110,30) size 100x100 RenderText {#text} at (0,0) size 99x99 text run at (0,0) width 56: "This is an" @@ -307,13 +307,13 @@ layer at (118,1388) size 100x100 text run at (0,40) width 98: "with enough text" text run at (0,60) width 95: "to have to wrap" text run at (0,80) width 96: "to multiple lines." -layer at (18,1590) size 200x60 +layer at (18,1612) size 200x60 RenderBlock (floating) {DIV} at (10,52) size 200x60 RenderText {#text} at (0,0) size 188x59 text run at (0,0) width 188: "This is an overflow section with" text run at (0,20) width 184: "enough text to have to wrap to" text run at (0,40) width 80: "multiple lines." -layer at (118,1710) size 100x100 +layer at (118,1732) size 100x100 RenderBlock {DIV} at (110,30) size 100x100 RenderText {#text} at (0,0) size 99x99 text run at (0,0) width 56: "This is an" @@ -321,7 +321,7 @@ layer at (118,1710) size 100x100 text run at (0,40) width 98: "with enough text" text run at (0,60) width 95: "to have to wrap" text run at (0,80) width 96: "to multiple lines." -layer at (118,1910) size 100x100 +layer at (118,1932) size 100x100 RenderBlock {DIV} at (110,30) size 100x100 RenderText {#text} at (0,0) size 99x99 text run at (0,0) width 56: "This is an" diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/canvas/canvas-zoom-expected.checksum b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/canvas/canvas-zoom-expected.checksum new file mode 100644 index 0000000..aabe4d3 --- /dev/null +++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/canvas/canvas-zoom-expected.checksum @@ -0,0 +1 @@ +8fd49841c07d233469f68b959612ef4e
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/canvas/canvas-zoom-expected.png b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/canvas/canvas-zoom-expected.png Binary files differnew file mode 100644 index 0000000..6d09cbf --- /dev/null +++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/canvas/canvas-zoom-expected.png diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/tables/mozilla/bugs/bug106158-1-expected.checksum b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/tables/mozilla/bugs/bug106158-1-expected.checksum index dd49877..b59a19b 100644 --- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/tables/mozilla/bugs/bug106158-1-expected.checksum +++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/tables/mozilla/bugs/bug106158-1-expected.checksum @@ -1 +1 @@ -2f8847d79f3630adb64f6e3c8250e0a6
\ No newline at end of file +af3540ae603d93e54adeed95db44c91f
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/tables/mozilla/bugs/bug106158-1-expected.png b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/tables/mozilla/bugs/bug106158-1-expected.png Binary files differindex 1f0f94d..8397895 100644 --- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/tables/mozilla/bugs/bug106158-1-expected.png +++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/tables/mozilla/bugs/bug106158-1-expected.png diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/css1/font_properties/font_family-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/css1/font_properties/font_family-expected.checksum index eba2afd..3039503 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/css1/font_properties/font_family-expected.checksum +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/css1/font_properties/font_family-expected.checksum @@ -1 +1 @@ -aa8ad44020466fa28d5621fcadba055e
\ No newline at end of file +e45c9808529fe1ce930173520680587a
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/css1/font_properties/font_family-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/css1/font_properties/font_family-expected.png Binary files differindex 5f278b8..b4d8c7c 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/css1/font_properties/font_family-expected.png +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/css1/font_properties/font_family-expected.png diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/css1/font_properties/font_family-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/css1/font_properties/font_family-expected.txt index a6a5a071..a515320 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/css1/font_properties/font_family-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/css1/font_properties/font_family-expected.txt @@ -1,8 +1,8 @@ -layer at (0,0) size 785x1314 +layer at (0,0) size 785x1324 RenderView at (0,0) size 785x600 -layer at (0,0) size 785x1314 - RenderBlock {HTML} at (0,0) size 785x1314 - RenderBody {BODY} at (8,8) size 769x1298 [bgcolor=#CCCCCC] +layer at (0,0) size 785x1324 + RenderBlock {HTML} at (0,0) size 785x1324 + RenderBody {BODY} at (8,8) size 769x1308 [bgcolor=#CCCCCC] RenderBlock {P} at (0,0) size 769x20 RenderText {#text} at (0,0) size 337x19 text run at (0,0) width 337: "The style declarations which apply to the text below are:" @@ -50,11 +50,11 @@ layer at (0,0) size 785x1314 RenderBlock {P} at (0,440) size 769x19 RenderText {#text} at (0,0) size 383x18 text run at (0,0) width 383: "This sentence should be in a sans-serif font, not cursive." - RenderBlock {P} at (0,475) size 769x16 - RenderText {#text} at (0,0) size 440x16 - text run at (0,0) width 440: "This sentence should be in a monospace font, not serif." - RenderBlock {HR} at (0,504) size 769x2 [border: (1px inset #000000)] - RenderBlock {DIV} at (0,519) size 769x210 + RenderBlock {P} at (0,475) size 769x18 + RenderText {#text} at (0,0) size 550x18 + text run at (0,0) width 550: "This sentence should be in a monospace font, not serif." + RenderBlock {HR} at (0,509) size 769x2 [border: (1px inset #000000)] + RenderBlock {DIV} at (0,524) size 769x210 RenderBlock {P} at (0,0) size 769x32 RenderText {#text} at (0,0) size 768x32 text run at (0,0) width 768: "This sentence is normal for the first division, which is the next five sentences; it should be a" @@ -74,18 +74,18 @@ layer at (0,0) size 785x1314 RenderBlock {P} at (0,194) size 769x16 RenderText {#text} at (0,0) size 352x16 text run at (0,0) width 352: "This sentence should be in a monospace font." - RenderTable {TABLE} at (0,742) size 769x556 [border: (1px outset #808080)] - RenderTableSection {TBODY} at (1,1) size 767x554 + RenderTable {TABLE} at (0,747) size 769x561 [border: (1px outset #808080)] + RenderTableSection {TBODY} at (1,1) size 767x559 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 767x526 - RenderTableCell {TD} at (0,277) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] + RenderTableRow {TR} at (0,28) size 767x531 + RenderTableCell {TD} at (0,279) 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 755x526 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] + RenderTableCell {TD} at (12,28) size 755x531 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] RenderBlock {DIV} at (4,4) size 747x198 RenderBlock {P} at (0,0) size 747x20 RenderText {#text} at (0,0) size 599x19 @@ -109,11 +109,11 @@ layer at (0,0) size 785x1314 RenderBlock {P} at (4,233) size 747x19 RenderText {#text} at (0,0) size 383x18 text run at (0,0) width 383: "This sentence should be in a sans-serif font, not cursive." - RenderBlock {P} at (4,268) size 747x16 - RenderText {#text} at (0,0) size 440x16 - text run at (0,0) width 440: "This sentence should be in a monospace font, not serif." - RenderBlock {HR} at (4,297) size 747x2 [border: (1px inset #000000)] - RenderBlock {DIV} at (4,312) size 747x210 + RenderBlock {P} at (4,268) size 747x18 + RenderText {#text} at (0,0) size 550x18 + text run at (0,0) width 550: "This sentence should be in a monospace font, not serif." + RenderBlock {HR} at (4,302) size 747x2 [border: (1px inset #000000)] + RenderBlock {DIV} at (4,317) size 747x210 RenderBlock {P} at (0,0) size 747x32 RenderText {#text} at (0,0) size 728x32 text run at (0,0) width 728: "This sentence is normal for the first division, which is the next five sentences; it should" diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/block/float/035-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/block/float/035-expected.checksum index 40d4546..fa123db 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/block/float/035-expected.checksum +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/block/float/035-expected.checksum @@ -1 +1 @@ -d975c001de9476347c2d1168ea94a4e7
\ No newline at end of file +d2e5d1cb2b639cccae99d098e9463e02
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/block/float/035-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/block/float/035-expected.png Binary files differindex 99db00d..fc43ca6 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/block/float/035-expected.png +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/block/float/035-expected.png diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/block/float/avoidance-percent-width-compat-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/block/float/avoidance-percent-width-compat-expected.checksum new file mode 100644 index 0000000..4d44e2c --- /dev/null +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/block/float/avoidance-percent-width-compat-expected.checksum @@ -0,0 +1 @@ +539990595e047bf9896a76b169a0da6f
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/block/float/avoidance-percent-width-compat-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/block/float/avoidance-percent-width-compat-expected.png Binary files differnew file mode 100644 index 0000000..c14a18b --- /dev/null +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/block/float/avoidance-percent-width-compat-expected.png diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/block/float/avoidance-percent-width-compat-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/block/float/avoidance-percent-width-compat-expected.txt new file mode 100644 index 0000000..8c11e2f --- /dev/null +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/block/float/avoidance-percent-width-compat-expected.txt @@ -0,0 +1,13 @@ +layer at (0,0) size 800x600 + RenderView at (0,0) size 800x600 +layer at (0,0) size 800x600 + RenderBlock {HTML} at (0,0) size 800x600 + RenderBody {BODY} at (8,8) size 784x584 + RenderBlock {DIV} at (0,0) size 784x432 + RenderBlock (floating) {DIV} at (0,0) size 554x24 [border: (2px solid #FF0000)] + RenderText {#text} at (2,2) size 291x19 + text run at (2,2) width 291: "There should be a green border table below this:" + RenderTable {TABLE} at (0,24) size 784x408 [border: (2px solid #008000)] + RenderTableSection {TBODY} at (2,2) size 780x404 + RenderTableRow {TR} at (0,2) size 780x400 + RenderTableCell {TD} at (2,201) size 776x2 [r=0 c=0 rs=1 cs=1] diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/block/float/avoidance-percent-width-strict-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/block/float/avoidance-percent-width-strict-expected.checksum new file mode 100644 index 0000000..131138b --- /dev/null +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/block/float/avoidance-percent-width-strict-expected.checksum @@ -0,0 +1 @@ +2284b2202208f02bc68cd25e6d399fe7
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/block/float/avoidance-percent-width-strict-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/block/float/avoidance-percent-width-strict-expected.png Binary files differnew file mode 100644 index 0000000..a2e1d3a --- /dev/null +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/block/float/avoidance-percent-width-strict-expected.png diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/block/float/avoidance-percent-width-strict-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/block/float/avoidance-percent-width-strict-expected.txt new file mode 100644 index 0000000..4d91d30 --- /dev/null +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/block/float/avoidance-percent-width-strict-expected.txt @@ -0,0 +1,28 @@ +layer at (0,0) size 812x585 + RenderView at (0,0) size 800x585 +layer at (0,0) size 812x148 + RenderBlock {HTML} at (0,0) size 800x148 + RenderBody {BODY} at (8,8) size 784x132 + RenderBlock {DIV} at (0,0) size 800x54 + RenderBlock (floating) {DIV} at (0,0) size 554x24 [border: (2px solid #FF0000)] + RenderText {#text} at (2,2) size 482x19 + text run at (2,2) width 482: "(Parent DIV have no border set) There should be a green table below this block" + RenderTable {TABLE} at (0,24) size 800x30 [border: (2px solid #008000)] + RenderTableSection {TBODY} at (2,2) size 796x26 + RenderTableRow {TR} at (0,2) size 796x22 + RenderTableCell {TD} at (2,2) size 792x22 [r=0 c=0 rs=1 cs=1] + RenderText {#text} at (1,1) size 21x19 + text run at (1,1) width 21: "test" + RenderBlock (anonymous) at (0,54) size 784x20 + RenderBR {BR} at (0,0) size 0x19 + RenderBlock {DIV} at (0,74) size 804x58 [border: (2px solid #0000FF)] + RenderBlock (floating) {DIV} at (2,2) size 554x24 [border: (2px solid #FF0000)] + RenderText {#text} at (2,2) size 519x19 + text run at (2,2) width 238: "(Parent DIV have 2px blue border set) " + text run at (240,2) width 281: "There should be a green table below this block" + RenderTable {TABLE} at (2,26) size 800x30 [border: (2px solid #008000)] + RenderTableSection {TBODY} at (2,2) size 796x26 + RenderTableRow {TR} at (0,2) size 796x22 + RenderTableCell {TD} at (2,2) size 792x22 [r=0 c=0 rs=1 cs=1] + RenderText {#text} at (1,1) size 21x19 + text run at (1,1) width 21: "test" diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/block/float/float-avoidance-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/block/float/float-avoidance-expected.checksum index 3b1bfcd..e177a63 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/block/float/float-avoidance-expected.checksum +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/block/float/float-avoidance-expected.checksum @@ -1 +1 @@ -09bec5eb88a1ee9adab6143648e29bd6
\ No newline at end of file +e20da86871ffb2f04bf5db9f2ecb8f3c
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/block/float/float-avoidance-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/block/float/float-avoidance-expected.png Binary files differindex 0259a5d..fde5fa4 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/block/float/float-avoidance-expected.png +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/block/float/float-avoidance-expected.png diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/block/float/float-avoidance-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/block/float/float-avoidance-expected.txt index 6c3813f..79781cf 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/block/float/float-avoidance-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/block/float/float-avoidance-expected.txt @@ -1,8 +1,8 @@ -layer at (0,0) size 785x2418 +layer at (0,0) size 785x2458 RenderView at (0,0) size 785x600 -layer at (0,0) size 785x2418 - RenderBlock {HTML} at (0,0) size 785x2418 - RenderBody {BODY} at (8,8) size 769x2402 +layer at (0,0) size 785x2458 + RenderBlock {HTML} at (0,0) size 785x2458 + RenderBody {BODY} at (8,8) size 769x2442 RenderBlock (anonymous) at (0,0) size 769x40 RenderText {#text} at (0,0) size 754x39 text run at (0,0) width 517: "Test of objects that avoid floats to see what they do with percentage and auto widths. " @@ -129,7 +129,7 @@ layer at (0,0) size 785x2418 RenderText {#text} at (0,0) size 695x19 text run at (0,0) width 550: "The block-level table below has a percentage width and should still be even with the select. " text run at (550,0) width 145: "It spills out of the block." - RenderBlock {P} at (0,962) size 220x132 [border: (10px solid #FF0000)] + RenderBlock {P} at (0,962) size 220x156 [border: (10px solid #FF0000)] RenderBlock (anonymous) at (10,10) size 200x20 RenderText {#text} at (0,0) size 56x19 text run at (0,0) width 56: "Line One" @@ -139,7 +139,7 @@ layer at (0,0) size 785x2418 RenderText at (4,1) size 24x16 text run at (4,1) width 24: "One" RenderText {#text} at (0,0) size 0x0 - RenderTable {TABLE} at (110,30) size 200x72 [border: (2px outset #808080)] + RenderTable {TABLE} at (10,54) size 200x72 [border: (2px outset #808080)] RenderTableSection {TBODY} at (2,2) size 196x68 RenderTableRow {TR} at (0,2) size 196x64 RenderTableCell {TD} at (2,2) size 192x64 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1] @@ -147,13 +147,13 @@ layer at (0,0) size 785x2418 text run at (2,2) width 150: "Floating table that should" text run at (2,22) width 154: "shrink so it can be next to" text run at (2,42) width 85: "previous float." - RenderBlock (anonymous) at (10,102) size 200x20 + RenderBlock (anonymous) at (10,126) size 200x20 RenderBR {BR} at (0,0) size 0x19 - RenderBlock (anonymous) at (0,1110) size 769x20 + RenderBlock (anonymous) at (0,1134) size 769x20 RenderText {#text} at (0,0) size 705x19 text run at (0,0) width 517: "The block-level table below has an auto width and should still be even with the select. " text run at (517,0) width 188: "It shrinks to fit inside the block." - RenderBlock {P} at (0,1146) size 220x172 [border: (10px solid #FF0000)] + RenderBlock {P} at (0,1170) size 220x172 [border: (10px solid #FF0000)] RenderBlock (anonymous) at (10,10) size 200x20 RenderText {#text} at (0,0) size 56x19 text run at (0,0) width 56: "Line One" @@ -175,10 +175,10 @@ layer at (0,0) size 785x2418 text run at (2,82) width 85: "previous float." RenderBlock (anonymous) at (10,142) size 200x20 RenderBR {BR} at (0,0) size 0x19 - RenderBlock (anonymous) at (0,1334) size 769x20 + RenderBlock (anonymous) at (0,1358) size 769x20 RenderText {#text} at (0,0) size 507x19 text run at (0,0) width 507: "The floating overflow section with a percentage width should be even with the select." - RenderBlock {DIV} at (0,1354) size 220x140 [border: (10px solid #FF0000)] + RenderBlock {DIV} at (0,1378) size 220x140 [border: (10px solid #FF0000)] RenderText {#text} at (10,10) size 56x19 text run at (10,10) width 56: "Line One" RenderBR {BR} at (66,25) size 0x0 @@ -189,11 +189,11 @@ layer at (0,0) size 785x2418 RenderText {#text} at (0,0) size 0x0 RenderText {#text} at (0,0) size 0x0 RenderBR {BR} at (210,30) size 0x19 - RenderBlock (anonymous) at (0,1494) size 769x40 + RenderBlock (anonymous) at (0,1518) size 769x40 RenderText {#text} at (0,0) size 763x39 text run at (0,0) width 763: "The floating overflow section with an auto width should be even with the select and shrinks to use the available line width. THIS" text run at (0,20) width 172: "IS CURRENTLY BUGGY." - RenderBlock {DIV} at (0,1534) size 220x124 [border: (10px solid #FF0000)] + RenderBlock {DIV} at (0,1558) size 220x124 [border: (10px solid #FF0000)] RenderText {#text} at (10,10) size 56x19 text run at (10,10) width 56: "Line One" RenderBR {BR} at (66,25) size 0x0 @@ -204,10 +204,10 @@ layer at (0,0) size 785x2418 RenderText {#text} at (0,0) size 0x0 RenderText {#text} at (0,0) size 0x0 RenderBR {BR} at (110,30) size 0x19 - RenderBlock (anonymous) at (0,1658) size 769x20 + RenderBlock (anonymous) at (0,1682) size 769x20 RenderText {#text} at (0,0) size 616x19 text run at (0,0) width 616: "The block-level overflow section below has a percentage width and should still be even with the select." - RenderBlock {DIV} at (0,1678) size 220x160 [border: (10px solid #FF0000)] + RenderBlock {DIV} at (0,1702) size 220x160 [border: (10px solid #FF0000)] RenderBlock (anonymous) at (10,10) size 200x20 RenderText {#text} at (0,0) size 56x19 text run at (0,0) width 56: "Line One" @@ -219,12 +219,12 @@ layer at (0,0) size 785x2418 RenderText {#text} at (0,0) size 0x0 RenderBlock (anonymous) at (10,130) size 200x20 RenderBR {BR} at (0,0) size 0x19 - RenderBlock (anonymous) at (0,1838) size 769x40 + RenderBlock (anonymous) at (0,1862) size 769x40 RenderText {#text} at (0,0) size 733x39 text run at (0,0) width 587: "The block-level overflow section below has an auto width and should still be even with the select. " text run at (587,0) width 146: "It shrinks to fit inside the" text run at (0,20) width 38: "block." - RenderBlock {DIV} at (0,1878) size 220x160 [border: (10px solid #FF0000)] + RenderBlock {DIV} at (0,1902) size 220x160 [border: (10px solid #FF0000)] RenderBlock (anonymous) at (10,10) size 200x20 RenderText {#text} at (0,0) size 56x19 text run at (0,0) width 56: "Line One" @@ -236,10 +236,10 @@ layer at (0,0) size 785x2418 RenderText {#text} at (0,0) size 0x0 RenderBlock (anonymous) at (10,130) size 200x20 RenderBR {BR} at (0,0) size 0x19 - RenderBlock (anonymous) at (0,2038) size 769x20 + RenderBlock (anonymous) at (0,2062) size 769x20 RenderText {#text} at (0,0) size 420x19 text run at (0,0) width 420: "The floating hr with a percentage width should be even with the select." - RenderBlock {DIV} at (0,2058) size 220x64 [border: (10px solid #FF0000)] + RenderBlock {DIV} at (0,2082) size 220x64 [border: (10px solid #FF0000)] RenderText {#text} at (10,10) size 56x19 text run at (10,10) width 56: "Line One" RenderBR {BR} at (66,25) size 0x0 @@ -251,10 +251,10 @@ layer at (0,0) size 785x2418 RenderBlock (floating) {HR} at (112,32) size 82x2 [border: (1px inset #000000)] RenderText {#text} at (0,0) size 0x0 RenderBR {BR} at (196,30) size 0x19 - RenderBlock (anonymous) at (0,2122) size 769x20 + RenderBlock (anonymous) at (0,2146) size 769x20 RenderText {#text} at (0,0) size 735x19 text run at (0,0) width 735: "The floating hr below should still be even with the select and shrinks to use its intrinsic width (which is basically like 1-2px)." - RenderBlock {DIV} at (0,2142) size 220x64 [border: (10px solid #FF0000)] + RenderBlock {DIV} at (0,2166) size 220x64 [border: (10px solid #FF0000)] RenderText {#text} at (10,10) size 56x19 text run at (10,10) width 56: "Line One" RenderBR {BR} at (66,25) size 0x0 @@ -266,10 +266,10 @@ layer at (0,0) size 785x2418 RenderBlock (floating) {HR} at (112,32) size 2x2 [border: (1px inset #000000)] RenderText {#text} at (0,0) size 0x0 RenderBR {BR} at (116,30) size 0x19 - RenderBlock (anonymous) at (0,2206) size 769x20 + RenderBlock (anonymous) at (0,2230) size 769x20 RenderText {#text} at (0,0) size 529x19 text run at (0,0) width 529: "The block-level hr below has a percentage width and should still be even with the select." - RenderBlock {DIV} at (0,2226) size 220x78 [border: (10px solid #FF0000)] + RenderBlock {DIV} at (0,2250) size 220x94 [border: (10px solid #FF0000)] RenderBlock (anonymous) at (10,10) size 200x20 RenderText {#text} at (0,0) size 56x19 text run at (0,0) width 56: "Line One" @@ -279,14 +279,14 @@ layer at (0,0) size 785x2418 RenderText at (4,1) size 24x16 text run at (4,1) width 24: "One" RenderText {#text} at (0,0) size 0x0 - RenderBlock {HR} at (110,38) size 202x2 [border: (1px inset #000000)] - RenderBlock (anonymous) at (10,48) size 200x20 - RenderBR {BR} at (100,0) size 0x19 - RenderBlock (anonymous) at (0,2304) size 769x20 + RenderBlock {HR} at (10,54) size 202x2 [border: (1px inset #000000)] + RenderBlock (anonymous) at (10,64) size 200x20 + RenderBR {BR} at (0,0) size 0x19 + RenderBlock (anonymous) at (0,2344) size 769x20 RenderText {#text} at (0,0) size 590x19 text run at (0,0) width 500: "The block-level hr below has an auto width and should still be even with the select. " text run at (500,0) width 90: "It shrinks to fit." - RenderBlock {DIV} at (0,2324) size 220x78 [border: (10px solid #FF0000)] + RenderBlock {DIV} at (0,2364) size 220x78 [border: (10px solid #FF0000)] RenderBlock (anonymous) at (10,10) size 200x20 RenderText {#text} at (0,0) size 56x19 text run at (0,0) width 56: "Line One" @@ -299,7 +299,7 @@ layer at (0,0) size 785x2418 RenderBlock {HR} at (110,38) size 100x2 [border: (1px inset #000000)] RenderBlock (anonymous) at (10,48) size 200x20 RenderBR {BR} at (100,0) size 0x19 -layer at (118,1392) size 100x100 +layer at (118,1416) size 100x100 RenderBlock (floating) {DIV} at (110,30) size 100x100 RenderText {#text} at (0,0) size 99x99 text run at (0,0) width 56: "This is an" @@ -307,13 +307,13 @@ layer at (118,1392) size 100x100 text run at (0,40) width 98: "with enough text" text run at (0,60) width 95: "to have to wrap" text run at (0,80) width 96: "to multiple lines." -layer at (18,1596) size 200x60 +layer at (18,1620) size 200x60 RenderBlock (floating) {DIV} at (10,54) size 200x60 RenderText {#text} at (0,0) size 188x59 text run at (0,0) width 188: "This is an overflow section with" text run at (0,20) width 184: "enough text to have to wrap to" text run at (0,40) width 80: "multiple lines." -layer at (118,1716) size 100x100 +layer at (118,1740) size 100x100 RenderBlock {DIV} at (110,30) size 100x100 RenderText {#text} at (0,0) size 99x99 text run at (0,0) width 56: "This is an" @@ -321,7 +321,7 @@ layer at (118,1716) size 100x100 text run at (0,40) width 98: "with enough text" text run at (0,60) width 95: "to have to wrap" text run at (0,80) width 96: "to multiple lines." -layer at (118,1916) size 100x100 +layer at (118,1940) size 100x100 RenderBlock {DIV} at (110,30) size 100x100 RenderText {#text} at (0,0) size 99x99 text run at (0,0) width 56: "This is an" diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/canvas/canvas-zoom-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/canvas/canvas-zoom-expected.checksum new file mode 100644 index 0000000..56a02ad --- /dev/null +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/canvas/canvas-zoom-expected.checksum @@ -0,0 +1 @@ +3a8d63c612a0b710927dfbc9f418110d
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/canvas/canvas-zoom-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/canvas/canvas-zoom-expected.png Binary files differnew file mode 100644 index 0000000..0315acf --- /dev/null +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/canvas/canvas-zoom-expected.png diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/canvas/canvas-zoom-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/canvas/canvas-zoom-expected.txt new file mode 100644 index 0000000..baa71e3 --- /dev/null +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/canvas/canvas-zoom-expected.txt @@ -0,0 +1,22 @@ +layer at (0,0) size 800x600 + RenderView at (0,0) size 800x600 +layer at (0,0) size 800x600 + RenderBlock {HTML} at (0,0) size 800x600 + RenderBody {BODY} at (8,8) size 784x584 + RenderBlock {P} at (0,0) size 784x20 + RenderText {#text} at (0,0) size 598x19 + text run at (0,0) width 598: "These should be four green hollow boxes with dimensions 600x300, 100x300, 600x100, 100x100." + RenderBlock (anonymous) at (0,36) size 784x422 + RenderHTMLCanvas {CANVAS} at (0,0) size 606x306 [border: (3px solid #008000)] + RenderText {#text} at (606,291) size 4x19 + text run at (606,291) width 4: " " + RenderText {#text} at (0,0) size 0x0 + RenderHTMLCanvas {CANVAS} at (610,0) size 106x306 [border: (3px solid #008000)] + RenderText {#text} at (0,0) size 0x0 + RenderText {#text} at (0,0) size 0x0 + RenderHTMLCanvas {CANVAS} at (0,311) size 606x106 [border: (3px solid #008000)] + RenderText {#text} at (606,402) size 4x19 + text run at (606,402) width 4: " " + RenderText {#text} at (0,0) size 0x0 + RenderHTMLCanvas {CANVAS} at (610,311) size 106x106 [border: (3px solid #008000)] + RenderText {#text} at (0,0) size 0x0 diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/tables/mozilla/bugs/bug106158-1-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/tables/mozilla/bugs/bug106158-1-expected.checksum index 6787378..1203cd9 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/tables/mozilla/bugs/bug106158-1-expected.checksum +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/tables/mozilla/bugs/bug106158-1-expected.checksum @@ -1 +1 @@ -6869142561ee5f394fcb09467b4d55c7
\ No newline at end of file +82a69c6ff79b3cb7a4721f6b8bff5599
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/tables/mozilla/bugs/bug106158-1-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/tables/mozilla/bugs/bug106158-1-expected.png Binary files differindex 8efc242..864d637 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/tables/mozilla/bugs/bug106158-1-expected.png +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/tables/mozilla/bugs/bug106158-1-expected.png diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/tables/mozilla/bugs/bug106158-1-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/tables/mozilla/bugs/bug106158-1-expected.txt index 1bf5847..c8183bf 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/tables/mozilla/bugs/bug106158-1-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/tables/mozilla/bugs/bug106158-1-expected.txt @@ -3,17 +3,17 @@ layer at (0,0) size 800x600 layer at (0,0) size 800x600 RenderBlock {HTML} at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x584 - RenderTable {TABLE} at (0,0) size 450x84 [border: (1px solid #000000)] - RenderTableSection {TBODY} at (1,1) size 448x82 - RenderTableRow {TR} at (0,2) size 448x78 - RenderTableCell {TD} at (2,2) size 444x78 [r=0 c=0 rs=1 cs=1] + RenderTable {TABLE} at (0,0) size 450x112 [border: (1px solid #000000)] + RenderTableSection {TBODY} at (1,1) size 448x110 + RenderTableRow {TR} at (0,2) size 448x106 + RenderTableCell {TD} at (2,2) size 444x106 [r=0 c=0 rs=1 cs=1] RenderTable {TABLE} at (1,1) size 442x28 [border: (1px solid #FF0000)] RenderTableSection {TBODY} at (1,1) size 440x26 RenderTableRow {TR} at (0,2) size 440x22 RenderTableCell {TD} at (2,2) size 436x22 [r=0 c=0 rs=1 cs=1] RenderText {#text} at (1,1) size 21x19 text run at (1,1) width 21: "test" - RenderTable {TABLE} at (1,1) size 437x76 [border: (1px solid #000000)] + RenderTable {TABLE} at (1,29) size 437x76 [border: (1px solid #000000)] RenderTableSection {TBODY} at (1,1) size 435x74 RenderTableRow {TR} at (0,2) size 435x70 RenderTableCell {TD} at (2,2) size 431x70 [r=0 c=0 rs=1 cs=1] diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt index 5962036..4d801a9 100644 --- a/webkit/tools/layout_tests/test_expectations.txt +++ b/webkit/tools/layout_tests/test_expectations.txt @@ -2804,7 +2804,6 @@ BUG19247 : LayoutTests/fast/events/set-event-in-another-frame.html = FAIL BUG19248 : LayoutTests/fast/js/const.html = FAIL BUG_LEVIN : LayoutTests/fast/dom/Window/window-property-shadowing.html = FAIL -BUG_LEVIN WIN LINUX : LayoutTests/fast/canvas/canvas-zoom.html = FAIL BUG_LEVIN : LayoutTests/fast/dom/Geolocation/enabled.html = FAIL BUG_LEVIN : LayoutTests/storage/multiple-transactions-on-different-handles.html = TIMEOUT BUG_LEVIN WIN : LayoutTests/fast/events/mouse-click-events.html = FAIL @@ -2812,15 +2811,9 @@ BUG_LEVIN WIN : LayoutTests/fast/events/mouse-click-events.html = FAIL // Fallout from webkit 47189:47265 BUG_LEVIN : LayoutTests/fast/loader/onhashchange-attribute-listeners.html = TIMEOUT BUG_LEVIN : LayoutTests/fast/dom/Geolocation/argument-types.html = FAIL -BUG_LEVIN WIN LINUX : LayoutTests/css1/font_properties/font_family.html = FAIL BUG_LEVIN WIN LINUX : LayoutTests/css2.1/t1503-c522-font-family-00-b.html = FAIL -BUG_LEVIN WIN LINUX : LayoutTests/fast/block/float/035.html = FAIL -BUG_LEVIN WIN LINUX : LayoutTests/fast/block/float/avoidance-percent-width-compat.html = FAIL -BUG_LEVIN WIN LINUX : LayoutTests/fast/block/float/avoidance-percent-width-strict.html = FAIL -BUG_LEVIN WIN LINUX : LayoutTests/fast/block/float/float-avoidance.html = FAIL BUG_LEVIN WIN LINUX : LayoutTests/fast/reflections/reflection-overflow-scroll.html = FAIL BUG_LEVIN WIN LINUX : LayoutTests/fast/text/monospace-width-cache.html = FAIL -BUG_LEVIN WIN LINUX : LayoutTests/tables/mozilla/bugs/bug106158-1.html = FAIL // Fallout from webkit 47265:47277 BUG_MBELSHE : LayoutTests/fast/js/Array-isArray.html = FAIL |
