Bug 1274017 - Fix graphics-related exceptions in about:support. (bug 1274017, r=milan) . r=milan, a=sylvestre
authorDavid Anderson <danderson@mozilla.com>
Thu, 19 May 2016 15:07:13 -0700
changeset 333200 410d008493bcec3873e58f9af33d85843d1ae98f
parent 333199 3f047773835673c744b6e7b19e60cb1d49eaa22f
child 333201 df5a45f1a3e749c8d5e2ab97815c8c19ca200e02
push id6048
push userkmoir@mozilla.com
push dateMon, 06 Jun 2016 19:02:08 +0000
treeherdermozilla-beta@46d72a56c57d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmilan, milan, sylvestre
bugs1274017
milestone48.0a2
Bug 1274017 - Fix graphics-related exceptions in about:support. (bug 1274017, r=milan) . r=milan, a=sylvestre
toolkit/content/aboutSupport.js
--- a/toolkit/content/aboutSupport.js
+++ b/toolkit/content/aboutSupport.js
@@ -352,16 +352,17 @@ var snapshotFormatters = {
     let compositor = data.windowLayerManagerRemote
                      ? data.windowLayerManagerType
                      : "BasicLayers (" + strings.GetStringFromName("mainThreadNoOMTC") + ")";
     addRow("features", "compositing", compositor);
     delete data.windowLayerManagerRemote;
     delete data.windowLayerManagerType;
     delete data.numTotalWindows;
     delete data.numAcceleratedWindows;
+    delete data.numAcceleratedWindowsMessage;
 
     addRow("features", "asyncPanZoom",
            apzInfo.length
            ? apzInfo.join("; ")
            : localizedMsg(["apzNone"]));
     addRowFromKey("features", "webglRenderer");
     addRowFromKey("features", "supportsHardwareH264", "hardwareH264");
     addRowFromKey("features", "direct2DEnabled", "#Direct2D");
@@ -420,17 +421,21 @@ var snapshotFormatters = {
       delete data[prop];
       delete data[prop + "2"];
     }
     delete data.isGPU2Active;
 
     // Now that we're done, grab any remaining keys in data and drop them into
     // the diagnostics section.
     for (let key in data) {
-      addRow("diagnostics", key, data[key]);
+      let value = data[key];
+      if (Array.isArray(value)) {
+        value = localizedMsg(value);
+      }
+      addRow("diagnostics", key, value);
     }
   },
 
   javaScript: function javaScript(data) {
     $("javascript-incremental-gc").textContent = data.incrementalGCEnabled;
   },
 
   accessibility: function accessibility(data) {