[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[eric.carlson at apple.com]

The following commit has been merged in the webkit-1.2 branch:
commit d9e4e51c3f5e0351fd3ed809b3c9e5d62ad4b1c6
Author: eric.carlson at apple.com <eric.carlson at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Mar 5 18:12:04 2010 +0000

    2010-03-05  Eric Carlson  <eric.carlson at apple.com>
    
            Unreviewed, build fix.
    
            Use a movie that will hopefully fail to open less often on a headless
            SnowLeopard bot.
    
            * media/video-preload-expected.txt:
            * media/video-preload.html: Use test.mp4 instead of silence.mpg.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55589 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index afeda39..f246bcd 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -2,6 +2,16 @@
 
         Unreviewed, build fix.
 
+        Use a movie that will hopefully fail to open less often on a headless 
+        SnowLeopard buildbot.
+
+        * media/video-preload-expected.txt:
+        * media/video-preload.html: Use test.mp4 instead of silence.mpg.
+
+2010-03-05  Eric Carlson  <eric.carlson at apple.com>
+
+        Unreviewed, build fix.
+
         media/video-preload.html fails on GTK, skip it.
 
         * platform/gtk/Skipped:
diff --git a/LayoutTests/media/video-preload-expected.txt b/LayoutTests/media/video-preload-expected.txt
index 4d90a68..874e499 100644
--- a/LayoutTests/media/video-preload-expected.txt
+++ b/LayoutTests/media/video-preload-expected.txt
@@ -1,7 +1,7 @@
 Test to see if media loads automatically when 'preload' is specified.
 
 
-Will load "content/silence.mpg" with 'preload=none', should not buffer automatically until 'play()' is called
+Will load with 'preload=none', should not buffer automatically until 'play()' is called
 RUN(video.setAttribute('preload', 'none'))
 RUN(video.removeAttribute('autoplay'))
 EVENT(loadstart)
@@ -11,21 +11,21 @@ EVENT(play)
 EVENT(loadedmetadata)
 buffered automatically OK
 
-Will load "content/silence.mpg" with 'preload=metadata', should buffer automatically 
+Will load with 'preload=metadata', should buffer automatically 
 RUN(video.setAttribute('preload', 'metadata'))
 RUN(video.removeAttribute('autoplay'))
 EVENT(loadstart)
 EVENT(loadedmetadata)
 buffered automatically OK
 
-Will load "content/silence.mpg" with 'preload=auto', should buffer automatically 
+Will load with 'preload=auto', should buffer automatically 
 RUN(video.setAttribute('preload', 'auto'))
 RUN(video.removeAttribute('autoplay'))
 EVENT(loadstart)
 EVENT(loadedmetadata)
 buffered automatically OK
 
-Will load "content/silence.mpg" with 'preload=none', should buffer automatically because of 'autoplay'
+Will load with 'preload=none', should buffer automatically because of 'autoplay'
 RUN(video.setAttribute('preload', 'none'))
 RUN(video.setAttribute('autoplay', 'true'))
 EVENT(loadstart)
diff --git a/LayoutTests/media/video-preload.html b/LayoutTests/media/video-preload.html
index 1d06bbe..e264b88 100644
--- a/LayoutTests/media/video-preload.html
+++ b/LayoutTests/media/video-preload.html
@@ -14,21 +14,18 @@
                 [ 
                     {
                         // should not buffer, 'preload' is 'none'
-                        url : "content/silence.mpg", 
                         preload : "none",
                         shouldBuffer : false,
                         autoPlay : false,
                         description : "until 'play()' is called", 
                     },
                     {
-                        url : "content/silence.mpg", 
                         preload : "metadata",
                         shouldBuffer : true,
                         autoPlay : false,
                         description : "", 
                     },
                     {
-                        url : "content/silence.mpg", 
                         preload : "auto",
                         shouldBuffer : true,
                         autoPlay : false,
@@ -36,7 +33,6 @@
                     },
                     {
                         // should buffer because 'autoplay' is set
-                        url : "content/silence.mpg", 
                         preload : "none",
                         shouldBuffer : true,
                         autoPlay : true,
@@ -86,8 +82,8 @@
                 }
 
                 var movie = movieInfo.movies[movieInfo.current];
-                var desc = "Will load <em>\""+ movie.url + "\"</em>"
-                            + " with <em>'preload=" + movie.preload + "'</em>"
+                var url = findMediaFile("video", "content/test");
+                var desc = "Will load with <em>'preload=" + movie.preload + "'</em>"
                             + ", <b>should" + (movie.shouldBuffer ? "" : " not") + " </b> buffer automatically "
                             + movie.description;
                 consoleWrite(desc);
@@ -95,7 +91,7 @@
                 setupAttribute('preload', movie.preload);
                 setupAttribute('autoplay', movie.autoPlay);
 
-                video.src = movie.url;
+                video.src = url;
                 if (movieInfo.current > 0)
                     video.load();
                 if (!movie.shouldBuffer)

-- 
WebKit Debian packaging