[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 2dcb04c485c5b4ff0b35bfe76708b24abd5d5629
Author: eric.carlson at apple.com <eric.carlson at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Jan 12 19:41:29 2010 +0000

    2010-01-12  Eric Carlson  <eric.carlson at apple.com>
    
            Unreviewed, build fix.
    
            Update test and results after r53146.
    
            * http/tests/security/local-video-poster-from-remote-expected.txt:
            * http/tests/security/local-video-poster-from-remote.html:
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53150 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 82ab20c..84a8289 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,12 @@
+2010-01-12  Eric Carlson  <eric.carlson at apple.com>
+
+        Unreviewed, build fix.
+
+        Update test and results after r53146.
+
+        * http/tests/security/local-video-poster-from-remote-expected.txt:
+        * http/tests/security/local-video-poster-from-remote.html:
+
 2010-01-12  Philippe Normand  <pnormand at igalia.com>
 
         Rubber-stamped by Gustavo Noronha Silva.
diff --git a/LayoutTests/http/tests/security/local-video-poster-from-remote-expected.txt b/LayoutTests/http/tests/security/local-video-poster-from-remote-expected.txt
index e20f4a9..bc79e9b 100644
--- a/LayoutTests/http/tests/security/local-video-poster-from-remote-expected.txt
+++ b/LayoutTests/http/tests/security/local-video-poster-from-remote-expected.txt
@@ -1,9 +1,7 @@
 CONSOLE MESSAGE: line 0: Not allowed to load local resource: compass.jpg
-CONSOLE MESSAGE: line 0: Not allowed to load local resource: compass.jpg
-
 Test that a remote video element can not use a local poster
 
-This test only works in DRT
+This test requires the run-webkit httpd server (run-webkit-httpd)
 
 SUCCESS: Local image failed to load from remote page.
 
diff --git a/LayoutTests/http/tests/security/local-video-poster-from-remote.html b/LayoutTests/http/tests/security/local-video-poster-from-remote.html
index 4af713e..b3a1cd2 100644
--- a/LayoutTests/http/tests/security/local-video-poster-from-remote.html
+++ b/LayoutTests/http/tests/security/local-video-poster-from-remote.html
@@ -39,7 +39,10 @@
             function checkPoster()
             {
                 document.body.offsetLeft;
-                if (video.clientHeight == 0 && video.clientWidth == 0)
+
+                // The poster image is 128x128, so if it loads the element should be that size, otherwise
+                // it should be the default 300x150.
+                if (video.clientHeight == 150 && video.clientWidth == 300)
                     logResult("Local image failed to load from remote page.", true);
                 else
                     logResult("Local image loaded from remote page.", false);
@@ -65,7 +68,7 @@
 
         <p>Test that a remote video element can not use a local poster</p>
 
-        <p>This test only works in DRT</p>
+        <p>This test requires the run-webkit httpd server (run-webkit-httpd)</p>
 
     </body>
 </html>

-- 
WebKit Debian packaging