Changeset 106541 in webkit

Timestamp:

Feb 2, 2012 1:12:47 AM (12 years ago)

Author:

yurys@chromium.org

Message:

Web Inspector: pause on uncaugh exceptions state is not properly restored
​https://bugs.webkit.org/show_bug.cgi?id=77558

'Pause on exceptions' state is now stored in InspectorState object so that it is
properly restored on inspected process change.

Reviewed by Vsevolod Vlasov.

• inspector/InspectorDebuggerAgent.cpp:

(DebuggerAgentState):
(WebCore::InspectorDebuggerAgent::InspectorDebuggerAgent):
(WebCore::InspectorDebuggerAgent::disable):
(WebCore::InspectorDebuggerAgent::restore):
(WebCore::InspectorDebuggerAgent::setPauseOnExceptions):
(WebCore):
(WebCore::InspectorDebuggerAgent::setPauseOnExceptionsImpl):

• inspector/InspectorDebuggerAgent.h:

(InspectorDebuggerAgent):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• inspector/InspectorDebuggerAgent.cpp (modified) (5 diffs)
• inspector/InspectorDebuggerAgent.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-02-02  Yury Semikhatsky  <yurys@chromium.org>
+
+        Web Inspector: pause on uncaugh exceptions state is not properly restored
+        https://bugs.webkit.org/show_bug.cgi?id=77558
+
+        'Pause on exceptions' state is now stored in InspectorState object so that it is
+        properly restored on inspected process change.
+
+        Reviewed by Vsevolod Vlasov.
+
+        * inspector/InspectorDebuggerAgent.cpp:
+        (DebuggerAgentState):
+        (WebCore::InspectorDebuggerAgent::InspectorDebuggerAgent):
+        (WebCore::InspectorDebuggerAgent::disable):
+        (WebCore::InspectorDebuggerAgent::restore):
+        (WebCore::InspectorDebuggerAgent::setPauseOnExceptions):
+        (WebCore):
+        (WebCore::InspectorDebuggerAgent::setPauseOnExceptionsImpl):
+        * inspector/InspectorDebuggerAgent.h:
+        (InspectorDebuggerAgent):
+
 2012-02-02  Kentaro Hara  <haraken@chromium.org>
 

trunk/Source/WebCore/inspector/InspectorDebuggerAgent.cpp

@@ -50 +50 @@
 static const char debuggerEnabled[] = "debuggerEnabled";
 static const char javaScriptBreakpoints[] = "javaScriptBreakopints";
+static const char pauseOnExceptionsState[] = "pauseOnExceptionsState";
 };
 
@@ -64 +65 @@
     // FIXME: make breakReason optional so that there was no need to init it with "other".
     clearBreakDetails();
+    m_state->setLong(DebuggerAgentState::pauseOnExceptionsState, ScriptDebugServer::DontPauseOnExceptions);
 }
 
@@ -86 +88 @@
 {
     m_state->setObject(DebuggerAgentState::javaScriptBreakpoints, InspectorObject::create());
+    m_state->setLong(DebuggerAgentState::pauseOnExceptionsState, ScriptDebugServer::DontPauseOnExceptions);
     m_instrumentingAgents->setInspectorDebuggerAgent(0);
 
@@ -141 +144 @@
         m_frontend->globalObjectCleared();
         enable();
+        long pauseState = m_state->getLong(DebuggerAgentState::pauseOnExceptionsState);
+        String error;
+        setPauseOnExceptionsImpl(&error, pauseState);
     }
 }
@@ -448 +454 @@
         return;
     }
+    setPauseOnExceptionsImpl(errorString, pauseState);
+}
+
+void InspectorDebuggerAgent::setPauseOnExceptionsImpl(ErrorString* errorString, int pauseState)
+{
     scriptDebugServer().setPauseOnExceptionsState(static_cast<ScriptDebugServer::PauseOnExceptionsState>(pauseState));
     if (scriptDebugServer().pauseOnExceptionsState() != pauseState)
         *errorString = "Internal error. Could not change pause on exceptions state";
+    else
+        m_state->setLong(DebuggerAgentState::pauseOnExceptionsState, pauseState);
 }
 

trunk/Source/WebCore/inspector/InspectorDebuggerAgent.h

@@ -137 +137 @@
     virtual void didContinue();
 
+    void setPauseOnExceptionsImpl(ErrorString*, int);
+
     PassRefPtr<InspectorObject> resolveBreakpoint(const String& breakpointId, const String& scriptId, const ScriptBreakpoint&);
     void clear();