Support merged Dart-JS callstacks

Source/bindings/dart/DartDOMData.h

 /*
  * Copyright (C) 2012 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 16 matching lines @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #ifndef DartDOMData_h
 #define DartDOMData_h
 
 #include "DartJsInteropData.h"
 #include "DartWebkitClassIds.h"
 
+#include "bindings/common/StackTrace.h"
 #include "bindings/dart/DartCustomElementBinding.h"
 #include "bindings/dart/DartLibraryIds.h"
 #include "bindings/dart/DartScriptState.h"
 #include "bindings/dart/DartStringCache.h"
 
 #include "wtf/HashMap.h"
 #include "wtf/HashSet.h"
 #include "wtf/RefPtr.h"
 #include "wtf/Threading.h"
 #include "wtf/ThreadingPrimitives.h"
@@ skipping 27 matching lines @@
 class DartDOMData {
 public:
     DartDOMData(ExecutionContext*, bool isDOMEnabled);
     ~DartDOMData();
 
     static DartDOMData* current();
 
     ExecutionContext* scriptExecutionContext() { return m_scriptExecutionContext; }
     bool isDOMEnabled() { return m_isDOMEnabled; }
 
-    // We track the Dart specific recursion level here as well as the global
-    // recursion level tracked by m_recursionScope due to dartbug.com/14183.
-    int* recursion() { return &m_recursion; }
+    // Track Dart stack trace depth and timestamp pairs so that we can
+    // correctly interleave Dart and JavaScript stack traces.
+    StackTraceTimestampTracker* stackTraceTimestampTracker() { return &m_stackTraceTimestampTracker; }
+
     DartStringCache& stringCache() { return m_stringCache; }
 
     void setThreadSafeIsolateWrapper(PassRefPtr<ThreadSafeDartIsolateWrapper>);
     PassRefPtr<ThreadSafeDartIsolateWrapper> threadSafeIsolateWrapper();
 
     void setApplicationLoader(PassRefPtr<DartApplicationLoader>);
     PassRefPtr<DartApplicationLoader> applicationLoader();
 
     Vector<uint8_t>* applicationSnapshot() { return &m_applicationSnapshot; }
 
@@ skipping 131 matching lines @@
     {
         m_isObservatoryFakeDartDOMData = isObservatoryFakeDartDOMData;
     }
 
 private:
     Dart_PersistentHandle getLibrary(int libraryId, const char* name);
 
     ExecutionContext* m_scriptExecutionContext;
     bool m_isDOMEnabled;
     int m_recursion;
+    StackTraceTimestampTracker m_stackTraceTimestampTracker;
     DartStringCache m_stringCache;
     RefPtr<ThreadSafeDartIsolateWrapper> m_threadSafeIsolateWrapper;
     Mutex m_isolateWrapperMutex;
     RefPtr<DartApplicationLoader> m_applicationLoader;
     Vector<uint8_t> m_applicationSnapshot;
     Dart_WeakPersistentHandle m_reachableWeakHandle;
 
     DartJsInteropData m_jsInteropData;
     DartDOMObjectMap m_objectMap;
     DartMessagePortMap m_messagePortMap;
@@ skipping 10 matching lines @@
     Dart_WeakReferenceSetBuilder m_weakReferenceSetBuilder;
 
     // FIXME(dartbug.com/20303): remove this field once we support service
     // isolates.
     bool m_isObservatoryFakeDartDOMData;
 };
 
 }
 
 #endif // DartDOMData_h