Changeset 291380 in webkit for trunk/Source/JavaScriptCore/debugger/Debugger.cpp

Timestamp:

Mar 16, 2022, 5:39:04 PM (3 years ago)

Author:

Devin Rousso

Message:

Web Inspector: REGRESSION(r290720): Debugger: Step next should not behave the same as Step into
​https://bugs.webkit.org/show_bug.cgi?id=237936

Reviewed by Joseph Pecoraro.

Covered by existing tests (not sure why they don't fail on EWS, but they fail locally).

• debugger/Debugger.cpp:

(JSC::Debugger::pauseIfNeeded):
Checking that the desired CallFrame matches the current CallFrame is enough to determine
whether the Debugger should pause for Step next and Step out, as both of those actions set
a desired CallFrame. We explicitly do not want to check for the bool flags that indicate
those actions because they have different behaviors regarding the current CallFrame (the
former desires the same CallFrame and the latter desires the parent CallFrame). This
patch partially reverts r290720.

File:

• trunk/Source/JavaScriptCore/debugger/Debugger.cpp (modified) (1 diff)

trunk/Source/JavaScriptCore/debugger/Debugger.cpp

@@ -888 +888 @@
         pauseNow = true;
         didPauseForStep = !afterBlackboxedScript;
-    } else if (m_pauseOnStepNext || m_pauseOnStepOut || (m_pauseOnCallFrame == m_currentCallFrame)) {
+    } else if (m_pauseOnCallFrame == m_currentCallFrame) {
         pauseNow = true;
         didPauseForStep = true;