Merge 140127

Source/WebCore/inspector/InstrumentingAgents.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 15 matching lines @@
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #ifndef InstrumentingAgents_h
 #define InstrumentingAgents_h
 
 #include <wtf/FastAllocBase.h>
 #include <wtf/Noncopyable.h>
+#include <wtf/PassRefPtr.h>
+#include <wtf/RefCounted.h>
 
 namespace WebCore {
 
 class InspectorAgent;
 class InspectorApplicationCacheAgent;
 class InspectorCSSAgent;
 class InspectorCanvasAgent;
 class InspectorConsoleAgent;
 class InspectorDOMAgent;
 class InspectorDOMDebuggerAgent;
 class InspectorDOMStorageAgent;
 class InspectorDatabaseAgent;
 class InspectorDebuggerAgent;
 class InspectorFileSystemAgent;
 class InspectorLayerTreeAgent;
 class InspectorPageAgent;
 class InspectorProfilerAgent;
 class InspectorResourceAgent;
 class InspectorTimelineAgent;
 class InspectorWorkerAgent;
 class Page;
 class PageDebuggerAgent;
 class PageRuntimeAgent;
 class WorkerContext;
 class WorkerRuntimeAgent;
 
-class InstrumentingAgents {
+class InstrumentingAgents : public RefCounted<InstrumentingAgents> {
     WTF_MAKE_NONCOPYABLE(InstrumentingAgents);
     WTF_MAKE_FAST_ALLOCATED;
 public:
-    InstrumentingAgents()
-        : m_inspectorAgent(0)
-        , m_inspectorPageAgent(0)
-        , m_inspectorCSSAgent(0)
-#if USE(ACCELERATED_COMPOSITING)
-        , m_inspectorLayerTreeAgent(0)
-#endif
-        , m_inspectorConsoleAgent(0)
-        , m_inspectorDOMAgent(0)
-        , m_inspectorResourceAgent(0)
-        , m_pageRuntimeAgent(0)
-        , m_workerRuntimeAgent(0)
-        , m_inspectorTimelineAgent(0)
-        , m_inspectorDOMStorageAgent(0)
-#if ENABLE(SQL_DATABASE)
-        , m_inspectorDatabaseAgent(0)
-#endif
-#if ENABLE(FILE_SYSTEM)
-        , m_inspectorFileSystemAgent(0)
-#endif
-        , m_inspectorApplicationCacheAgent(0)
-#if ENABLE(JAVASCRIPT_DEBUGGER)
-        , m_inspectorDebuggerAgent(0)
-        , m_pageDebuggerAgent(0)
-        , m_inspectorDOMDebuggerAgent(0)
-        , m_inspectorProfilerAgent(0)
-#endif
-#if ENABLE(WORKERS)
-        , m_inspectorWorkerAgent(0)
-#endif
-        , m_inspectorCanvasAgent(0)
-    { }
+    static PassRefPtr<InstrumentingAgents> create()
+    {
+        return adoptRef(new InstrumentingAgents());
+    }
     ~InstrumentingAgents() { }
+    void reset();
 
     InspectorAgent* inspectorAgent() const { return m_inspectorAgent; }
     void setInspectorAgent(InspectorAgent* agent) { m_inspectorAgent = agent; }
 
     InspectorPageAgent* inspectorPageAgent() const { return m_inspectorPageAgent; }
     void setInspectorPageAgent(InspectorPageAgent* agent) { m_inspectorPageAgent = agent; }
 
     InspectorCSSAgent* inspectorCSSAgent() const { return m_inspectorCSSAgent; }
     void setInspectorCSSAgent(InspectorCSSAgent* agent) { m_inspectorCSSAgent = agent; }
 
@@ skipping 52 matching lines @@
 
     InspectorCanvasAgent* inspectorCanvasAgent() const { return m_inspectorCanvasAgent; }
     void setInspectorCanvasAgent(InspectorCanvasAgent* agent) { m_inspectorCanvasAgent = agent; }
 
 #if USE(ACCELERATED_COMPOSITING)
     InspectorLayerTreeAgent* inspectorLayerTreeAgent() const { return m_inspectorLayerTreeAgent; }
     void setInspectorLayerTreeAgent(InspectorLayerTreeAgent* agent) { m_inspectorLayerTreeAgent = agent; }
 #endif
 
 private:
+    InstrumentingAgents();
+
     InspectorAgent* m_inspectorAgent;
     InspectorPageAgent* m_inspectorPageAgent;
     InspectorCSSAgent* m_inspectorCSSAgent;
 #if USE(ACCELERATED_COMPOSITING)
     InspectorLayerTreeAgent* m_inspectorLayerTreeAgent;
 #endif
     InspectorConsoleAgent* m_inspectorConsoleAgent;
     InspectorDOMAgent* m_inspectorDOMAgent;
     InspectorResourceAgent* m_inspectorResourceAgent;
     PageRuntimeAgent* m_pageRuntimeAgent;
@@ skipping 20 matching lines @@
 };
 
 InstrumentingAgents* instrumentationForPage(Page*);
 #if ENABLE(WORKERS)
 InstrumentingAgents* instrumentationForWorkerContext(WorkerContext*);
 #endif
 
 }
 
 #endif // !defined(InstrumentingAgents_h)