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

[simon.fraser at apple.com]

The following commit has been merged in the webkit-1.2 branch:
commit 418698ca2bf71cb67355bdce6473f854ce04801d
Author: simon.fraser at apple.com <simon.fraser at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Feb 22 20:51:25 2010 +0000

    2010-02-22  Simon Fraser  <simon.fraser at apple.com>
    
            Reviewed by John Sullivan.
    
            <rdar://problem/7285392>
            On Leopard, we have to disable hardware acceleration if we detect that the
            installed Core Video framework has bug <rdar://problem/7228836>.
    
            * WebView/WebView.mm:
            (coreVideoHas7228836Fix):
            (-[WebView _preferencesChangedNotification:]):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55100 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/mac/ChangeLog b/WebKit/mac/ChangeLog
index 07c54d3..7bdf4b6 100644
--- a/WebKit/mac/ChangeLog
+++ b/WebKit/mac/ChangeLog
@@ -1,3 +1,15 @@
+2010-02-22  Simon Fraser  <simon.fraser at apple.com>
+
+        Reviewed by John Sullivan.
+
+        <rdar://problem/7285392> 
+        On Leopard, we have to disable hardware acceleration if we detect that the
+        installed Core Video framework has bug <rdar://problem/7228836>.
+        
+        * WebView/WebView.mm:
+        (coreVideoHas7228836Fix):
+        (-[WebView _preferencesChangedNotification:]):
+
 2010-02-21  Dan Bernstein  <mitz at apple.com>
 
         Reviewed by Darin Adler.
diff --git a/WebKit/mac/WebView/WebView.mm b/WebKit/mac/WebView/WebView.mm
index 44d4b58..be035b2 100644
--- a/WebKit/mac/WebView/WebView.mm
+++ b/WebKit/mac/WebView/WebView.mm
@@ -558,6 +558,16 @@ static bool runningTigerMail()
     return NO;    
 }
 
+static bool coreVideoHas7228836Fix()
+{
+#ifdef BUILDING_ON_LEOPARD
+    NSBundle* coreVideoFrameworkBundle = [NSBundle bundleWithPath:@"/System/Library/Frameworks/CoreVideo.framework"];
+    double version = [[coreVideoFrameworkBundle objectForInfoDictionaryKey:(NSString *)kCFBundleVersionKey] doubleValue];
+    return (version >= 48);
+#endif
+    return true;
+}
+
 static bool shouldEnableLoadDeferring()
 {
     return !applicationIsAdobeInstaller();
@@ -1332,7 +1342,7 @@ static bool fastDocumentTeardownEnabled()
     settings->setZoomsTextOnly([preferences zoomsTextOnly]);
     settings->setXSSAuditorEnabled([preferences isXSSAuditorEnabled]);
     settings->setEnforceCSSMIMETypeInStrictMode(!WKAppVersionCheckLessThan(@"com.apple.iWeb", -1, 2.1));
-    settings->setAcceleratedCompositingEnabled([preferences acceleratedCompositingEnabled]);
+    settings->setAcceleratedCompositingEnabled(coreVideoHas7228836Fix() && [preferences acceleratedCompositingEnabled]);
     settings->setShowDebugBorders([preferences showDebugBorders]);
     settings->setShowRepaintCounter([preferences showRepaintCounter]);
     settings->setPluginAllowedRunTime([preferences pluginAllowedRunTime]);

-- 
WebKit Debian packaging