Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2016 the V8 project authors. All rights reserved. | 1 // Copyright 2016 the V8 project 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 "src/inspector/v8-stack-trace-impl.h" | 5 #include "src/inspector/v8-stack-trace-impl.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 | 8 |
| 9 #include "src/inspector/v8-debugger.h" | 9 #include "src/inspector/v8-debugger.h" |
| 10 #include "src/inspector/wasm-translation.h" | 10 #include "src/inspector/wasm-translation.h" |
| (...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 119 const { | 119 const { |
| 120 return protocol::Runtime::CallFrame::create() | 120 return protocol::Runtime::CallFrame::create() |
| 121 .setFunctionName(m_functionName) | 121 .setFunctionName(m_functionName) |
| 122 .setScriptId(m_scriptId) | 122 .setScriptId(m_scriptId) |
| 123 .setUrl(m_sourceURL) | 123 .setUrl(m_sourceURL) |
| 124 .setLineNumber(m_lineNumber) | 124 .setLineNumber(m_lineNumber) |
| 125 .setColumnNumber(m_columnNumber) | 125 .setColumnNumber(m_columnNumber) |
| 126 .build(); | 126 .build(); |
| 127 } | 127 } |
| 128 | 128 |
| 129 bool StackFrame::isEqual(StackFrame* frame) const { | |
| 130 if (scriptId() != frame->scriptId()) return false; | |
|
dgozman
2017/05/16 20:19:25
return m_scriptId == frame->m_scriptId && ....;
kozy
2017/05/16 21:18:48
Done.
| |
| 131 if (lineNumber() != frame->lineNumber()) return false; | |
| 132 if (columnNumber() != frame->columnNumber()) return false; | |
| 133 return true; | |
| 134 } | |
| 135 | |
| 129 // static | 136 // static |
| 130 void V8StackTraceImpl::setCaptureStackTraceForUncaughtExceptions( | 137 void V8StackTraceImpl::setCaptureStackTraceForUncaughtExceptions( |
| 131 v8::Isolate* isolate, bool capture) { | 138 v8::Isolate* isolate, bool capture) { |
| 132 isolate->SetCaptureStackTraceForUncaughtExceptions( | 139 isolate->SetCaptureStackTraceForUncaughtExceptions( |
| 133 capture, V8StackTraceImpl::maxCallStackSizeToCapture); | 140 capture, V8StackTraceImpl::maxCallStackSizeToCapture); |
| 134 } | 141 } |
| 135 | 142 |
| 136 // static | 143 // static |
| 137 std::unique_ptr<V8StackTraceImpl> V8StackTraceImpl::create( | 144 std::unique_ptr<V8StackTraceImpl> V8StackTraceImpl::create( |
| 138 V8Debugger* debugger, int contextGroupId, | 145 V8Debugger* debugger, int contextGroupId, |
| (...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 234 stackTrace.append(':'); | 241 stackTrace.append(':'); |
| 235 stackTrace.append(String16::fromInteger(frame.lineNumber() + 1)); | 242 stackTrace.append(String16::fromInteger(frame.lineNumber() + 1)); |
| 236 stackTrace.append(':'); | 243 stackTrace.append(':'); |
| 237 stackTrace.append(String16::fromInteger(frame.columnNumber() + 1)); | 244 stackTrace.append(String16::fromInteger(frame.columnNumber() + 1)); |
| 238 stackTrace.append(')'); | 245 stackTrace.append(')'); |
| 239 } | 246 } |
| 240 String16 string = stackTrace.toString(); | 247 String16 string = stackTrace.toString(); |
| 241 return StringBufferImpl::adopt(string); | 248 return StringBufferImpl::adopt(string); |
| 242 } | 249 } |
| 243 | 250 |
| 251 bool V8StackTraceImpl::isEqualIgnoringTopFrame( | |
| 252 V8StackTraceImpl* stackTrace) const { | |
| 253 StackFrameIterator current(this); | |
| 254 StackFrameIterator target(stackTrace); | |
| 255 | |
| 256 current.next(); | |
| 257 target.next(); | |
| 258 while (!current.done() && !target.done()) { | |
| 259 if (!current.frame()->isEqual(target.frame())) { | |
| 260 return false; | |
| 261 } | |
| 262 current.next(); | |
| 263 target.next(); | |
| 264 } | |
| 265 return current.done() == target.done(); | |
| 266 } | |
| 267 | |
| 268 V8StackTraceImpl::StackFrameIterator::StackFrameIterator( | |
| 269 const V8StackTraceImpl* stackTrace) | |
| 270 : m_currentIt(stackTrace->m_frames.begin()), | |
| 271 m_currentEnd(stackTrace->m_frames.end()), | |
| 272 m_parent(stackTrace->m_asyncParent.lock().get()) {} | |
| 273 | |
| 274 void V8StackTraceImpl::StackFrameIterator::next() { | |
| 275 if (m_currentIt == m_currentEnd) return; | |
| 276 ++m_currentIt; | |
| 277 while (m_currentIt == m_currentEnd && m_parent) { | |
| 278 const std::vector<std::shared_ptr<StackFrame>>& frames = m_parent->frames(); | |
| 279 m_currentIt = frames.begin(); | |
| 280 if (m_parent->description() == "async function") ++m_currentIt; | |
| 281 m_currentEnd = frames.end(); | |
| 282 m_parent = m_parent->parent().lock().get(); | |
| 283 } | |
| 284 } | |
| 285 | |
| 286 bool V8StackTraceImpl::StackFrameIterator::done() { | |
| 287 return m_currentIt == m_currentEnd; | |
| 288 } | |
| 289 | |
| 290 StackFrame* V8StackTraceImpl::StackFrameIterator::frame() { | |
| 291 return m_currentIt->get(); | |
| 292 } | |
| 293 | |
| 244 // static | 294 // static |
| 245 std::shared_ptr<AsyncStackTrace> AsyncStackTrace::capture( | 295 std::shared_ptr<AsyncStackTrace> AsyncStackTrace::capture( |
| 246 V8Debugger* debugger, int contextGroupId, const String16& description, | 296 V8Debugger* debugger, int contextGroupId, const String16& description, |
| 247 int maxStackSize) { | 297 int maxStackSize) { |
| 248 DCHECK(debugger); | 298 DCHECK(debugger); |
| 249 | 299 |
| 250 v8::Isolate* isolate = debugger->isolate(); | 300 v8::Isolate* isolate = debugger->isolate(); |
| 251 v8::HandleScope handleScope(isolate); | 301 v8::HandleScope handleScope(isolate); |
| 252 | 302 |
| 253 std::vector<std::shared_ptr<StackFrame>> frames; | 303 std::vector<std::shared_ptr<StackFrame>> frames; |
| (...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 311 return m_asyncParent; | 361 return m_asyncParent; |
| 312 } | 362 } |
| 313 | 363 |
| 314 std::weak_ptr<AsyncStackTrace> AsyncStackTrace::creation() const { | 364 std::weak_ptr<AsyncStackTrace> AsyncStackTrace::creation() const { |
| 315 return m_asyncCreation; | 365 return m_asyncCreation; |
| 316 } | 366 } |
| 317 | 367 |
| 318 bool AsyncStackTrace::isEmpty() const { return m_frames.empty(); } | 368 bool AsyncStackTrace::isEmpty() const { return m_frames.empty(); } |
| 319 | 369 |
| 320 } // namespace v8_inspector | 370 } // namespace v8_inspector |
| OLD | NEW |