Diff
Modified: trunk/LayoutTests/ChangeLog (93785 => 93786)
--- trunk/LayoutTests/ChangeLog 2011-08-25 15:18:16 UTC (rev 93785)
+++ trunk/LayoutTests/ChangeLog 2011-08-25 15:22:48 UTC (rev 93786)
@@ -1,3 +1,13 @@
+2011-08-25 Pavel Feldman <[email protected]>
+
+ [Qt] REGRESSION(93769): inspector/console/console-tests.html fails
+ https://bugs.webkit.org/show_bug.cgi?id=66930
+
+ Reviewed by Yury Semikhatsky.
+
+ * inspector/console/console-repeat-count-expected.txt: Added.
+ * inspector/console/console-repeat-count.html: Added.
+
2011-08-25 Sheriff Bot <[email protected]>
Unreviewed, rolling out r93775.
Added: trunk/LayoutTests/inspector/console/console-repeat-count-expected.txt (0 => 93786)
--- trunk/LayoutTests/inspector/console/console-repeat-count-expected.txt (rev 0)
+++ trunk/LayoutTests/inspector/console/console-repeat-count-expected.txt 2011-08-25 15:22:48 UTC (rev 93786)
@@ -0,0 +1,17 @@
+CONSOLE MESSAGE: line 10: Same message
+CONSOLE MESSAGE: line 10: Same message
+CONSOLE MESSAGE: line 10: Same message
+CONSOLE MESSAGE: line 10: Same message
+CONSOLE MESSAGE: line 10: Same message
+CONSOLE MESSAGE: line 10: Same message
+CONSOLE MESSAGE: line 10: Same message
+CONSOLE MESSAGE: line 10: Same message
+CONSOLE MESSAGE: line 10: Same message
+CONSOLE MESSAGE: line 10: Same message
+Tests that repeat count is properly updated.
+
+5console-repeat-count.html:10Same message
+"Different message"
+"Different message"
+5console-repeat-count.html:10Same message
+
Property changes on: trunk/LayoutTests/inspector/console/console-repeat-count-expected.txt
___________________________________________________________________
Added: svn:eol-style
Added: trunk/LayoutTests/inspector/console/console-repeat-count.html (0 => 93786)
--- trunk/LayoutTests/inspector/console/console-repeat-count.html (rev 0)
+++ trunk/LayoutTests/inspector/console/console-repeat-count.html 2011-08-25 15:22:48 UTC (rev 93786)
@@ -0,0 +1,40 @@
+<html>
+<head>
+<script src=""
+<script src=""
+<script>
+
+function dumpMessages()
+{
+ for (var i = 0; i < 5; ++i)
+ console.log("Same message");
+}
+
+function test()
+{
+ InspectorTest.evaluateInPage("dumpMessages()", step1);
+
+ function step1()
+ {
+ InspectorTest.evaluateInConsole("\"Different message\"", step2);
+ }
+
+ function step2()
+ {
+ InspectorTest.evaluateInPage("dumpMessages()", step3);
+ }
+
+ function step3()
+ {
+ InspectorTest.dumpConsoleMessages();
+ InspectorTest.completeTest();
+ }
+}
+</script>
+</head>
+<body _onload_="runTest()">
+<p>
+Tests that repeat count is properly updated.
+</p>
+</body>
+</html>
Property changes on: trunk/LayoutTests/inspector/console/console-repeat-count.html
___________________________________________________________________
Added: svn:eol-style
Modified: trunk/Source/WebCore/ChangeLog (93785 => 93786)
--- trunk/Source/WebCore/ChangeLog 2011-08-25 15:18:16 UTC (rev 93785)
+++ trunk/Source/WebCore/ChangeLog 2011-08-25 15:22:48 UTC (rev 93786)
@@ -1,3 +1,23 @@
+2011-08-25 Pavel Feldman <[email protected]>
+
+ [Qt] REGRESSION(93769): inspector/console/console-tests.html fails
+ https://bugs.webkit.org/show_bug.cgi?id=66930
+
+ Reviewed by Yury Semikhatsky.
+
+ Test: inspector/console/console-repeat-count.html
+
+ * inspector/front-end/ConsoleModel.js:
+ (WebInspector.ConsoleModel):
+ (WebInspector.ConsoleModel.prototype.addMessage):
+ (WebInspector.ConsoleModel.prototype.clearMessages):
+ (WebInspector.ConsoleModel.prototype.interruptRepeatCount):
+ (WebInspector.ConsoleModel.prototype._messageRepeatCountUpdated):
+ (WebInspector.ConsoleDispatcher.prototype.messageRepeatCountUpdated):
+ * inspector/front-end/ConsoleView.js:
+ (WebInspector.ConsoleView.prototype._consoleMessageAdded):
+ * inspector/front-end/inspector.js:
+
2011-08-25 Mikhail Naganov <[email protected]>
Chromium: expose MemoryCache::prune and FontCache::purgeInactiveFontData.
Modified: trunk/Source/WebCore/inspector/front-end/ConsoleModel.js (93785 => 93786)
--- trunk/Source/WebCore/inspector/front-end/ConsoleModel.js 2011-08-25 15:18:16 UTC (rev 93785)
+++ trunk/Source/WebCore/inspector/front-end/ConsoleModel.js 2011-08-25 15:22:48 UTC (rev 93786)
@@ -36,12 +36,14 @@
this.messages = [];
this.warnings = 0;
this.errors = 0;
+ this._interruptRepeatCount = false;
InspectorBackend.registerConsoleDispatcher(new WebInspector.ConsoleDispatcher(this));
}
WebInspector.ConsoleModel.Events = {
ConsoleCleared: "console-cleared",
MessageAdded: "console-message-added",
+ RepeatCountUpdated: "repeat-count-updated"
}
WebInspector.ConsoleModel.prototype = {
@@ -66,8 +68,10 @@
addMessage: function(msg)
{
this.messages.push(msg);
+ this._previousMessage = msg;
this._incrementErrorWarningCount(msg);
this.dispatchEventToListeners(WebInspector.ConsoleModel.Events.MessageAdded, msg);
+ this._interruptRepeatCount = false;
},
_incrementErrorWarningCount: function(msg)
@@ -96,6 +100,35 @@
this.warnings = 0;
this.dispatchEventToListeners(WebInspector.ConsoleModel.Events.ConsoleCleared);
+ },
+
+ interruptRepeatCount: function()
+ {
+ this._interruptRepeatCount = true;
+ },
+
+ _messageRepeatCountUpdated: function(count)
+ {
+ var msg = this._previousMessage;
+ if (!msg)
+ return;
+
+ var prevRepeatCount = msg.totalRepeatCount;
+
+ if (!this._interruptRepeatCount) {
+ msg.repeatDelta = count - prevRepeatCount;
+ msg.repeatCount = msg.repeatCount + msg.repeatDelta;
+ msg.totalRepeatCount = count;
+ msg._updateRepeatCount();
+
+ this._incrementErrorWarningCount(msg);
+ this.dispatchEventToListeners(WebInspector.ConsoleModel.Events.RepeatCountUpdated, msg);
+ } else {
+ var msgCopy = new WebInspector.ConsoleMessage(msg.source, msg.type, msg.level, msg.line, msg.url, count - prevRepeatCount, msg._messageText, msg._parameters, msg._stackTrace, msg._request);
+ msgCopy.totalRepeatCount = count;
+ msgCopy._formatMessage();
+ this.addMessage(msgCopy);
+ }
}
}
@@ -130,25 +163,7 @@
messageRepeatCountUpdated: function(count)
{
- var msg = this._console.previousMessage;
- if (!msg)
- return;
-
- var prevRepeatCount = msg.totalRepeatCount;
-
- if (!this._console.commandSincePreviousMessage) {
- msg.repeatDelta = count - prevRepeatCount;
- msg.repeatCount = msg.repeatCount + msg.repeatDelta;
- msg.totalRepeatCount = count;
- msg._updateRepeatCount();
- this._console._incrementErrorWarningCount(msg);
- this._console.dispatchEventToListeners(WebInspector.ConsoleModel.Events.MessageAdded, msg);
- } else {
- var msgCopy = new WebInspector.ConsoleMessage(msg.source, msg.type, msg.level, msg.line, msg.url, count - prevRepeatCount, msg._messageText, msg._parameters, msg._stackTrace, msg._request);
- msgCopy.totalRepeatCount = count;
- msgCopy._formatMessage();
- this._console.addMessage(msgCopy);
- }
+ this._console._messageRepeatCountUpdated(count);
},
messagesCleared: function()
Modified: trunk/Source/WebCore/inspector/front-end/ConsoleView.js (93785 => 93786)
--- trunk/Source/WebCore/inspector/front-end/ConsoleView.js 2011-08-25 15:18:16 UTC (rev 93785)
+++ trunk/Source/WebCore/inspector/front-end/ConsoleView.js 2011-08-25 15:22:48 UTC (rev 93786)
@@ -256,23 +256,9 @@
_consoleMessageAdded: function(event)
{
- this.commandSincePreviousMessage = false;
- this.previousMessage = event.data;
this._appendConsoleMessage(event.data);
},
- _appendConsoleCommand: function(msg)
- {
- if (this.previousMessage)
- this.commandSincePreviousMessage = true;
- this._appendConsoleMessage(msg);
- },
-
- _appendConsoleCommandResult: function(msg)
- {
- this._appendConsoleMessage(msg);
- },
-
_appendConsoleMessage: function(msg)
{
var shouldScrollToLastMessage = this.messagesElement.isScrolledToBottom();
@@ -598,7 +584,8 @@
return;
var commandMessage = new WebInspector.ConsoleCommand(str);
- this._appendConsoleCommand(commandMessage);
+ WebInspector.console.interruptRepeatCount();
+ this._appendConsoleMessage(commandMessage);
function printResult(result, wasThrown)
{
@@ -611,7 +598,7 @@
WebInspector.settings.consoleHistory.set(this.prompt.history.slice(-30));
- this._appendConsoleCommandResult(new WebInspector.ConsoleCommandResult(result, wasThrown, commandMessage));
+ this._appendConsoleMessage(new WebInspector.ConsoleCommandResult(result, wasThrown, commandMessage));
}
this.evalInInspectedWindow(str, "console", true, undefined, undefined, printResult.bind(this));
Modified: trunk/Source/WebCore/inspector/front-end/Resource.js (93785 => 93786)
--- trunk/Source/WebCore/inspector/front-end/Resource.js 2011-08-25 15:18:16 UTC (rev 93785)
+++ trunk/Source/WebCore/inspector/front-end/Resource.js 2011-08-25 15:22:48 UTC (rev 93786)
@@ -235,7 +235,9 @@
}
WebInspector.Resource.Events = {
- RevisionAdded: 0
+ RevisionAdded: "revision-added",
+ MessageAdded: "message-added",
+ MessagesCleared: "messages-cleared"
}
WebInspector.Resource.prototype = {
@@ -750,7 +752,7 @@
if (!this._messages)
this._messages = [];
this._messages.push(msg);
- this.dispatchEventToListeners("errors-warnings-message-added", msg);
+ this.dispatchEventToListeners(WebInspector.Resource.Events.MessageAdded, msg);
},
get errors()
@@ -778,7 +780,7 @@
this._messages = [];
this._warnings = 0;
this._errors = 0;
- this.dispatchEventToListeners("errors-warnings-cleared");
+ this.dispatchEventToListeners(WebInspector.Resource.Events.MessagesCleared);
},
get content()
Modified: trunk/Source/WebCore/inspector/front-end/ResourceTreeModel.js (93785 => 93786)
--- trunk/Source/WebCore/inspector/front-end/ResourceTreeModel.js 2011-08-25 15:18:16 UTC (rev 93785)
+++ trunk/Source/WebCore/inspector/front-end/ResourceTreeModel.js 2011-08-25 15:22:48 UTC (rev 93786)
@@ -39,6 +39,7 @@
WebInspector.networkManager.addEventListener(WebInspector.NetworkManager.EventTypes.ResourceFinished, this._onResourceUpdated, this);
WebInspector.console.addEventListener(WebInspector.ConsoleModel.Events.MessageAdded, this._consoleMessageAdded, this);
+ WebInspector.console.addEventListener(WebInspector.ConsoleModel.Events.RepeatCountUpdated, this._consoleMessageAdded, this);
WebInspector.console.addEventListener(WebInspector.ConsoleModel.Events.ConsoleCleared, this._consoleCleared, this);
this.frontendReused();
Modified: trunk/Source/WebCore/inspector/front-end/ResourcesPanel.js (93785 => 93786)
--- trunk/Source/WebCore/inspector/front-end/ResourcesPanel.js 2011-08-25 15:18:16 UTC (rev 93785)
+++ trunk/Source/WebCore/inspector/front-end/ResourcesPanel.js 2011-08-25 15:22:48 UTC (rev 93786)
@@ -1175,8 +1175,8 @@
{
WebInspector.BaseStorageTreeElement.call(this, storagePanel, resource, resource.displayName, ["resource-sidebar-tree-item", "resources-category-" + resource.category.name]);
this._resource = resource;
- this._resource.addEventListener("errors-warnings-cleared", this._errorsWarningsCleared, this);
- this._resource.addEventListener("errors-warnings-message-added", this._errorsWarningsMessageAdded, this);
+ this._resource.addEventListener(WebInspector.Resource.Events.MessageAdded, this._consoleMessageAdded, this);
+ this._resource.addEventListener(WebInspector.Resource.Events.MessagesCleared, this._consoleMessagesCleared, this);
this._resource.addEventListener(WebInspector.Resource.Events.RevisionAdded, this._revisionAdded, this);
this.tooltip = resource.url;
}
@@ -1325,7 +1325,7 @@
this._bubbleElement.addStyleClass("error");
},
- _errorsWarningsCleared: function()
+ _consoleMessagesCleared: function()
{
// FIXME: move to the SourceFrame.
if (this._sourceView)
@@ -1334,13 +1334,11 @@
this._updateErrorsAndWarningsBubbles();
},
- _errorsWarningsMessageAdded: function(event)
+ _consoleMessageAdded: function(event)
{
var msg = event.data;
-
if (this._sourceView)
this._sourceView.addMessage(msg);
-
this._updateErrorsAndWarningsBubbles();
},
Modified: trunk/Source/WebCore/inspector/front-end/inspector.js (93785 => 93786)
--- trunk/Source/WebCore/inspector/front-end/inspector.js 2011-08-25 15:18:16 UTC (rev 93785)
+++ trunk/Source/WebCore/inspector/front-end/inspector.js 2011-08-25 15:22:48 UTC (rev 93786)
@@ -486,6 +486,7 @@
this.console = new WebInspector.ConsoleModel();
this.console.addEventListener(WebInspector.ConsoleModel.Events.ConsoleCleared, this._updateErrorAndWarningCounts, this);
this.console.addEventListener(WebInspector.ConsoleModel.Events.MessageAdded, this._updateErrorAndWarningCounts, this);
+ this.console.addEventListener(WebInspector.ConsoleModel.Events.RepeatCountUpdated, this._updateErrorAndWarningCounts, this);
this.drawer = new WebInspector.Drawer();
this.consoleView = new WebInspector.ConsoleView(this.drawer);
