Inspector: wrapped inspector agent instances into factory-like wrappers

Source/core/inspector/InspectorPageAgent.h

 /*
  * 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:
  *
  *     * 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 43 matching lines @@
 class InstrumentingAgents;
 class IntSize;
 class KURL;
 class LayoutRect;
 class Page;
 class RenderObject;
 class SharedBuffer;
 
 typedef String ErrorString;
 
-class InspectorPageAgent : public InspectorBaseAgent<InspectorPageAgent>, public InspectorBackendDispatcher::PageCommandHandler {
+class InspectorPageAgent : public InspectorBaseAgent, public InspectorBackendDispatcher::PageCommandHandler {
     WTF_MAKE_NONCOPYABLE(InspectorPageAgent);
 public:
     enum ResourceType {
         DocumentResource,
         StylesheetResource,
         ImageResource,
         FontResource,
         ScriptResource,
         XHRResource,
         WebSocketResource,
         OtherResource
     };
 
-    static PassOwnPtr<InspectorPageAgent> create(InstrumentingAgents*, Page*, InspectorCompositeState*, InjectedScriptManager*, InspectorClient*, InspectorOverlay*);
+    static PassRefPtr<InspectorPageAgent> create(InstrumentingAgents*, InspectorState*, Page*, InjectedScriptManager*, InspectorOverlay*, InspectorClient*);
 
     static bool cachedResourceContent(CachedResource*, String* result, bool* base64Encoded);
     static bool sharedBufferContent(PassRefPtr<SharedBuffer>, const String& textEncodingName, bool withBase64Encode, String* result);
     static void resourceContent(ErrorString*, Frame*, const KURL&, String* result, bool* base64Encoded);
 
     static PassRefPtr<SharedBuffer> resourceData(Frame*, const KURL&, String* textEncodingName);
     static CachedResource* cachedResource(Frame*, const KURL&);
     static TypeBuilder::Page::ResourceType::Enum resourceTypeJson(ResourceType);
     static ResourceType cachedResourceType(const CachedResource&);
     static TypeBuilder::Page::ResourceType::Enum cachedResourceTypeJson(const CachedResource&);
@@ skipping 78 matching lines @@
     String frameId(Frame*);
     bool hasIdForFrame(Frame*) const;
     String loaderId(DocumentLoader*);
     Frame* findFrameWithSecurityOrigin(const String& originRawString);
     Frame* assertFrame(ErrorString*, const String& frameId);
     String scriptPreprocessor() { return m_scriptPreprocessor; }
     String resourceSourceMapURL(const String& url);
     static DocumentLoader* assertDocumentLoader(ErrorString*, Frame*);
 
 private:
-    InspectorPageAgent(InstrumentingAgents*, Page*, InspectorCompositeState*, InjectedScriptManager*, InspectorClient*, InspectorOverlay*);
+    InspectorPageAgent(InstrumentingAgents*, InspectorState*, Page*, InjectedScriptManager*, InspectorOverlay*, InspectorClient*);
     bool deviceMetricsChanged(int width, int height, double fontScaleFactor, bool fitWindow);
     void updateViewMetrics(int, int, double, bool);
     void updateTouchEventEmulationInPage(bool);
 
     static bool dataContent(const char* data, unsigned size, const String& textEncodingName, bool withBase64Encode, String* result);
 
     PassRefPtr<TypeBuilder::Page::Frame> buildObjectForFrame(Frame*);
     PassRefPtr<TypeBuilder::Page::FrameResourceTree> buildObjectForFrameTree(Frame*);
     Page* m_page;
     InjectedScriptManager* m_injectedScriptManager;
@@ skipping 12 matching lines @@
     bool m_isFirstLayoutAfterOnLoad;
     bool m_geolocationOverridden;
     bool m_ignoreScriptsEnabledNotification;
     bool m_didForceCompositingMode;
     RefPtr<GeolocationPosition> m_geolocationPosition;
     RefPtr<GeolocationPosition> m_platformGeolocationPosition;
     RefPtr<DeviceOrientationData> m_deviceOrientation;
 };
 
 
+class InspectorPageFactory : public InspectorBaseFactory<InspectorPageFactory, InspectorPageAgent> {
+public:
+
+    static PassOwnPtr<InspectorPageFactory> create(InstrumentingAgents* instrumentingAgents, InspectorCompositeState* state, Page* page, InjectedScriptManager* injectedScriptManager, InspectorOverlay* inspectorOverlay, InspectorClient* inspectorClient)
+    {
+        return adoptPtr(new InspectorPageFactory(instrumentingAgents, state, page, injectedScriptManager, inspectorOverlay, inspectorClient));
+    }
+
+protected:
+    InspectorPageFactory(InstrumentingAgents* instrumentingAgents, InspectorCompositeState* compositeState, Page* page, InjectedScriptManager* injectedScriptManager, InspectorOverlay* inspectorOverlay, InspectorClient* inspectorClient)
+        : InspectorBaseFactory<InspectorPageFactory, InspectorPageAgent>("Page", instrumentingAgents, compositeState)
+    {
+        setAgent(InspectorPageAgent::create(m_instrumentingAgents, m_state, page, injectedScriptManager, inspectorOverlay, inspectorClient));
+    }
+};
+
 } // namespace WebCore
 
 
 #endif // !defined(InspectorPagerAgent_h)