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

Unified Diff: third_party/WebKit/Source/core/inspector/v8/PromiseTracker.cpp

Issue 1666563005: DevTools: merge ScriptCallStack and ScriptAsyncCallStack, move CallStacks from console to Runtime. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 11 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 side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/core/inspector/v8/PromiseTracker.cpp
diff --git a/third_party/WebKit/Source/core/inspector/v8/PromiseTracker.cpp b/third_party/WebKit/Source/core/inspector/v8/PromiseTracker.cpp
index 96e98bfc502a75bfb18647db7f3734b4dccca5b4..0f50e8fc570df3ed550af18bc270d3956d78fd65 100644
--- a/third_party/WebKit/Source/core/inspector/v8/PromiseTracker.cpp
+++ b/third_party/WebKit/Source/core/inspector/v8/PromiseTracker.cpp
@@ -5,12 +5,12 @@
#include "core/inspector/v8/PromiseTracker.h"
#include "bindings/core/v8/ScriptCallStackFactory.h"
-#include "core/inspector/ScriptAsyncCallStack.h"
+#include "core/inspector/ScriptCallStack.h"
#include "wtf/CurrentTime.h"
#include "wtf/PassOwnPtr.h"
using blink::TypeBuilder::Array;
-using blink::TypeBuilder::Console::CallFrame;
+using blink::TypeBuilder::Runtime::CallFrame;
using blink::TypeBuilder::Debugger::PromiseDetails;
namespace blink {
@@ -137,26 +137,18 @@ void PromiseTracker::didReceiveV8PromiseEvent(v8::Local<v8::Context> context, v8
promiseDetails->setCreationTime(currentTimeMS());
RefPtr<ScriptCallStack> stack = currentScriptCallStack(m_captureStacks ? ScriptCallStack::maxCallStackSizeToCapture : 1);
if (stack) {
- if (stack->size()) {
+ if (stack->size())
promiseDetails->setCallFrame(stack->at(0).buildInspectorObject());
- if (m_captureStacks)
- promiseDetails->setCreationStack(stack->buildInspectorArray());
- }
- RefPtr<ScriptAsyncCallStack> asyncCallStack = stack->asyncCallStack();
- if (m_captureStacks && asyncCallStack)
- promiseDetails->setAsyncCreationStack(asyncCallStack->buildInspectorObject());
+ if (m_captureStacks)
+ promiseDetails->setCreationStack(stack->buildInspectorObject());
}
}
} else {
promiseDetails->setSettlementTime(currentTimeMS());
if (m_captureStacks) {
RefPtr<ScriptCallStack> stack = currentScriptCallStack(ScriptCallStack::maxCallStackSizeToCapture);
- if (stack) {
- if (stack->size())
- promiseDetails->setSettlementStack(stack->buildInspectorArray());
- if (RefPtr<ScriptAsyncCallStack> asyncCallStack = stack->asyncCallStack())
- promiseDetails->setAsyncSettlementStack(asyncCallStack->buildInspectorObject());
- }
+ if (stack)
+ promiseDetails->setSettlementStack(stack->buildInspectorObject());
}
}
}

Powered by Google App Engine
This is Rietveld 408576698