Title: [198091] trunk
Revision
198091
Author
[email protected]
Date
2016-03-13 20:58:26 -0700 (Sun, 13 Mar 2016)

Log Message

DRT should enable WebGL by default on Mac
https://bugs.webkit.org/show_bug.cgi?id=155419
<rdar://problem/25136981>

Reviewed by Sam Weinig.

Tools:

For some reason, lost in time, WebGL was enabled
by default on trunk, but disabled by default
in DumpRenderTree when using WebKit 1. This
was very annoying, because each test had
an explicit command to enable it.

* DumpRenderTree/mac/DumpRenderTree.mm:
(resetWebPreferencesToConsistentValues): Deleted WebGL line.

LayoutTests:

Update all the tests that no longer have to explicitly
turn WebGL on.

* compositing/backface-visibility/backface-visibility-webgl.html:
* compositing/visibility/visibility-simple-webgl-layer.html:
* compositing/webgl/webgl-background-color.html:
* compositing/webgl/webgl-no-alpha.html:
* compositing/webgl/webgl-nonpremultiplied-blend.html:
* compositing/webgl/webgl-reflection.html:
* compositing/webgl/webgl-repaint.html:
* fast/canvas/webgl/antialiasing-enabled.html:
* fast/canvas/webgl/canvas-resize-crash.html:
* fast/canvas/webgl/css-webkit-canvas-repaint.html:
* fast/canvas/webgl/css-webkit-canvas.html:
* fast/canvas/webgl/out-of-bounds-simulated-vertexAttrib0-drawArrays-expected.txt:
* fast/canvas/webgl/out-of-bounds-simulated-vertexAttrib0-drawArrays.html:
* fast/canvas/webgl/premultiplyalpha-test.html:
* fast/canvas/webgl/resources/webgl-test.js:
(initNonKhronosFramework): Deleted.
* fast/canvas/webgl/texImage2DImageDataTest.html:
* fast/canvas/webgl/toDataURL-unpremultipliedAlpha.html:
* fast/canvas/webgl/unprefixed-context.html:
* fast/canvas/webgl/webgl-composite-modes-repaint.html:
* fast/canvas/webgl/webgl-composite-modes.html:
* fast/canvas/webgl/webgl-drawarrays-crash.html:
* fast/canvas/webgl/webgl-layer-update.html:
* fast/canvas/webgl/webgl-reload-crash.html:
* http/tests/canvas/webgl/origin-clean-conformance.html:
* http/tests/security/webgl-remote-read-remote-image-allowed-with-credentials.html:
* http/tests/security/webgl-remote-read-remote-image-allowed.html:
* http/tests/security/webgl-remote-read-remote-image-blocked-no-crossorigin.html:
* http/tests/webgl/1.0.2/resources/webgl_test_files/conformance/more/unit.js:
* http/tests/webgl/1.0.2/resources/webgl_test_files/resources/js-test-pre.js:
* http/tests/webgl/1.0.2/resources/webkit-webgl-test-harness.js:
* imported/blink/compositing/draws-content/webgl-simple-background.html:
* webgl/1.0.2/resources/webgl_test_files/conformance/more/unit.js:
* webgl/1.0.2/resources/webgl_test_files/resources/js-test-pre.js:
* webgl/1.0.2/resources/webkit-webgl-test-harness.js:
* webgl/1.0.3/resources/webgl_test_files/conformance/more/unit.js:
* webgl/1.0.3/resources/webgl_test_files/resources/js-test-pre.js:
* webgl/1.0.3/resources/webkit-webgl-test-harness.js:
* webgl/resources/webkit-webgl-test-harness.js:

Modified Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (198090 => 198091)


