Diff
Modified: trunk/LayoutTests/ChangeLog (121782 => 121783)
--- trunk/LayoutTests/ChangeLog 2012-07-03 17:15:50 UTC (rev 121782)
+++ trunk/LayoutTests/ChangeLog 2012-07-03 17:17:12 UTC (rev 121783)
@@ -1,5 +1,18 @@
2012-07-03 Emil A Eklund <[email protected]>
+ Unreviewed chromium rebaseline.
+
+ * platform/chromium-linux-x86/fast/line-grid: Added.
+ * platform/chromium-linux-x86/fast/line-grid/line-grid-into-columns-expected.txt: Added.
+ * platform/chromium-linux/fast/line-grid/line-grid-into-columns-expected.png:
+ * platform/chromium-linux/fast/line-grid/line-grid-into-columns-expected.txt: Added.
+ * platform/chromium-win-xp/fast/line-grid: Added.
+ * platform/chromium-win-xp/fast/line-grid/line-grid-into-columns-expected.txt: Added.
+ * platform/chromium-win/fast/line-grid/line-grid-into-columns-expected.png:
+ * platform/chromium-win/fast/line-grid/line-grid-into-columns-expected.txt:
+
+2012-07-03 Emil A Eklund <[email protected]>
+
Unreviewed chromium TestExpectations update, marked a couple of tests as flaky on windows.
* platform/chromium/TestExpectations:
Modified: trunk/LayoutTests/platform/chromium-linux/fast/line-grid/line-grid-into-columns-expected.png
(Binary files differ)
Added: trunk/LayoutTests/platform/chromium-linux/fast/line-grid/line-grid-into-columns-expected.txt (0 => 121783)
--- trunk/LayoutTests/platform/chromium-linux/fast/line-grid/line-grid-into-columns-expected.txt (rev 0)
+++ trunk/LayoutTests/platform/chromium-linux/fast/line-grid/line-grid-into-columns-expected.txt 2012-07-03 17:17:12 UTC (rev 121783)
@@ -0,0 +1,89 @@
+layer at (0,0) size 1178x585
+ RenderView at (0,0) size 800x585
+layer at (0,0) size 800x585 layerType: background only
+layer at (0,0) size 800x540 scrollWidth 1216 scrollHeight 555
+ RenderBlock (positioned) zI: -1 {DIV} at (0,0) size 800x540 [color=#00FF00]
+ RenderText zI: -1 {#text} at (0,7) size 1216x32
+ text run at (0,7) width 1216: "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
+ RenderBR {BR} at (0,0) size 0x0
+ RenderText zI: -1 {#text} at (0,50) size 1216x32
+ text run at (0,50) width 1216: "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
+ RenderBR {BR} at (0,0) size 0x0
+ RenderText zI: -1 {#text} at (0,93) size 1216x32
+ text run at (0,93) width 1216: "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
+ RenderBR {BR} at (0,0) size 0x0
+ RenderText zI: -1 {#text} at (0,136) size 1216x32
+ text run at (0,136) width 1216: "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
+ RenderBR {BR} at (0,0) size 0x0
+ RenderText zI: -1 {#text} at (0,179) size 1216x32
+ text run at (0,179) width 1216: "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
+ RenderBR {BR} at (0,0) size 0x0
+ RenderText zI: -1 {#text} at (0,222) size 1216x32
+ text run at (0,222) width 1216: "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
+ RenderBR {BR} at (0,0) size 0x0
+ RenderText zI: -1 {#text} at (0,265) size 1216x32
+ text run at (0,265) width 1216: "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
+ RenderBR {BR} at (0,0) size 0x0
+ RenderText zI: -1 {#text} at (0,308) size 1216x32
+ text run at (0,308) width 1216: "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
+ RenderBR {BR} at (0,0) size 0x0
+ RenderText zI: -1 {#text} at (0,351) size 1216x32
+ text run at (0,351) width 1216: "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
+ RenderBR {BR} at (0,0) size 0x0
+ RenderText zI: -1 {#text} at (0,394) size 1216x32
+ text run at (0,394) width 1216: "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
+ RenderBR {BR} at (0,0) size 0x0
+ RenderText zI: -1 {#text} at (0,437) size 1216x32
+ text run at (0,437) width 1216: "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
+ RenderBR {BR} at (0,0) size 0x0
+ RenderText zI: -1 {#text} at (0,480) size 1216x32
+ text run at (0,480) width 1216: "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
+ RenderBR {BR} at (0,0) size 0x0
+ RenderText zI: -1 {#text} at (0,523) size 1216x32
+ text run at (0,523) width 1216: "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
+ RenderBR {BR} at (0,0) size 0x0
+layer at (0,0) size 800x585 layerType: foreground only
+ RenderBlock {HTML} at (0,0) size 800x585
+ RenderBody {BODY} at (0,0) size 800x585
+layer at (0,0) size 800x540
+ RenderBlock (relative positioned) {DIV} at (0,0) size 800x540
+layer at (0,0) size 800x540
+ RenderBlock {DIV} at (0,0) size 800x540
+ RenderBlock {DIV} at (20,20) size 362x405
+ RenderText {#text} at (0,41) size 338x105
+ text run at (0,41) width 328: "All of this text even though it's smaller should be on the"
+ text run at (0,84) width 338: "36px grid. The grid should reset at the top of the second"
+ text run at (0,127) width 47: "column."
+ RenderBR {BR} at (47,142) size 0x0
+ RenderText {#text} at (0,170) size 338x105
+ text run at (0,170) width 328: "All of this text even though it's smaller should be on the"
+ text run at (0,213) width 338: "36px grid. The grid should reset at the top of the second"
+ text run at (0,256) width 47: "column."
+ RenderBR {BR} at (47,271) size 0x0
+ RenderText {#text} at (0,299) size 338x105
+ text run at (0,299) width 328: "All of this text even though it's smaller should be on the"
+ text run at (0,342) width 338: "36px grid. The grid should reset at the top of the second"
+ text run at (0,385) width 47: "column."
+ RenderBR {BR} at (47,400) size 0x0
+ RenderBlock {DIV} at (20,425) size 362x545
+ RenderText {#text} at (0,17) size 360x183
+ text run at (0,17) width 294: "All of this text even though it's"
+ text run at (0,60) width 336: "smaller should be on the 36px grid."
+ text run at (0,130) width 360: "The grid should reset at the top of the"
+ text run at (0,173) width 150: "second column."
+ RenderBR {BR} at (150,194) size 0x0
+ RenderText {#text} at (0,216) size 360x156
+ text run at (0,216) width 294: "All of this text even though it's"
+ text run at (0,259) width 336: "smaller should be on the 36px grid."
+ text run at (0,302) width 360: "The grid should reset at the top of the"
+ text run at (0,345) width 150: "second column."
+ RenderBR {BR} at (150,366) size 0x0
+ RenderText {#text} at (0,388) size 360x156
+ text run at (0,388) width 294: "All of this text even though it's"
+ text run at (0,431) width 336: "smaller should be on the 36px grid."
+ text run at (0,474) width 360: "The grid should reset at the top of the"
+ text run at (0,517) width 150: "second column."
+ RenderBR {BR} at (150,538) size 0x0
+ RenderBlock {DIV} at (20,970) size 362x38
+ RenderText {#text} at (0,26) size 273x12
+ text run at (0,26) width 273: "All of this text even though it's smaller should be on the 36px grid."
Added: trunk/LayoutTests/platform/chromium-linux-x86/fast/line-grid/line-grid-into-columns-expected.txt (0 => 121783)
--- trunk/LayoutTests/platform/chromium-linux-x86/fast/line-grid/line-grid-into-columns-expected.txt (rev 0)
+++ trunk/LayoutTests/platform/chromium-linux-x86/fast/line-grid/line-grid-into-columns-expected.txt 2012-07-03 17:17:12 UTC (rev 121783)
@@ -0,0 +1,89 @@
+layer at (0,0) size 1178x585
+ RenderView at (0,0) size 800x585
+layer at (0,0) size 800x585 layerType: background only
+layer at (0,0) size 800x540 scrollWidth 1216 scrollHeight 555
+ RenderBlock (positioned) zI: -1 {DIV} at (0,0) size 800x540 [color=#00FF00]
+ RenderText zI: -1 {#text} at (0,7) size 1216x32
+ text run at (0,7) width 1216: "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
+ RenderBR {BR} at (0,0) size 0x0
+ RenderText zI: -1 {#text} at (0,50) size 1216x32
+ text run at (0,50) width 1216: "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
+ RenderBR {BR} at (0,0) size 0x0
+ RenderText zI: -1 {#text} at (0,93) size 1216x32
+ text run at (0,93) width 1216: "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
+ RenderBR {BR} at (0,0) size 0x0
+ RenderText zI: -1 {#text} at (0,136) size 1216x32
+ text run at (0,136) width 1216: "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
+ RenderBR {BR} at (0,0) size 0x0
+ RenderText zI: -1 {#text} at (0,179) size 1216x32
+ text run at (0,179) width 1216: "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
+ RenderBR {BR} at (0,0) size 0x0
+ RenderText zI: -1 {#text} at (0,222) size 1216x32
+ text run at (0,222) width 1216: "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
+ RenderBR {BR} at (0,0) size 0x0
+ RenderText zI: -1 {#text} at (0,265) size 1216x32
+ text run at (0,265) width 1216: "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
+ RenderBR {BR} at (0,0) size 0x0
+ RenderText zI: -1 {#text} at (0,308) size 1216x32
+ text run at (0,308) width 1216: "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
+ RenderBR {BR} at (0,0) size 0x0
+ RenderText zI: -1 {#text} at (0,351) size 1216x32
+ text run at (0,351) width 1216: "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
+ RenderBR {BR} at (0,0) size 0x0
+ RenderText zI: -1 {#text} at (0,394) size 1216x32
+ text run at (0,394) width 1216: "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
+ RenderBR {BR} at (0,0) size 0x0
+ RenderText zI: -1 {#text} at (0,437) size 1216x32
+ text run at (0,437) width 1216: "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
+ RenderBR {BR} at (0,0) size 0x0
+ RenderText zI: -1 {#text} at (0,480) size 1216x32
+ text run at (0,480) width 1216: "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
+ RenderBR {BR} at (0,0) size 0x0
+ RenderText zI: -1 {#text} at (0,523) size 1216x32
+ text run at (0,523) width 1216: "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
+ RenderBR {BR} at (0,0) size 0x0
+layer at (0,0) size 800x585 layerType: foreground only
+ RenderBlock {HTML} at (0,0) size 800x585
+ RenderBody {BODY} at (0,0) size 800x585
+layer at (0,0) size 800x540
+ RenderBlock (relative positioned) {DIV} at (0,0) size 800x540
+layer at (0,0) size 800x540
+ RenderBlock {DIV} at (0,0) size 800x540
+ RenderBlock {DIV} at (20,20) size 362x405
+ RenderText {#text} at (0,41) size 338x105
+ text run at (0,41) width 328: "All of this text even though it's smaller should be on the"
+ text run at (0,84) width 338: "36px grid. The grid should reset at the top of the second"
+ text run at (0,127) width 47: "column."
+ RenderBR {BR} at (47,142) size 0x0
+ RenderText {#text} at (0,170) size 338x105
+ text run at (0,170) width 328: "All of this text even though it's smaller should be on the"
+ text run at (0,213) width 338: "36px grid. The grid should reset at the top of the second"
+ text run at (0,256) width 47: "column."
+ RenderBR {BR} at (47,271) size 0x0
+ RenderText {#text} at (0,299) size 338x105
+ text run at (0,299) width 328: "All of this text even though it's smaller should be on the"
+ text run at (0,342) width 338: "36px grid. The grid should reset at the top of the second"
+ text run at (0,385) width 47: "column."
+ RenderBR {BR} at (47,400) size 0x0
+ RenderBlock {DIV} at (20,425) size 362x545
+ RenderText {#text} at (0,17) size 360x183
+ text run at (0,17) width 294: "All of this text even though it's"
+ text run at (0,60) width 336: "smaller should be on the 36px grid."
+ text run at (0,130) width 360: "The grid should reset at the top of the"
+ text run at (0,173) width 150: "second column."
+ RenderBR {BR} at (150,194) size 0x0
+ RenderText {#text} at (0,216) size 360x156
+ text run at (0,216) width 294: "All of this text even though it's"
+ text run at (0,259) width 336: "smaller should be on the 36px grid."
+ text run at (0,302) width 360: "The grid should reset at the top of the"
+ text run at (0,345) width 150: "second column."
+ RenderBR {BR} at (150,366) size 0x0
+ RenderText {#text} at (0,388) size 360x156
+ text run at (0,388) width 294: "All of this text even though it's"
+ text run at (0,431) width 336: "smaller should be on the 36px grid."
+ text run at (0,474) width 360: "The grid should reset at the top of the"
+ text run at (0,517) width 150: "second column."
+ RenderBR {BR} at (150,538) size 0x0
+ RenderBlock {DIV} at (20,970) size 362x38
+ RenderText {#text} at (0,26) size 273x12
+ text run at (0,26) width 273: "All of this text even though it's smaller should be on the 36px grid."
Modified: trunk/LayoutTests/platform/chromium-win/fast/line-grid/line-grid-into-columns-expected.png
(Binary files differ)
Modified: trunk/LayoutTests/platform/chromium-win/fast/line-grid/line-grid-into-columns-expected.txt (121782 => 121783)
--- trunk/LayoutTests/platform/chromium-win/fast/line-grid/line-grid-into-columns-expected.txt 2012-07-03 17:15:50 UTC (rev 121782)
+++ trunk/LayoutTests/platform/chromium-win/fast/line-grid/line-grid-into-columns-expected.txt 2012-07-03 17:17:12 UTC (rev 121783)
@@ -1,6 +1,6 @@
-layer at (0,0) size 800x600
- RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600 layerType: background only
+layer at (0,0) size 1178x585
+ RenderView at (0,0) size 800x585
+layer at (0,0) size 800x585 layerType: background only
layer at (0,0) size 800x540 scrollWidth 1216 scrollHeight 555
RenderBlock (positioned) zI: -1 {DIV} at (0,0) size 800x540 [color=#00FF00]
RenderText zI: -1 {#text} at (0,7) size 1216x32
@@ -42,9 +42,9 @@
RenderText zI: -1 {#text} at (0,523) size 1216x32
text run at (0,523) width 1216: "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
RenderBR {BR} at (0,0) size 0x0
-layer at (0,0) size 800x600 layerType: foreground only
- RenderBlock {HTML} at (0,0) size 800x600
- RenderBody {BODY} at (0,0) size 800x600
+layer at (0,0) size 800x585 layerType: foreground only
+ RenderBlock {HTML} at (0,0) size 800x585
+ RenderBody {BODY} at (0,0) size 800x585
layer at (0,0) size 800x540
RenderBlock (relative positioned) {DIV} at (0,0) size 800x540
layer at (0,0) size 800x540
Added: trunk/LayoutTests/platform/chromium-win-xp/fast/line-grid/line-grid-into-columns-expected.txt (0 => 121783)
--- trunk/LayoutTests/platform/chromium-win-xp/fast/line-grid/line-grid-into-columns-expected.txt (rev 0)
+++ trunk/LayoutTests/platform/chromium-win-xp/fast/line-grid/line-grid-into-columns-expected.txt 2012-07-03 17:17:12 UTC (rev 121783)
@@ -0,0 +1,89 @@
+layer at (0,0) size 1178x585
+ RenderView at (0,0) size 800x585
+layer at (0,0) size 800x585 layerType: background only
+layer at (0,0) size 800x540 scrollWidth 1216 scrollHeight 555
+ RenderBlock (positioned) zI: -1 {DIV} at (0,0) size 800x540 [color=#00FF00]
+ RenderText zI: -1 {#text} at (0,7) size 1216x32
+ text run at (0,7) width 1216: "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
+ RenderBR {BR} at (0,0) size 0x0
+ RenderText zI: -1 {#text} at (0,50) size 1216x32
+ text run at (0,50) width 1216: "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
+ RenderBR {BR} at (0,0) size 0x0
+ RenderText zI: -1 {#text} at (0,93) size 1216x32
+ text run at (0,93) width 1216: "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
+ RenderBR {BR} at (0,0) size 0x0
+ RenderText zI: -1 {#text} at (0,136) size 1216x32
+ text run at (0,136) width 1216: "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
+ RenderBR {BR} at (0,0) size 0x0
+ RenderText zI: -1 {#text} at (0,179) size 1216x32
+ text run at (0,179) width 1216: "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
+ RenderBR {BR} at (0,0) size 0x0
+ RenderText zI: -1 {#text} at (0,222) size 1216x32
+ text run at (0,222) width 1216: "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
+ RenderBR {BR} at (0,0) size 0x0
+ RenderText zI: -1 {#text} at (0,265) size 1216x32
+ text run at (0,265) width 1216: "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
+ RenderBR {BR} at (0,0) size 0x0
+ RenderText zI: -1 {#text} at (0,308) size 1216x32
+ text run at (0,308) width 1216: "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
+ RenderBR {BR} at (0,0) size 0x0
+ RenderText zI: -1 {#text} at (0,351) size 1216x32
+ text run at (0,351) width 1216: "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
+ RenderBR {BR} at (0,0) size 0x0
+ RenderText zI: -1 {#text} at (0,394) size 1216x32
+ text run at (0,394) width 1216: "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
+ RenderBR {BR} at (0,0) size 0x0
+ RenderText zI: -1 {#text} at (0,437) size 1216x32
+ text run at (0,437) width 1216: "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
+ RenderBR {BR} at (0,0) size 0x0
+ RenderText zI: -1 {#text} at (0,480) size 1216x32
+ text run at (0,480) width 1216: "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
+ RenderBR {BR} at (0,0) size 0x0
+ RenderText zI: -1 {#text} at (0,523) size 1216x32
+ text run at (0,523) width 1216: "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
+ RenderBR {BR} at (0,0) size 0x0
+layer at (0,0) size 800x585 layerType: foreground only
+ RenderBlock {HTML} at (0,0) size 800x585
+ RenderBody {BODY} at (0,0) size 800x585
+layer at (0,0) size 800x540
+ RenderBlock (relative positioned) {DIV} at (0,0) size 800x540
+layer at (0,0) size 800x540
+ RenderBlock {DIV} at (0,0) size 800x540
+ RenderBlock {DIV} at (20,20) size 362x405
+ RenderText {#text} at (0,41) size 338x105
+ text run at (0,41) width 328: "All of this text even though it's smaller should be on the"
+ text run at (0,84) width 338: "36px grid. The grid should reset at the top of the second"
+ text run at (0,127) width 47: "column."
+ RenderBR {BR} at (47,142) size 0x0
+ RenderText {#text} at (0,170) size 338x105
+ text run at (0,170) width 328: "All of this text even though it's smaller should be on the"
+ text run at (0,213) width 338: "36px grid. The grid should reset at the top of the second"
+ text run at (0,256) width 47: "column."
+ RenderBR {BR} at (47,271) size 0x0
+ RenderText {#text} at (0,299) size 338x105
+ text run at (0,299) width 328: "All of this text even though it's smaller should be on the"
+ text run at (0,342) width 338: "36px grid. The grid should reset at the top of the second"
+ text run at (0,385) width 47: "column."
+ RenderBR {BR} at (47,400) size 0x0
+ RenderBlock {DIV} at (20,425) size 362x545
+ RenderText {#text} at (0,17) size 360x183
+ text run at (0,17) width 294: "All of this text even though it's"
+ text run at (0,60) width 336: "smaller should be on the 36px grid."
+ text run at (0,130) width 360: "The grid should reset at the top of the"
+ text run at (0,173) width 150: "second column."
+ RenderBR {BR} at (150,194) size 0x0
+ RenderText {#text} at (0,216) size 360x156
+ text run at (0,216) width 294: "All of this text even though it's"
+ text run at (0,259) width 336: "smaller should be on the 36px grid."
+ text run at (0,302) width 360: "The grid should reset at the top of the"
+ text run at (0,345) width 150: "second column."
+ RenderBR {BR} at (150,366) size 0x0
+ RenderText {#text} at (0,388) size 360x156
+ text run at (0,388) width 294: "All of this text even though it's"
+ text run at (0,431) width 336: "smaller should be on the 36px grid."
+ text run at (0,474) width 360: "The grid should reset at the top of the"
+ text run at (0,517) width 150: "second column."
+ RenderBR {BR} at (150,538) size 0x0
+ RenderBlock {DIV} at (20,970) size 362x38
+ RenderText {#text} at (0,26) size 273x12
+ text run at (0,26) width 273: "All of this text even though it's smaller should be on the 36px grid."
