Back out 3 changesets (bug 1087560) again, for Android 2.3 crashes and b2g failures

CLOSED TREE

Backed out changeset ed403e959506 (bug 1087560)
Backed out changeset 64c7041ab581 (bug 1087560)
Backed out changeset 4f040d3522a4 (bug 1087560)

dom/canvas/test/webgl-mochitest.ini

@@ -1,16 +1,14 @@
 [DEFAULT]
-skip-if = ((os == 'linux') && (buildapp == 'b2g'))
-
 support-files =
   webgl-mochitest/driver-info.js
   webgl-mochitest/webgl-util.js
 
-[webgl-mochitest/test_backbuffer_channels.html]
+[webgl-mochitest/test-backbuffer-channels.html]
+[webgl-mochitest/test-hidden-alpha.html]
 [webgl-mochitest/test_depth_readpixels.html]
 [webgl-mochitest/test_draw.html]
 [webgl-mochitest/test_fb_param.html]
 [webgl-mochitest/test_fb_param_crash.html]
-[webgl-mochitest/test_hidden_alpha.html]
 [webgl-mochitest/test_highp_fs.html]
 [webgl-mochitest/test_no_arr_points.html]
 [webgl-mochitest/test_noprog_draw.html]

dom/canvas/test/webgl-mochitest/mochi-to-testcase.py

@@ -48,11 +48,6 @@ function todo(val, text) {
                    : 'Test <font color=\\'blue\\'  >todo</font>: ';
   debug(status + text);
 }
-
-SimpleTest = {
-  waitForExplicitFinish: function() {},
-  finish: function() {},
-};
 </script>
 <div id='mochi-to-testcase-output'></div>
 \n'''

dom/canvas/test/webgl-mochitest/test-backbuffer-channels.html

@@ -8,7 +8,7 @@
 <script>
 
 function TestAttribs(attribs) {
-  ok(true, 'Testing attribs: ' + JSON.stringify(attribs));
+  debug('Testing attribs: ' + JSON.stringify(attribs));
   var canvas = document.createElement('canvas');
   var gl = canvas.getContext('experimental-webgl', attribs);
   ok(gl, 'No tested attribs should result in failure to create a context');

dom/canvas/test/webgl-mochitest/test-hidden-alpha.html

@@ -77,7 +77,7 @@ function Test(gl, prog) {
 
   //////////////////
 
-  ok(true, 'clear(R,G,B,0)');
+  debug('clear(R,G,B,0)');
 
   Reset(gl);
 
@@ -102,7 +102,7 @@ function Test(gl, prog) {
 
   //////////////////
 
-  ok(true, 'mask(R,G,B,0), clear(R,G,B,1)');
+  debug('mask(R,G,B,0), clear(R,G,B,1)');
 
   Reset(gl);
 
@@ -129,7 +129,6 @@ function Test(gl, prog) {
      'toDataURL should be unchanged after blending.');
 
   ok(true, 'Test complete.');
-  SimpleTest.finish();
 }
 
 (function(){
@@ -147,7 +146,6 @@ function Test(gl, prog) {
   ok(prog, 'Program should link.');
   prog.aPosCoord = gl.getAttribLocation(prog, 'aPosCoord');
 
-  SimpleTest.waitForExplicitFinish();
   setTimeout(function(){ Test(gl, prog); }, 500);
 })();