| Index: Source/core/timing/PerformanceBase.cpp
|
| diff --git a/Source/core/timing/Performance.cpp b/Source/core/timing/PerformanceBase.cpp
|
| similarity index 78%
|
| copy from Source/core/timing/Performance.cpp
|
| copy to Source/core/timing/PerformanceBase.cpp
|
| index 2f4c7c2797280f1cd5c9b6b49a391d5d8ac51457..64aa79f34122e08432732127cfa94f4184382808 100644
|
| --- a/Source/core/timing/Performance.cpp
|
| +++ b/Source/core/timing/PerformanceBase.cpp
|
| @@ -30,16 +30,13 @@
|
| */
|
|
|
| #include "config.h"
|
| -#include "core/timing/Performance.h"
|
| +#include "core/timing/PerformanceBase.h"
|
|
|
| #include "core/dom/Document.h"
|
| #include "core/events/Event.h"
|
| -#include "core/frame/LocalFrame.h"
|
| -#include "core/loader/DocumentLoader.h"
|
| #include "core/timing/PerformanceCompositeTiming.h"
|
| #include "core/timing/PerformanceRenderTiming.h"
|
| #include "core/timing/PerformanceResourceTiming.h"
|
| -#include "core/timing/PerformanceTiming.h"
|
| #include "core/timing/PerformanceUserTiming.h"
|
| #include "core/timing/ResourceTimingInfo.h"
|
| #include "platform/weborigin/SecurityOrigin.h"
|
| @@ -50,55 +47,29 @@ namespace blink {
|
| static const size_t defaultResourceTimingBufferSize = 150;
|
| static const size_t defaultFrameTimingBufferSize = 150;
|
|
|
| -Performance::Performance(LocalFrame* frame)
|
| - : DOMWindowProperty(frame)
|
| - , m_frameTimingBufferSize(defaultFrameTimingBufferSize)
|
| +PerformanceBase::PerformanceBase(double timeOrigin)
|
| + : m_frameTimingBufferSize(defaultFrameTimingBufferSize)
|
| , m_resourceTimingBufferSize(defaultResourceTimingBufferSize)
|
| - , m_referenceTime(frame && frame->host() ? frame->document()->loader()->timing().referenceMonotonicTime() : 0.0)
|
| + , m_timeOrigin(timeOrigin)
|
| , m_userTiming(nullptr)
|
| {
|
| }
|
|
|
| -Performance::~Performance()
|
| +PerformanceBase::~PerformanceBase()
|
| {
|
| }
|
|
|
| -const AtomicString& Performance::interfaceName() const
|
| +const AtomicString& PerformanceBase::interfaceName() const
|
| {
|
| return EventTargetNames::Performance;
|
| }
|
|
|
| -ExecutionContext* Performance::executionContext() const
|
| +PerformanceTiming* PerformanceBase::timing() const
|
| {
|
| - if (!frame())
|
| - return nullptr;
|
| - return frame()->document();
|
| + return nullptr;
|
| }
|
|
|
| -MemoryInfo* Performance::memory()
|
| -{
|
| - if (!m_memoryInfo)
|
| - m_memoryInfo = MemoryInfo::create();
|
| - return m_memoryInfo.get();
|
| -}
|
| -
|
| -PerformanceNavigation* Performance::navigation() const
|
| -{
|
| - if (!m_navigation)
|
| - m_navigation = PerformanceNavigation::create(m_frame);
|
| -
|
| - return m_navigation.get();
|
| -}
|
| -
|
| -PerformanceTiming* Performance::timing() const
|
| -{
|
| - if (!m_timing)
|
| - m_timing = PerformanceTiming::create(m_frame);
|
| -
|
| - return m_timing.get();
|
| -}
|
| -
|
| -PerformanceEntryVector Performance::getEntries() const
|
| +PerformanceEntryVector PerformanceBase::getEntries() const
|
| {
|
| PerformanceEntryVector entries;
|
|
|
| @@ -114,7 +85,7 @@ PerformanceEntryVector Performance::getEntries() const
|
| return entries;
|
| }
|
|
|
| -PerformanceEntryVector Performance::getEntriesByType(const String& entryType)
|
| +PerformanceEntryVector PerformanceBase::getEntriesByType(const String& entryType)
|
| {
|
| PerformanceEntryVector entries;
|
|
|
| @@ -143,7 +114,7 @@ PerformanceEntryVector Performance::getEntriesByType(const String& entryType)
|
| return entries;
|
| }
|
|
|
| -PerformanceEntryVector Performance::getEntriesByName(const String& name, const String& entryType)
|
| +PerformanceEntryVector PerformanceBase::getEntriesByName(const String& name, const String& entryType)
|
| {
|
| PerformanceEntryVector entries;
|
|
|
| @@ -175,24 +146,24 @@ PerformanceEntryVector Performance::getEntriesByName(const String& name, const S
|
| return entries;
|
| }
|
|
|
| -void Performance::webkitClearResourceTimings()
|
| +void PerformanceBase::webkitClearResourceTimings()
|
| {
|
| m_resourceTimingBuffer.clear();
|
| }
|
|
|
| -void Performance::webkitSetResourceTimingBufferSize(unsigned size)
|
| +void PerformanceBase::webkitSetResourceTimingBufferSize(unsigned size)
|
| {
|
| m_resourceTimingBufferSize = size;
|
| if (isResourceTimingBufferFull())
|
| dispatchEvent(Event::create(EventTypeNames::webkitresourcetimingbufferfull));
|
| }
|
|
|
| -void Performance::clearFrameTimings()
|
| +void PerformanceBase::clearFrameTimings()
|
| {
|
| m_frameTimingBuffer.clear();
|
| }
|
|
|
| -void Performance::setFrameTimingBufferSize(unsigned size)
|
| +void PerformanceBase::setFrameTimingBufferSize(unsigned size)
|
| {
|
| m_frameTimingBufferSize = size;
|
| if (isFrameTimingBufferFull())
|
| @@ -238,7 +209,7 @@ static bool allowsTimingRedirect(const Vector<ResourceResponse>& redirectChain,
|
| return true;
|
| }
|
|
|
| -void Performance::addResourceTiming(const ResourceTimingInfo& info, Document* initiatorDocument)
|
| +void PerformanceBase::addResourceTiming(const ResourceTimingInfo& info, Document* initiatorDocument)
|
| {
|
| if (isResourceTimingBufferFull())
|
| return;
|
| @@ -271,7 +242,7 @@ void Performance::addResourceTiming(const ResourceTimingInfo& info, Document* in
|
| addResourceTimingBuffer(entry);
|
| }
|
|
|
| -void Performance::addResourceTimingBuffer(PerformanceEntry* entry)
|
| +void PerformanceBase::addResourceTimingBuffer(PerformanceEntry* entry)
|
| {
|
| m_resourceTimingBuffer.append(entry);
|
|
|
| @@ -279,12 +250,12 @@ void Performance::addResourceTimingBuffer(PerformanceEntry* entry)
|
| dispatchEvent(Event::create(EventTypeNames::webkitresourcetimingbufferfull));
|
| }
|
|
|
| -bool Performance::isResourceTimingBufferFull()
|
| +bool PerformanceBase::isResourceTimingBufferFull()
|
| {
|
| return m_resourceTimingBuffer.size() >= m_resourceTimingBufferSize;
|
| }
|
|
|
| -void Performance::addRenderTiming(Document* initiatorDocument, unsigned sourceFrame, double startTime, double finishTime)
|
| +void PerformanceBase::addRenderTiming(Document* initiatorDocument, unsigned sourceFrame, double startTime, double finishTime)
|
| {
|
| if (isFrameTimingBufferFull())
|
| return;
|
| @@ -293,7 +264,7 @@ void Performance::addRenderTiming(Document* initiatorDocument, unsigned sourceFr
|
| addFrameTimingBuffer(entry);
|
| }
|
|
|
| -void Performance::addCompositeTiming(Document* initiatorDocument, unsigned sourceFrame, double startTime)
|
| +void PerformanceBase::addCompositeTiming(Document* initiatorDocument, unsigned sourceFrame, double startTime)
|
| {
|
| if (isFrameTimingBufferFull())
|
| return;
|
| @@ -302,7 +273,7 @@ void Performance::addCompositeTiming(Document* initiatorDocument, unsigned sourc
|
| addFrameTimingBuffer(entry);
|
| }
|
|
|
| -void Performance::addFrameTimingBuffer(PerformanceEntry* entry)
|
| +void PerformanceBase::addFrameTimingBuffer(PerformanceEntry* entry)
|
| {
|
| m_frameTimingBuffer.append(entry);
|
|
|
| @@ -310,54 +281,50 @@ void Performance::addFrameTimingBuffer(PerformanceEntry* entry)
|
| dispatchEvent(Event::create(EventTypeNames::frametimingbufferfull));
|
| }
|
|
|
| -bool Performance::isFrameTimingBufferFull()
|
| +bool PerformanceBase::isFrameTimingBufferFull()
|
| {
|
| return m_frameTimingBuffer.size() >= m_frameTimingBufferSize;
|
| }
|
|
|
| -void Performance::mark(const String& markName, ExceptionState& exceptionState)
|
| +void PerformanceBase::mark(const String& markName, ExceptionState& exceptionState)
|
| {
|
| if (!m_userTiming)
|
| m_userTiming = UserTiming::create(this);
|
| m_userTiming->mark(markName, exceptionState);
|
| }
|
|
|
| -void Performance::clearMarks(const String& markName)
|
| +void PerformanceBase::clearMarks(const String& markName)
|
| {
|
| if (!m_userTiming)
|
| m_userTiming = UserTiming::create(this);
|
| m_userTiming->clearMarks(markName);
|
| }
|
|
|
| -void Performance::measure(const String& measureName, const String& startMark, const String& endMark, ExceptionState& exceptionState)
|
| +void PerformanceBase::measure(const String& measureName, const String& startMark, const String& endMark, ExceptionState& exceptionState)
|
| {
|
| if (!m_userTiming)
|
| m_userTiming = UserTiming::create(this);
|
| m_userTiming->measure(measureName, startMark, endMark, exceptionState);
|
| }
|
|
|
| -void Performance::clearMeasures(const String& measureName)
|
| +void PerformanceBase::clearMeasures(const String& measureName)
|
| {
|
| if (!m_userTiming)
|
| m_userTiming = UserTiming::create(this);
|
| m_userTiming->clearMeasures(measureName);
|
| }
|
|
|
| -double Performance::now() const
|
| +double PerformanceBase::now() const
|
| {
|
| - return 1000.0 * (monotonicallyIncreasingTime() - m_referenceTime);
|
| + return 1000.0 * (monotonicallyIncreasingTime() - m_timeOrigin);
|
| }
|
|
|
| -DEFINE_TRACE(Performance)
|
| +DEFINE_TRACE(PerformanceBase)
|
| {
|
| - visitor->trace(m_navigation);
|
| - visitor->trace(m_timing);
|
| visitor->trace(m_frameTimingBuffer);
|
| visitor->trace(m_resourceTimingBuffer);
|
| - visitor->trace(m_memoryInfo);
|
| visitor->trace(m_userTiming);
|
| EventTargetWithInlineData::trace(visitor);
|
| - DOMWindowProperty::trace(visitor);
|
| }
|
|
|
| } // namespace blink
|
|
|