diff options
| author | Ben Murdoch <benm@google.com> | 2010-02-02 04:52:44 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-02-02 04:52:44 -0800 |
| commit | c4766f7975447de3bab0811aac254e9d8042a46d (patch) | |
| tree | fa40ea1d6294a0b735f246c21fe8ced1e0c25b64 | |
| parent | 0ab568698cf196f00e6e8d49db6e0a06fcfe56b8 (diff) | |
| parent | 22ff7dd8d1b59441735a8c7a0fe8af07fcafb6a8 (diff) | |
| download | external_webkit-c4766f7975447de3bab0811aac254e9d8042a46d.zip external_webkit-c4766f7975447de3bab0811aac254e9d8042a46d.tar.gz external_webkit-c4766f7975447de3bab0811aac254e9d8042a46d.tar.bz2 | |
Merge "Cherry pick of WebKit revision r54138 (http://trac.webkit.org/changeset/54138) to add source and line number information to ScriptCallFrames when the caller is unknown."
| -rw-r--r-- | WebCore/bindings/js/ScriptCallStack.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/WebCore/bindings/js/ScriptCallStack.cpp b/WebCore/bindings/js/ScriptCallStack.cpp index 824a07b..a435588 100644 --- a/WebCore/bindings/js/ScriptCallStack.cpp +++ b/WebCore/bindings/js/ScriptCallStack.cpp @@ -54,14 +54,15 @@ ScriptCallStack::ScriptCallStack(ExecState* exec, const ArgList& args, unsigned exec->interpreter()->retrieveLastCaller(exec, signedLineNumber, sourceID, urlString, function); + unsigned lineNumber = signedLineNumber >= 0 ? signedLineNumber : 0; + if (function) { m_caller = asInternalFunction(function); - unsigned lineNumber = signedLineNumber >= 0 ? signedLineNumber : 0; m_frames.append(ScriptCallFrame(m_caller->name(m_exec), urlString, lineNumber, args, skipArgumentCount)); } else { // Caller is unknown, but we should still add the frame, because // something called us, and gave us arguments. - m_frames.append(ScriptCallFrame(UString(), UString(), 0, args, skipArgumentCount)); + m_frames.append(ScriptCallFrame(UString(), urlString, lineNumber, args, skipArgumentCount)); } } |