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

Side by Side Diff: Source/core/inspector/ScriptCallFrame.cpp

Issue 23717011: DevTools: Use scriptId for resolving stack frames in console messages (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Fixed tests Created 7 years, 3 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 | Annotate | Revision Log
« no previous file with comments | « Source/core/inspector/ScriptCallFrame.h ('k') | Source/devtools/front_end/ConsoleMessage.js » ('j') | 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) 2010 Google Inc. All rights reserved. 2 * Copyright (c) 2010 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 15 matching lines...) Expand all
26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
29 */ 29 */
30 30
31 #include "config.h" 31 #include "config.h"
32 #include "core/inspector/ScriptCallFrame.h" 32 #include "core/inspector/ScriptCallFrame.h"
33 33
34 namespace WebCore { 34 namespace WebCore {
35 35
36 ScriptCallFrame::ScriptCallFrame(const String& functionName, const String& scrip tName, unsigned lineNumber, unsigned column) 36 ScriptCallFrame::ScriptCallFrame(const String& functionName, const String& scrip tId, const String& scriptName, unsigned lineNumber, unsigned column)
37 : m_functionName(functionName) 37 : m_functionName(functionName)
38 , m_scriptId(scriptId)
38 , m_scriptName(scriptName) 39 , m_scriptName(scriptName)
39 , m_lineNumber(lineNumber) 40 , m_lineNumber(lineNumber)
40 , m_column(column) 41 , m_column(column)
41 { 42 {
42 } 43 }
43 44
44 ScriptCallFrame::~ScriptCallFrame() 45 ScriptCallFrame::~ScriptCallFrame()
45 { 46 {
46 } 47 }
47 48
48 bool ScriptCallFrame::isEqual(const ScriptCallFrame& o) const 49 bool ScriptCallFrame::isEqual(const ScriptCallFrame& o) const
49 { 50 {
50 return m_functionName == o.m_functionName 51 return m_functionName == o.m_functionName
52 && m_scriptId == o.m_scriptId
51 && m_scriptName == o.m_scriptName 53 && m_scriptName == o.m_scriptName
52 && m_lineNumber == o.m_lineNumber; 54 && m_lineNumber == o.m_lineNumber;
53 } 55 }
54 56
55 PassRefPtr<TypeBuilder::Console::CallFrame> ScriptCallFrame::buildInspectorObjec t() const 57 PassRefPtr<TypeBuilder::Console::CallFrame> ScriptCallFrame::buildInspectorObjec t() const
56 { 58 {
57 return TypeBuilder::Console::CallFrame::create() 59 return TypeBuilder::Console::CallFrame::create()
58 .setFunctionName(m_functionName) 60 .setFunctionName(m_functionName)
61 .setScriptId(m_scriptId)
59 .setUrl(m_scriptName) 62 .setUrl(m_scriptName)
60 .setLineNumber(m_lineNumber) 63 .setLineNumber(m_lineNumber)
61 .setColumnNumber(m_column) 64 .setColumnNumber(m_column)
62 .release(); 65 .release();
63 } 66 }
64 67
65 } // namespace WebCore 68 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/inspector/ScriptCallFrame.h ('k') | Source/devtools/front_end/ConsoleMessage.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698