Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(674)

Unified Diff: Source/core/inspector/InspectorDebuggerAgent.cpp

Issue 333153003: DevTools: Revert stepping over/out on a call frame backend code. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/inspector/InspectorDebuggerAgent.h ('k') | Source/core/inspector/JavaScriptCallFrame.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/inspector/InspectorDebuggerAgent.cpp
diff --git a/Source/core/inspector/InspectorDebuggerAgent.cpp b/Source/core/inspector/InspectorDebuggerAgent.cpp
index eb1529bd4934c0c0b9cb1b4ff71d6b209423b93f..3d22f1aecd227309c8f4a0dcff4f896c25012897 100644
--- a/Source/core/inspector/InspectorDebuggerAgent.cpp
+++ b/Source/core/inspector/InspectorDebuggerAgent.cpp
@@ -787,32 +787,13 @@ void InspectorDebuggerAgent::resume(ErrorString* errorString)
scriptDebugServer().continueProgram();
}
-ScriptValue InspectorDebuggerAgent::resolveCallFrame(ErrorString* errorString, const String* callFrameId)
-{
- if (!callFrameId)
- return ScriptValue();
- if (!isPaused() || m_currentCallStack.isEmpty()) {
- *errorString = "Attempt to access callframe when debugger is not on pause";
- return ScriptValue();
- }
- InjectedScript injectedScript = m_injectedScriptManager->injectedScriptForObjectId(*callFrameId);
- if (injectedScript.isEmpty()) {
- *errorString = "Inspected frame has gone";
- return ScriptValue();
- }
- return injectedScript.findCallFrameById(errorString, m_currentCallStack, *callFrameId);
-}
-
-void InspectorDebuggerAgent::stepOver(ErrorString* errorString, const String* callFrameId)
+void InspectorDebuggerAgent::stepOver(ErrorString* errorString)
{
if (!assertPaused(errorString))
return;
- ScriptValue frame = resolveCallFrame(errorString, callFrameId);
- if (!errorString->isEmpty())
- return;
m_debuggerStepScheduled = true;
m_injectedScriptManager->releaseObjectGroup(InspectorDebuggerAgent::backtraceObjectGroup);
- scriptDebugServer().stepOverStatement(frame);
+ scriptDebugServer().stepOverStatement();
}
void InspectorDebuggerAgent::stepInto(ErrorString* errorString)
@@ -826,16 +807,13 @@ void InspectorDebuggerAgent::stepInto(ErrorString* errorString)
m_listener->stepInto();
}
-void InspectorDebuggerAgent::stepOut(ErrorString* errorString, const String* callFrameId)
+void InspectorDebuggerAgent::stepOut(ErrorString* errorString)
{
if (!assertPaused(errorString))
return;
- ScriptValue frame = resolveCallFrame(errorString, callFrameId);
- if (!errorString->isEmpty())
- return;
m_debuggerStepScheduled = true;
m_injectedScriptManager->releaseObjectGroup(InspectorDebuggerAgent::backtraceObjectGroup);
- scriptDebugServer().stepOutOfFunction(frame);
+ scriptDebugServer().stepOutOfFunction();
}
void InspectorDebuggerAgent::setPauseOnExceptions(ErrorString* errorString, const String& stringPauseState)
« no previous file with comments | « Source/core/inspector/InspectorDebuggerAgent.h ('k') | Source/core/inspector/JavaScriptCallFrame.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698