Backed out changeset 86277c75f5f7 (bug 1322560)

--HG--
extra : rebase_source : 7c0cc4b70ec105a50d73099d29626d73d98fdb05

js/src/gc/Statistics.cpp

@@ -313,7 +313,7 @@ Statistics::gcDuration(TimeDuration* total, TimeDuration* maxPause) const
 }
 
 void
-Statistics::sccDurations(TimeDuration* total, TimeDuration* maxPause) const
+Statistics::sccDurations(TimeDuration* total, TimeDuration* maxPause)
 {
     *total = *maxPause = 0;
     for (size_t i = 0; i < sccTimes.length(); i++) {
@@ -491,7 +491,7 @@ Statistics::formatCompactSlicePhaseTimes(const PhaseTimeTable& phaseTimes) const
 }
 
 UniqueChars
-Statistics::formatDetailedMessage() const
+Statistics::formatDetailedMessage()
 {
     FragmentVector fragments;
 
@@ -515,7 +515,7 @@ Statistics::formatDetailedMessage() const
 }
 
 UniqueChars
-Statistics::formatDetailedDescription() const
+Statistics::formatDetailedDescription()
 {
     const double bytesPerMiB = 1024 * 1024;
 
@@ -561,7 +561,7 @@ Statistics::formatDetailedDescription() const
 }
 
 UniqueChars
-Statistics::formatDetailedSliceDescription(unsigned i, const SliceData& slice) const
+Statistics::formatDetailedSliceDescription(unsigned i, const SliceData& slice)
 {
     char budgetDescription[200];
     slice.budget.describe(budgetDescription, sizeof(budgetDescription) - 1);
@@ -586,7 +586,7 @@ Statistics::formatDetailedSliceDescription(unsigned i, const SliceData& slice) c
 }
 
 UniqueChars
-Statistics::formatDetailedPhaseTimes(const PhaseTimeTable& phaseTimes) const
+Statistics::formatDetailedPhaseTimes(const PhaseTimeTable& phaseTimes)
 {
     static const char* LevelToIndent[] = { "", "  ", "    ", "      " };
     static const TimeDuration MaxUnaccountedChildTime = TimeDuration::FromMicroseconds(50);
@@ -621,7 +621,7 @@ Statistics::formatDetailedPhaseTimes(const PhaseTimeTable& phaseTimes) const
 }
 
 UniqueChars
-Statistics::formatDetailedTotals() const
+Statistics::formatDetailedTotals()
 {
     TimeDuration total, longest;
     gcDuration(&total, &longest);
@@ -638,7 +638,7 @@ Statistics::formatDetailedTotals() const
 }
 
 UniqueChars
-Statistics::formatJsonMessage(uint64_t timestamp) const
+Statistics::formatJsonMessage(uint64_t timestamp)
 {
     MOZ_ASSERT(!aborted);
 
@@ -684,7 +684,7 @@ SplitDurationMS(TimeDuration d)
 }
 
 UniqueChars
-Statistics::formatJsonDescription(uint64_t timestamp) const
+Statistics::formatJsonDescription(uint64_t timestamp)
 {
     TimeDuration total, longest;
     gcDuration(&total, &longest);
@@ -738,7 +738,7 @@ Statistics::formatJsonDescription(uint64_t timestamp) const
 }
 
 UniqueChars
-Statistics::formatJsonSliceDescription(unsigned i, const SliceData& slice) const
+Statistics::formatJsonSliceDescription(unsigned i, const SliceData& slice)
 {
     TimeDuration duration = slice.duration();
     lldiv_t durationParts = SplitDurationMS(duration);
@@ -791,7 +791,7 @@ FilterJsonKey(const char*const buffer)
 }
 
 UniqueChars
-Statistics::formatJsonPhaseTimes(const PhaseTimeTable& phaseTimes) const
+Statistics::formatJsonPhaseTimes(const PhaseTimeTable& phaseTimes)
 {
     FragmentVector fragments;
     char buffer[128];

js/src/gc/Statistics.h

@@ -274,8 +274,8 @@ struct Statistics
 
     UniqueChars formatCompactSliceMessage() const;
     UniqueChars formatCompactSummaryMessage() const;
-    UniqueChars formatJsonMessage(uint64_t timestamp) const;
-    UniqueChars formatDetailedMessage() const;
+    UniqueChars formatJsonMessage(uint64_t timestamp);
+    UniqueChars formatDetailedMessage();
 
     JS::GCSliceCallback setSliceCallback(JS::GCSliceCallback callback);
     JS::GCNurseryCollectionCallback setNurseryCollectionCallback(
@@ -421,19 +421,19 @@ FOR_EACH_GC_PROFILE_TIME(DEFINE_TIME_KEY)
     void recordPhaseEnd(Phase phase);
 
     void gcDuration(TimeDuration* total, TimeDuration* maxPause) const;
-    void sccDurations(TimeDuration* total, TimeDuration* maxPause) const;
+    void sccDurations(TimeDuration* total, TimeDuration* maxPause);
     void printStats();
 
     UniqueChars formatCompactSlicePhaseTimes(const PhaseTimeTable& phaseTimes) const;
 
-    UniqueChars formatDetailedDescription() const;
-    UniqueChars formatDetailedSliceDescription(unsigned i, const SliceData& slice) const;
-    UniqueChars formatDetailedPhaseTimes(const PhaseTimeTable& phaseTimes) const;
-    UniqueChars formatDetailedTotals() const;
+    UniqueChars formatDetailedDescription();
+    UniqueChars formatDetailedSliceDescription(unsigned i, const SliceData& slice);
+    UniqueChars formatDetailedPhaseTimes(const PhaseTimeTable& phaseTimes);
+    UniqueChars formatDetailedTotals();
 
-    UniqueChars formatJsonDescription(uint64_t timestamp) const;
-    UniqueChars formatJsonSliceDescription(unsigned i, const SliceData& slice) const;
-    UniqueChars formatJsonPhaseTimes(const PhaseTimeTable& phaseTimes) const;
+    UniqueChars formatJsonDescription(uint64_t timestamp);
+    UniqueChars formatJsonSliceDescription(unsigned i, const SliceData& slice);
+    UniqueChars formatJsonPhaseTimes(const PhaseTimeTable& phaseTimes);
 
     double computeMMU(TimeDuration resolution) const;