[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.19-706-ge5415e9

Thu Feb 4 21:23:31 UTC 2010

The following commit has been merged in the webkit-1.1 branch:
commit c45d483620f0e1877ce47e75eec6820c7b3ebca9
Author: philn at webkit.org <philn at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jan 21 18:24:07 2010 +0000

    2010-01-21  Philippe Normand  <pnormand at igalia.com>
    
            Rubber-stamped by Eric Carlson.
    
            Start the test when the video element loads, which is less prone
            to occasional cases where document.load is fired after video.load.
    
            * media/video-source-error-no-candidate.html:
            * media/video-source-error-no-candidate-expected.txt:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53631 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 875ba2e..d7f3040 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,13 @@
+2010-01-21  Philippe Normand  <pnormand at igalia.com>
+
+        Rubber-stamped by Eric Carlson.
+
+        Start the test when the video element loads, which is less prone
+        to occasional cases where document.load is fired after video.load.
+
+        * media/video-source-error-no-candidate.html:
+        * media/video-source-error-no-candidate-expected.txt:
+
 2010-01-21  Eric Carlson  <eric.carlson at apple.com>
 
         Reviewed by Darin Adler.
diff --git a/LayoutTests/media/video-source-error-no-candidate-expected.txt b/LayoutTests/media/video-source-error-no-candidate-expected.txt
index 092ae4b..ab1ac97 100644
--- a/LayoutTests/media/video-source-error-no-candidate-expected.txt
+++ b/LayoutTests/media/video-source-error-no-candidate-expected.txt
@@ -1,6 +1,5 @@
 Test that 'error' events are fired when no urls are passed to the media engine.
 
-EVENT(loadstart)
 
 EVENT(error) from <source id='missing-src' src=''> OK
 EXPECTED (video.error == 'null') OK
diff --git a/LayoutTests/media/video-source-error-no-candidate.html b/LayoutTests/media/video-source-error-no-candidate.html
index fac1ffb..9564f42 100644
--- a/LayoutTests/media/video-source-error-no-candidate.html
+++ b/LayoutTests/media/video-source-error-no-candidate.html
@@ -44,9 +44,9 @@
         </script>
     </head>
 
-    <body onload="start()">
+    <body>
 
-        <video controls>
+       <video onloadstart="start()" controls>
             <source id=missing-src type="video/blahblah">
             <source id=bogus-type src=content/test.mp4 type="video/blahblah">
             <source id=unsupported-media-query src=content/test.mp4 media=print>

-- 
WebKit Debian packaging

