Bug 1272821 - remove the WebGL feature failure from telemetry. r=jrmuizel
authorBenoit Girard <b56girard@gmail.com>
Thu, 26 May 2016 18:25:22 -0400
changeset 372383 5483a7f7649caeb0e86035ed2d10572164b3282a
parent 372382 47c611b9a71b2da9716aa1c165afdf0458f856d0
child 372384 d667c7bfcc25d1f3ae4c7e29a5030d223f3eaf5a
push id19519
push userbmo:rail@mozilla.com
push dateSat, 28 May 2016 13:01:27 +0000
reviewersjrmuizel
bugs1272821
milestone49.0a1
Bug 1272821 - remove the WebGL feature failure from telemetry. r=jrmuizel MozReview-Commit-ID: 8OOC63NTR0z
widget/GfxInfoBase.cpp
widget/nsIGfxInfo.idl
--- a/widget/GfxInfoBase.cpp
+++ b/widget/GfxInfoBase.cpp
@@ -1289,20 +1289,16 @@ GfxInfoBase::BuildFeatureStateLog(JSCont
   });
 
   return true;
 }
 
 void
 GfxInfoBase::DescribeFeatures(JSContext* aCx, JS::Handle<JSObject*> aObj)
 {
-  JS::Rooted<JSObject*> obj(aCx);
-
-  InitFeatureObject(aCx, aObj, "opengl", nsIGfxInfo::FEATURE_OPENGL_LAYERS, Nothing(), &obj);
-  InitFeatureObject(aCx, aObj, "webgl", nsIGfxInfo::FEATURE_WEBGL_OPENGL, Nothing(), &obj);
 }
 
 bool
 GfxInfoBase::InitFeatureObject(JSContext* aCx,
                                JS::Handle<JSObject*> aContainer,
                                const char* aName,
                                int32_t aFeature,
                                Maybe<mozilla::gfx::FeatureStatus> aFeatureStatus,
@@ -1323,22 +1319,16 @@ GfxInfoBase::InitFeatureObject(JSContext
   if (aFeatureStatus) {
     const char* status = FeatureStatusToString(aFeatureStatus.value());
 
     JS::Rooted<JSString*> str(aCx, JS_NewStringCopyZ(aCx, status));
     JS::Rooted<JS::Value> val(aCx, JS::StringValue(str));
     JS_SetProperty(aCx, obj, "status", val);
   }
 
-  if (!failureId.IsEmpty()) {
-    JS::Rooted<JSString*> str(aCx, JS_NewStringCopyZ(aCx, failureId.get()));
-    JS::Rooted<JS::Value> val(aCx, JS::StringValue(str));
-    JS_SetProperty(aCx, obj, "failureId", val);
-  }
-
   // Add the feature object to the container.
   {
     JS::Rooted<JS::Value> val(aCx, JS::ObjectValue(*obj));
     JS_SetProperty(aCx, aContainer, aName, val);
   }
 
   aOutObj.set(obj);
   return true;
--- a/widget/nsIGfxInfo.idl
+++ b/widget/nsIGfxInfo.idl
@@ -162,17 +162,16 @@ interface nsIGfxInfo : nsISupports
   // Return an object describing all features that have been configured:
   //
   //   "features": [
   //     // For each feature:
   //     {
   //       "name": <string>,
   //       "description": <string>,
   //       "status": <string>,
-  //       "failureId": <string>,    // optional, only covers static failure currently.
   //       "log": [
   //          // One or more log entries, the first denotes the default value.
   //          {
   //            "type": <string>,    // "base", "user", "env", or "runtime"
   //            "status": <string>,
   //            "message": <string>  // Set unless type is "base" and status is "available".
   //          }
   //       ]