[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.22-985-g3c00f00

[cmarrin at apple.com]

The following commit has been merged in the webkit-1.1 branch:
commit 693981f160dbdf83d0e379e5e246cc46a540db08
Author: cmarrin at apple.com <cmarrin at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Mar 4 00:05:39 2010 +0000

            Additional change to separate Accelerated Compositing test from 3D Rendering test
            https://bugs.webkit.org/show_bug.cgi?id=35610
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55481 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 03c0e56..6ff0d80 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -2,6 +2,21 @@
 
         Reviewed by Simon Fraser.
 
+        Additional change to separate Accelerated Compositing test from 3D Rendering test
+        https://bugs.webkit.org/show_bug.cgi?id=35610
+        
+        I am now using #if ENABLED(3D_RENDERING) to emit the 3DRendering string from
+        DRT or not. This allows these flags to set independently. I also improved
+        the code flow in run-webkit-tests a bit.
+
+        * DumpRenderTree/win/DumpRenderTree.cpp:
+        (main):
+        * Scripts/run-webkit-tests:
+
+2010-03-03  Chris Marrin  <cmarrin at apple.com>
+
+        Reviewed by Simon Fraser.
+
         Added ability to print supported features to console to DRT
         https://bugs.webkit.org/show_bug.cgi?id=35610
         
diff --git a/WebKitTools/DumpRenderTree/win/DumpRenderTree.cpp b/WebKitTools/DumpRenderTree/win/DumpRenderTree.cpp
index 06fadc2..e445798 100644
--- a/WebKitTools/DumpRenderTree/win/DumpRenderTree.cpp
+++ b/WebKitTools/DumpRenderTree/win/DumpRenderTree.cpp
@@ -1255,7 +1255,14 @@ int main(int argc, char* argv[])
     if (printSupportedFeatures) {
         BOOL acceleratedCompositingAvailable;
         standardPreferences->acceleratedCompositingEnabled(&acceleratedCompositingAvailable);
-        printf("SupportedFeatures:%s\n", acceleratedCompositingAvailable ? "AcceleratedCompositing, 3DRendering" : "");
+        BOOL threeDRenderingAvailable = 
+#if ENABLE(3D_RENDERING)
+            true;
+#else
+            false;
+#endif
+
+        printf("SupportedFeatures:%s %s\n", acceleratedCompositingAvailable ? "AcceleratedCompositing" : "", threeDRenderingAvailable ? "3DRendering" : "");
         return 0;
     }
 
diff --git a/WebKitTools/Scripts/run-webkit-tests b/WebKitTools/Scripts/run-webkit-tests
index ab32c00..a004b4d 100755
--- a/WebKitTools/Scripts/run-webkit-tests
+++ b/WebKitTools/Scripts/run-webkit-tests
@@ -462,21 +462,22 @@ if (isCygwin()) {
     $supportedFeaturesResult = `$supportedFeaturesCommand 2>&1`;
 }
 
-# Check for acelerated compositing support
+my $hasAcceleratedCompositing = 0;
+my $has3DRendering = 0;
+
 if (isCygwin()) {
-    if ($supportedFeaturesResult !~ /AcceleratedCompositing/) {
-        $ignoredDirectories{'compositing'} = 1;
-    }
-} elsif (!checkWebCoreFeatureSupport("Accelerated Compositing", 0)) {
+    $hasAcceleratedCompositing = $supportedFeaturesResult =~ /AcceleratedCompositing/;
+    $has3DRendering = $supportedFeaturesResult =~ /3DRendering/;
+} else {
+    $hasAcceleratedCompositing = checkWebCoreFeatureSupport("Accelerated Compositing", 0);
+    $has3DRendering = checkWebCoreFeatureSupport("3D Rendering", 0);
+}
+
+if (!$hasAcceleratedCompositing) {
     $ignoredDirectories{'compositing'} = 1;
 }
 
-if (isCygwin()) {
-    if ($supportedFeaturesResult !~ /3DRendering/) {
-        $ignoredDirectories{'animations/3d'} = 1;
-        $ignoredDirectories{'transforms/3d'} = 1;
-    }
-} elsif (!checkWebCoreFeatureSupport("3D Rendering", 0)) {
+if (!$has3DRendering) {
     $ignoredDirectories{'animations/3d'} = 1;
     $ignoredDirectories{'transforms/3d'} = 1;
 }

-- 
WebKit Debian packaging