Title: [108510] branches/chromium/1025
- Revision
- 108510
- Author
- pfeld...@chromium.org
- Date
- 2012-02-22 09:26:14 -0800 (Wed, 22 Feb 2012)
Log Message
Merge 107681 - Web Inspector: [REGRESSION] Copy Stack Trace is broken
https://bugs.webkit.org/show_bug.cgi?id=78583
Reviewed by Yury Semikhatsky.
Source/WebCore:
Test: inspector/debugger/copy-stack-trace.html
* inspector/front-end/CallStackSidebarPane.js:
(WebInspector.CallStackSidebarPane.prototype._copyStackTrace):
LayoutTests:
* inspector/debugger/copy-stack-trace-expected.txt: Added.
* inspector/debugger/copy-stack-trace.html: Added.
TBR=pfeld...@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9430052
Modified Paths
Added Paths
Diff
Copied: branches/chromium/1025/LayoutTests/inspector/debugger/copy-stack-trace-expected.txt (from rev 107681, trunk/LayoutTests/inspector/debugger/copy-stack-trace-expected.txt) (0 => 108510)
--- branches/chromium/1025/LayoutTests/inspector/debugger/copy-stack-trace-expected.txt (rev 0)
+++ branches/chromium/1025/LayoutTests/inspector/debugger/copy-stack-trace-expected.txt 2012-02-22 17:26:14 UTC (rev 108510)
@@ -0,0 +1,12 @@
+Tests that debugger will copy valid stack trace upon context menu action.
+
+Debugger was enabled.
+Set timer for test function.
+Script execution paused.
+functionBaz (copy-stack-trace.html:19)
+functionBar (copy-stack-trace.html:14)
+testFunction (copy-stack-trace.html:9)
+
+Script execution resumed.
+Debugger was disabled.
+
Copied: branches/chromium/1025/LayoutTests/inspector/debugger/copy-stack-trace.html (from rev 107681, trunk/LayoutTests/inspector/debugger/copy-stack-trace.html) (0 => 108510)
--- branches/chromium/1025/LayoutTests/inspector/debugger/copy-stack-trace.html (rev 0)
+++ branches/chromium/1025/LayoutTests/inspector/debugger/copy-stack-trace.html 2012-02-22 17:26:14 UTC (rev 108510)
@@ -0,0 +1,48 @@
+<html>
+<head>
+<script src=""
+<script src=""
+<script>
+
+function testFunction()
+{
+ functionBar();
+}
+
+function functionBar()
+{
+ functionBaz();
+}
+
+function functionBaz()
+{
+ debugger;
+}
+
+var test = function()
+{
+ InspectorTest.startDebuggerTest(step1);
+
+ function step1()
+ {
+ InspectorTest.runTestFunctionAndWaitUntilPaused(step2);
+ }
+
+ function step2()
+ {
+ InspectorFrontendHost.copyText = InspectorTest.addResult.bind(InspectorTest);
+ WebInspector.panels.scripts.sidebarPanes.callstack._copyStackTrace();
+ InspectorTest.completeDebuggerTest();
+ }
+}
+
+</script>
+</head>
+
+<body _onload_="runTest()">
+<p>
+Tests that debugger will copy valid stack trace upon context menu action.
+</p>
+
+</body>
+</html>
Modified: branches/chromium/1025/Source/WebCore/inspector/front-end/CallStackSidebarPane.js (108509 => 108510)
--- branches/chromium/1025/Source/WebCore/inspector/front-end/CallStackSidebarPane.js 2012-02-22 17:09:53 UTC (rev 108509)
+++ branches/chromium/1025/Source/WebCore/inspector/front-end/CallStackSidebarPane.js 2012-02-22 17:26:14 UTC (rev 108510)
@@ -126,7 +126,7 @@
{
var text = "";
for (var i = 0; i < this.placards.length; ++i)
- text += this.placards[i]._text + "\n";
+ text += this.placards[i].title + " (" + this.placards[i].subtitle + ")\n";
InspectorFrontendHost.copyText(text);
},
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
