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

    2010-01-12  Eric Carlson  <eric.carlson at apple.com>
    
            Unreviewed, build fix.
    
            Add media/video-poster-scale.html to GTK skipped list, it needs platform specific
            results (https://bugs.webkit.org/show_bug.cgi?id=33541). Fix test results on
            OSX and Windows.
    
            * media/video-poster-scale-expected.txt:
            * media/video-poster-scale.html:
            * platform/gtk/Skipped:
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53153 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 84a8289..f9c3472 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -2,6 +2,18 @@
 
         Unreviewed, build fix.
 
+        Add media/video-poster-scale.html to GTK skipped list, it needs platform specific 
+        results (https://bugs.webkit.org/show_bug.cgi?id=33541). Fix test results on
+        OSX and Windows.
+
+        * media/video-poster-scale-expected.txt:
+        * media/video-poster-scale.html:
+        * platform/gtk/Skipped:
+
+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:
diff --git a/LayoutTests/media/video-poster-scale-expected.txt b/LayoutTests/media/video-poster-scale-expected.txt
index 2fd065f..684a8d1 100644
--- a/LayoutTests/media/video-poster-scale-expected.txt
+++ b/LayoutTests/media/video-poster-scale-expected.txt
@@ -1,33 +1,17 @@
-CONSOLE MESSAGE: line 24: ReferenceError: Can't find variable: testExpected
-layer at (0,0) size 785x619
-  RenderView at (0,0) size 785x600
-layer at (0,0) size 785x619
-  RenderBlock {HTML} at (0,0) size 785x619
-    RenderBody {BODY} at (8,8) size 769x603
-      RenderText {#text} at (326,142) size 4x18
-        text run at (326,142) width 4: " "
-      RenderBR {BR} at (0,0) size 0x0
-      RenderText {#text} at (82,255) size 4x18
-        text run at (82,255) width 4: " "
-      RenderText {#text} at (168,255) size 4x18
-        text run at (168,255) width 4: " "
-      RenderBR {BR} at (0,0) size 0x0
-      RenderText {#text} at (56,585) size 4x18
-        text run at (56,585) width 4: " "
-      RenderText {#text} at (386,585) size 4x18
-        text run at (386,585) width 4: " "
-      RenderText {#text} at (716,585) size 4x18
-        text run at (716,585) width 4: " "
-      RenderBR {BR} at (0,0) size 0x0
-layer at (8,8) size 326x156
-  RenderVideo {VIDEO} at (0,0) size 326x156 [bgcolor=#EE00EE] [border: (3px solid #FF0000)]
-layer at (8,168) size 82x109
-  RenderVideo {VIDEO} at (0,160) size 82x109 [bgcolor=#EE00EE] [border: (3px solid #FF0000)]
-layer at (94,168) size 82x109
-  RenderVideo {VIDEO} at (86,160) size 82x109 [bgcolor=#EE00EE] [border: (3px solid #FF0000)]
-layer at (8,281) size 56x326
-  RenderVideo {VIDEO} at (0,273) size 56x326 [bgcolor=#EE00EE] [border: (3px solid #FF0000)]
-layer at (68,361) size 326x246
-  RenderVideo {VIDEO} at (60,353) size 326x246 [bgcolor=#EE00EE] [border: (3px solid #FF0000)]
-layer at (398,551) size 326x56
-  RenderVideo {VIDEO} at (390,543) size 326x56 [bgcolor=#EE00EE] [border: (3px solid #FF0000)]
+ 
+  
+   
+EXPECTED (videos[0].getAttribute('poster') == 'content/abe.png') OK
+EXPECTED (relativeURL(videos[0].poster) == 'content/abe.png') OK
+EXPECTED (videos[1].getAttribute('poster') == 'content/abe.png') OK
+EXPECTED (relativeURL(videos[1].poster) == 'content/abe.png') OK
+EXPECTED (videos[2].getAttribute('poster') == 'content/abe.png') OK
+EXPECTED (relativeURL(videos[2].poster) == 'content/abe.png') OK
+EXPECTED (videos[3].getAttribute('poster') == 'content/abe.png') OK
+EXPECTED (relativeURL(videos[3].poster) == 'content/abe.png') OK
+EXPECTED (videos[4].getAttribute('poster') == 'content/abe.png') OK
+EXPECTED (relativeURL(videos[4].poster) == 'content/abe.png') OK
+EXPECTED (videos[5].getAttribute('poster') == 'content/abe.png') OK
+EXPECTED (relativeURL(videos[5].poster) == 'content/abe.png') OK
+END OF TEST
+
diff --git a/LayoutTests/media/video-poster-scale.html b/LayoutTests/media/video-poster-scale.html
index 7a036ba..f87507d 100644
--- a/LayoutTests/media/video-poster-scale.html
+++ b/LayoutTests/media/video-poster-scale.html
@@ -3,6 +3,7 @@
 <html>
     <head>
         <title>'poster' aspect ratio test</title>
+        <script src=video-test.js></script>
         <style> 
             video { 
                 border: 3px solid red; 
diff --git a/LayoutTests/platform/gtk/Skipped b/LayoutTests/platform/gtk/Skipped
index ee133df..6e8553f 100644
--- a/LayoutTests/platform/gtk/Skipped
+++ b/LayoutTests/platform/gtk/Skipped
@@ -3633,6 +3633,9 @@ media/media-fullscreen-not-in-document.html
 # Requires media engine closed caption support
 media/media-captions.html
 
+# https://bugs.webkit.org/show_bug.cgi?id=33541 - Need platform specific results
+media/video-poster-scale.html
+
 # Tests in plugins/ directory
 #   These tests require ObjC plugin, do not bother trying to get them to work
 plugins/call-as-function-test.html

-- 
WebKit Debian packaging