Index: Source/core/inspector/AsyncCallStackTracker.cpp |
diff --git a/Source/core/inspector/AsyncCallStackTracker.cpp b/Source/core/inspector/AsyncCallStackTracker.cpp |
index 473d65e803d271216a1ef44625a3d09ec9464e93..02144bc7bfc5058a101fa168c98d645efc4d014a 100644 |
--- a/Source/core/inspector/AsyncCallStackTracker.cpp |
+++ b/Source/core/inspector/AsyncCallStackTracker.cpp |
@@ -146,7 +146,7 @@ static XMLHttpRequest* toXmlHttpRequest(EventTarget* eventTarget) |
return 0; |
} |
-AsyncCallStackTracker::AsyncCallStack::AsyncCallStack(const String& description, const ScriptValue& callFrames) |
+AsyncCallStackTracker::AsyncCallStack::AsyncCallStack(const String& description, const StackTrace& callFrames) |
: m_description(description) |
, m_callFrames(callFrames) |
{ |
@@ -178,7 +178,7 @@ const AsyncCallStackTracker::AsyncCallChain* AsyncCallStackTracker::currentAsync |
return m_currentAsyncCallChain.get(); |
} |
-void AsyncCallStackTracker::didInstallTimer(ExecutionContext* context, int timerId, bool singleShot, const ScriptValue& callFrames) |
+void AsyncCallStackTracker::didInstallTimer(ExecutionContext* context, int timerId, bool singleShot, const StackTrace& callFrames) |
{ |
ASSERT(context); |
ASSERT(isEnabled()); |
@@ -220,7 +220,7 @@ void AsyncCallStackTracker::willFireTimer(ExecutionContext* context, int timerId |
} |
} |
-void AsyncCallStackTracker::didRequestAnimationFrame(ExecutionContext* context, int callbackId, const ScriptValue& callFrames) |
+void AsyncCallStackTracker::didRequestAnimationFrame(ExecutionContext* context, int callbackId, const StackTrace& callFrames) |
{ |
ASSERT(context); |
ASSERT(isEnabled()); |
@@ -253,7 +253,7 @@ void AsyncCallStackTracker::willFireAnimationFrame(ExecutionContext* context, in |
setCurrentAsyncCallChain(nullptr); |
} |
-void AsyncCallStackTracker::didAddEventListener(EventTarget* eventTarget, const AtomicString& eventType, EventListener* listener, bool useCapture, const ScriptValue& callFrames) |
+void AsyncCallStackTracker::didAddEventListener(EventTarget* eventTarget, const AtomicString& eventType, EventListener* listener, bool useCapture, const StackTrace& callFrames) |
{ |
ASSERT(eventTarget->executionContext()); |
ASSERT(isEnabled()); |
@@ -307,7 +307,7 @@ void AsyncCallStackTracker::willHandleEvent(EventTarget* eventTarget, const Atom |
setCurrentAsyncCallChain(nullptr); |
} |
-void AsyncCallStackTracker::willLoadXHR(XMLHttpRequest* xhr, const ScriptValue& callFrames) |
+void AsyncCallStackTracker::willLoadXHR(XMLHttpRequest* xhr, const StackTrace& callFrames) |
{ |
ASSERT(xhr->executionContext()); |
ASSERT(isEnabled()); |
@@ -332,7 +332,7 @@ void AsyncCallStackTracker::willHandleXHREvent(XMLHttpRequest* xhr, EventTarget* |
} |
} |
-void AsyncCallStackTracker::didEnqueueMutationRecord(ExecutionContext* context, MutationObserver* observer, const ScriptValue& callFrames) |
+void AsyncCallStackTracker::didEnqueueMutationRecord(ExecutionContext* context, MutationObserver* observer, const StackTrace& callFrames) |
{ |
ASSERT(context); |
ASSERT(isEnabled()); |
@@ -369,7 +369,7 @@ void AsyncCallStackTracker::willDeliverMutationRecords(ExecutionContext* context |
setCurrentAsyncCallChain(nullptr); |
} |
-void AsyncCallStackTracker::didPostPromiseTask(ExecutionContext* context, ExecutionContextTask* task, bool isResolved, const ScriptValue& callFrames) |
+void AsyncCallStackTracker::didPostPromiseTask(ExecutionContext* context, ExecutionContextTask* task, bool isResolved, const StackTrace& callFrames) |
{ |
ASSERT(context); |
ASSERT(isEnabled()); |
@@ -398,7 +398,7 @@ void AsyncCallStackTracker::didFireAsyncCall() |
clearCurrentAsyncCallChain(); |
} |
-PassRefPtr<AsyncCallStackTracker::AsyncCallChain> AsyncCallStackTracker::createAsyncCallChain(const String& description, const ScriptValue& callFrames) |
+PassRefPtr<AsyncCallStackTracker::AsyncCallChain> AsyncCallStackTracker::createAsyncCallChain(const String& description, const StackTrace& callFrames) |
{ |
RefPtr<AsyncCallChain> chain = adoptRef(m_currentAsyncCallChain ? new AsyncCallStackTracker::AsyncCallChain(*m_currentAsyncCallChain) : new AsyncCallStackTracker::AsyncCallChain()); |
ensureMaxAsyncCallChainDepth(chain.get(), m_maxAsyncCallStackDepth - 1); |
@@ -433,9 +433,9 @@ void AsyncCallStackTracker::ensureMaxAsyncCallChainDepth(AsyncCallChain* chain, |
chain->m_callStacks.removeLast(); |
} |
-bool AsyncCallStackTracker::validateCallFrames(const ScriptValue& callFrames) |
+bool AsyncCallStackTracker::validateCallFrames(const StackTrace& callFrames) |
{ |
- return !callFrames.isEmpty(); |
+ return !callFrames.isNull(); |
} |
AsyncCallStackTracker::ExecutionContextData* AsyncCallStackTracker::createContextDataIfNeeded(ExecutionContext* context) |