[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.15.1-1414-gc69ee75

[eric at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 70475cafef942a5971ec32b29619bc9a57b9167a
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Oct 23 18:57:45 2009 +0000

    2009-10-23  Eric Seidel  <eric at webkit.org>
    
            Reviewed by Eric Carlson.
    
            fast/media/mq-transform-02.html failed on Leopard Commit Bot
            https://bugs.webkit.org/show_bug.cgi?id=30700
    
            * DumpRenderTree/mac/DumpRenderTree.mm:
            (resetDefaultsToConsistentValues): Update QuickTime version check.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@49984 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 2e0ee1d..bd8639a 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,13 @@
+2009-10-23  Eric Seidel  <eric at webkit.org>
+
+        Reviewed by Eric Carlson.
+
+        fast/media/mq-transform-02.html failed on Leopard Commit Bot
+        https://bugs.webkit.org/show_bug.cgi?id=30700
+
+        * DumpRenderTree/mac/DumpRenderTree.mm:
+        (resetDefaultsToConsistentValues): Update QuickTime version check.
+
 2009-10-23  Kevin Ollivier  <kevino at theolliviers.com>
 
         wxMac 10.4 build fix, needs to link against WebKitSystemInterfaceTiger to get 
diff --git a/WebKitTools/DumpRenderTree/mac/DumpRenderTree.mm b/WebKitTools/DumpRenderTree/mac/DumpRenderTree.mm
index dfae265..98f4f9c 100644
--- a/WebKitTools/DumpRenderTree/mac/DumpRenderTree.mm
+++ b/WebKitTools/DumpRenderTree/mac/DumpRenderTree.mm
@@ -434,9 +434,9 @@ static void resetDefaultsToConsistentValues()
     SInt32 qtVersion;
     OSErr err = Gestalt(gestaltQuickTimeVersion, &qtVersion);
     assert(err == noErr);
-    // Bug 7228836 exists in at least 7.6.3 and 7.6.4, hopefully it will be fixed in 7.6.5.
+    // 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 <= 0x07640000)
+    if (qtVersion <= 0x07648000) // 7.6.4, final release (0x8).  See http://developer.apple.com/mac/library/techn
         [preferences setAcceleratedCompositingEnabled:NO];
     else
 #endif

-- 
WebKit Debian packaging