Changeset 139416 in webkit


Ignore:
Timestamp:
Jan 11, 2013 1:45:03 AM (11 years ago)
Author:
pfeldman@chromium.org
Message:

Web Inspector [chromium]: Debugger.globalObjectCleared is not dispatched on reload after renderer swap
https://bugs.webkit.org/show_bug.cgi?id=106555

Reviewed by Vsevolod Vlasov.

Source/WebCore:

Wrong ::enable was made virtual in the InspectorDebuggerAgent.

Test: inspector/debugger/debugger-scripts-reload.html

  • inspector/InspectorDebuggerAgent.h:

(InspectorDebuggerAgent):

  • inspector/PageDebuggerAgent.cpp:

(WebCore::PageDebuggerAgent::enable):
(WebCore::PageDebuggerAgent::disable):

  • inspector/PageDebuggerAgent.h:

(PageDebuggerAgent):

LayoutTests:

  • http/tests/inspector/debugger-test.js:

(initialize_DebuggerTest):

  • inspector/debugger/debugger-scripts-reload-expected.txt: Added.
  • inspector/debugger/debugger-scripts-reload.html: Added.
Location:
trunk
Files:
2 added
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/LayoutTests/ChangeLog

    r139414 r139416  
     12013-01-11  Pavel Feldman  <pfeldman@chromium.org>
     2
     3        Web Inspector [chromium]: Debugger.globalObjectCleared is not dispatched on reload after renderer swap
     4        https://bugs.webkit.org/show_bug.cgi?id=106555
     5
     6        Reviewed by Vsevolod Vlasov.
     7
     8        * http/tests/inspector/debugger-test.js:
     9        (initialize_DebuggerTest):
     10        * inspector/debugger/debugger-scripts-reload-expected.txt: Added.
     11        * inspector/debugger/debugger-scripts-reload.html: Added.
     12
    1132013-01-11  Vsevolod Vlasov  <vsevik@chromium.org>
    214
  • trunk/LayoutTests/http/tests/inspector/debugger-test.js

    r138506 r139416  
    285285    for (var scriptId in WebInspector.debuggerModel._scripts) {
    286286        var script = WebInspector.debuggerModel._scripts[scriptId];
    287         if (filter(script))
     287        if (!filter || filter(script))
    288288            scripts.push(script);
    289289    }
  • trunk/Source/WebCore/ChangeLog

    r139414 r139416  
     12013-01-11  Pavel Feldman  <pfeldman@chromium.org>
     2
     3        Web Inspector [chromium]: Debugger.globalObjectCleared is not dispatched on reload after renderer swap
     4        https://bugs.webkit.org/show_bug.cgi?id=106555
     5
     6        Reviewed by Vsevolod Vlasov.
     7
     8        Wrong ::enable was made virtual in the InspectorDebuggerAgent.
     9
     10        Test: inspector/debugger/debugger-scripts-reload.html
     11
     12        * inspector/InspectorDebuggerAgent.h:
     13        (InspectorDebuggerAgent):
     14        * inspector/PageDebuggerAgent.cpp:
     15        (WebCore::PageDebuggerAgent::enable):
     16        (WebCore::PageDebuggerAgent::disable):
     17        * inspector/PageDebuggerAgent.h:
     18        (PageDebuggerAgent):
     19
    1202013-01-11  Vsevolod Vlasov  <vsevik@chromium.org>
    221
  • trunk/Source/WebCore/inspector/InspectorDebuggerAgent.h

    r138534 r139416  
    7272    virtual void supportsSeparateScriptCompilationAndExecution(ErrorString*, bool*);
    7373
    74     virtual void enable(ErrorString*);
    75     virtual void disable(ErrorString*);
    76 
    7774    virtual void setFrontend(InspectorFrontend*);
    7875    virtual void clearFrontend();
     
    8481
    8582    // Part of the protocol.
     83    virtual void enable(ErrorString*);
     84    virtual void disable(ErrorString*);
    8685    virtual void setBreakpointsActive(ErrorString*, bool active);
    8786
     
    145144    virtual InjectedScript injectedScriptForEval(ErrorString*, const int* executionContextId) = 0;
    146145
     146    virtual void enable();
    147147    virtual void disable();
    148148    virtual void didPause(ScriptState*, const ScriptValue& callFrames, const ScriptValue& exception);
     
    151151
    152152private:
    153     void enable();
    154153    bool enabled();
    155154
  • trunk/Source/WebCore/inspector/PageDebuggerAgent.cpp

    r138457 r139416  
    6060}
    6161
    62 void PageDebuggerAgent::enable(ErrorString* errorString)
     62void PageDebuggerAgent::enable()
    6363{
    64     InspectorDebuggerAgent::enable(errorString);
     64    InspectorDebuggerAgent::enable();
    6565    m_instrumentingAgents->setPageDebuggerAgent(this);
    6666}
    6767
    68 void PageDebuggerAgent::disable(ErrorString* errorString)
     68void PageDebuggerAgent::disable()
    6969{
    70     InspectorDebuggerAgent::disable(errorString);
     70    InspectorDebuggerAgent::disable();
    7171    m_instrumentingAgents->setPageDebuggerAgent(0);
    7272}
  • trunk/Source/WebCore/inspector/PageDebuggerAgent.h

    r138457 r139416  
    5050    virtual ~PageDebuggerAgent();
    5151
    52     virtual void enable(ErrorString*);
    53     virtual void disable(ErrorString*);
     52    void didClearMainFrameWindowObject();
    5453
    55     void didClearMainFrameWindowObject();
     54protected:
     55    virtual void enable();
     56    virtual void disable();
    5657
    5758private:
Note: See TracChangeset for help on using the changeset viewer.