Title: [104797] branches/chromium/963
- Revision
- 104797
- Author
- pfeld...@chromium.org
- Date
- 2012-01-12 00:02:18 -0800 (Thu, 12 Jan 2012)
Log Message
Merge 104714 - 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:
TBR=pfeld...@chromium.org
BUG=109861
Review URL: http://codereview.chromium.org/9193003
Modified Paths
Diff
Modified: branches/chromium/963/LayoutTests/http/tests/inspector-enabled/console-log-before-frame-navigation.html (104796 => 104797)
--- branches/chromium/963/LayoutTests/http/tests/inspector-enabled/console-log-before-frame-navigation.html 2012-01-12 07:56:04 UTC (rev 104796)
+++ branches/chromium/963/LayoutTests/http/tests/inspector-enabled/console-log-before-frame-navigation.html 2012-01-12 08:02:18 UTC (rev 104797)
@@ -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: branches/chromium/963/LayoutTests/inspector/debugger/source-frame-expected.txt (104796 => 104797)
--- branches/chromium/963/LayoutTests/inspector/debugger/source-frame-expected.txt 2012-01-12 07:56:04 UTC (rev 104796)
+++ branches/chromium/963/LayoutTests/inspector/debugger/source-frame-expected.txt 2012-01-12 08:02:18 UTC (rev 104797)
@@ -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: branches/chromium/963/Source/WebCore/inspector/front-end/ConsoleMessage.js (104796 => 104797)
--- branches/chromium/963/Source/WebCore/inspector/front-end/ConsoleMessage.js 2012-01-12 07:56:04 UTC (rev 104796)
+++ branches/chromium/963/Source/WebCore/inspector/front-end/ConsoleMessage.js 2012-01-12 08:02:18 UTC (rev 104797)
@@ -157,9 +157,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
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
