From 7e196b249c9331c799d3f75928f058f1e69acc24 Mon Sep 17 00:00:00 2001
From: "Carsten \"Tomcat\" Book" <cbook@mozilla.com>
Date: Mon, 25 Aug 2014 14:10:16 +0200
Subject: [PATCH] Backed out changeset 99302ed2d6ad (bug 1052240)

---
 .../test/webgl-conformance/mochi-single.html  | 68 +++++++++----------
 1 file changed, 32 insertions(+), 36 deletions(-)

diff --git a/dom/canvas/test/webgl-conformance/mochi-single.html b/dom/canvas/test/webgl-conformance/mochi-single.html
index 9b1b88352d07..125f549306e4 100644
--- a/dom/canvas/test/webgl-conformance/mochi-single.html
+++ b/dom/canvas/test/webgl-conformance/mochi-single.html
@@ -22,49 +22,16 @@ WebGL Conformance Test Suite Single Test Wrapper
 var IFRAME_BODY_MARGIN = 8;
 var IFRAME_SIZE_UPDATE_INTERVAL = 100; // ms
 
+////////////////////////////////////////
+
 var statusElem = document.getElementById('status');
 var pathElem = document.getElementById('path');
 var resultsElem = document.getElementById('results');
 var frameElem = document.getElementById('test-frame');
 
-////////////////////////////////////////////////////////////////////////
-// Forward SimpleTest functions and replace if missing.
-
-if (!window.ok) {
-  window.ok = parent.ok;
-}
-if (!window.todo) {
-  window.todo = parent.todo;
-}
-if (!window.SimpleTest) {
-  window.SimpleTest = parent.SimpleTest;
-}
-
-if (!window.ok) {
-  window.ok = function(status, message) {
-    console.log('ok(' + status + ', "' + message + '")');
-  }
-}
-if (!window.todo) {
-  window.todo = function(status, message) {
-    console.log('todo(' + status + ', "' + message + '")');
-  }
-}
-if (!window.SimpleTest) {
-  window.SimpleTest = {
-    waitForExplicitFinish: function(){},
-    finish: function(){},
-  };
-}
-
-////////////////////////////////////////////////////////////////////////
-// Test running and harness.
-
-var gTestPath = null;
 
 function RunTest(testPath) {
   pathElem.innerHTML = testPath;
-  gTestPath = testPath;
 
   // Auto-update to grow the size of the doc.
   function UpdateFrameSize() {
@@ -111,6 +78,8 @@ window.webglTestHarness = {
   },
 };
 
+var gTestPath = null;
+
 function OnTestComplete() {
   statusElem.innerHTML = 'Complete';
 
@@ -119,7 +88,34 @@ function OnTestComplete() {
   SimpleTest.finish();
 }
 
-////////////////////////////////////////////////////////////////////////
+if (!window.ok) {
+  window.ok = parent.ok;
+}
+if (!window.todo) {
+  window.todo = parent.todo;
+}
+if (!window.SimpleTest) {
+  window.SimpleTest = parent.SimpleTest;
+}
+
+if (!window.ok) {
+  window.ok = function(status, message) {
+    console.log('ok(' + status + ', "' + message + '")');
+  }
+}
+if (!window.todo) {
+  window.todo = function(status, message) {
+    console.log('todo(' + status + ', "' + message + '")');
+  }
+}
+if (!window.SimpleTest) {
+  window.SimpleTest = {
+    waitForExplicitFinish: function(){},
+    finish: function(){},
+  };
+}
+
+////////////////////////////////////////
 // Begin execution
 
 SimpleTest.waitForExplicitFinish();