diff options
| author | Ben Murdoch <benm@google.com> | 2010-10-22 13:02:20 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2010-10-26 15:21:41 +0100 |
| commit | a94275402997c11dd2e778633dacf4b7e630a35d (patch) | |
| tree | e66f56c67e3b01f22c9c23cd932271ee9ac558ed /WebCore/inspector/InspectorTimelineAgent.cpp | |
| parent | 09e26c78506587b3f5d930d7bc72a23287ffbec0 (diff) | |
| download | external_webkit-a94275402997c11dd2e778633dacf4b7e630a35d.zip external_webkit-a94275402997c11dd2e778633dacf4b7e630a35d.tar.gz external_webkit-a94275402997c11dd2e778633dacf4b7e630a35d.tar.bz2 | |
Merge WebKit at r70209: Initial merge by Git
Change-Id: Id23a68efa36e9d1126bcce0b137872db00892c8e
Diffstat (limited to 'WebCore/inspector/InspectorTimelineAgent.cpp')
| -rw-r--r-- | WebCore/inspector/InspectorTimelineAgent.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/WebCore/inspector/InspectorTimelineAgent.cpp b/WebCore/inspector/InspectorTimelineAgent.cpp index fbb17c4..645b692 100644 --- a/WebCore/inspector/InspectorTimelineAgent.cpp +++ b/WebCore/inspector/InspectorTimelineAgent.cpp @@ -44,12 +44,12 @@ namespace WebCore { -int InspectorTimelineAgent::s_instanceCount = 0; +int InspectorTimelineAgent::s_id = 0; InspectorTimelineAgent::InspectorTimelineAgent(InspectorFrontend* frontend) : m_frontend(frontend) + , m_id(++s_id) { - ++s_instanceCount; ScriptGCEvent::addEventListener(this); ASSERT(m_frontend); } @@ -76,8 +76,6 @@ void InspectorTimelineAgent::didGC(double startTime, double endTime, size_t coll InspectorTimelineAgent::~InspectorTimelineAgent() { - ASSERT(s_instanceCount); - --s_instanceCount; ScriptGCEvent::removeEventListener(this); } @@ -242,10 +240,11 @@ void InspectorTimelineAgent::didReceiveResourceResponse() didCompleteCurrentRecord(ResourceReceiveResponseTimelineRecordType); } -void InspectorTimelineAgent::didFinishLoadingResource(unsigned long identifier, bool didFail) +void InspectorTimelineAgent::didFinishLoadingResource(unsigned long identifier, bool didFail, double finishTime) { pushGCEventRecords(); - RefPtr<InspectorObject> record = TimelineRecordFactory::createGenericRecord(WTF::currentTimeMS()); + // Sometimes network stack can provide for us exact finish loading time. In the other case we will use currentTime. + RefPtr<InspectorObject> record = TimelineRecordFactory::createGenericRecord(finishTime ? finishTime * 1000 : WTF::currentTimeMS()); record->setObject("data", TimelineRecordFactory::createResourceFinishData(identifier, didFail)); record->setNumber("type", ResourceFinishTimelineRecordType); setHeapSizeStatistic(record.get()); |