Chromium Code Reviews| Index: third_party/WebKit/Source/core/timing/PerformanceResourceTiming.cpp |
| diff --git a/third_party/WebKit/Source/core/timing/PerformanceResourceTiming.cpp b/third_party/WebKit/Source/core/timing/PerformanceResourceTiming.cpp |
| index 3353a97ef0b3410e2f53f5045d7ba8618890336b..9f8ea077f4c7d4e2614e7ba5accf80d2a5902df7 100644 |
| --- a/third_party/WebKit/Source/core/timing/PerformanceResourceTiming.cpp |
| +++ b/third_party/WebKit/Source/core/timing/PerformanceResourceTiming.cpp |
| @@ -40,60 +40,38 @@ |
| namespace blink { |
| PerformanceResourceTiming::PerformanceResourceTiming( |
| - const AtomicString& initiatorType, |
| + const ResourceTimingInfo& info, |
| double timeOrigin, |
| - ResourceLoadTiming* timing, |
| + double startTime, |
| double lastRedirectEndTime, |
| - double finishTime, |
| - unsigned long long transferSize, |
| - unsigned long long encodedBodyLength, |
| - unsigned long long decodedBodyLength, |
| - bool didReuseConnection, |
| bool allowTimingDetails, |
| - bool allowRedirectDetails, |
| - const String& name, |
| - const String& entryType, |
| - double startTime) |
| + bool allowRedirectDetails) |
| : PerformanceEntry( |
| - name, |
| - entryType, |
| + info.initialURL().getString(), |
| + "resource", |
| PerformanceBase::monotonicTimeToDOMHighResTimeStamp(timeOrigin, |
| startTime), |
| - PerformanceBase::monotonicTimeToDOMHighResTimeStamp(timeOrigin, |
| - finishTime)), |
| - m_initiatorType(initiatorType), |
| + PerformanceBase::monotonicTimeToDOMHighResTimeStamp( |
| + timeOrigin, |
| + info.loadFinishTime())), |
| + m_initiatorType(info.initiatorType()), |
| m_timeOrigin(timeOrigin), |
| - m_timing(timing), |
| + m_timing(info.finalResponse().resourceLoadTiming()), |
| m_lastRedirectEndTime(lastRedirectEndTime), |
| - m_finishTime(finishTime), |
| - m_transferSize(transferSize), |
| - m_encodedBodySize(encodedBodyLength), |
| - m_decodedBodySize(decodedBodyLength), |
| - m_didReuseConnection(didReuseConnection), |
| + m_finishTime(info.loadFinishTime()), |
| + m_transferSize(info.transferSize()), |
| + m_encodedBodySize(info.finalResponse().encodedBodyLength()), |
| + m_decodedBodySize(info.finalResponse().decodedBodyLength()), |
| + m_didReuseConnection(info.finalResponse().connectionReused()), |
| m_allowTimingDetails(allowTimingDetails), |
| m_allowRedirectDetails(allowRedirectDetails) {} |
| -PerformanceResourceTiming::PerformanceResourceTiming( |
| - const ResourceTimingInfo& info, |
| - double timeOrigin, |
| - double startTime, |
| - double lastRedirectEndTime, |
| - bool allowTimingDetails, |
| - bool allowRedirectDetails) |
| - : PerformanceResourceTiming(info.initiatorType(), |
| - timeOrigin, |
| - info.finalResponse().resourceLoadTiming(), |
| - lastRedirectEndTime, |
| - info.loadFinishTime(), |
| - info.transferSize(), |
| - info.finalResponse().encodedBodyLength(), |
| - info.finalResponse().decodedBodyLength(), |
| - info.finalResponse().connectionReused(), |
| - allowTimingDetails, |
| - allowRedirectDetails, |
| - info.initialURL().getString(), |
| - "resource", |
| - startTime) {} |
| +// This constructor is for PerformanceNavigationTiming. |
|
panicker
2017/02/03 23:53:52
Add TODO with link to design doc and indicate this
sunjian
2017/02/10 18:32:46
I'm not sure what TODO to add. We can't get rid of
|
| +PerformanceResourceTiming::PerformanceResourceTiming(const String& name, |
| + const String& entryType, |
| + double startTime, |
| + double duration) |
| + : PerformanceEntry(name, entryType, startTime, duration) {} |
| PerformanceResourceTiming::~PerformanceResourceTiming() {} |