Changeset 103509 in webkit

Timestamp:

Dec 22, 2011 2:32:40 AM (12 years ago)

Author:

commit-queue@webkit.org

Message:

Media element loads blocked by a resource load delegate or beforeload handler do not generate an error event
​https://bugs.webkit.org/show_bug.cgi?id=63558

Patch by Shadi Khalek <​shadi@chromium.org> on 2011-12-22
Reviewed by Eric Carlson.

• media/media-blocked-by-beforeload.html:

Location:

trunk/LayoutTests

Files:

• ChangeLog (modified) (1 diff)
• media/media-blocked-by-beforeload.html (modified) (3 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-12-22  Shadi Khalek  <shadi@chromium.org>
+
+        Media element loads blocked by a resource load delegate or beforeload handler do not generate an error event
+        https://bugs.webkit.org/show_bug.cgi?id=63558
+
+        Reviewed by Eric Carlson.
+
+        * media/media-blocked-by-beforeload.html:
+
 2011-12-22  Nikolas Zimmermann  <nzimmermann@rim.com>
 

trunk/LayoutTests/media/media-blocked-by-beforeload.html

@@ -20 +20 @@
         var allowedURL;
         var test;
+        var loadedmetadataFired = false;
+        var loadedFired = false;
 
         function logEvent(evt)
@@ -25 +27 @@
             consoleWrite("<br>EVENT('" + evt.type + "')");
         }
-        
+
         function loadedmetadata(evt)
         {
             logEvent(evt);
             consoleWrite("");
-            endTest();
+            loadedmetadataFired = true;
+            checkEndTest();
         }
 
-        function setupSourceTest() 
+        function setupSourceTest()
         {
             consoleWrite("<br>*** Test using the &lt;source&gt; element ***");
@@ -103 +106 @@
         }
 
-        function loaded(evt) 
+        function loaded(evt)
         {
-            logEvent(evt);
-            testExpected("video.error", null, "!=");
-            testExpected("video.error.code", MediaError.MEDIA_ERR_SRC_NOT_SUPPORTED);
-            testExpected("video.networkState", HTMLMediaElement.NETWORK_NO_SOURCE);
+            loadedFired = true;
+            checkEndTest();
+        };
+
+        function checkEndTest()
+        {
+            if (loadedmetadataFired && loadedFired)
+                endTest();
         };