[inspector] added targetCallFrames for continueToLocation

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 396 matching lines @@
   if (m_stepIntoAsyncCallback) {
     m_stepIntoAsyncCallback->sendFailure(Response::Error(
         "Current scheduled step into async was overriden with new one."));
   }
   m_targetContextGroupId = targetContextGroupId;
   m_stepIntoAsyncCallback = std::move(callback);
 }
 
 Response V8Debugger::continueToLocation(
     int targetContextGroupId,
-    std::unique_ptr<protocol::Debugger::Location> location) {
+    std::unique_ptr<protocol::Debugger::Location> location,
+    const String16& strategy) {
   DCHECK(isPaused());
   DCHECK(!m_executionState.IsEmpty());
   DCHECK(targetContextGroupId);
   m_targetContextGroupId = targetContextGroupId;
   ScriptBreakpoint breakpoint(location->getScriptId(),
                               location->getLineNumber(),
                               location->getColumnNumber(0), String16());
   int lineNumber = 0;
   int columnNumber = 0;
   m_continueToLocationBreakpointId =
       setBreakpoint(breakpoint, &lineNumber, &columnNumber);
   if (!m_continueToLocationBreakpointId.isEmpty()) {
+    m_continueToLocationStrategy = strategy;
+    if (m_continueToLocationStrategy !=
+        protocol::Debugger::ContinueToLocation::StrategyEnum::Default) {
+      m_continueToLocationStack = captureStackTrace(true);
+      if (!m_continueToLocationStack) {

[dgozman, 2017/05/16 20:19:24]

DCHECK()

[kozy, 2017/05/16 21:18:48]

Done.

+        m_continueToLocationStrategy =
+            protocol::Debugger::ContinueToLocation::StrategyEnum::Default;
+      }
+    }
     continueProgram(targetContextGroupId);
     return Response::OK();
   } else {
     return Response::Error("No breakpoint by passed location");
   }
 }
 
+bool V8Debugger::shouldIgnoreContinueToLocation() {

[dgozman, 2017/05/16 20:19:25]

shouldContinueToCurrentLocation

[kozy, 2017/05/16 21:18:48]

Done.

+  if (m_continueToLocationStrategy ==
+      protocol::Debugger::ContinueToLocation::StrategyEnum::Default) {
+    return false;
+  }
+  std::unique_ptr<V8StackTraceImpl> currentStack = captureStackTrace(true);
+  if (m_continueToLocationStrategy ==
+      protocol::Debugger::ContinueToLocation::StrategyEnum::InCurrentFrame) {
+    return !m_continueToLocationStack->isEqualIgnoringTopFrame(
+        currentStack.get());
+  }
+  return false;
+}
+
 void V8Debugger::clearContinueToLocation() {
-  if (m_continueToLocationBreakpointId.length()) {
-    removeBreakpoint(m_continueToLocationBreakpointId);
-  }
+  if (m_continueToLocationBreakpointId.isEmpty()) return;
+  removeBreakpoint(m_continueToLocationBreakpointId);
   m_continueToLocationBreakpointId = String16();
+  m_continueToLocationStrategy = String16();
+  m_continueToLocationStack.reset();
 }
 
 Response V8Debugger::setScriptSource(
     const String16& sourceID, v8::Local<v8::String> newSource, bool dryRun,
     Maybe<protocol::Runtime::ExceptionDetails>* exceptionDetails,
     JavaScriptCallFrames* newCallFrames, Maybe<bool>* stackChanged,
     bool* compileError) {
   class EnableLiveEditScope {
    public:
     explicit EnableLiveEditScope(v8::Isolate* isolate) : m_isolate(isolate) {
@@ skipping 137 matching lines @@
   std::vector<String16> breakpointIds;
   if (!hitBreakpointNumbers.IsEmpty()) {
     breakpointIds.reserve(hitBreakpointNumbers->Length());
     for (uint32_t i = 0; i < hitBreakpointNumbers->Length(); i++) {
       v8::Local<v8::Value> hitBreakpointNumber =
           hitBreakpointNumbers->Get(debuggerContext(), i).ToLocalChecked();
       DCHECK(hitBreakpointNumber->IsInt32());
       breakpointIds.push_back(String16::fromInteger(
           hitBreakpointNumber->Int32Value(debuggerContext()).FromJust()));
     }
+    if (breakpointIds.size() == 1 &&
+        breakpointIds[0] == m_continueToLocationBreakpointId) {
+      v8::Context::Scope contextScope(pausedContext);
+      if (shouldIgnoreContinueToLocation()) return;
+    }
   }
   clearContinueToLocation();
 
   m_pausedContext = pausedContext;
   m_executionState = executionState;
   m_pausedContextGroupId = contextGroupId;
   agent->didPause(InspectedContext::contextId(pausedContext), exception,
                   breakpointIds, isPromiseRejection, isUncaught,
                   m_scheduledOOMBreak);
   int groupId = m_inspector->contextGroupId(pausedContext);
@@ skipping 514 matching lines @@
   fprintf(stdout, "Async stacks count: %d\n", m_asyncStacksCount);
   fprintf(stdout, "Scheduled async tasks: %zu\n", m_asyncTaskStacks.size());
   fprintf(stdout, "Created async tasks: %zu\n",
           m_asyncTaskCreationStacks.size());
   fprintf(stdout, "Async tasks with parent: %zu\n", m_parentTask.size());
   fprintf(stdout, "Recurring async tasks: %zu\n", m_recurringTasks.size());
   fprintf(stdout, "\n");
 }
 
 }  // namespace v8_inspector