[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 c6a8bb997a4eb68c3d0236cc2869f5e36e5e68c3
Author: simon.fraser at apple.com <simon.fraser at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Feb 23 04:29:04 2010 +0000

    2010-02-22  Simon Fraser  <simon.fraser at apple.com>
    
            Reviewed by Darin Adler.
    
            Remove DRT hack that turns off hardware acceleration with older QuickTimes
            https://bugs.webkit.org/show_bug.cgi?id=35275
    
            Now that WebKit does a version check to avoid a QuickTime-related
            crash (r55100), DumpRenderTree does not need to.
    
            * DumpRenderTree/mac/DumpRenderTree.mm:
            (resetDefaultsToConsistentValues):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55118 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index ec2bf6b..770d812 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,16 @@
+2010-02-22  Simon Fraser  <simon.fraser at apple.com>
+
+        Reviewed by Darin Adler.
+
+        Remove DRT hack that turns off hardware acceleration with older QuickTimes
+        https://bugs.webkit.org/show_bug.cgi?id=35275
+        
+        Now that WebKit does a version check to avoid a QuickTime-related
+        crash (r55100), DumpRenderTree does not need to.
+
+        * DumpRenderTree/mac/DumpRenderTree.mm:
+        (resetDefaultsToConsistentValues):
+
 2010-02-22  Tor Arne Vestbø  <tor.arne.vestbo at nokia.com>
 
         Reviewed by Kenneth Rohde Christiansen.
diff --git a/WebKitTools/DumpRenderTree/mac/DumpRenderTree.mm b/WebKitTools/DumpRenderTree/mac/DumpRenderTree.mm
index c7ddf21..f494b01 100644
--- a/WebKitTools/DumpRenderTree/mac/DumpRenderTree.mm
+++ b/WebKitTools/DumpRenderTree/mac/DumpRenderTree.mm
@@ -430,20 +430,7 @@ static void resetDefaultsToConsistentValues()
     // The back/forward cache is causing problems due to layouts during transition from one page to another.
     // So, turn it off for now, but we might want to turn it back on some day.
     [preferences setUsesPageCache:NO];
-
-#if defined(BUILDING_ON_LEOPARD)
-    // Disable hardware composititing to avoid timeouts and crashes from buggy CoreVideo teardown code.
-    // https://bugs.webkit.org/show_bug.cgi?id=28845 and rdar://problem/7228836
-    SInt32 qtVersion;
-    OSErr err = Gestalt(gestaltQuickTimeVersion, &qtVersion);
-    assert(err == noErr);
-    // Bug 7228836 exists in at least 7.6.3 through 7.6.4, hopefully it will be fixed in 7.6.5.
-    // FIXME: Once we know the exact versions of QuickTime affected, we can update this check.
-    if (qtVersion <= 0x07648000) // 7.6.4, final release (0x8).  See http://developer.apple.com/mac/library/techn
-        [preferences setAcceleratedCompositingEnabled:NO];
-    else
-#endif
-        [preferences setAcceleratedCompositingEnabled:YES];
+    [preferences setAcceleratedCompositingEnabled:YES];
 
     [[NSHTTPCookieStorage sharedHTTPCookieStorage] setCookieAcceptPolicy:NSHTTPCookieAcceptPolicyOnlyFromMainDocumentDomain];
 

-- 
WebKit Debian packaging