Title: [194941] branches/safari-601-branch/Source/WebInspectorUI
- Revision
- 194941
- Author
- matthew_han...@apple.com
- Date
- 2016-01-12 17:41:23 -0800 (Tue, 12 Jan 2016)
Log Message
Merge r194066. rdar://problem/24101252
Modified Paths
Diff
Modified: branches/safari-601-branch/Source/WebInspectorUI/ChangeLog (194940 => 194941)
--- branches/safari-601-branch/Source/WebInspectorUI/ChangeLog 2016-01-13 01:41:21 UTC (rev 194940)
+++ branches/safari-601-branch/Source/WebInspectorUI/ChangeLog 2016-01-13 01:41:23 UTC (rev 194941)
@@ -1,5 +1,21 @@
2016-01-12 Matthew Hanson <matthew_han...@apple.com>
+ Merge r194066. rdar://problem/24101252
+
+ 2015-12-14 Joseph Pecoraro <pecor...@apple.com>
+
+ Web Inspector: Copy message from console with a stack trace does not include source code locations
+ https://bugs.webkit.org/show_bug.cgi?id=152270
+
+ Reviewed by Timothy Hatcher.
+
+ * UserInterface/Views/ConsoleMessageView.js:
+ (WebInspector.ConsoleMessageView.prototype.toClipboardString):
+ When the the StackTrace was upgraded to a real collection of CallFrame
+ object's the CallFrame's got real SourceCodeLocation properties.
+
+2016-01-12 Matthew Hanson <matthew_han...@apple.com>
+
Merge r194009. rdar://problem/24101259
2015-12-12 Joseph Pecoraro <pecor...@apple.com>
Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/ConsoleMessageView.js (194940 => 194941)
--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/ConsoleMessageView.js 2016-01-13 01:41:21 UTC (rev 194940)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/ConsoleMessageView.js 2016-01-13 01:41:23 UTC (rev 194941)
@@ -196,8 +196,8 @@
if (hasStackTrace) {
this._message.stackTrace.callFrames.forEach(function(frame) {
clipboardString += "\n\t" + (frame.functionName || WebInspector.UIString("(anonymous function)"));
- if (frame.url)
- clipboardString += " (" + WebInspector.displayNameForURL(frame.url) + ", line " + frame.lineNumber + ")";
+ if (frame.sourceCodeLocation)
+ clipboardString += " (" + frame.sourceCodeLocation.originalLocationString() + ")";
});
} else {
var repeatString = this.repeatCount > 1 ? "x" + this.repeatCount : "";
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
