[WIP] Protocol for sending information about Promises to frontend.

Source/core/inspector/PromiseTracker.cpp

Index: Source/core/inspector/PromiseTracker.cpp
diff --git a/Source/core/inspector/PromiseTracker.cpp b/Source/core/inspector/PromiseTracker.cpp
index a9704ae61ab7e92729fd3488bb0bab63095cbe9e..2aa7829c8c15a1b514ee9a10efcb3208d333b782 100644
--- a/Source/core/inspector/PromiseTracker.cpp
+++ b/Source/core/inspector/PromiseTracker.cpp
@@ -11,16 +11,22 @@
 #include "wtf/PassOwnPtr.h"
 #include "wtf/WeakPtr.h"
 
+using blink::TypeBuilder::Array;
+using blink::TypeBuilder::Console::CallFrame;
+using blink::TypeBuilder::Debugger::PromiseDetails;
+
 namespace blink {
 
 class PromiseTracker::PromiseData : public RefCounted<PromiseData> {
 public:
-    PromiseData(v8::Isolate* isolate, int promiseHash, v8::Handle<v8::Object> promise)
+    PromiseData(v8::Isolate* isolate, int promiseHash, int promiseId, v8::Handle<v8::Object> promise)
         : m_promiseHash(promiseHash)
+        , m_promiseId(promiseId)
         , m_promise(isolate, promise)
+        , m_parentPromiseId(0)
         , m_status(0)
         , m_weakPtrFactory(this)
-        {
+    {
     }
 
     int promiseHash() const { return m_promiseHash; }
@@ -30,9 +36,10 @@ private:
     friend class PromiseTracker;
 
     int m_promiseHash;
-
+    int m_promiseId;
     ScopedPersistent<v8::Object> m_promise;
-    ScriptCallFrame m_callFrame;
+    RefPtr<ScriptCallStack> m_callStack;

[aandrey, 2014/09/02 14:34:49]

move after m_weakPtrFactory

[Alexandra Mikhaylova, 2014/09/03 14:28:54]

Done.

+    int m_parentPromiseId;
     ScopedPersistent<v8::Object> m_parentPromise;

[aandrey, 2014/09/02 14:34:49]

ditto

[Alexandra Mikhaylova, 2014/09/03 14:28:54]

Done.

     int m_status;
 

[aandrey, 2014/09/02 14:34:49]

extra line

[Alexandra Mikhaylova, 2014/09/03 14:28:54]

Done.

@@ -83,6 +90,7 @@ private:
 
 PromiseTracker::PromiseTracker()
     : m_isEnabled(false)
+    , m_circularSequentialId(0)
 {
 }
 
@@ -90,26 +98,29 @@ PromiseTracker::~PromiseTracker()
 {
 }
 
-void PromiseTracker::enable()
+void PromiseTracker::setEnabled(bool enabled)
 {
-    m_isEnabled = true;
-}
-
-void PromiseTracker::disable()
-{
-    m_isEnabled = false;
-    clear();
+    m_isEnabled = enabled;
+    if (!enabled)
+        clear();
 }
 
 void PromiseTracker::clear()
 {
     m_promiseDataMap.clear();
+    m_circularSequentialId = 0;

[aandrey, 2014/09/02 14:34:49]

remove. let's not reset the ID counter upon disable command.

[Alexandra Mikhaylova, 2014/09/03 14:28:54]

Done.

 }
 
-void PromiseTracker::didReceiveV8PromiseEvent(ScriptState* scriptState, v8::Handle<v8::Object> promise, v8::Handle<v8::Value> parentPromise, int status)
+int PromiseTracker::circularSequentialId()
 {
-    ASSERT(isEnabled());
+    ++m_circularSequentialId;
+    if (m_circularSequentialId <= 0)
+        m_circularSequentialId = 1;
+    return m_circularSequentialId;
+}
 
+PassRefPtr<PromiseTracker::PromiseData> PromiseTracker::createPromiseDataIfNeeded(v8::Isolate* isolate, v8::Handle<v8::Object> promise)
+{
     int promiseHash = promise->GetIdentityHash();
     PromiseDataVector* vector;
     PromiseDataMap::iterator it = m_promiseDataMap.find(promiseHash);
@@ -118,11 +129,10 @@ void PromiseTracker::didReceiveV8PromiseEvent(ScriptState* scriptState, v8::Hand
     else
         vector = &m_promiseDataMap.add(promiseHash, PromiseDataVector()).storedValue->value;
 
-    v8::Isolate* isolate = scriptState->isolate();
     RefPtr<PromiseData> data;
     int index = indexOf(vector, ScopedPersistent<v8::Object>(isolate, promise));
     if (index == -1) {
-        data = adoptRef(new PromiseData(isolate, promiseHash, promise));
+        data = adoptRef(new PromiseData(isolate, promiseHash, circularSequentialId(), promise));
         OwnPtr<PromiseDataWrapper> wrapper = adoptPtr(new PromiseDataWrapper(data->m_weakPtrFactory.createWeakPtr(), &m_promiseDataMap));
         data->m_promise.setWeak(wrapper.leakPtr(), &PromiseDataWrapper::didRemovePromise);
         vector->append(data);
@@ -130,18 +140,52 @@ void PromiseTracker::didReceiveV8PromiseEvent(ScriptState* scriptState, v8::Hand
         data = vector->at(index);
     }
 
-    if (!parentPromise.IsEmpty()) {
-        ASSERT(parentPromise->IsObject());
-        data->m_parentPromise.set(isolate, parentPromise->ToObject());
+    return data.release();
+}
+
+void PromiseTracker::didReceiveV8PromiseEvent(ScriptState* scriptState, v8::Handle<v8::Object> promise, v8::Handle<v8::Value> parentPromise, int status)
+{
+    ASSERT(isEnabled());
+
+    v8::Isolate* isolate = scriptState->isolate();
+    RefPtr<PromiseData> data = createPromiseDataIfNeeded(isolate, promise);
+    if (!parentPromise.IsEmpty() && parentPromise->IsObject()) {
+        v8::Handle<v8::Object> handle = parentPromise->ToObject();
+        RefPtr<PromiseData> parentData = createPromiseDataIfNeeded(isolate, handle);
+        data->m_parentPromiseId = parentData->m_promiseId;
+        data->m_parentPromise.set(isolate, handle);
     } else {
         data->m_status = status;
         if (!status) {

[aandrey, 2014/09/02 14:34:49]

if (!status && !data->m_callStack)

[Alexandra Mikhaylova, 2014/09/03 14:28:55]

Done.

             v8::Handle<v8::StackTrace> stackTrace(v8::StackTrace::CurrentStackTrace(isolate, 1));
             RefPtrWillBeRawPtr<ScriptCallStack> stack = createScriptCallStack(stackTrace, 1, isolate);
             if (stack->size())
-                data->m_callFrame = stack->at(0);
+                data->m_callStack = stack;
         }
     }
 }
 
+PassRefPtr<Array<PromiseDetails> > PromiseTracker::promises()
+{
+    ASSERT(isEnabled());
+
+    RefPtr<Array<PromiseDetails> > result = Array<PromiseDetails>::create();
+    for (PromiseDataMap::iterator it = m_promiseDataMap.begin(); it != m_promiseDataMap.end(); ++it) {
+        PromiseDataVector* vector = &it->value;
+        for (size_t index = 0; index < vector->size(); ++index) {
+            RefPtr<PromiseData> data = vector->at(index);
+            RefPtr<PromiseDetails> promiseDetails = PromiseDetails::create()
+                .setId(data->m_promiseId)
+                .setStatus(data->m_status);
+            if (data->m_parentPromiseId)
+                promiseDetails->setParentId(data->m_parentPromiseId);
+            if (data->m_callStack.get())

[aandrey, 2014/09/02 14:34:49]

drop ".get()"

[Alexandra Mikhaylova, 2014/09/03 14:28:54]

Done.

+                promiseDetails->setCallFrame(data->m_callStack->at(0).buildInspectorObject());
+            result->addItem(promiseDetails);
+        }
+    }
+
+    return result.release();
+}
+
 } // namespace blink