2011-02-17 Mihai Parparita <mihaip@chromium.org>
authormihaip@chromium.org <mihaip@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 18 Feb 2011 04:48:40 +0000 (04:48 +0000)
committermihaip@chromium.org <mihaip@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 18 Feb 2011 04:48:40 +0000 (04:48 +0000)
        Reviewed by Kent Tamura.

        [chromium] Video-related compositor tests failing in DumpRenderTree
        https://bugs.webkit.org/show_bug.cgi?id=47231

        Make tests fall back to .ogv (Theora) videos if they can't play the
        .mp4/.mov files.

        * compositing/geometry/clipped-video-controller.html:
        * compositing/geometry/video-fixed-scrolling.html:
        * compositing/geometry/video-opacity-overlay.html:
        * compositing/layers-inside-overflow-scroll.html:
        * compositing/overflow/overflow-compositing-descendant.html:
        * compositing/overflow/scroll-ancestor-update.html:
        * compositing/reflections/load-video-in-reflection.html:
        * compositing/resources/alpha-gradient-small.ogv: Added.
        * compositing/resources/video.ogv: Added.
        * compositing/self-painting-layers.html:
        * compositing/self-painting-layers2.html:
        * compositing/video/video-background-color.html:
        * compositing/video/video-poster.html:
        * platform/chromium/test_expectations.txt:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@78951 268f45cc-cd09-0410-ab3c-d52691b4dbfc

15 files changed:
LayoutTests/ChangeLog
LayoutTests/compositing/geometry/clipped-video-controller.html
LayoutTests/compositing/geometry/video-fixed-scrolling.html
LayoutTests/compositing/geometry/video-opacity-overlay.html
LayoutTests/compositing/layers-inside-overflow-scroll.html
LayoutTests/compositing/overflow/overflow-compositing-descendant.html
LayoutTests/compositing/overflow/scroll-ancestor-update.html
LayoutTests/compositing/reflections/load-video-in-reflection.html
LayoutTests/compositing/resources/alpha-gradient-small.ogv [new file with mode: 0644]
LayoutTests/compositing/resources/video.ogv [new file with mode: 0644]
LayoutTests/compositing/self-painting-layers.html
LayoutTests/compositing/self-painting-layers2.html
LayoutTests/compositing/video/video-background-color.html
LayoutTests/compositing/video/video-poster.html
LayoutTests/platform/chromium/test_expectations.txt

index 3e293dd..cec5e0e 100644 (file)
@@ -1,3 +1,28 @@
+2011-02-17  Mihai Parparita  <mihaip@chromium.org>
+
+        Reviewed by Kent Tamura.
+
+        [chromium] Video-related compositor tests failing in DumpRenderTree
+        https://bugs.webkit.org/show_bug.cgi?id=47231
+        
+        Make tests fall back to .ogv (Theora) videos if they can't play the
+        .mp4/.mov files.
+
+        * compositing/geometry/clipped-video-controller.html:
+        * compositing/geometry/video-fixed-scrolling.html:
+        * compositing/geometry/video-opacity-overlay.html:
+        * compositing/layers-inside-overflow-scroll.html:
+        * compositing/overflow/overflow-compositing-descendant.html:
+        * compositing/overflow/scroll-ancestor-update.html:
+        * compositing/reflections/load-video-in-reflection.html:
+        * compositing/resources/alpha-gradient-small.ogv: Added.
+        * compositing/resources/video.ogv: Added.
+        * compositing/self-painting-layers.html:
+        * compositing/self-painting-layers2.html:
+        * compositing/video/video-background-color.html:
+        * compositing/video/video-poster.html:
+        * platform/chromium/test_expectations.txt:
+
 2011-02-17  Andrew Wilson  <atwilson@chromium.org>
 
         Unreviewed expectations tweak in attempt to green up the chromium canaries.
index 631bd4a..438d3cd 100644 (file)
 <body>
     <p>The video controller should not be visible below</p>
     <div id="box">
-      <video src="../resources/video.mp4" controls></video>
+      <video controls></video>
     </div>
     <script type="text/javascript" charset="utf-8">
       var video = document.getElementsByTagName('video')[0];
