[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.15.1-1414-gc69ee75

Thu Oct 29 20:49:48 UTC 2009

The following commit has been merged in the webkit-1.1 branch:
commit 0b9b809385fb14bb2ca89181858d5f94d89d6797
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Oct 21 23:06:47 2009 +0000

    2009-10-21  Andrew Scherkus  <scherkus at chromium.org>
    
            Reviewed by Eric Seidel.
    
            Update more media layout tests to use findMediaFile().
    
            https://bugs.webkit.org/show_bug.cgi?id=30644
    
            * media/controls-drag-timebar.html: Switch to using findMediaFile().
            * media/video-currentTime-set.html: Remove src attribute and rely on findMediaFile() instead.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@49925 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 1b5077d..f3c74a0 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,14 @@
+2009-10-21  Andrew Scherkus  <scherkus at chromium.org>
+
+        Reviewed by Eric Seidel.
+
+        Update more media layout tests to use findMediaFile().
+
+        https://bugs.webkit.org/show_bug.cgi?id=30644
+
+        * media/controls-drag-timebar.html: Switch to using findMediaFile().
+        * media/video-currentTime-set.html: Remove src attribute and rely on findMediaFile() instead.
+
 2009-10-21  Brian Weinstein  <bweinstein at apple.com>
 
         Reviewed by Eric Seidel.
diff --git a/LayoutTests/media/controls-drag-timebar.html b/LayoutTests/media/controls-drag-timebar.html
index bb2b321..28ae10e 100644
--- a/LayoutTests/media/controls-drag-timebar.html
+++ b/LayoutTests/media/controls-drag-timebar.html
@@ -1,6 +1,7 @@
 <html>
     <head>
         <title>drag timebar test</title>
+        <script src=media-file.js></script>
         <script src=video-test.js></script>
         <script>
             var x, y, time, count;
@@ -53,7 +54,7 @@
                 waitForEvent('playing', playing);
                 waitForEvent('seeked', seeked);
                 run("video.autoplay = true");
-                run("video.src = 'content/test.mp4'");
+                run("video.src = '" + findMediaFile("video", "content/test") + "'");
             }    
         </script>
     </head>
diff --git a/LayoutTests/media/video-currentTime-set.html b/LayoutTests/media/video-currentTime-set.html
index 3d23598..a237fc4 100644
--- a/LayoutTests/media/video-currentTime-set.html
+++ b/LayoutTests/media/video-currentTime-set.html
@@ -1,7 +1,7 @@
 <html>
 <body>
 
-    <video src=content/test.mp4 controls></video>
+    <video controls></video>
     
     <p>Test that setting currentTime changes the time, and that 'ended' event is fired in a reasonable amount of time</p>
     

-- 
WebKit Debian packaging

