summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjparent@chromium.org <jparent@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-02-24 21:22:43 +0000
committerjparent@chromium.org <jparent@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-02-24 21:22:43 +0000
commit9ce59a62d6c7bc425d128e21c0889cdf3745fb66 (patch)
tree2aa5605ac6303cebfa7587e33cc421c82d0e0898
parent349d1cd92fe47226b7edb93c965bb3db93cdc28e (diff)
downloadchromium_src-9ce59a62d6c7bc425d128e21c0889cdf3745fb66.zip
chromium_src-9ce59a62d6c7bc425d128e21c0889cdf3745fb66.tar.gz
chromium_src-9ce59a62d6c7bc425d128e21c0889cdf3745fb66.tar.bz2
Add windows/linux txt baselines for new test media/video-replaces-poster.
Differences are just due to text layout. This makes all platforms pass txt results, but now all fail image results in the same way. I'll update the bug with more details, but the failure looks partially legit. TEST=none BUG=35922 Review URL: http://codereview.chromium.org/657049 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@39924 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/video-replaces-poster-expected.txt22
-rw-r--r--webkit/tools/layout_tests/test_expectations.txt5
2 files changed, 24 insertions, 3 deletions
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/video-replaces-poster-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/video-replaces-poster-expected.txt
new file mode 100644
index 0000000..ed54a47
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/video-replaces-poster-expected.txt
@@ -0,0 +1,22 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x355
+ RenderBlock {HTML} at (0,0) size 800x355
+ RenderBody {BODY} at (8,16) size 784x331
+ RenderBlock {P} at (0,0) size 784x40
+ RenderText {#text} at (0,0) size 51x19
+ text run at (0,0) width 51: "Test for "
+ RenderInline {A} at (0,0) size 291x19 [color=#0000EE]
+ RenderText {#text} at (51,0) size 291x19
+ text run at (51,0) width 291: "https://bugs.webkit.org/show_bug.cgi?id=34966"
+ RenderText {#text} at (342,0) size 8x19
+ text run at (342,0) width 8: ". "
+ RenderBR {BR} at (350,0) size 0x19
+ RenderText {#text} at (0,20) size 226x19
+ text run at (0,20) width 226: "You should see the video play below."
+ RenderBlock (anonymous) at (0,56) size 784x275
+ RenderText {#text} at (0,0) size 0x0
+ RenderText {#text} at (0,0) size 0x0
+ RenderText {#text} at (0,0) size 0x0
+layer at (8,72) size 480x270
+ RenderVideo {VIDEO} at (0,0) size 480x270
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index b584e6f9..8b804d9 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -2940,9 +2940,8 @@ BUG35858 MAC : media/video-src-change.html = CRASH PASS
BUG35858 MAC : media/video-src-source.html = CRASH PASS
BUG35858 MAC : media/video-timeupdate-during-playback.html = CRASH PASS
-// Newly added in r54826 - may just need baselines.
-BUG35922 MAC : media/video-replaces-poster.html = IMAGE
-BUG35922 WIN LINUX : media/video-replaces-poster.html = IMAGE+TEXT
+// Newly added in r54826.
+BUG35922 : media/video-replaces-poster.html = IMAGE
// Started failing during roll from 54848 -> 54898
// Started failing with 54865. No rebaselines upstream but they don't run pixel tests.