+      video.src = '../resources/video.' + (video.canPlayType('video/ogg') ? 'ogv' : 'mp4');
       video.addEventListener('canplaythrough', function() {
         if (window.layoutTestController)
           layoutTestController.notifyDone();
index 6cd5e0a..9905d9a 100644 (file)
   </script>
 </head>
 <body>
-    <video src="../resources/video.mp4"></video>
+    <video></video>
 
     <p>The blue bar should be in front of the video, and at the top of the page.</p>
     <div id="fixed-bar"></div>
 
   <script type="text/javascript" charset="utf-8">
     var video = document.getElementsByTagName('video')[0];
+    video.src = '../resources/video.' + (video.canPlayType('video/ogg') ? 'ogv' : 'mp4');
     video.addEventListener('canplaythrough', function() {
       window.scrollBy(50, 50);
       if (window.layoutTestController)
index 91828e8..6f574c4 100644 (file)
 <body>
   <p>The orange bar should be in front of the video.</p>
   <div class="container">
-    <video src="../resources/video.mp4"></video>
+    <video></video>
     <div class="controls" id="controls">
       <div id="control-bar"></div>
     </div>
   </div>
   <script type="text/javascript" charset="utf-8">
     var video = document.getElementsByTagName('video')[0];
+    video.src = '../resources/video.' + (video.canPlayType('video/ogg') ? 'ogv' : 'mp4');
     video.addEventListener('canplaythrough', function() {
       if (window.layoutTestController)
         layoutTestController.notifyDone();
index aa66c13..b001abd 100644 (file)
@@ -49,7 +49,7 @@
       window.addEventListener('load', function() {
         var video = document.getElementById('video');
         video.addEventListener('loadeddata', testOnLoad, false);
-        video.src = "resources/video.mp4";
+        video.src = 'resources/video.' + (video.canPlayType('video/ogg') ? 'ogv' : 'mp4');
       }, false);
     </script>
   </head>
index 9995637..d57e3e0 100644 (file)
     
     <p>You should see a green box under the video. If you see red, the test failed.</p>
     <div class="movie content">
-        <video src="../resources/video.mp4" height="100" width="100"></video>
+        <video height="100" width="100"></video>
         <div class="indicator box"></div>
         <div class="test box"></div>
     </div>
 
     <script type="text/javascript" charset="utf-8">
       var video = document.getElementsByTagName('video')[0];
+      video.src = '../resources/video.' + (video.canPlayType('video/ogg') ? 'ogv' : 'mp4');
       video.addEventListener('canplaythrough', function() {
         if (window.layoutTestController)
           layoutTestController.notifyDone();
index 53c66ba..cb631c3 100644 (file)
     <p>The green box should obscure the red box, and move when you drag the scrollbar.</p>
   </div>
   
-  <video src="../resources/video.mp4"></video>
+  <video></video>
 
   <script type="text/javascript" charset="utf-8">
     var video = document.getElementsByTagName('video')[0];
+    video.src = '../resources/video.' + (video.canPlayType('video/ogg') ? 'ogv' : 'mp4');
     video.addEventListener('canplaythrough', function() {
       scrollTestDiv();
       if (window.layoutTestController)
index 658e7a5..d277294 100644 (file)
@@ -37,7 +37,7 @@
       video.addEventListener('canplaythrough', videoLoaded, false);
       
       window.setTimeout(function() {
-        video.src= "../resources/video.mp4"
+        video.src = '../resources/video.' + (video.canPlayType('video/ogg') ? 'ogv' : 'mp4');
       }, 100);
     }
     
diff --git a/LayoutTests/compositing/resources/alpha-gradient-small.ogv b/LayoutTests/compositing/resources/alpha-gradient-small.ogv
new file mode 100644 (file)
index 0000000..0b40116
Binary files /dev/null and b/LayoutTests/compositing/resources/alpha-gradient-small.ogv differ
diff --git a/LayoutTests/compositing/resources/video.ogv b/LayoutTests/compositing/resources/video.ogv
new file mode 100644 (file)
index 0000000..5cb5f87
Binary files /dev/null and b/LayoutTests/compositing/resources/video.ogv differ
index c8ae079..ff1f164 100644 (file)
@@ -43,7 +43,7 @@
       window.addEventListener('load', function() {
         var video = document.getElementById('video');
         video.addEventListener('loadeddata', testOnLoad, false);
-        video.src = "resources/video.mp4";
+        video.src = 'resources/video.' + (video.canPlayType('video/ogg') ? 'ogv' : 'mp4');
       }, false);
     </script>
   </head>
index 41a532e..230ec1d 100644 (file)
@@ -29,7 +29,7 @@
       window.addEventListener('load', function() {
         var video = document.getElementById('video');
         video.addEventListener('loadeddata', testOnLoad, false);
-        video.src = "resources/video.mp4";
+        video.src = 'resources/video.' + (video.canPlayType('video/ogg') ? 'ogv' : 'mp4');
       }, false);
     </script>
   </head>
index 43f0a19..df7ac1d 100644 (file)
   <div class="wrapper">
     <img src="../resources/alpha-gradient-small.png">
   </div>
-  <video src="../resources/alpha-gradient-small.mov" autoplay loop></video>
+  <video autoplay loop></video>
 
   <p>Top and bottom should look the same.</p>
 
   <script type="text/javascript" charset="utf-8">
     var video = document.getElementsByTagName('video')[0];
+    video.src = '../resources/alpha-gradient-small.' + (video.canPlayType('video/ogg') ? 'ogv' : 'mov');
     video.addEventListener('canplaythrough', function() {
       if (window.layoutTestController)
         layoutTestController.notifyDone();
index 6f62010..fde34bd 100644 (file)
@@ -32,7 +32,7 @@
                 {
                     case "load":
                         checkLayers("No src, no poster", false);
-                        video.src = "../resources/video.mp4"
+                        video.src = "../resources/video." + (video.canPlayType("video/ogg") ? "ogv" : "mp4");
                         video.poster = "../resources/apple.jpg";
                         break;
                     case "canplaythrough":
index 6f962cf..758681a 100644 (file)
@@ -3033,17 +3033,17 @@ BUGWK50528 MAC : svg/custom/image-small-width-height.svg = IMAGE
 BUGNONE GPU MAC : compositing = PASS FAIL
 
 // All compositor tests that load resources/video.mp4 are failing
-BUGWK47231 GPU : compositing/geometry/clipped-video-controller.html = TIMEOUT
-BUGWK47231 GPU : compositing/geometry/video-fixed-scrolling.html = TIMEOUT
-BUGWK47231 GPU : compositing/geometry/video-opacity-overlay.html = TIMEOUT
-BUGWK47231 GPU : compositing/layers-inside-overflow-scroll.html = TIMEOUT
-BUGWK47231 GPU : compositing/overflow/overflow-compositing-descendant.html = TIMEOUT
-BUGWK47231 GPU : compositing/overflow/scroll-ancestor-update.html = TIMEOUT
-BUGWK47231 GPU : compositing/reflections/load-video-in-reflection.html = TIMEOUT
-BUGWK47231 GPU : compositing/self-painting-layers.html = TIMEOUT
-BUGWK47231 GPU : compositing/self-painting-layers2.html = TIMEOUT
-BUGWK47231 GPU : compositing/video/video-background-color.html = TIMEOUT
-BUGWK47231 GPU : compositing/video/video-poster.html = TIMEOUT
+BUGWK54694 GPU : compositing/geometry/clipped-video-controller.html = IMAGE
+BUGWK54694 GPU : compositing/geometry/video-fixed-scrolling.html = IMAGE
+BUGWK54694 GPU : compositing/geometry/video-opacity-overlay.html = IMAGE
+BUGWK54694 GPU : compositing/layers-inside-overflow-scroll.html = IMAGE
+BUGWK54694 GPU : compositing/overflow/overflow-compositing-descendant.html = IMAGE
+BUGWK54694 GPU : compositing/overflow/scroll-ancestor-update.html = IMAGE
+BUGWK54694 GPU : compositing/reflections/load-video-in-reflection.html = IMAGE
+BUGWK54694 GPU : compositing/self-painting-layers.html = IMAGE
+BUGWK54694 GPU : compositing/self-painting-layers2.html = IMAGE
+BUGWK54694 GPU : compositing/video/video-background-color.html = IMAGE
+BUGWK54694 GPU : compositing/video/video-poster.html = IMAGE
 
 BUGWK47923 GPU : compositing/geometry/limit-layer-bounds-opacity-transition.html = TIMEOUT
 BUGWK54509 GPU : compositing/checkerboard.html = IMAGE