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

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

Issue 1532413002: Added Dartium changes onto 45.0.2454.104 (Closed) Base URL: http://src.chromium.org/blink/branches/chromium/2454
Patch Set: Created 5 years 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
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 23 matching lines...) Expand all
34 #include "platform/TracedValue.h" 34 #include "platform/TracedValue.h"
35 35
36 namespace blink { 36 namespace blink {
37 37
38 ScriptCallFrame::ScriptCallFrame() 38 ScriptCallFrame::ScriptCallFrame()
39 : m_functionName("undefined") 39 : m_functionName("undefined")
40 , m_scriptId("") 40 , m_scriptId("")
41 , m_scriptName("undefined") 41 , m_scriptName("undefined")
42 , m_lineNumber(0) 42 , m_lineNumber(0)
43 , m_column(0) 43 , m_column(0)
44 , m_isEmpty(true)
44 { 45 {
45 } 46 }
46 47
47 ScriptCallFrame::ScriptCallFrame(const String& functionName, const String& scrip tId, const String& scriptName, unsigned lineNumber, unsigned column) 48 ScriptCallFrame::ScriptCallFrame(const String& functionName, const String& scrip tId, const String& scriptName, unsigned lineNumber, unsigned column)
48 : m_functionName(functionName) 49 : m_functionName(functionName)
49 , m_scriptId(scriptId) 50 , m_scriptId(scriptId)
50 , m_scriptName(scriptName) 51 , m_scriptName(scriptName)
51 , m_lineNumber(lineNumber) 52 , m_lineNumber(lineNumber)
52 , m_column(column) 53 , m_column(column)
54 , m_isEmpty(false)
53 { 55 {
54 } 56 }
55 57
56 ScriptCallFrame::~ScriptCallFrame() 58 ScriptCallFrame::~ScriptCallFrame()
57 { 59 {
58 } 60 }
59 61
60 // buildInspectorObject() and toTracedValue() should set the same fields. 62 // buildInspectorObject() and toTracedValue() should set the same fields.
61 // If either of them is modified, the other should be also modified. 63 // If either of them is modified, the other should be also modified.
62 PassRefPtr<TypeBuilder::Console::CallFrame> ScriptCallFrame::buildInspectorObjec t() const 64 PassRefPtr<TypeBuilder::Console::CallFrame> ScriptCallFrame::buildInspectorObjec t() const
(...skipping 12 matching lines...) Expand all
75 value->beginDictionary(); 77 value->beginDictionary();
76 value->setString("functionName", m_functionName); 78 value->setString("functionName", m_functionName);
77 value->setString("scriptId", m_scriptId); 79 value->setString("scriptId", m_scriptId);
78 value->setString("url", m_scriptName); 80 value->setString("url", m_scriptName);
79 value->setInteger("lineNumber", m_lineNumber); 81 value->setInteger("lineNumber", m_lineNumber);
80 value->setInteger("columnNumber", m_column); 82 value->setInteger("columnNumber", m_column);
81 value->endDictionary(); 83 value->endDictionary();
82 } 84 }
83 85
84 } // namespace blink 86 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/inspector/ScriptCallFrame.h ('k') | Source/devtools/front_end/sdk/ResourceTreeModel.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698