wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 580786. Require gWindowUtils. r=dbaron

Browse Source 
We should have DOMWindowUtils everywhere and
this cleans up the code.
This commit is contained in:
Jeff Muizelaar 2011-12-19 09:02:47 -05:00
parent 90e62b3c51
commit 9dba35afaf
1 changed files with 7 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
layout/tools/reftest/reftest.js
View File

@ -345,13 +345,9 @@ function InitAndStartRefTests()
gThisChunk = 0;
}
try {
gWindowUtils = gContainingWindow.QueryInterface(CI.nsIInterfaceRequestor).getInterface(CI.nsIDOMWindowUtils);
if (gWindowUtils && !gWindowUtils.compareCanvases)
gWindowUtils = null;
} catch (e) {
gWindowUtils = null;
}
gWindowUtils = gContainingWindow.QueryInterface(CI.nsIInterfaceRequestor).getInterface(CI.nsIDOMWindowUtils);
if (!gWindowUtils || !gWindowUtils.compareCanvases)
throw "nsIDOMWindowUtils inteface missing";
gIOService = CC[IO_SERVICE_CONTRACTID].getService(CI.nsIIOService);
gDebug = CC[DEBUG_CONTRACTID].getService(CI.nsIDebug2);
@ -521,9 +517,9 @@ function BuildConditionSandbox(aURL) {
}
sandbox.layersGPUAccelerated =
gWindowUtils && gWindowUtils.layerManagerType != "Basic";
gWindowUtils.layerManagerType != "Basic";
sandbox.layersOpenGL =
gWindowUtils && gWindowUtils.layerManagerType == "OpenGL";
gWindowUtils.layerManagerType == "OpenGL";
// Shortcuts for widget toolkits.
sandbox.Android = xr.OS == "Android";
@ -1403,15 +1399,8 @@ function RecordResult(testRunTime, errorMsg, scriptResults)
// whether the two renderings match:
var equal;
if (gWindowUtils) {
differences = gWindowUtils.compareCanvases(gCanvas1, gCanvas2, {});
equal = (differences == 0);
} else {
differences = -1;
var k1 = gCanvas1.toDataURL();
var k2 = gCanvas2.toDataURL();
equal = (k1 == k2);
}
differences = gWindowUtils.compareCanvases(gCanvas1, gCanvas2, {});
equal = (differences == 0);
// whether the comparison result matches what is in the manifest
var test_passed = (equal == (gURLs[0].type == TYPE_REFTEST_EQUAL));