| Index: third_party/WebKit/Source/platform/v8_inspector/V8StackTraceImpl.cpp
|
| diff --git a/third_party/WebKit/Source/platform/v8_inspector/V8StackTraceImpl.cpp b/third_party/WebKit/Source/platform/v8_inspector/V8StackTraceImpl.cpp
|
| index 8221c3a986cafcffede4715631b043ffb4be4554..0bf639c54052ea40c369d8c3ec402eccc9082964 100644
|
| --- a/third_party/WebKit/Source/platform/v8_inspector/V8StackTraceImpl.cpp
|
| +++ b/third_party/WebKit/Source/platform/v8_inspector/V8StackTraceImpl.cpp
|
| @@ -6,7 +6,7 @@
|
|
|
| #include "platform/inspector_protocol/Platform.h"
|
| #include "platform/inspector_protocol/String16.h"
|
| -#include "platform/v8_inspector/V8DebuggerImpl.h"
|
| +#include "platform/v8_inspector/V8InspectorImpl.h"
|
| #include "platform/v8_inspector/V8StringUtil.h"
|
|
|
| #include <v8-debug.h>
|
| @@ -105,7 +105,7 @@ void V8StackTraceImpl::setCaptureStackTraceForUncaughtExceptions(v8::Isolate* is
|
| }
|
|
|
| // static
|
| -std::unique_ptr<V8StackTraceImpl> V8StackTraceImpl::create(V8DebuggerImpl* debugger, int contextGroupId, v8::Local<v8::StackTrace> stackTrace, size_t maxStackSize, const String16& description)
|
| +std::unique_ptr<V8StackTraceImpl> V8StackTraceImpl::create(V8InspectorImpl* inspector, int contextGroupId, v8::Local<v8::StackTrace> stackTrace, size_t maxStackSize, const String16& description)
|
| {
|
| v8::Isolate* isolate = v8::Isolate::GetCurrent();
|
| v8::HandleScope scope(isolate);
|
| @@ -115,9 +115,9 @@ std::unique_ptr<V8StackTraceImpl> V8StackTraceImpl::create(V8DebuggerImpl* debug
|
|
|
| int maxAsyncCallChainDepth = 1;
|
| V8StackTraceImpl* asyncCallChain = nullptr;
|
| - if (debugger && maxStackSize > 1) {
|
| - asyncCallChain = debugger->currentAsyncCallChain();
|
| - maxAsyncCallChainDepth = debugger->maxAsyncCallChainDepth();
|
| + if (inspector && maxStackSize > 1) {
|
| + asyncCallChain = inspector->currentAsyncCallChain();
|
| + maxAsyncCallChainDepth = inspector->maxAsyncCallChainDepth();
|
| }
|
| // Do not accidentally append async call chain from another group. This should not
|
| // happen if we have proper instrumentation, but let's double-check to be safe.
|
| @@ -147,7 +147,7 @@ std::unique_ptr<V8StackTraceImpl> V8StackTraceImpl::create(V8DebuggerImpl* debug
|
| return result;
|
| }
|
|
|
| -std::unique_ptr<V8StackTraceImpl> V8StackTraceImpl::capture(V8DebuggerImpl* debugger, int contextGroupId, size_t maxStackSize, const String16& description)
|
| +std::unique_ptr<V8StackTraceImpl> V8StackTraceImpl::capture(V8InspectorImpl* inspector, int contextGroupId, size_t maxStackSize, const String16& description)
|
| {
|
| v8::Isolate* isolate = v8::Isolate::GetCurrent();
|
| v8::HandleScope handleScope(isolate);
|
| @@ -158,7 +158,7 @@ std::unique_ptr<V8StackTraceImpl> V8StackTraceImpl::capture(V8DebuggerImpl* debu
|
| #endif
|
| stackTrace = v8::StackTrace::CurrentStackTrace(isolate, maxStackSize, stackTraceOptions);
|
| }
|
| - return V8StackTraceImpl::create(debugger, contextGroupId, stackTrace, maxStackSize, description);
|
| + return V8StackTraceImpl::create(inspector, contextGroupId, stackTrace, maxStackSize, description);
|
| }
|
|
|
| std::unique_ptr<V8StackTrace> V8StackTraceImpl::clone()
|
| @@ -242,11 +242,11 @@ std::unique_ptr<protocol::Runtime::StackTrace> V8StackTraceImpl::buildInspectorO
|
| return stackTrace;
|
| }
|
|
|
| -std::unique_ptr<protocol::Runtime::StackTrace> V8StackTraceImpl::buildInspectorObjectForTail(V8DebuggerImpl* debugger) const
|
| +std::unique_ptr<protocol::Runtime::StackTrace> V8StackTraceImpl::buildInspectorObjectForTail(V8InspectorImpl* inspector) const
|
| {
|
| v8::HandleScope handleScope(v8::Isolate::GetCurrent());
|
| // Next call collapses possible empty stack and ensures maxAsyncCallChainDepth.
|
| - std::unique_ptr<V8StackTraceImpl> fullChain = V8StackTraceImpl::create(debugger, m_contextGroupId, v8::Local<v8::StackTrace>(), V8StackTraceImpl::maxCallStackSizeToCapture);
|
| + std::unique_ptr<V8StackTraceImpl> fullChain = V8StackTraceImpl::create(inspector, m_contextGroupId, v8::Local<v8::StackTrace>(), V8StackTraceImpl::maxCallStackSizeToCapture);
|
| if (!fullChain || !fullChain->m_parent)
|
| return nullptr;
|
| return fullChain->m_parent->buildInspectorObjectImpl();
|
|
|