Index: Source/core/page/PerformanceResourceTiming.cpp |
diff --git a/Source/core/page/PerformanceResourceTiming.cpp b/Source/core/page/PerformanceResourceTiming.cpp |
index 84230055b7f5f496f230068995e2b768ac9e3bdc..94d594c6d91ed936b2ce88bc5f15bfb9888c37d0 100644 |
--- a/Source/core/page/PerformanceResourceTiming.cpp |
+++ b/Source/core/page/PerformanceResourceTiming.cpp |
@@ -120,10 +120,10 @@ double PerformanceResourceTiming::domainLookupStart() const |
if (!m_shouldReportDetails) |
return 0.0; |
- if (!m_timing || m_timing->dnsStart < 0) |
+ if (!m_timing || m_timing->dnsStart == 0.0) |
eustas
2013/05/21 09:43:38
Doesn't both checks do the same?
Pan
2013/05/21 12:28:01
not really, sometimes it's null ptr when glue won'
|
return fetchStart(); |
- return resourceTimeToDocumentMilliseconds(m_timing->dnsStart); |
+ return monotonicTimeToDocumentMilliseconds(m_requestingDocument.get(), m_timing->dnsStart); |
} |
double PerformanceResourceTiming::domainLookupEnd() const |
@@ -131,10 +131,10 @@ double PerformanceResourceTiming::domainLookupEnd() const |
if (!m_shouldReportDetails) |
return 0.0; |
- if (!m_timing || m_timing->dnsEnd < 0) |
+ if (!m_timing || m_timing->dnsEnd == 0.0) |
return domainLookupStart(); |
- return resourceTimeToDocumentMilliseconds(m_timing->dnsEnd); |
+ return monotonicTimeToDocumentMilliseconds(m_requestingDocument.get(), m_timing->dnsEnd); |
} |
double PerformanceResourceTiming::connectStart() const |
@@ -142,8 +142,8 @@ double PerformanceResourceTiming::connectStart() const |
if (!m_shouldReportDetails) |
return 0.0; |
- // connectStart will be -1 when a network request is not made. |
- if (!m_timing || m_timing->connectStart < 0 || m_didReuseConnection) |
+ // connectStart will be zero when a network request is not made. |
+ if (!m_timing || m_timing->connectStart == 0.0 || m_didReuseConnection) |
return domainLookupEnd(); |
// connectStart includes any DNS time, so we may need to trim that off. |
@@ -151,7 +151,7 @@ double PerformanceResourceTiming::connectStart() const |
if (m_timing->dnsEnd >= 0) |
connectStart = m_timing->dnsEnd; |
- return resourceTimeToDocumentMilliseconds(connectStart); |
+ return monotonicTimeToDocumentMilliseconds(m_requestingDocument.get(), connectStart); |
} |
double PerformanceResourceTiming::connectEnd() const |
@@ -159,11 +159,11 @@ double PerformanceResourceTiming::connectEnd() const |
if (!m_shouldReportDetails) |
return 0.0; |
- // connectStart will be -1 when a network request is not made. |
- if (!m_timing || m_timing->connectEnd < 0 || m_didReuseConnection) |
+ // connectStart will be zero when a network request is not made. |
+ if (!m_timing || m_timing->connectEnd == 0.0 || m_didReuseConnection) |
return connectStart(); |
- return resourceTimeToDocumentMilliseconds(m_timing->connectEnd); |
+ return monotonicTimeToDocumentMilliseconds(m_requestingDocument.get(), m_timing->connectEnd); |
} |
double PerformanceResourceTiming::secureConnectionStart() const |
@@ -171,10 +171,10 @@ double PerformanceResourceTiming::secureConnectionStart() const |
if (!m_shouldReportDetails) |
return 0.0; |
- if (!m_timing || m_timing->sslStart < 0) // Secure connection not negotiated. |
+ if (!m_timing || m_timing->sslStart == 0.0) // Secure connection not negotiated. |
return 0.0; |
- return resourceTimeToDocumentMilliseconds(m_timing->sslStart); |
+ return monotonicTimeToDocumentMilliseconds(m_requestingDocument.get(), m_timing->sslStart); |
} |
double PerformanceResourceTiming::requestStart() const |
@@ -185,7 +185,7 @@ double PerformanceResourceTiming::requestStart() const |
if (!m_timing) |
return connectEnd(); |
- return resourceTimeToDocumentMilliseconds(m_timing->sendStart); |
+ return monotonicTimeToDocumentMilliseconds(m_requestingDocument.get(), m_timing->sendStart); |
} |
double PerformanceResourceTiming::responseStart() const |
@@ -196,7 +196,7 @@ double PerformanceResourceTiming::responseStart() const |
if (!m_timing) |
return requestStart(); |
// FIXME: This number isn't exactly correct. See the notes in PerformanceTiming::responseStart(). |
- return resourceTimeToDocumentMilliseconds(m_timing->receiveHeadersEnd); |
+ return monotonicTimeToDocumentMilliseconds(m_requestingDocument.get(), m_timing->receiveHeadersEnd); |
} |
double PerformanceResourceTiming::responseEnd() const |
@@ -207,10 +207,4 @@ double PerformanceResourceTiming::responseEnd() const |
return monotonicTimeToDocumentMilliseconds(m_requestingDocument.get(), m_finishTime); |
} |
-double PerformanceResourceTiming::resourceTimeToDocumentMilliseconds(int deltaMilliseconds) const |
-{ |
- ASSERT(deltaMilliseconds >= 0); |
- return monotonicTimeToDocumentMilliseconds(m_requestingDocument.get(), m_timing->requestTime) + deltaMilliseconds; |
-} |
- |
} // namespace WebCore |