1 files changed, 12 insertions, 54 deletions
diff --git a/Source/WebCore/inspector/InstrumentingAgents.cpp b/Source/WebCore/inspector/InstrumentingAgents.cpp
index 15643931b..7118ea88b 100644
--- a/Source/WebCore/inspector/InstrumentingAgents.cpp
+++ b/Source/WebCore/inspector/InstrumentingAgents.cpp
@@ -1,5 +1,6 @@
 /*
  * Copyright (C) 2011 Google Inc. All rights reserved.
+ * Copyright (C) 2014, 2015 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
@@ -31,43 +32,12 @@
 #include "config.h"
 #include "InstrumentingAgents.h"
 
-#if ENABLE(INSPECTOR)
-
-#include "InspectorController.h"
-#include "Page.h"
-#include "WorkerGlobalScope.h"
-#include "WorkerInspectorController.h"
-#include <wtf/MainThread.h>
-
 using namespace Inspector;
 
 namespace WebCore {
 
 InstrumentingAgents::InstrumentingAgents(InspectorEnvironment& environment)
     : m_environment(environment)
-    , m_inspectorAgent(nullptr)
-    , m_inspectorPageAgent(nullptr)
-    , m_inspectorCSSAgent(nullptr)
-#if USE(ACCELERATED_COMPOSITING)
-    , m_inspectorLayerTreeAgent(nullptr)
-#endif
-    , m_inspectorConsoleAgent(nullptr)
-    , m_inspectorDOMAgent(nullptr)
-    , m_inspectorResourceAgent(nullptr)
-    , m_pageRuntimeAgent(nullptr)
-    , m_workerRuntimeAgent(nullptr)
-    , m_inspectorTimelineAgent(nullptr)
-    , m_inspectorDOMStorageAgent(nullptr)
-#if ENABLE(SQL_DATABASE)
-    , m_inspectorDatabaseAgent(nullptr)
-#endif
-    , m_inspectorApplicationCacheAgent(nullptr)
-    , m_inspectorDebuggerAgent(nullptr)
-    , m_pageDebuggerAgent(nullptr)
-    , m_inspectorDOMDebuggerAgent(nullptr)
-    , m_inspectorProfilerAgent(nullptr)
-    , m_inspectorWorkerAgent(nullptr)
-    , m_inspectorCanvasAgent(nullptr)
 {
 }
 
@@ -76,39 +46,27 @@ void InstrumentingAgents::reset()
     m_inspectorAgent = nullptr;
     m_inspectorPageAgent = nullptr;
     m_inspectorCSSAgent = nullptr;
-#if USE(ACCELERATED_COMPOSITING)
     m_inspectorLayerTreeAgent = nullptr;
-#endif
-    m_inspectorConsoleAgent = nullptr;
+    m_inspectorWorkerAgent = nullptr;
+    m_webConsoleAgent = nullptr;
     m_inspectorDOMAgent = nullptr;
-    m_inspectorResourceAgent = nullptr;
+    m_inspectorNetworkAgent = nullptr;
     m_pageRuntimeAgent = nullptr;
-    m_workerRuntimeAgent = nullptr;
     m_inspectorTimelineAgent = nullptr;
+    m_persistentInspectorTimelineAgent = nullptr;
     m_inspectorDOMStorageAgent = nullptr;
-#if ENABLE(SQL_DATABASE)
-    m_inspectorDatabaseAgent = nullptr;
+#if ENABLE(WEB_REPLAY)
+    m_inspectorReplayAgent = nullptr;
 #endif
+#if ENABLE(RESOURCE_USAGE)
+    m_inspectorMemoryAgent = nullptr;
+#endif
+    m_inspectorDatabaseAgent = nullptr;
     m_inspectorApplicationCacheAgent = nullptr;
     m_inspectorDebuggerAgent = nullptr;
     m_pageDebuggerAgent = nullptr;
+    m_pageHeapAgent = nullptr;
     m_inspectorDOMDebuggerAgent = nullptr;
-    m_inspectorProfilerAgent = nullptr;
-    m_inspectorWorkerAgent = nullptr;
-    m_inspectorCanvasAgent = nullptr;
-}
-
-InstrumentingAgents* instrumentationForPage(Page* page)
-{
-    ASSERT(isMainThread());
-    return page ? page->inspectorController().m_instrumentingAgents.get() : nullptr;
-}
-
-InstrumentingAgents* instrumentationForWorkerGlobalScope(WorkerGlobalScope* workerGlobalScope)
-{
-    return workerGlobalScope ? workerGlobalScope->workerInspectorController().m_instrumentingAgents.get() : nullptr;
 }
 
 } // namespace WebCore
-
-#endif // ENABLE(INSPECTOR)