Title: [92964] trunk/Source/WebCore
- Revision
- 92964
- Author
- [email protected]
- Date
- 2011-08-12 08:34:08 -0700 (Fri, 12 Aug 2011)
Log Message
Web Inspector: properly update console message count in source frames and resources panel.
https://bugs.webkit.org/show_bug.cgi?id=57009
Reviewed by Yury Semikhatsky.
* inspector/front-end/ConsoleView.js:
(WebInspector.ConsoleView.prototype._registerConsoleDomainDispatcher.dispatcher.messageRepeatCountUpdated):
* inspector/front-end/SourceFrame.js:
(WebInspector.SourceFrame.prototype.show):
(WebInspector.SourceFrame.prototype.addMessageToSource):
(WebInspector.SourceFrame.prototype._updateMessageRepeatCount):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (92963 => 92964)
--- trunk/Source/WebCore/ChangeLog 2011-08-12 15:15:16 UTC (rev 92963)
+++ trunk/Source/WebCore/ChangeLog 2011-08-12 15:34:08 UTC (rev 92964)
@@ -1,3 +1,17 @@
+2011-08-11 Pavel Podivilov <[email protected]>
+
+ Web Inspector: properly update console message count in source frames and resources panel.
+ https://bugs.webkit.org/show_bug.cgi?id=57009
+
+ Reviewed by Yury Semikhatsky.
+
+ * inspector/front-end/ConsoleView.js:
+ (WebInspector.ConsoleView.prototype._registerConsoleDomainDispatcher.dispatcher.messageRepeatCountUpdated):
+ * inspector/front-end/SourceFrame.js:
+ (WebInspector.SourceFrame.prototype.show):
+ (WebInspector.SourceFrame.prototype.addMessageToSource):
+ (WebInspector.SourceFrame.prototype._updateMessageRepeatCount):
+
2011-08-12 Pavel Feldman <[email protected]>
Not reviewed: follow up to inspector test breakage.
Modified: trunk/Source/WebCore/inspector/front-end/ConsoleView.js (92963 => 92964)
--- trunk/Source/WebCore/inspector/front-end/ConsoleView.js 2011-08-12 15:15:16 UTC (rev 92963)
+++ trunk/Source/WebCore/inspector/front-end/ConsoleView.js 2011-08-12 15:34:08 UTC (rev 92964)
@@ -142,6 +142,7 @@
msg.totalRepeatCount = count;
msg._updateRepeatCount();
console._incrementErrorWarningCount(msg);
+ console.dispatchEventToListeners(WebInspector.ConsoleView.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._requestId);
msgCopy.totalRepeatCount = count;
Modified: trunk/Source/WebCore/inspector/front-end/SourceFrame.js (92963 => 92964)
--- trunk/Source/WebCore/inspector/front-end/SourceFrame.js 2011-08-12 15:15:16 UTC (rev 92963)
+++ trunk/Source/WebCore/inspector/front-end/SourceFrame.js 2011-08-12 15:34:08 UTC (rev 92964)
@@ -82,7 +82,7 @@
WebInspector.View.prototype.show.call(this, parentElement);
this._ensureContentLoaded();
-
+
this.restoreScrollPositions();
// Resize after setting the initial scroll positions to avoid unnecessary rendering work.
@@ -452,21 +452,6 @@
return ranges;
},
- _incrementMessageRepeatCount: function(msg, repeatDelta)
- {
- if (!msg._resourceMessageLineElement)
- return;
-
- if (!msg._resourceMessageRepeatCountElement) {
- var repeatedElement = document.createElement("span");
- msg._resourceMessageLineElement.appendChild(repeatedElement);
- msg._resourceMessageRepeatCountElement = repeatedElement;
- }
-
- msg.repeatCount += repeatDelta;
- msg._resourceMessageRepeatCountElement.textContent = WebInspector.UIString(" (repeated %d times)", msg.repeatCount);
- },
-
setExecutionLine: function(lineNumber, skipRevealLine)
{
this._executionLineNumber = lineNumber;
@@ -540,13 +525,15 @@
}
for (var i = 0; i < rowMessages.length; ++i) {
- if (rowMessages[i].isEqual(msg)) {
- this._incrementMessageRepeatCount(rowMessages[i], msg.repeatDelta);
+ if (rowMessages[i].consoleMessage.isEqual(msg)) {
+ rowMessages[i].repeatCount = msg.totalRepeatCount;
+ this._updateMessageRepeatCount(rowMessages[i]);
return;
}
}
- rowMessages.push(msg);
+ var rowMessage = { consoleMessage: msg };
+ rowMessages.push(rowMessage);
var imageURL;
switch (msg.level) {
@@ -571,9 +558,25 @@
messageLineElement.appendChild(image);
messageLineElement.appendChild(document.createTextNode(msg.message));
- msg._resourceMessageLineElement = messageLineElement;
+ rowMessage.element = messageLineElement;
+ rowMessage.repeatCount = msg.totalRepeatCount;
+ this._updateMessageRepeatCount(rowMessage);
},
+ _updateMessageRepeatCount: function(rowMessage)
+ {
+ if (rowMessage.repeatCount < 2)
+ return;
+
+ if (!rowMessage.repeatCountElement) {
+ var repeatCountElement = document.createElement("span");
+ rowMessage.element.appendChild(repeatCountElement);
+ rowMessage.repeatCountElement = repeatCountElement;
+ }
+
+ rowMessage.repeatCountElement.textContent = WebInspector.UIString(" (repeated %d times)", rowMessage.repeatCount);
+ },
+
addBreakpoint: function(lineNumber, resolved, conditional, enabled)
{
this._breakpoints[lineNumber] = {
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
