Add a guard on InspectorTimelineAgent, and remove unnecessary guards...
diff --git a/WebCore/inspector/InspectorController.h b/WebCore/inspector/InspectorController.h
index 58458bc..382d887 100644
--- a/WebCore/inspector/InspectorController.h
+++ b/WebCore/inspector/InspectorController.h
@@ -62,9 +62,7 @@
class DocumentLoader;
class GraphicsContext;
class HitTestResult;
-#if !PLATFORM(ANDROID)
class InspectorBackend;
-#endif
class InspectorClient;
class InspectorDOMAgent;
class InspectorFrontend;
@@ -166,9 +164,7 @@
InspectorController(Page*, InspectorClient*);
~InspectorController();
-#if !PLATFORM(ANDROID)
InspectorBackend* inspectorBackend() { return m_inspectorBackend.get(); }
-#endif
void inspectedPageDestroyed();
void pageDestroyed() { m_page = 0; }
@@ -295,9 +291,7 @@
void evaluateForTestInFrontend(long callId, const String& script);
private:
-#if !PLATFORM(ANDROID)
friend class InspectorBackend;
-#endif
// Following are used from InspectorBackend and internally.
void scriptObjectReady();
void moveWindowBy(float x, float y) const;
@@ -362,7 +356,6 @@
Page* m_inspectedPage;
InspectorClient* m_client;
-
OwnPtr<InspectorFrontend> m_frontend;
RefPtr<InspectorDOMAgent> m_domAgent;
OwnPtr<InspectorTimelineAgent> m_timelineAgent;
@@ -392,9 +385,7 @@
ConsoleMessage* m_previousMessage;
bool m_resourceTrackingEnabled;
bool m_resourceTrackingSettingsLoaded;
-#if !PLATFORM(ANDROID)
RefPtr<InspectorBackend> m_inspectorBackend;
-#endif
HashMap<String, ScriptValue> m_idToWrappedObject;
ObjectGroupsMap m_objectGroups;
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 @@
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)
