DevTools: report timeline progress while recording.

Source/core/inspector/InspectorTimelineAgent.cpp

 /*
 * Copyright (C) 2013 Google Inc. All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions are
 * met:
 *
 *     * Redistributions of source code must retain the above copyright
 * notice, this list of conditions and the following disclaimer.
 *     * Redistributions in binary form must reproduce the above
@@ skipping 252 matching lines @@
 }
 
 void InspectorTimelineAgent::pushGCEventRecords()
 {
     if (!m_gcEvents.size())
         return;
 
     GCEvents events = m_gcEvents;
     m_gcEvents.clear();
     for (GCEvents::iterator i = events.begin(); i != events.end(); ++i) {
-        RefPtr<TimelineEvent> record = TimelineRecordFactory::createGenericRecord(m_timeConverter.fromMonotonicallyIncreasingTime(i->startTime), m_maxCallStackDepth, TimelineRecordType::GCEvent, TimelineRecordFactory::createGCEventData(i->collectedBytes));
+        double ts = m_timeConverter.fromMonotonicallyIncreasingTime(i->startTime);
+        RefPtr<TimelineEvent> record = TimelineRecordFactory::createGenericRecord(ts, m_maxCallStackDepth, TimelineRecordType::GCEvent, TimelineRecordFactory::createGCEventData(i->collectedBytes));
         record->setEndTime(m_timeConverter.fromMonotonicallyIncreasingTime(i->endTime));
-        addRecordToTimeline(record.release());
+        addRecordToTimeline(record.release(), ts);
     }
 }
 
 void InspectorTimelineAgent::didGC(double startTime, double endTime, size_t collectedBytesCount)
 {
     m_gcEvents.append(TimelineGCEvent(startTime, endTime, collectedBytesCount));
 }
 
 InspectorTimelineAgent::~InspectorTimelineAgent()
 {
@@ skipping 51 matching lines @@
         *errorString = "Timeline is already started";
         return;
     }
 
     releaseNodeIds();
     if (maxCallStackDepth && *maxCallStackDepth >= 0)
         m_maxCallStackDepth = *maxCallStackDepth;
     else
         m_maxCallStackDepth = 5;
 
-    if (bufferEvents && *bufferEvents)
+    if (bufferEvents && *bufferEvents) {
         m_bufferedEvents = TypeBuilder::Array<TimelineEvent>::create();
+        m_lastProgressTimestamp = timestamp();
+    }
+
     if (liveEvents)
         setLiveEvents(*liveEvents);
 
     m_state->setLong(TimelineAgentState::timelineMaxCallStackDepth, m_maxCallStackDepth);
     m_state->setBoolean(TimelineAgentState::includeCounters, includeCounters && *includeCounters);
     m_state->setBoolean(TimelineAgentState::includeGPUEvents, includeGPUEvents && *includeGPUEvents);
     m_state->setBoolean(TimelineAgentState::bufferEvents, bufferEvents && *bufferEvents);
     m_state->setString(TimelineAgentState::liveEvents, liveEvents ? *liveEvents : "");
 
     innerStart();
@@ skipping 227 matching lines @@
     double paintSetupStart = m_paintSetupStart;
     m_paintSetupStart = 0;
     if (graphicsLayer) {
         int layerIdentifier = graphicsLayer->platformLayer()->id();
         int nodeIdentifier = nodeId(renderer);
         ASSERT(layerIdentifier && nodeIdentifier);
         m_layerToNodeMap.set(layerIdentifier, nodeIdentifier);
         if (paintSetupStart) {
             RefPtr<TimelineEvent> paintSetupRecord = TimelineRecordFactory::createGenericRecord(paintSetupStart, 0, TimelineRecordType::PaintSetup, TimelineRecordFactory::createLayerData(nodeIdentifier));
             paintSetupRecord->setEndTime(m_paintSetupEnd);
-            addRecordToTimeline(paintSetupRecord);
+            addRecordToTimeline(paintSetupRecord, paintSetupStart);
         }
     }
     pushCurrentRecord(JSONObject::create(), TimelineRecordType::Paint, true, frame, true);
 }
 
 void InspectorTimelineAgent::didPaint(RenderObject* renderer, const GraphicsLayer* graphicsLayer, GraphicsContext*, const LayoutRect& clipRect)
 {
     TimelineRecordEntry& entry = m_recordStack.last();
     ASSERT(entry.type == TimelineRecordType::Paint);
     FloatQuad quad;
@@ skipping 479 matching lines @@
     RefPtr<TimelineEvent> record = TimelineRecordFactory::createGenericRecord(timestamp, 0, TimelineRecordType::EmbedderCallback, data);
     state.recordStack.addScopedRecord(record, TimelineRecordType::EmbedderCallback);
 }
 
 void InspectorTimelineAgent::onEmbedderCallbackEnd(const TraceEventDispatcher::TraceEvent& event)
 {
     TimelineThreadState& state = threadState(event.threadIdentifier());
     state.recordStack.closeScopedRecord(m_timeConverter.fromMonotonicallyIncreasingTime(event.timestamp()));
 }
 
-void InspectorTimelineAgent::addRecordToTimeline(PassRefPtr<TimelineEvent> record)
+void InspectorTimelineAgent::addRecordToTimeline(PassRefPtr<TimelineEvent> record, double ts)
 {
     commitFrameRecord();
     innerAddRecordToTimeline(record);
+    if (m_bufferedEvents && ts - m_lastProgressTimestamp > 300) {
+        m_lastProgressTimestamp = ts;
+        m_frontend->progress(m_bufferedEvents->length());
+    }
 }
 
 void InspectorTimelineAgent::innerAddRecordToTimeline(PassRefPtr<TimelineEvent> record)
 {
     if (m_recordStack.isEmpty()) {
         TraceEventDispatcher::instance()->processBackgroundEvents();
         sendEvent(record);
     } else {
         setCounters(record.get());
         TimelineRecordEntry& parent = m_recordStack.last();
@@ skipping 53 matching lines @@
         m_recordStack.removeLast();
         while (entry.type != type && entry.skipWhenUnbalanced && !m_recordStack.isEmpty()) {
             // Discard pending skippable entry, paste its children inplace.
             if (entry.children)
                 m_recordStack.last().children->concat(entry.children);
             entry = m_recordStack.last();
             m_recordStack.removeLast();
         }
         ASSERT(entry.type == type);
         entry.record->setChildren(entry.children);
-        entry.record->setEndTime(timestamp());
+        double ts = timestamp();
+        entry.record->setEndTime(ts);
         ptrdiff_t usedHeapSizeDelta = getUsedHeapSize() - entry.usedHeapSizeAtStart;
         if (usedHeapSizeDelta)
             entry.record->setUsedHeapSizeDelta(usedHeapSizeDelta);
-        addRecordToTimeline(entry.record);
+        addRecordToTimeline(entry.record, ts);
     }
 }
 
 void InspectorTimelineAgent::unwindRecordStack()
 {
     while (!m_recordStack.isEmpty()) {
         TimelineRecordEntry& entry = m_recordStack.last();
         didCompleteCurrentRecord(entry.type);
     }
 }
 
 InspectorTimelineAgent::InspectorTimelineAgent(InspectorPageAgent* pageAgent, InspectorDOMAgent* domAgent, InspectorLayerTreeAgent* layerTreeAgent,
     InspectorOverlay* overlay, InspectorType type, InspectorClient* client)
     : InspectorBaseAgent<InspectorTimelineAgent>("Timeline")
     , m_pageAgent(pageAgent)
     , m_domAgent(domAgent)
     , m_layerTreeAgent(layerTreeAgent)
     , m_frontend(0)
     , m_client(client)
     , m_overlay(overlay)
     , m_inspectorType(type)
     , m_id(1)
     , m_layerTreeId(0)
     , m_maxCallStackDepth(5)
     , m_platformInstrumentationClientInstalledAtStackDepth(0)
     , m_imageBeingPainted(0)
     , m_paintSetupStart(0)
     , m_styleRecalcElementCounter(0)
     , m_mayEmitFirstPaint(false)
+    , m_lastProgressTimestamp(0)
 {
 }
 
 void InspectorTimelineAgent::appendRecord(PassRefPtr<JSONObject> data, const String& type, bool captureCallStack, LocalFrame* frame)
 {
     pushGCEventRecords();
-    RefPtr<TimelineEvent> record = TimelineRecordFactory::createGenericRecord(timestamp(), captureCallStack ? m_maxCallStackDepth : 0, type, data);
+    double ts = timestamp();
+    RefPtr<TimelineEvent> record = TimelineRecordFactory::createGenericRecord(ts, captureCallStack ? m_maxCallStackDepth : 0, type, data);
     setFrameIdentifier(record.get(), frame);
-    addRecordToTimeline(record.release());
+    addRecordToTimeline(record.release(), ts);
 }
 
 void InspectorTimelineAgent::sendEvent(PassRefPtr<TimelineEvent> record)
 {
     RefPtr<TimelineEvent> retain = record;
     if (m_bufferedEvents) {
         m_bufferedEvents->addItem(retain);
         if (!m_liveEvents.contains(TimelineRecordFactory::type(retain.get())))
             return;
     }
@@ skipping 128 matching lines @@
 
 #ifndef NDEBUG
 bool TimelineRecordStack::isOpenRecordOfType(const String& type)
 {
     return !m_stack.isEmpty() && m_stack.last().type == type;
 }
 #endif
 
 } // namespace WebCore