Bug 602975 - Empty "Graphics" section in about:support - r=joe
authorBenoit Jacob <bjacob@mozilla.com>
Tue, 12 Oct 2010 17:01:59 -0400
changeset 55378 69bcdcc0ef25251c1f614d150d70b3587af11183
parent 55377 3c4f52eb4d8e5eb04a11cfaab92a188fcf9df069
child 55379 08c58ca3f156ff1d16815f5e6865d0b3b7f00d83
push id1
push userroot
push dateTue, 26 Apr 2011 22:38:44 +0000
treeherdermozilla-beta@bfdb6e623a36 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjoe
bugs602975
milestone2.0b8pre
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 602975 - Empty "Graphics" section in about:support - r=joe
toolkit/content/aboutSupport.js
--- a/toolkit/content/aboutSupport.js
+++ b/toolkit/content/aboutSupport.js
@@ -187,17 +187,20 @@ function populateGraphicsSection() {
       createHeader(bundle.GetStringFromName("driverVersion")),
       createElement("td", gfxInfo.adapterDriverVersion),
     ]));
     trGraphics.push(createParentElement("tr", [
       createHeader(bundle.GetStringFromName("driverDate")),
       createElement("td", gfxInfo.adapterDriverDate),
     ]));
 
-    var d2dEnabled = gfxInfo.D2DEnabled;
+    var d2dEnabled = false;
+    try {
+      d2dEnabled = gfxInfo.D2DEnabled;
+    } catch(e) {}
     var d2dMessage = d2dEnabled;
     if (!d2dEnabled) {
       var d2dStatus = -1; // different from any status value defined in the IDL
       try {
         d2dStatus = gfxInfo.getFeatureStatus(gfxInfo.FEATURE_DIRECT2D);
       } catch(e) {
         window.dump(e + '\n');
       }  
@@ -219,19 +222,23 @@ function populateGraphicsSection() {
         }
       }
     }
     trGraphics.push(createParentElement("tr", [
       createHeader(bundle.GetStringFromName("direct2DEnabled")),
       createElement("td", d2dMessage),
     ]));
 
+    var dwEnabled = false;
+    try {
+      dwEnabled = gfxInfo.DWriteEnabled;
+    } catch(e) {}
     trGraphics.push(createParentElement("tr", [
       createHeader(bundle.GetStringFromName("directWriteEnabled")),
-      createElement("td", gfxInfo.DWriteEnabled),
+      createElement("td", dwEnabled),
     ]));
 
     appendChildren(graphics_tbody, trGraphics);
 
   } // end if (gfxInfo)
 
   let windows = Services.ww.getWindowEnumerator();
   let acceleratedWindows = 0;