Bug 1462879 - Update the channel properties before notify, r=valentin

EtlerEdelgard · May 24, 2018 · 5cf7331 · 5cf7331
1 parent f87bd4e
commit 5cf7331
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 6 deletions.
diff --git a/dom/performance/PerformanceMainThread.cpp b/dom/performance/PerformanceMainThread.cpp
@@ -336,9 +336,17 @@ PerformanceMainThread::CreateNavigationTimingEntry()
 void
 PerformanceMainThread::QueueNavigationTimingEntry()
 {
-  if (mDocEntry) {
-    QueueEntry(mDocEntry);
+  if (!mDocEntry) {
+    return;
   }
+
+  // Let's update some values.
+  nsCOMPtr<nsIHttpChannel> httpChannel = do_QueryInterface(mChannel);
+  if (httpChannel) {
+    mDocEntry->UpdatePropertiesFromHttpChannel(httpChannel);
+  }
+
+  QueueEntry(mDocEntry);
 }
 
 void

diff --git a/dom/performance/PerformanceMainThread.h b/dom/performance/PerformanceMainThread.h
@@ -13,6 +13,8 @@
 namespace mozilla {
 namespace dom {
 
+class PerformanceNavigationTiming;
+
 class PerformanceMainThread final : public Performance
                                   , public PerformanceStorage
 {
@@ -84,7 +86,7 @@ class PerformanceMainThread final : public Performance
 
   void DispatchBufferFullEvent() override;
 
-  RefPtr<PerformanceEntry> mDocEntry;
+  RefPtr<PerformanceNavigationTiming> mDocEntry;
   RefPtr<nsDOMNavigationTiming> mDOMTiming;
   nsCOMPtr<nsITimedChannel> mChannel;
   RefPtr<PerformanceTiming> mTiming;

diff --git a/dom/performance/PerformanceNavigationTiming.cpp b/dom/performance/PerformanceNavigationTiming.cpp
@@ -94,3 +94,9 @@ PerformanceNavigationTiming::RedirectCount() const
 {
   return mTimingData->GetRedirectCount();
 }
+
+void
+PerformanceNavigationTiming::UpdatePropertiesFromHttpChannel(nsIHttpChannel* aHttpChannel)
+{
+  mTimingData->SetPropertiesFromHttpChannel(aHttpChannel);
+}
diff --git a/dom/performance/PerformanceNavigationTiming.h b/dom/performance/PerformanceNavigationTiming.h
@@ -67,6 +67,9 @@ class PerformanceNavigationTiming final
   NavigationType Type() const;
   uint16_t RedirectCount() const;
 
+  void
+  UpdatePropertiesFromHttpChannel(nsIHttpChannel* aHttpChannel);
+
 private:
   ~PerformanceNavigationTiming() {}
 };

diff --git a/testing/web-platform/tests/navigation-timing/nav2_test_attributes_values.html b/testing/web-platform/tests/navigation-timing/nav2_test_attributes_values.html
@@ -81,7 +81,7 @@ <h1>Description</h1>
                     var entries = entryList.getEntries();
                     assert_equals(entries[0].entryType, "navigation",
                         "Expected entryType to be: navigation.");
-                    assert_equals(entries[0].name, "http://web-platform.test:8001/navigation-timing/nav2_test_attributes_values.html");
+                    assert_equals(entries[0].name, window.location.toString());
                     assert_equals(entries[0].startTime, 0,
                         "Expected startTime to be: 0.");
                     assert_equals(entries[0].duration, entries[0].loadEventEnd,
@@ -93,8 +93,8 @@ <h1>Description</h1>
                     // running this test.
                     assert_true(entries[0].transferSize > entries[0].encodedBodySize,
                         "Expected transferSize to be greater than encodedBodySize in uncached navigation.");
-                    assert_equals(entries[0].encodedBodySize, 5328);
-                    assert_equals(entries[0].decodedBodySize, 5328);
+                    assert_equals(entries[0].encodedBodySize, 5272);
+                    assert_equals(entries[0].decodedBodySize, 5272);
                     verifyTimingEventOrder(entries[0], navTiming2EventOrder1);
                     // Verify if the reported timing is not that different
                     // from what is reported by Navigation Timing 1.