Backout changeset 3b7d72e5e850 (bug 1196128, r=vladan)

This commit is contained in:
David Anderson 2015-08-24 23:20:30 -04:00
parent 6ee96dc7a5
commit 1855b044c6
2 changed files with 1 additions and 24 deletions

View File

@ -74,16 +74,6 @@ function reportTestReason(val) {
histogram.add(val);
}
function reportSnapshotContents(canvas) {
try {
var data = canvas.toDataURL();
Cc['@mozilla.org/observer-service;1'].
getService(Ci.nsIObserverService).
notifyObservers(null, "graphics-sanity-test-failed", data);
} catch (e) {
}
}
function annotateCrashReport(value) {
try {
// "1" if we're annotating the crash report, "" to remove the annotation.
@ -177,9 +167,7 @@ let listener = {
// Perform the compositor backbuffer test, which currently we use for
// actually deciding whether to enable hardware media decoding.
if (!testCompositor(this.win, this.ctx)) {
reportSnapshotContents(this.canvas);
}
testCompositor(this.win, this.ctx);
this.endTest();
},

View File

@ -169,7 +169,6 @@ const EXPERIMENTS_CHANGED_TOPIC = "experiments-changed";
const SEARCH_ENGINE_MODIFIED_TOPIC = "browser-search-engine-modified";
const SEARCH_SERVICE_TOPIC = "browser-search-service";
const COMPOSITOR_CREATED_TOPIC = "compositor:created";
const SANITY_TEST_FAILED_TOPIC = "graphics-sanity-test-failed";
/**
* Get the current browser.
@ -827,7 +826,6 @@ EnvironmentCache.prototype = {
Services.obs.addObserver(this, SEARCH_ENGINE_MODIFIED_TOPIC, false);
Services.obs.addObserver(this, SEARCH_SERVICE_TOPIC, false);
Services.obs.addObserver(this, COMPOSITOR_CREATED_TOPIC, false);
Services.obs.addObserver(this, SANITY_TEST_FAILED_TOPIC, false);
},
_removeObservers: function () {
@ -835,7 +833,6 @@ EnvironmentCache.prototype = {
Services.obs.removeObserver(this, SEARCH_ENGINE_MODIFIED_TOPIC);
Services.obs.removeObserver(this, SEARCH_SERVICE_TOPIC);
Services.obs.removeObserver(this, COMPOSITOR_CREATED_TOPIC);
Services.obs.removeObserver(this, SANITY_TEST_FAILED_TOPIC);
},
observe: function (aSubject, aTopic, aData) {
@ -861,9 +858,6 @@ EnvironmentCache.prototype = {
// first compositor to be created and then query nsIGfxInfo again.
this._updateGraphicsFeatures();
break;
case SANITY_TEST_FAILED_TOPIC:
this._onGraphicsSanityTestFailed(aData);
break;
}
},
@ -943,11 +937,6 @@ EnvironmentCache.prototype = {
}
},
_onGraphicsSanityTestFailed: function (aData) {
let gfxData = this._currentEnvironment.system.gfx;
gfxData.sanityTestSnapshot = aData;
},
/**
* Get the build data in object form.
* @return Object containing the build data.