Commit 68b12f1c authored by dgozman's avatar dgozman Committed by Commit bot

[DevTools] Remove Console.messagesCleared event.

This event doesn't make sense. Frontend can clear console messages log
on navigation if it wants to.

BUG=613882

Review-Url: https://codereview.chromium.org/2146163002
Cr-Commit-Position: refs/heads/master@{#405559}
parent c6d61f2a
......@@ -8,11 +8,12 @@ function test()
function dumpMessages(next, message)
{
InspectorTest.dumpConsoleMessagesIgnoreErrorStackFrames();
InspectorTest.consoleModel.requestClearMessages();
InspectorTest.consoleModel.addEventListener(WebInspector.ConsoleModel.Events.ConsoleCleared, afterCleared);
InspectorTest.consoleModel.requestClearMessages();
function afterCleared() {
function afterCleared()
{
InspectorTest.consoleModel.removeEventListener(WebInspector.ConsoleModel.Events.ConsoleCleared, afterCleared);
next();
}
......
......@@ -150,7 +150,6 @@ WebInspector.ConsoleView = function()
this._registerWithMessageSink();
WebInspector.targetManager.observeTargets(this);
WebInspector.targetManager.addEventListener(WebInspector.TargetManager.Events.MainFrameNavigated, this._onMainFrameNavigated, this);
this._initConsoleMessages();
......@@ -179,17 +178,6 @@ WebInspector.ConsoleView.prototype = {
this._prompt.setAddCompletionsFromHistory(this._consoleHistoryAutocompleteSetting.get());
},
/**
* @param {!WebInspector.Event} event
*/
_onMainFrameNavigated: function(event)
{
if (!WebInspector.moduleSetting("preserveConsoleLog").get())
return;
var frame = /** @type {!WebInspector.ResourceTreeFrame} */(event.data);
WebInspector.console.log(WebInspector.UIString("Navigated to %s", frame.url));
},
_initConsoleMessages: function()
{
var mainTarget = WebInspector.targetManager.mainTarget();
......
......@@ -75,18 +75,6 @@
"settingType": "boolean",
"defaultValue": false
},
{
"type": "setting",
"category": "Console",
"title": "Preserve log upon navigation",
"settingName": "preserveConsoleLog",
"settingType": "boolean",
"defaultValue": false,
"options": [
{ "value": true, "title": "Preserve log upon navigation" },
{ "value": false, "title": "Do not preserve log upon navigation" }
]
},
{
"type": "setting",
"category": "Console",
......
......@@ -82,6 +82,9 @@ WebInspector.ConsoleModel.prototype = {
if (msg.source === WebInspector.ConsoleMessage.MessageSource.Worker && msg.target().workerManager && msg.target().workerManager.targetByWorkerId(msg.workerId))
return;
if (msg.source === WebInspector.ConsoleMessage.MessageSource.ConsoleAPI && msg.type === WebInspector.ConsoleMessage.MessageType.Clear)
this.clear();
if (msg.level === WebInspector.ConsoleMessage.MessageLevel.RevokedError && msg._revokedExceptionId) {
var exceptionMessage = this._messageByExceptionId.get(msg._revokedExceptionId);
if (!exceptionMessage)
......@@ -145,10 +148,10 @@ WebInspector.ConsoleModel.prototype = {
requestClearMessages: function()
{
this._consoleAgent.clearMessages();
this._messagesCleared();
this.clear();
},
_messagesCleared: function()
clear: function()
{
this._messages = [];
this._messageByExceptionId.clear();
......@@ -563,8 +566,6 @@ WebInspector.ConsoleDispatcher.prototype = {
*/
messagesCleared: function()
{
if (!WebInspector.moduleSetting("preserveConsoleLog").get())
this._console._messagesCleared();
}
}
......
......@@ -289,8 +289,13 @@ WebInspector.ResourceTreeModel.prototype = {
this._inspectedPageURL = frame.url;
this.dispatchEventToListeners(WebInspector.ResourceTreeModel.EventTypes.FrameNavigated, frame);
if (frame.isMainFrame())
if (frame.isMainFrame()) {
this.dispatchEventToListeners(WebInspector.ResourceTreeModel.EventTypes.MainFrameNavigated, frame);
if (WebInspector.moduleSetting("preserveConsoleLog").get())
WebInspector.console.log(WebInspector.UIString("Navigated to %s", frame.url));
else
this.target().consoleModel.clear();
}
if (addedOrigin)
this._addSecurityOrigin(addedOrigin);
......
......@@ -23,6 +23,18 @@
"settingType": "boolean",
"defaultValue": false
},
{
"type": "setting",
"category": "Console",
"title": "Preserve log upon navigation",
"settingName": "preserveConsoleLog",
"settingType": "boolean",
"defaultValue": false,
"options": [
{ "value": true, "title": "Preserve log upon navigation" },
{ "value": false, "title": "Do not preserve log upon navigation" }
]
},
{
"type": "setting",
"category": "Debugger",
......
......@@ -55,7 +55,6 @@ void V8ConsoleAgentImpl::restore()
{
if (!m_state->booleanProperty(ConsoleAgentState::consoleEnabled, false))
return;
m_frontend.messagesCleared();
ErrorString ignored;
enable(&ignored);
}
......@@ -66,12 +65,6 @@ void V8ConsoleAgentImpl::messageAdded(V8ConsoleMessage* message)
reportMessage(message, true);
}
void V8ConsoleAgentImpl::reset()
{
if (m_enabled)
m_frontend.messagesCleared();
}
bool V8ConsoleAgentImpl::enabled()
{
return m_enabled;
......
......@@ -470,7 +470,6 @@ void V8ConsoleMessageStorage::clear()
m_expiredCount = 0;
V8InspectorSessionImpl* session = m_debugger->sessionForContextGroup(m_contextGroupId);
if (session) {
session->consoleAgent()->reset();
session->releaseObjectGroup("console");
session->client()->consoleCleared();
}
......
......@@ -107,7 +107,6 @@ void V8InspectorSessionImpl::reset()
{
m_debuggerAgent->reset();
m_runtimeAgent->reset();
m_consoleAgent->reset();
discardInjectedScripts();
}
......
......@@ -769,7 +769,8 @@
},
{
"name": "messagesCleared",
"description": "Issued when console is cleared. This happens either upon <code>clearMessages</code> command or after page navigation."
"description": "Not issued.",
"deprecated": true
}
]
},
......
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