Revert of DevTools: Debugger StepInto/Out/Over initiated from a framework should not black-box it.

Source/core/inspector/InspectorDebuggerAgent.cpp

Index: Source/core/inspector/InspectorDebuggerAgent.cpp
diff --git a/Source/core/inspector/InspectorDebuggerAgent.cpp b/Source/core/inspector/InspectorDebuggerAgent.cpp
index 234384b4b731952369dacc0028184440693f7b8d..3d22f1aecd227309c8f4a0dcff4f896c25012897 100644
--- a/Source/core/inspector/InspectorDebuggerAgent.cpp
+++ b/Source/core/inspector/InspectorDebuggerAgent.cpp
@@ -106,7 +106,6 @@
     , m_pausedScriptState(nullptr)
     , m_javaScriptPauseScheduled(false)
     , m_debuggerStepScheduled(false)
-    , m_steppingFromFramework(false)
     , m_pausingOnNativeEvent(false)
     , m_listener(0)
     , m_skippedStepInCount(0)
@@ -475,9 +474,6 @@
 
 ScriptDebugListener::SkipPauseRequest InspectorDebuggerAgent::shouldSkipExceptionPause()
 {
-    if (m_steppingFromFramework)
-        return ScriptDebugListener::NoSkip;
-
     // FIXME: Fast return: if (!m_cachedSkipStackRegExp && !has_any_anti_breakpoint) return ScriptDebugListener::NoSkip;
 
     RefPtrWillBeRawPtr<JavaScriptCallFrame> topFrame = scriptDebugServer().topCallFrameNoScopes();
@@ -530,7 +526,7 @@
 
 ScriptDebugListener::SkipPauseRequest InspectorDebuggerAgent::shouldSkipStepPause()
 {
-    if (!m_cachedSkipStackRegExp || m_steppingFromFramework)
+    if (!m_cachedSkipStackRegExp)
         return ScriptDebugListener::NoSkip;
 
     RefPtrWillBeRawPtr<JavaScriptCallFrame> topFrame = scriptDebugServer().topCallFrameNoScopes();
@@ -560,16 +556,6 @@
     return ScriptDebugListener::StepInto;
 }
 
-bool InspectorDebuggerAgent::isTopCallFrameInFramework()
-{
-    if (!m_cachedSkipStackRegExp)
-        return false;
-
-    RefPtrWillBeRawPtr<JavaScriptCallFrame> topFrame = scriptDebugServer().topCallFrameNoScopes();
-    String scriptUrl = scriptURL(topFrame.get());
-    return !scriptUrl.isEmpty() && m_cachedSkipStackRegExp->match(scriptUrl) != -1;
-}
-
 PassRefPtr<TypeBuilder::Debugger::Location> InspectorDebuggerAgent::resolveBreakpoint(const String& breakpointId, const String& scriptId, const ScriptBreakpoint& breakpoint, BreakpointSource source)
 {
     ScriptsMap::iterator scriptIterator = m_scripts.find(scriptId);
@@ -797,7 +783,6 @@
     if (!assertPaused(errorString))
         return;
     m_debuggerStepScheduled = false;
-    m_steppingFromFramework = false;
     m_injectedScriptManager->releaseObjectGroup(InspectorDebuggerAgent::backtraceObjectGroup);
     scriptDebugServer().continueProgram();
 }
@@ -807,7 +792,6 @@
     if (!assertPaused(errorString))
         return;
     m_debuggerStepScheduled = true;
-    m_steppingFromFramework = isTopCallFrameInFramework();
     m_injectedScriptManager->releaseObjectGroup(InspectorDebuggerAgent::backtraceObjectGroup);
     scriptDebugServer().stepOverStatement();
 }
@@ -817,7 +801,6 @@
     if (!assertPaused(errorString))
         return;
     m_debuggerStepScheduled = true;
-    m_steppingFromFramework = isTopCallFrameInFramework();
     m_injectedScriptManager->releaseObjectGroup(InspectorDebuggerAgent::backtraceObjectGroup);
     scriptDebugServer().stepIntoStatement();
     if (m_listener)
@@ -829,7 +812,6 @@
     if (!assertPaused(errorString))
         return;
     m_debuggerStepScheduled = true;
-    m_steppingFromFramework = isTopCallFrameInFramework();
     m_injectedScriptManager->releaseObjectGroup(InspectorDebuggerAgent::backtraceObjectGroup);
     scriptDebugServer().stepOutOfFunction();
 }
@@ -1190,7 +1172,6 @@
     m_frontend->paused(currentCallFrames(), m_breakReason, m_breakAuxData, hitBreakpointIds, currentAsyncStackTrace());
     m_javaScriptPauseScheduled = false;
     m_debuggerStepScheduled = false;
-    m_steppingFromFramework = false;
     m_pausingOnNativeEvent = false;
     m_skippedStepInCount = 0;
 
@@ -1223,7 +1204,6 @@
     m_breakReason = breakReason;
     m_breakAuxData = data;
     m_debuggerStepScheduled = false;
-    m_steppingFromFramework = false;
     m_pausingOnNativeEvent = false;
     scriptDebugServer().breakProgram();
 }
@@ -1239,7 +1219,6 @@
     clearBreakDetails();
     m_javaScriptPauseScheduled = false;
     m_debuggerStepScheduled = false;
-    m_steppingFromFramework = false;
     m_pausingOnNativeEvent = false;
     ErrorString error;
     setOverlayMessage(&error, 0);