2011-03-07 Victoria Kirst <vrk@google.com>

Reviewed by Mihai Parparita. Make LayoutTests robust to latency btwn playing event and frame rendering https://bugs.webkit.org/show_bug.cgi?id=55918 * media/controls-after-reload.html: * media/controls-without-preload.html: * media/video-paint-test.js: * platform/chromium/test_expectations.txt: Canonical link: https://commits.webkit.org/74148@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@84409 268f45cc-cd09-0410-ab3c-d52691b4dbfc
WebKit · Apr 20, 2011 · 25f33df · 25f33df
1 parent 223145f
commit 25f33df
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 14 deletions.
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
@@ -1,3 +1,15 @@
+2011-03-07  Victoria Kirst  <vrk@google.com>
+
+        Reviewed by Mihai Parparita.
+
+        Make LayoutTests robust to latency btwn playing event and frame rendering
+        https://bugs.webkit.org/show_bug.cgi?id=55918
+
+        * media/controls-after-reload.html:
+        * media/controls-without-preload.html:
+        * media/video-paint-test.js:
+        * platform/chromium/test_expectations.txt:
+
 2011-04-20  Taiju TSUIKI  <tzik@google.com>
 
         Reviewed by David Levin.

diff --git a/LayoutTests/media/controls-after-reload.html b/LayoutTests/media/controls-after-reload.html
@@ -10,6 +10,8 @@
 
     function finish()
     {
+        video.pause();
+        video.currentTime = 0;
         if (window.layoutTestController)
             layoutTestController.notifyDone();
     }

diff --git a/LayoutTests/media/video-paint-test.js b/LayoutTests/media/video-paint-test.js
@@ -5,10 +5,13 @@ function init()
     document.addEventListener("canplaythrough", function () {
         if (!--count) {
             var video = document.getElementsByTagName('video')[0];
-            if (window.layoutTestController) {
-                video.play();
-                video.addEventListener("playing", function() { layoutTestController.notifyDone(); });
-            }
+            video.play();
+            video.addEventListener("playing", function() {
+                video.pause();
+                video.currentTime = 0;
+                if (window.layoutTestController)
+                    layoutTestController.notifyDone();
+            });
             document.body.offsetLeft;
         }
     }, true);

diff --git a/LayoutTests/platform/chromium/test_expectations.txt b/LayoutTests/platform/chromium/test_expectations.txt
@@ -2910,16 +2910,15 @@ BUGWK53469 GPU MAC : compositing/scroll-painted-composited-content.html = CRASH
 
 BUGCR74979 GPU MAC: media/video-canvas-alpha.html = IMAGE
 
-// These tests rely on the playing event to be fired immediately after play()
-// is called on a video, before the frames start loading.
-BUGCR74982 GPU : media/controls-after-reload.html = IMAGE
-BUGCR74982 GPU : media/controls-strict.html = IMAGE
-BUGCR74982 GPU : media/controls-styling.html = IMAGE
-BUGCR74982 GPU : media/controls-without-preload.html = IMAGE
-BUGCR74982 GPU : media/video-aspect-ratio.html = IMAGE
-BUGCR74982 GPU WIN LINUX : media/video-transformed.html = IMAGE
-BUGCR74982 GPU MAC SNOWLEOPARD : media/video-transformed.html = IMAGE
-BUGCR74982 GPU : media/video-zoom-controls.html = IMAGE
+// Any tests that render controls will need rebaselining after the patch on
+// bug 55918 lands.
+BUGWK55918 : media/controls-after-reload.html = IMAGE
+BUGWK55918 : media/controls-strict.html = IMAGE
+BUGWK55918 : media/controls-styling.html = IMAGE
+BUGWK55918 : media/controls-without-preload.html = IMAGE
+BUGWK55918 : media/video-aspect-ratio.html = IMAGE
+BUGWK55918 : media/video-transformed.html = IMAGE
+BUGWK55918 : media/video-zoom-controls.html = IMAGE
 
 BUGWK55708 BUGCR75345 GPU MAC : media/video-controls-rendering.html = CRASH IMAGE
 BUGWK55718 BUGCR75354 GPU : media/media-document-audio-repaint.html = IMAGE+TEXT