summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoryutak@chromium.org <yutak@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-16 05:49:38 +0000
committeryutak@chromium.org <yutak@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-16 05:49:38 +0000
commitcb6498db0ea28fd667b3e86646b84b169134ff3a (patch)
tree727e92d787b4a193d69a6b0dc38b703f82b010e2
parente88dc7f5eea29e62f7885d7ba405646d73884cad (diff)
downloadchromium_src-cb6498db0ea28fd667b3e86646b84b169134ff3a.zip
chromium_src-cb6498db0ea28fd667b3e86646b84b169134ff3a.tar.gz
chromium_src-cb6498db0ea28fd667b3e86646b84b169134ff3a.tar.bz2
[LTTF] Rebaseline LayoutTests/fast/multicol/single-line.html.
This is a new test added in WebKit r50869. BUG=27555 TEST=none Review URL: http://codereview.chromium.org/397007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@32042 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/multicol/single-line-expected.checksum1
-rw-r--r--webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/multicol/single-line-expected.pngbin0 -> 18809 bytes
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/multicol/single-line-expected.checksum1
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/multicol/single-line-expected.pngbin0 -> 7128 bytes
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/multicol/single-line-expected.txt37
-rw-r--r--webkit/tools/layout_tests/test_expectations.txt1
6 files changed, 39 insertions, 1 deletions
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/multicol/single-line-expected.checksum b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/multicol/single-line-expected.checksum
new file mode 100644
index 0000000..4c24e60
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/multicol/single-line-expected.checksum
@@ -0,0 +1 @@
+b1bf27f651cbbeb28f7536d6f8c032b8 \ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/multicol/single-line-expected.png b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/multicol/single-line-expected.png
new file mode 100644
index 0000000..e50e1d7
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/multicol/single-line-expected.png
Binary files differ
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/multicol/single-line-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/multicol/single-line-expected.checksum
new file mode 100644
index 0000000..926ee49
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/multicol/single-line-expected.checksum
@@ -0,0 +1 @@
+c1784061dad496623b0a327f2520619a \ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/multicol/single-line-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/multicol/single-line-expected.png
new file mode 100644
index 0000000..328fe9f
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/multicol/single-line-expected.png
Binary files differ
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/multicol/single-line-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/multicol/single-line-expected.txt
new file mode 100644
index 0000000..3ad2ddc
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/multicol/single-line-expected.txt
@@ -0,0 +1,37 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x293
+ RenderBlock {HTML} at (0,0) size 800x293
+ RenderBody {BODY} at (8,16) size 784x261
+ RenderBlock {P} at (0,0) size 784x20
+ RenderText {#text} at (0,0) size 721x19
+ text run at (0,0) width 370: "This test checks if CSS3 multi-column layout properly works "
+ text run at (370,0) width 351: "when the multi-column block contains only one line of text."
+ RenderBlock {P} at (0,36) size 784x20
+ RenderText {#text} at (0,0) size 522x19
+ text run at (0,0) width 280: "Test successful if the following text is readable "
+ text run at (280,0) width 242: "(i.e. not split into two different columns)."
+ RenderBlock {P} at (0,72) size 784x19 [bgcolor=#EEEEEE]
+ RenderText {#text} at (0,0) size 63x19
+ text run at (0,0) width 63: "Short text."
+ RenderBlock {P} at (0,107) size 784x34 [bgcolor=#EEEEEE]
+ RenderInline {SPAN} at (0,0) size 137x34
+ RenderText {#text} at (0,0) size 137x34
+ text run at (0,0) width 137: "Bigger text."
+ RenderText {#text} at (0,0) size 0x0
+ RenderBlock {P} at (0,157) size 784x34 [bgcolor=#EEEEEE]
+ RenderText {#text} at (0,12) size 52x19
+ text run at (0,12) width 52: "Partially "
+ RenderInline {SPAN} at (0,0) size 36x34
+ RenderText {#text} at (52,0) size 36x34
+ text run at (52,0) width 36: "big"
+ RenderText {#text} at (88,12) size 30x19
+ text run at (88,12) width 30: " text."
+ RenderBlock {DIV} at (0,207) size 784x19 [bgcolor=#EEEEEE]
+ RenderBlock {P} at (0,0) size 184x20
+ RenderText {#text} at (0,0) size 86x19
+ text run at (0,0) width 86: "Nested block."
+ RenderBlock {DIV} at (0,242) size 784x19
+ RenderBlock {P} at (0,0) size 784x19 [bgcolor=#EEEEEE]
+ RenderText {#text} at (0,0) size 106x19
+ text run at (0,0) width 106: "Nested block #2."
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index c1c51f3..8cd86d7 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -3085,7 +3085,6 @@ BUG27555 : LayoutTests/media/media-fullscreen-inline.html = TIMEOUT
BUG27555 : LayoutTests/media/media-fullscreen-not-in-document.html = TIMEOUT
BUG27555 WIN LINUX : LayoutTests/fast/canvas/canvas-shadow.html = TEXT
-BUG27555 WIN LINUX : LayoutTests/fast/multicol/single-line.html = IMAGE+TEXT
// hbono's new test.
BUG27679 WIN LINUX MAC : LayoutTests/fast/events/ime-composition-events-001.html = TEXT