Inspector: wrapped inspector agent instances into factory-like wrappers

Source/core/inspector/InspectorAgent.h

 /*
  * Copyright (C) 2007, 2008, 2009, 2010 Apple Inc. All rights reserved.
  * 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:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
@@ skipping 33 matching lines @@
 class Frame;
 class InjectedScriptManager;
 class InspectorFrontend;
 class InspectorObject;
 class InstrumentingAgents;
 class KURL;
 class Page;
 
 typedef String ErrorString;
 
-class InspectorAgent : public InspectorBaseAgent<InspectorAgent>, public InspectorBackendDispatcher::InspectorCommandHandler {
+class InspectorAgent : public InspectorBaseAgent, public InspectorBackendDispatcher::InspectorCommandHandler {
     WTF_MAKE_NONCOPYABLE(InspectorAgent);
 public:
-    static PassOwnPtr<InspectorAgent> create(Page* page, InjectedScriptManager* injectedScriptManager, InstrumentingAgents* instrumentingAgents, InspectorCompositeState* state)
+    static PassRefPtr<InspectorAgent> create(Page* page, InjectedScriptManager* injectedScriptManager, InstrumentingAgents* instrumentingAgents, InspectorState* state)

[pfeldman, 2013/06/18 15:36:06]

Make agents ref-counted in a separate patch?

[Vladislav Kaznacheev, 2013/06/19 12:58:43]

Discussed, agreed this is not worth it.
On 2013/06/18 15:36:06, pfeldman wrote:

     {
-        return adoptPtr(new InspectorAgent(page, injectedScriptManager, instrumentingAgents, state));
+        return adoptRef(new InspectorAgent(page, injectedScriptManager, instrumentingAgents, state));
     }
 
     virtual ~InspectorAgent();
 
     // Inspector front-end API.
     void enable(ErrorString*);
     void disable(ErrorString*);
     void reset(ErrorString*);
 
     KURL inspectedURL() const;
@@ skipping 12 matching lines @@
     bool hasFrontend() const { return m_frontend; }
 
     // Generic code called from custom implementations.
     void evaluateForTestInFrontend(long testCallId, const String& script);
 
     void setInjectedScriptForOrigin(const String& origin, const String& source);
 
     void inspect(PassRefPtr<TypeBuilder::Runtime::RemoteObject> objectToInspect, PassRefPtr<InspectorObject> hints);
 
 private:
-    InspectorAgent(Page*, InjectedScriptManager*, InstrumentingAgents*, InspectorCompositeState*);
+    InspectorAgent(Page*, InjectedScriptManager*, InstrumentingAgents*, InspectorState*);
 
     void unbindAllResources();
 
     void toggleRecordButton(bool);
 
     bool isMainResourceLoader(DocumentLoader*, const KURL& requestUrl);
 
     Page* m_inspectedPage;
     InspectorFrontend* m_frontend;
     InjectedScriptManager* m_injectedScriptManager;
 
     Vector<pair<long, String> > m_pendingEvaluateTestCommands;
     pair<RefPtr<TypeBuilder::Runtime::RemoteObject>, RefPtr<InspectorObject> > m_pendingInspectData;
     typedef HashMap<String, String> InjectedScriptForOriginMap;
     InjectedScriptForOriginMap m_injectedScriptForOrigin;
 };
 
+class InspectorAgentController: public InspectorBaseController<InspectorAgentController, InspectorAgent> {

[pfeldman, 2013/06/18 15:36:06]

s/Controller/Factory/

[Vladislav Kaznacheev, 2013/06/19 12:58:43]

Done.

+public:
+
+    static PassOwnPtr<InspectorAgentController> create(Page* page, InjectedScriptManager* injectedScriptManager, InstrumentingAgents* instrumentingAgents, InspectorCompositeState* compositeState)
+    {
+        return adoptPtr(new InspectorAgentController(page, injectedScriptManager, instrumentingAgents, compositeState));
+    }
+
+protected:
+    InspectorAgentController(Page* page, InjectedScriptManager* injectedScriptManager, InstrumentingAgents* instrumentingAgents, InspectorCompositeState* compositeState)
+        : InspectorBaseController<InspectorAgentController, InspectorAgent>("Inspector", instrumentingAgents, compositeState)
+    {
+        setAgent(InspectorAgent::create(page, injectedScriptManager, m_instrumentingAgents, m_state));
+    }
+};
+
 } // namespace WebCore
 
 #endif // !defined(InspectorAgent_h)