2011-02-09 Ilya Tikhonovsky <loislo@chromium.org>

        Reviewed by Pavel Feldman.

        Web Inspector: InspectorAgent should know nothing about InspectorController instance.

        https://bugs.webkit.org/show_bug.cgi?id=54100

        * inspector/InspectorAgent.cpp:
        (WebCore::InspectorAgent::InspectorAgent):
        (WebCore::InspectorAgent::restoreInspectorStateFromCookie):
        (WebCore::InspectorAgent::disconnectFrontend):
        * inspector/InspectorAgent.h:
        * inspector/InspectorController.cpp:
        (WebCore::InspectorController::InspectorController):
        (WebCore::InspectorController::disconnectFrontend):
        (WebCore::InspectorController::restoreInspectorStateFromCookie):

git-svn-id: svn://svn.chromium.org/blink/trunk@78056 bbb929c8-8fbe-4397-9dbb-9b2b20218538

third_party/WebKit/Source/WebCore/ChangeLog

+2011-02-09  Ilya Tikhonovsky  <loislo@chromium.org>
+
+        Reviewed by Pavel Feldman.
+
+        Web Inspector: InspectorAgent should know nothing about InspectorController instance.
+
+        https://bugs.webkit.org/show_bug.cgi?id=54100
+
+        * inspector/InspectorAgent.cpp:
+        (WebCore::InspectorAgent::InspectorAgent):
+        (WebCore::InspectorAgent::restoreInspectorStateFromCookie):
+        (WebCore::InspectorAgent::disconnectFrontend):
+        * inspector/InspectorAgent.h:
+        * inspector/InspectorController.cpp:
+        (WebCore::InspectorController::InspectorController):
+        (WebCore::InspectorController::disconnectFrontend):
+        (WebCore::InspectorController::restoreInspectorStateFromCookie):
+
 2011-02-09  Pavel Podivilov  <podivilov@chromium.org>
 
         Reviewed by Pavel Feldman.

third_party/WebKit/Source/WebCore/inspector/InspectorAgent.cpp

@@ -140,9 +140,8 @@ static const char scriptsPanelName[] = "scripts";
 static const char consolePanelName[] = "console";
 static const char profilesPanelName[] = "profiles";
 
-InspectorAgent::InspectorAgent(InspectorController* inspectorController, Page* page, InspectorClient* client)
-    : m_inspectorController(inspectorController)
-    , m_inspectedPage(page)
+InspectorAgent::InspectorAgent(Page* page, InspectorClient* client)
+    : m_inspectedPage(page)
     , m_client(client)
     , m_frontend(0)
     , m_cssAgent(new InspectorCSSAgent())
@@ -198,13 +197,9 @@ void InspectorAgent::restoreInspectorStateFromCookie(const String& inspectorStat
 {
     m_state->restoreFromInspectorCookie(inspectorStateCookie);
 
-    if (!m_frontend) {
-        m_inspectorController->connectFrontend();
-        m_frontend->frontendReused();
-        m_frontend->inspectedURLChanged(inspectedURL().string());
-        m_domAgent->setDocument(m_inspectedPage->mainFrame()->document());
-        pushDataCollectedOffline();
-    }
+    m_frontend->frontendReused();
+    m_frontend->inspectedURLChanged(inspectedURL().string());
+    pushDataCollectedOffline();
 
     m_resourceAgent = InspectorResourceAgent::restore(m_inspectedPage, m_state.get(), m_frontend);
 
@@ -365,8 +360,6 @@ void InspectorAgent::disconnectFrontend()
 
     m_frontend = 0;
 
-    m_inspectorController->disconnectFrontendImpl();
-
 #if ENABLE(JAVASCRIPT_DEBUGGER)
     // If the window is being closed with the debugger enabled,
     // remember this state to re-enable debugger on the next window

third_party/WebKit/Source/WebCore/inspector/InspectorAgent.h

@@ -59,7 +59,6 @@ class InspectorArray;
 class InspectorBrowserDebuggerAgent;
 class InspectorClient;
 class InspectorConsoleAgent;
-class InspectorController;
 class InspectorCSSAgent;
 class InspectorDOMAgent;
 class InspectorDOMStorageAgent;
@@ -108,7 +107,7 @@ class InspectorAgent {
     WTF_MAKE_NONCOPYABLE(InspectorAgent);
     WTF_MAKE_FAST_ALLOCATED;
 public:
-    InspectorAgent(InspectorController*, Page*, InspectorClient*);
+    InspectorAgent(Page*, InspectorClient*);
     virtual ~InspectorAgent();
 
     InspectorClient* inspectorClient() { return m_client; }
@@ -141,7 +140,6 @@ public:
 
     InspectorResourceAgent* resourceAgent();
 
-    InspectorController* inspectorController() { return m_inspectorController; };
     InspectorAgent* inspectorAgent() { return this; }
     InspectorConsoleAgent* consoleAgent() { return m_consoleAgent.get(); }
     InspectorCSSAgent* cssAgent() { return m_cssAgent.get(); }
@@ -276,7 +274,6 @@ private:
     void focusNode();
     bool isMainResourceLoader(DocumentLoader*, const KURL& requestUrl);
 
-    InspectorController* m_inspectorController;
     Page* m_inspectedPage;
     InspectorClient* m_client;
     InspectorFrontend* m_frontend;

third_party/WebKit/Source/WebCore/inspector/InspectorController.cpp

@@ -50,7 +50,7 @@
 namespace WebCore {
 
 InspectorController::InspectorController(Page* page, InspectorClient* inspectorClient)
-    : m_inspectorAgent(new InspectorAgent(this, page, inspectorClient))
+    : m_inspectorAgent(new InspectorAgent(page, inspectorClient))
     , m_inspectorBackendDispatcher(new InspectorBackendDispatcher(m_inspectorAgent.get()))
     , m_inspectorClient(inspectorClient)
     , m_openingFrontend(false)
@@ -104,20 +104,18 @@ void InspectorController::connectFrontend()
 }
 
 void InspectorController::disconnectFrontend()
-{
-    m_inspectorAgent->disconnectFrontend();
-}
-
-void InspectorController::disconnectFrontendImpl()
 {
     if (!m_inspectorFrontend)
         return;
 
+    m_inspectorAgent->disconnectFrontend();
+
     m_inspectorFrontend.clear();
 
     InspectorInstrumentation::frontendDeleted();
     if (!InspectorInstrumentation::hasFrontends())
         ScriptController::setCaptureCallStackForUncaughtExceptions(false);
+
 }
 
 void InspectorController::show()
@@ -146,6 +144,8 @@ void InspectorController::close()
 
 void InspectorController::restoreInspectorStateFromCookie(const String& inspectorStateCookie)
 {
+    ASSERT(!m_inspectorFrontend);
+    connectFrontend();
     m_inspectorAgent->restoreInspectorStateFromCookie(inspectorStateCookie);
 }
 

third_party/WebKit/Source/WebCore/inspector/InspectorController.h

@@ -100,12 +100,8 @@ public:
 #endif
 
 private:
-    friend class InspectorAgent;
     friend class PostWorkerNotificationToFrontendTask;
 
-    void disconnectFrontendImpl(); // used by InspectorAgent
-    void frontendLoaded();
-
     OwnPtr<InspectorAgent> m_inspectorAgent;
     OwnPtr<InspectorBackendDispatcher> m_inspectorBackendDispatcher;
     OwnPtr<InspectorFrontendClient> m_inspectorFrontendClient;