Support merged Dart-JS callstacks

Source/bindings/dart/DartUtilities.cpp

 // Copyright 2011, 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 38 matching lines @@
 #include "bindings/v8/ScriptController.h"
 #include "bindings/v8/SerializedScriptValue.h"
 #include "bindings/v8/V8Binding.h"
 #include "bindings/v8/V8ExceptionState.h"
 #include "bindings/v8/V8PerIsolateData.h"
 #include "core/dom/Document.h"
 #include "core/fetch/ResourceFetcher.h"
 #include "core/frame/LocalDOMWindow.h"
 #include "core/frame/LocalFrame.h"
 #include "core/html/canvas/DataView.h"
+#include "core/inspector/InspectorInstrumentation.h"
 #include "core/inspector/ScriptArguments.h"
 #include "core/inspector/ScriptCallStack.h"
 #include "core/loader/FrameLoader.h"
 #include "modules/webdatabase/sqlite/SQLValue.h"
 #include "platform/SharedBuffer.h"
 #include "platform/network/ResourceRequest.h"
 
 #include "wtf/ArrayBufferView.h"
 #include "wtf/Float32Array.h"
 #include "wtf/Float64Array.h"
 #include "wtf/Int16Array.h"
 #include "wtf/Int32Array.h"
 #include "wtf/Int8Array.h"
 #include "wtf/RefCounted.h"
 #include "wtf/Uint16Array.h"
 #include "wtf/Uint32Array.h"
 #include "wtf/Uint8Array.h"
 #include "wtf/Uint8ClampedArray.h"
 #include "wtf/text/AtomicString.h"
 #include "wtf/text/CString.h"
 #include "wtf/text/WTFString.h"
 
 namespace WebCore {
 
 V8Scope::V8Scope(DartDOMData* dartDOMData, v8::Handle<v8::Context> context)
     : m_v8Isolate(v8::Isolate::GetCurrent())
     , m_dartDOMData(dartDOMData)
     , m_handleScope(m_v8Isolate)
     , m_contextScope(context)
-    , m_recursionScope(m_v8Isolate, DartUtilities::scriptExecutionContext())
+    , m_recursionScope(m_v8Isolate, DartUtilities::scriptExecutionContext(), false)
 {
-    if (m_dartDOMData)
-        (*m_dartDOMData->recursion())++;
+    incrementRecursionLevel();
 }
 
 V8Scope::V8Scope(DartDOMData* dartDOMData)
     : m_v8Isolate(v8::Isolate::GetCurrent())
     , m_dartDOMData(dartDOMData)
     , m_handleScope(m_v8Isolate)
     , m_contextScope(DartUtilities::currentV8Context())
-    , m_recursionScope(m_v8Isolate, DartUtilities::scriptExecutionContext())
+    , m_recursionScope(m_v8Isolate, DartUtilities::scriptExecutionContext(), false)
 {
-    if (m_dartDOMData)
-        (*m_dartDOMData->recursion())++;
+    incrementRecursionLevel();
 }
 
 V8Scope::~V8Scope()
 {
     if (m_dartDOMData)
-        (*m_dartDOMData->recursion())--;
+        m_dartDOMData->stackTraceTimestampTracker()->decrementRecursionLevel();
+}
+
+void V8Scope::incrementRecursionLevel()
+{
+    if (!m_dartDOMData)
+        return;
+    StackTraceTimestampTracker* tracker = m_dartDOMData->stackTraceTimestampTracker();
+    tracker->incrementRecursionLevel(InspectorInstrumentation::hasFrontends() && tracker->recursionLevel() > 0 ?
+        DartUtilities::currentStackDepth() : 0);
 }
 
 DartStringPeer* DartStringPeer::emptyString()
 {
     DEFINE_STATIC_LOCAL(DartStringPeer, empty, ());
     return &empty;
 }
 
 
 static void stringFinalizer(void* peer)
@@ skipping 945 matching lines @@
     intptr_t lineNumber = 0;
     intptr_t columnNumber = 0;
     Dart_Handle result = Dart_ActivationFrameInfo(frame, &functionName, &scriptUrl, &lineNumber, &columnNumber);
     if (Dart_IsError(result)) {
         exception = result;
         return ScriptCallFrame("undefined", "undefined", "undefined", 0, 0);
     }
     return ScriptCallFrame(DartUtilities::toString(functionName), "undefined", DartUtilities::toString(scriptUrl), lineNumber, columnNumber);
 }
 
+size_t DartUtilities::currentStackDepth()
+{
+    intptr_t stackDepth = 0;
+    Dart_StackTrace trace = 0;
+    Dart_Handle ALLOW_UNUSED result = Dart_GetStackTrace(&trace);
+    ASSERT(!Dart_IsError(result));
+    ASSERT(!Dart_IsNull(result));
+    result = Dart_StackTraceLength(trace, &stackDepth);
+    ASSERT(!Dart_IsError(result));
+    return stackDepth;
+}
+
 PassRefPtr<ScriptCallStack> DartUtilities::createScriptCallStack()
 {
     Dart_StackTrace trace = 0;
     Dart_Handle ALLOW_UNUSED result = Dart_GetStackTrace(&trace);
     ASSERT(!Dart_IsError(result));
     ASSERT(!Dart_IsNull(result));
     ASSERT(trace);
     return createScriptCallStackFromStackTrace(trace);
 }
 
@@ skipping 123 matching lines @@
     if (!v) {
         return 0;
     }
     ASSERT(valueLen > 0 && static_cast<size_t>(valueLen) > strlen(v));
     strncpy(value, v, valueLen);
     value[valueLen - 1] = '\0';
     return strlen(value);
 #endif
 }
 }