2011-02-28 Pavel Podivilov <podivilov@chromium.org>

Reviewed by Pavel Feldman. Web Inspector: [REGRESSION] no resources in scripts panel because debugger is enabled too early. https://bugs.webkit.org/show_bug.cgi?id=55389 * inspector/InspectorAgent.cpp: (WebCore::InspectorAgent::populateScriptObjects): * inspector/InspectorDebuggerAgent.cpp: (WebCore::InspectorDebuggerAgent::setFrontend): (WebCore::InspectorDebuggerAgent::enableDebuggerAfterShown): * inspector/InspectorDebuggerAgent.h: Canonical link: https://commits.webkit.org/69804@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@79887 268f45cc-cd09-0410-ab3c-d52691b4dbfc
WebKit · Feb 28, 2011 · f34f3e33e1028f42c6302ebe5058db0a66f76c15 · f34f3e3
1 parent 58601ae
commit f34f3e33e1028f42c6302ebe5058db0a66f76c15
Showing 4 changed files with 20 additions and 0 deletions.
diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
@@ -1,3 +1,17 @@
+2011-02-28  Pavel Podivilov  <podivilov@chromium.org>
+
+        Reviewed by Pavel Feldman.
+
+        Web Inspector: [REGRESSION] no resources in scripts panel because debugger is enabled too early.
+        https://bugs.webkit.org/show_bug.cgi?id=55389
+
+        * inspector/InspectorAgent.cpp:
+        (WebCore::InspectorAgent::populateScriptObjects):
+        * inspector/InspectorDebuggerAgent.cpp:
+        (WebCore::InspectorDebuggerAgent::setFrontend):
+        (WebCore::InspectorDebuggerAgent::enableDebuggerAfterShown):
+        * inspector/InspectorDebuggerAgent.h:
+
 2011-02-28  Sheriff Bot  <webkit.review.bot@gmail.com>
 
         Unreviewed, rolling out r79877.

diff --git a/Source/WebCore/inspector/InspectorAgent.cpp b/Source/WebCore/inspector/InspectorAgent.cpp
@@ -464,6 +464,7 @@ void InspectorAgent::populateScriptObjects(ErrorString*)
         m_showPanelAfterVisible = "";
     }
 
+    m_debuggerAgent->enableDebuggerAfterShown();
     restoreProfiler(ProfilerRestoreNoAction);
 
     // Dispatch pending frontend commands

diff --git a/Source/WebCore/inspector/InspectorDebuggerAgent.cpp b/Source/WebCore/inspector/InspectorDebuggerAgent.cpp
@@ -128,6 +128,10 @@ void InspectorDebuggerAgent::restore()
 void InspectorDebuggerAgent::setFrontend(InspectorFrontend* frontend)
 {
     m_frontend = frontend;
+}
+
+void InspectorDebuggerAgent::enableDebuggerAfterShown()
+{
     // Erase sticky breakpoints. If we are restoring from a cookie setFrontend msut be called
     // before the state is loaded from the cookie.
     m_inspectorState->setObject(DebuggerAgentState::javaScriptBreakpoints, InspectorObject::create());

diff --git a/Source/WebCore/inspector/InspectorDebuggerAgent.h b/Source/WebCore/inspector/InspectorDebuggerAgent.h
@@ -72,6 +72,7 @@ class InspectorDebuggerAgent : public ScriptDebugListener {
     bool enabled();
     void restore();
     void setFrontend(InspectorFrontend*);
+    void enableDebuggerAfterShown();
     void clearFrontend();
 
     void inspectedURLChanged(const String& url);