mozilla
/
pjs
зеркало из https://github.com/mozilla/pjs.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bug 580786. Require gWindowUtils. r=dbaron 

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
Родитель e3e9218654
Коммит b11e8e447e
1 изменённых файлов: 7 добавлений и 18 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

25
layout/tools/reftest/reftest.js
Просмотреть файл

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