Support merged Dart-JS callstacks

Source/core/inspector/InjectedScript.cpp

 /*
  * 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.
  */
 
 #include "config.h"
 
 
 #include "core/inspector/InjectedScript.h"
 
 #include "bindings/v8/ScriptFunctionCall.h"
+#include "bindings/v8/V8PerIsolateData.h"
 #include "core/inspector/InjectedScriptHost.h"
 #include "platform/JSONValues.h"
 #include "wtf/text/WTFString.h"
 
+#include <v8-debug.h>
+
 using WebCore::TypeBuilder::Array;
 using WebCore::TypeBuilder::Debugger::CallFrame;
 using WebCore::TypeBuilder::Runtime::PropertyDescriptor;
 using WebCore::TypeBuilder::Runtime::InternalPropertyDescriptor;
 using WebCore::TypeBuilder::Debugger::FunctionDetails;
 using WebCore::TypeBuilder::Runtime::RemoteObject;
 
 namespace WebCore {
 
 V8InjectedScript::V8InjectedScript()
@@ skipping 23 matching lines @@
     function.appendArgument(objectId);
     function.appendArgument(expression);
     function.appendArgument(arguments);
     function.appendArgument(returnByValue);
     function.appendArgument(generatePreview);
     makeEvalCall(errorString, function, result, wasThrown);
 }
 
 void V8InjectedScript::evaluateOnCallFrame(ErrorString* errorString, const StackTrace& callFrames, const Vector<StackTrace>& asyncCallStacks, const String& callFrameId, const String& expression, const String& objectGroup, bool includeCommandLineAPI, bool returnByValue, bool generatePreview, RefPtr<RemoteObject>* result, TypeBuilder::OptOutput<bool>* wasThrown)
 {
+    v8::Context::Scope contextScope(v8::Debug::GetDebugContext());
+
     ScriptFunctionCall function(injectedScriptObject(), "evaluateOnCallFrame");
     function.appendArgument(callFrames.asJavaScript());
     Vector<ScriptValue> asyncCallStacksJavaScript;
     for (size_t i = 0; i < asyncCallStacks.size(); i++) {
-        if (asyncCallStacks[i].isJavaScript())
+        if (asyncCallStacks[i].hasJavaScript())
             asyncCallStacksJavaScript.append(asyncCallStacks[i].asJavaScript());
     }
     function.appendArgument(asyncCallStacksJavaScript);
     function.appendArgument(callFrameId);
     function.appendArgument(expression);
     function.appendArgument(objectGroup);
     function.appendArgument(includeCommandLineAPI);
     function.appendArgument(returnByValue);
     function.appendArgument(generatePreview);
     makeEvalCall(errorString, function, result, wasThrown);
 }
 
 void V8InjectedScript::getCompletionsOnCallFrame(ErrorString* errorString, const StackTrace& callFrames, const Vector<StackTrace>& asyncCallStacks, const String& callFrameId, const String& expression, RefPtr<TypeBuilder::Array<String> >* result)
 {
     ScriptFunctionCall function(injectedScriptObject(), "getCompletionsOnCallFrame");
     function.appendArgument(callFrames.asJavaScript());
     Vector<ScriptValue> asyncCallStacksJavaScript;
     for (size_t i = 0; i < asyncCallStacks.size(); i++) {
-        if (asyncCallStacks[i].isJavaScript())
+        if (asyncCallStacks[i].hasJavaScript())
             asyncCallStacksJavaScript.append(asyncCallStacks[i].asJavaScript());
     }
     function.appendArgument(asyncCallStacksJavaScript);
     function.appendArgument(callFrameId);
     function.appendArgument(expression);
     RefPtr<JSONValue> resultValue;
     makeCall(function, &resultValue);
     if (!resultValue || resultValue->type() != JSONValue::TypeArray) {
         *errorString = "Internal error";
         return;
@@ skipping 165 matching lines @@
 PassRefPtr<Array<CallFrame> > V8InjectedScript::wrapCallFrames(const StackTrace& callFrames, int asyncOrdinal)
 {
     ASSERT(!isEmpty());
     ScriptFunctionCall function(injectedScriptObject(), "wrapCallFrames");
     function.appendArgument(callFrames.asJavaScript());
     function.appendArgument(asyncOrdinal);
     bool hadException = false;
     ScriptValue callFramesValue = callFunctionWithEvalEnabled(function, hadException);
     ASSERT(!hadException);
     RefPtr<JSONValue> result = callFramesValue.toJSONValue(scriptState());
-    if (result && result->type() == JSONValue::TypeArray)
+    if (result && result->type() == JSONValue::TypeArray) {
+        // FIXMEDART: set timestamps for async callstacks as well.
+        if (asyncOrdinal < 1) {
+            // Bread the CallFrame JSON with timestamps.

[vsm, 2014/08/29 08:42:08]

Bread?

[Jacob, 2014/09/05 23:35:56]

This code has been removed.

+            StackTraceTimestampTracker* tracker = V8PerIsolateData::from(v8::Isolate::GetCurrent())->stackTraceTimestampTracker();
+            RefPtr<JSONArray> arr;
+            result->asArray(&arr);
+            for (size_t i = 0, length = arr->length(); i < length; i++)
+                CallFrame::runtimeCast(arr->get(i))->setTimestamp(tracker->getTimestamp(length - i - 1));
+        }
         return Array<CallFrame>::runtimeCast(result);
+    }
     return Array<CallFrame>::create();
 }
 
 PassRefPtr<TypeBuilder::Runtime::RemoteObject> V8InjectedScript::wrapObject(const ScriptValue& value, const String& groupName, bool generatePreview)
 {
     ASSERT(!isEmpty());
     ScriptFunctionCall wrapFunction(injectedScriptObject(), "wrapObject");
     wrapFunction.appendArgument(value);
     wrapFunction.appendArgument(groupName);
     wrapFunction.appendArgument(canAccessInspectedWindow());
@@ skipping 60 matching lines @@
     ASSERT(!hadException);
 }
 
 ScriptValue V8InjectedScript::nodeAsScriptValue(Node* node)
 {
     return InjectedScriptHost::nodeAsScriptValue(scriptState(), node);
 }
 
 } // namespace WebCore