[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

Wed Dec 22 11:19:58 UTC 2010

The following commit has been merged in the debian/experimental branch:
commit a476c72af01152e73a257315a34c258cb57dc4a8
Author: eric.carlson at apple.com <eric.carlson at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Jul 19 22:16:11 2010 +0000

    2010-07-19  Eric Carlson  <eric.carlson at apple.com>
    
            Unreviewed, build fix.
    
            Update more tests/results missed in r63684.
    
            * accessibility/media-element.html:
            * media/unsupported-rtsp-expected.txt:
            * platform/mac/accessibility/media-element-expected.txt:
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@63691 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index cf71352..445d153 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,13 @@
+2010-07-19  Eric Carlson  <eric.carlson at apple.com>
+
+        Unreviewed, build fix.
+
+        Update more tests/results missed in r63684.
+
+        * accessibility/media-element.html:
+        * media/unsupported-rtsp-expected.txt:
+        * platform/mac/accessibility/media-element-expected.txt:
+
 2010-07-17  Tony Gentilcore  <tonyg at chromium.org>
 
         Reviewed by Darin Fisher.
diff --git a/LayoutTests/accessibility/media-element.html b/LayoutTests/accessibility/media-element.html
index f7e140f..3de13ec 100644
--- a/LayoutTests/accessibility/media-element.html
+++ b/LayoutTests/accessibility/media-element.html
@@ -58,7 +58,7 @@
                 
                 dumpChildren(vidAXObject);
 
-                if (window.layoutTestController && event.type == 'load')
+                if (window.layoutTestController && event.type == 'canplaythrough')
                     layoutTestController.notifyDone();     
             }
         </script>
@@ -66,10 +66,10 @@
 
 <body>
 
-    <video id=vid src="../media/content/test.mp4" controls onload="dumpVideoAX()">
+    <video id=vid src="../media/content/test.mp4" controls oncanplaythrough="dumpVideoAX()">
     </video>
 
-    <div>Dump &lt;video&gt; element controller accessibility object tree at 'loadstart' and 'load' events.</div>
+    <div>Dump &lt;video&gt; element controller accessibility object tree at 'canplaythrough' event.</div>
     
     <div id=console></div>
 
diff --git a/LayoutTests/media/unsupported-rtsp-expected.txt b/LayoutTests/media/unsupported-rtsp-expected.txt
index a279dd9..778120f 100644
--- a/LayoutTests/media/unsupported-rtsp-expected.txt
+++ b/LayoutTests/media/unsupported-rtsp-expected.txt
@@ -3,6 +3,6 @@ Test that QuickTime file with RTSP URL generates a load error.
 EVENT(error)
 EXPECTED (video.error != 'null') OK
 EXPECTED (video.error.code == '4') OK
-EXPECTED (video.networkState == '4') OK
+EXPECTED (video.networkState == '3') OK
 END OF TEST
 
diff --git a/LayoutTests/platform/mac/accessibility/media-element-expected.txt b/LayoutTests/platform/mac/accessibility/media-element-expected.txt
index f85f769..d513d9e 100644
--- a/LayoutTests/platform/mac/accessibility/media-element-expected.txt
+++ b/LayoutTests/platform/mac/accessibility/media-element-expected.txt
@@ -1,8 +1,8 @@
-Dump <video> element controller accessibility object tree at 'loadstart' and 'load' events.
+Dump <video> element controller accessibility object tree at 'canplaythrough' event.
 
 +++++++++++++++++++++++++++++++++++
 
-State at 'load' event:
+State at 'canplaythrough' event:
 
     description: AXDescription: video element controller
     role: AXRole: AXToolbar

-- 
WebKit Debian packaging

