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

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

Issue 688623002: [Thread-safe] Remove TracedValue::setArray (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 1 month 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 13 matching lines...) Expand all
24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
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 #include "platform/TracedValue.h"
35
34 namespace blink { 36 namespace blink {
35 37
36 ScriptCallFrame::ScriptCallFrame() 38 ScriptCallFrame::ScriptCallFrame()
37 : m_functionName("undefined") 39 : m_functionName("undefined")
38 , m_scriptId("") 40 , m_scriptId("")
39 , m_scriptName("undefined") 41 , m_scriptName("undefined")
40 , m_lineNumber(0) 42 , m_lineNumber(0)
41 , m_column(0) 43 , m_column(0)
42 { 44 {
43 } 45 }
44 46
45 ScriptCallFrame::ScriptCallFrame(const String& functionName, const String& scrip tId, const String& scriptName, unsigned lineNumber, unsigned column) 47 ScriptCallFrame::ScriptCallFrame(const String& functionName, const String& scrip tId, const String& scriptName, unsigned lineNumber, unsigned column)
46 : m_functionName(functionName) 48 : m_functionName(functionName)
47 , m_scriptId(scriptId) 49 , m_scriptId(scriptId)
48 , m_scriptName(scriptName) 50 , m_scriptName(scriptName)
49 , m_lineNumber(lineNumber) 51 , m_lineNumber(lineNumber)
50 , m_column(column) 52 , m_column(column)
51 { 53 {
52 } 54 }
53 55
54 ScriptCallFrame::~ScriptCallFrame() 56 ScriptCallFrame::~ScriptCallFrame()
55 { 57 {
56 } 58 }
57 59
60 // buildInspectorObject() and addInspectorObject() should set the same fields.
61 // If either of them is modified, the other should be also modified.
58 PassRefPtr<TypeBuilder::Console::CallFrame> ScriptCallFrame::buildInspectorObjec t() const 62 PassRefPtr<TypeBuilder::Console::CallFrame> ScriptCallFrame::buildInspectorObjec t() const
59 { 63 {
60 return TypeBuilder::Console::CallFrame::create() 64 return TypeBuilder::Console::CallFrame::create()
61 .setFunctionName(m_functionName) 65 .setFunctionName(m_functionName)
62 .setScriptId(m_scriptId) 66 .setScriptId(m_scriptId)
63 .setUrl(m_scriptName) 67 .setUrl(m_scriptName)
64 .setLineNumber(m_lineNumber) 68 .setLineNumber(m_lineNumber)
65 .setColumnNumber(m_column) 69 .setColumnNumber(m_column)
66 .release(); 70 .release();
67 } 71 }
68 72
73 void ScriptCallFrame::addInspectorObject(TracedValue* value) const
74 {
75 value->beginDictionary();
76 value->setString("functionName", m_functionName);
77 value->setString("scriptId", m_scriptId);
78 value->setString("url", m_scriptName);
79 value->setInteger("lineNumber", m_lineNumber);
80 value->setInteger("columnNumber", m_column);
81 value->endDictionary();
82 }
83
69 } // namespace blink 84 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698