Changeset 70799 in webkit


Ignore:
Timestamp:
Oct 28, 2010 1:13:56 PM (13 years ago)
Author:
podivilov@chromium.org
Message:

2010-10-28 Pavel Podivilov <​podivilov@chromium.org>

Reviewed by Pavel Feldman.

Web Inspector: fix pausing on next JavaScript statement
​https://bugs.webkit.org/show_bug.cgi?id=48534

  • inspector/InspectorDebuggerAgent.cpp: (WebCore::InspectorDebuggerAgent::InspectorDebuggerAgent): (WebCore::InspectorDebuggerAgent::schedulePauseOnNextStatement): (WebCore::InspectorDebuggerAgent::cancelPauseOnNextStatement): (WebCore::InspectorDebuggerAgent::pause): (WebCore::InspectorDebuggerAgent::didPause):
  • inspector/InspectorDebuggerAgent.h:
Location:
trunk/WebCore
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/WebCore/ChangeLog

    r70797 r70799  
     12010-10-28  Pavel Podivilov  <podivilov@chromium.org>
     2
     3        Reviewed by Pavel Feldman.
     4
     5        Web Inspector: fix pausing on next JavaScript statement
     6        https://bugs.webkit.org/show_bug.cgi?id=48534
     7
     8        * inspector/InspectorDebuggerAgent.cpp:
     9        (WebCore::InspectorDebuggerAgent::InspectorDebuggerAgent):
     10        (WebCore::InspectorDebuggerAgent::schedulePauseOnNextStatement):
     11        (WebCore::InspectorDebuggerAgent::cancelPauseOnNextStatement):
     12        (WebCore::InspectorDebuggerAgent::pause):
     13        (WebCore::InspectorDebuggerAgent::didPause):
     14        * inspector/InspectorDebuggerAgent.h:
     15
    1162010-10-28  Yuzo Fujishima  <yuzo@google.com>
    217

  • trunk/WebCore/inspector/InspectorDebuggerAgent.cpp

    r69798 r70799  
    6363    , m_pausedScriptState(0)
    6464    , m_breakpointsLoaded(false)
     65    , m_javaScriptPauseScheduled(false)
    6566{
    6667}
    … …  
    145146void InspectorDebuggerAgent::schedulePauseOnNextStatement(DebuggerEventType type, PassRefPtr<InspectorValue> data)
    146147{
     148    if (m_javaScriptPauseScheduled)
     149        return;
    147150    m_breakProgramDetails = InspectorObject::create();
    148151    m_breakProgramDetails->setNumber("eventType", type);
    … …  
    153156void InspectorDebuggerAgent::cancelPauseOnNextStatement()
    154157{
     158    if (m_javaScriptPauseScheduled)
     159        return;
    155160    m_breakProgramDetails = 0;
    156161    ScriptDebugServer::shared().setPauseOnNextStatement(false);
    … …  
    160165{
    161166    schedulePauseOnNextStatement(JavaScriptPauseEventType, InspectorObject::create());
     167    m_javaScriptPauseScheduled = true;
    162168}
    163169
    … …  
    310316
    311317    m_frontend->pausedScript(m_breakProgramDetails);
     318    m_javaScriptPauseScheduled = false;
    312319}
    313320

  • trunk/WebCore/inspector/InspectorDebuggerAgent.h

    r69567 r70799  
    107107    static InspectorDebuggerAgent* s_debuggerAgentOnBreakpoint;
    108108    RefPtr<InspectorObject> m_breakProgramDetails;
     109    bool m_javaScriptPauseScheduled;
    109110};
    110111
Note: See TracChangeset for help on using the changeset viewer.