summaryrefslogtreecommitdiffstats
path: root/WebCore/inspector/InspectorTimelineAgent.h
diff options
context:
space:
mode:
authorNicolas Roard <nicolas@android.com>2009-11-13 20:18:29 -0800
committerNicolas Roard <nicolas@android.com>2009-11-13 20:18:29 -0800
commitbac5ab03db021eac2dd5b0043251c60be9d2723e (patch)
tree0751196324444327bdcae8851f6f0501febb9747 /WebCore/inspector/InspectorTimelineAgent.h
parent7f9b227f4bbeb58184a4fd914ab15e384a603e8d (diff)
downloadexternal_webkit-bac5ab03db021eac2dd5b0043251c60be9d2723e.zip
external_webkit-bac5ab03db021eac2dd5b0043251c60be9d2723e.tar.gz
external_webkit-bac5ab03db021eac2dd5b0043251c60be9d2723e.tar.bz2
Add a guard on InspectorTimelineAgent, and remove unnecessary guards...
Diffstat (limited to 'WebCore/inspector/InspectorTimelineAgent.h')
-rw-r--r--WebCore/inspector/InspectorTimelineAgent.h8
1 files changed, 3 insertions, 5 deletions
diff --git a/WebCore/inspector/InspectorTimelineAgent.h b/WebCore/inspector/InspectorTimelineAgent.h
index 0f204f9..d1d3675 100644
--- a/WebCore/inspector/InspectorTimelineAgent.h
+++ b/WebCore/inspector/InspectorTimelineAgent.h
@@ -31,6 +31,8 @@
#ifndef InspectorTimelineAgent_h
#define InspectorTimelineAgent_h
+#if ENABLE(INSPECTOR)
+
#include "Document.h"
#include "ScriptExecutionContext.h"
#include "ScriptObject.h"
@@ -115,18 +117,14 @@ namespace WebCore {
Vector< TimelineRecordEntry > m_recordStack;
};
-#if PLATFORM(ANDROID)
-// TODO: Upstream this guard to webkit.org
-#if ENABLE(INSPECTOR)
inline InspectorTimelineAgent* InspectorTimelineAgent::retrieve(ScriptExecutionContext* context)
{
if (context->isDocument())
return static_cast<Document*>(context)->inspectorTimelineAgent();
return 0;
}
-#endif
-#endif
} // namespace WebCore
+#endif // !ENABLE(INSPECTOR)
#endif // !defined(InspectorTimelineAgent_h)