Changeset 35755 in webkit

Timestamp:

Aug 14, 2008 10:41:05 AM (16 years ago)

Author:

timothy@apple.com

Message:

Avoid formating ConsoleMessages twice unless the message will be
displayed in bubbles of a SourceFrame.

Reviewed by Kevin McCullough.

• page/inspector/Console.js: (WebInspector.ConsoleMessage): Only format the plain text message if the URL and line are valid and the level is error or warning. (WebInspector.ConsoleMessage.prototype.isErrorOrWarning): Added. Helper to test for error or warning level.
• page/inspector/SourceFrame.js: (WebInspector.SourceFrame.prototype.addMessage): Don't add the message if there is no message or valid line or if the msg isn't an error or warning.

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• page/inspector/Console.js (modified) (2 diffs)
• page/inspector/SourceFrame.js (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2008-08-14  Timothy Hatcher  <timothy@apple.com>
+
+        Avoid formating ConsoleMessages twice unless the message will be
+        displayed in bubbles of a SourceFrame.
+
+        Reviewed by Kevin McCullough.
+
+        * page/inspector/Console.js:
+        (WebInspector.ConsoleMessage): Only format the plain text message
+        if the URL and line are valid and the level is error or warning.
+        (WebInspector.ConsoleMessage.prototype.isErrorOrWarning): Added.
+        Helper to test for error or warning level.
+        * page/inspector/SourceFrame.js:
+        (WebInspector.SourceFrame.prototype.addMessage): Don't add the
+        message if there is no message or valid line or if the msg
+        isn't an error or warning.
+
 2008-08-14  Jan Michael Alonzo  <jmalonzo@webkit.org>
 

trunk/WebCore/page/inspector/Console.js

@@ -514 +514 @@
     this.groupLevel = groupLevel;
 
-    // This _format call passes in true for the plainText argument. The result's textContent is
-    // used for inline message bubbles in SourceFrames, or other plain-text representations.
-    this.message = this._format(Array.prototype.slice.call(arguments, 5), true).textContent;
+    if (url && line > 0 && this.isErrorOrWarning()) {
+        // This _format call passes in true for the plainText argument. The result's textContent is
+        // used for inline message bubbles in SourceFrames, or other plain-text representations.
+        // Right now we only need to generate this string if the URL and line are valid and the level
+        // is error or warning, since SourceFrame only shows these messages.
+        this.message = this._format(Array.prototype.slice.call(arguments, 5), true).textContent;
+    }
 
     // The formatedMessage property is used for the rich and interactive console.
@@ -523 +527 @@
 
 WebInspector.ConsoleMessage.prototype = {
+    isErrorOrWarning: function()
+    {
+        return (this.level === WebInspector.ConsoleMessage.MessageLevel.Warning || this.level === WebInspector.ConsoleMessage.MessageLevel.Error);
+    },
+
     _format: function(parameters, plainText)
-    {    
+    {
         var formattedResult = document.createElement("span");
 

trunk/WebCore/page/inspector/SourceFrame.js

@@ -136 +136 @@
     addMessage: function(msg)
     {
+        // Don't add the message if there is no message or valid line or if the msg isn't an error or warning.
+        if (!msg.message || msg.line <= 0 || !msg.isErrorOrWarning())
+            return;
         this.messages.push(msg);
         this._addMessageToSource(msg);