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

WebCore/inspector/InspectorController.cpp

 /*
  * Copyright (C) 2007, 2008, 2009, 2010 Apple Inc. All rights reserved.
  * Copyright (C) 2008 Matt Lilek <webkit@mattlilek.com>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
@@ skipping 482 matching lines @@
 
 #if ENABLE(OFFLINE_WEB_APPLICATIONS)
     m_applicationCacheAgent = new InspectorApplicationCacheAgent(this, m_frontend.get());
 #endif
 
     if (!connectedFrontendCount)
         ScriptController::setCaptureCallStackForUncaughtExceptions(true);
     connectedFrontendCount++;
 }
 
+void InspectorController::reuseFrontend()
+{
+    connectFrontend();
+    restoreDebugger();
+    restoreProfiler();
+}
+
 void InspectorController::show()
 {
     if (!enabled())
         return;
 
     if (m_openingFrontend)
         return;
 
     if (m_frontend)
         m_frontend->bringToFront();
@@ skipping 143 matching lines @@
         InspectorWorkerResource* worker = it->second.get();
         m_frontend->didCreateWorker(worker->id(), worker->url(), worker->isSharedWorker());
     }
 #endif
 
     // Dispatch pending frontend commands
     for (Vector<pair<long, String> >::iterator it = m_pendingEvaluateTestCommands.begin(); it != m_pendingEvaluateTestCommands.end(); ++it)
         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);
     else {
         String debuggerEnabled = setting(debuggerEnabledSettingName);
         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);
         if (profilerEnabledSetting == "true")
             enableProfiler();
     }
 #endif
 }
 
 void InspectorController::unbindAllResources()
@@ skipping 869 matching lines @@
 
     if (m_frontend)
         m_frontend->debuggerWasDisabled();
 }
 
 void InspectorController::resume()
 {
     if (m_debuggerAgent)
         m_debuggerAgent->resume();
 }
-// JavaScriptDebugListener functions
 
 #endif
 
 void InspectorController::evaluateForTestInFrontend(long callId, const String& script)
 {
     if (m_frontend)
         m_frontend->evaluateForTestInFrontend(callId, script);
     else
         m_pendingEvaluateTestCommands.append(pair<long, String>(callId, script));
 }
@@ skipping 321 matching lines @@
 void InspectorController::didModifyDOMAttrImpl(Element* element)
 {
     if (m_domAgent)
         m_domAgent->didModifyDOMAttr(element);
 }
 
 
 } // namespace WebCore
 
 #endif // ENABLE(INSPECTOR)