Annotate crash reports during graphics driver initialization guards. (bug 1181375 part 3, r=mattwoodrow)

--HG--
extra : rebase_source : 8cb703fc6b04f36c5c9c32512b309cc74c6590ad

gfx/src/DriverInitCrashDetection.cpp

@@ -6,6 +6,9 @@
 #include "gfxPrefs.h"
 #include "nsAppDirectoryServiceDefs.h"
 #include "nsDirectoryServiceUtils.h"
+#ifdef MOZ_CRASHREPORTER
+#include "nsExceptionHandler.h"
+#endif
 #include "nsServiceManagerUtils.h"
 #include "nsString.h"
 #include "nsXULAppAPI.h"
@@ -70,6 +73,12 @@ DriverInitCrashDetection::~DriverInitCrashDetection()
     // If we attempted to initialize the driver, and got this far without
     // crashing, assume everything is okay.
     gfxPrefs::SetDriverInitStatus(int32_t(DriverInitStatus::Okay));
+
+#ifdef MOZ_CRASHREPORTER
+    // Remove the crash report annotation.
+    CrashReporter::AnnotateCrashReport(NS_LITERAL_CSTRING("GraphicsStartupTest"),
+                                       NS_LITERAL_CSTRING(""));
+#endif
   }
 }
 
@@ -104,6 +113,11 @@ DriverInitCrashDetection::AllowDriverInitAttempt()
   // If we crash, we'll just lose this. Not a big deal, next startup we'll
   // record the failure.
   RecordTelemetry(TelemetryState::EnvironmentChanged);
+
+#ifdef MOZ_CRASHREPORTER
+  CrashReporter::AnnotateCrashReport(NS_LITERAL_CSTRING("GraphicsStartupTest"),
+                                     NS_LITERAL_CSTRING("1"));
+#endif
 }
 
 bool