[inspector] change target promise for kDebugWillHandle & kDebugDidHandle

src/inspector/v8-debugger.cc

 // Copyright 2016 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "src/inspector/v8-debugger.h"
 
 #include "src/inspector/debugger-script.h"
 #include "src/inspector/inspected-context.h"
 #include "src/inspector/protocol/Protocol.h"
 #include "src/inspector/script-breakpoint.h"
@@ skipping 545 matching lines @@
 bool V8Debugger::IsFunctionBlackboxed(v8::Local<v8::debug::Script> script,
                                       const v8::debug::Location& start,
                                       const v8::debug::Location& end) {
   V8DebuggerAgentImpl* agent = agentForScript(m_inspector, script);
   if (!agent) return false;
   return agent->isFunctionBlackboxed(String16::fromInteger(script->Id()), start,
                                      end);
 }
 
 void V8Debugger::PromiseEventOccurred(v8::debug::PromiseDebugActionType type,
-                                      int id) {
+                                      int id, int parentId) {
   if (!m_maxAsyncCallStackDepth) return;
   // Async task events from Promises are given misaligned pointers to prevent
   // from overlapping with other Blink task identifiers. There is a single
   // namespace of such ids, managed by src/js/promise.js.
   void* ptr = reinterpret_cast<void*>(id * 2 + 1);
   switch (type) {
+    case v8::debug::kDebugPromiseCreated:
+      asyncTaskCreated(
+          ptr, parentId ? reinterpret_cast<void*>(parentId * 2 + 1) : nullptr);
+      break;
     case v8::debug::kDebugEnqueueAsyncFunction:
       asyncTaskScheduled("async function", ptr, true);
       break;
     case v8::debug::kDebugEnqueuePromiseResolve:
       asyncTaskScheduled("Promise.resolve", ptr, true);
       break;
     case v8::debug::kDebugEnqueuePromiseReject:
       asyncTaskScheduled("Promise.reject", ptr, true);
       break;
-    case v8::debug::kDebugEnqueuePromiseResolveThenableJob:
-      asyncTaskScheduled("PromiseResolveThenableJob", ptr, true);
-      break;
     case v8::debug::kDebugPromiseCollected:
       asyncTaskCanceled(ptr);
       break;
     case v8::debug::kDebugWillHandle:
       asyncTaskStarted(ptr);
       break;
     case v8::debug::kDebugDidHandle:
       asyncTaskFinished(ptr);
       break;
   }
@@ skipping 255 matching lines @@
   for (const auto& pair : m_maxAsyncCallStackDepthMap) {
     if (pair.second > maxAsyncCallStackDepth)
       maxAsyncCallStackDepth = pair.second;
   }
 
   if (m_maxAsyncCallStackDepth == maxAsyncCallStackDepth) return;
   m_maxAsyncCallStackDepth = maxAsyncCallStackDepth;
   if (!maxAsyncCallStackDepth) allAsyncTasksCanceled();
 }
 
+void V8Debugger::asyncTaskCreated(void* task, void* parentTask) {
+  if (parentTask) m_parentTask[task] = parentTask;
+}
+
 void V8Debugger::asyncTaskScheduled(const StringView& taskName, void* task,
                                     bool recurring) {
   if (!m_maxAsyncCallStackDepth) return;
   asyncTaskScheduled(toString16(taskName), task, recurring);
 }
 
 void V8Debugger::asyncTaskScheduled(const String16& taskName, void* task,
                                     bool recurring) {
   if (!m_maxAsyncCallStackDepth) return;
   v8::HandleScope scope(m_isolate);
@@ skipping 14 matching lines @@
       void* taskToRemove = m_idToTask.begin()->second;
       asyncTaskCanceled(taskToRemove);
     }
   }
 }
 
 void V8Debugger::asyncTaskCanceled(void* task) {
   if (!m_maxAsyncCallStackDepth) return;
   m_asyncTaskStacks.erase(task);
   m_recurringTasks.erase(task);
+  m_parentTask.erase(task);
   auto it = m_taskToId.find(task);
   if (it == m_taskToId.end()) return;
   m_idToTask.erase(it->second);
   m_taskToId.erase(it);
 }
 
 void V8Debugger::asyncTaskStarted(void* task) {
   if (!m_maxAsyncCallStackDepth) return;
   m_currentTasks.push_back(task);
-  AsyncTaskToStackTrace::iterator stackIt = m_asyncTaskStacks.find(task);
+  auto parentIt = m_parentTask.find(task);
+  AsyncTaskToStackTrace::iterator stackIt = m_asyncTaskStacks.find(
+      parentIt == m_parentTask.end() ? task : parentIt->second);
   // Needs to support following order of events:
   // - asyncTaskScheduled
   //   <-- attached here -->
   // - asyncTaskStarted
   // - asyncTaskCanceled <-- canceled before finished
   //   <-- async stack requested here -->
   // - asyncTaskFinished
   std::unique_ptr<V8StackTraceImpl> stack;
   if (stackIt != m_asyncTaskStacks.end() && stackIt->second)
     stack = stackIt->second->cloneImpl();
   m_currentStacks.push_back(std::move(stack));
 }
 
 void V8Debugger::asyncTaskFinished(void* task) {
   if (!m_maxAsyncCallStackDepth) return;
   // We could start instrumenting half way and the stack is empty.
   if (!m_currentStacks.size()) return;
 
   DCHECK(m_currentTasks.back() == task);
   m_currentTasks.pop_back();
 
   m_currentStacks.pop_back();
   if (m_recurringTasks.find(task) == m_recurringTasks.end()) {
     m_asyncTaskStacks.erase(task);

[dgozman, 2017/01/24 18:13:51]

Call asyncTaskCanceled here.

[kozy, 2017/01/24 18:41:41]

Done.

     auto it = m_taskToId.find(task);
     if (it == m_taskToId.end()) return;
     m_idToTask.erase(it->second);
     m_taskToId.erase(it);
   }
 }
 
 void V8Debugger::allAsyncTasksCanceled() {
   m_asyncTaskStacks.clear();
   m_recurringTasks.clear();
   m_currentStacks.clear();
   m_currentTasks.clear();
+  m_parentTask.clear();
   m_idToTask.clear();
   m_taskToId.clear();
   m_lastTaskId = 0;
 }
 
 void V8Debugger::muteScriptParsedEvents() {
   ++m_ignoreScriptParsedEventsCounter;
 }
 
 void V8Debugger::unmuteScriptParsedEvents() {
@@ skipping 12 matching lines @@
 
   size_t stackSize =
       fullStack ? V8StackTraceImpl::maxCallStackSizeToCapture : 1;
   if (m_inspector->enabledRuntimeAgentForGroup(contextGroupId))
     stackSize = V8StackTraceImpl::maxCallStackSizeToCapture;
 
   return V8StackTraceImpl::capture(this, contextGroupId, stackSize);
 }
 
 }  // namespace v8_inspector