Inspector: wrapped inspector agent instances into factory-like wrappers

Source/core/inspector/InspectorLayerTreeAgent.h

 /*
  * Copyright (C) 2012 Apple 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:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
@@ skipping 28 matching lines @@
 #include <wtf/text/WTFString.h>
 #include <wtf/Vector.h>
 
 namespace WebCore {
 
 class InspectorState;
 class InstrumentingAgents;
 
 typedef String ErrorString;
 
-class InspectorLayerTreeAgent : public InspectorBaseAgent<InspectorLayerTreeAgent>, public InspectorBackendDispatcher::LayerTreeCommandHandler {
+class InspectorLayerTreeAgent : public InspectorBaseAgent, public InspectorBackendDispatcher::LayerTreeCommandHandler {
 public:
-    static PassOwnPtr<InspectorLayerTreeAgent> create(InstrumentingAgents* instrumentingAgents, InspectorCompositeState* state)
+    static PassRefPtr<InspectorLayerTreeAgent> create(InstrumentingAgents* instrumentingAgents, InspectorState* state)
     {
-        return adoptPtr(new InspectorLayerTreeAgent(instrumentingAgents, state));
+        return adoptRef(new InspectorLayerTreeAgent(instrumentingAgents, state));
     }
     ~InspectorLayerTreeAgent();
 
     virtual void setFrontend(InspectorFrontend*);
     virtual void clearFrontend();
     virtual void restore();
     void reset();
 
     void didCommitLoad(Frame*, DocumentLoader*);
     void layerTreeDidChange();
     void renderLayerDestroyed(const RenderLayer*);
     void pseudoElementDestroyed(PseudoElement*);
 
     // Called from the front-end.
     virtual void enable(ErrorString*);
     virtual void disable(ErrorString*);
     virtual void layersForNode(ErrorString*, int nodeId, RefPtr<TypeBuilder::Array<TypeBuilder::LayerTree::Layer> >&);
     virtual void reasonsForCompositingLayer(ErrorString*, const String& layerId, RefPtr<TypeBuilder::LayerTree::CompositingReasons>&);
 
 private:
-    InspectorLayerTreeAgent(InstrumentingAgents*, InspectorCompositeState*);
+    InspectorLayerTreeAgent(InstrumentingAgents*, InspectorState*);
 
     // RenderLayer-related methods.
     String bind(const RenderLayer*);
     void unbind(const RenderLayer*);
 
     void gatherLayersUsingRenderObjectHierarchy(ErrorString*, RenderObject*, RefPtr<TypeBuilder::Array<TypeBuilder::LayerTree::Layer> >&);
     void gatherLayersUsingRenderLayerHierarchy(ErrorString*, RenderLayer*, RefPtr<TypeBuilder::Array<TypeBuilder::LayerTree::Layer> >&);
 
     PassRefPtr<TypeBuilder::LayerTree::Layer> buildObjectForLayer(ErrorString*, RenderLayer*);
     PassRefPtr<TypeBuilder::LayerTree::IntRect> buildObjectForIntRect(const IntRect&);
 
     int idForNode(ErrorString*, Node*);
 
     String bindPseudoElement(PseudoElement*);
     void unbindPseudoElement(PseudoElement*);
 
     InspectorFrontend::LayerTree* m_frontend;
 
     HashMap<const RenderLayer*, String> m_documentLayerToIdMap;
     HashMap<String, const RenderLayer*> m_idToLayer;
 
     HashMap<PseudoElement*, String> m_pseudoElementToIdMap;
     HashMap<String, PseudoElement*> m_idToPseudoElement;
 };
 
+class InspectorLayerTreeController: public InspectorBaseController<InspectorLayerTreeController, InspectorLayerTreeAgent> {
+public:
+
+    static PassOwnPtr<InspectorLayerTreeController> create(InstrumentingAgents* instrumentingAgents, InspectorCompositeState* compositeState)
+    {
+        return adoptPtr(new InspectorLayerTreeController(instrumentingAgents, compositeState));
+    }
+
+protected:
+    InspectorLayerTreeController(InstrumentingAgents* instrumentingAgents, InspectorCompositeState* compositeState)
+        : InspectorBaseController<InspectorLayerTreeController, InspectorLayerTreeAgent>("LayerTree", instrumentingAgents, compositeState)
+    {
+        setAgent(InspectorLayerTreeAgent::create(m_instrumentingAgents, m_state));
+    }
+};
+
 } // namespace WebCore
 
 
 #endif // !defined(InspectorLayerTreeAgent_h)