From abcaa560fcaf2f814fc40eef46557033c910eb96 Mon Sep 17 00:00:00 2001
From: wolfbeast <mcwerewolf@wolfbeast.com>
Date: Tue, 29 Jan 2019 00:40:24 +0100
Subject: Revert "Reduce number of allocations in AutoStopwatch"

This reverts commit 3476c1d60ec29c5497123194acd7a9310b1023d2.
---
 toolkit/components/perfmonitoring/nsPerformanceStats.cpp | 8 ++------
 toolkit/components/perfmonitoring/nsPerformanceStats.h   | 2 +-
 2 files changed, 3 insertions(+), 7 deletions(-)

(limited to 'toolkit/components')

diff --git a/toolkit/components/perfmonitoring/nsPerformanceStats.cpp b/toolkit/components/perfmonitoring/nsPerformanceStats.cpp
index 03e63a461..6c470356a 100644
--- a/toolkit/components/perfmonitoring/nsPerformanceStats.cpp
+++ b/toolkit/components/perfmonitoring/nsPerformanceStats.cpp
@@ -1310,12 +1310,8 @@ nsPerformanceStatsService::GetResources(uint64_t* userTime,
 
 void
 nsPerformanceStatsService::NotifyJankObservers(const mozilla::Vector<uint64_t>& aPreviousJankLevels) {
-
-  // The move operation is generally constant time, unless `mPendingAlerts.length()` is very small, in which case it's
-  // fast anyway.
-  GroupVector alerts(Move(mPendingAlerts));
-  mPendingAlerts = GroupVector(); // Reconstruct after `Move`.
-
+  GroupVector alerts;
+  mPendingAlerts.swap(alerts);
   if (!mPendingAlertsCollector) {
     // We are shutting down.
     return;
diff --git a/toolkit/components/perfmonitoring/nsPerformanceStats.h b/toolkit/components/perfmonitoring/nsPerformanceStats.h
index 661a78a1a..6902c840d 100644
--- a/toolkit/components/perfmonitoring/nsPerformanceStats.h
+++ b/toolkit/components/perfmonitoring/nsPerformanceStats.h
@@ -19,7 +19,7 @@
 class nsPerformanceGroup;
 class nsPerformanceGroupDetails;
 
-typedef mozilla::Vector<RefPtr<nsPerformanceGroup>, 8> GroupVector;
+typedef mozilla::Vector<RefPtr<nsPerformanceGroup>> GroupVector;
 
 /**
  * A data structure for registering observers interested in
-- 
cgit v1.2.3