<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[183659] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/183659">183659</a></dd>
<dt>Author</dt> <dd>jond@apple.com</dd>
<dt>Date</dt> <dd>2015-04-30 18:10:43 -0700 (Thu, 30 Apr 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: console should show an icon for console.info() messages
https://bugs.webkit.org/show_bug.cgi?id=18530
Reviewed by Timothy Hatcher.
Source/JavaScriptCore:
* inspector/ConsoleMessage.cpp:
(Inspector::messageLevelValue):
* inspector/protocol/Console.json:
* runtime/ConsoleClient.cpp:
(JSC::appendMessagePrefix):
* runtime/ConsolePrototype.cpp:
(JSC::ConsolePrototype::finishCreation):
(JSC::consoleProtoFuncInfo):
* runtime/ConsoleTypes.h:
Source/WebInspectorUI:
Added icons for console.log, console.info and console.debug messages.
Separated console.info from console.log.
* UserInterface/Images/Debug.svg: Added.
* UserInterface/Images/Info.svg: Added.
* UserInterface/Images/Log.svg: Added.
New icon files.
* UserInterface/Models/ConsoleMessage.js:
* UserInterface/Views/ConsoleMessageView.css:
(.console-log-level::before):
(.console-info-level::before):
(.console-debug-level::before):
(:matches(.console-warning-level, .console-error-level, .console-log-level, .console-info-level, .console-debug-level).console-message):
(:matches(.console-warning-level, .console-error-level, .console-log-level, .console-info-level, .console-debug-level)::before):
(:matches(.console-warning-level, .console-error-level, .console-log-level).console-message): Deleted.
(:matches(.console-warning-level, .console-error-level, .console-log-level)::before): Deleted.
Include console.info messages in layout adjustments.
* UserInterface/Views/ConsoleMessageView.js:
(WebInspector.ConsoleMessageView):
(WebInspector.ConsoleMessageView.prototype._levelString):
Source/WebKit/mac:
* WebCoreSupport/WebChromeClient.mm:
(stringForMessageLevel):
* WebView/WebUIDelegatePrivate.h:
LayoutTests:
* inspector/console/console-api-expected.txt:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsinspectorconsoleconsoleapiexpectedtxt">trunk/LayoutTests/inspector/console/console-api-expected.txt</a></li>
<li><a href="#trunkLayoutTestsinspectorprotocolconsoleconsolemessageexpectedtxt">trunk/LayoutTests/inspector-protocol/console/console-message-expected.txt</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorConsoleMessagecpp">trunk/Source/JavaScriptCore/inspector/ConsoleMessage.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorprotocolConsolejson">trunk/Source/JavaScriptCore/inspector/protocol/Console.json</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeConsoleClientcpp">trunk/Source/JavaScriptCore/runtime/ConsoleClient.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeConsolePrototypecpp">trunk/Source/JavaScriptCore/runtime/ConsolePrototype.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeConsoleTypesh">trunk/Source/JavaScriptCore/runtime/ConsoleTypes.h</a></li>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUILocalizationsenlprojlocalizedStringsjs">trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceModelsConsoleMessagejs">trunk/Source/WebInspectorUI/UserInterface/Models/ConsoleMessage.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsConsoleMessageViewcss">trunk/Source/WebInspectorUI/UserInterface/Views/ConsoleMessageView.css</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsConsoleMessageViewjs">trunk/Source/WebInspectorUI/UserInterface/Views/ConsoleMessageView.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsLogContentViewjs">trunk/Source/WebInspectorUI/UserInterface/Views/LogContentView.js</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacWebCoreSupportWebChromeClientmm">trunk/Source/WebKit/mac/WebCoreSupport/WebChromeClient.mm</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebUIDelegatePrivateh">trunk/Source/WebKit/mac/WebView/WebUIDelegatePrivate.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceImagesDebugsvg">trunk/Source/WebInspectorUI/UserInterface/Images/Debug.svg</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceImagesInfosvg">trunk/Source/WebInspectorUI/UserInterface/Images/Info.svg</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceImagesLogsvg">trunk/Source/WebInspectorUI/UserInterface/Images/Log.svg</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (183658 => 183659)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-05-01 01:04:52 UTC (rev 183658)
+++ trunk/LayoutTests/ChangeLog 2015-05-01 01:10:43 UTC (rev 183659)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2015-04-30 Jon Davis <jond@apple.com>
+
+ Web Inspector: console should show an icon for console.info() messages
+ https://bugs.webkit.org/show_bug.cgi?id=18530
+
+ Reviewed by Timothy Hatcher.
+
+ * inspector/console/console-api-expected.txt:
+
</ins><span class="cx"> 2015-04-30 Dean Jackson <dino@apple.com>
</span><span class="cx">
</span><span class="cx"> -apple-system-font-monospaced-numbers doesn't work on iOS
</span></span></pre></div>
<a id="trunkLayoutTestsinspectorconsoleconsoleapiexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/inspector/console/console-api-expected.txt (183658 => 183659)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/console/console-api-expected.txt 2015-05-01 01:04:52 UTC (rev 183658)
+++ trunk/LayoutTests/inspector/console/console-api-expected.txt 2015-05-01 01:10:43 UTC (rev 183659)
</span><span class="lines">@@ -108,7 +108,7 @@
</span><span class="cx"> STEP: console.info('console.info')
</span><span class="cx"> {
</span><span class="cx"> "_source": "console-api",
</span><del>- "_level": "log",
</del><ins>+ "_level": "info",
</ins><span class="cx"> "_messageText": "console.info",
</span><span class="cx"> "_type": "log",
</span><span class="cx"> "_url": null,
</span><span class="lines">@@ -382,7 +382,7 @@
</span><span class="cx"> STEP: console.info('message', object)
</span><span class="cx"> {
</span><span class="cx"> "_source": "console-api",
</span><del>- "_level": "log",
</del><ins>+ "_level": "info",
</ins><span class="cx"> "_messageText": "message",
</span><span class="cx"> "_type": "log",
</span><span class="cx"> "_url": null,
</span></span></pre></div>
<a id="trunkLayoutTestsinspectorprotocolconsoleconsolemessageexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/inspector-protocol/console/console-message-expected.txt (183658 => 183659)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector-protocol/console/console-message-expected.txt 2015-05-01 01:04:52 UTC (rev 183658)
+++ trunk/LayoutTests/inspector-protocol/console/console-message-expected.txt 2015-05-01 01:10:43 UTC (rev 183659)
</span><span class="lines">@@ -5,7 +5,7 @@
</span><span class="cx"> CONSOLE MESSAGE: line 11: debug
</span><span class="cx"> Tests that console log messages make it to the frontend and have expected source, type, and levels.
</span><span class="cx"> {"source":"console-api","level":"log","text":"log","location":"console-message.html:7:16","parameters":[{"type":"string"}]}
</span><del>-{"source":"console-api","level":"log","text":"info","location":"console-message.html:8:17","parameters":[{"type":"string"}]}
</del><ins>+{"source":"console-api","level":"info","text":"info","location":"console-message.html:8:17","parameters":[{"type":"string"}]}
</ins><span class="cx"> {"source":"console-api","level":"warning","text":"warn","location":"console-message.html:9:17","parameters":[{"type":"string"}]}
</span><span class="cx"> {"source":"console-api","level":"error","text":"error","location":"console-message.html:10:18","parameters":[{"type":"string"}]}
</span><span class="cx"> {"source":"console-api","level":"debug","text":"debug","location":"console-message.html:11:18","parameters":[{"type":"string"}]}
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (183658 => 183659)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2015-05-01 01:04:52 UTC (rev 183658)
+++ trunk/Source/JavaScriptCore/ChangeLog 2015-05-01 01:10:43 UTC (rev 183659)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2015-04-30 Jon Davis <jond@apple.com>
+
+ Web Inspector: console should show an icon for console.info() messages
+ https://bugs.webkit.org/show_bug.cgi?id=18530
+
+ Reviewed by Timothy Hatcher.
+
+ * inspector/ConsoleMessage.cpp:
+ (Inspector::messageLevelValue):
+ * inspector/protocol/Console.json:
+ * runtime/ConsoleClient.cpp:
+ (JSC::appendMessagePrefix):
+ * runtime/ConsolePrototype.cpp:
+ (JSC::ConsolePrototype::finishCreation):
+ (JSC::consoleProtoFuncInfo):
+ * runtime/ConsoleTypes.h:
+
</ins><span class="cx"> 2015-04-30 Filip Pizlo <fpizlo@apple.com>
</span><span class="cx">
</span><span class="cx"> Move all of the branchIs<type> helpers from SpeculativeJIT into AssemblyHelpers
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorConsoleMessagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/ConsoleMessage.cpp (183658 => 183659)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/ConsoleMessage.cpp 2015-05-01 01:04:52 UTC (rev 183658)
+++ trunk/Source/JavaScriptCore/inspector/ConsoleMessage.cpp 2015-05-01 01:10:43 UTC (rev 183659)
</span><span class="lines">@@ -170,6 +170,7 @@
</span><span class="cx"> {
</span><span class="cx"> switch (level) {
</span><span class="cx"> case MessageLevel::Log: return Inspector::Protocol::Console::ConsoleMessage::Level::Log;
</span><ins>+ case MessageLevel::Info: return Inspector::Protocol::Console::ConsoleMessage::Level::Info;
</ins><span class="cx"> case MessageLevel::Warning: return Inspector::Protocol::Console::ConsoleMessage::Level::Warning;
</span><span class="cx"> case MessageLevel::Error: return Inspector::Protocol::Console::ConsoleMessage::Level::Error;
</span><span class="cx"> case MessageLevel::Debug: return Inspector::Protocol::Console::ConsoleMessage::Level::Debug;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorprotocolConsolejson"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/protocol/Console.json (183658 => 183659)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/protocol/Console.json 2015-05-01 01:04:52 UTC (rev 183658)
+++ trunk/Source/JavaScriptCore/inspector/protocol/Console.json 2015-05-01 01:10:43 UTC (rev 183659)
</span><span class="lines">@@ -8,7 +8,7 @@
</span><span class="cx"> "description": "Console message.",
</span><span class="cx"> "properties": [
</span><span class="cx"> { "name": "source", "type": "string", "enum": ["xml", "javascript", "network", "console-api", "storage", "appcache", "rendering", "css", "security", "other"], "description": "Message source." },
</span><del>- { "name": "level", "type": "string", "enum": ["log", "warning", "error", "debug"], "description": "Message severity." },
</del><ins>+ { "name": "level", "type": "string", "enum": ["log", "info", "warning", "error", "debug"], "description": "Message severity." },
</ins><span class="cx"> { "name": "text", "type": "string", "description": "Message text." },
</span><span class="cx"> { "name": "type", "type": "string", "optional": true, "enum": ["log", "dir", "dirxml", "table", "trace", "clear", "startGroup", "startGroupCollapsed", "endGroup", "assert", "timing", "profile", "profileEnd"], "description": "Console message type." },
</span><span class="cx"> { "name": "url", "type": "string", "optional": true, "description": "URL of the message origin." },
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeConsoleClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/ConsoleClient.cpp (183658 => 183659)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/ConsoleClient.cpp 2015-05-01 01:04:52 UTC (rev 183658)
+++ trunk/Source/JavaScriptCore/runtime/ConsoleClient.cpp 2015-05-01 01:10:43 UTC (rev 183659)
</span><span class="lines">@@ -105,6 +105,9 @@
</span><span class="cx"> case MessageLevel::Log:
</span><span class="cx"> levelString = "LOG";
</span><span class="cx"> break;
</span><ins>+ case MessageLevel::Info:
+ levelString = "INFO";
+ break;
</ins><span class="cx"> case MessageLevel::Warning:
</span><span class="cx"> levelString = "WARN";
</span><span class="cx"> break;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeConsolePrototypecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/ConsolePrototype.cpp (183658 => 183659)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/ConsolePrototype.cpp 2015-05-01 01:04:52 UTC (rev 183658)
+++ trunk/Source/JavaScriptCore/runtime/ConsolePrototype.cpp 2015-05-01 01:10:43 UTC (rev 183659)
</span><span class="lines">@@ -41,6 +41,7 @@
</span><span class="cx"> static EncodedJSValue JSC_HOST_CALL consoleProtoFuncDebug(ExecState*);
</span><span class="cx"> static EncodedJSValue JSC_HOST_CALL consoleProtoFuncError(ExecState*);
</span><span class="cx"> static EncodedJSValue JSC_HOST_CALL consoleProtoFuncLog(ExecState*);
</span><ins>+static EncodedJSValue JSC_HOST_CALL consoleProtoFuncInfo(ExecState*);
</ins><span class="cx"> static EncodedJSValue JSC_HOST_CALL consoleProtoFuncWarn(ExecState*);
</span><span class="cx"> static EncodedJSValue JSC_HOST_CALL consoleProtoFuncClear(ExecState*);
</span><span class="cx"> static EncodedJSValue JSC_HOST_CALL consoleProtoFuncDir(ExecState*);
</span><span class="lines">@@ -70,7 +71,7 @@
</span><span class="cx"> JSC_NATIVE_FUNCTION("debug", consoleProtoFuncDebug, None, 0);
</span><span class="cx"> JSC_NATIVE_FUNCTION("error", consoleProtoFuncError, None, 0);
</span><span class="cx"> JSC_NATIVE_FUNCTION("log", consoleProtoFuncLog, None, 0);
</span><del>- JSC_NATIVE_FUNCTION("info", consoleProtoFuncLog, None, 0); // "info" is an alias of "log".
</del><ins>+ JSC_NATIVE_FUNCTION("info", consoleProtoFuncInfo, None, 0);
</ins><span class="cx"> JSC_NATIVE_FUNCTION("warn", consoleProtoFuncWarn, None, 0);
</span><span class="cx">
</span><span class="cx"> JSC_NATIVE_FUNCTION("clear", consoleProtoFuncClear, None, 0);
</span><span class="lines">@@ -127,6 +128,11 @@
</span><span class="cx"> return consoleLogWithLevel(exec, MessageLevel::Log);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static EncodedJSValue JSC_HOST_CALL consoleProtoFuncInfo(ExecState* exec)
+{
+ return consoleLogWithLevel(exec, MessageLevel::Info);
+}
+
</ins><span class="cx"> static EncodedJSValue JSC_HOST_CALL consoleProtoFuncWarn(ExecState* exec)
</span><span class="cx"> {
</span><span class="cx"> return consoleLogWithLevel(exec, MessageLevel::Warning);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeConsoleTypesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/ConsoleTypes.h (183658 => 183659)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/ConsoleTypes.h 2015-05-01 01:04:52 UTC (rev 183658)
+++ trunk/Source/JavaScriptCore/runtime/ConsoleTypes.h 2015-05-01 01:10:43 UTC (rev 183659)
</span><span class="lines">@@ -62,6 +62,7 @@
</span><span class="cx"> Warning = 2,
</span><span class="cx"> Error = 3,
</span><span class="cx"> Debug = 4,
</span><ins>+ Info = 5,
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace JSC
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (183658 => 183659)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2015-05-01 01:04:52 UTC (rev 183658)
+++ trunk/Source/WebInspectorUI/ChangeLog 2015-05-01 01:10:43 UTC (rev 183659)
</span><span class="lines">@@ -1,3 +1,34 @@
</span><ins>+2015-04-30 Jon Davis <jond@apple.com>
+
+ Web Inspector: console should show an icon for console.info() messages
+ https://bugs.webkit.org/show_bug.cgi?id=18530
+
+ Reviewed by Timothy Hatcher.
+
+ Added icons for console.log, console.info and console.debug messages.
+
+ Separated console.info from console.log.
+
+ * UserInterface/Images/Debug.svg: Added.
+ * UserInterface/Images/Info.svg: Added.
+ * UserInterface/Images/Log.svg: Added.
+ New icon files.
+
+ * UserInterface/Models/ConsoleMessage.js:
+ * UserInterface/Views/ConsoleMessageView.css:
+ (.console-log-level::before):
+ (.console-info-level::before):
+ (.console-debug-level::before):
+ (:matches(.console-warning-level, .console-error-level, .console-log-level, .console-info-level, .console-debug-level).console-message):
+ (:matches(.console-warning-level, .console-error-level, .console-log-level, .console-info-level, .console-debug-level)::before):
+ (:matches(.console-warning-level, .console-error-level, .console-log-level).console-message): Deleted.
+ (:matches(.console-warning-level, .console-error-level, .console-log-level)::before): Deleted.
+ Include console.info messages in layout adjustments.
+
+ * UserInterface/Views/ConsoleMessageView.js:
+ (WebInspector.ConsoleMessageView):
+ (WebInspector.ConsoleMessageView.prototype._levelString):
+
</ins><span class="cx"> 2015-04-30 Timothy Hatcher <timothy@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: Scope Chain sidebar should be selected immediately when paused
</span></span></pre></div>
<a id="trunkSourceWebInspectorUILocalizationsenlprojlocalizedStringsjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js (183658 => 183659)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js 2015-05-01 01:04:52 UTC (rev 183658)
+++ trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js 2015-05-01 01:10:43 UTC (rev 183659)
</span><span class="lines">@@ -267,6 +267,7 @@
</span><span class="cx"> localizedStrings["Index"] = "Index";
</span><span class="cx"> localizedStrings["Index Key \u2014 %s"] = "Index Key \u2014 %s";
</span><span class="cx"> localizedStrings["Indexed Databases"] = "Indexed Databases";
</span><ins>+localizedStrings["Info: "] = "Info: ";
</ins><span class="cx"> localizedStrings["Inherited From: "] = "Inherited From: ";
</span><span class="cx"> localizedStrings["Initiator"] = "Initiator";
</span><span class="cx"> localizedStrings["Input: "] = "Input: ";
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceImagesDebugsvg"></a>
<div class="addfile"><h4>Added: trunk/Source/WebInspectorUI/UserInterface/Images/Debug.svg (0 => 183659)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Images/Debug.svg (rev 0)
+++ trunk/Source/WebInspectorUI/UserInterface/Images/Debug.svg 2015-05-01 01:10:43 UTC (rev 183659)
</span><span class="lines">@@ -0,0 +1,5 @@
</span><ins>+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright © 2015 Apple Inc. All rights reserved. -->
+<svg viewBox="0 0 10 10" version="1.1" xmlns="http://www.w3.org/2000/svg">
+ <path d="M 0 1.997 C 0 1.446 0.446 1 0.996 1 L 5.693 1 C 5.973 1 6.352 1.152 6.555 1.355 L 9.845 4.645 C 10.041 4.841 10.048 5.152 9.845 5.355 L 6.555 8.645 C 6.359 8.841 5.979 9 5.693 9 L 0.996 9 C 0.446 9 0 8.547 0 8.003 L 0 1.997 Z" class="filled" fill="rgb(123, 178, 238)"/>
+</svg>
</ins></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceImagesInfosvg"></a>
<div class="addfile"><h4>Added: trunk/Source/WebInspectorUI/UserInterface/Images/Info.svg (0 => 183659)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Images/Info.svg (rev 0)
+++ trunk/Source/WebInspectorUI/UserInterface/Images/Info.svg 2015-05-01 01:10:43 UTC (rev 183659)
</span><span class="lines">@@ -0,0 +1,6 @@
</span><ins>+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright © 2015 Apple Inc. All rights reserved. -->
+<svg viewBox="0 0 10 10" version="1.1" xmlns="http://www.w3.org/2000/svg">
+ <circle cx="5" cy="5" r="5" fill="rgb(11, 36, 251)"/>
+ <path d="M 4.998 2.998 C 5.552 2.998 5.997 2.549 5.997 1.998 C 5.997 1.448 5.552 0.999 4.998 0.999 C 4.448 0.999 3.999 1.448 3.999 1.998 C 3.999 2.549 4.448 2.998 4.998 2.998 L 4.998 2.998 L 4.998 2.998 Z M 3.999 7.994 C 3.999 8.544 4.448 8.993 4.998 8.993 C 5.552 8.993 5.997 8.544 5.997 7.994 L 5.997 4.996 C 5.997 4.446 5.552 3.997 4.998 3.997 C 4.448 3.997 3.999 4.446 3.999 4.996 L 3.999 7.994 L 3.999 7.994 Z" class="filled" fill="white"/>
+</svg>
</ins></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceImagesLogsvg"></a>
<div class="addfile"><h4>Added: trunk/Source/WebInspectorUI/UserInterface/Images/Log.svg (0 => 183659)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Images/Log.svg (rev 0)
+++ trunk/Source/WebInspectorUI/UserInterface/Images/Log.svg 2015-05-01 01:10:43 UTC (rev 183659)
</span><span class="lines">@@ -0,0 +1,5 @@
</span><ins>+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright © 2015 Apple Inc. All rights reserved. -->
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 10 10" version="1.1">
+ <path d="M 3.998 6.998 L 3.998 2.001 C 3.998 1.451 3.553 1.002 2.999 1.002 C 2.449 1.002 2 1.451 2 2.001 L 2 7.997 C 2 8.272 2.112 8.522 2.293 8.703 C 2.474 8.885 2.724 8.996 2.999 8.996 L 7.009 8.996 C 7.559 8.996 8.008 8.551 8.008 7.997 C 8.008 7.447 7.559 6.998 7.009 6.998 L 3.998 6.998 L 3.998 6.998 Z M 5 5 C 5 5.554 5.449 5.999 5.999 5.999 L 7.005 5.999 C 7.555 5.999 8.004 5.554 8.004 5 C 8.004 4.45 7.555 4.001 7.005 4.001 L 5.999 4.001 C 5.449 4.001 5 4.45 5 5 Z M 5 2.001 C 5 2.555 5.449 3 5.999 3 L 7.005 3 C 7.555 3 8.004 2.555 8.004 2.001 C 8.004 1.451 7.555 1.002 7.005 1.002 L 5.999 1.002 C 5.449 1.002 5 1.451 5 2.001 Z" class="filled" fill="rgb(181, 181, 181)"/>
+</svg>
</ins></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceModelsConsoleMessagejs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Models/ConsoleMessage.js (183658 => 183659)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Models/ConsoleMessage.js 2015-05-01 01:04:52 UTC (rev 183658)
+++ trunk/Source/WebInspectorUI/UserInterface/Models/ConsoleMessage.js 2015-05-01 01:10:43 UTC (rev 183659)
</span><span class="lines">@@ -138,6 +138,7 @@
</span><span class="cx">
</span><span class="cx"> WebInspector.ConsoleMessage.MessageLevel = {
</span><span class="cx"> Log: "log",
</span><ins>+ Info: "info",
</ins><span class="cx"> Warning: "warning",
</span><span class="cx"> Error: "error",
</span><span class="cx"> Debug: "debug",
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsConsoleMessageViewcss"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/ConsoleMessageView.css (183658 => 183659)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/ConsoleMessageView.css 2015-05-01 01:04:52 UTC (rev 183658)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/ConsoleMessageView.css 2015-05-01 01:10:43 UTC (rev 183659)
</span><span class="lines">@@ -163,6 +163,18 @@
</span><span class="cx"> padding-right: 0;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+.console-log-level::before {
+ content: url(../Images/Log.svg);
+}
+
+.console-info-level::before {
+ content: url(../Images/Info.svg);
+}
+
+.console-debug-level::before {
+ content: url(../Images/Debug.svg);
+}
+
</ins><span class="cx"> .console-error-level::before {
</span><span class="cx"> content: url(../Images/Error.svg);
</span><span class="cx"> }
</span><span class="lines">@@ -175,16 +187,12 @@
</span><span class="cx"> content: url(../Images/UserInputPromptPrevious.svg);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.console-debug-level::before {
- background-color: blue;
-}
-
-:matches(.console-warning-level, .console-error-level, .console-log-level).console-message {
</del><ins>+:matches(.console-warning-level, .console-error-level, .console-log-level, .console-info-level, .console-debug-level).console-message {
</ins><span class="cx"> /* Move non-monospace log/warning/error text up a bit. */
</span><span class="cx"> padding: 3px 12px 3px 20px;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-:matches(.console-warning-level, .console-error-level, .console-log-level)::before {
</del><ins>+:matches(.console-warning-level, .console-error-level, .console-log-level, .console-info-level, .console-debug-level)::before {
</ins><span class="cx"> /* Re-center log/warning/error icons. */
</span><span class="cx"> padding-top: 1px;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsConsoleMessageViewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/ConsoleMessageView.js (183658 => 183659)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/ConsoleMessageView.js 2015-05-01 01:04:52 UTC (rev 183658)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/ConsoleMessageView.js 2015-05-01 01:10:43 UTC (rev 183659)
</span><span class="lines">@@ -50,6 +50,10 @@
</span><span class="cx"> this._element.classList.add("console-log-level");
</span><span class="cx"> this._element.setAttribute("data-labelprefix", WebInspector.UIString("Log: "));
</span><span class="cx"> break;
</span><ins>+ case WebInspector.ConsoleMessage.MessageLevel.Info:
+ this._element.classList.add("console-info-level");
+ this._element.setAttribute("data-labelprefix", WebInspector.UIString("Info: "));
+ break;
</ins><span class="cx"> case WebInspector.ConsoleMessage.MessageLevel.Debug:
</span><span class="cx"> this._element.classList.add("console-debug-level");
</span><span class="cx"> this._element.setAttribute("data-labelprefix", WebInspector.UIString("Debug: "));
</span><span class="lines">@@ -743,6 +747,8 @@
</span><span class="cx"> switch (this._message.level) {
</span><span class="cx"> case WebInspector.ConsoleMessage.MessageLevel.Log:
</span><span class="cx"> return "Log";
</span><ins>+ case WebInspector.ConsoleMessage.MessageLevel.Info:
+ return "Info";
</ins><span class="cx"> case WebInspector.ConsoleMessage.MessageLevel.Warning:
</span><span class="cx"> return "Warning";
</span><span class="cx"> case WebInspector.ConsoleMessage.MessageLevel.Debug:
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsLogContentViewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/LogContentView.js (183658 => 183659)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/LogContentView.js 2015-05-01 01:04:52 UTC (rev 183658)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/LogContentView.js 2015-05-01 01:10:43 UTC (rev 183659)
</span><span class="lines">@@ -671,6 +671,7 @@
</span><span class="cx"> visible = showsErrors;
</span><span class="cx"> break;
</span><span class="cx"> case WebInspector.ConsoleMessage.MessageLevel.Log:
</span><ins>+ case WebInspector.ConsoleMessage.MessageLevel.Info:
</ins><span class="cx"> case WebInspector.ConsoleMessage.MessageLevel.Debug:
</span><span class="cx"> visible = showsLogs;
</span><span class="cx"> break;
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (183658 => 183659)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2015-05-01 01:04:52 UTC (rev 183658)
+++ trunk/Source/WebKit/mac/ChangeLog 2015-05-01 01:10:43 UTC (rev 183659)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2015-04-30 Jon Davis <jond@apple.com>
+
+ Web Inspector: console should show an icon for console.info() messages
+ https://bugs.webkit.org/show_bug.cgi?id=18530
+
+ Reviewed by Timothy Hatcher.
+
+ * WebCoreSupport/WebChromeClient.mm:
+ (stringForMessageLevel):
+ * WebView/WebUIDelegatePrivate.h:
+
</ins><span class="cx"> 2015-04-29 Myles C. Maxfield <mmaxfield@apple.com>
</span><span class="cx">
</span><span class="cx"> [OS X] Use CTFontCreateForCSS instead of doing font search ourselves
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebCoreSupportWebChromeClientmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebChromeClient.mm (183658 => 183659)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebCoreSupport/WebChromeClient.mm 2015-05-01 01:04:52 UTC (rev 183658)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebChromeClient.mm 2015-05-01 01:10:43 UTC (rev 183659)
</span><span class="lines">@@ -113,6 +113,7 @@
</span><span class="cx">
</span><span class="cx"> NSString *WebConsoleMessageDebugMessageLevel = @"DebugMessageLevel";
</span><span class="cx"> NSString *WebConsoleMessageLogMessageLevel = @"LogMessageLevel";
</span><ins>+NSString *WebConsoleMessageInfoMessageLevel = @"InfoMessageLevel";
</ins><span class="cx"> NSString *WebConsoleMessageWarningMessageLevel = @"WarningMessageLevel";
</span><span class="cx"> NSString *WebConsoleMessageErrorMessageLevel = @"ErrorMessageLevel";
</span><span class="cx">
</span><span class="lines">@@ -400,6 +401,8 @@
</span><span class="cx"> return WebConsoleMessageDebugMessageLevel;
</span><span class="cx"> case MessageLevel::Log:
</span><span class="cx"> return WebConsoleMessageLogMessageLevel;
</span><ins>+ case MessageLevel::Info:
+ return WebConsoleMessageInfoMessageLevel;
</ins><span class="cx"> case MessageLevel::Warning:
</span><span class="cx"> return WebConsoleMessageWarningMessageLevel;
</span><span class="cx"> case MessageLevel::Error:
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebUIDelegatePrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebUIDelegatePrivate.h (183658 => 183659)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebUIDelegatePrivate.h 2015-05-01 01:04:52 UTC (rev 183658)
+++ trunk/Source/WebKit/mac/WebView/WebUIDelegatePrivate.h 2015-05-01 01:10:43 UTC (rev 183659)
</span><span class="lines">@@ -169,6 +169,7 @@
</span><span class="cx"> // Message Levels.
</span><span class="cx"> extern NSString *WebConsoleMessageDebugMessageLevel;
</span><span class="cx"> extern NSString *WebConsoleMessageLogMessageLevel;
</span><ins>+extern NSString *WebConsoleMessageInfoMessageLevel;
</ins><span class="cx"> extern NSString *WebConsoleMessageWarningMessageLevel;
</span><span class="cx"> extern NSString *WebConsoleMessageErrorMessageLevel;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>