--- trunk/LayoutTests/ChangeLog	2016-03-14 01:57:17 UTC (rev 198090)
+++ trunk/LayoutTests/ChangeLog	2016-03-14 03:58:26 UTC (rev 198091)
@@ -1,3 +1,54 @@
+2016-03-13  Dean Jackson  <[email protected]>
+
+        DRT should enable WebGL by default on Mac
+        https://bugs.webkit.org/show_bug.cgi?id=155419
+        <rdar://problem/25136981>
+
+        Reviewed by Sam Weinig.
+
+        Update all the tests that no longer have to explicitly
+        turn WebGL on.
+
+        * compositing/backface-visibility/backface-visibility-webgl.html:
+        * compositing/visibility/visibility-simple-webgl-layer.html:
+        * compositing/webgl/webgl-background-color.html:
+        * compositing/webgl/webgl-no-alpha.html:
+        * compositing/webgl/webgl-nonpremultiplied-blend.html:
+        * compositing/webgl/webgl-reflection.html:
+        * compositing/webgl/webgl-repaint.html:
+        * fast/canvas/webgl/antialiasing-enabled.html:
+        * fast/canvas/webgl/canvas-resize-crash.html:
+        * fast/canvas/webgl/css-webkit-canvas-repaint.html:
+        * fast/canvas/webgl/css-webkit-canvas.html:
+        * fast/canvas/webgl/out-of-bounds-simulated-vertexAttrib0-drawArrays-expected.txt:
+        * fast/canvas/webgl/out-of-bounds-simulated-vertexAttrib0-drawArrays.html:
+        * fast/canvas/webgl/premultiplyalpha-test.html:
+        * fast/canvas/webgl/resources/webgl-test.js:
+        (initNonKhronosFramework): Deleted.
+        * fast/canvas/webgl/texImage2DImageDataTest.html:
+        * fast/canvas/webgl/toDataURL-unpremultipliedAlpha.html:
+        * fast/canvas/webgl/unprefixed-context.html:
+        * fast/canvas/webgl/webgl-composite-modes-repaint.html:
+        * fast/canvas/webgl/webgl-composite-modes.html:
+        * fast/canvas/webgl/webgl-drawarrays-crash.html:
+        * fast/canvas/webgl/webgl-layer-update.html:
+        * fast/canvas/webgl/webgl-reload-crash.html:
+        * http/tests/canvas/webgl/origin-clean-conformance.html:
+        * http/tests/security/webgl-remote-read-remote-image-allowed-with-credentials.html:
+        * http/tests/security/webgl-remote-read-remote-image-allowed.html:
+        * http/tests/security/webgl-remote-read-remote-image-blocked-no-crossorigin.html:
+        * http/tests/webgl/1.0.2/resources/webgl_test_files/conformance/more/unit.js:
+        * http/tests/webgl/1.0.2/resources/webgl_test_files/resources/js-test-pre.js:
+        * http/tests/webgl/1.0.2/resources/webkit-webgl-test-harness.js:
+        * imported/blink/compositing/draws-content/webgl-simple-background.html:
+        * webgl/1.0.2/resources/webgl_test_files/conformance/more/unit.js:
+        * webgl/1.0.2/resources/webgl_test_files/resources/js-test-pre.js:
+        * webgl/1.0.2/resources/webkit-webgl-test-harness.js:
+        * webgl/1.0.3/resources/webgl_test_files/conformance/more/unit.js:
+        * webgl/1.0.3/resources/webgl_test_files/resources/js-test-pre.js:
+        * webgl/1.0.3/resources/webkit-webgl-test-harness.js:
+        * webgl/resources/webkit-webgl-test-harness.js:
+
 2016-03-13  Ryosuke Niwa  <[email protected]>
 
         REGRESSION (r190840): crash inside details element's slotNameFunction

Modified: trunk/LayoutTests/compositing/backface-visibility/backface-visibility-webgl.html (198090 => 198091)


--- trunk/LayoutTests/compositing/backface-visibility/backface-visibility-webgl.html	2016-03-14 01:57:17 UTC (rev 198090)
+++ trunk/LayoutTests/compositing/backface-visibility/backface-visibility-webgl.html	2016-03-14 03:58:26 UTC (rev 198091)
@@ -43,17 +43,8 @@
 </head>
 <body>
 
-<!-- Enable WebGL in the testing framework (without this we will fail to
-     create a GL context) -->
+    <table><tr>
 
-<script>
-  if (window.testRunner) {
-    testRunner.overridePreference("WebKitWebGLEnabled", "1");
-  }
-</script>
-
-<table><tr>
-
 <!-- This test draws a canvas which is facing the screen. -->
 
 <td>

Modified: trunk/LayoutTests/compositing/visibility/visibility-simple-webgl-layer.html (198090 => 198091)


--- trunk/LayoutTests/compositing/visibility/visibility-simple-webgl-layer.html	2016-03-14 01:57:17 UTC (rev 198090)
+++ trunk/LayoutTests/compositing/visibility/visibility-simple-webgl-layer.html	2016-03-14 03:58:26 UTC (rev 198091)
@@ -16,10 +16,8 @@
     </style>
 
     <script>
-      if (window.testRunner) {
+      if (window.testRunner)
           testRunner.dumpAsText(true);
-          testRunner.overridePreference("WebKitWebGLEnabled", "1");
-      }
 
       function drawCanvas(canvasID, clearColor)
       {

Modified: trunk/LayoutTests/compositing/webgl/webgl-background-color.html (198090 => 198091)


--- trunk/LayoutTests/compositing/webgl/webgl-background-color.html	2016-03-14 01:57:17 UTC (rev 198090)
+++ trunk/LayoutTests/compositing/webgl/webgl-background-color.html	2016-03-14 03:58:26 UTC (rev 198091)
@@ -22,9 +22,6 @@
       }
     </style>
     <script>
