Diff
Modified: trunk/LayoutTests/inspector/protocol/console-agent-expected.txt (98325 => 98326)
--- trunk/LayoutTests/inspector/protocol/console-agent-expected.txt 2011-10-25 08:19:54 UTC (rev 98325)
+++ trunk/LayoutTests/inspector/protocol/console-agent-expected.txt 2011-10-25 08:24:14 UTC (rev 98326)
@@ -30,7 +30,6 @@
response:
{
result : {
- expiredMessagesCount : 0
}
id : <number>
}
Modified: trunk/Source/WebCore/ChangeLog (98325 => 98326)
--- trunk/Source/WebCore/ChangeLog 2011-10-25 08:19:54 UTC (rev 98325)
+++ trunk/Source/WebCore/ChangeLog 2011-10-25 08:24:14 UTC (rev 98326)
@@ -1,3 +1,18 @@
+2011-10-24 Pavel Feldman <pfeld...@google.com>
+
+ Web Inspector: print expired message count before remaining messages.
+ https://bugs.webkit.org/show_bug.cgi?id=70736
+
+ Reviewed by Yury Semikhatsky.
+
+ * inspector/Inspector-0.1.json:
+ * inspector/Inspector.json:
+ * inspector/InspectorConsoleAgent.cpp:
+ (WebCore::InspectorConsoleAgent::enable):
+ (WebCore::InspectorConsoleAgent::restore):
+ * inspector/InspectorConsoleAgent.h:
+ * inspector/front-end/ConsoleModel.js:
+
2011-10-25 Sheriff Bot <webkit.review....@gmail.com>
Unreviewed, rolling out r98309.
Modified: trunk/Source/WebCore/inspector/Inspector-0.1.json (98325 => 98326)
--- trunk/Source/WebCore/inspector/Inspector-0.1.json 2011-10-25 08:19:54 UTC (rev 98325)
+++ trunk/Source/WebCore/inspector/Inspector-0.1.json 2011-10-25 08:24:14 UTC (rev 98326)
@@ -351,12 +351,12 @@
"description": "Console message.",
"properties": [
{ "name": "source", "type": "string", "enum": ["html", "wml", "xml", "_javascript_", "network", "console-api", "other"], "description": "Message source." },
- { "name": "type", "type": "string", "enum": ["log", "dir", "dirxml", "trace", "startGroup", "startGroupCollapsed", "endGroup", "assert"], "description": "Console message type." },
{ "name": "level", "type": "string", "enum": ["tip", "log", "warning", "error", "debug"], "description": "Message severity." },
- { "name": "line", "type": "integer", "description": "Line number in the resource that generated this message." },
- { "name": "url", "type": "string", "description": "URL of the message origin." },
- { "name": "repeatCount", "type": "integer", "description": "Repeat count for repeated messages." },
{ "name": "text", "type": "string", "description": "Message text." },
+ { "name": "type", "type": "string", "optional": true, "enum": ["log", "dir", "dirxml", "trace", "startGroup", "startGroupCollapsed", "endGroup", "assert"], "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." },
{ "name": "networkRequestId", "$ref": "Network.RequestId", "optional": true, "description": "Identifier of the network request associated with this message." },
{ "name": "parameters", "type": "array", "items": { "$ref": "Runtime.RemoteObject" }, "optional": true, "description": "Message parameters in case of the formatted message." },
{ "name": "stackTrace", "$ref": "StackTrace", "optional": true, "description": "_javascript_ stack trace for assertions and error messages." }
@@ -384,7 +384,7 @@
{
"name": "enable",
"returns": [
- { "name": "expiredMessagesCount", "type": "integer", "description": "Number of messages dropped due to message threashold overflow." }
+ { "name": "expiredMessagesCount", "type": "integer", "optional": true, "description": "Number of messages dropped due to message threashold overflow." }
],
"description": "Enables console domain, sends the messages collected so far to the client by means of the <code>messageAdded</code> notification."
},
Modified: trunk/Source/WebCore/inspector/Inspector.json (98325 => 98326)
--- trunk/Source/WebCore/inspector/Inspector.json 2011-10-25 08:19:54 UTC (rev 98325)
+++ trunk/Source/WebCore/inspector/Inspector.json 2011-10-25 08:24:14 UTC (rev 98326)
@@ -398,12 +398,12 @@
"description": "Console message.",
"properties": [
{ "name": "source", "type": "string", "enum": ["html", "wml", "xml", "_javascript_", "network", "console-api", "other"], "description": "Message source." },
- { "name": "type", "type": "string", "enum": ["log", "dir", "dirxml", "trace", "startGroup", "startGroupCollapsed", "endGroup", "assert"], "description": "Console message type." },
{ "name": "level", "type": "string", "enum": ["tip", "log", "warning", "error", "debug"], "description": "Message severity." },
- { "name": "line", "type": "integer", "description": "Line number in the resource that generated this message." },
- { "name": "url", "type": "string", "description": "URL of the message origin." },
- { "name": "repeatCount", "type": "integer", "description": "Repeat count for repeated messages." },
{ "name": "text", "type": "string", "description": "Message text." },
+ { "name": "type", "type": "string", "optional": true, "enum": ["log", "dir", "dirxml", "trace", "startGroup", "startGroupCollapsed", "endGroup", "assert"], "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." },
{ "name": "networkRequestId", "$ref": "Network.RequestId", "optional": true, "description": "Identifier of the network request associated with this message." },
{ "name": "parameters", "type": "array", "items": { "$ref": "Runtime.RemoteObject" }, "optional": true, "description": "Message parameters in case of the formatted message." },
{ "name": "stackTrace", "$ref": "StackTrace", "optional": true, "description": "_javascript_ stack trace for assertions and error messages." }
@@ -430,9 +430,6 @@
"commands": [
{
"name": "enable",
- "returns": [
- { "name": "expiredMessagesCount", "type": "integer", "description": "Number of messages dropped due to message threashold overflow." }
- ],
"description": "Enables console domain, sends the messages collected so far to the client by means of the <code>messageAdded</code> notification."
},
{
Modified: trunk/Source/WebCore/inspector/InspectorConsoleAgent.cpp (98325 => 98326)
--- trunk/Source/WebCore/inspector/InspectorConsoleAgent.cpp 2011-10-25 08:19:54 UTC (rev 98325)
+++ trunk/Source/WebCore/inspector/InspectorConsoleAgent.cpp 2011-10-25 08:24:14 UTC (rev 98326)
@@ -81,12 +81,15 @@
m_inspectorDOMAgent = 0;
}
-void InspectorConsoleAgent::enable(ErrorString*, int* consoleMessageExpireCount)
+void InspectorConsoleAgent::enable(ErrorString*)
{
- *consoleMessageExpireCount = m_expiredConsoleMessageCount;
-
m_inspectorState->setBoolean(ConsoleAgentState::consoleMessagesEnabled, true);
+ if (m_expiredConsoleMessageCount) {
+ ConsoleMessage expiredMessage(OtherMessageSource, LogMessageType, WarningMessageLevel, String::format("%d console messages are not shown.", m_expiredConsoleMessageCount), 0, "", "");
+ expiredMessage.addToFrontend(m_frontend, m_injectedScriptManager);
+ }
+
size_t messageCount = m_consoleMessages.size();
for (size_t i = 0; i < messageCount; ++i)
m_consoleMessages[i]->addToFrontend(m_frontend, m_injectedScriptManager);
@@ -120,8 +123,7 @@
{
if (m_inspectorState->getBoolean(ConsoleAgentState::consoleMessagesEnabled)) {
ErrorString error;
- int expiredCount;
- enable(&error, &expiredCount);
+ enable(&error);
}
}
Modified: trunk/Source/WebCore/inspector/InspectorConsoleAgent.h (98325 => 98326)
--- trunk/Source/WebCore/inspector/InspectorConsoleAgent.h 2011-10-25 08:19:54 UTC (rev 98325)
+++ trunk/Source/WebCore/inspector/InspectorConsoleAgent.h 2011-10-25 08:24:14 UTC (rev 98326)
@@ -59,7 +59,7 @@
InspectorConsoleAgent(InstrumentingAgents*, InspectorAgent*, InspectorState*, InjectedScriptManager*, InspectorDOMAgent*);
~InspectorConsoleAgent();
- void enable(ErrorString*, int* consoleMessageExpireCount);
+ void enable(ErrorString*);
void disable(ErrorString*);
void clearMessages(ErrorString*);
void reset();
Modified: trunk/Source/WebCore/inspector/front-end/ConsoleModel.js (98325 => 98326)
--- trunk/Source/WebCore/inspector/front-end/ConsoleModel.js 2011-10-25 08:19:54 UTC (rev 98325)
+++ trunk/Source/WebCore/inspector/front-end/ConsoleModel.js 2011-10-25 08:24:14 UTC (rev 98326)
@@ -53,17 +53,9 @@
if (WebInspector.settings.monitoringXHREnabled.get())
ConsoleAgent.setMonitoringXHREnabled(true);
- ConsoleAgent.enable(this._setConsoleMessageExpiredCount.bind(this));
+ ConsoleAgent.enable();
},
- _setConsoleMessageExpiredCount: function(count)
- {
- if (count) {
- var message = String.sprintf(WebInspector.UIString("%d console messages are not shown."), count);
- this.addMessage(WebInspector.ConsoleMessage.createTextMessage(message, WebInspector.ConsoleMessage.MessageLevel.Warning));
- }
- },
-
/**
* @param {WebInspector.ConsoleMessage} msg
*/
