Commit 184acb55 authored by yurys@chromium.org's avatar yurys@chromium.org

Make console.timeline/timelineEnd work for Timeline based on trace events

BUG=398787

Review URL: https://codereview.chromium.org/462603002

git-svn-id: svn://svn.chromium.org/blink/trunk@179964 bbb929c8-8fbe-4397-9dbb-9b2b20218538
parent e0100fb2
...@@ -126,6 +126,7 @@ void InspectorConsoleAgent::disable(ErrorString*) ...@@ -126,6 +126,7 @@ void InspectorConsoleAgent::disable(ErrorString*)
if (!(--s_enabledAgentCount)) if (!(--s_enabledAgentCount))
ScriptController::setCaptureCallStackForUncaughtExceptions(false); ScriptController::setCaptureCallStackForUncaughtExceptions(false);
m_state->setBoolean(ConsoleAgentState::consoleMessagesEnabled, false); m_state->setBoolean(ConsoleAgentState::consoleMessagesEnabled, false);
m_state->setBoolean(ConsoleAgentState::tracingBasedTimeline, false);
} }
void InspectorConsoleAgent::clearMessages(ErrorString*) void InspectorConsoleAgent::clearMessages(ErrorString*)
......
...@@ -30,6 +30,8 @@ WebInspector.Target = function(name, connection, callback) ...@@ -30,6 +30,8 @@ WebInspector.Target = function(name, connection, callback)
if (WebInspector.experimentsSettings.timelinePowerProfiler.isEnabled()) if (WebInspector.experimentsSettings.timelinePowerProfiler.isEnabled())
this.powerAgent().canProfilePower(this._initializeCapability.bind(this, WebInspector.Target.Capabilities.CanProfilePower, null)); this.powerAgent().canProfilePower(this._initializeCapability.bind(this, WebInspector.Target.Capabilities.CanProfilePower, null));
this.workerAgent().canInspectWorkers(this._initializeCapability.bind(this, WebInspector.Target.Capabilities.CanInspectWorkers, this._loadedWithCapabilities.bind(this, callback))); this.workerAgent().canInspectWorkers(this._initializeCapability.bind(this, WebInspector.Target.Capabilities.CanInspectWorkers, this._loadedWithCapabilities.bind(this, callback)));
if (WebInspector.experimentsSettings.timelineOnTraceEvents.isEnabled())
this.consoleAgent().setTracingBasedTimeline(true);
/** @type {!WebInspector.Lock} */ /** @type {!WebInspector.Lock} */
this.profilingLock = new WebInspector.Lock(); this.profilingLock = new WebInspector.Lock();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment