Changeset 147327 in webkit

Timestamp:

Apr 1, 2013 8:26:45 AM (11 years ago)

Author:

commit-queue@webkit.org

Message:

Web Inspector: Exception in console on attempt to filter javascript messages.
​https://bugs.webkit.org/show_bug.cgi?id=113327

Fixed non-css filtration if console message groups are present. Message groups elements are always shown and are
never filtered out.

Patch by Dmitry Zvorygin <​zvorygin@chromium.org> on 2013-04-01
Reviewed by Pavel Feldman.

• inspector/front-end/ConsoleMessage.js:

(WebInspector.ConsoleMessageImpl.prototype.updateRepeatCount):

• inspector/front-end/ConsoleView.js:

(WebInspector.ConsoleView.get this):
(WebInspector.ConsoleView.prototype._consoleMessageAdded):
(WebInspector.ConsoleView.prototype._appendConsoleMessage):
(WebInspector.ConsoleView.prototype._consoleCleared):
(WebInspector.ConsoleView.prototype._shouldBeVisible):
(WebInspector.ConsoleView.prototype._updateMessageList):
(WebInspector.ConsoleView.prototype._printResult):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• inspector/front-end/ConsoleMessage.js (modified) (1 diff)
• inspector/front-end/ConsoleView.js (modified) (9 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-04-01  Dmitry Zvorygin  <zvorygin@chromium.org>
+
+        Web Inspector: Exception in console on attempt to filter javascript messages.
+        https://bugs.webkit.org/show_bug.cgi?id=113327
+
+        Fixed non-css filtration if console message groups are present. Message groups elements are always shown and are
+        never filtered out.
+
+        Reviewed by Pavel Feldman.
+
+        * inspector/front-end/ConsoleMessage.js:
+        (WebInspector.ConsoleMessageImpl.prototype.updateRepeatCount):
+        * inspector/front-end/ConsoleView.js:
+        (WebInspector.ConsoleView.get this):
+        (WebInspector.ConsoleView.prototype._consoleMessageAdded):
+        (WebInspector.ConsoleView.prototype._appendConsoleMessage):
+        (WebInspector.ConsoleView.prototype._consoleCleared):
+        (WebInspector.ConsoleView.prototype._shouldBeVisible):
+        (WebInspector.ConsoleView.prototype._updateMessageList):
+        (WebInspector.ConsoleView.prototype._printResult):
+
 2013-04-01  Victor Carbune  <vcarbune@chromium.org>
 

trunk/Source/WebCore/inspector/front-end/ConsoleMessage.js

@@ -777 +777 @@
 
     updateRepeatCount: function() {
+        if (!this._element)
+            return;
+
         if (!this.repeatCountElement) {
             this.repeatCountElement = document.createElement("span");

trunk/Source/WebCore/inspector/front-end/ConsoleView.js

@@ -40 +40 @@
     this._messageURLFilters = WebInspector.settings.messageURLFilters.get();
     this._visibleMessages = [];
+    this._messages = [];
     this._urlToMessageCount = {};
 
@@ -385 +386 @@
     {
         var message = /** @type {WebInspector.ConsoleMessage} */ (event.data);
+        this._messages.push(message);
+
         if (this._urlToMessageCount[message.url])
             this._urlToMessageCount[message.url]++;
@@ -412 +415 @@
                 this.currentGroup.messagesElement.appendChild(group.element);
                 this.currentGroup = group;
+                message.group = group;
             }
             this.currentGroup.addMessage(message);
@@ -425 +429 @@
             this._visibleMessages[i].willHide();
         this._visibleMessages = [];
+        this._messages = [];
 
         this.currentGroup = this.topGroup;
@@ -528 +533 @@
     _shouldBeVisible: function(message)
     {
-        return !message.url || !this._messageURLFilters[message.url];
+        return (message.type === WebInspector.ConsoleMessage.MessageType.StartGroup || message.type === WebInspector.ConsoleMessage.MessageType.StartGroupCollapsed || message.type === WebInspector.ConsoleMessage.MessageType.EndGroup) ||
+            (!message.url || !this._messageURLFilters[message.url]);
     },
 
@@ -536 +542 @@
     _updateMessageList: function()
     {
-        var sourceMessages = WebInspector.console.messages;
+        var group = this.topGroup;
+        var sourceMessages = this._messages;
         var visibleMessageIndex = 0;
         var newVisibleMessages = [];
+        var anchor = null;
         for (var i = 0; i < sourceMessages.length; i++) {
             var sourceMessage = sourceMessages[i];
@@ -545 +553 @@
             if (visibleMessage === sourceMessage) {
                 visibleMessageIndex++;
-                if (this._shouldBeVisible(visibleMessage))
+                if (this._shouldBeVisible(visibleMessage)) {
                     newVisibleMessages.push(visibleMessage);
-                else {
+                    if (sourceMessage.type === WebInspector.ConsoleMessage.MessageType.EndGroup) {
+                        anchor = group.element;
+                        group = group.parentGroup || group;
+                    } else if (sourceMessage.type === WebInspector.ConsoleMessage.MessageType.StartGroup || sourceMessage.type === WebInspector.ConsoleMessage.MessageType.StartGroupCollapsed) {
+                        group = sourceMessage.group;
+                        anchor = group.messagesElement.firstChild;
+                    }
+                } else {
                     visibleMessage.willHide();
-                    visibleMessage.toMessageElement().removeSelf();                    
+                    visibleMessage.toMessageElement().removeSelf();
                 }
             } else {
                 if (this._shouldBeVisible(sourceMessage)) {
-                    this.currentGroup.addMessage(sourceMessage, visibleMessage ? visibleMessage.toMessageElement() : null);
+                    group.addMessage(sourceMessage, anchor ? anchor.nextSibling : group.messagesElement.firstChild);
                     newVisibleMessages.push(sourceMessage);
+                    anchor = sourceMessage.toMessageElement();
                 }
             }
@@ -655 +671 @@
         if (!result)
             return;
-
-        this._appendConsoleMessage(new WebInspector.ConsoleCommandResult(result, wasThrown, originatingCommand, this._linkifier));
+        var message = new WebInspector.ConsoleCommandResult(result, wasThrown, originatingCommand, this._linkifier);
+        this._messages.push(message);
+        this._appendConsoleMessage(message);
     },
 
@@ -664 +681 @@
             var commandMessage = new WebInspector.ConsoleCommand(text);
             WebInspector.console.interruptRepeatCount();
+            this._messages.push(commandMessage);
             this._appendConsoleMessage(commandMessage);
         }