DevTools: switch Timeline frontend into buffered mode and remove the corresponding experiment.

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 53 matching lines @@
 
 namespace WebCore {
 
 namespace TimelineAgentState {
 static const char enabled[] = "enabled";
 static const char started[] = "started";
 static const char startedFromProtocol[] = "startedFromProtocol";
 static const char timelineMaxCallStackDepth[] = "timelineMaxCallStackDepth";
 static const char includeCounters[] = "includeCounters";
 static const char includeGPUEvents[] = "includeGPUEvents";
-static const char bufferEvents[] = "bufferEvents";
 static const char liveEvents[] = "liveEvents";
 }
 
 // Must be kept in sync with WebInspector.TimelineModel.RecordType in TimelineModel.js
 namespace TimelineRecordType {
 static const char Program[] = "Program";
 
 static const char EventDispatch[] = "EventDispatch";
 static const char ScheduleStyleRecalculation[] = "ScheduleStyleRecalculation";
 static const char RecalculateStyles[] = "RecalculateStyles";
@@ skipping 186 matching lines @@
     ErrorString error;
     RefPtr<TypeBuilder::Array<TimelineEvent> > events;
     stop(&error, events);
     disable(&error);
     m_frontend = 0;
 }
 
 void InspectorTimelineAgent::restore()
 {
     if (m_state->getBoolean(TimelineAgentState::startedFromProtocol)) {
-        if (m_state->getBoolean(TimelineAgentState::bufferEvents))
-            m_bufferedEvents = TypeBuilder::Array<TimelineEvent>::create();
-
         setLiveEvents(m_state->getString(TimelineAgentState::liveEvents));
         innerStart();
     } else if (isStarted()) {
         // Timeline was started from console.timeline, it is not restored.
         // Tell front-end timline is no longer collecting.
         m_state->setBoolean(TimelineAgentState::started, false);
         bool fromConsole = true;
-        m_frontend->stopped(&fromConsole);
+        m_frontend->stopped(&fromConsole, nullptr);
     }
 }
 
 void InspectorTimelineAgent::enable(ErrorString*)
 {
     m_state->setBoolean(TimelineAgentState::enabled, true);
 }
 
 void InspectorTimelineAgent::disable(ErrorString*)
 {
     m_state->setBoolean(TimelineAgentState::enabled, false);
 }
 
-void InspectorTimelineAgent::start(ErrorString* errorString, const int* maxCallStackDepth, const bool* bufferEvents, const String* liveEvents, const bool* includeCounters, const bool* includeGPUEvents)
+void InspectorTimelineAgent::start(ErrorString* errorString, const int* maxCallStackDepth, const String* liveEvents, const bool* includeCounters, const bool* includeGPUEvents)
 {
     if (!m_frontend)
         return;
     m_state->setBoolean(TimelineAgentState::startedFromProtocol, true);
 
     if (isStarted()) {
         *errorString = "Timeline is already started";
         return;
     }
 
     if (maxCallStackDepth && *maxCallStackDepth >= 0)
         m_maxCallStackDepth = *maxCallStackDepth;
     else
         m_maxCallStackDepth = 5;
 
-    if (bufferEvents && *bufferEvents) {
-        m_bufferedEvents = TypeBuilder::Array<TimelineEvent>::create();
-        m_lastProgressTimestamp = timestamp();
-    }
+    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();
     bool fromConsole = false;
     m_frontend->started(&fromConsole);
 }
 
 bool InspectorTimelineAgent::isStarted()
 {
     return m_state->getBoolean(TimelineAgentState::started);
 }
 
 void InspectorTimelineAgent::innerStart()
 {
+    m_bufferedEvents = TypeBuilder::Array<TimelineEvent>::create();
+
     if (m_overlay)
         m_overlay->startedRecordingProfile();
     m_state->setBoolean(TimelineAgentState::started, true);
     m_instrumentingAgents->setInspectorTimelineAgent(this);
     ScriptGCEvent::addEventListener(this);
     if (m_client) {
         TraceEventDispatcher* dispatcher = TraceEventDispatcher::instance();
         dispatcher->addListener(InstrumentationEvents::BeginFrame, TRACE_EVENT_PHASE_INSTANT, this, &InspectorTimelineAgent::onBeginImplSideFrame, m_client);
         dispatcher->addListener(InstrumentationEvents::PaintSetup, TRACE_EVENT_PHASE_BEGIN, this, &InspectorTimelineAgent::onPaintSetupBegin, m_client);
         dispatcher->addListener(InstrumentationEvents::PaintSetup, TRACE_EVENT_PHASE_END, this, &InspectorTimelineAgent::onPaintSetupEnd, m_client);
@@ skipping 15 matching lines @@
         if (m_state->getBoolean(TimelineAgentState::includeGPUEvents)) {
             m_pendingGPURecord.clear();
             m_client->startGPUEventsRecording();
         }
     }
 }
 
 void InspectorTimelineAgent::stop(ErrorString* errorString, RefPtr<TypeBuilder::Array<TimelineEvent> >& events)
 {
     m_state->setBoolean(TimelineAgentState::startedFromProtocol, false);
-    m_state->setBoolean(TimelineAgentState::bufferEvents, false);
     m_state->setString(TimelineAgentState::liveEvents, "");
 
     if (!isStarted()) {
         *errorString = "Timeline was not started";
         return;
     }
     innerStop(false);
-    if (m_bufferedEvents)
-        events = m_bufferedEvents.release();
     m_liveEvents.clear();
 }
 
 void InspectorTimelineAgent::innerStop(bool fromConsole)
 {
     m_state->setBoolean(TimelineAgentState::started, false);
 
     if (m_client) {
         TraceEventDispatcher::instance()->removeAllListeners(this, m_client);
         if (m_state->getBoolean(TimelineAgentState::includeGPUEvents))
@@ skipping 10 matching lines @@
     m_imageBeingPainted = 0;
     m_paintSetupStart = 0;
     m_mayEmitFirstPaint = false;
 
     for (size_t i = 0; i < m_consoleTimelines.size(); ++i) {
         String message = String::format("Timeline '%s' terminated.", m_consoleTimelines[i].utf8().data());
         mainFrame()->console().addMessage(JSMessageSource, DebugMessageLevel, message);
     }
     m_consoleTimelines.clear();
 
-    m_frontend->stopped(&fromConsole);
+    m_frontend->stopped(&fromConsole, m_bufferedEvents.release());
     if (m_overlay)
         m_overlay->finishedRecordingProfile();
 }
 
 void InspectorTimelineAgent::didBeginFrame(int frameId)
 {
     TraceEventDispatcher::instance()->processBackgroundEvents();
     m_pendingFrameRecord = TimelineRecordFactory::createGenericRecord(timestamp(), 0, TimelineRecordType::BeginFrame, TimelineRecordFactory::createFrameData(frameId));
 }
 
@@ skipping 618 matching lines @@
 void InspectorTimelineAgent::onEmbedderCallbackEnd(const TraceEventDispatcher::TraceEvent& event)
 {
     TimelineThreadState& state = threadState(event.threadIdentifier());
     state.recordStack.closeScopedRecord(event.timestamp() * msPerSecond);
 }
 
 void InspectorTimelineAgent::addRecordToTimeline(PassRefPtr<TimelineEvent> record, double ts)
 {
     commitFrameRecord();
     innerAddRecordToTimeline(record);
-    if (m_bufferedEvents && ts - m_lastProgressTimestamp > 300) {
+    if (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);
@@ skipping 99 matching lines @@
 {
     double ts = timestamp();
     RefPtr<TimelineEvent> record = TimelineRecordFactory::createGenericRecord(ts, captureCallStack ? m_maxCallStackDepth : 0, type, data);
     setFrameIdentifier(record.get(), frame);
     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;
-    }
+    m_bufferedEvents->addItem(retain);
+    if (!m_liveEvents.contains(TimelineRecordFactory::type(retain.get())))
+        return;
     m_frontend->eventRecorded(retain.release());
 }
 
 void InspectorTimelineAgent::pushCurrentRecord(PassRefPtr<JSONObject> data, const String& type, bool captureCallStack, LocalFrame* frame, bool hasLowLevelDetails)
 {
     commitFrameRecord();
     RefPtr<TimelineEvent> record = TimelineRecordFactory::createGenericRecord(timestamp(), captureCallStack ? m_maxCallStackDepth : 0, type, data.get());
     setFrameIdentifier(record.get(), frame);
     m_recordStack.append(TimelineRecordEntry(record.release(), data, TypeBuilder::Array<TimelineEvent>::create(), type));
     if (hasLowLevelDetails && !m_platformInstrumentationClientInstalledAtStackDepth && !PlatformInstrumentation::hasClient()) {
@@ skipping 110 matching lines @@
 
 #ifndef NDEBUG
 bool TimelineRecordStack::isOpenRecordOfType(const String& type)
 {
     return !m_stack.isEmpty() && m_stack.last().type == type;
 }
 #endif
 
 } // namespace WebCore