Chromium Code Reviews| Index: third_party/WebKit/Source/core/timing/PerformanceBase.cpp |
| diff --git a/third_party/WebKit/Source/core/timing/PerformanceBase.cpp b/third_party/WebKit/Source/core/timing/PerformanceBase.cpp |
| index 88094fa06e3bbc734cc74a5cfebffa8c64b236f7..078b33760be42a59f0cc842a9a6d3d9da1c5214e 100644 |
| --- a/third_party/WebKit/Source/core/timing/PerformanceBase.cpp |
| +++ b/third_party/WebKit/Source/core/timing/PerformanceBase.cpp |
| @@ -32,12 +32,19 @@ |
| #include "core/timing/PerformanceBase.h" |
| #include "core/dom/Document.h" |
| +#include "core/dom/DocumentTiming.h" |
| +#include "core/dom/Element.h" |
| #include "core/events/Event.h" |
| +#include "core/frame/LocalFrame.h" |
| #include "core/frame/UseCounter.h" |
| +#include "core/loader/DocumentLoadTiming.h" |
| +#include "core/loader/DocumentLoader.h" |
| #include "core/timing/PerformanceLongTaskTiming.h" |
| +#include "core/timing/PerformanceNavigationTiming.h" |
| #include "core/timing/PerformanceObserver.h" |
| #include "core/timing/PerformanceResourceTiming.h" |
| #include "core/timing/PerformanceUserTiming.h" |
| +#include "platform/RuntimeEnabledFeatures.h" |
| #include "platform/network/ResourceTimingInfo.h" |
| #include "platform/weborigin/SecurityOrigin.h" |
| #include "wtf/CurrentTime.h" |
| @@ -53,6 +60,7 @@ static const size_t defaultFrameTimingBufferSize = 150; |
| PerformanceBase::PerformanceBase(double timeOrigin) |
| : m_frameTimingBufferSize(defaultFrameTimingBufferSize), |
| m_resourceTimingBufferSize(defaultResourceTimingBufferSize), |
| + m_navigationTiming(nullptr), |
| m_userTiming(nullptr), |
| m_timeOrigin(timeOrigin), |
| m_observerFilterOptions(PerformanceEntry::Invalid), |
| @@ -74,6 +82,8 @@ PerformanceEntryVector PerformanceBase::getEntries() const { |
| PerformanceEntryVector entries; |
| entries.appendVector(m_resourceTimingBuffer); |
| + if (RuntimeEnabledFeatures::performanceNavigationTiming2Enabled()) |
| + entries.append(m_navigationTiming); |
| entries.appendVector(m_frameTimingBuffer); |
| if (m_userTiming) { |
| @@ -103,6 +113,10 @@ PerformanceEntryVector PerformanceBase::getEntriesByType( |
| for (const auto& resource : m_resourceTimingBuffer) |
| entries.append(resource); |
| break; |
| + case PerformanceEntry::Navigation: |
| + if (RuntimeEnabledFeatures::performanceNavigationTiming2Enabled()) |
| + entries.append(m_navigationTiming); |
| + break; |
| case PerformanceEntry::Composite: |
| case PerformanceEntry::Render: |
| for (const auto& frame : m_frameTimingBuffer) { |
| @@ -143,6 +157,12 @@ PerformanceEntryVector PerformanceBase::getEntriesByName( |
| } |
| } |
| + if (entryType.isNull() || type == PerformanceEntry::Navigation) { |
|
panicker
2016/11/08 18:27:06
these should be "else if" to avoid needless execut
sunjian
2016/11/08 23:16:21
I think they intended to collect all entries with
|
| + if (RuntimeEnabledFeatures::performanceNavigationTiming2Enabled() && |
| + m_navigationTiming->name() == name) |
| + entries.append(m_navigationTiming); |
| + } |
| + |
| if (entryType.isNull() || type == PerformanceEntry::Composite || |
| type == PerformanceEntry::Render) { |
| for (const auto& frame : m_frameTimingBuffer) { |
| @@ -292,6 +312,42 @@ void PerformanceBase::addResourceTiming(const ResourceTimingInfo& info) { |
| addResourceTimingBuffer(*entry); |
| } |
| +void PerformanceBase::addNavigationTiming(LocalFrame* frame) { |
| + if (!RuntimeEnabledFeatures::performanceNavigationTiming2Enabled()) |
| + return; |
| + DCHECK(frame); |
| + const DocumentLoader* docLoader = frame->loader().documentLoader(); |
| + DCHECK(docLoader); |
| + const DocumentLoadTiming docLoadTiming = docLoader->timing(); |
| + const DocumentTiming docTiming = frame->document()->timing(); |
|
kinuko
2016/11/08 13:39:32
We don't usually abbreviate variable names in blin
sunjian
2016/11/08 23:16:21
Done.
|
| + |
| + ResourceResponse finalResponse = docLoader->response(); |
| + |
| + ResourceLoadTiming* resourceLoadTiming = finalResponse.resourceLoadTiming(); |
| + double lastRedirectEndTime = docLoadTiming.redirectEnd(); |
| + double finishTime = docLoadTiming.loadEventEnd(); |
| + |
| + // TODO(sunjian) Implement transfer size. crbug/663187 |
| + unsigned long long transferSize = 0; |
| + unsigned long long encodedBodyLength = finalResponse.encodedBodyLength(); |
| + unsigned long long decodedBodyLength = finalResponse.decodedBodyLength(); |
| + bool didReuseConnection = finalResponse.connectionReused(); |
| + |
| + m_navigationTiming = new PerformanceNavigationTiming( |
| + timeOrigin(), docLoadTiming.unloadEventStart(), |
| + docLoadTiming.unloadEventEnd(), docLoadTiming.loadEventStart(), |
| + docLoadTiming.loadEventEnd(), docLoadTiming.redirectCount(), |
| + docTiming.domInteractive(), docTiming.domContentLoadedEventStart(), |
| + docTiming.domContentLoadedEventEnd(), docTiming.domComplete(), |
| + docLoader->getNavigationType(), docLoadTiming.redirectStart(), |
| + docLoadTiming.redirectEnd(), docLoadTiming.fetchStart(), |
| + docLoadTiming.responseEnd(), docLoadTiming.hasCrossOriginRedirect(), |
| + docLoadTiming.hasSameOriginAsPreviousDocument(), resourceLoadTiming, |
| + lastRedirectEndTime, finishTime, transferSize, encodedBodyLength, |
| + decodedBodyLength, didReuseConnection); |
| + notifyObserversOfEntry(*m_navigationTiming); |
| +} |
| + |
| void PerformanceBase::addResourceTimingBuffer(PerformanceEntry& entry) { |
| m_resourceTimingBuffer.append(&entry); |
| @@ -464,6 +520,7 @@ DOMHighResTimeStamp PerformanceBase::now() const { |
| DEFINE_TRACE(PerformanceBase) { |
| visitor->trace(m_frameTimingBuffer); |
| visitor->trace(m_resourceTimingBuffer); |
| + visitor->trace(m_navigationTiming); |
| visitor->trace(m_userTiming); |
| visitor->trace(m_observers); |
| visitor->trace(m_activeObservers); |