<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[194247] trunk/Source</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/194247">194247</a></dd>
<dt>Author</dt> <dd>joepeck@webkit.org</dd>
<dt>Date</dt> <dd>2015-12-17 16:20:18 -0800 (Thu, 17 Dec 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: Improve names in Debugger Call Stack section when paused
https://bugs.webkit.org/show_bug.cgi?id=152398
Reviewed by Brian Burg.
Source/JavaScriptCore:
* debugger/DebuggerCallFrame.cpp:
(JSC::DebuggerCallFrame::functionName):
Provide a better name from the underlying CallFrame.
* inspector/InjectedScriptSource.js:
(InjectedScript.CallFrameProxy):
Just call functionName, it will provide a better
than nothing function name.
* runtime/JSFunction.cpp:
(JSC::getCalculatedDisplayName):
Use emptyString().
* interpreter/CallFrame.h:
* interpreter/CallFrame.cpp:
(JSC::CallFrame::friendlyFunctionName):
This is the third similiar implementation of this,
but all other cases use other "StackFrame" objects.
Use the expected names for program code.
Source/WebInspectorUI:
* UserInterface/Controllers/DebuggerManager.js:
(WebInspector.DebuggerManager.prototype.debuggerDidPause):
Use a new fromPayload helper to construct the CallFrame and share code.
* UserInterface/Models/CallFrame.js:
(WebInspector.CallFrame.functionNameFromPayload):
(WebInspector.CallFrame.programCodeFromPayload):
(WebInspector.CallFrame.fromDebuggerPayload):
(WebInspector.CallFrame.fromPayload):
Add a new way to construct a call frame. There are two kinds of
CallFrame payloads in the protocol:
- Debugger.CallFrame, this new path
- Console.CallFrame, the pre-existing path</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoredebuggerDebuggerCallFramecpp">trunk/Source/JavaScriptCore/debugger/DebuggerCallFrame.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorInjectedScriptSourcejs">trunk/Source/JavaScriptCore/inspector/InjectedScriptSource.js</a></li>
<li><a href="#trunkSourceJavaScriptCoreinterpreterCallFramecpp">trunk/Source/JavaScriptCore/interpreter/CallFrame.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreinterpreterCallFrameh">trunk/Source/JavaScriptCore/interpreter/CallFrame.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSFunctioncpp">trunk/Source/JavaScriptCore/runtime/JSFunction.cpp</a></li>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceControllersDebuggerManagerjs">trunk/Source/WebInspectorUI/UserInterface/Controllers/DebuggerManager.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceModelsCallFramejs">trunk/Source/WebInspectorUI/UserInterface/Models/CallFrame.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (194246 => 194247)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2015-12-18 00:05:04 UTC (rev 194246)
+++ trunk/Source/JavaScriptCore/ChangeLog 2015-12-18 00:20:18 UTC (rev 194247)
</span><span class="lines">@@ -1,3 +1,30 @@
</span><ins>+2015-12-17 Joseph Pecoraro <pecoraro@apple.com>
+
+ Web Inspector: Improve names in Debugger Call Stack section when paused
+ https://bugs.webkit.org/show_bug.cgi?id=152398
+
+ Reviewed by Brian Burg.
+
+ * debugger/DebuggerCallFrame.cpp:
+ (JSC::DebuggerCallFrame::functionName):
+ Provide a better name from the underlying CallFrame.
+
+ * inspector/InjectedScriptSource.js:
+ (InjectedScript.CallFrameProxy):
+ Just call functionName, it will provide a better
+ than nothing function name.
+
+ * runtime/JSFunction.cpp:
+ (JSC::getCalculatedDisplayName):
+ Use emptyString().
+
+ * interpreter/CallFrame.h:
+ * interpreter/CallFrame.cpp:
+ (JSC::CallFrame::friendlyFunctionName):
+ This is the third similiar implementation of this,
+ but all other cases use other "StackFrame" objects.
+ Use the expected names for program code.
+
</ins><span class="cx"> 2015-12-16 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: Add JSContext Script Profiling
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredebuggerDebuggerCallFramecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/debugger/DebuggerCallFrame.cpp (194246 => 194247)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/debugger/DebuggerCallFrame.cpp 2015-12-18 00:05:04 UTC (rev 194246)
+++ trunk/Source/JavaScriptCore/debugger/DebuggerCallFrame.cpp 2015-12-18 00:20:18 UTC (rev 194247)
</span><span class="lines">@@ -128,11 +128,7 @@
</span><span class="cx"> ASSERT(isValid());
</span><span class="cx"> if (!isValid())
</span><span class="cx"> return String();
</span><del>- JSFunction* function = jsDynamicCast<JSFunction*>(m_callFrame->callee());
- if (!function)
- return String();
-
- return getCalculatedDisplayName(m_callFrame, function);
</del><ins>+ return m_callFrame->friendlyFunctionName();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> DebuggerScope* DebuggerCallFrame::scope()
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorInjectedScriptSourcejs"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/InjectedScriptSource.js (194246 => 194247)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/InjectedScriptSource.js 2015-12-18 00:05:04 UTC (rev 194246)
+++ trunk/Source/JavaScriptCore/inspector/InjectedScriptSource.js 2015-12-18 00:20:18 UTC (rev 194247)
</span><span class="lines">@@ -1344,7 +1344,7 @@
</span><span class="cx"> InjectedScript.CallFrameProxy = function(ordinal, callFrame)
</span><span class="cx"> {
</span><span class="cx"> this.callFrameId = "{\"ordinal\":" + ordinal + ",\"injectedScriptId\":" + injectedScriptId + "}";
</span><del>- this.functionName = (callFrame.type === "function" ? callFrame.functionName : "");
</del><ins>+ this.functionName = callFrame.functionName;
</ins><span class="cx"> this.location = {scriptId: String(callFrame.sourceID), lineNumber: callFrame.line, columnNumber: callFrame.column};
</span><span class="cx"> this.scopeChain = this._wrapScopeChain(callFrame);
</span><span class="cx"> this.this = injectedScript._wrapObject(callFrame.thisObject, "backtrace");
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinterpreterCallFramecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/interpreter/CallFrame.cpp (194246 => 194247)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/interpreter/CallFrame.cpp 2015-12-18 00:05:04 UTC (rev 194246)
+++ trunk/Source/JavaScriptCore/interpreter/CallFrame.cpp 2015-12-18 00:20:18 UTC (rev 194247)
</span><span class="lines">@@ -230,6 +230,26 @@
</span><span class="cx"> registers()[activationRegister.offset()] = lexicalEnvironment;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+String CallFrame::friendlyFunctionName()
+{
+ CodeBlock* codeBlock = this->codeBlock();
+ if (!codeBlock)
+ return emptyString();
+
+ switch (codeBlock->codeType()) {
+ case EvalCode:
+ return ASCIILiteral("eval code");
+ case ModuleCode:
+ return ASCIILiteral("module code");
+ case GlobalCode:
+ return ASCIILiteral("global code");
+ case FunctionCode:
+ if (callee())
+ return getCalculatedDisplayName(this, callee());
+ return emptyString();
+ }
+}
+
</ins><span class="cx"> void CallFrame::dump(PrintStream& out)
</span><span class="cx"> {
</span><span class="cx"> if (CodeBlock* codeBlock = this->codeBlock()) {
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinterpreterCallFrameh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/interpreter/CallFrame.h (194246 => 194247)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/interpreter/CallFrame.h 2015-12-18 00:05:04 UTC (rev 194246)
+++ trunk/Source/JavaScriptCore/interpreter/CallFrame.h 2015-12-18 00:20:18 UTC (rev 194247)
</span><span class="lines">@@ -243,6 +243,8 @@
</span><span class="cx"> void setCodeBlock(CodeBlock* codeBlock) { static_cast<Register*>(this)[JSStack::CodeBlock] = codeBlock; }
</span><span class="cx"> void setReturnPC(void* value) { callerFrameAndPC().pc = reinterpret_cast<Instruction*>(value); }
</span><span class="cx">
</span><ins>+ String friendlyFunctionName();
+
</ins><span class="cx"> // CallFrame::iterate() expects a Functor that implements the following method:
</span><span class="cx"> // StackVisitor::Status operator()(StackVisitor&);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSFunctioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSFunction.cpp (194246 => 194247)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSFunction.cpp 2015-12-18 00:05:04 UTC (rev 194246)
+++ trunk/Source/JavaScriptCore/runtime/JSFunction.cpp 2015-12-18 00:20:18 UTC (rev 194247)
</span><span class="lines">@@ -566,7 +566,7 @@
</span><span class="cx"> return function->calculatedDisplayName(callFrame);
</span><span class="cx"> if (InternalFunction* function = jsDynamicCast<InternalFunction*>(object))
</span><span class="cx"> return function->calculatedDisplayName(callFrame);
</span><del>- return "";
</del><ins>+ return emptyString();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace JSC
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (194246 => 194247)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2015-12-18 00:05:04 UTC (rev 194246)
+++ trunk/Source/WebInspectorUI/ChangeLog 2015-12-18 00:20:18 UTC (rev 194247)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2015-12-17 Joseph Pecoraro <pecoraro@apple.com>
+
+ Web Inspector: Improve names in Debugger Call Stack section when paused
+ https://bugs.webkit.org/show_bug.cgi?id=152398
+
+ Reviewed by Brian Burg.
+
+ * UserInterface/Controllers/DebuggerManager.js:
+ (WebInspector.DebuggerManager.prototype.debuggerDidPause):
+ Use a new fromPayload helper to construct the CallFrame and share code.
+
+ * UserInterface/Models/CallFrame.js:
+ (WebInspector.CallFrame.functionNameFromPayload):
+ (WebInspector.CallFrame.programCodeFromPayload):
+ (WebInspector.CallFrame.fromDebuggerPayload):
+ (WebInspector.CallFrame.fromPayload):
+ Add a new way to construct a call frame. There are two kinds of
+ CallFrame payloads in the protocol:
+ - Debugger.CallFrame, this new path
+ - Console.CallFrame, the pre-existing path
+
</ins><span class="cx"> 2015-12-17 Brian Burg <bburg@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: control whether to collect and dump protocol messages using a WebInspector.Setting
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceControllersDebuggerManagerjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Controllers/DebuggerManager.js (194246 => 194247)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Controllers/DebuggerManager.js 2015-12-18 00:05:04 UTC (rev 194246)
+++ trunk/Source/WebInspectorUI/UserInterface/Controllers/DebuggerManager.js 2015-12-18 00:20:18 UTC (rev 194247)
</span><span class="lines">@@ -489,9 +489,9 @@
</span><span class="cx"> // Exclude the case where the call frame is in the inspector code.
</span><span class="cx"> if (sourceCodeLocation.sourceCode.url && sourceCodeLocation.sourceCode.url.startsWith("__WebInspector"))
</span><span class="cx"> continue;
</span><del>- var thisObject = WebInspector.RemoteObject.fromPayload(callFramePayload.this);
- var scopeChain = this._scopeChainFromPayload(callFramePayload.scopeChain);
- var callFrame = new WebInspector.CallFrame(callFramePayload.callFrameId, sourceCodeLocation, callFramePayload.functionName, thisObject, scopeChain);
</del><ins>+
+ let scopeChain = this._scopeChainFromPayload(callFramePayload.scopeChain);
+ let callFrame = WebInspector.CallFrame.fromDebuggerPayload(callFramePayload, scopeChain, sourceCodeLocation);
</ins><span class="cx"> this._callFrames.push(callFrame);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceModelsCallFramejs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Models/CallFrame.js (194246 => 194247)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Models/CallFrame.js 2015-12-18 00:05:04 UTC (rev 194246)
+++ trunk/Source/WebInspectorUI/UserInterface/Models/CallFrame.js 2015-12-18 00:20:18 UTC (rev 194247)
</span><span class="lines">@@ -108,14 +108,43 @@
</span><span class="cx">
</span><span class="cx"> // Static
</span><span class="cx">
</span><ins>+ static functionNameFromPayload(payload)
+ {
+ let functionName = payload.functionName;
+ if (functionName === "global code")
+ return WebInspector.UIString("Global Code");
+ if (functionName === "eval code")
+ return WebInspector.UIString("Eval Code");
+ if (functionName === "module code")
+ return WebInspector.UIString("Module Code");
+ return functionName;
+ }
+
+ static programCodeFromPayload(payload)
+ {
+ return payload.functionName.endsWith(" code");
+ }
+
+ static fromDebuggerPayload(payload, scopeChain, sourceCodeLocation)
+ {
+ let id = payload.callFrameId;
+ let thisObject = WebInspector.RemoteObject.fromPayload(payload.this);
+ let functionName = WebInspector.CallFrame.functionNameFromPayload(payload);
+ let nativeCode = false;
+ let programCode = WebInspector.CallFrame.programCodeFromPayload(payload);
+
+ return new WebInspector.CallFrame(id, sourceCodeLocation, functionName, thisObject, scopeChain, nativeCode, programCode);
+ }
+
</ins><span class="cx"> static fromPayload(payload)
</span><span class="cx"> {
</span><span class="cx"> console.assert(payload);
</span><span class="cx">
</span><span class="cx"> let url = payload.url;
</span><span class="cx"> let nativeCode = false;
</span><del>- let programCode = false;
</del><span class="cx"> let sourceCodeLocation = null;
</span><ins>+ let functionName = WebInspector.CallFrame.functionNameFromPayload(payload);
+ let programCode = WebInspector.CallFrame.programCodeFromPayload(payload);
</ins><span class="cx">
</span><span class="cx"> if (!url || url === "[native code]") {
</span><span class="cx"> nativeCode = true;
</span><span class="lines">@@ -132,18 +161,6 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- let functionName = payload.functionName;
- if (payload.functionName === "global code") {
- functionName = WebInspector.UIString("Global Code");
- programCode = true;
- } else if (payload.functionName === "eval code") {
- functionName = WebInspector.UIString("Eval Code");
- programCode = true;
- } else if (payload.functionName === "module code") {
- functionName = WebInspector.UIString("Module Code");
- programCode = true;
- }
-
</del><span class="cx"> return new WebInspector.CallFrame(null, sourceCodeLocation, functionName, null, null, nativeCode, programCode);
</span><span class="cx"> }
</span><span class="cx"> };
</span></span></pre>
</div>
</div>
</body>
</html>