Merge 140127

Source/WebCore/inspector/InstrumentingAgents.cpp

Index: Source/WebCore/inspector/InstrumentingAgents.cpp
===================================================================
--- Source/WebCore/inspector/InstrumentingAgents.cpp	(revision 141144)
+++ Source/WebCore/inspector/InstrumentingAgents.cpp	(working copy)
@@ -42,6 +42,74 @@
 
 namespace WebCore {
 
+InstrumentingAgents::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)
+{
+}
+
+void InstrumentingAgents::reset()
+{
+    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;
+}
+
 InstrumentingAgents* instrumentationForPage(Page* page)
 {
     ASSERT(isMainThread());