Backed out changeset 99302ed2d6ad (bug 1052240)
authorCarsten "Tomcat" Book <cbook@mozilla.com>
Mon, 25 Aug 2014 14:10:16 +0200
changeset 222988 c22358426fd3977d63ff08ca12aa32064b322b1f
parent 222987 f0592de4261c6f90a0731c4b9b65bae0060f12e3
child 222989 6074e6792a95740fc08a0a694593c22c60bbfcbf
push id3979
push userraliiev@mozilla.com
push dateMon, 13 Oct 2014 16:35:44 +0000
treeherdermozilla-beta@30f2cc610691 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1052240
milestone34.0a1
backs out99302ed2d6ad14113ad7a0b2e930d0f477f4245c
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 99302ed2d6ad (bug 1052240)
dom/canvas/test/webgl-conformance/mochi-single.html
--- a/dom/canvas/test/webgl-conformance/mochi-single.html
+++ b/dom/canvas/test/webgl-conformance/mochi-single.html
@@ -17,59 +17,26 @@ WebGL Conformance Test Suite Single Test
 <div>Failures: <span id='results'>-</span></div>
 <iframe id='test-frame' width='100%' scrolling='no'></iframe>
 <script>
 'use strict';
 
 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() {
     var frameBody = frameElem.contentWindow.document.body;
 
     if (frameBody) {
       var scrollHeight = frameBody.scrollHeight;
       frameElem.height = scrollHeight + 2*IFRAME_BODY_MARGIN;
@@ -106,25 +73,54 @@ window.webglTestHarness = {
     ].join('\n');
   },
 
   notifyFinished: function(testPath) {
     OnTestComplete();
   },
 };
 
+var gTestPath = null;
+
 function OnTestComplete() {
   statusElem.innerHTML = 'Complete';
 
   var passed = failureCount == 0;
   ok(passed, 'Should pass: ' + gTestPath);
   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();
 
 do {
   var arg = location.search.substr(1);
   if (arg == 'dump') {
     statusElem.innerHTML = 'Dumping';