60778 xenon diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog index 9a44fc1..c7a2166 100644 --- a/WebCore/ChangeLog +++ b/WebCore/ChangeLog @@ -1,5 +1,16 @@ 2008-05-14 Timothy Hatcher <timothy@apple.com> + Fixes the bug where stepping out of a function would show the wrong + call stack (would look like it stepped out twice.) + + Reviewed by NOBODY (OOPS!). + + * page/JavaScriptDebugServer.cpp: + (WebCore::JavaScriptDebugServer::returnEvent): + Call pauseIfNeeded before setting m_currentCallFrame to the caller. + +2008-05-14 Timothy Hatcher <timothy@apple.com> + Add pause on exception support to the Inspector debugger with a toggle buttons to enable or disable it. diff --git a/WebCore/page/JavaScriptDebugServer.cpp b/WebCore/page/JavaScriptDebugServer.cpp index c340d12..b158bf5 100644 --- a/WebCore/page/JavaScriptDebugServer.cpp +++ b/WebCore/page/JavaScriptDebugServer.cpp @@ -457,9 +457,9 @@ bool JavaScriptDebugServer::returnEvent(ExecState* exec, int sourceID, int lineN { if (m_paused) return true; + pauseIfNeeded(exec, sourceID, lineNumber); m_currentCallFrame->invalidate(); m_currentCallFrame = m_currentCallFrame->caller(); - pauseIfNeeded(exec, sourceID, lineNumber); return true; } 3419787327 #webkit TRUE