Merge 86507 - 2011-05-15 Ilya Tikhonovsky <loislo@chromium.org>

Source/WebCore/inspector/InspectorController.cpp

 /*
  * Copyright (C) 2011 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 94 matching lines @@
     m_openingFrontend = false;
     m_inspectorFrontend = new InspectorFrontend(m_inspectorClient);
     m_injectedScriptManager->injectedScriptHost()->setFrontend(m_inspectorFrontend.get());
     m_inspectorAgent->setFrontend(m_inspectorFrontend.get());
 
     if (!InspectorInstrumentation::hasFrontends())
         ScriptController::setCaptureCallStackForUncaughtExceptions(true);
     InspectorInstrumentation::frontendCreated();
 
     ASSERT(m_inspectorClient);
-    m_inspectorBackendDispatcher = new InspectorBackendDispatcher(
+    m_inspectorBackendDispatcher = adoptRef(new InspectorBackendDispatcher(
         m_inspectorClient,
 #if ENABLE(OFFLINE_WEB_APPLICATIONS)
         m_inspectorAgent->applicationCacheAgent(),
 #endif
 #if ENABLE(JAVASCRIPT_DEBUGGER)
         m_inspectorAgent->browserDebuggerAgent(),
 #endif
         m_inspectorAgent->cssAgent(),
         m_inspectorAgent->consoleAgent(),
         m_inspectorAgent->domAgent(),
 #if ENABLE(DOM_STORAGE)
         m_inspectorAgent->domStorageAgent(),
 #endif
 #if ENABLE(DATABASE)
         m_inspectorAgent->databaseAgent(),
 #endif
 #if ENABLE(JAVASCRIPT_DEBUGGER)
         m_inspectorAgent->debuggerAgent(),
 #endif
         m_inspectorAgent->resourceAgent(),
         m_inspectorAgent->pageAgent(),
 #if ENABLE(JAVASCRIPT_DEBUGGER)
         m_inspectorAgent->profilerAgent(),
 #endif
         m_inspectorAgent->runtimeAgent(),
-        m_inspectorAgent->timelineAgent());
+        m_inspectorAgent->timelineAgent()));
 
     if (m_startUserInitiatedDebuggingWhenFrontedIsConnected) {
         m_inspectorFrontend->inspector()->startUserInitiatedDebugging();
         m_startUserInitiatedDebuggingWhenFrontedIsConnected = false;
     }
 }
 
 void InspectorController::disconnectFrontend()
 {
     if (!m_inspectorFrontend)
         return;
+    m_inspectorBackendDispatcher->clearFrontend();
     m_inspectorBackendDispatcher.clear();
 
     m_inspectorAgent->disconnectFrontend();
     m_injectedScriptManager->injectedScriptHost()->clearFrontend();
 
     m_inspectorFrontend.clear();
 
     InspectorInstrumentation::frontendDeleted();
     if (!InspectorInstrumentation::hasFrontends())
         ScriptController::setCaptureCallStackForUncaughtExceptions(false);
@@ skipping 161 matching lines @@
         ErrorString error;
         debuggerAgent->resume(&error);
     }
 }
 
 #endif
 
 } // namespace WebCore
 
 #endif // ENABLE(INSPECTOR)