| Index: Source/core/timing/Performance.cpp
|
| diff --git a/Source/core/timing/Performance.cpp b/Source/core/timing/Performance.cpp
|
| index a8000fa8f17492f286b29f2f605e5a222c5f5e0e..978239d8090ac7dab39681e779cd093acde634b0 100644
|
| --- a/Source/core/timing/Performance.cpp
|
| +++ b/Source/core/timing/Performance.cpp
|
| @@ -36,18 +36,22 @@
|
| #include "core/events/Event.h"
|
| #include "core/frame/LocalFrame.h"
|
| #include "core/loader/DocumentLoader.h"
|
| -#include "core/timing/ResourceTimingInfo.h"
|
| +#include "core/timing/PerformanceCompositeTiming.h"
|
| +#include "core/timing/PerformanceRenderTiming.h"
|
| #include "core/timing/PerformanceResourceTiming.h"
|
| #include "core/timing/PerformanceUserTiming.h"
|
| +#include "core/timing/ResourceTimingInfo.h"
|
| #include "platform/weborigin/SecurityOrigin.h"
|
| #include "wtf/CurrentTime.h"
|
|
|
| namespace blink {
|
|
|
| static const size_t defaultResourceTimingBufferSize = 150;
|
| +static const size_t defaultFrameTimingBufferSize = 150;
|
|
|
| Performance::Performance(LocalFrame* frame)
|
| : DOMWindowProperty(frame)
|
| + , m_frameTimingBufferSize(defaultFrameTimingBufferSize)
|
| , m_resourceTimingBufferSize(defaultResourceTimingBufferSize)
|
| , m_referenceTime(frame && frame->host() ? frame->document()->loader()->timing()->referenceMonotonicTime() : 0.0)
|
| , m_userTiming(nullptr)
|
| @@ -97,6 +101,8 @@ PerformanceEntryVector Performance::getEntries() const
|
|
|
| entries.appendVector(m_resourceTimingBuffer);
|
|
|
| + entries.appendVector(m_frameTimingBuffer);
|
| +
|
| if (m_userTiming) {
|
| entries.appendVector(m_userTiming->getMarks());
|
| entries.appendVector(m_userTiming->getMeasures());
|
| @@ -115,6 +121,15 @@ PerformanceEntryVector Performance::getEntriesByType(const String& entryType)
|
| entries.append(resource);
|
| }
|
|
|
| + if (equalIgnoringCase(entryType, "composite")
|
| + || equalIgnoringCase(entryType, "render")) {
|
| + for (const auto& frame : m_frameTimingBuffer) {
|
| + if (equalIgnoringCase(entryType, frame->entryType())) {
|
| + entries.append(frame);
|
| + }
|
| + }
|
| + }
|
| +
|
| if (m_userTiming) {
|
| if (equalIgnoringCase(entryType, "mark"))
|
| entries.appendVector(m_userTiming->getMarks());
|
| @@ -137,6 +152,16 @@ PerformanceEntryVector Performance::getEntriesByName(const String& name, const S
|
| }
|
| }
|
|
|
| + if (entryType.isNull() || equalIgnoringCase(entryType, "composite")
|
| + || equalIgnoringCase(entryType, "render")) {
|
| + for (const auto& frame : m_frameTimingBuffer) {
|
| + if (frame->name() == name && (entryType.isNull()
|
| + || equalIgnoringCase(entryType, frame->entryType()))) {
|
| + entries.append(frame);
|
| + }
|
| + }
|
| + }
|
| +
|
| if (m_userTiming) {
|
| if (entryType.isNull() || equalIgnoringCase(entryType, "mark"))
|
| entries.appendVector(m_userTiming->getMarks(name));
|
| @@ -160,6 +185,18 @@ void Performance::webkitSetResourceTimingBufferSize(unsigned size)
|
| dispatchEvent(Event::create(EventTypeNames::webkitresourcetimingbufferfull));
|
| }
|
|
|
| +void Performance::webkitClearFrameTimings()
|
| +{
|
| + m_frameTimingBuffer.clear();
|
| +}
|
| +
|
| +void Performance::webkitSetFrameTimingBufferSize(unsigned size)
|
| +{
|
| + m_frameTimingBufferSize = size;
|
| + if (isFrameTimingBufferFull())
|
| + dispatchEvent(Event::create(EventTypeNames::webkitframetimingbufferfull));
|
| +}
|
| +
|
| static bool passesTimingAllowCheck(const ResourceResponse& response, Document* requestingDocument, const AtomicString& originalTimingAllowOrigin)
|
| {
|
| AtomicallyInitializedStaticReference(AtomicString, timingAllowOrigin, new AtomicString("timing-allow-origin"));
|
| @@ -245,6 +282,37 @@ bool Performance::isResourceTimingBufferFull()
|
| return m_resourceTimingBuffer.size() >= m_resourceTimingBufferSize;
|
| }
|
|
|
| +void Performance::addRenderTiming(Document* initiatorDocument, unsigned sourceFrame, double startTime)
|
| +{
|
| + if (isFrameTimingBufferFull())
|
| + return;
|
| +
|
| + RefPtrWillBeRawPtr<PerformanceEntry> entry = PerformanceRenderTiming::create(initiatorDocument, sourceFrame, startTime);
|
| + addFrameTimingBuffer(entry);
|
| +}
|
| +
|
| +void Performance::addCompositeTiming(Document* initiatorDocument, unsigned sourceFrame, double startTime)
|
| +{
|
| + if (isFrameTimingBufferFull())
|
| + return;
|
| +
|
| + RefPtrWillBeRawPtr<PerformanceEntry> entry = PerformanceCompositeTiming::create(initiatorDocument, sourceFrame, startTime);
|
| + addFrameTimingBuffer(entry);
|
| +}
|
| +
|
| +void Performance::addFrameTimingBuffer(PassRefPtrWillBeRawPtr<PerformanceEntry> entry)
|
| +{
|
| + m_frameTimingBuffer.append(entry);
|
| +
|
| + if (isFrameTimingBufferFull())
|
| + dispatchEvent(Event::create(EventTypeNames::webkitframetimingbufferfull));
|
| +}
|
| +
|
| +bool Performance::isFrameTimingBufferFull()
|
| +{
|
| + return m_frameTimingBuffer.size() >= m_frameTimingBufferSize;
|
| +}
|
| +
|
| void Performance::mark(const String& markName, ExceptionState& exceptionState)
|
| {
|
| if (!m_userTiming)
|
| @@ -282,6 +350,7 @@ void Performance::trace(Visitor* visitor)
|
| {
|
| visitor->trace(m_navigation);
|
| visitor->trace(m_timing);
|
| + visitor->trace(m_frameTimingBuffer);
|
| visitor->trace(m_resourceTimingBuffer);
|
| visitor->trace(m_userTiming);
|
| EventTargetWithInlineData::trace(visitor);
|
|
|