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

[bweinstein at apple.com]

The following commit has been merged in the debian/experimental branch:
commit ab8e524c21a18a8fb67655cbcfedb4090cde26ec
Author: bweinstein at apple.com <bweinstein at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Nov 5 18:01:50 2010 +0000

    userscripts/user-script-*-document.html tests are flaky on Windows
    https://bugs.webkit.org/show_bug.cgi?id=45980
    
    Reviewed by Eric Carlson.
    
    We can't use counting.mp4 as our video file to create a video document, because on Windows counting.mp4
    is opened in Windows Explorer or Quicktime instead of Safari. This bug is being tracked by
    <https://bugs.webkit.org/show_bug.cgi?id=25220>.
    
    This patch switches user-script-video-document.html to use silence-loop.mov instead of counting.mp4,
    which creates a video document on both Mac and Windows.
    
    * userscripts/resources/counting.mp4: Removed.
    * userscripts/resources/silence-loop.mov: Added.
    * userscripts/user-script-video-document-expected.txt:
    * userscripts/user-script-video-document.html:
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@71433 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 8275e16..abae5cb 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,22 @@
+2010-11-05  Brian Weinstein  <bweinstein at apple.com>
+
+        Reviewed by Eric Carlson.
+
+        userscripts/user-script-*-document.html tests are flaky on Windows
+        https://bugs.webkit.org/show_bug.cgi?id=45980
+        
+        We can't use counting.mp4 as our video file to create a video document, because on Windows counting.mp4
+        is opened in Windows Explorer or Quicktime instead of Safari. This bug is being tracked by 
+        <https://bugs.webkit.org/show_bug.cgi?id=25220>.
+        
+        This patch switches user-script-video-document.html to use silence-loop.mov instead of counting.mp4,
+        which creates a video document on both Mac and Windows.
+
+        * userscripts/resources/counting.mp4: Removed.
+        * userscripts/resources/silence-loop.mov: Added.
+        * userscripts/user-script-video-document-expected.txt:
+        * userscripts/user-script-video-document.html:
+
 2010-11-05  Anders Carlsson  <andersca at apple.com>
 
         Reviewed by Adam Roben.
diff --git a/LayoutTests/platform/win/Skipped b/LayoutTests/platform/win/Skipped
index 99f12dc..7a784bb 100644
--- a/LayoutTests/platform/win/Skipped
+++ b/LayoutTests/platform/win/Skipped
@@ -1007,10 +1007,6 @@ userscripts/user-script-top-frame-only.html
 userscripts/user-style-all-frames.html
 userscripts/user-style-top-frame-only.html
 
-# These tests are flaky on Windows. Needs investigation.
-# https://bugs.webkit.org/show_bug.cgi?id=45980
-userscripts/user-script-video-document.html
-
 # Directory upload is not enabled.
 fast/forms/input-file-directory-upload.html
 
diff --git a/LayoutTests/userscripts/resources/counting.mp4 b/LayoutTests/userscripts/resources/counting.mp4
deleted file mode 100644
index 5fbd6d9..0000000
Binary files a/LayoutTests/userscripts/resources/counting.mp4 and /dev/null differ
diff --git a/LayoutTests/userscripts/user-script-video-document-expected.txt b/LayoutTests/userscripts/user-script-video-document-expected.txt
index 0b25ab0..d639d0d 100644
--- a/LayoutTests/userscripts/user-script-video-document-expected.txt
+++ b/LayoutTests/userscripts/user-script-video-document-expected.txt
@@ -1,4 +1,4 @@
 CONSOLE MESSAGE: line 1: End Script: user-script-video-document.html
-CONSOLE MESSAGE: line 1: Start Script: counting.mp4
-CONSOLE MESSAGE: line 1: End Script: counting.mp4
+CONSOLE MESSAGE: line 1: Start Script: silence-loop.mov
+CONSOLE MESSAGE: line 1: End Script: silence-loop.mov
 
diff --git a/LayoutTests/userscripts/user-script-video-document.html b/LayoutTests/userscripts/user-script-video-document.html
index 1c4db0a..c3b69e5 100644
--- a/LayoutTests/userscripts/user-script-video-document.html
+++ b/LayoutTests/userscripts/user-script-video-document.html
@@ -9,6 +9,6 @@ if (window.layoutTestController) {
 </script>
 </head>
 <body>
-<iframe src="resources/counting.mp4"></iframe>
+<iframe src="resources/silence-loop.mov"></iframe>
 </body>
 </html>

-- 
WebKit Debian packaging