Changeset 55697 in webkit

Timestamp:

Mar 8, 2010 4:56:01 PM (14 years ago)

Author:

cmarrin@apple.com

Message:

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

Location:

trunk

Files:

• LayoutTests/platform/mac-leopard/Skipped (modified) (1 diff)
• WebKit/mac/WebView/WebView.mm (modified) (1 diff)

trunk/LayoutTests/platform/mac-leopard/Skipped

@@ -53 +53 @@
 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

trunk/WebKit/mac/WebView/WebView.mm

@@ -1349 +1349 @@
     // 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]);