Changeset 82845 in webkit

Timestamp:

Apr 4, 2011 10:32:51 AM (13 years ago)

Author:

yurys@chromium.org

Message:

2011-04-04 Yury Semikhatsky <​yurys@chromium.org>

Reviewed by Pavel Feldman.

Web Inspector: InspectorRuntimeAgent should not depend on Page
​https://bugs.webkit.org/show_bug.cgi?id=57759

Descendants of InspectorRuntimeAgent should implement a method providing access to the default
inspected state used for console evaluations.

• inspector/InspectorAgent.cpp: (WebCore::InspectorAgent::InspectorAgent): runtime agent is created and deleted along with other agents. (WebCore::InspectorAgent::setFrontend):
• inspector/InspectorAgent.h:
• inspector/InspectorRuntimeAgent.cpp: (WebCore::InspectorRuntimeAgent::create): (WebCore::InspectorRuntimeAgent::InspectorRuntimeAgent): (WebCore::InspectorRuntimeAgent::evaluate):
• inspector/InspectorRuntimeAgent.h: (WebCore::InspectorRuntimeAgent::InspectedStateProvider::~InspectedStateProvider):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• inspector/InspectorAgent.cpp (modified) (5 diffs)
• inspector/InspectorAgent.h (modified) (1 diff)
• inspector/InspectorRuntimeAgent.cpp (modified) (2 diffs)
• inspector/InspectorRuntimeAgent.h (modified) (4 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-04-04  Yury Semikhatsky  <yurys@chromium.org>
+
+        Reviewed by Pavel Feldman.
+
+        Web Inspector: InspectorRuntimeAgent should not depend on Page
+        https://bugs.webkit.org/show_bug.cgi?id=57759
+
+        Descendants of InspectorRuntimeAgent should implement a method providing access to the default
+        inspected state used for console evaluations.
+
+        * inspector/InspectorAgent.cpp:
+        (WebCore::InspectorAgent::InspectorAgent): runtime agent is created and deleted along with other agents.
+        (WebCore::InspectorAgent::setFrontend):
+        * inspector/InspectorAgent.h:
+        * inspector/InspectorRuntimeAgent.cpp:
+        (WebCore::InspectorRuntimeAgent::create):
+        (WebCore::InspectorRuntimeAgent::InspectorRuntimeAgent):
+        (WebCore::InspectorRuntimeAgent::evaluate):
+        * inspector/InspectorRuntimeAgent.h:
+        (WebCore::InspectorRuntimeAgent::InspectedStateProvider::~InspectedStateProvider):
+
 2011-04-04  Yong Li  <yoli@rim.com>
 

trunk/Source/WebCore/inspector/InspectorAgent.cpp

@@ -90 +90 @@
 static const char profilesPanelName[] = "profiles";
 
+namespace {
+
+class PageRuntimeAgent : public InspectorRuntimeAgent {
+public:
+    PageRuntimeAgent(InjectedScriptManager* injectedScriptManager, Page* page)
+        : InspectorRuntimeAgent(injectedScriptManager)
+        , m_inspectedPage(page) { }
+    virtual ~PageRuntimeAgent() { }
+
+private:
+    virtual ScriptState* getDefaultInspectedState() { return mainWorldScriptState(m_inspectedPage->mainFrame()); }
+    Page* m_inspectedPage;
+};
+
+}
+
 InspectorAgent::InspectorAgent(Page* page, InspectorClient* client, InjectedScriptManager* injectedScriptManager)
     : m_inspectedPage(page)
@@ -111 +127 @@
 #endif
     , m_resourceAgent(InspectorResourceAgent::create(m_instrumentingAgents.get(), page, m_state.get()))
+    , m_runtimeAgent(adoptPtr(new PageRuntimeAgent(m_injectedScriptManager, page)))
     , m_consoleAgent(new InspectorConsoleAgent(m_instrumentingAgents.get(), this, m_state.get(), injectedScriptManager, m_domAgent.get()))
 #if ENABLE(JAVASCRIPT_DEBUGGER)
@@ -163 +180 @@
     m_inspectedPage = 0;
 
-    releaseFrontendLifetimeAgents();
     m_injectedScriptManager->disconnect();
 
@@ -202 +218 @@
 
     m_frontend = inspectorFrontend;
-    createFrontendLifetimeAgents();
 
 #if ENABLE(OFFLINE_WEB_APPLICATIONS)
@@ -273 +288 @@
 #endif
     m_pageAgent->clearFrontend();
-
-    releaseFrontendLifetimeAgents();
-}
-
-void InspectorAgent::createFrontendLifetimeAgents()
-{
-    m_runtimeAgent = InspectorRuntimeAgent::create(m_injectedScriptManager, m_inspectedPage);
-}
-
-void InspectorAgent::releaseFrontendLifetimeAgents()
-{
-    m_runtimeAgent.clear();
 }
 

