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

Wed Dec 22 12:14:44 UTC 2010

The following commit has been merged in the debian/experimental branch:
commit ef0ea7e874c094510babb5ed9c7ed2c549e55544
Author: vestbo at webkit.org <vestbo at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Aug 17 20:06:05 2010 +0000

    Add testcase for r65514
    
    Reviewed by Eric Carlson.
    
    * media/video-poster-delayed-expected.txt: Added.
    * media/video-poster-delayed.html: Added.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65533 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 17b87b3..c55b6d2 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,12 @@
+2010-08-17  Tor Arne Vestbø  <tor.arne.vestbo at nokia.com>
+
+        Reviewed by Eric Carlson.
+
+        Add testcase for r65514
+
+        * media/video-poster-delayed-expected.txt: Added.
+        * media/video-poster-delayed.html: Added.
+
 2010-08-17  Sam Weinig  <sam at webkit.org>
 
         Rubber-stamped by Anders Carlsson.
diff --git a/LayoutTests/media/video-poster-delayed-expected.txt b/LayoutTests/media/video-poster-delayed-expected.txt
new file mode 100644
index 0000000..212b733
--- /dev/null
+++ b/LayoutTests/media/video-poster-delayed-expected.txt
@@ -0,0 +1,16 @@
+
+Video loaded
+
+EXPECTED (video.clientWidth == '320') OK
+EXPECTED (video.clientHeight == '240') OK
+EXPECTED (video.videoWidth == '320') OK
+EXPECTED (video.videoHeight == '240') OK
+
+Poster loaded
+
+EXPECTED (video.clientWidth == '320') OK
+EXPECTED (video.clientHeight == '240') OK
+EXPECTED (video.videoWidth == '320') OK
+EXPECTED (video.videoHeight == '240') OK
+END OF TEST
+
diff --git a/LayoutTests/media/video-poster-delayed.html b/LayoutTests/media/video-poster-delayed.html
new file mode 100644
index 0000000..ac74f23
--- /dev/null
+++ b/LayoutTests/media/video-poster-delayed.html
@@ -0,0 +1,53 @@
+<!DOCTYPE HTML5>
+
+<html>
+    <head>
+        <title>Delayed load of poster should not overwrite intrinsic size of video</title>
+        <script src=video-test.js></script>
+        <script src=media-file.js></script>
+        <style>
+            video {
+                border: 3px solid red;
+                background-color: magenta;
+            }
+        </style>
+        <script>
+            function start()
+            {
+                video = document.getElementById('video');
+
+                video.addEventListener("loadeddata", function(ev) {
+
+                    consoleWrite("<br><b>Video loaded</b><br>");
+
+                    testExpected("video.clientWidth", 320);
+                    testExpected("video.clientHeight", 240);
+                    testExpected("video.videoWidth", 320);
+                    testExpected("video.videoHeight", 240);
+
+                    video.poster = "content/abe.png";
+                    setTimeout(testAfterLoadingPoster, 100);
+                });
+
+                video.src = findMediaFile("video", "content/test");
+            }
+
+            function testAfterLoadingPoster()
+            {
+                consoleWrite("<br><b>Poster loaded</b><br>");
+
+                testExpected("video.clientWidth", 320);
+                testExpected("video.clientHeight", 240);
+                testExpected("video.videoWidth", 320);
+                testExpected("video.videoHeight", 240);
+
+                endTest();
+            }
+        </script>
+    </head>
+
+
+    <body onload="start()">
+        <video id=video></video>
+    </body>
+</html>

-- 
WebKit Debian packaging

