[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[cmarrin at apple.com]

The following commit has been merged in the webkit-1.2 branch:
commit 340f6d0aa96b39ef0e730bda4f4830fe98065a44
Author: cmarrin at apple.com <cmarrin at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Mar 9 00:56:01 2010 +0000

    This turns back on HW comp on Leopard (which I turned off in http://trac.webkit.org/changeset/55696) if you have WebGL turned on. I've added the failing tests to the Skipped file instead
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55697 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/platform/mac-leopard/Skipped b/LayoutTests/platform/mac-leopard/Skipped
index 6361a9b..a654682 100644
--- a/LayoutTests/platform/mac-leopard/Skipped
+++ b/LayoutTests/platform/mac-leopard/Skipped
@@ -52,3 +52,6 @@ http/tests/media/video-referer.html
 # Disable test until https://bugs.webkit.org/show_bug.cgi?id=35714 is fixed
 animation/fill-mode-transform.html
 
+# Disable tests until we can turn on HW comp as described in https://bugs.webkit.org/show_bug.cgi?id=35897
+fast/media/mq-transform-02.html
+fast/media/mq-transform-03.html
diff --git a/WebKit/mac/WebView/WebView.mm b/WebKit/mac/WebView/WebView.mm
index d13a36a..1700742 100644
--- a/WebKit/mac/WebView/WebView.mm
+++ b/WebKit/mac/WebView/WebView.mm
@@ -1348,8 +1348,7 @@ static bool fastDocumentTeardownEnabled()
     
     // FIXME: Enabling accelerated compositing when WebGL is enabled causes tests to fail on Leopard which expect HW compositing to be disabled.
     // Until we fix that, I will comment out the test (CFM)
-    settings->setAcceleratedCompositingEnabled((coreVideoHas7228836Fix() /*|| [preferences webGLEnabled]*/) && [preferences acceleratedCompositingEnabled]);
-
+    settings->setAcceleratedCompositingEnabled((coreVideoHas7228836Fix() || [preferences webGLEnabled]) && [preferences acceleratedCompositingEnabled]);
     settings->setShowDebugBorders([preferences showDebugBorders]);
     settings->setShowRepaintCounter([preferences showRepaintCounter]);
     settings->setPluginAllowedRunTime([preferences pluginAllowedRunTime]);

-- 
WebKit Debian packaging