diff --git a/toolkit/components/gfx/SanityTest.js b/toolkit/components/gfx/SanityTest.js index 256eb0c0d70..9603b54acf7 100644 --- a/toolkit/components/gfx/SanityTest.js +++ b/toolkit/components/gfx/SanityTest.js @@ -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(); }, diff --git a/toolkit/components/telemetry/TelemetryEnvironment.jsm b/toolkit/components/telemetry/TelemetryEnvironment.jsm index 16f5f843cc9..950d18ab116 100644 --- a/toolkit/components/telemetry/TelemetryEnvironment.jsm +++ b/toolkit/components/telemetry/TelemetryEnvironment.jsm @@ -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.