Title: [104714] trunk
Revision
104714
Author
[email protected]
Date
2012-01-11 08:35:00 -0800 (Wed, 11 Jan 2012)

Log Message

Web Inspector: "undefined" instead of error message in the SourceFrame.
https://bugs.webkit.org/show_bug.cgi?id=76060

Reviewed by Yury Semikhatsky.

Source/WebCore:

* inspector/front-end/ConsoleMessage.js:
(WebInspector.ConsoleMessageImpl.prototype._formatMessage):
(WebInspector.ConsoleMessageImpl.prototype.get message):

LayoutTests:

* http/tests/inspector-enabled/console-log-before-frame-navigation.html:
* inspector/debugger/source-frame-expected.txt:

Modified Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (104713 => 104714)


--- trunk/LayoutTests/ChangeLog	2012-01-11 16:18:17 UTC (rev 104713)
+++ trunk/LayoutTests/ChangeLog	2012-01-11 16:35:00 UTC (rev 104714)
@@ -1,5 +1,15 @@
 2012-01-11  Pavel Feldman  <[email protected]>
 
+        Web Inspector: "undefined" instead of error message in the SourceFrame.
+        https://bugs.webkit.org/show_bug.cgi?id=76060
+
+        Reviewed by Yury Semikhatsky.
+
+        * http/tests/inspector-enabled/console-log-before-frame-navigation.html:
+        * inspector/debugger/source-frame-expected.txt:
+
+2012-01-11  Pavel Feldman  <[email protected]>
+
         Web Inspector: make setOuterHTML use new DOMEditor, cover it with tests.
         https://bugs.webkit.org/show_bug.cgi?id=76056
 

Modified: trunk/LayoutTests/http/tests/inspector-enabled/console-log-before-frame-navigation.html (104713 => 104714)


--- trunk/LayoutTests/http/tests/inspector-enabled/console-log-before-frame-navigation.html	2012-01-11 16:18:17 UTC (rev 104713)
+++ trunk/LayoutTests/http/tests/inspector-enabled/console-log-before-frame-navigation.html	2012-01-11 16:35:00 UTC (rev 104714)
@@ -31,7 +31,7 @@
     for (var i = 0; i < messages.length; ++i) {
         var m = messages[i];
         InspectorTest.addResult("Message[" + i + "]:");
-        InspectorTest.addResult("Message: " + m.message);
+        InspectorTest.addResult("Message: " + WebInspector.displayNameForURL(m.url) + ":" + m.line + " " + m.message);
     }
     InspectorTest.addResult("TEST COMPLETE.");
     InspectorTest.completeTest();

Modified: trunk/LayoutTests/inspector/debugger/source-frame-expected.txt (104713 => 104714)


--- trunk/LayoutTests/inspector/debugger/source-frame-expected.txt	2012-01-11 16:18:17 UTC (rev 104713)
+++ trunk/LayoutTests/inspector/debugger/source-frame-expected.txt	2012-01-11 16:35:00 UTC (rev 104714)
@@ -8,7 +8,7 @@
 Breakpoint added to source frame at line 17
 
 Running: testConsoleMessage
-Message text: source-frame.html:10 test error message
+Message text: test error message
 
 Running: testShowResource
 Debugger was disabled.

Modified: trunk/Source/WebCore/ChangeLog (104713 => 104714)


--- trunk/Source/WebCore/ChangeLog	2012-01-11 16:18:17 UTC (rev 104713)
+++ trunk/Source/WebCore/ChangeLog	2012-01-11 16:35:00 UTC (rev 104714)
@@ -1,5 +1,16 @@
 2012-01-11  Pavel Feldman  <[email protected]>
 
+        Web Inspector: "undefined" instead of error message in the SourceFrame.
+        https://bugs.webkit.org/show_bug.cgi?id=76060
+
+        Reviewed by Yury Semikhatsky.
+
+        * inspector/front-end/ConsoleMessage.js:
+        (WebInspector.ConsoleMessageImpl.prototype._formatMessage):
+        (WebInspector.ConsoleMessageImpl.prototype.get message):
+
+2012-01-11  Pavel Feldman  <[email protected]>
+
         Web Inspector: make setOuterHTML use new DOMEditor, cover it with tests.
         https://bugs.webkit.org/show_bug.cgi?id=76056
 

Modified: trunk/Source/WebCore/inspector/front-end/ConsoleMessage.js (104713 => 104714)


--- trunk/Source/WebCore/inspector/front-end/ConsoleMessage.js	2012-01-11 16:18:17 UTC (rev 104713)
+++ trunk/Source/WebCore/inspector/front-end/ConsoleMessage.js	2012-01-11 16:35:00 UTC (rev 104714)
@@ -152,9 +152,16 @@
         }
 
         // This is used for inline message bubbles in SourceFrames, or other plain-text representations.
-        this.message = (urlElement ? urlElement.textContent + " " : "") + messageText.textContent;
+        this._message = messageText.textContent;
     },
 
+    get message()
+    {
+        // force message formatting
+        var formattedMessage = this.formattedMessage;
+        return this._message;
+    },
+   
     get formattedMessage()
     {
         if (!this._formattedMessage)
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to