Bug 1348273 - Convert the layout annotation; r?dbaron draft
authorGabriele Svelto <gsvelto@mozilla.com>
Sat, 17 Mar 2018 22:23:41 +0100
changeset 776649 c49aeb600a4fdabf58d84eec24deeea478c926f5
parent 776648 8072caeba5a3525b08e6aa8521b0bde88e3fa22a
child 776650 6e4aa94a4f90f1ab14005e370add2617cc75a1ce
push id104933
push usergsvelto@mozilla.com
push dateTue, 03 Apr 2018 14:35:30 +0000
reviewersdbaron
bugs1348273
milestone61.0a1
Bug 1348273 - Convert the layout annotation; r?dbaron MozReview-Commit-ID: DGjl1lELte5
layout/style/nsLayoutStylesheetCache.cpp
toolkit/crashreporter/CrashAnnotations.yaml
--- a/layout/style/nsLayoutStylesheetCache.cpp
+++ b/layout/style/nsLayoutStylesheetCache.cpp
@@ -741,18 +741,19 @@ AnnotateCrashReport(nsIURI* aURI)
         }
       }
       delete find;
     }
   } else {
     annotation.AppendLiteral("No GRE omnijar\n");
   }
 
-  CrashReporter::AnnotateCrashReport(NS_LITERAL_CSTRING("SheetLoadFailure"),
-                                     NS_ConvertUTF16toUTF8(annotation));
+  CrashReporter::AnnotateCrashReport(
+    CrashReporter::Annotation::SheetLoadFailure,
+    NS_ConvertUTF16toUTF8(annotation));
 }
 
 static void
 ErrorLoadingSheet(nsIURI* aURI, const char* aMsg, FailureAction aFailureAction)
 {
   nsPrintfCString errorMessage("%s loading built-in stylesheet '%s'",
                                aMsg,
                                aURI ? aURI->GetSpecOrDefault().get() : "");
--- a/toolkit/crashreporter/CrashAnnotations.yaml
+++ b/toolkit/crashreporter/CrashAnnotations.yaml
@@ -508,16 +508,22 @@ SecondsSinceLastCrash:
   type: string
   ping: true
 
 ServerURL:
   description: >
     URL used to post the crash report.
   type: string
 
+SheetLoadFailure:
+  description: >
+    Set when failing to load a style sheet, this can contain a potentially very
+    large amount of diagnostic information.
+  type: string
+
 StartupTime:
   description: >
     The time when Firefox was launched expressed in seconds since the Epoch.
   type: integer
   content: false
 
 StatFailure:
   description: >