| Index: third_party/WebKit/Source/platform/v8_inspector/V8DebuggerImpl.cpp
|
| diff --git a/third_party/WebKit/Source/platform/v8_inspector/V8DebuggerImpl.cpp b/third_party/WebKit/Source/platform/v8_inspector/V8DebuggerImpl.cpp
|
| index 6ac1e0b95f0808f9a625c2ad0c6f381a4aed989a..5f7dc49ff3587cc91876607e9b82ecdf86f94810 100644
|
| --- a/third_party/WebKit/Source/platform/v8_inspector/V8DebuggerImpl.cpp
|
| +++ b/third_party/WebKit/Source/platform/v8_inspector/V8DebuggerImpl.cpp
|
| @@ -476,8 +476,10 @@ int V8DebuggerImpl::frameCount()
|
| return 0;
|
| }
|
|
|
| -PassOwnPtr<JavaScriptCallFrame> V8DebuggerImpl::wrapCallFrames()
|
| +PassOwnPtr<JavaScriptCallFrame> V8DebuggerImpl::currentCallFrames()
|
| {
|
| + if (!m_isolate->InContext())
|
| + return nullptr;
|
| v8::Local<v8::Value> currentCallFrameV8;
|
| if (m_executionState.IsEmpty()) {
|
| v8::Local<v8::Function> currentCallFrameFunction = v8::Local<v8::Function>::Cast(m_debuggerScript.Get(m_isolate)->Get(v8InternalizedString("currentCallFrame")));
|
| @@ -492,19 +494,6 @@ PassOwnPtr<JavaScriptCallFrame> V8DebuggerImpl::wrapCallFrames()
|
| return JavaScriptCallFrame::create(debuggerContext(), v8::Local<v8::Object>::Cast(currentCallFrameV8));
|
| }
|
|
|
| -PassOwnPtr<JavaScriptCallFrame> V8DebuggerImpl::currentCallFrames()
|
| -{
|
| - if (!m_isolate->InContext())
|
| - return nullptr;
|
| -
|
| - // Filter out stack traces entirely consisting of V8's internal scripts.
|
| - v8::Local<v8::StackTrace> stackTrace = v8::StackTrace::CurrentStackTrace(m_isolate, 1);
|
| - if (!stackTrace->GetFrameCount())
|
| - return nullptr;
|
| -
|
| - return wrapCallFrames();
|
| -}
|
| -
|
| PassOwnPtr<JavaScriptCallFrame> V8DebuggerImpl::callFrame(int index)
|
| {
|
| if (!m_isolate->InContext())
|
|
|