Backed out changeset 99302ed2d6ad (bug 1052240)

dothq · Aug 25, 2014 · 7e196b2 · 7e196b2
1 parent 6af46c3
commit 7e196b2
Showing 1 changed file with 32 additions and 36 deletions.
diff --git a/dom/canvas/test/webgl-conformance/mochi-single.html b/dom/canvas/test/webgl-conformance/mochi-single.html
@@ -22,49 +22,16 @@
 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 @@
   },
 };
 
+var gTestPath = null;
+
 function OnTestComplete() {
   statusElem.innerHTML = 'Complete';
 
@@ -119,7 +88,34 @@
   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();