trunk/Source/WebCore/inspector/InspectorAgent.h

@@ -178 +178 @@
     void unbindAllResources();
 
-    void releaseFrontendLifetimeAgents();
-    void createFrontendLifetimeAgents();
-
 #if ENABLE(JAVASCRIPT_DEBUGGER)
     void toggleRecordButton(bool);

trunk/Source/WebCore/inspector/InspectorRuntimeAgent.cpp

@@ -37 +37 @@
 #include "InjectedScriptManager.h"
 #include "InspectorValues.h"
-#include "Page.h"
-#include <wtf/PassOwnPtr.h>
 #include <wtf/PassRefPtr.h>
 
 namespace WebCore {
 
-PassOwnPtr<InspectorRuntimeAgent> InspectorRuntimeAgent::create(InjectedScriptManager* injectedScriptManager, Page* inspectedPage)
-{
-    return adoptPtr(new InspectorRuntimeAgent(injectedScriptManager, inspectedPage));
-}
-
-InspectorRuntimeAgent::InspectorRuntimeAgent(InjectedScriptManager* injectedScriptManager, Page* inspectedPage)
+InspectorRuntimeAgent::InspectorRuntimeAgent(InjectedScriptManager* injectedScriptManager)
     : m_injectedScriptManager(injectedScriptManager)
-    , m_inspectedPage(inspectedPage)
 {
 }
@@ -60 +52 @@
 void InspectorRuntimeAgent::evaluate(ErrorString* errorString, const String& expression, const String& objectGroup, const bool* const optionalIncludeCommandLineAPI, RefPtr<InspectorObject>* result)
 {
-    ScriptState* scriptState = mainWorldScriptState(m_inspectedPage->mainFrame());
-    InjectedScript injectedScript = m_injectedScriptManager->injectedScriptFor(scriptState);
+    InjectedScript injectedScript = m_injectedScriptManager->injectedScriptFor(getDefaultInspectedState());
     if (!injectedScript.hasNoValue())
         injectedScript.evaluate(errorString, expression, objectGroup, optionalIncludeCommandLineAPI ? *optionalIncludeCommandLineAPI : false, result);

trunk/Source/WebCore/inspector/InspectorRuntimeAgent.h

@@ -34 +34 @@
 #if ENABLE(INSPECTOR)
 
+#include "ScriptState.h"
 #include <wtf/Forward.h>
 #include <wtf/Noncopyable.h>
@@ -43 +44 @@
 class InspectorObject;
 class InspectorValue;
-class Page;
 
 typedef String ErrorString;
@@ -50 +50 @@
     WTF_MAKE_NONCOPYABLE(InspectorRuntimeAgent);
 public:
-    static PassOwnPtr<InspectorRuntimeAgent> create(InjectedScriptManager*, Page*);
-    ~InspectorRuntimeAgent();
+    virtual ~InspectorRuntimeAgent();
 
     // Part of the protocol.
@@ -61 +60 @@
     void releaseObjectGroup(ErrorString*, const String& objectGroup);
 
+protected:
+    explicit InspectorRuntimeAgent(InjectedScriptManager*);
+    virtual ScriptState* getDefaultInspectedState() = 0;
+
 private:
-    InspectorRuntimeAgent(InjectedScriptManager*, Page*);
-
     InjectedScriptManager* m_injectedScriptManager;
-    Page* m_inspectedPage;
 };