Commit 5d764107 authored by luoe's avatar luoe Committed by Commit bot

DevTools: remove unused ConsoleViewMessage.toString()

Some inspector LayoutTests were using ConsoleViewMessage.toString() to check
that a message included a substring. Most of the function logic was not
necessary and some cases could be replaced with the .text getter.

BUG=

Review-Url: https://codereview.chromium.org/2348583004
Cr-Commit-Position: refs/heads/master@{#419910}
parent 2ce4166d
......@@ -32,7 +32,7 @@ function test()
function addMessage(uiMessage)
{
// There will be only one such message.
if (uiMessage.toString().indexOf("non-existent-iframe") !== -1)
if (uiMessage.element().deepTextContent().indexOf("non-existent-iframe") !== -1)
InspectorTest.expandConsoleMessages(onExpandedMessages);
}
......
......@@ -10,7 +10,7 @@ function test()
InspectorTest.evaluateInPage("loadIframe()");
function addMessage(viewMessage)
{
if (viewMessage.toString().indexOf("setTimeout") !== -1)
if (viewMessage.element().deepTextContent().indexOf("setTimeout") !== -1)
InspectorTest.expandConsoleMessages(onExpanded);
}
......
......@@ -21,7 +21,7 @@ function test()
var completeMessageReceived = false;
function messageSniffer(uiMessage)
{
if (uiMessage.toString().indexOf("complete") !== -1) {
if (uiMessage.element().deepTextContent().indexOf("complete") !== -1) {
completeMessageReceived = true;
maybeCompleteTest();
}
......
......@@ -1067,116 +1067,6 @@ WebInspector.ConsoleViewMessage.prototype = {
this._repeatCountElement.textContent = this._repeatCount;
},
/**
* @override
* @return {string}
*/
toString: function()
{
var sourceString;
switch (this._message.source) {
case WebInspector.ConsoleMessage.MessageSource.XML:
sourceString = "XML";
break;
case WebInspector.ConsoleMessage.MessageSource.JS:
sourceString = "JavaScript";
break;
case WebInspector.ConsoleMessage.MessageSource.Network:
sourceString = "Network";
break;
case WebInspector.ConsoleMessage.MessageSource.ConsoleAPI:
sourceString = "ConsoleAPI";
break;
case WebInspector.ConsoleMessage.MessageSource.Storage:
sourceString = "Storage";
break;
case WebInspector.ConsoleMessage.MessageSource.AppCache:
sourceString = "AppCache";
break;
case WebInspector.ConsoleMessage.MessageSource.Rendering:
sourceString = "Rendering";
break;
case WebInspector.ConsoleMessage.MessageSource.CSS:
sourceString = "CSS";
break;
case WebInspector.ConsoleMessage.MessageSource.Security:
sourceString = "Security";
break;
case WebInspector.ConsoleMessage.MessageSource.Other:
sourceString = "Other";
break;
}
var typeString;
switch (this._message.type) {
case WebInspector.ConsoleMessage.MessageType.Log:
typeString = "Log";
break;
case WebInspector.ConsoleMessage.MessageType.Debug:
typeString = "Debug";
break;
case WebInspector.ConsoleMessage.MessageType.Info:
typeString = "Info";
break;
case WebInspector.ConsoleMessage.MessageType.Error:
typeString = "Error";
break;
case WebInspector.ConsoleMessage.MessageType.Warning:
typeString = "Warning";
break;
case WebInspector.ConsoleMessage.MessageType.Dir:
typeString = "Dir";
break;
case WebInspector.ConsoleMessage.MessageType.DirXML:
typeString = "Dir XML";
break;
case WebInspector.ConsoleMessage.MessageType.Trace:
typeString = "Trace";
break;
case WebInspector.ConsoleMessage.MessageType.StartGroupCollapsed:
case WebInspector.ConsoleMessage.MessageType.StartGroup:
typeString = "Start Group";
break;
case WebInspector.ConsoleMessage.MessageType.EndGroup:
typeString = "End Group";
break;
case WebInspector.ConsoleMessage.MessageType.Assert:
typeString = "Assert";
break;
case WebInspector.ConsoleMessage.MessageType.Result:
typeString = "Result";
break;
case WebInspector.ConsoleMessage.MessageType.Profile:
case WebInspector.ConsoleMessage.MessageType.ProfileEnd:
typeString = "Profiling";
break;
}
var levelString;
switch (this._message.level) {
case WebInspector.ConsoleMessage.MessageLevel.Log:
levelString = "Log";
break;
case WebInspector.ConsoleMessage.MessageLevel.Warning:
levelString = "Warning";
break;
case WebInspector.ConsoleMessage.MessageLevel.Debug:
levelString = "Debug";
break;
case WebInspector.ConsoleMessage.MessageLevel.Error:
levelString = "Error";
break;
case WebInspector.ConsoleMessage.MessageLevel.RevokedError:
levelString = "RevokedError";
break;
case WebInspector.ConsoleMessage.MessageLevel.Info:
levelString = "Info";
break;
}
return sourceString + " " + typeString + " " + levelString + ": " + this.formattedMessage().textContent + "\n" + this._message.url + " line " + this._message.line;
},
get text()
{
return this._message.messageText;
......
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