Inspector: wrapped inspector agent instances into factory-like wrappers

Source/core/inspector/PageRuntimeAgent.h

 /*
  * 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 22 matching lines @@
 
 
 #include "InspectorFrontend.h"
 #include "bindings/v8/ScriptState.h"
 #include "core/inspector/InspectorRuntimeAgent.h"
 #include <wtf/PassOwnPtr.h>
 
 namespace WebCore {
 
 class InspectorPageAgent;
+class InspectorPageController;
 class Page;
 class SecurityOrigin;
 
 class PageRuntimeAgent : public InspectorRuntimeAgent {
 public:
-    static PassOwnPtr<PageRuntimeAgent> create(InstrumentingAgents* instrumentingAgents, InspectorCompositeState* state, InjectedScriptManager* injectedScriptManager, ScriptDebugServer* scriptDebugServer, Page* page, InspectorPageAgent* pageAgent)
-    {
-        return adoptPtr(new PageRuntimeAgent(instrumentingAgents, state, injectedScriptManager, scriptDebugServer, page, pageAgent));
-    }
+    static PassRefPtr<PageRuntimeAgent> create(InstrumentingAgents*, InspectorState*, Page*, PassRefPtr<InspectorPageAgent>, InjectedScriptManager*, ScriptDebugServer*);
     virtual ~PageRuntimeAgent();
     virtual void setFrontend(InspectorFrontend*);
     virtual void clearFrontend();
     virtual void restore();
     virtual void enable(ErrorString*);
     virtual void disable(ErrorString*);
 
     void didClearWindowObjectInWorld(Frame*, DOMWrapperWorld*);
     void didCreateIsolatedContext(Frame*, ScriptState*, SecurityOrigin*);
 
 private:
-    PageRuntimeAgent(InstrumentingAgents*, InspectorCompositeState*, InjectedScriptManager*, ScriptDebugServer*, Page*, InspectorPageAgent*);
+    PageRuntimeAgent(InstrumentingAgents*, InspectorState*, Page*, PassRefPtr<InspectorPageAgent>, InjectedScriptManager*, ScriptDebugServer*);
 
     virtual InjectedScript injectedScriptForEval(ErrorString*, const int* executionContextId);
     virtual void muteConsole();
     virtual void unmuteConsole();
     void reportExecutionContextCreation();
     void notifyContextCreated(const String& frameId, ScriptState*, SecurityOrigin*, bool isPageContext);
 
     Page* m_inspectedPage;
-    InspectorPageAgent* m_pageAgent;
+    RefPtr<InspectorPageAgent> m_pageAgent;
     InspectorFrontend::Runtime* m_frontend;
     bool m_mainWorldContextCreated;
 };
 
+class PageRuntimeController: public InspectorRuntimeController {
+public:
+
+    static PassOwnPtr<PageRuntimeController> create(InstrumentingAgents* instrumentingAgents, InspectorCompositeState* compositeState, Page* page, InspectorPageController* pageController, InjectedScriptManager* injectedScriptManager, ScriptDebugServer* scriptDebugServer)
+    {
+        return adoptPtr(new PageRuntimeController(instrumentingAgents, compositeState, page, pageController, injectedScriptManager, scriptDebugServer));
+    }
+
+protected:
+    PageRuntimeController(InstrumentingAgents*, InspectorCompositeState*, Page*, InspectorPageController*, InjectedScriptManager*, ScriptDebugServer*);
+};
+
 } // namespace WebCore
 
 
 #endif // !defined(InspectorPagerAgent_h)