[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 4196dea6b747d399ac43ba24a5cb1d47c14f6d63
Author: aroben at apple.com <aroben at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Oct 26 20:56:40 2010 +0000

    Clear up confusion between "3D rendering" and "accelerated compositing"
    
    WebKit has no software-based 3D rendering implementation, so 3D
    rendering can only be enabled when accelerated compositing is. But DRT
    was falsely reporting that 3D rendering was available on machines that
    don't support accelerated compositing, leading to much confusion.
    
    Reviewed by Darin Adler.
    
    Fixes <http://webkit.org/b/48370> REGRESSION (r70540): Many
    transforms/3d tests are failing on the XP bots
    
    * DumpRenderTree/win/DumpRenderTree.cpp:
    (main): When ENABLE(3D_RENDERING) is turned on, only report that 3D
    rendering is available when acclerated compositing is also available.
    
    * Scripts/old-run-webkit-tests: Skip tests that use the
    -webkit-transform-3d media query when 3D rendering is disabled,
    rather than when accelerated compositing is disabled.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@70572 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index d29fc2d..d421f89 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,25 @@
+2010-10-26  Adam Roben  <aroben at apple.com>
+
+        Clear up confusion between "3D rendering" and "accelerated compositing"
+
+        WebKit has no software-based 3D rendering implementation, so 3D
+        rendering can only be enabled when accelerated compositing is. But DRT
+        was falsely reporting that 3D rendering was available on machines that
+        don't support accelerated compositing, leading to much confusion.
+
+        Reviewed by Darin Adler.
+
+        Fixes <http://webkit.org/b/48370> REGRESSION (r70540): Many
+        transforms/3d tests are failing on the XP bots
+
+        * DumpRenderTree/win/DumpRenderTree.cpp:
+        (main): When ENABLE(3D_RENDERING) is turned on, only report that 3D
+        rendering is available when acclerated compositing is also available.
+
+        * Scripts/old-run-webkit-tests: Skip tests that use the
+        -webkit-transform-3d media query when 3D rendering is disabled,
+        rather than when accelerated compositing is disabled.
+
 2010-10-26  Eric Seidel  <eric at webkit.org>
 
         Reviewed by Ojan Vafai.
diff --git a/WebKitTools/DumpRenderTree/win/DumpRenderTree.cpp b/WebKitTools/DumpRenderTree/win/DumpRenderTree.cpp
index 2bfe660..5138562 100644
--- a/WebKitTools/DumpRenderTree/win/DumpRenderTree.cpp
+++ b/WebKitTools/DumpRenderTree/win/DumpRenderTree.cpp
@@ -1307,11 +1307,14 @@ int main(int argc, char* argv[])
     if (printSupportedFeatures) {
         BOOL acceleratedCompositingAvailable;
         standardPreferences->acceleratedCompositingEnabled(&acceleratedCompositingAvailable);
-        BOOL threeDRenderingAvailable = 
+
 #if ENABLE(3D_RENDERING)
-            true;
+        // In theory, we could have a software-based 3D rendering implementation that we use when
+        // hardware-acceleration is not available. But we don't have any such software
+        // implementation, so 3D rendering is only available when hardware-acceleration is.
+        BOOL threeDRenderingAvailable = acceleratedCompositingAvailable;
 #else
-            false;
+        BOOL threeDRenderingAvailable = FALSE;
 #endif
 
         printf("SupportedFeatures:%s %s\n", acceleratedCompositingAvailable ? "AcceleratedCompositing" : "", threeDRenderingAvailable ? "3DRendering" : "");
diff --git a/WebKitTools/Scripts/old-run-webkit-tests b/WebKitTools/Scripts/old-run-webkit-tests
index c2412d8..6b37298 100755
--- a/WebKitTools/Scripts/old-run-webkit-tests
+++ b/WebKitTools/Scripts/old-run-webkit-tests
@@ -528,11 +528,6 @@ if (isCygwin()) {
 if (!$hasAcceleratedCompositing) {
     $ignoredDirectories{'compositing'} = 1;
 
-    # These tests use the -webkit-transform-3d media query, which depends on
-    # accelerated compositing support.
-    $ignoredFiles{'fast/media/mq-transform-02.html'} = 1;
-    $ignoredFiles{'fast/media/mq-transform-03.html'} = 1;
-
     # This test has slightly different floating-point rounding when accelerated
     # compositing is enabled.
     $ignoredFiles{'svg/custom/use-on-symbol-inside-pattern.svg'} = 1;
@@ -553,6 +548,10 @@ if (!$hasAcceleratedCompositing) {
 if (!$has3DRendering) {
     $ignoredDirectories{'animations/3d'} = 1;
     $ignoredDirectories{'transforms/3d'} = 1;
+
+    # These tests use the -webkit-transform-3d media query.
+    $ignoredFiles{'fast/media/mq-transform-02.html'} = 1;
+    $ignoredFiles{'fast/media/mq-transform-03.html'} = 1;
 }
 
 if (!checkWebCoreFeatureSupport("3D Canvas", 0)) {

-- 
WebKit Debian packaging