Index: Source/core/timing/Performance.cpp |
diff --git a/Source/core/timing/Performance.cpp b/Source/core/timing/Performance.cpp |
index 6029829a1130437d17209a9b95938227867f6139..eb3c6ef1d736bc3ccdde7ba9b9002a5230bf1f29 100644 |
--- a/Source/core/timing/Performance.cpp |
+++ b/Source/core/timing/Performance.cpp |
@@ -35,19 +35,22 @@ |
#include "core/dom/Document.h" |
#include "core/frame/LocalFrame.h" |
#include "core/loader/DocumentLoader.h" |
-#include "core/timing/ResourceTimingInfo.h" |
+#include "core/timing/PerformanceDrawTiming.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 WebCore { |
static const size_t defaultResourceTimingBufferSize = 150; |
+static const size_t defaultDrawTimingBufferSize = 150; |
Performance::Performance(LocalFrame* frame) |
: DOMWindowProperty(frame) |
, m_resourceTimingBufferSize(defaultResourceTimingBufferSize) |
+ , m_drawTimingBufferSize(defaultDrawTimingBufferSize) |
, m_referenceTime(frame && frame->host() ? frame->document()->loader()->timing()->referenceMonotonicTime() : 0.0) |
, m_userTiming(nullptr) |
{ |
@@ -97,6 +100,8 @@ PerformanceEntryVector Performance::getEntries() const |
entries.appendVector(m_resourceTimingBuffer); |
+ entries.appendVector(m_drawTimingBuffer); |
+ |
if (m_userTiming) { |
entries.appendVector(m_userTiming->getMarks()); |
entries.appendVector(m_userTiming->getMeasures()); |
@@ -114,6 +119,10 @@ PerformanceEntryVector Performance::getEntriesByType(const String& entryType) |
for (PerformanceEntryVector::const_iterator resource = m_resourceTimingBuffer.begin(); resource != m_resourceTimingBuffer.end(); ++resource) |
entries.append(*resource); |
+ if (equalIgnoringCase(entryType, "draw")) |
+ for (PerformanceEntryVector::const_iterator draw = m_drawTimingBuffer.begin(); draw != m_drawTimingBuffer.end(); ++draw) |
+ entries.append(*draw); |
+ |
if (m_userTiming) { |
if (equalIgnoringCase(entryType, "mark")) |
entries.appendVector(m_userTiming->getMarks()); |
@@ -134,6 +143,12 @@ PerformanceEntryVector Performance::getEntriesByName(const String& name, const S |
if ((*resource)->name() == name) |
entries.append(*resource); |
+ if (entryType.isNull() || equalIgnoringCase(entryType, "draw")) { |
+ for (PerformanceEntryVector::const_iterator draw = m_drawTimingBuffer.begin(); draw != m_drawTimingBuffer.end(); ++draw) { |
+ if ((*draw)->name() == name) |
+ entries.append(*draw); |
+ } |
+ } |
if (m_userTiming) { |
if (entryType.isNull() || equalIgnoringCase(entryType, "mark")) |
entries.appendVector(m_userTiming->getMarks(name)); |
@@ -157,6 +172,18 @@ void Performance::webkitSetResourceTimingBufferSize(unsigned size) |
dispatchEvent(Event::create(EventTypeNames::webkitresourcetimingbufferfull)); |
} |
+void Performance::webkitClearDrawTimings() |
+{ |
+ m_drawTimingBuffer.clear(); |
+} |
+ |
+void Performance::webkitSetDrawTimingBufferSize(unsigned size) |
+{ |
+ m_drawTimingBufferSize = size; |
+ if (isDrawTimingBufferFull()) |
+ dispatchEvent(Event::create(EventTypeNames::webkitdrawtimingbufferfull)); |
+} |
+ |
static bool passesTimingAllowCheck(const ResourceResponse& response, Document* requestingDocument, const AtomicString& originalTimingAllowOrigin) |
{ |
AtomicallyInitializedStatic(AtomicString&, timingAllowOrigin = *new AtomicString("timing-allow-origin")); |
@@ -242,6 +269,28 @@ bool Performance::isResourceTimingBufferFull() |
return m_resourceTimingBuffer.size() >= m_resourceTimingBufferSize; |
} |
+void Performance::addDrawTiming(Document* initiatorDocument, unsigned sourceFrame, double startTime) |
+{ |
+ if (isDrawTimingBufferFull()) |
+ return; |
+ |
+ RefPtrWillBeRawPtr<PerformanceEntry> entry = PerformanceDrawTiming::create(initiatorDocument, sourceFrame, startTime); |
+ addDrawTimingBuffer(entry); |
+} |
+ |
+void Performance::addDrawTimingBuffer(PassRefPtrWillBeRawPtr<PerformanceEntry> entry) |
+{ |
+ m_drawTimingBuffer.append(entry); |
+ |
+ if (isDrawTimingBufferFull()) |
+ dispatchEvent(Event::create(EventTypeNames::webkitdrawtimingbufferfull)); |
+} |
+ |
+bool Performance::isDrawTimingBufferFull() |
+{ |
+ return m_drawTimingBuffer.size() >= m_drawTimingBufferSize; |
+} |
+ |
void Performance::mark(const String& markName, ExceptionState& exceptionState) |
{ |
if (!m_userTiming) |
@@ -280,6 +329,7 @@ void Performance::trace(Visitor* visitor) |
visitor->trace(m_navigation); |
visitor->trace(m_timing); |
visitor->trace(m_resourceTimingBuffer); |
+ visitor->trace(m_drawTimingBuffer); |
visitor->trace(m_userTiming); |
EventTargetWithInlineData::trace(visitor); |
} |