Bug 1462879 - Performance.getEntriesByName must consider the Performa…

…nceNavigationTiming name, r=valentin
EtlerEdelgard · May 24, 2018 · f87bd4e · f87bd4e
1 parent 687c271
commit f87bd4e
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 15 deletions.
diff --git a/dom/performance/PerformanceMainThread.cpp b/dom/performance/PerformanceMainThread.cpp
@@ -393,16 +393,14 @@ PerformanceMainThread::GetEntriesByName(const nsAString& aName,
     return;
   }
 
-  if (aName.EqualsLiteral("document")) {
-    aRetval.Clear();
+  Performance::GetEntriesByName(aName, aEntryType, aRetval);
 
-    if (mDocEntry) {
-      aRetval.AppendElement(mDocEntry);
-    }
+  // The navigation entry is the first one. If it exists and the name matches,
+  // let put it in front.
+  if (mDocEntry && mDocEntry->GetName().Equals(aName)) {
+    aRetval.InsertElementAt(0, mDocEntry);
     return;
   }
-
-  Performance::GetEntriesByName(aName, aEntryType, aRetval);
 }
 
 } // dom namespace

diff --git a/dom/tests/mochitest/general/resource_timing_iframe.html b/dom/tests/mochitest/general/resource_timing_iframe.html
@@ -27,9 +27,10 @@
   window.parent.ok(!!window.performance.getEntriesByName(
     "http://mochi.test:8888/tests/image/test/mochitest/damon.jpg").length,
     "http://mochi.test:8888/tests/image/test/mochitest/damon.jpg should be a valid entry name");
-  window.parent.ok(!window.performance.getEntriesByName(
-    "http://mochi.test:8888/tests/dom/tests/mochitest/general/resource_timing_iframe.html").length,
-    "This iframe should NOT contain itself as an entry");
+  var entries = window.performance.getEntriesByName(
+    "http://mochi.test:8888/tests/dom/tests/mochitest/general/resource_timing_iframe.html");
+  window.parent.ok(entries.length == 1, "This iframe should contain itself only once");
+  window.parent.ok(entries[0].type == "navigate", "This iframe should contain itself only once and it must be a navigation entry");
 
   // Check that there are no iframes added as entries
   var resources = window.performance.getEntriesByType("resource");

diff --git a/dom/tests/mochitest/general/test_performance_nav_timing_before_onload.html b/dom/tests/mochitest/general/test_performance_nav_timing_before_onload.html
@@ -19,8 +19,8 @@
   SpecialPowers.pushPrefEnv({"set": [["dom.enable_performance_navigation_timing", true]]}, start);
 
   function start() {
-    var p = performance.getEntriesByName("document")[0];
-    ok(!!p, "There should be an entry for the document");
+    var p = performance.getEntriesByName(window.location.toString())[0];
+    ok(!!p, "There should be an entry for this URL");
     document.getElementById("content").textContent += JSON.stringify(p);
 
     SimpleTest.finish();

diff --git a/...timing/nav2_test_redirect_server.html.ini → ...atform/meta/navigation-timing/__dir__.ini b/...timing/nav2_test_redirect_server.html.ini → ...atform/meta/navigation-timing/__dir__.ini
@@ -1,2 +1 @@
 prefs: [privacy.reduceTimerPrecision:false]
-[nav2_test_redirect_server.html]
diff --git a/testing/web-platform/tests/navigation-timing/nav2_test_instance_accessors.html b/testing/web-platform/tests/navigation-timing/nav2_test_instance_accessors.html
@@ -50,10 +50,10 @@ <h1>Description</h1>
                 t.step_func(function (entryList) {
                     var instance1 = performance.getEntries()[0];
                     var instance2 = performance.getEntriesByType("navigation")[0];
-                    var instance3 = performance.getEntriesByName("http://web-platform.test:8001/navigation-timing/nav2_test_instance_accessors.html")[0];
+                    var instance3 = performance.getEntriesByName(window.location.toString())[0];
 
                     assert_equals(performance.getEntriesByType("navigation").length, 1, "Expected there is only one navigation timing instance.");
-                    assert_equals(performance.getEntriesByName("http://web-platform.test:8001/navigation-timing/nav2_test_instance_accessors.html").length, 1, "Expected there is only one navigation timing instance.");
+                    assert_equals(performance.getEntriesByName(window.location.toString()).length, 1, "Expected there is only one navigation timing instance.");
 
                     for (var i = 0; i < navTiming2Attributes.length; i++) {
                         assert_equals(instance1[navTiming2Attributes[i]], instance2[navTiming2Attributes[i]]);
Original file line number	Diff line number	Diff line change
		@@ -1,2 +1 @@
		prefs: [privacy.reduceTimerPrecision:false]
		[nav2_test_redirect_server.html]