Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1335)

Unified Diff: Source/core/inspector/InspectorTimelineAgent.cpp

Issue 399043002: DevTools: switch Timeline frontend into buffered mode and remove the corresponding experiment. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: minor changes Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: Source/core/inspector/InspectorTimelineAgent.cpp
diff --git a/Source/core/inspector/InspectorTimelineAgent.cpp b/Source/core/inspector/InspectorTimelineAgent.cpp
index ab2fa3c972dab28a8001532d6e4be3b6806b4c39..4907ea77229012eecd4653647ea962e7b6a5d0e9 100644
--- a/Source/core/inspector/InspectorTimelineAgent.cpp
+++ b/Source/core/inspector/InspectorTimelineAgent.cpp
@@ -71,7 +71,6 @@ 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";
}
@@ -278,9 +277,6 @@ void InspectorTimelineAgent::clearFrontend()
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()) {
@@ -288,7 +284,7 @@ void InspectorTimelineAgent::restore()
// 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);
}
}
@@ -302,7 +298,7 @@ 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;
@@ -318,10 +314,7 @@ void InspectorTimelineAgent::start(ErrorString* errorString, const int* maxCallS
else
m_maxCallStackDepth = 5;
- if (bufferEvents && *bufferEvents) {
- m_bufferedEvents = TypeBuilder::Array<TimelineEvent>::create();
- m_lastProgressTimestamp = timestamp();
- }
+ m_lastProgressTimestamp = timestamp();
if (liveEvents)
setLiveEvents(*liveEvents);
@@ -329,7 +322,6 @@ void InspectorTimelineAgent::start(ErrorString* errorString, const int* maxCallS
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();
@@ -344,6 +336,8 @@ bool InspectorTimelineAgent::isStarted()
void InspectorTimelineAgent::innerStart()
{
+ m_bufferedEvents = TypeBuilder::Array<TimelineEvent>::create();
+
if (m_overlay)
m_overlay->startedRecordingProfile();
m_state->setBoolean(TimelineAgentState::started, true);
@@ -379,7 +373,6 @@ void InspectorTimelineAgent::innerStart()
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()) {
@@ -387,8 +380,6 @@ void InspectorTimelineAgent::stop(ErrorString* errorString, RefPtr<TypeBuilder::
return;
}
innerStop(false);
- if (m_bufferedEvents)
- events = m_bufferedEvents.release();
m_liveEvents.clear();
}
@@ -419,7 +410,7 @@ void InspectorTimelineAgent::innerStop(bool fromConsole)
}
m_consoleTimelines.clear();
- m_frontend->stopped(&fromConsole);
+ m_frontend->stopped(&fromConsole, m_bufferedEvents.release());
if (m_overlay)
m_overlay->finishedRecordingProfile();
}
@@ -1058,7 +1049,7 @@ void InspectorTimelineAgent::addRecordToTimeline(PassRefPtr<TimelineEvent> recor
{
commitFrameRecord();
innerAddRecordToTimeline(record);
- if (m_bufferedEvents && ts - m_lastProgressTimestamp > 300) {
+ if (ts - m_lastProgressTimestamp > 300) {
m_lastProgressTimestamp = ts;
m_frontend->progress(m_bufferedEvents->length());
}
@@ -1178,11 +1169,9 @@ void InspectorTimelineAgent::appendRecord(PassRefPtr<JSONObject> data, const Str
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());
}

Powered by Google App Engine
This is Rietveld 408576698