Changeset 86581 in webkit

Timestamp:

May 16, 2011 9:58:15 AM (13 years ago)

Author:

podivilov@chromium.org

Message:

2011-05-16 Pavel Podivilov <​podivilov@chromium.org>

Reviewed by Yury Semikhatsky.

Web Inspector: debuggerWasEnabled notification should not be send to front-end on navigation.
​https://bugs.webkit.org/show_bug.cgi?id=60888

• inspector/InspectorController.cpp: (WebCore::InspectorController::disableDebugger):
• inspector/InspectorDebuggerAgent.cpp: (WebCore::InspectorDebuggerAgent::enable): (WebCore::InspectorDebuggerAgent::disable): (WebCore::InspectorDebuggerAgent::restore): (WebCore::InspectorDebuggerAgent::clearFrontend):
• inspector/InspectorDebuggerAgent.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• inspector/InspectorController.cpp (modified) (1 diff)
• inspector/InspectorDebuggerAgent.cpp (modified) (3 diffs)
• inspector/InspectorDebuggerAgent.h (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-05-16  Pavel Podivilov  <podivilov@chromium.org>
+
+        Reviewed by Yury Semikhatsky.
+
+        Web Inspector: debuggerWasEnabled notification should not be send to front-end on navigation.
+        https://bugs.webkit.org/show_bug.cgi?id=60888
+
+        * inspector/InspectorController.cpp:
+        (WebCore::InspectorController::disableDebugger):
+        * inspector/InspectorDebuggerAgent.cpp:
+        (WebCore::InspectorDebuggerAgent::enable):
+        (WebCore::InspectorDebuggerAgent::disable):
+        (WebCore::InspectorDebuggerAgent::restore):
+        (WebCore::InspectorDebuggerAgent::clearFrontend):
+        * inspector/InspectorDebuggerAgent.h:
+
 2011-05-16  Yury Semikhatsky  <yurys@chromium.org>
 

trunk/Source/WebCore/inspector/InspectorController.cpp

@@ -448 +448 @@
 void InspectorController::disableDebugger()
 {
-    m_debuggerAgent->disable();
+    ErrorString error;
+    m_debuggerAgent->disable(&error);
 }
 

trunk/Source/WebCore/inspector/InspectorDebuggerAgent.cpp

@@ -65 +65 @@
 }
 
-void InspectorDebuggerAgent::enable(bool restoringFromState)
-{
-    ASSERT(m_frontend);
-    if (!restoringFromState && enabled())
-        return;
-    m_inspectorState->setBoolean(DebuggerAgentState::debuggerEnabled, true);
+void InspectorDebuggerAgent::enable()
+{
     m_instrumentingAgents->setInspectorDebuggerAgent(this);
 
-    scriptDebugServer().clearBreakpoints();
     // FIXME(WK44513): breakpoints activated flag should be synchronized between all front-ends
     scriptDebugServer().setBreakpointsActivated(true);
     startListeningScriptDebugServer();
 
-    m_frontend->debuggerWasEnabled();
     if (m_listener)
         m_listener->debuggerWasEnabled();
@@ -85 +79 @@
 void InspectorDebuggerAgent::disable()
 {
-    if (!enabled())
-        return;
-    m_inspectorState->setBoolean(DebuggerAgentState::debuggerEnabled, false);
     m_inspectorState->setObject(DebuggerAgentState::javaScriptBreakpoints, InspectorObject::create());
     m_instrumentingAgents->setInspectorDebuggerAgent(0);
 
     stopListeningScriptDebugServer();
+    scriptDebugServer().clearBreakpoints();
     clear();
+
+    if (m_listener)
+        m_listener->debuggerWasDisabled();
+}
+
+bool InspectorDebuggerAgent::enabled()
+{
+    return m_inspectorState->getBoolean(DebuggerAgentState::debuggerEnabled);
+}
+
+void InspectorDebuggerAgent::enable(ErrorString*)
+{
+    if (enabled())
+        return;
+
+    enable();
+    m_inspectorState->setBoolean(DebuggerAgentState::debuggerEnabled, true);
+
+    ASSERT(m_frontend);
+    m_frontend->debuggerWasEnabled();
+}
+
+void InspectorDebuggerAgent::disable(ErrorString*)
+{
+    if (!enabled())
+        return;
+
+    disable();
+    m_inspectorState->setBoolean(DebuggerAgentState::debuggerEnabled, false);
 
     if (m_frontend)
         m_frontend->debuggerWasDisabled();
-    if (m_listener)
-        m_listener->debuggerWasDisabled();
-}
-
-bool InspectorDebuggerAgent::enabled()
-{
-    return m_inspectorState->getBoolean(DebuggerAgentState::debuggerEnabled);
 }
 
 void InspectorDebuggerAgent::restore()
 {
-    if (m_inspectorState->getBoolean(DebuggerAgentState::debuggerEnabled))
-        enable(true);
+    if (enabled())
+        enable();
 }
 
@@ -122 +136 @@
     if (!enabled())
         return;
-    // If the window is being closed with the debugger enabled,
-    // remember this state to re-enable debugger on the next window
-    // opening.
+
     disable();
+
+    // FIXME: due to m_state->mute() hack in InspectorController, debuggerEnabled is actually set to false only
+    // in InspectorState, but not in cookie. That's why after navigation debuggerEnabled will be true,
+    // but after front-end re-open it will still be false.
+    m_inspectorState->setBoolean(DebuggerAgentState::debuggerEnabled, false);
 }
 

trunk/Source/WebCore/inspector/InspectorDebuggerAgent.h

@@ -69 +69 @@
     virtual ~InspectorDebuggerAgent();
 
-    void enable(ErrorString*) { enable(false); }
-    void disable(ErrorString*) { disable(); }
-    void disable();
+    void enable(ErrorString*);
+    void disable(ErrorString*);
     bool enabled();
     void restore();
@@ -117 +116 @@
 
 private:
-    void enable(bool restoringFromState);
+    void enable();
+    void disable();
 
     PassRefPtr<InspectorArray> currentCallFrames();