-        if (window.testRunner)
-            testRunner.overridePreference("WebKitWebGLEnabled", "1");
-
         function initWebGL(canvasName, vshader, fshader, attribs, clearColor, clearDepth)
         {
             var canvas = document.getElementById(canvasName);

Modified: trunk/LayoutTests/compositing/webgl/webgl-no-alpha.html (198090 => 198091)


--- trunk/LayoutTests/compositing/webgl/webgl-no-alpha.html	2016-03-14 01:57:17 UTC (rev 198090)
+++ trunk/LayoutTests/compositing/webgl/webgl-no-alpha.html	2016-03-14 03:58:26 UTC (rev 198091)
@@ -21,10 +21,8 @@
       }
     </style>
     <script>
-        if (window.testRunner) {
-            testRunner.overridePreference("WebKitWebGLEnabled", "1");
+        if (window.testRunner)
             testRunner.dumpAsText(true);
-        }
 
         function initWebGL(canvasName, vshader, fshader, attribs, clearColor, clearDepth)
         {

Modified: trunk/LayoutTests/compositing/webgl/webgl-nonpremultiplied-blend.html (198090 => 198091)


--- trunk/LayoutTests/compositing/webgl/webgl-nonpremultiplied-blend.html	2016-03-14 01:57:17 UTC (rev 198090)
+++ trunk/LayoutTests/compositing/webgl/webgl-nonpremultiplied-blend.html	2016-03-14 03:58:26 UTC (rev 198091)
@@ -13,9 +13,6 @@
       }
     </style>
     <script>
-        if (window.testRunner)
-            testRunner.overridePreference("WebKitWebGLEnabled", "1");
-
         function initWebGL(canvasName, vshader, fshader, attribs, clearColor, clearDepth, premultAlpha)
         {
             var canvas = document.getElementById(canvasName);

Modified: trunk/LayoutTests/compositing/webgl/webgl-reflection.html (198090 => 198091)


--- trunk/LayoutTests/compositing/webgl/webgl-reflection.html	2016-03-14 01:57:17 UTC (rev 198090)
+++ trunk/LayoutTests/compositing/webgl/webgl-reflection.html	2016-03-14 03:58:26 UTC (rev 198091)
@@ -27,9 +27,6 @@
       }
     </script>
     <script>
-    if (window.testRunner)
-        testRunner.overridePreference("WebKitWebGLEnabled", "1");
-
     var gl = null;
 
     function draw()

Modified: trunk/LayoutTests/compositing/webgl/webgl-repaint.html (198090 => 198091)


--- trunk/LayoutTests/compositing/webgl/webgl-repaint.html	2016-03-14 01:57:17 UTC (rev 198090)
+++ trunk/LayoutTests/compositing/webgl/webgl-repaint.html	2016-03-14 03:58:26 UTC (rev 198091)
@@ -13,9 +13,6 @@
 }
 </style>
 <script>
-if (window.testRunner)
-    testRunner.overridePreference("WebKitWebGLEnabled", "1");
-
 function initWebGL()
 {
     var canvas = document.getElementById('canvas');

Modified: trunk/LayoutTests/fast/canvas/webgl/antialiasing-enabled.html (198090 => 198091)


--- trunk/LayoutTests/fast/canvas/webgl/antialiasing-enabled.html	2016-03-14 01:57:17 UTC (rev 198090)
+++ trunk/LayoutTests/fast/canvas/webgl/antialiasing-enabled.html	2016-03-14 03:58:26 UTC (rev 198091)
@@ -29,7 +29,6 @@
 if (window.testRunner) {
     window.testRunner.waitUntilDone();
     window.testRunner.dumpAsText();
-    window.testRunner.overridePreference("WebKitWebGLEnabled", "1");
 }
 
 function logResult(message) {

Modified: trunk/LayoutTests/fast/canvas/webgl/canvas-resize-crash.html (198090 => 198091)


--- trunk/LayoutTests/fast/canvas/webgl/canvas-resize-crash.html	2016-03-14 01:57:17 UTC (rev 198090)
+++ trunk/LayoutTests/fast/canvas/webgl/canvas-resize-crash.html	2016-03-14 03:58:26 UTC (rev 198091)
@@ -27,16 +27,7 @@
 </head>
 
 <body _onload_="start()">
-<!-- Enable WebGL in the testing framework (without this we will fail to
-     create a GL context) -->
-
-<script>
-  if (window.testRunner) {
-    testRunner.overridePreference("WebKitWebGLEnabled", "1");
-  }
-</script>
-
-<canvas id="example"></canvas>
+    <canvas id="example"></canvas>
 </body>
 </html>
 

Modified: trunk/LayoutTests/fast/canvas/webgl/css-webkit-canvas-repaint.html (198090 => 198091)


--- trunk/LayoutTests/fast/canvas/webgl/css-webkit-canvas-repaint.html	2016-03-14 01:57:17 UTC (rev 198090)
+++ trunk/LayoutTests/fast/canvas/webgl/css-webkit-canvas-repaint.html	2016-03-14 03:58:26 UTC (rev 198091)
@@ -94,10 +94,8 @@
                 gl.drawArrays(gl.TRIANGLES, 0, 3); 
             }
             
-            if (window.testRunner) {
+            if (window.testRunner)
                 testRunner.waitUntilDone();
-                testRunner.overridePreference("WebKitWebGLEnabled", "1");
-            }
             
             initialize();
 

Modified: trunk/LayoutTests/fast/canvas/webgl/css-webkit-canvas.html (198090 => 198091)


--- trunk/LayoutTests/fast/canvas/webgl/css-webkit-canvas.html	2016-03-14 01:57:17 UTC (rev 198090)
+++ trunk/LayoutTests/fast/canvas/webgl/css-webkit-canvas.html	2016-03-14 03:58:26 UTC (rev 198091)
@@ -93,9 +93,6 @@
                 gl.clear(gl.COLOR_BUFFER_BIT);
                 gl.drawArrays(gl.TRIANGLES, 0, 3); 
             }
