Index: Source/core/inspector/InspectorBaseAgent.h |
diff --git a/Source/core/inspector/InspectorBaseAgent.h b/Source/core/inspector/InspectorBaseAgent.h |
index 3f7bbbf331b95ff1f57e227135e571471e7a685e..340485ad4763892cf7bd1c1461c96b529cf26ebe 100644 |
--- a/Source/core/inspector/InspectorBaseAgent.h |
+++ b/Source/core/inspector/InspectorBaseAgent.h |
@@ -32,6 +32,8 @@ |
#define InspectorBaseAgent_h |
#include "core/InspectorBackendDispatcher.h" |
+#include "core/inspector/InstrumentingAgents.h" |
+#include "platform/heap/Handle.h" |
#include "wtf/Forward.h" |
#include "wtf/Vector.h" |
#include "wtf/text/WTFString.h" |
@@ -43,10 +45,11 @@ class InspectorCompositeState; |
class InspectorState; |
class InstrumentingAgents; |
-class InspectorAgent { |
+class InspectorAgent : public NoBaseWillBeGarbageCollectedFinalized<InspectorAgent> { |
public: |
explicit InspectorAgent(const String&); |
virtual ~InspectorAgent(); |
+ virtual void trace(Visitor*); |
virtual void init() { } |
virtual void setFrontend(InspectorFrontend*) { } |
@@ -61,17 +64,18 @@ public: |
void appended(InstrumentingAgents*, InspectorState*); |
protected: |
- InstrumentingAgents* m_instrumentingAgents; |
+ RawPtrWillBeMember<InstrumentingAgents> m_instrumentingAgents; |
+ // FIXME: Oilpan: Move InspectorState to heap in follow-up CL. |
InspectorState* m_state; |
private: |
String m_name; |
}; |
-class InspectorAgentRegistry { |
+class InspectorAgentRegistry FINAL : public NoBaseWillBeGarbageCollectedFinalized<InspectorAgentRegistry> { |
public: |
InspectorAgentRegistry(InstrumentingAgents*, InspectorCompositeState*); |
- void append(PassOwnPtr<InspectorAgent>); |
+ void append(PassOwnPtrWillBeRawPtr<InspectorAgent>); |
void setFrontend(InspectorFrontend*); |
void clearFrontend(); |
@@ -80,10 +84,13 @@ public: |
void discardAgents(); |
void flushPendingFrontendMessages(); |
+ void trace(Visitor*); |
+ |
private: |
- InstrumentingAgents* m_instrumentingAgents; |
+ RawPtrWillBeMember<InstrumentingAgents> m_instrumentingAgents; |
+ // FIXME: Oilpan: Move InspectorCompositeState to heap in follow-up CL. |
InspectorCompositeState* m_inspectorState; |
- Vector<OwnPtr<InspectorAgent> > m_agents; |
+ WillBeHeapVector<OwnPtrWillBeMember<InspectorAgent> > m_agents; |
}; |
template<typename T> |