Support merged Dart-JS callstacks

Source/core/inspector/AsyncCallStackTracker.cpp

Index: Source/core/inspector/AsyncCallStackTracker.cpp
diff --git a/Source/core/inspector/AsyncCallStackTracker.cpp b/Source/core/inspector/AsyncCallStackTracker.cpp
index 96a4139458349abc455e92c1c1358c004e8e96df..cb53dba03de43fb529c66a804ae8cfa5692de9b0 100644
--- a/Source/core/inspector/AsyncCallStackTracker.cpp
+++ b/Source/core/inspector/AsyncCallStackTracker.cpp
@@ -91,7 +91,7 @@ static XMLHttpRequest* toXmlHttpRequest(EventTarget* eventTarget)
     return 0;
 }
 
-AsyncCallStackTracker::AsyncCallStack::AsyncCallStack(const String& description, const StackTrace& callFrames)
+AsyncCallStackTracker::AsyncCallStack::AsyncCallStack(const String& description, const StackTraces& callFrames)
     : m_description(description)
     , m_callFrames(callFrames)
 {
@@ -123,7 +123,7 @@ const AsyncCallStackTracker::AsyncCallChain* AsyncCallStackTracker::currentAsync
     return m_currentAsyncCallChain.get();
 }
 
-void AsyncCallStackTracker::didInstallTimer(ExecutionContext* context, int timerId, bool singleShot, const StackTrace& callFrames)
+void AsyncCallStackTracker::didInstallTimer(ExecutionContext* context, int timerId, bool singleShot, const StackTraces& callFrames)
 {
     ASSERT(context);
     ASSERT(isEnabled());
@@ -165,7 +165,7 @@ void AsyncCallStackTracker::willFireTimer(ExecutionContext* context, int timerId
     }
 }
 
-void AsyncCallStackTracker::didRequestAnimationFrame(ExecutionContext* context, int callbackId, const StackTrace& callFrames)
+void AsyncCallStackTracker::didRequestAnimationFrame(ExecutionContext* context, int callbackId, const StackTraces& callFrames)
 {
     ASSERT(context);
     ASSERT(isEnabled());
@@ -198,7 +198,7 @@ void AsyncCallStackTracker::willFireAnimationFrame(ExecutionContext* context, in
         setCurrentAsyncCallChain(nullptr);
 }
 
-void AsyncCallStackTracker::didEnqueueEvent(EventTarget* eventTarget, Event* event, const StackTrace& callFrames)
+void AsyncCallStackTracker::didEnqueueEvent(EventTarget* eventTarget, Event* event, const StackTraces& callFrames)
 {
     ASSERT(eventTarget->executionContext());
     ASSERT(isEnabled());
@@ -230,7 +230,7 @@ void AsyncCallStackTracker::willHandleEvent(EventTarget* eventTarget, Event* eve
     }
 }
 
-void AsyncCallStackTracker::willLoadXHR(XMLHttpRequest* xhr, const StackTrace& callFrames)
+void AsyncCallStackTracker::willLoadXHR(XMLHttpRequest* xhr, const StackTraces& callFrames)
 {
     ASSERT(xhr->executionContext());
     ASSERT(isEnabled());
@@ -255,7 +255,7 @@ void AsyncCallStackTracker::willHandleXHREvent(XMLHttpRequest* xhr, EventTarget*
     }
 }
 
-void AsyncCallStackTracker::didEnqueueMutationRecord(ExecutionContext* context, MutationObserver* observer, const StackTrace& callFrames)
+void AsyncCallStackTracker::didEnqueueMutationRecord(ExecutionContext* context, MutationObserver* observer, const StackTraces& callFrames)
 {
     ASSERT(context);
     ASSERT(isEnabled());
@@ -297,7 +297,7 @@ void AsyncCallStackTracker::didFireAsyncCall()
     clearCurrentAsyncCallChain();
 }
 
-PassRefPtr<AsyncCallStackTracker::AsyncCallChain> AsyncCallStackTracker::createAsyncCallChain(const String& description, const StackTrace& callFrames)
+PassRefPtr<AsyncCallStackTracker::AsyncCallChain> AsyncCallStackTracker::createAsyncCallChain(const String& description, const StackTraces& callFrames)
 {
     RefPtr<AsyncCallChain> chain = adoptRef(m_currentAsyncCallChain ? new AsyncCallStackTracker::AsyncCallChain(*m_currentAsyncCallChain) : new AsyncCallStackTracker::AsyncCallChain());
     ensureMaxAsyncCallChainDepth(chain.get(), m_maxAsyncCallStackDepth - 1);
@@ -332,7 +332,7 @@ void AsyncCallStackTracker::ensureMaxAsyncCallChainDepth(AsyncCallChain* chain,
         chain->m_callStacks.removeLast();
 }
 
-bool AsyncCallStackTracker::validateCallFrames(const StackTrace& callFrames)
+bool AsyncCallStackTracker::validateCallFrames(const StackTraces& callFrames)
 {
     return !callFrames.isNull();
 }