Inspector: wrapped inspector agent instances into factory-like wrappers

Source/core/inspector/InspectorCSSAgent.h

 /*
  * Copyright (C) 2010, 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:
  * 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
  *     notice, this list of conditions and the following disclaimer in the
@@ skipping 49 matching lines @@
 class NodeList;
 class SelectorProfile;
 class StyleResolver;
 class StyleRule;
 class StyleSheetVisitor;
 class UpdateRegionLayoutTask;
 
 typedef HashMap<CSSStyleSheet*, RefPtr<InspectorStyleSheet> > CSSStyleSheetToInspectorStyleSheet;
 
 class InspectorCSSAgent
-    : public InspectorBaseAgent<InspectorCSSAgent>
+    : public InspectorBaseAgent
     , public InspectorDOMAgent::DOMListener
     , public InspectorBackendDispatcher::CSSCommandHandler
     , public InspectorStyleSheet::Listener {
     WTF_MAKE_NONCOPYABLE(InspectorCSSAgent);
 public:
     enum MediaListSource {
         MediaListSourceLinkedSheet,
         MediaListSourceInlineSheet,
         MediaListSourceMediaRule,
         MediaListSourceImportRule
@@ skipping 12 matching lines @@
             m_contentSecurityPolicy->setOverrideAllowInlineStyle(false);
         }
 
     private:
         ContentSecurityPolicy* m_contentSecurityPolicy;
     };
 
     static CSSStyleRule* asCSSStyleRule(CSSRule*);
     static bool cssErrorFilter(const CSSParserString& content, int propertyId, int errorType);
 
-    static PassOwnPtr<InspectorCSSAgent> create(InstrumentingAgents* instrumentingAgents, InspectorCompositeState* state, InspectorDOMAgent* domAgent, InspectorPageAgent* pageAgent)
+    static PassRefPtr<InspectorCSSAgent> create(InstrumentingAgents* instrumentingAgents, InspectorState* state, PassRefPtr<InspectorDOMAgent> domAgent, PassRefPtr<InspectorPageAgent> pageAgent)
     {
-        return adoptPtr(new InspectorCSSAgent(instrumentingAgents, state, domAgent, pageAgent));
+        return adoptRef(new InspectorCSSAgent(instrumentingAgents, state, domAgent, pageAgent));
     }
     ~InspectorCSSAgent();
 
     bool forcePseudoState(Element*, CSSSelector::PseudoType);
     virtual void setFrontend(InspectorFrontend*);
     virtual void clearFrontend();
     virtual void discardAgent();
     virtual void restore();
     virtual void enable(ErrorString*);
     virtual void disable(ErrorString*);
@@ skipping 36 matching lines @@
 
 private:
     class StyleSheetAction;
     class SetStyleSheetTextAction;
     class SetStyleTextAction;
     class SetPropertyTextAction;
     class TogglePropertyAction;
     class SetRuleSelectorAction;
     class AddRuleAction;
 
-    InspectorCSSAgent(InstrumentingAgents*, InspectorCompositeState*, InspectorDOMAgent*, InspectorPageAgent*);
+    InspectorCSSAgent(InstrumentingAgents*, InspectorState*, PassRefPtr<InspectorDOMAgent>, PassRefPtr<InspectorPageAgent>);
 
     typedef HashMap<String, RefPtr<InspectorStyleSheet> > IdToInspectorStyleSheet;
     typedef HashMap<Node*, RefPtr<InspectorStyleSheetForInlineStyle> > NodeToInspectorStyleSheet; // bogus "stylesheets" with elements' inline styles
     typedef HashMap<RefPtr<Document>, RefPtr<InspectorStyleSheet> > DocumentToViaInspectorStyleSheet; // "via inspector" stylesheets
     typedef HashMap<int, unsigned> NodeIdToForcedPseudoState;
 
     void resetNonPersistentData();
     InspectorStyleSheetForInlineStyle* asInspectorStyleSheet(Element* element);
     Element* elementForId(ErrorString*, int nodeId);
     int documentNodeWithRequestedFlowsId(Document*);
@@ skipping 17 matching lines @@
     virtual void didRemoveDocument(Document*);
     virtual void didRemoveDOMNode(Node*);
     virtual void didModifyDOMAttr(Element*);
 
     // InspectorCSSAgent::Listener implementation
     virtual void styleSheetChanged(InspectorStyleSheet*);
 
     void resetPseudoStates();
 
     InspectorFrontend::CSS* m_frontend;
-    InspectorDOMAgent* m_domAgent;
-    InspectorPageAgent* m_pageAgent;
+    RefPtr<InspectorDOMAgent> m_domAgent;
+    RefPtr<InspectorPageAgent> m_pageAgent;
 
     IdToInspectorStyleSheet m_idToInspectorStyleSheet;
     CSSStyleSheetToInspectorStyleSheet m_cssStyleSheetToInspectorStyleSheet;
     NodeToInspectorStyleSheet m_nodeToInspectorStyleSheet;
     DocumentToViaInspectorStyleSheet m_documentToInspectorStyleSheet;
     NodeIdToForcedPseudoState m_nodeIdToForcedPseudoState;
     HashSet<int> m_namedFlowCollectionsRequested;
     OwnPtr<UpdateRegionLayoutTask> m_updateRegionLayoutTask;
 
     int m_lastStyleSheetId;
     bool m_creatingViaInspectorStyleSheet;
 
     OwnPtr<SelectorProfile> m_currentSelectorProfile;
 
     friend class StyleSheetBinder;
 };
 
+class InspectorCSSController: public InspectorBaseController<InspectorCSSController, InspectorCSSAgent> {
+public:
+
+    static PassOwnPtr<InspectorCSSController> create(InstrumentingAgents* instrumentingAgents, InspectorCompositeState* compositeState, InspectorDOMController* domController, InspectorPageController* pageController)
+    {
+        return adoptPtr(new InspectorCSSController(instrumentingAgents, compositeState, domController, pageController));
+    }
+
+protected:
+    InspectorCSSController(InstrumentingAgents*, InspectorCompositeState*, InspectorDOMController*, InspectorPageController*);
+};
 
 } // namespace WebCore
 
 #endif // !defined(InspectorCSSAgent_h)