[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 3dd2889c6a2f013e3be81fb97530ae3c48e79baf
Author: simon.fraser at apple.com <simon.fraser at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Mar 11 23:13:20 2010 +0000

    2010-03-11  Simon Fraser  <simon.fraser at apple.com>
    
            Reviewed by Oliver Hunt.
    
            https://bugs.webkit.org/show_bug.cgi?id=35905
            REGRESSION(55699?): media/video-no-autoplay.html times out on Leopard Commit Bot
    
            Make sure we reset the WebGL preference, so that WebGL doesn't get left
            on after being enabled via layoutTestController.overridePreference(),
            which in turn causes accelerated compositing to be enabled on Leopard
            when we don't want it to be.
    
            * DumpRenderTree/mac/DumpRenderTree.mm:
            (resetDefaultsToConsistentValues):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55857 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index a6e7d93..3ec9614 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,18 @@
+2010-03-11  Simon Fraser  <simon.fraser at apple.com>
+
+        Reviewed by Oliver Hunt.
+
+        https://bugs.webkit.org/show_bug.cgi?id=35905
+        REGRESSION(55699?): media/video-no-autoplay.html times out on Leopard Commit Bot
+
+        Make sure we reset the WebGL preference, so that WebGL doesn't get left
+        on after being enabled via layoutTestController.overridePreference(),
+        which in turn causes accelerated compositing to be enabled on Leopard
+        when we don't want it to be.
+        
+        * DumpRenderTree/mac/DumpRenderTree.mm:
+        (resetDefaultsToConsistentValues):
+
 2010-03-10  Dirk Pranke  <dpranke at chromium.org>
 
         Reviewed by Dimitri Glazkov.
diff --git a/WebKitTools/DumpRenderTree/mac/DumpRenderTree.mm b/WebKitTools/DumpRenderTree/mac/DumpRenderTree.mm
index f2f6046..b09b166 100644
--- a/WebKitTools/DumpRenderTree/mac/DumpRenderTree.mm
+++ b/WebKitTools/DumpRenderTree/mac/DumpRenderTree.mm
@@ -434,6 +434,7 @@ static void resetDefaultsToConsistentValues()
     // So, turn it off for now, but we might want to turn it back on some day.
     [preferences setUsesPageCache:NO];
     [preferences setAcceleratedCompositingEnabled:YES];
+    [preferences setWebGLEnabled:NO];
 
     [[NSHTTPCookieStorage sharedHTTPCookieStorage] setCookieAcceptPolicy:NSHTTPCookieAcceptPolicyOnlyFromMainDocumentDomain];
 

-- 
WebKit Debian packaging