Backed out changeset 9278f620c078 (bug 1181375) for bustage

toolkit/components/gfx/SanityTest.js

@@ -28,12 +28,6 @@ const TEST_FAILED_RENDER=1;
 const TEST_FAILED_VIDEO=2;
 const TEST_CRASHED=3;
 
-// GRAPHICS_SANITY_TEST_REASON enumeration values.
-const REASON_FIRST_RUN=0;
-const REASON_FIREFOX_CHANGED=1;
-const REASON_DEVICE_CHANGED=2;
-const REASON_DRIVER_CHANGED=3;
-
 // GRAPHICS_SANITY_TEST_OS_SNAPSHOT histogram enumeration values
 const SNAPSHOT_VIDEO_OK=0;
 const SNAPSHOT_VIDEO_FAIL=1;
@@ -69,11 +63,6 @@ function reportSnapshotResult(val) {
   histogram.add(val);
 }
 
-function reportTestReason(val) {
-  let histogram = Services.telemetry.getHistogramById("GRAPHICS_SANITY_TEST_REASON");
-  histogram.add(val);
-}
-
 function takeWindowSnapshot(win, ctx) {
   // TODO: drawWindow reads back from the gpu's backbuffer, which won't catch issues with presenting
   // the front buffer via the window manager. Ideally we'd use an OS level API for reading back
@@ -229,24 +218,10 @@ SanityTest.prototype = {
       return false;
     }
 
-    function checkPref(pref, value, reason) {
-      var prefValue = Preferences.get(pref, "");
-      if (prefValue == value) {
-        return true;
-      }
-      if (value == "") {
-        reportTestReason(REASON_FIRST_RUN);
-      } else {
-        reportTestReason(reason);
-      }
-      return false;
-    }
-
     // TODO: Handle dual GPU setups
-    if (checkPref(DRIVER_PREF, gfxinfo.adapterDriverVersion, REASON_DRIVER_CHANGED) &&
-        checkPref(DEVICE_PREF, gfxinfo.adapterDeviceID, REASON_DEVICE_CHANGED) &&
-        checkPref(VERSION_PREF, xulVersion, REASON_FIREFOX_CHANGED))
-    {
+    if (Preferences.get(DRIVER_PREF, "") == gfxinfo.adapterDriverVersion &&
+        Preferences.get(DEVICE_PREF, "") == gfxinfo.adapterDeviceID &&
+        Preferences.get(VERSION_PREF, "") == xulVersion) {
       return false;
     }