Inspector: wrapped inspector agent instances into factory-like wrappers

Source/core/inspector/InspectorApplicationCacheAgent.h

 /*
  * Copyright (C) 2010 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
  *     notice, this list of conditions and the following disclaimer in the
@@ skipping 21 matching lines @@
 #include <wtf/Noncopyable.h>
 #include <wtf/PassOwnPtr.h>
 
 namespace WebCore {
 
 class Frame;
 class InspectorArray;
 class InspectorFrontend;
 class InspectorObject;
 class InspectorPageAgent;
+class InspectorPageController;
 class InspectorValue;
 class InspectorState;
 class InstrumentingAgents;
 class Page;
 class ResourceResponse;
 
 typedef String ErrorString;
 
-class InspectorApplicationCacheAgent : public InspectorBaseAgent<InspectorApplicationCacheAgent>, public InspectorBackendDispatcher::ApplicationCacheCommandHandler {
+class InspectorApplicationCacheAgent : public InspectorBaseAgent, public InspectorBackendDispatcher::ApplicationCacheCommandHandler {
     WTF_MAKE_NONCOPYABLE(InspectorApplicationCacheAgent); WTF_MAKE_FAST_ALLOCATED;
 public:
-    static PassOwnPtr<InspectorApplicationCacheAgent> create(InstrumentingAgents* instrumentingAgents, InspectorCompositeState* state, InspectorPageAgent* pageAgent)
-    {
-        return adoptPtr(new InspectorApplicationCacheAgent(instrumentingAgents, state, pageAgent));
-    }
-    ~InspectorApplicationCacheAgent() { }
+    static PassRefPtr<InspectorApplicationCacheAgent> create(InstrumentingAgents*, InspectorState*, PassRefPtr<InspectorPageAgent>);
+    ~InspectorApplicationCacheAgent();

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

virtual

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

Done.

 
     // InspectorBaseAgent
     virtual void setFrontend(InspectorFrontend*);
     virtual void clearFrontend();
     virtual void restore();
 
     // InspectorInstrumentation API
     void updateApplicationCacheStatus(Frame*);
     void networkStateChanged();
 
     // ApplicationCache API for InspectorFrontend
     virtual void enable(ErrorString*);
     virtual void getFramesWithManifests(ErrorString*, RefPtr<TypeBuilder::Array<TypeBuilder::ApplicationCache::FrameWithManifest> >& result);
     virtual void getManifestForFrame(ErrorString*, const String& frameId, String* manifestURL);
     virtual void getApplicationCacheForFrame(ErrorString*, const String& frameId, RefPtr<TypeBuilder::ApplicationCache::ApplicationCache>&);
 
 private:
-    InspectorApplicationCacheAgent(InstrumentingAgents*, InspectorCompositeState*, InspectorPageAgent*);
+    InspectorApplicationCacheAgent(InstrumentingAgents*, InspectorState*, PassRefPtr<InspectorPageAgent>);
     PassRefPtr<TypeBuilder::ApplicationCache::ApplicationCache> buildObjectForApplicationCache(const ApplicationCacheHost::ResourceInfoList&, const ApplicationCacheHost::CacheInfo&);
     PassRefPtr<TypeBuilder::Array<TypeBuilder::ApplicationCache::ApplicationCacheResource> > buildArrayForApplicationCacheResources(const ApplicationCacheHost::ResourceInfoList&);
     PassRefPtr<TypeBuilder::ApplicationCache::ApplicationCacheResource> buildObjectForApplicationCacheResource(const ApplicationCacheHost::ResourceInfo&);
 
     DocumentLoader* assertFrameWithDocumentLoader(ErrorString*, String frameId);
 
-    InspectorPageAgent* m_pageAgent;
+    RefPtr<InspectorPageAgent> m_pageAgent;
     InspectorFrontend::ApplicationCache* m_frontend;
 };
 
+class InspectorApplicationCacheController: public InspectorBaseController<InspectorApplicationCacheController, InspectorApplicationCacheAgent> {

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

 :

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

Done.

+public:
+
+    static PassOwnPtr<InspectorApplicationCacheController> create(InstrumentingAgents* instrumentingAgents, InspectorCompositeState* compositeState, InspectorPageController* pageController)
+    {
+        return adoptPtr(new InspectorApplicationCacheController(instrumentingAgents, compositeState, pageController));
+    }
+
+protected:
+    InspectorApplicationCacheController(InstrumentingAgents*, InspectorCompositeState*, InspectorPageController*);
+};
+
 } // namespace WebCore
 
 #endif // InspectorApplicationCacheAgent_h