Merge remote-tracking branch 'origin/tracking' into custom

dom/performance/PerformanceMainThread.h

@@ -62,16 +62,19 @@ public:
     return true;
   }
 
+  void QueueNavigationTimingEntry() override;
+
 protected:
   ~PerformanceMainThread();
 
+  void CreateNavigationTimingEntry();
+
   void InsertUserEntry(PerformanceEntry* aEntry) override;
 
   DOMHighResTimeStamp
   GetPerformanceTimingFromString(const nsAString& aTimingName) override;
 
   void DispatchBufferFullEvent() override;
-  void EnsureDocEntry();
 
   RefPtr<PerformanceEntry> mDocEntry;
   RefPtr<nsDOMNavigationTiming> mDOMTiming;