| Index: Source/core/inspector/InspectorBaseAgent.h
|
| diff --git a/Source/core/inspector/InspectorBaseAgent.h b/Source/core/inspector/InspectorBaseAgent.h
|
| index eae8210979a35633618be2aa14522043f1123730..90389ec0925886aa916c475afb0cd3a963ad1653 100644
|
| --- a/Source/core/inspector/InspectorBaseAgent.h
|
| +++ b/Source/core/inspector/InspectorBaseAgent.h
|
| @@ -32,6 +32,7 @@
|
| #define InspectorBaseAgent_h
|
|
|
| #include "InspectorBackendDispatcher.h"
|
| +#include "platform/heap/Handle.h"
|
| #include "wtf/Forward.h"
|
| #include "wtf/Vector.h"
|
| #include "wtf/text/WTFString.h"
|
| @@ -43,10 +44,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 +63,17 @@ public:
|
| void appended(InstrumentingAgents*, InspectorState*);
|
|
|
| protected:
|
| - InstrumentingAgents* m_instrumentingAgents;
|
| + RawPtrWillBeMember<InstrumentingAgents> m_instrumentingAgents;
|
| InspectorState* m_state;
|
|
|
| private:
|
| String m_name;
|
| };
|
|
|
| -class InspectorAgentRegistry {
|
| +class InspectorAgentRegistry : public NoBaseWillBeGarbageCollectedFinalized<InspectorAgentRegistry> {
|
| public:
|
| InspectorAgentRegistry(InstrumentingAgents*, InspectorCompositeState*);
|
| - void append(PassOwnPtr<InspectorAgent>);
|
| + void append(PassOwnPtrWillBeRawPtr<InspectorAgent>);
|
|
|
| void setFrontend(InspectorFrontend*);
|
| void clearFrontend();
|
| @@ -80,10 +82,12 @@ public:
|
| void discardAgents();
|
| void flushPendingFrontendMessages();
|
|
|
| + void trace(Visitor*);
|
| +
|
| private:
|
| - InstrumentingAgents* m_instrumentingAgents;
|
| + RawPtrWillBeMember<InstrumentingAgents> m_instrumentingAgents;
|
| InspectorCompositeState* m_inspectorState;
|
| - Vector<OwnPtr<InspectorAgent> > m_agents;
|
| + WillBeHeapVector<RawPtrWillBeMember<InspectorAgent> > m_agents;
|
| };
|
|
|
| template<typename T>
|
|
|