From: tony@chromium.org Date: Tue, 17 Jul 2012 20:24:40 +0000 (+0000) Subject: [chromium] Unreviewed gardening. Add baselines after r122861. X-Git-Url: http://git.webkit.org/?p=WebKit-https.git;a=commitdiff_plain;h=3fbd66ca09ecc461fc64628062c5b026701470b7 [chromium] Unreviewed gardening. Add baselines after r122861. * platform/chromium-mac-snowleopard/fast/block/float/026-expected.txt: Copied from LayoutTests/platform/chromium-mac/fast/block/float/026-expected.txt. * platform/chromium-mac-snowleopard/fast/block/float/028-expected.txt: Copied from LayoutTests/platform/chromium-mac/fast/block/float/028-expected.txt. * platform/chromium-mac/fast/block/float/026-expected.txt: * platform/chromium-mac/fast/block/float/028-expected.txt: * platform/chromium-mac/fast/multicol/shrink-to-column-height-for-pagination-expected.png: Added. git-svn-id: https://svn.webkit.org/repository/webkit/trunk@122871 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog index 77f4adf..ece19ed 100644 --- a/LayoutTests/ChangeLog +++ b/LayoutTests/ChangeLog @@ -1,3 +1,13 @@ +2012-07-17 Tony Chang + + [chromium] Unreviewed gardening. Add baselines after r122861. + + * platform/chromium-mac-snowleopard/fast/block/float/026-expected.txt: Copied from LayoutTests/platform/chromium-mac/fast/block/float/026-expected.txt. + * platform/chromium-mac-snowleopard/fast/block/float/028-expected.txt: Copied from LayoutTests/platform/chromium-mac/fast/block/float/028-expected.txt. + * platform/chromium-mac/fast/block/float/026-expected.txt: + * platform/chromium-mac/fast/block/float/028-expected.txt: + * platform/chromium-mac/fast/multicol/shrink-to-column-height-for-pagination-expected.png: Added. + 2012-07-17 Ojan Vafai results.html should handle flaky tests differently diff --git a/LayoutTests/platform/chromium-mac-snowleopard/fast/block/float/026-expected.txt b/LayoutTests/platform/chromium-mac-snowleopard/fast/block/float/026-expected.txt new file mode 100644 index 0000000..611a28e --- /dev/null +++ b/LayoutTests/platform/chromium-mac-snowleopard/fast/block/float/026-expected.txt @@ -0,0 +1,51 @@ +layer at (0,0) size 785x1432 + RenderView at (0,0) size 785x600 +layer at (0,0) size 785x1432 + RenderBlock {HTML} at (0,0) size 785x1432 + RenderBody {BODY} at (8,8) size 769x1416 + RenderBlock {DIV} at (0,0) size 769x200 + RenderBlock (floating) {DIV} at (569,0) size 200x200 [bgcolor=#FF0000] + RenderTable {TABLE} at (0,0) size 569x46 [border: (2px solid #008000)] + RenderTableSection {TBODY} at (2,2) size 565x42 + RenderTableRow {TR} at (0,2) size 565x38 + RenderTableCell {TD} at (2,2) size 561x38 [r=0 c=0 rs=1 cs=1] + RenderText {#text} at (8,1) size 552x36 + text run at (8,1) width 552: "This is a table. It should sit on the same line as the float and wrap as needed to fit within" + text run at (403,19) width 4 RTL: "." + text run at (407,19) width 153: "the remaining line width" + RenderBlock {DIV} at (0,200) size 769x200 + RenderBlock (floating) {DIV} at (569,0) size 200x200 [bgcolor=#FF0000] + RenderBlock {DIV} at (0,408) size 769x200 + RenderBlock (floating) {DIV} at (569,0) size 200x200 [bgcolor=#FF0000] + RenderBlock {HR} at (0,0) size 569x2 [border: (1px inset #000000)] + RenderBlock {DIV} at (0,608) size 769x200 + RenderBlock (floating) {DIV} at (569,0) size 200x200 [bgcolor=#FF0000] + RenderTable {TABLE} at (185,0) size 384x46 [border: (2px solid #008000)] + RenderTableSection {TBODY} at (2,2) size 380x42 + RenderTableRow {TR} at (0,2) size 380x38 + RenderTableCell {TD} at (2,2) size 376x38 [r=0 c=0 rs=1 cs=1] + RenderText {#text} at (2,1) size 373x36 + text run at (2,1) width 373: "This is a table. It should sit on the same line as the float and" + text run at (39,19) width 4 RTL: "." + text run at (43,19) width 332: "wrap as needed to fit within the remaining line width" + RenderBlock {DIV} at (0,808) size 769x200 + RenderBlock (floating) {DIV} at (569,0) size 200x200 [bgcolor=#FF0000] + RenderBlock {DIV} at (0,1016) size 769x200 + RenderBlock (floating) {DIV} at (569,0) size 200x200 [bgcolor=#FF0000] + RenderBlock {HR} at (182,0) size 387x2 [border: (1px inset #000000)] + RenderBlock {DIV} at (0,1216) size 769x200 + RenderBlock (floating) {DIV} at (569,0) size 200x200 [bgcolor=#FF0000] + RenderImage {IMG} at (184,0) size 385x50 [bgcolor=#008000] +layer at (8,208) size 569x55 clip at (25,210) size 550x36 + RenderBlock {DIV} at (0,0) size 569x55 [border: (2px solid #0000FF)] + RenderText {#text} at (9,2) size 543x36 + text run at (9,2) width 543: "This is an overflow:scroll region. It should sit on the same line as the float and wrap as" + text run at (269,20) width 4 RTL: "." + text run at (273,20) width 279: "needed to fit within the remaining line width" +layer at (189,816) size 388x73 clip at (206,818) size 369x54 + RenderBlock {DIV} at (180,0) size 389x73 [border: (2px solid #0000FF)] + RenderText {#text} at (7,2) size 364x54 + text run at (7,2) width 364: "This is an overflow:scroll region. It should sit on the same" + text run at (47,20) width 324: "line as the float and wrap as needed to fit within the" + text run at (237,38) width 4 RTL: "." + text run at (241,38) width 130: "remaining line width" diff --git a/LayoutTests/platform/chromium-mac-snowleopard/fast/block/float/028-expected.txt b/LayoutTests/platform/chromium-mac-snowleopard/fast/block/float/028-expected.txt new file mode 100644 index 0000000..611a28e --- /dev/null +++ b/LayoutTests/platform/chromium-mac-snowleopard/fast/block/float/028-expected.txt @@ -0,0 +1,51 @@ +layer at (0,0) size 785x1432 + RenderView at (0,0) size 785x600 +layer at (0,0) size 785x1432 + RenderBlock {HTML} at (0,0) size 785x1432 + RenderBody {BODY} at (8,8) size 769x1416 + RenderBlock {DIV} at (0,0) size 769x200 + RenderBlock (floating) {DIV} at (569,0) size 200x200 [bgcolor=#FF0000] + RenderTable {TABLE} at (0,0) size 569x46 [border: (2px solid #008000)] + RenderTableSection {TBODY} at (2,2) size 565x42 + RenderTableRow {TR} at (0,2) size 565x38 + RenderTableCell {TD} at (2,2) size 561x38 [r=0 c=0 rs=1 cs=1] + RenderText {#text} at (8,1) size 552x36 + text run at (8,1) width 552: "This is a table. It should sit on the same line as the float and wrap as needed to fit within" + text run at (403,19) width 4 RTL: "." + text run at (407,19) width 153: "the remaining line width" + RenderBlock {DIV} at (0,200) size 769x200 + RenderBlock (floating) {DIV} at (569,0) size 200x200 [bgcolor=#FF0000] + RenderBlock {DIV} at (0,408) size 769x200 + RenderBlock (floating) {DIV} at (569,0) size 200x200 [bgcolor=#FF0000] + RenderBlock {HR} at (0,0) size 569x2 [border: (1px inset #000000)] + RenderBlock {DIV} at (0,608) size 769x200 + RenderBlock (floating) {DIV} at (569,0) size 200x200 [bgcolor=#FF0000] + RenderTable {TABLE} at (185,0) size 384x46 [border: (2px solid #008000)] + RenderTableSection {TBODY} at (2,2) size 380x42 + RenderTableRow {TR} at (0,2) size 380x38 + RenderTableCell {TD} at (2,2) size 376x38 [r=0 c=0 rs=1 cs=1] + RenderText {#text} at (2,1) size 373x36 + text run at (2,1) width 373: "This is a table. It should sit on the same line as the float and" + text run at (39,19) width 4 RTL: "." + text run at (43,19) width 332: "wrap as needed to fit within the remaining line width" + RenderBlock {DIV} at (0,808) size 769x200 + RenderBlock (floating) {DIV} at (569,0) size 200x200 [bgcolor=#FF0000] + RenderBlock {DIV} at (0,1016) size 769x200 + RenderBlock (floating) {DIV} at (569,0) size 200x200 [bgcolor=#FF0000] + RenderBlock {HR} at (182,0) size 387x2 [border: (1px inset #000000)] + RenderBlock {DIV} at (0,1216) size 769x200 + RenderBlock (floating) {DIV} at (569,0) size 200x200 [bgcolor=#FF0000] + RenderImage {IMG} at (184,0) size 385x50 [bgcolor=#008000] +layer at (8,208) size 569x55 clip at (25,210) size 550x36 + RenderBlock {DIV} at (0,0) size 569x55 [border: (2px solid #0000FF)] + RenderText {#text} at (9,2) size 543x36 + text run at (9,2) width 543: "This is an overflow:scroll region. It should sit on the same line as the float and wrap as" + text run at (269,20) width 4 RTL: "." + text run at (273,20) width 279: "needed to fit within the remaining line width" +layer at (189,816) size 388x73 clip at (206,818) size 369x54 + RenderBlock {DIV} at (180,0) size 389x73 [border: (2px solid #0000FF)] + RenderText {#text} at (7,2) size 364x54 + text run at (7,2) width 364: "This is an overflow:scroll region. It should sit on the same" + text run at (47,20) width 324: "line as the float and wrap as needed to fit within the" + text run at (237,38) width 4 RTL: "." + text run at (241,38) width 130: "remaining line width" diff --git a/LayoutTests/platform/chromium-mac/fast/block/float/026-expected.txt b/LayoutTests/platform/chromium-mac/fast/block/float/026-expected.txt index b22034c..611a28e 100644 --- a/LayoutTests/platform/chromium-mac/fast/block/float/026-expected.txt +++ b/LayoutTests/platform/chromium-mac/fast/block/float/026-expected.txt @@ -42,7 +42,7 @@ layer at (8,208) size 569x55 clip at (25,210) size 550x36 text run at (9,2) width 543: "This is an overflow:scroll region. It should sit on the same line as the float and wrap as" text run at (269,20) width 4 RTL: "." text run at (273,20) width 279: "needed to fit within the remaining line width" -layer at (189,816) size 388x73 clip at (206,818) size 369x54 scrollWidth 370 +layer at (189,816) size 388x73 clip at (206,818) size 369x54 RenderBlock {DIV} at (180,0) size 389x73 [border: (2px solid #0000FF)] RenderText {#text} at (7,2) size 364x54 text run at (7,2) width 364: "This is an overflow:scroll region. It should sit on the same" diff --git a/LayoutTests/platform/chromium-mac/fast/block/float/028-expected.txt b/LayoutTests/platform/chromium-mac/fast/block/float/028-expected.txt index b22034c..611a28e 100644 --- a/LayoutTests/platform/chromium-mac/fast/block/float/028-expected.txt +++ b/LayoutTests/platform/chromium-mac/fast/block/float/028-expected.txt @@ -42,7 +42,7 @@ layer at (8,208) size 569x55 clip at (25,210) size 550x36 text run at (9,2) width 543: "This is an overflow:scroll region. It should sit on the same line as the float and wrap as" text run at (269,20) width 4 RTL: "." text run at (273,20) width 279: "needed to fit within the remaining line width" -layer at (189,816) size 388x73 clip at (206,818) size 369x54 scrollWidth 370 +layer at (189,816) size 388x73 clip at (206,818) size 369x54 RenderBlock {DIV} at (180,0) size 389x73 [border: (2px solid #0000FF)] RenderText {#text} at (7,2) size 364x54 text run at (7,2) width 364: "This is an overflow:scroll region. It should sit on the same" diff --git a/LayoutTests/platform/chromium-mac/fast/multicol/shrink-to-column-height-for-pagination-expected.png b/LayoutTests/platform/chromium-mac/fast/multicol/shrink-to-column-height-for-pagination-expected.png new file mode 100644 index 0000000..2f22a30 Binary files /dev/null and b/LayoutTests/platform/chromium-mac/fast/multicol/shrink-to-column-height-for-pagination-expected.png differ