Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-16 13:56:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 708443 patch 1: Remove call to nonexistent function 'imageLoadCallback' and other misc cleanup in animationPolling.js. r=jwir3

Browse Source
This commit is contained in:
Daniel Holbert 2011-12-08 13:31:29 -08:00
parent 1b75d56798
commit ec2eb42f9a
1 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
image/test/mochitest/animationPolling.js
View File

@ -1,7 +1,7 @@
var currentTest;
var gIsRefImageLoaded = false;
function pollForSuccess ()
function pollForSuccess()
{
if (!currentTest.isTestFinished) {
if (!currentTest.reusingReferenceImage || (currentTest.reusingReferenceImage
@ -23,9 +23,8 @@ function reuseImageCallback()
gIsRefImageLoaded = true;
}
function failTest ()
{ imageLoadCallback();
function failTest()
{
if (currentTest.isTestFinished || currentTest.closeFunc) {
return;
}
@ -203,7 +202,7 @@ AnimationTest.prototype.continueTest = function()
this.takeReferenceSnapshot();
this.setupPolledImage();
setTimeout(pollForSuccess, 10);
SimpleTest.executeSoon(pollForSuccess);
};
AnimationTest.prototype.setupPolledImage = function ()
@ -212,7 +211,8 @@ AnimationTest.prototype.setupPolledImage = function ()
if (!this.reusingImageAsReference) {
this.enableDisplay(document.getElementById(this.imageElementId));
var currentSnapshot = snapshotWindow(window, false);
var result = compareSnapshots(currentSnapshot, this.referenceSnapshot, true);
var result = compareSnapshots(currentSnapshot,
this.referenceSnapshot, true);
this.currentSnapshotDataURI = currentSnapshot.toDataURL();
@ -276,14 +276,14 @@ AnimationTest.prototype.takeReferenceSnapshot = function ()
}
if (this.reusingImageAsReference) {
// Show reference div, & take a snapshot
var referenceDiv = document.getElementById(this.imageElementId);
this.enableDisplay(referenceDiv);
// Show reference elem (which is actually our image), & take a snapshot
var referenceElem = document.getElementById(this.imageElementId);
this.enableDisplay(referenceElem);
this.referenceSnapshot = snapshotWindow(window, false);
var snapResult = compareSnapshots(this.cleanSnapshot, this.referenceSnapshot,
false);
var snapResult = compareSnapshots(this.cleanSnapshot,
this.referenceSnapshot, false);
if (!snapResult[0]) {
if (this.blankWaitTime > 2000) {
// if it took longer than two seconds to load the image, we probably
@ -292,9 +292,9 @@ AnimationTest.prototype.takeReferenceSnapshot = function ()
ok(snapResult[0],
"Reference snapshot shouldn't match clean (non-image) snapshot");
} else {
this.blankWaitTime += 20;
this.blankWaitTime += currentTest.pollFreq;
// let's wait a bit and see if it clears up
setTimeout(referencePoller, 20);
setTimeout(referencePoller, currentTest.pollFreq);
return;
}
}
@ -314,7 +314,8 @@ AnimationTest.prototype.takeReferenceSnapshot = function ()
this.enableDisplay(referenceDiv);
this.referenceSnapshot = snapshotWindow(window, false);
var snapResult = compareSnapshots(this.cleanSnapshot, this.referenceSnapshot, false);
var snapResult = compareSnapshots(this.cleanSnapshot,
this.referenceSnapshot, false);
if (!snapResult[0]) {
if (this.blankWaitTime > 2000) {
// if it took longer than two seconds to load the image, we probably