Backed out changeset 99302ed2d6ad (bug 1052240)

This commit is contained in:
Carsten "Tomcat" Book 2014-08-25 14:10:16 +02:00
parent 6af46c3004
commit 7e196b249c

View File

@ -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();