Inspector: wrapped inspector agent instances into factory-like wrappers

Source/core/inspector/InspectorCanvasAgent.h

Index: Source/core/inspector/InspectorCanvasAgent.h
diff --git a/Source/core/inspector/InspectorCanvasAgent.h b/Source/core/inspector/InspectorCanvasAgent.h
index 0d8bf0c79ed94bbbeee60ba8365c5310a781b8a2..7cec88619168ee87536b357967eee5f9eced8e17 100644
--- a/Source/core/inspector/InspectorCanvasAgent.h
+++ b/Source/core/inspector/InspectorCanvasAgent.h
@@ -48,18 +48,16 @@ class DocumentLoader;
 class InjectedScriptCanvasModule;
 class InjectedScriptManager;
 class InspectorPageAgent;
+class InspectorPageController;
 class InspectorState;
 class InstrumentingAgents;
 class ScriptObject;
 
 typedef String ErrorString;
 
-class InspectorCanvasAgent : public InspectorBaseAgent<InspectorCanvasAgent>, public InspectorBackendDispatcher::CanvasCommandHandler {
+class InspectorCanvasAgent : public InspectorBaseAgent, public InspectorBackendDispatcher::CanvasCommandHandler {
 public:
-    static PassOwnPtr<InspectorCanvasAgent> create(InstrumentingAgents* instrumentingAgents, InspectorCompositeState* state, InspectorPageAgent* pageAgent, InjectedScriptManager* injectedScriptManager)
-    {
-        return adoptPtr(new InspectorCanvasAgent(instrumentingAgents, state, pageAgent, injectedScriptManager));
-    }
+    static PassRefPtr<InspectorCanvasAgent> create(InstrumentingAgents*, InspectorState*, PassRefPtr<InspectorPageAgent>, InjectedScriptManager*);
     ~InspectorCanvasAgent();
 
     virtual void setFrontend(InspectorFrontend*);
@@ -88,7 +86,7 @@ public:
     virtual void getResourceState(ErrorString*, const TypeBuilder::Canvas::TraceLogId&, const TypeBuilder::Canvas::ResourceId&, RefPtr<TypeBuilder::Canvas::ResourceState>&);
 
 private:
-    InspectorCanvasAgent(InstrumentingAgents*, InspectorCompositeState*, InspectorPageAgent*, InjectedScriptManager*);
+    InspectorCanvasAgent(InstrumentingAgents*, InspectorState*, PassRefPtr<InspectorPageAgent>, InjectedScriptManager*);
 
     InjectedScriptCanvasModule injectedScriptCanvasModule(ErrorString*, ScriptState*);
     InjectedScriptCanvasModule injectedScriptCanvasModule(ErrorString*, const ScriptObject&);
@@ -98,7 +96,7 @@ private:
     bool checkIsEnabled(ErrorString*) const;
     ScriptObject notifyRenderingContextWasWrapped(const ScriptObject&);
 
-    InspectorPageAgent* m_pageAgent;
+    RefPtr<InspectorPageAgent> m_pageAgent;
     InjectedScriptManager* m_injectedScriptManager;
     InspectorFrontend::Canvas* m_frontend;
     bool m_enabled;
@@ -107,6 +105,18 @@ private:
     FramesWithUninstrumentedCanvases m_framesWithUninstrumentedCanvases;
 };
 
+class InspectorCanvasController: public InspectorBaseController<InspectorCanvasController, InspectorCanvasAgent> {
+public:
+
+    static PassOwnPtr<InspectorCanvasController> create(InstrumentingAgents* instrumentingAgents, InspectorCompositeState* compositeState, InspectorPageController* pageController, InjectedScriptManager* injectedScriptManager)
+    {
+        return adoptPtr(new InspectorCanvasController(instrumentingAgents, compositeState, pageController, injectedScriptManager));
+    }
+
+protected:
+    InspectorCanvasController(InstrumentingAgents*, InspectorCompositeState*, InspectorPageController*, InjectedScriptManager*);
+};
+
 } // namespace WebCore