Merge 67623 - 2010-09-16 Yury Semikhatsky <yurys@chromium.org>...

WebCore/inspector/InspectorController.cpp

Index: WebCore/inspector/InspectorController.cpp
===================================================================
--- WebCore/inspector/InspectorController.cpp	(revision 67697)
+++ WebCore/inspector/InspectorController.cpp	(working copy)
@@ -500,6 +500,13 @@
     connectedFrontendCount++;
 }
 
+void InspectorController::reuseFrontend()
+{
+    connectFrontend();
+    restoreDebugger();
+    restoreProfiler();
+}
+
 void InspectorController::show()
 {
     if (!enabled())
@@ -663,6 +670,13 @@
         m_frontend->evaluateForTestInFrontend((*it).first, (*it).second);
     m_pendingEvaluateTestCommands.clear();
 
+    restoreDebugger();
+    restoreProfiler();
+}
+
+void InspectorController::restoreDebugger()
+{
+    ASSERT(m_frontend);
 #if ENABLE(JAVASCRIPT_DEBUGGER)
     if (InspectorDebuggerAgent::isDebuggerAlwaysEnabled())
         enableDebuggerFromFrontend(false);
@@ -671,6 +685,13 @@
         if (debuggerEnabled == "true" || m_attachDebuggerWhenShown)
             enableDebugger();
     }
+#endif
+}
+
+void InspectorController::restoreProfiler()
+{
+    ASSERT(m_frontend);
+#if ENABLE(JAVASCRIPT_DEBUGGER)
     m_profilerAgent->setFrontend(m_frontend.get());
     if (!ScriptProfiler::isProfilerAlwaysEnabled()) {
         String profilerEnabledSetting = setting(profilerEnabledSettingName);
@@ -1560,7 +1581,6 @@
     if (m_debuggerAgent)
         m_debuggerAgent->resume();
 }
-// JavaScriptDebugListener functions
 
 #endif