From 609cbc5e07f81c87d635fce50ca00949e7be0ac3 Mon Sep 17 00:00:00 2001
From: Benoit Jacob <bjacob@mozilla.com>
Date: Thu, 7 Oct 2010 22:31:43 -0700
Subject: [PATCH] Bug 600620 - followup: fix typo in aboutSupport.js -
 r=jmuizelaar, a=blocking2.0-beta7

---
 toolkit/content/aboutSupport.js | 25 +++++++++++++++++++------
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/toolkit/content/aboutSupport.js b/toolkit/content/aboutSupport.js
index 029368762e..2858ae337a 100644
--- a/toolkit/content/aboutSupport.js
+++ b/toolkit/content/aboutSupport.js
@@ -153,9 +153,13 @@ function populateGraphicsSection() {
   let bundle = Services.strings.createBundle("chrome://global/locale/aboutSupport.properties");
   let graphics_tbody = document.getElementById("graphics-tbody");
 
+  var gfxInfo = null;
   try {
     // nsIGfxInfo is currently only implemented on Windows
-    let gfxInfo = Cc["@mozilla.org/gfx/info;1"].getService(Ci.nsIGfxInfo);
+    gfxInfo = Cc["@mozilla.org/gfx/info;1"].getService(Ci.nsIGfxInfo);
+  } catch(e) {}
+
+  if (gfxInfo) {
     let trGraphics = [];
     trGraphics.push(createParentElement("tr", [
       createHeader(bundle.GetStringFromName("adapterDescription")),
@@ -191,7 +195,12 @@ function populateGraphicsSection() {
     var d2dEnabled = gfxInfo.D2DEnabled;
     var d2dMessage = d2dEnabled;
     if (!d2dEnabled) {
-      var d2dStatus = gfxInfo.getFeatureStatus(gfxgfxInfoInfo.FEATURE_DIRECT2D);
+      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');
+      }  
       if (d2dStatus == gfxInfo.FEATURE_BLOCKED_DEVICE ||
           d2dStatus == gfxInfo.FEATURE_DISCOURAGED)
       {
@@ -199,9 +208,14 @@ function populateGraphicsSection() {
       }
       else if (d2dStatus == gfxInfo.FEATURE_BLOCKED_DRIVER_VERSION)
       {
-        var d2dSuggestedDriverVersion = gfxInfo.getFeatureSuggestedDriverVersion(gfxInfo.FEATURE_DIRECT2D);
+        var d2dSuggestedDriverVersion = null;
+        try {
+          gfxInfo.getFeatureSuggestedDriverVersion(gfxInfo.FEATURE_DIRECT2D);
+        } catch(e) {
+          window.dump(e + '\n');
+        }
         if (d2dSuggestedDriverVersion) {
-          d2dMessage += bundle.GetStringFromName("tryNewerDriverVersion").replace("%1", d2dSuggestedDriverVersion);
+          d2dMessage = bundle.GetStringFromName("tryNewerDriverVersion").replace("%1", d2dSuggestedDriverVersion);
         }
       }
     }
@@ -217,8 +231,7 @@ function populateGraphicsSection() {
 
     appendChildren(graphics_tbody, trGraphics);
 
-  } catch (e) {
-  }
+  } // end if (gfxInfo)
 
   let windows = Services.ww.getWindowEnumerator();
   let acceleratedWindows = 0;
-- 
2.11.4.GIT