Merge pull request #292 from janekptacijarabaci/js_dom_performance-observer_1

moebius#157: The Performance Observer (improvements)

1 files changed, 13 insertions, 2 deletions

diff --git a/dom/performance/PerformanceObserverEntryList.cpp b/dom/performance/PerformanceObserverEntryList.cpp
index 349103f08..20e818f3d 100644
--- a/dom/performance/PerformanceObserverEntryList.cpp
+++ b/dom/performance/PerformanceObserverEntryList.cpp
@@ -66,6 +66,7 @@ PerformanceObserverEntryList::GetEntries(
 
     aRetval.AppendElement(entry);
   }
+  aRetval.Sort(PerformanceEntryComparator());
 }
 
 void
@@ -79,6 +80,7 @@ PerformanceObserverEntryList::GetEntriesByType(
       aRetval.AppendElement(entry);
     }
   }
+  aRetval.Sort(PerformanceEntryComparator());
 }
 
 void
@@ -88,9 +90,18 @@ PerformanceObserverEntryList::GetEntriesByName(
   nsTArray<RefPtr<PerformanceEntry>>& aRetval)
 {
   aRetval.Clear();
+  const bool typePassed = aEntryType.WasPassed();
   for (const RefPtr<PerformanceEntry>& entry : mEntries) {
-    if (entry->GetName().Equals(aName)) {
-      aRetval.AppendElement(entry);
+    if (!entry->GetName().Equals(aName)) {
+      continue;
     }
+
+    if (typePassed &&
+        !entry->GetEntryType().Equals(aEntryType.Value())) {
+      continue;
+    }
+
+    aRetval.AppendElement(entry);
   }
+  aRetval.Sort(PerformanceEntryComparator());
 }