mozilla-central: changeset 257285:059f102b3567aba630b95833c7f9f4c737f95a1f

author	Kyle Machulis <kyle@nonpolynomial.com>
	Mon, 10 Aug 2015 14:16:11 -0700
changeset 257285	059f102b3567aba630b95833c7f9f4c737f95a1f
parent 257284	462b7f77dc3af710ee3cbf3d68778e563a4ffc07
child 257286	44204bf72cbfda72113fe91e017fface0d029170
push id	29210
push user	kwierso@gmail.com
push date	Tue, 11 Aug 2015 22:35:38 +0000
treeherder	mozilla-central@7dcecc8a395d [default view] [failures only]
perfherder	[talos] [build metrics] [platform microbench] (compared to previous push)
reviewers	baku
bugs	1192787
milestone	43.0a1
first release with	nightly linux32 d4f3a8a75577 / 43.0a1 / 20150812030206 / files nightly linux64 d4f3a8a75577 / 43.0a1 / 20150812030206 / files nightly mac d4f3a8a75577 / 43.0a1 / 20150812030206 / files nightly win32 d4f3a8a75577 / 43.0a1 / 20150812030206 / files nightly win64 d4f3a8a75577 / 43.0a1 / 20150812030206 / files
last release without	nightly linux32 8cba870a352c / 43.0a1 / 20150811030206 / files nightly linux64 8cba870a352c / 43.0a1 / 20150811030206 / files nightly mac 8cba870a352c / 43.0a1 / 20150811030206 / files nightly win32 8cba870a352c / 43.0a1 / 20150811030206 / files nightly win64 8cba870a352c / 43.0a1 / 20150811030206 / files

--- a/dom/base/nsPerformance.cpp
+++ b/dom/base/nsPerformance.cpp
@@ -343,17 +343,17 @@ DOMTimeMilliSec
 nsPerformanceTiming::ResponseStart()
 {
   return static_cast<int64_t>(ResponseStartHighRes());
 }
 
 DOMHighResTimeStamp
 nsPerformanceTiming::ResponseEndHighRes()
 {
-  if (!IsInitialized()) {
+  if (!nsContentUtils::IsPerformanceTimingEnabled() || !IsInitialized()) {
     return mZeroTime;
   }
   if (mResponseEnd.IsNull() ||
      (!mCacheReadEnd.IsNull() && mCacheReadEnd < mResponseEnd)) {
     mResponseEnd = mCacheReadEnd;
   }
   // Bug 1155008 - nsHttpTransaction is racy. Return ResponseStart when null
   return mResponseEnd.IsNull() ? ResponseStartHighRes()