Inspector: wrapped inspector agent instances into factory-like wrappers

Source/core/inspector/InspectorResourceAgent.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:
  *
  *     * 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 41 matching lines @@
 class Document;
 class DocumentLoader;
 class FormData;
 class Frame;
 class HTTPHeaderMap;
 class InspectorArray;
 class InspectorClient;
 class InspectorFrontend;
 class InspectorObject;
 class InspectorPageAgent;
+class InspectorPageFactory;
 class InspectorState;
 class InstrumentingAgents;
 class KURL;
 class NetworkResourcesData;
 class Page;
 class ResourceError;
 class ResourceLoader;
 class ResourceRequest;
 class ResourceResponse;
 class SharedBuffer;
 class ThreadableLoaderClient;
 class XHRReplayData;
 class XMLHttpRequest;
 
 struct WebSocketFrame;
 class WebSocketHandshakeRequest;
 class WebSocketHandshakeResponse;
 
 typedef String ErrorString;
 
-class InspectorResourceAgent : public InspectorBaseAgent<InspectorResourceAgent>, public InspectorBackendDispatcher::NetworkCommandHandler {
+class InspectorResourceAgent : public InspectorBaseAgent, public InspectorBackendDispatcher::NetworkCommandHandler {
 public:
-    static PassOwnPtr<InspectorResourceAgent> create(InstrumentingAgents* instrumentingAgents, InspectorPageAgent* pageAgent, InspectorClient* client, InspectorCompositeState* state)
-    {
-        return adoptPtr(new InspectorResourceAgent(instrumentingAgents, pageAgent, client, state));
-    }
+    static PassRefPtr<InspectorResourceAgent> create(InstrumentingAgents*, InspectorState*, PassRefPtr<InspectorPageAgent>, InspectorClient*);
 
     virtual void setFrontend(InspectorFrontend*);
     virtual void clearFrontend();
     virtual void restore();
 
-    static PassRefPtr<InspectorResourceAgent> restore(Page*, InspectorCompositeState*, InspectorFrontend*);
-
-    ~InspectorResourceAgent();
+    virtual ~InspectorResourceAgent();
 
     void willSendRequest(unsigned long identifier, DocumentLoader*, ResourceRequest&, const ResourceResponse& redirectResponse, const CachedResourceInitiatorInfo&);
     void markResourceAsCached(unsigned long identifier);
     void didReceiveResourceResponse(unsigned long identifier, DocumentLoader*, const ResourceResponse&, ResourceLoader*);
     void didReceiveData(unsigned long identifier, const char* data, int dataLength, int encodedDataLength);
     void didFinishLoading(unsigned long identifier, DocumentLoader*, double monotonicFinishTime);
     void didFailLoading(unsigned long identifier, DocumentLoader*, const ResourceError&);
     void didCommitLoad(Frame*, DocumentLoader*);
     void scriptImported(unsigned long identifier, const String& sourceString);
     void didReceiveScriptResponse(unsigned long identifier);
@@ skipping 41 matching lines @@
     virtual void clearBrowserCache(ErrorString*);
     virtual void canClearBrowserCookies(ErrorString*, bool*);
     virtual void clearBrowserCookies(ErrorString*);
     virtual void setCacheDisabled(ErrorString*, bool cacheDisabled);
 
     virtual void loadResourceForFrontend(ErrorString*, const String& frameId, const String& url, PassRefPtr<LoadResourceForFrontendCallback>);
 
     virtual void reportMemoryUsage(MemoryObjectInfo*) const OVERRIDE;
 
 private:
-    InspectorResourceAgent(InstrumentingAgents*, InspectorPageAgent*, InspectorClient*, InspectorCompositeState*);
+    InspectorResourceAgent(InstrumentingAgents*, InspectorState*, PassRefPtr<InspectorPageAgent>, InspectorClient*);
 
     void enable();
 
-    InspectorPageAgent* m_pageAgent;
+    RefPtr<InspectorPageAgent> m_pageAgent;
     InspectorClient* m_client;
     InspectorFrontend::Network* m_frontend;
     String m_userAgentOverride;
     OwnPtr<NetworkResourcesData> m_resourcesData;
     bool m_loadingXHRSynchronously;
 
     typedef HashMap<ThreadableLoaderClient*, RefPtr<XHRReplayData> > PendingXHRReplayDataMap;
     PendingXHRReplayDataMap m_pendingXHRReplayData;
     // FIXME: InspectorResourceAgent should now be aware of style recalculation.
     RefPtr<TypeBuilder::Network::Initiator> m_styleRecalculationInitiator;
     bool m_isRecalculatingStyle;
 };
 
+class InspectorResourceFactory : public InspectorBaseFactory<InspectorResourceFactory, InspectorResourceAgent> {
+public:
+
+    static PassOwnPtr<InspectorResourceFactory> create(InstrumentingAgents* instrumentingAgents, InspectorCompositeState* compositeState, InspectorPageFactory* pageFactory, InspectorClient* client)
+    {
+        return adoptPtr(new InspectorResourceFactory(instrumentingAgents, compositeState, pageFactory, client));
+    }
+
+protected:
+    InspectorResourceFactory(InstrumentingAgents*, InspectorCompositeState*, InspectorPageFactory*, InspectorClient*);
+};
+
 } // namespace WebCore
 
 
 #endif // !defined(InspectorResourceAgent_h)