[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 b4aebbefd740e958ba090d2ab798714e76707a74
Author: cmarrin at apple.com <cmarrin at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Mar 9 00:39:07 2010 +0000

    Backed out the half of http://trac.webkit.org/changeset/55690 that turned on HW accel for Leopard which was causing LayoutTests to fail
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55696 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/mac/WebView/WebView.mm b/WebKit/mac/WebView/WebView.mm
index a3c345e..d13a36a 100644
--- a/WebKit/mac/WebView/WebView.mm
+++ b/WebKit/mac/WebView/WebView.mm
@@ -1345,7 +1345,11 @@ static bool fastDocumentTeardownEnabled()
     settings->setZoomMode([preferences zoomsTextOnly] ? ZoomTextOnly : ZoomPage);
     settings->setXSSAuditorEnabled([preferences isXSSAuditorEnabled]);
     settings->setEnforceCSSMIMETypeInStrictMode(!WKAppVersionCheckLessThan(@"com.apple.iWeb", -1, 2.1));
-    settings->setAcceleratedCompositingEnabled((coreVideoHas7228836Fix() || [preferences webGLEnabled]) && [preferences acceleratedCompositingEnabled]);
+    
+    // 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->setShowDebugBorders([preferences showDebugBorders]);
     settings->setShowRepaintCounter([preferences showRepaintCounter]);
     settings->setPluginAllowedRunTime([preferences pluginAllowedRunTime]);

-- 
WebKit Debian packaging