[tor-commits] [tor-browser/tor-browser-38.1.0esr-5.0-1] Bug #16311: Fix the responseEnd attribute (navigation timing)

[gk at torproject.org]

commit d3c069a3cc6bc073e7230d1ef3a8d1f09346364e
Author: Nicolas Vigier <boklm at torproject.org>
Date:   Sat Aug 8 01:48:33 2015 +0200

    Bug #16311: Fix the responseEnd attribute (navigation timing)
    
    This reverts a change introduced by this patch:
    https://hg.mozilla.org/mozilla-central/rev/9b0c94f564f3#l11.43
---
 dom/base/nsPerformance.cpp |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dom/base/nsPerformance.cpp b/dom/base/nsPerformance.cpp
index 6dfcc25..67a374d 100644
--- a/dom/base/nsPerformance.cpp
+++ b/dom/base/nsPerformance.cpp
@@ -341,7 +341,7 @@ nsPerformanceTiming::ResponseStart()
 DOMHighResTimeStamp
 nsPerformanceTiming::ResponseEndHighRes()
 {
-  if (!IsInitialized()) {
+  if (!nsContentUtils::IsPerformanceTimingEnabled() || !IsInitialized()) {
     return mZeroTime;
   }
   if (mResponseEnd.IsNull() ||