[inspector] changed a way of preserving stepping between tasks

src/inspector/v8-inspector-impl.cc

 /*
  * Copyright (c) 2010-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 72 matching lines @@
   return agent && agent->enabled() ? agent : nullptr;
 }
 
 V8ProfilerAgentImpl* V8InspectorImpl::enabledProfilerAgentForGroup(
     int contextGroupId) {
   V8InspectorSessionImpl* session = sessionForContextGroup(contextGroupId);
   V8ProfilerAgentImpl* agent = session ? session->profilerAgent() : nullptr;
   return agent && agent->enabled() ? agent : nullptr;
 }
 
 v8::MaybeLocal<v8::Value> V8InspectorImpl::runCompiledScript(

[dgozman, 2017/03/13 17:31:33]

Remove this function now.

[kozy, 2017/03/14 01:30:14]

Done.

     v8::Local<v8::Context> context, v8::Local<v8::Script> script) {
   v8::MicrotasksScope microtasksScope(m_isolate,
                                       v8::MicrotasksScope::kRunMicrotasks);
-  int groupId = contextGroupId(context);
-  if (V8DebuggerAgentImpl* agent = enabledDebuggerAgentForGroup(groupId))
-    agent->willExecuteScript(script->GetUnboundScript()->GetId());
-  v8::MaybeLocal<v8::Value> result = script->Run(context);
-  // Get agent from the map again, since it could have detached during script
-  // execution.
-  if (V8DebuggerAgentImpl* agent = enabledDebuggerAgentForGroup(groupId))
-    agent->didExecuteScript();
-  return result;
+  return script->Run(context);
 }
 
 v8::MaybeLocal<v8::Value> V8InspectorImpl::callFunction(
     v8::Local<v8::Function> function, v8::Local<v8::Context> context,
     v8::Local<v8::Value> receiver, int argc, v8::Local<v8::Value> info[]) {
   return callFunction(function, context, receiver, argc, info,
                       v8::MicrotasksScope::kRunMicrotasks);
 }
 
 v8::MaybeLocal<v8::Value> V8InspectorImpl::callInternalFunction(

[dgozman, 2017/03/13 17:31:32]

And maybe these as well?

[kozy, 2017/03/14 01:30:14]

Done.

     v8::Local<v8::Function> function, v8::Local<v8::Context> context,
     v8::Local<v8::Value> receiver, int argc, v8::Local<v8::Value> info[]) {
   return callFunction(function, context, receiver, argc, info,
                       v8::MicrotasksScope::kDoNotRunMicrotasks);
 }
 
 v8::MaybeLocal<v8::Value> V8InspectorImpl::callFunction(

[dgozman, 2017/03/13 17:31:32]

And this one.

[kozy, 2017/03/14 01:30:14]

Done.

     v8::Local<v8::Function> function, v8::Local<v8::Context> context,
     v8::Local<v8::Value> receiver, int argc, v8::Local<v8::Value> info[],
     v8::MicrotasksScope::Type runMicrotasks) {
   v8::MicrotasksScope microtasksScope(m_isolate, runMicrotasks);
-  int groupId = contextGroupId(context);
-  if (V8DebuggerAgentImpl* agent = enabledDebuggerAgentForGroup(groupId))
-    agent->willExecuteScript(function->ScriptId());
-  v8::MaybeLocal<v8::Value> result =
-      function->Call(context, receiver, argc, info);
-  // Get agent from the map again, since it could have detached during script
-  // execution.
-  if (V8DebuggerAgentImpl* agent = enabledDebuggerAgentForGroup(groupId))
-    agent->didExecuteScript();
-  return result;
+  return function->Call(context, receiver, argc, info);
 }
 
 v8::MaybeLocal<v8::Value> V8InspectorImpl::compileAndRunInternalScript(
     v8::Local<v8::Context> context, v8::Local<v8::String> source) {
   v8::Local<v8::UnboundScript> unboundScript;
   if (!v8::debug::CompileInspectorScript(m_isolate, source)
            .ToLocal(&unboundScript))
     return v8::MaybeLocal<v8::Value>();
   v8::MicrotasksScope microtasksScope(m_isolate,
                                       v8::MicrotasksScope::kDoNotRunMicrotasks);
@@ skipping 133 matching lines @@
   m_consoleStorageMap.erase(contextGroupId);
   m_muteExceptionsMap.erase(contextGroupId);
   SessionMap::iterator session = m_sessions.find(contextGroupId);
   if (session != m_sessions.end()) session->second->reset();
   m_contexts.erase(contextGroupId);
   m_debugger->wasmTranslation()->Clear();
 }
 
 void V8InspectorImpl::willExecuteScript(v8::Local<v8::Context> context,
                                         int scriptId) {
-  if (V8DebuggerAgentImpl* agent =
-          enabledDebuggerAgentForGroup(contextGroupId(context))) {
-    agent->willExecuteScript(scriptId);
-  }
 }
 
 void V8InspectorImpl::didExecuteScript(v8::Local<v8::Context> context) {
-  if (V8DebuggerAgentImpl* agent =
-          enabledDebuggerAgentForGroup(contextGroupId(context))) {
-    agent->didExecuteScript();
-  }
 }
 
 void V8InspectorImpl::idleStarted() {
   for (auto it = m_sessions.begin(); it != m_sessions.end(); ++it) {
     if (it->second->profilerAgent()->idleStarted()) return;
   }
 }
 
 void V8InspectorImpl::idleFinished() {
   for (auto it = m_sessions.begin(); it != m_sessions.end(); ++it) {
@@ skipping 79 matching lines @@
 }
 
 V8InspectorSessionImpl* V8InspectorImpl::sessionForContextGroup(
     int contextGroupId) {
   if (!contextGroupId) return nullptr;
   SessionMap::iterator iter = m_sessions.find(contextGroupId);
   return iter == m_sessions.end() ? nullptr : iter->second;
 }
 
 }  // namespace v8_inspector