-            
-            if (window.testRunner)
-                testRunner.overridePreference("WebKitWebGLEnabled", "1");
 
             initialize();
             draw(0, 0.5, 0);

Modified: trunk/LayoutTests/fast/canvas/webgl/out-of-bounds-simulated-vertexAttrib0-drawArrays-expected.txt (198090 => 198091)


--- trunk/LayoutTests/fast/canvas/webgl/out-of-bounds-simulated-vertexAttrib0-drawArrays-expected.txt	2016-03-14 01:57:17 UTC (rev 198090)
+++ trunk/LayoutTests/fast/canvas/webgl/out-of-bounds-simulated-vertexAttrib0-drawArrays-expected.txt	2016-03-14 03:58:26 UTC (rev 198091)
@@ -1,2 +1,2 @@
-CONSOLE MESSAGE: line 32: WebGL: INVALID_OPERATION: drawArrays: attempt to access outside the bounds of the simulated vertexAttrib0 array
+CONSOLE MESSAGE: line 30: WebGL: INVALID_OPERATION: drawArrays: attempt to access outside the bounds of the simulated vertexAttrib0 array
 

Modified: trunk/LayoutTests/fast/canvas/webgl/out-of-bounds-simulated-vertexAttrib0-drawArrays.html (198090 => 198091)


--- trunk/LayoutTests/fast/canvas/webgl/out-of-bounds-simulated-vertexAttrib0-drawArrays.html	2016-03-14 01:57:17 UTC (rev 198090)
+++ trunk/LayoutTests/fast/canvas/webgl/out-of-bounds-simulated-vertexAttrib0-drawArrays.html	2016-03-14 03:58:26 UTC (rev 198091)
@@ -1,9 +1,7 @@
 <script>
 
