Backed out changeset 85109095dd71 (bug 883364)
authorEd Morley <emorley@mozilla.com>
Wed, 31 Jul 2013 08:58:40 +0100
changeset 140712 91b9edd45d8f5518e764631d9341e65b84d4938b
parent 140711 8b338d7c3660bb849d9928ddc0c8eabb6d3c26cf
child 140713 5623c4b04a1e9ccbaacd987ff7c3715d0f822020
push id31840
push useremorley@mozilla.com
push dateWed, 31 Jul 2013 08:00:05 +0000
treeherdermozilla-inbound@5623c4b04a1e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs883364
milestone25.0a1
backs out85109095dd715ffb62c57379194412f1677c7f86
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backed out changeset 85109095dd71 (bug 883364)
content/canvas/test/reftest/webgl-clear-test.html
content/canvas/test/reftest/webgl-color-alpha-test.html
content/canvas/test/reftest/webgl-color-test.html
content/canvas/test/reftest/webgl-hanging-fb-test.html
content/canvas/test/reftest/webgl-hanging-scissor-test.html
content/canvas/test/reftest/webgl-orientation-test.html
--- a/content/canvas/test/reftest/webgl-clear-test.html
+++ b/content/canvas/test/reftest/webgl-clear-test.html
@@ -13,38 +13,31 @@
 "use strict";
 
 function renderGL(gl) {
   gl.clearColor(0.0, 1.0, 0.0, 1.0);
   gl.clear(gl.COLOR_BUFFER_BIT);
   gl.finish();
 }
 
-function renderFailure(canvas) {
-  // This will also trigger RAF for us.
-  var context = canvas.getContext("2d");
-  context.fillText('WebGL failed.', 64, 64);
-}
-
 function runTest() {
   var canvas = document.getElementById("canvas");
   var gl = initGL(canvas);
 
   if (gl)
     renderGL(gl);
   else
-    renderFailure(canvas);
+    document.write("Failed to get WebGL context.");
 
   rAF(testComplete);
 }
 
 function testComplete() {
   document.documentElement.removeAttribute("class");
 }
-
 </script>
 </head>
 
 <body onload="rAF(runTest);">
   <canvas id="canvas" width="256" height="256"></canvas>
 </body>
 
 </html>
--- a/content/canvas/test/reftest/webgl-color-alpha-test.html
+++ b/content/canvas/test/reftest/webgl-color-alpha-test.html
@@ -42,33 +42,27 @@ function renderGL(gl, value, alpha) {
 
   gl.scissor(128, 0, 128, 128);
   gl.clearColor(value, value, value, alpha);
   gl.clear(gl.COLOR_BUFFER_BIT);
 
   gl.finish();
 }
 
-function renderFailure(canvas) {
-  // This will also trigger RAF for us.
-  var context = canvas.getContext("2d");
-  context.fillText('WebGL failed.', 64, 64);
-}
-
 function runTest() {
   var canvas = document.getElementById("canvas");
   var gl = initGL(canvas);
 
   var value = arg("colorVal");
   var alpha = arg("alphaVal");
 
   if (gl)
     renderGL(gl, value, alpha);
   else
-    renderFailure(canvas);
+    document.write("Failed to get WebGL context.");
 
   rAF(testComplete);
 }
 
 function testComplete() {
   document.documentElement.removeAttribute("class");
 }
 </script>
--- a/content/canvas/test/reftest/webgl-color-test.html
+++ b/content/canvas/test/reftest/webgl-color-test.html
@@ -40,30 +40,24 @@ function renderGL(gl) {
 
   gl.scissor(128, 0, 128, 128);
   gl.clearColor(1.0, 1.0, 1.0, 1.0);
   gl.clear(gl.COLOR_BUFFER_BIT);
 
   gl.finish();
 }
 
-function renderFailure(canvas) {
-  // This will also trigger RAF for us.
-  var context = canvas.getContext("2d");
-  context.fillText('WebGL failed.', 64, 64);
-}
-
 function runTest() {
   var canvas = document.getElementById("canvas");
   var gl = initGL(canvas);
 
   if (gl)
     renderGL(gl);
   else
-    renderFailure(canvas);
+    document.write("Failed to get WebGL context.");
 
   rAF(testComplete);
 }
 
 function testComplete() {
   document.documentElement.removeAttribute("class");
 }
 </script>
--- a/content/canvas/test/reftest/webgl-hanging-fb-test.html
+++ b/content/canvas/test/reftest/webgl-hanging-fb-test.html
@@ -22,30 +22,24 @@ function renderGL(gl) {
   gl.clear(gl.COLOR_BUFFER_BIT);
 
   var fb = gl.createFramebuffer();
   gl.bindFramebuffer(gl.FRAMEBUFFER, fb);
 
   gl.finish();
 }
 
-function renderFailure(canvas) {
-  // This will also trigger RAF for us.
-  var context = canvas.getContext("2d");
-  context.fillText('WebGL failed.', 64, 64);
-}
-
 function runTest() {
   var canvas = document.getElementById("canvas");
   var gl = initGL(canvas);
 
   if (gl)
     renderGL(gl);
   else
-    renderFailure(canvas);
+    document.write("Failed to get WebGL context.");
 
   rAF(testComplete);
 }
 
 function testComplete() {
   document.documentElement.removeAttribute("class");
 }
 </script>
--- a/content/canvas/test/reftest/webgl-hanging-scissor-test.html
+++ b/content/canvas/test/reftest/webgl-hanging-scissor-test.html
@@ -21,30 +21,24 @@ function renderGL(gl) {
   gl.clear(gl.COLOR_BUFFER_BIT);
 
   gl.enable(gl.SCISSOR_TEST);
   gl.scissor(0, 128, 128, 128);
 
   gl.finish();
 }
 
-function renderFailure(canvas) {
-  // This will also trigger RAF for us.
-  var context = canvas.getContext("2d");
-  context.fillText('WebGL failed.', 64, 64);
-}
-
 function runTest() {
   var canvas = document.getElementById("canvas");
   var gl = initGL(canvas);
 
   if (gl)
     renderGL(gl);
   else
-    renderFailure(canvas);
+    document.write("Failed to get WebGL context.");
 
   rAF(testComplete);
 }
 
 function testComplete() {
   document.documentElement.removeAttribute("class");
 }
 </script>
--- a/content/canvas/test/reftest/webgl-orientation-test.html
+++ b/content/canvas/test/reftest/webgl-orientation-test.html
@@ -21,30 +21,24 @@ function renderGL(gl) {
   gl.enable(gl.SCISSOR_TEST);
   gl.scissor(0, 128, 128, 128);
   gl.clearColor(1.0, 1.0, 1.0, 1.0);
   gl.clear(gl.COLOR_BUFFER_BIT);
 
   gl.finish();
 }
 
-function renderFailure(canvas) {
-  // This will also trigger RAF for us.
-  var context = canvas.getContext("2d");
-  context.fillText('WebGL failed.', 64, 64);
-}
-
 function runTest() {
   var canvas = document.getElementById("canvas");
   var gl = initGL(canvas);
 
   if (gl)
     renderGL(gl);
   else
-    renderFailure(canvas);
+    document.write("Failed to get WebGL context.");
 
   rAF(testComplete);
 }
 
 function testComplete() {
   document.documentElement.removeAttribute("class");
 }
 </script>