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

[aroben at apple.com]

The following commit has been merged in the debian/experimental branch:
commit 23aae761a15f238a3fcca708ff3654e639bdc5de
Author: aroben at apple.com <aroben at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Oct 28 13:50:49 2010 +0000

    Skip npn-invalidate-rect-invalidates-window.html on headless XP machines
    
    TestNetscapePlugIn never receives a WM_PAINT message on headless XP
    machines, so this test times out. Fixing the test is covered by
    <http://webkit.org/b/48333>.
    
    * Scripts/old-run-webkit-tests: Skip
    npn-invalidate-rect-invalidates-window.html on Windows if accelerated
    compositing support is disabled, which likely means we're on a headless
    XP machine.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@70773 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 9661caa..ea64005 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,17 @@
+2010-10-28  Adam Roben  <aroben at apple.com>
+
+        Skip npn-invalidate-rect-invalidates-window.html on headless XP
+        machines
+
+        TestNetscapePlugIn never receives a WM_PAINT message on headless XP
+        machines, so this test times out. Fixing the test is covered by
+        <http://webkit.org/b/48333>.
+
+        * Scripts/old-run-webkit-tests: Skip
+        npn-invalidate-rect-invalidates-window.html on Windows if accelerated
+        compositing support is disabled, which likely means we're on a headless
+        XP machine.
+
 2010-10-28  Kimmo Kinnunen  <kimmok at iki.fi>
 
         Adding myself as a committer.
diff --git a/WebKitTools/Scripts/old-run-webkit-tests b/WebKitTools/Scripts/old-run-webkit-tests
index 6b37298..e40b3ad 100755
--- a/WebKitTools/Scripts/old-run-webkit-tests
+++ b/WebKitTools/Scripts/old-run-webkit-tests
@@ -543,6 +543,12 @@ if (!$hasAcceleratedCompositing) {
         $ignoredFiles{'media/video-display-toggle.html'} = 1;
         $ignoredFiles{'media/video-no-audio.html'} = 1;
     }
+
+    # Here we're using !$hasAcceleratedCompositing as a proxy for "is a headless XP machine" (like
+    # our test slaves). Headless XP machines can neither support accelerated compositing nor pass
+    # this test, so skipping the test here is expedient, if a little sloppy. See
+    # <http://webkit.org/b/48333>.
+    $ignoredFiles{'platform/win/plugins/npn-invalidate-rect-invalidates-window.html'} = 1 if isAppleWinWebKit();
 }
 
 if (!$has3DRendering) {

-- 
WebKit Debian packaging