Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(522)

Side by Side Diff: Source/WebCore/inspector/front-end/ConsoleMessage.js

Issue 9193003: Merge 104714 - Web Inspector: "undefined" instead of error message in the SourceFrame. (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/963/
Patch Set: Created 8 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « LayoutTests/inspector/debugger/source-frame-expected.txt ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2011 Google Inc. All rights reserved. 2 * Copyright (C) 2011 Google Inc. All rights reserved.
3 * Copyright (C) 2007, 2008 Apple Inc. All rights reserved. 3 * Copyright (C) 2007, 2008 Apple Inc. All rights reserved.
4 * Copyright (C) 2009 Joseph Pecoraro 4 * Copyright (C) 2009 Joseph Pecoraro
5 * 5 *
6 * Redistribution and use in source and binary forms, with or without 6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions 7 * modification, are permitted provided that the following conditions
8 * are met: 8 * are met:
9 * 9 *
10 * 1. Redistributions of source code must retain the above copyright 10 * 1. Redistributions of source code must retain the above copyright
(...skipping 139 matching lines...) Expand 10 before | Expand all | Expand 10 after
150 content.treeElementForTest = root; 150 content.treeElementForTest = root;
151 treeOutline.appendChild(root); 151 treeOutline.appendChild(root);
152 if (this.type === WebInspector.ConsoleMessage.MessageType.Trace) 152 if (this.type === WebInspector.ConsoleMessage.MessageType.Trace)
153 root.expand(); 153 root.expand();
154 154
155 this._populateStackTraceTreeElement(root); 155 this._populateStackTraceTreeElement(root);
156 this._formattedMessage = ol; 156 this._formattedMessage = ol;
157 } 157 }
158 158
159 // This is used for inline message bubbles in SourceFrames, or other pla in-text representations. 159 // This is used for inline message bubbles in SourceFrames, or other pla in-text representations.
160 this.message = (urlElement ? urlElement.textContent + " " : "") + messag eText.textContent; 160 this._message = messageText.textContent;
161 }, 161 },
162 162
163 get message()
164 {
165 // force message formatting
166 var formattedMessage = this.formattedMessage;
167 return this._message;
168 },
169
163 get formattedMessage() 170 get formattedMessage()
164 { 171 {
165 if (!this._formattedMessage) 172 if (!this._formattedMessage)
166 this._formatMessage(); 173 this._formatMessage();
167 return this._formattedMessage; 174 return this._formattedMessage;
168 }, 175 },
169 176
170 _linkifyLocation: function(url, lineNumber, columnNumber) 177 _linkifyLocation: function(url, lineNumber, columnNumber)
171 { 178 {
172 // FIXME(62725): stack trace line/column numbers are one-based. 179 // FIXME(62725): stack trace line/column numbers are one-based.
(...skipping 415 matching lines...) Expand 10 before | Expand all | Expand 10 after
588 && (this._request === msg._request); 595 && (this._request === msg._request);
589 }, 596 },
590 597
591 get stackTrace() 598 get stackTrace()
592 { 599 {
593 return this._stackTrace; 600 return this._stackTrace;
594 } 601 }
595 } 602 }
596 603
597 WebInspector.ConsoleMessageImpl.prototype.__proto__ = WebInspector.ConsoleMessag e.prototype; 604 WebInspector.ConsoleMessageImpl.prototype.__proto__ = WebInspector.ConsoleMessag e.prototype;
OLDNEW
« no previous file with comments | « LayoutTests/inspector/debugger/source-frame-expected.txt ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698