-if (window.testRunner) {
+if (window.testRunner)
     window.testRunner.dumpAsText();
-    testRunner.overridePreference("WebKitWebGLEnabled", "1");
-}
 
 function createShader(str, type) {
     var shader = gl.createShader(type);

Modified: trunk/LayoutTests/fast/canvas/webgl/premultiplyalpha-test.html (198090 => 198091)


--- trunk/LayoutTests/fast/canvas/webgl/premultiplyalpha-test.html	2016-03-14 01:57:17 UTC (rev 198090)
+++ trunk/LayoutTests/fast/canvas/webgl/premultiplyalpha-test.html	2016-03-14 03:58:26 UTC (rev 198091)
@@ -73,8 +73,6 @@
 var premultipledAlpha;
 
 jsTestIsAsync = true;
-if (window.testRunner)
-    testRunner.overridePreference("WebKitWebGLEnabled", "1");
 
 description("Test the WebGL premultipledAlpha context creation flag.");
 doNextTest();

Modified: trunk/LayoutTests/fast/canvas/webgl/resources/webgl-test.js (198090 => 198091)


--- trunk/LayoutTests/fast/canvas/webgl/resources/webgl-test.js	2016-03-14 01:57:17 UTC (rev 198090)
+++ trunk/LayoutTests/fast/canvas/webgl/resources/webgl-test.js	2016-03-14 03:58:26 UTC (rev 198091)
@@ -1,8 +1,5 @@
 //----------------------------------------------------------------------
 // Differences with respect to Khronos version of webgl-test.js
-if (window.testRunner)
-    testRunner.overridePreference("WebKitWebGLEnabled", "1");
-
 function assertMsg(assertion, msg) {
     if (assertion) {
         testPassed(msg);
@@ -12,8 +9,6 @@
 }
 
 function initNonKhronosFramework(waitUntilDone) {
-  if (window.testRunner)
-    testRunner.overridePreference("WebKitWebGLEnabled", "1");
   if (waitUntilDone)
     window.jsTestIsAsync = true;
 }

Modified: trunk/LayoutTests/fast/canvas/webgl/texImage2DImageDataTest.html (198090 => 198091)


--- trunk/LayoutTests/fast/canvas/webgl/texImage2DImageDataTest.html	2016-03-14 01:57:17 UTC (rev 198090)
+++ trunk/LayoutTests/fast/canvas/webgl/texImage2DImageDataTest.html	2016-03-14 03:58:26 UTC (rev 198091)
@@ -51,10 +51,8 @@
         
         function init()
         {
-            if (window.testRunner) {
-                testRunner.overridePreference("WebKitWebGLEnabled", "1");
+            if (window.testRunner)
                 testRunner.dumpAsText();
-            }
             // Set up a canvas to get image data from
             var canvas2d = document.getElementById("texcanvas");
             var context2d = canvas2d.getContext("2d");

Modified: trunk/LayoutTests/fast/canvas/webgl/toDataURL-unpremultipliedAlpha.html (198090 => 198091)


--- trunk/LayoutTests/fast/canvas/webgl/toDataURL-unpremultipliedAlpha.html	2016-03-14 01:57:17 UTC (rev 198090)
+++ trunk/LayoutTests/fast/canvas/webgl/toDataURL-unpremultipliedAlpha.html	2016-03-14 03:58:26 UTC (rev 198091)
@@ -12,9 +12,6 @@
 <script>
 var wtu = WebGLTestUtils;
 
-if (window.testRunner)
-    testRunner.overridePreference("WebKitWebGLEnabled", "1");
-
 description("Test toDataURL on a non-premultipledAlpha WebGL context.");
 var canvas = document.createElement("canvas");
 var gl = wtu.create3DContext(canvas, { premultipliedAlpha: false, preserveDrawingBuffer: true });

Modified: trunk/LayoutTests/fast/canvas/webgl/unprefixed-context.html (198090 => 198091)


--- trunk/LayoutTests/fast/canvas/webgl/unprefixed-context.html	2016-03-14 01:57:17 UTC (rev 198090)
+++ trunk/LayoutTests/fast/canvas/webgl/unprefixed-context.html	2016-03-14 03:58:26 UTC (rev 198091)
@@ -1,8 +1,6 @@
 <script>
-if (window.testRunner) {
-    testRunner.overridePreference("WebKitWebGLEnabled", "1");
+if (window.testRunner)
     testRunner.dumpAsText();
-}
 
 var canvas = document.createElement("canvas");
 var context = canvas.getContext("webgl");

Modified: trunk/LayoutTests/fast/canvas/webgl/webgl-composite-modes-repaint.html (198090 => 198091)


--- trunk/LayoutTests/fast/canvas/webgl/webgl-composite-modes-repaint.html	2016-03-14 01:57:17 UTC (rev 198090)
+++ trunk/LayoutTests/fast/canvas/webgl/webgl-composite-modes-repaint.html	2016-03-14 03:58:26 UTC (rev 198091)
@@ -48,7 +48,6 @@
 var ctxs = []
 
 if (window.testRunner) {
-    testRunner.overridePreference("WebKitWebGLEnabled", "1");
     testRunner.dumpAsText(true);
     document.getElementById("description").style.position = "absolute";
     document.getElementById("description").style.top = "-5000px";

Modified: trunk/LayoutTests/fast/canvas/webgl/webgl-composite-modes.html (198090 => 198091)


--- trunk/LayoutTests/fast/canvas/webgl/webgl-composite-modes.html	2016-03-14 01:57:17 UTC (rev 198090)
+++ trunk/LayoutTests/fast/canvas/webgl/webgl-composite-modes.html	2016-03-14 03:58:26 UTC (rev 198091)
@@ -46,7 +46,6 @@
 var ctxs = []
 
 if (window.testRunner) {
-    testRunner.overridePreference("WebKitWebGLEnabled", "1");
     testRunner.dumpAsText(true);
     document.getElementById("description").style.position = "absolute";
     document.getElementById("description").style.top = "-5000px";

Modified: trunk/LayoutTests/fast/canvas/webgl/webgl-drawarrays-crash.html (198090 => 198091)


--- trunk/LayoutTests/fast/canvas/webgl/webgl-drawarrays-crash.html	2016-03-14 01:57:17 UTC (rev 198090)
+++ trunk/LayoutTests/fast/canvas/webgl/webgl-drawarrays-crash.html	2016-03-14 03:58:26 UTC (rev 198091)
@@ -27,8 +27,6 @@
 
     if (window.testRunner) {
       testRunner.dumpAsText();
-      testRunner.overridePreference("WebKitAcceleratedCompositingEnabled", "1");
-      testRunner.overridePreference("WebKitWebGLEnabled", "1");
       testRunner.waitUntilDone();
     }
 

Modified: trunk/LayoutTests/fast/canvas/webgl/webgl-layer-update.html (198090 => 198091)


--- trunk/LayoutTests/fast/canvas/webgl/webgl-layer-update.html	2016-03-14 01:57:17 UTC (rev 198090)
+++ trunk/LayoutTests/fast/canvas/webgl/webgl-layer-update.html	2016-03-14 03:58:26 UTC (rev 198091)
@@ -42,7 +42,6 @@
 <script>
 
 if (window.testRunner) {
-    testRunner.overridePreference("WebKitWebGLEnabled", "1");
     testRunner.dumpAsText(true);
     document.getElementById("description").style.position = "absolute";
     document.getElementById("description").style.top = "-5000px"; 

Modified: trunk/LayoutTests/fast/canvas/webgl/webgl-reload-crash.html (198090 => 198091)


--- trunk/LayoutTests/fast/canvas/webgl/webgl-reload-crash.html	2016-03-14 01:57:17 UTC (rev 198090)
+++ trunk/LayoutTests/fast/canvas/webgl/webgl-reload-crash.html	2016-03-14 03:58:26 UTC (rev 198091)
@@ -27,8 +27,6 @@
     }
     if (window.testRunner) {
       testRunner.dumpAsText();
-      testRunner.overridePreference("WebKitAcceleratedCompositingEnabled", "1");
-      testRunner.overridePreference("WebKitWebGLEnabled", "1");
       testRunner.waitUntilDone();
     }
 

Modified: trunk/LayoutTests/http/tests/canvas/webgl/origin-clean-conformance.html (198090 => 198091)


--- trunk/LayoutTests/http/tests/canvas/webgl/origin-clean-conformance.html	2016-03-14 01:57:17 UTC (rev 198090)
+++ trunk/LayoutTests/http/tests/canvas/webgl/origin-clean-conformance.html	2016-03-14 03:58:26 UTC (rev 198091)
@@ -103,7 +103,6 @@
 
   if (videoFile) {
     if (window.testRunner) {
-      testRunner.overridePreference("WebKitWebGLEnabled", "1");
       testRunner.dumpAsText();
       testRunner.waitUntilDone();
     }

Modified: trunk/LayoutTests/http/tests/security/webgl-remote-read-remote-image-allowed-with-credentials.html (198090 => 198091)


--- trunk/LayoutTests/http/tests/security/webgl-remote-read-remote-image-allowed-with-credentials.html	2016-03-14 01:57:17 UTC (rev 198090)
+++ trunk/LayoutTests/http/tests/security/webgl-remote-read-remote-image-allowed-with-credentials.html	2016-03-14 03:58:26 UTC (rev 198091)
@@ -1,7 +1,6 @@
 <pre id="console"></pre>
 <script>
 if (window.testRunner) {
-    testRunner.overridePreference("WebKitWebGLEnabled", "1");
     testRunner.dumpAsText();
     testRunner.waitUntilDone();
 }

Modified: trunk/LayoutTests/http/tests/security/webgl-remote-read-remote-image-allowed.html (198090 => 198091)


--- trunk/LayoutTests/http/tests/security/webgl-remote-read-remote-image-allowed.html	2016-03-14 01:57:17 UTC (rev 198090)
+++ trunk/LayoutTests/http/tests/security/webgl-remote-read-remote-image-allowed.html	2016-03-14 03:58:26 UTC (rev 198091)
@@ -1,7 +1,6 @@
 <pre id="console"></pre>
 <script>
 if (window.testRunner) {
-    testRunner.overridePreference("WebKitWebGLEnabled", "1");
     testRunner.dumpAsText();
     testRunner.waitUntilDone();
 }

Modified: trunk/LayoutTests/http/tests/security/webgl-remote-read-remote-image-blocked-no-crossorigin.html (198090 => 198091)


--- trunk/LayoutTests/http/tests/security/webgl-remote-read-remote-image-blocked-no-crossorigin.html	2016-03-14 01:57:17 UTC (rev 198090)
+++ trunk/LayoutTests/http/tests/security/webgl-remote-read-remote-image-blocked-no-crossorigin.html	2016-03-14 03:58:26 UTC (rev 198091)
@@ -1,7 +1,6 @@
 <pre id="console"></pre>
 <script>
 if (window.testRunner) {
-    testRunner.overridePreference("WebKitWebGLEnabled", "1");
     testRunner.dumpAsText();
     testRunner.waitUntilDone();
 }

Modified: trunk/LayoutTests/http/tests/webgl/1.0.2/resources/webgl_test_files/conformance/more/unit.js (198090 => 198091)


--- trunk/LayoutTests/http/tests/webgl/1.0.2/resources/webgl_test_files/conformance/more/unit.js	2016-03-14 01:57:17 UTC (rev 198090)
+++ trunk/LayoutTests/http/tests/webgl/1.0.2/resources/webgl_test_files/conformance/more/unit.js	2016-03-14 03:58:26 UTC (rev 198091)
@@ -33,7 +33,6 @@
 }
 
 if (window.layoutTestController) {
-  layoutTestController.overridePreference("WebKitWebGLEnabled", "1");
   layoutTestController.dumpAsText();
   layoutTestController.waitUntilDone();
 

Modified: trunk/LayoutTests/http/tests/webgl/1.0.2/resources/webgl_test_files/resources/js-test-pre.js (198090 => 198091)


--- trunk/LayoutTests/http/tests/webgl/1.0.2/resources/webgl_test_files/resources/js-test-pre.js	2016-03-14 01:57:17 UTC (rev 198090)
+++ trunk/LayoutTests/http/tests/webgl/1.0.2/resources/webgl_test_files/resources/js-test-pre.js	2016-03-14 03:58:26 UTC (rev 198091)
@@ -38,7 +38,6 @@
     }
 
     if (window.layoutTestController) {
-      layoutTestController.overridePreference("WebKitWebGLEnabled", "1");
       layoutTestController.dumpAsText();
       layoutTestController.waitUntilDone();
     }

Modified: trunk/LayoutTests/http/tests/webgl/1.0.2/resources/webkit-webgl-test-harness.js (198090 => 198091)


--- trunk/LayoutTests/http/tests/webgl/1.0.2/resources/webkit-webgl-test-harness.js	2016-03-14 01:57:17 UTC (rev 198090)
+++ trunk/LayoutTests/http/tests/webgl/1.0.2/resources/webkit-webgl-test-harness.js	2016-03-14 03:58:26 UTC (rev 198091)
@@ -7,7 +7,6 @@
   }
 
   if (window.layoutTestController) {
-    layoutTestController.overridePreference("WebKitWebGLEnabled", "1");
     layoutTestController.dumpAsText();
     layoutTestController.waitUntilDone();
 

Modified: trunk/LayoutTests/imported/blink/compositing/draws-content/webgl-simple-background.html (198090 => 198091)


--- trunk/LayoutTests/imported/blink/compositing/draws-content/webgl-simple-background.html	2016-03-14 01:57:17 UTC (rev 198090)
+++ trunk/LayoutTests/imported/blink/compositing/draws-content/webgl-simple-background.html	2016-03-14 03:58:26 UTC (rev 198091)
@@ -13,9 +13,6 @@
       }
     </style>
     <script>
-        if (window.testRunner)
-            testRunner.overridePreference("WebKitWebGLEnabled", "1");
-
         function drawCanvas(canvasID) {
             var canvas = document.getElementById(canvasID);
             var gl = canvas.getContext("webgl");

Modified: trunk/LayoutTests/webgl/1.0.2/resources/webgl_test_files/conformance/more/unit.js (198090 => 198091)


--- trunk/LayoutTests/webgl/1.0.2/resources/webgl_test_files/conformance/more/unit.js	2016-03-14 01:57:17 UTC (rev 198090)
+++ trunk/LayoutTests/webgl/1.0.2/resources/webgl_test_files/conformance/more/unit.js	2016-03-14 03:58:26 UTC (rev 198091)
@@ -33,7 +33,6 @@
 }
 
 if (window.layoutTestController) {
-  layoutTestController.overridePreference("WebKitWebGLEnabled", "1");
   layoutTestController.dumpAsText();
   layoutTestController.waitUntilDone();
 

Modified: trunk/LayoutTests/webgl/1.0.2/resources/webgl_test_files/resources/js-test-pre.js (198090 => 198091)


--- trunk/LayoutTests/webgl/1.0.2/resources/webgl_test_files/resources/js-test-pre.js	2016-03-14 01:57:17 UTC (rev 198090)
+++ trunk/LayoutTests/webgl/1.0.2/resources/webgl_test_files/resources/js-test-pre.js	2016-03-14 03:58:26 UTC (rev 198091)
@@ -38,7 +38,6 @@
     }
 
     if (window.layoutTestController) {
-      layoutTestController.overridePreference("WebKitWebGLEnabled", "1");
       layoutTestController.dumpAsText();
       layoutTestController.waitUntilDone();
     }

Modified: trunk/LayoutTests/webgl/1.0.2/resources/webkit-webgl-test-harness.js (198090 => 198091)


--- trunk/LayoutTests/webgl/1.0.2/resources/webkit-webgl-test-harness.js	2016-03-14 01:57:17 UTC (rev 198090)
+++ trunk/LayoutTests/webgl/1.0.2/resources/webkit-webgl-test-harness.js	2016-03-14 03:58:26 UTC (rev 198091)
@@ -7,7 +7,6 @@
   }
 
   if (window.layoutTestController) {
-    layoutTestController.overridePreference("WebKitWebGLEnabled", "1");
     layoutTestController.dumpAsText();
     layoutTestController.waitUntilDone();
 

Modified: trunk/LayoutTests/webgl/1.0.3/resources/webgl_test_files/conformance/more/unit.js (198090 => 198091)


--- trunk/LayoutTests/webgl/1.0.3/resources/webgl_test_files/conformance/more/unit.js	2016-03-14 01:57:17 UTC (rev 198090)
+++ trunk/LayoutTests/webgl/1.0.3/resources/webgl_test_files/conformance/more/unit.js	2016-03-14 03:58:26 UTC (rev 198091)
@@ -33,7 +33,6 @@
 }
 
 if (window.layoutTestController) {
-  layoutTestController.overridePreference("WebKitWebGLEnabled", "1");
   layoutTestController.dumpAsText();
   layoutTestController.waitUntilDone();
 

Modified: trunk/LayoutTests/webgl/1.0.3/resources/webgl_test_files/resources/js-test-pre.js (198090 => 198091)


--- trunk/LayoutTests/webgl/1.0.3/resources/webgl_test_files/resources/js-test-pre.js	2016-03-14 01:57:17 UTC (rev 198090)
+++ trunk/LayoutTests/webgl/1.0.3/resources/webgl_test_files/resources/js-test-pre.js	2016-03-14 03:58:26 UTC (rev 198091)
@@ -38,7 +38,6 @@
     }
 
     if (window.layoutTestController) {
-      layoutTestController.overridePreference("WebKitWebGLEnabled", "1");
       layoutTestController.dumpAsText();
       layoutTestController.waitUntilDone();
     }

Modified: trunk/LayoutTests/webgl/1.0.3/resources/webkit-webgl-test-harness.js (198090 => 198091)


--- trunk/LayoutTests/webgl/1.0.3/resources/webkit-webgl-test-harness.js	2016-03-14 01:57:17 UTC (rev 198090)
+++ trunk/LayoutTests/webgl/1.0.3/resources/webkit-webgl-test-harness.js	2016-03-14 03:58:26 UTC (rev 198091)
@@ -7,7 +7,6 @@
   }
 
   if (window.layoutTestController) {
-    layoutTestController.overridePreference("WebKitWebGLEnabled", "1");
     layoutTestController.dumpAsText();
     layoutTestController.waitUntilDone();
 

Modified: trunk/LayoutTests/webgl/resources/webkit-webgl-test-harness.js (198090 => 198091)


--- trunk/LayoutTests/webgl/resources/webkit-webgl-test-harness.js	2016-03-14 01:57:17 UTC (rev 198090)
+++ trunk/LayoutTests/webgl/resources/webkit-webgl-test-harness.js	2016-03-14 03:58:26 UTC (rev 198091)
@@ -7,7 +7,6 @@
   }
 
   if (window.layoutTestController) {
-    layoutTestController.overridePreference("WebKitWebGLEnabled", "1");
     layoutTestController.dumpAsText();
     layoutTestController.waitUntilDone();
 

Modified: trunk/Tools/ChangeLog (198090 => 198091)


--- trunk/Tools/ChangeLog	2016-03-14 01:57:17 UTC (rev 198090)
+++ trunk/Tools/ChangeLog	2016-03-14 03:58:26 UTC (rev 198091)
@@ -1,3 +1,20 @@
+2016-03-13  Dean Jackson  <[email protected]>
+
+        DRT should enable WebGL by default on Mac
+        https://bugs.webkit.org/show_bug.cgi?id=155419
+        <rdar://problem/25136981>
+
+        Reviewed by Sam Weinig.
+
+        For some reason, lost in time, WebGL was enabled
+        by default on trunk, but disabled by default
+        in DumpRenderTree when using WebKit 1. This
+        was very annoying, because each test had
+        an explicit command to enable it.
+
+        * DumpRenderTree/mac/DumpRenderTree.mm:
+        (resetWebPreferencesToConsistentValues): Deleted WebGL line.
+
 2016-03-13  Konstantin Tokarev  <[email protected]>
 
         Added new port JSCOnly.

Modified: trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm (198090 => 198091)


--- trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm	2016-03-14 01:57:17 UTC (rev 198090)
+++ trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm	2016-03-14 03:58:26 UTC (rev 198091)
@@ -964,7 +964,6 @@
     [preferences setCanvasUsesAcceleratedDrawing:YES];
     [preferences setAcceleratedDrawingEnabled:useAcceleratedDrawing];
 #endif
-    [preferences setWebGLEnabled:NO];
     [preferences setCSSRegionsEnabled:YES];
     [preferences setUsePreHTML5ParserQuirks:NO];
     [preferences setAsynchronousSpellCheckingEnabled:NO];
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to