Bug 1369831 - fix "telementry" typo in js; r=billm
authorTom Tromey <tom@tromey.com>
Fri, 02 Jun 2017 12:49:56 -0600
changeset 412836 b80a07fac92daec6bec4ede84c55c1700b73d67d
parent 412834 4a153e231a306587f5ef53b9bfc352d566648db3
child 412837 c34f77a0b72bab5d834d6bbf2ff181350979b0d7
push id1490
push usermtabara@mozilla.com
push dateMon, 31 Jul 2017 14:08:16 +0000
treeherdermozilla-release@70e32e6bf15e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbillm
bugs1369831
milestone55.0a1
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 1369831 - fix "telementry" typo in js; r=billm MozReview-Commit-ID: DxhNlSnvZZC
js/src/jsexn.cpp
js/src/jsfriendapi.h
--- a/js/src/jsexn.cpp
+++ b/js/src/jsexn.cpp
@@ -784,17 +784,17 @@ ErrorReport::ErrorReport(JSContext* cx)
 {
 }
 
 ErrorReport::~ErrorReport()
 {
 }
 
 void
-ErrorReport::ReportAddonExceptionToTelementry(JSContext* cx)
+ErrorReport::ReportAddonExceptionToTelemetry(JSContext* cx)
 {
     MOZ_ASSERT(exnObject);
     RootedObject unwrapped(cx, UncheckedUnwrap(exnObject));
     MOZ_ASSERT(unwrapped, "UncheckedUnwrap failed?");
 
     // There is not much we can report if the exception is not an ErrorObject, let's ignore those.
     if (!unwrapped->is<ErrorObject>())
         return;
@@ -864,18 +864,18 @@ ErrorReport::init(JSContext* cx, HandleV
 
         if (!reportp && sniffingBehavior == NoSideEffects) {
             JS_ReportErrorNumberASCII(cx, GetErrorMessage, nullptr,
                                       JSMSG_ERR_DURING_THROW);
             return false;
         }
 
         // Let's see if the exception is from add-on code, if so, it should be reported
-        // to telementry.
-        ReportAddonExceptionToTelementry(cx);
+        // to telemetry.
+        ReportAddonExceptionToTelemetry(cx);
     }
 
 
     // Be careful not to invoke ToString if we've already successfully extracted
     // an error report, since the exception might be wrapped in a security
     // wrapper, and ToString-ing it might throw.
     if (reportp) {
         str = ErrorReportToString(cx, reportp);
--- a/js/src/jsfriendapi.h
+++ b/js/src/jsfriendapi.h
@@ -1477,18 +1477,18 @@ struct MOZ_STACK_CLASS JS_FRIEND_API(Err
     // but fills in an ErrorReport instead of reporting it.  Uses varargs to
     // make it simpler to call js::ExpandErrorArgumentsVA.
     //
     // Returns false if we fail to actually populate the ErrorReport
     // for some reason (probably out of memory).
     bool populateUncaughtExceptionReportUTF8(JSContext* cx, ...);
     bool populateUncaughtExceptionReportUTF8VA(JSContext* cx, va_list ap);
 
-    // Reports exceptions from add-on scopes to telementry.
-    void ReportAddonExceptionToTelementry(JSContext* cx);
+    // Reports exceptions from add-on scopes to telemetry.
+    void ReportAddonExceptionToTelemetry(JSContext* cx);
 
     // We may have a provided JSErrorReport, so need a way to represent that.
     JSErrorReport* reportp;
 
     // Or we may need to synthesize a JSErrorReport one of our own.
     JSErrorReport ownedReport;
 
     // And we have a string to maybe keep alive that has pointers into