Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-10 11:55:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1357517 - Remove Preferences.jsm usage from graphics sanity test. r=mchang

Browse Source 
--HG--
extra : rebase_source : 7a689805662eeea05c85b315e6687c4292a14992
This commit is contained in:
Marco Castelluccio 2017-07-31 19:36:32 +02:00
parent b639886200
commit 8e32927dd9
1 changed files with 41 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
toolkit/components/gfx/SanityTest.js
View File

@ -7,7 +7,6 @@
const { utils: Cu, interfaces: Ci, classes: Cc, results: Cr } = Components;
Cu.import("resource://gre/modules/Services.jsm");
Cu.import("resource://gre/modules/Preferences.jsm");
Cu.import("resource://gre/modules/XPCOMUtils.jsm");
const XUL_NS = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
@ -66,7 +65,7 @@ function reportResult(val) {
histogram.add(val);
} catch (e) {}
Preferences.set(RUNNING_PREF, false);
Services.prefs.setBoolPref(RUNNING_PREF, false);
Services.prefs.savePrefFile(null);
}
@ -131,21 +130,21 @@ function testCompositor(test, win, ctx) {
if (!verifyVideoRendering(ctx)) {
reportResult(TEST_FAILED_VIDEO);
Preferences.set(DISABLE_VIDEO_PREF, true);
Services.prefs.setBoolPref(DISABLE_VIDEO_PREF, true);
testPassed = false;
}
if (!verifyLayersRendering(ctx)) {
// Try disabling advanced layers if it was enabled. Also trgiger
// a device reset so the screen redraws.
if (Preferences.get(AL_ENABLED_PREF, false)) {
Preferences.set(AL_TEST_FAILED_PREF, true);
if (Services.prefs.getBoolPref(AL_ENABLED_PREF, false)) {
Services.prefs.setBoolPref(AL_TEST_FAILED_PREF, true);
test.utils.triggerDeviceReset();
}
reportResult(TEST_FAILED_RENDER);
testPassed = false;
} else {
Preferences.set(AL_TEST_FAILED_PREF, false);
Services.prefs.setBoolPref(AL_TEST_FAILED_PREF, false);
}
if (testPassed) {
@ -259,25 +258,45 @@ SanityTest.prototype = {
// gpu or drivers.
var buildId = Services.appinfo.platformBuildID;
var gfxinfo = Cc["@mozilla.org/gfx/info;1"].getService(Ci.nsIGfxInfo);
var hasAL = Preferences.get(AL_ENABLED_PREF, false);
var hasAL = Services.prefs.getBoolPref(AL_ENABLED_PREF, false);
if (Preferences.get(RUNNING_PREF, false)) {
Preferences.set(DISABLE_VIDEO_PREF, true);
if (Services.prefs.getBoolPref(RUNNING_PREF, false)) {
Services.prefs.setBoolPref(DISABLE_VIDEO_PREF, true);
reportResult(TEST_CRASHED);
return false;
}
function checkPref(pref, value, reason) {
var prefValue = Preferences.get(pref, undefined);
if (prefValue == value) {
return true;
let prefValue;
let prefType = Services.prefs.getPrefType(pref);
switch (prefType) {
case Ci.nsIPrefBranch.PREF_INVALID:
reportTestReason(REASON_FIRST_RUN);
return false;
case Ci.nsIPrefBranch.PREF_STRING:
prefValue = Services.prefs.getStringPref(pref);
break;
case Ci.nsIPrefBranch.PREF_BOOL:
prefValue = Services.prefs.getBoolPref(pref);
break;
case Ci.nsIPrefBranch.PREF_INT:
prefValue = Services.prefs.getIntPref(pref);
break;
default:
throw new Error("Unexpected preference type.");
}
if (prefValue === undefined) {
reportTestReason(REASON_FIRST_RUN);
} else {
if (prefValue != value) {
reportTestReason(reason);
return false;
}
return false;
return true;
}
// TODO: Handle dual GPU setups
@ -290,14 +309,14 @@ SanityTest.prototype = {
// Enable hardware decoding so we can test again
// and record the driver version to detect if the driver changes.
Preferences.set(DISABLE_VIDEO_PREF, false);
Preferences.set(DRIVER_PREF, gfxinfo.adapterDriverVersion);
Preferences.set(DEVICE_PREF, gfxinfo.adapterDeviceID);
Preferences.set(VERSION_PREF, buildId);
Preferences.set(ADVANCED_LAYERS_PREF, hasAL);
Services.prefs.setBoolPref(DISABLE_VIDEO_PREF, false);
Services.prefs.setStringPref(DRIVER_PREF, gfxinfo.adapterDriverVersion);
Services.prefs.setStringPref(DEVICE_PREF, gfxinfo.adapterDeviceID);
Services.prefs.setStringPref(VERSION_PREF, buildId);
Services.prefs.setBoolPref(ADVANCED_LAYERS_PREF, hasAL);
// Update the prefs so that this test doesn't run again until the next update.
Preferences.set(RUNNING_PREF, true);
Services.prefs.setBoolPref(RUNNING_PREF, true);
Services.prefs.savePrefFile(null);
return true;
},