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

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

Issue 464293002: [DevTools] ConsoleMessage storage moved from ConsoleAgent (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@remove-can-generate
Patch Set: Created 6 years, 4 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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "config.h" 5 #include "config.h"
6 #include "core/inspector/ConsoleMessage.h" 6 #include "core/inspector/ConsoleMessage.h"
7 7
8 #include "bindings/core/v8/ScriptCallStackFactory.h"
8 #include "bindings/core/v8/ScriptValue.h" 9 #include "bindings/core/v8/ScriptValue.h"
9 #include "core/inspector/ScriptArguments.h" 10 #include "core/inspector/ScriptArguments.h"
11 #include "wtf/CurrentTime.h"
12 #include "wtf/PassOwnPtr.h"
10 13
11 namespace blink { 14 namespace blink {
12 15
13 ConsoleMessage::ConsoleMessage(MessageSource source, 16 ConsoleMessage::ConsoleMessage(MessageSource source,
14 MessageLevel level, 17 MessageLevel level,
15 const String& message, 18 const String& message,
16 const String& url, 19 const String& url,
17 unsigned lineNumber, 20 unsigned lineNumber,
18 unsigned columnNumber) 21 unsigned columnNumber)
19 : m_source(source) 22 : m_source(source)
20 , m_level(level) 23 , m_level(level)
21 , m_type(LogMessageType) 24 , m_type(LogMessageType)
22 , m_message(message) 25 , m_message(message)
23 , m_url(url) 26 , m_url(url)
24 , m_lineNumber(lineNumber) 27 , m_lineNumber(lineNumber)
25 , m_columnNumber(columnNumber) 28 , m_columnNumber(columnNumber)
26 , m_requestIdentifier(0) 29 , m_requestIdentifier(0)
30 , m_timestamp(WTF::currentTime())
27 , m_workerProxy(nullptr) 31 , m_workerProxy(nullptr)
28 { 32 {
29 } 33 }
30 34
31 ConsoleMessage::~ConsoleMessage() 35 ConsoleMessage::~ConsoleMessage()
32 { 36 {
33 } 37 }
34 38
35 MessageType ConsoleMessage::type() const 39 MessageType ConsoleMessage::type() const
36 { 40 {
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
100 unsigned long ConsoleMessage::requestIdentifier() const 104 unsigned long ConsoleMessage::requestIdentifier() const
101 { 105 {
102 return m_requestIdentifier; 106 return m_requestIdentifier;
103 } 107 }
104 108
105 void ConsoleMessage::setRequestIdentifier(unsigned long requestIdentifier) 109 void ConsoleMessage::setRequestIdentifier(unsigned long requestIdentifier)
106 { 110 {
107 m_requestIdentifier = requestIdentifier; 111 m_requestIdentifier = requestIdentifier;
108 } 112 }
109 113
114 double ConsoleMessage::timestamp() const
115 {
116 return m_timestamp;
117 }
118
119 void ConsoleMessage::setTimestamp(double timestamp)
120 {
121 m_timestamp = timestamp;
122 }
123
110 MessageSource ConsoleMessage::source() const 124 MessageSource ConsoleMessage::source() const
111 { 125 {
112 return m_source; 126 return m_source;
113 } 127 }
114 128
115 MessageLevel ConsoleMessage::level() const 129 MessageLevel ConsoleMessage::level() const
116 { 130 {
117 return m_level; 131 return m_level;
118 } 132 }
119 133
120 const String& ConsoleMessage::message() const 134 const String& ConsoleMessage::message() const
121 { 135 {
122 return m_message; 136 return m_message;
123 } 137 }
124 138
125 unsigned ConsoleMessage::columnNumber() const 139 unsigned ConsoleMessage::columnNumber() const
126 { 140 {
127 return m_columnNumber; 141 return m_columnNumber;
128 } 142 }
129 143
144 void ConsoleMessage::windowCleared(LocalDOMWindow* window)
145 {
146 if (m_scriptState && m_scriptState->get() && m_scriptState->get()->domWindow () == window) {
147 m_scriptState->clear();
148 m_scriptState.clear();
149 }
150
151 if (!m_scriptArguments)
152 return;
153 if (m_scriptArguments->scriptState()->domWindow() != window)
154 return;
155 if (!m_message)
156 m_message = "<message collected>";
157 m_scriptArguments.clear();
158 }
159
160 unsigned ConsoleMessage::argumentCount()
161 {
162 if (m_scriptArguments)
163 return m_scriptArguments->argumentCount();
164 return 0;
165 }
166
167 void ConsoleMessage::autogenerateMetadata()
168 {
169 if (m_type == EndGroupMessageType)
170 return;
171
172 if (!m_callStack || m_source == ConsoleAPIMessageSource)
173 m_callStack = createScriptCallStackForConsole(ScriptCallStack::maxCallSt ackSizeToCapture, true);
174
175 if (m_callStack && m_callStack->size()) {
176 const ScriptCallFrame& frame = m_callStack->at(0);
177 m_url = frame.sourceURL();
178 m_lineNumber = frame.lineNumber();
179 m_columnNumber = frame.columnNumber();
180 return;
181 }
182
183 m_callStack.clear();
184 }
185
130 void ConsoleMessage::trace(Visitor* visitor) 186 void ConsoleMessage::trace(Visitor* visitor)
131 { 187 {
132 visitor->trace(m_callStack); 188 visitor->trace(m_callStack);
133 visitor->trace(m_scriptArguments); 189 visitor->trace(m_scriptArguments);
134 } 190 }
135 191
136 } // namespace blink 192 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698