Diff
Modified: trunk/Source/WebCore/ChangeLog (136447 => 136448)
--- trunk/Source/WebCore/ChangeLog 2012-12-03 23:42:49 UTC (rev 136447)
+++ trunk/Source/WebCore/ChangeLog 2012-12-03 23:43:27 UTC (rev 136448)
@@ -1,3 +1,29 @@
+2012-11-30 Andrey Kosyakov <[email protected]>
+
+ Web Inspector: make it possible to fliter out messages from console.{time,timeEnd}()
+ https://bugs.webkit.org/show_bug.cgi?id=103781
+
+ Reviewed by Yury Semikhatsky.
+
+ - make console messages produced by console.timeEnd() TimingMessageType & DebugMessageLevel;
+ - add console filter for Debug messages;
+
+ * inspector/ConsoleMessage.cpp:
+ (WebCore::messageTypeValue):
+ * inspector/Inspector.json:
+ * inspector/InspectorConsoleAgent.cpp:
+ (WebCore::InspectorConsoleAgent::stopTiming):
+ * inspector/front-end/ConsoleMessage.js:
+ (WebInspector.ConsoleMessageImpl.prototype.toMessageElement):
+ * inspector/front-end/ConsoleView.js:
+ (WebInspector.ConsoleView.prototype.):
+ (WebInspector.ConsoleView.prototype.filter):
+ * inspector/front-end/inspector.css:
+ (.console-warning-level, .console-error-level, .console-log-level, .console-debug-level):
+ (.filter-all .console-debug-level, .filter-debug .console-debug-level):
+ (.filter-all .console-debug-level.repeated-message, .filter-debug .console-debug-level.repeated-message):
+ * page/ConsoleTypes.h:
+
2012-12-03 Sheriff Bot <[email protected]>
Unreviewed, rolling out r136444.
Modified: trunk/Source/WebCore/inspector/ConsoleMessage.cpp (136447 => 136448)
--- trunk/Source/WebCore/inspector/ConsoleMessage.cpp 2012-12-03 23:42:49 UTC (rev 136447)
+++ trunk/Source/WebCore/inspector/ConsoleMessage.cpp 2012-12-03 23:43:27 UTC (rev 136448)
@@ -107,6 +107,7 @@
case StartGroupCollapsedMessageType: return TypeBuilder::Console::ConsoleMessage::Type::StartGroupCollapsed;
case EndGroupMessageType: return TypeBuilder::Console::ConsoleMessage::Type::EndGroup;
case AssertMessageType: return TypeBuilder::Console::ConsoleMessage::Type::Assert;
+ case TimingMessageType: return TypeBuilder::Console::ConsoleMessage::Type::Timing;
}
return TypeBuilder::Console::ConsoleMessage::Type::Log;
}
Modified: trunk/Source/WebCore/inspector/Inspector.json (136447 => 136448)
--- trunk/Source/WebCore/inspector/Inspector.json 2012-12-03 23:42:49 UTC (rev 136447)
+++ trunk/Source/WebCore/inspector/Inspector.json 2012-12-03 23:43:27 UTC (rev 136448)
@@ -675,7 +675,7 @@
{ "name": "source", "type": "string", "enum": ["html", "wml", "xml", "_javascript_", "network", "console-api", "other"], "description": "Message source." },
{ "name": "level", "type": "string", "enum": ["tip", "log", "warning", "error", "debug"], "description": "Message severity." },
{ "name": "text", "type": "string", "description": "Message text." },
- { "name": "type", "type": "string", "optional": true, "enum": ["log", "dir", "dirxml", "trace", "clear", "startGroup", "startGroupCollapsed", "endGroup", "assert"], "description": "Console message type." },
+ { "name": "type", "type": "string", "optional": true, "enum": ["log", "dir", "dirxml", "trace", "clear", "startGroup", "startGroupCollapsed", "endGroup", "assert", "timing"], "description": "Console message type." },
{ "name": "url", "type": "string", "optional": true, "description": "URL of the message origin." },
{ "name": "line", "type": "integer", "optional": true, "description": "Line number in the resource that generated this message." },
{ "name": "repeatCount", "type": "integer", "optional": true, "description": "Repeat count for repeated messages." },
Modified: trunk/Source/WebCore/inspector/InspectorConsoleAgent.cpp (136447 => 136448)
--- trunk/Source/WebCore/inspector/InspectorConsoleAgent.cpp 2012-12-03 23:42:49 UTC (rev 136447)
+++ trunk/Source/WebCore/inspector/InspectorConsoleAgent.cpp 2012-12-03 23:43:27 UTC (rev 136448)
@@ -227,7 +227,7 @@
double elapsed = monotonicallyIncreasingTime() - startTime;
String message = title + String::format(": %.3fms", elapsed * 1000);
const ScriptCallFrame& lastCaller = callStack->at(0);
- addMessageToConsole(JSMessageSource, LogMessageType, LogMessageLevel, message, lastCaller.sourceURL(), lastCaller.lineNumber());
+ addMessageToConsole(JSMessageSource, TimingMessageType, DebugMessageLevel, message, lastCaller.sourceURL(), lastCaller.lineNumber());
}
void InspectorConsoleAgent::count(ScriptState* state, PassRefPtr<ScriptArguments> arguments)
Modified: trunk/Source/WebCore/inspector/front-end/ConsoleMessage.js (136447 => 136448)
--- trunk/Source/WebCore/inspector/front-end/ConsoleMessage.js 2012-12-03 23:42:49 UTC (rev 136447)
+++ trunk/Source/WebCore/inspector/front-end/ConsoleMessage.js 2012-12-03 23:43:27 UTC (rev 136448)
@@ -610,21 +610,21 @@
this._element = element;
switch (this.level) {
- case WebInspector.ConsoleMessage.MessageLevel.Tip:
- element.addStyleClass("console-tip-level");
- break;
- case WebInspector.ConsoleMessage.MessageLevel.Log:
- element.addStyleClass("console-log-level");
- break;
- case WebInspector.ConsoleMessage.MessageLevel.Debug:
- element.addStyleClass("console-debug-level");
- break;
- case WebInspector.ConsoleMessage.MessageLevel.Warning:
- element.addStyleClass("console-warning-level");
- break;
- case WebInspector.ConsoleMessage.MessageLevel.Error:
- element.addStyleClass("console-error-level");
- break;
+ case WebInspector.ConsoleMessage.MessageLevel.Tip:
+ element.addStyleClass("console-tip-level");
+ break;
+ case WebInspector.ConsoleMessage.MessageLevel.Log:
+ element.addStyleClass("console-log-level");
+ break;
+ case WebInspector.ConsoleMessage.MessageLevel.Debug:
+ element.addStyleClass("console-debug-level");
+ break;
+ case WebInspector.ConsoleMessage.MessageLevel.Warning:
+ element.addStyleClass("console-warning-level");
+ break;
+ case WebInspector.ConsoleMessage.MessageLevel.Error:
+ element.addStyleClass("console-error-level");
+ break;
}
if (this.type === WebInspector.ConsoleMessage.MessageType.StartGroup || this.type === WebInspector.ConsoleMessage.MessageType.StartGroupCollapsed)
Modified: trunk/Source/WebCore/inspector/front-end/ConsoleView.js (136447 => 136448)
--- trunk/Source/WebCore/inspector/front-end/ConsoleView.js 2012-12-03 23:42:49 UTC (rev 136447)
+++ trunk/Source/WebCore/inspector/front-end/ConsoleView.js 2012-12-03 23:43:27 UTC (rev 136448)
@@ -98,6 +98,7 @@
this.errorElement = createFilterElement.call(this, "errors", WebInspector.UIString("Errors"));
this.warningElement = createFilterElement.call(this, "warnings", WebInspector.UIString("Warnings"));
this.logElement = createFilterElement.call(this, "logs", WebInspector.UIString("Logs"));
+ this.debugElement = createFilterElement.call(this, "debug", WebInspector.UIString("Debug"));
this.filter(this.allElement, false);
this._registerShortcuts();
@@ -266,11 +267,9 @@
this.errorElement.removeStyleClass("selected");
this.warningElement.removeStyleClass("selected");
this.logElement.removeStyleClass("selected");
+ this.debugElement.removeStyleClass("selected");
- this.messagesElement.removeStyleClass("filter-all");
- this.messagesElement.removeStyleClass("filter-errors");
- this.messagesElement.removeStyleClass("filter-warnings");
- this.messagesElement.removeStyleClass("filter-logs");
+ this.messagesElement.classList.remove("filter-all", "filter-errors", "filter-warnings", "filter-logs", "filter-debug");
}
var targetFilterClass = "filter-" + target.category;
Modified: trunk/Source/WebCore/inspector/front-end/inspector.css (136447 => 136448)
--- trunk/Source/WebCore/inspector/front-end/inspector.css 2012-12-03 23:42:49 UTC (rev 136447)
+++ trunk/Source/WebCore/inspector/front-end/inspector.css 2012-12-03 23:43:27 UTC (rev 136448)
@@ -2005,19 +2005,21 @@
-webkit-box-shadow: 0 1px 1px rgba(0, 0, 0, 0.5) inset, 0 -1px 1px rgba(255, 255, 255, 0.25) inset, 0 1px 0 rgba(255, 255, 255, 0.5);
}
-.console-warning-level, .console-error-level, .console-log-level {
+.console-warning-level, .console-error-level, .console-log-level, .console-debug-level {
display: none;
}
.filter-all .console-warning-level, .filter-warnings .console-warning-level,
.filter-all .console-error-level, .filter-errors .console-error-level,
-.filter-all .console-log-level, .filter-logs .console-log-level {
+.filter-all .console-log-level, .filter-logs .console-log-level,
+.filter-all .console-debug-level, .filter-debug .console-debug-level {
display: block;
}
.filter-all .console-warning-level.repeated-message, .filter-warnings .console-warning-level.repeated-message,
.filter-all .console-error-level.repeated-message, .filter-errors .console-error-level.repeated-message,
-.filter-all .console-log-level.repeated-message, .filter-logs .console-log-level.repeated-message {
+.filter-all .console-log-level.repeated-message, .filter-logs .console-log-level.repeated-message,
+.filter-all .console-debug-level.repeated-message, .filter-debug .console-debug-level.repeated-message {
display: -webkit-flex;
}
Modified: trunk/Source/WebCore/page/ConsoleTypes.h (136447 => 136448)
--- trunk/Source/WebCore/page/ConsoleTypes.h 2012-12-03 23:42:49 UTC (rev 136447)
+++ trunk/Source/WebCore/page/ConsoleTypes.h 2012-12-03 23:43:27 UTC (rev 136448)
@@ -48,7 +48,8 @@
StartGroupCollapsedMessageType,
EndGroupMessageType,
ClearMessageType,
- AssertMessageType
+ AssertMessageType,
+ TimingMessageType
};
enum MessageLevel {