Bug 1137404 - Remove DWriteVersion reporting from Telemetry. r=gfritzsche

toolkit/components/telemetry/TelemetryEnvironment.jsm

@@ -1019,7 +1019,9 @@ EnvironmentCache.prototype = {
     let gfxData = {
       D2DEnabled: getGfxField("D2DEnabled", null),
       DWriteEnabled: getGfxField("DWriteEnabled", null),
-      DWriteVersion: getGfxField("DWriteVersion", null),
+      // The following line is disabled due to main thread jank and will be enabled
+      // again as part of bug 1154500.
+      //DWriteVersion: getGfxField("DWriteVersion", null),
       adapters: [],
     };
 

toolkit/components/telemetry/docs/environment.rst

@@ -112,7 +112,7 @@ Structure::
         gfx: {
             D2DEnabled: <bool>, // null on failure
             DWriteEnabled: <bool>, // null on failure
-            DWriteVersion: <string>, // null on failure
+            //DWriteVersion: <string>, // temporarily removed, pending bug 1154500
             adapters: [
               {
                 description: <string>, // e.g. "Intel(R) HD Graphics 4600", null on failure

toolkit/components/telemetry/tests/unit/test_TelemetryEnvironment.js

@@ -392,11 +392,14 @@ function checkSystemSection(data) {
   let gfxData = data.system.gfx;
   Assert.ok("D2DEnabled" in gfxData);
   Assert.ok("DWriteEnabled" in gfxData);
-  Assert.ok("DWriteVersion" in gfxData);
+  // DWriteVersion is disabled due to main thread jank and will be enabled
+  // again as part of bug 1154500.
+  //Assert.ok("DWriteVersion" in gfxData);
   if (gIsWindows) {
     Assert.equal(typeof gfxData.D2DEnabled, "boolean");
     Assert.equal(typeof gfxData.DWriteEnabled, "boolean");
-    Assert.ok(checkString(gfxData.DWriteVersion));
+    // As above, will be enabled again as part of bug 1154500.
+    //Assert.ok(checkString(gfxData.DWriteVersion));
   }
 
   Assert.ok("adapters" in gfxData);