| Index: Source/core/inspector/InspectorTimelineAgent.cpp
|
| diff --git a/Source/core/inspector/InspectorTimelineAgent.cpp b/Source/core/inspector/InspectorTimelineAgent.cpp
|
| index 41db9181ad76cc38c168348621cb7b13e2d90860..513b91d4c0c89e83f777c1a0179c12159f4ace24 100644
|
| --- a/Source/core/inspector/InspectorTimelineAgent.cpp
|
| +++ b/Source/core/inspector/InspectorTimelineAgent.cpp
|
| @@ -66,6 +66,7 @@ static const char started[] = "started";
|
| static const char startedFromProtocol[] = "startedFromProtocol";
|
| static const char timelineMaxCallStackDepth[] = "timelineMaxCallStackDepth";
|
| static const char includeDomCounters[] = "includeDomCounters";
|
| +static const char includeGpuEvents[] = "includeGpuEvents";
|
| static const char bufferEvents[] = "bufferEvents";
|
| }
|
|
|
| @@ -125,6 +126,7 @@ static const char WebSocketDestroy[] = "WebSocketDestroy";
|
| const char DecodeImage[] = "DecodeImage";
|
| const char Rasterize[] = "Rasterize";
|
| const char PaintSetup[] = "PaintSetup";
|
| +const char GpuTask[] = "GpuTask";
|
| }
|
|
|
| namespace {
|
| @@ -225,7 +227,7 @@ void InspectorTimelineAgent::disable(ErrorString*)
|
| m_state->setBoolean(TimelineAgentState::enabled, false);
|
| }
|
|
|
| -void InspectorTimelineAgent::start(ErrorString* errorString, const int* maxCallStackDepth, const bool* bufferEvents, const bool* includeDomCounters)
|
| +void InspectorTimelineAgent::start(ErrorString* errorString, const int* maxCallStackDepth, const bool* bufferEvents, const bool* includeDomCounters, const bool* includeGpuEvents)
|
| {
|
| if (!m_frontend)
|
| return;
|
| @@ -247,6 +249,7 @@ void InspectorTimelineAgent::start(ErrorString* errorString, const int* maxCallS
|
|
|
| m_state->setLong(TimelineAgentState::timelineMaxCallStackDepth, m_maxCallStackDepth);
|
| m_state->setBoolean(TimelineAgentState::includeDomCounters, includeDomCounters && *includeDomCounters);
|
| + m_state->setBoolean(TimelineAgentState::includeGpuEvents, includeGpuEvents && *includeGpuEvents);
|
| m_state->setBoolean(TimelineAgentState::bufferEvents, bufferEvents && *bufferEvents);
|
|
|
| innerStart();
|
| @@ -266,7 +269,7 @@ void InspectorTimelineAgent::innerStart()
|
| m_instrumentingAgents->setInspectorTimelineAgent(this);
|
| ScriptGCEvent::addEventListener(this);
|
| if (m_client && m_pageAgent)
|
| - m_traceEventProcessor = adoptRef(new TimelineTraceEventProcessor(m_weakFactory.createWeakPtr(), m_client));
|
| + m_traceEventProcessor = adoptRef(new TimelineTraceEventProcessor(m_weakFactory.createWeakPtr(), m_client, m_state->getBoolean(TimelineAgentState::includeGpuEvents)));
|
| }
|
|
|
| void InspectorTimelineAgent::stop(ErrorString* errorString, RefPtr<TypeBuilder::Array<TypeBuilder::Timeline::TimelineEvent> >& events)
|
|
|