Index: Source/WebCore/inspector/InspectorController.cpp |
diff --git a/Source/WebCore/inspector/InspectorController.cpp b/Source/WebCore/inspector/InspectorController.cpp |
index 93a09259af6fc8f94f9a20607658cd802babb3a4..29144e18b6dae06b2e452583fa00d85f03a4219d 100644 |
--- a/Source/WebCore/inspector/InspectorController.cpp |
+++ b/Source/WebCore/inspector/InspectorController.cpp |
@@ -29,9 +29,6 @@ |
*/ |
#include "config.h" |
- |
-#if ENABLE(INSPECTOR) |
- |
#include "InspectorController.h" |
#include "Frame.h" |
@@ -141,7 +138,6 @@ InspectorController::InspectorController(Page* page, InspectorClient* inspectorC |
InspectorConsoleAgent* consoleAgent = consoleAgentPtr.get(); |
m_agents.append(consoleAgentPtr.release()); |
-#if ENABLE(JAVASCRIPT_DEBUGGER) |
OwnPtr<InspectorDebuggerAgent> debuggerAgentPtr(PageDebuggerAgent::create(m_instrumentingAgents.get(), m_state.get(), pageAgent, m_injectedScriptManager.get(), m_overlay.get())); |
m_debuggerAgent = debuggerAgentPtr.get(); |
m_agents.append(debuggerAgentPtr.release()); |
@@ -156,7 +152,6 @@ InspectorController::InspectorController(Page* page, InspectorClient* inspectorC |
m_agents.append(InspectorHeapProfilerAgent::create(m_instrumentingAgents.get(), m_state.get(), m_injectedScriptManager.get())); |
-#endif |
#if ENABLE(WORKERS) |
m_agents.append(InspectorWorkerAgent::create(m_instrumentingAgents.get(), m_state.get())); |
@@ -181,9 +176,7 @@ InspectorController::InspectorController(Page* page, InspectorClient* inspectorC |
, m_debuggerAgent |
); |
-#if ENABLE(JAVASCRIPT_DEBUGGER) |
runtimeAgent->setScriptDebugServer(&m_debuggerAgent->scriptDebugServer()); |
-#endif |
} |
InspectorController::~InspectorController() |
@@ -371,7 +364,6 @@ Node* InspectorController::highlightedNode() const |
return m_overlay->highlightedNode(); |
} |
-#if ENABLE(JAVASCRIPT_DEBUGGER) |
bool InspectorController::profilerEnabled() |
{ |
return m_profilerAgent->enabled(); |
@@ -393,7 +385,6 @@ void InspectorController::resume() |
m_debuggerAgent->resume(&error); |
} |
} |
-#endif |
void InspectorController::setResourcesDataSizeLimitsFromInternals(int maximumResourcesContentSize, int maximumSingleResourceContentSize) |
{ |
@@ -413,11 +404,9 @@ void InspectorController::reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo) |
info.addMember(m_domAgent, "domAgent"); |
info.addMember(m_resourceAgent, "resourceAgent"); |
info.addMember(m_pageAgent, "pageAgent"); |
-#if ENABLE(JAVASCRIPT_DEBUGGER) |
info.addMember(m_debuggerAgent, "debuggerAgent"); |
info.addMember(m_domDebuggerAgent, "domDebuggerAgent"); |
info.addMember(m_profilerAgent, "profilerAgent"); |
-#endif |
info.addMember(m_inspectorBackendDispatcher, "inspectorBackendDispatcher"); |
info.addMember(m_inspectorFrontendClient, "inspectorFrontendClient"); |
@@ -431,19 +420,15 @@ void InspectorController::willProcessTask() |
{ |
if (InspectorTimelineAgent* timelineAgent = m_instrumentingAgents->inspectorTimelineAgent()) |
timelineAgent->willProcessTask(); |
-#if ENABLE(JAVASCRIPT_DEBUGGER) |
m_profilerAgent->willProcessTask(); |
-#endif |
} |
void InspectorController::didProcessTask() |
{ |
if (InspectorTimelineAgent* timelineAgent = m_instrumentingAgents->inspectorTimelineAgent()) |
timelineAgent->didProcessTask(); |
-#if ENABLE(JAVASCRIPT_DEBUGGER) |
m_profilerAgent->didProcessTask(); |
m_domDebuggerAgent->didProcessTask(); |
-#endif |
} |
void InspectorController::didBeginFrame() |
@@ -481,4 +466,3 @@ HashMap<String, size_t> InspectorController::processMemoryDistribution() const |
} // namespace WebCore |
-#endif // ENABLE(INSPECTOR) |