[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 b4ca0fbcc07b9a8458ffc2e456b3dd0bbcc3da92
Author: simon.fraser at apple.com <simon.fraser at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Mar 12 00:03:42 2010 +0000

    2010-03-11  Simon Fraser  <simon.fraser at apple.com>
    
            No review.
    
            Need to turn on WebGL explicitly for these tests for Leopard.
    
            * compositing/webgl/webgl-background-color.html:
            * compositing/webgl/webgl-reflection.html:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55863 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 5746f42..478c7d9 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,12 @@
+2010-03-11  Simon Fraser  <simon.fraser at apple.com>
+
+        No review.
+
+        Need to turn on WebGL explicitly for these tests for Leopard.
+
+        * compositing/webgl/webgl-background-color.html:
+        * compositing/webgl/webgl-reflection.html:
+
 2010-03-11  Alexey Proskuryakov  <ap at apple.com>
 
         Reviewed by Geoff Garen.
diff --git a/LayoutTests/compositing/webgl/webgl-background-color.html b/LayoutTests/compositing/webgl/webgl-background-color.html
index 3c63a0b..e8b2514 100644
--- a/LayoutTests/compositing/webgl/webgl-background-color.html
+++ b/LayoutTests/compositing/webgl/webgl-background-color.html
@@ -22,6 +22,9 @@
       }
     </style>
     <script>
+        if (window.layoutTestController)
+            layoutTestController.overridePreference("WebKitWebGLEnabled", "1");
+
         function initWebGL(canvasName, vshader, fshader, attribs, clearColor, clearDepth)
         {
             var canvas = document.getElementById(canvasName);
diff --git a/LayoutTests/compositing/webgl/webgl-reflection.html b/LayoutTests/compositing/webgl/webgl-reflection.html
index 012dc80..62c3d98 100644
--- a/LayoutTests/compositing/webgl/webgl-reflection.html
+++ b/LayoutTests/compositing/webgl/webgl-reflection.html
@@ -27,6 +27,9 @@
       }
     </script>
     <script>
+    if (window.layoutTestController)
+        layoutTestController.overridePreference("WebKitWebGLEnabled", "1");
+
     var gl = null;
 
     function draw()

-- 
WebKit Debian packaging