| Index: third_party/WebKit/Source/core/inspector/InspectorBaseAgent.h
|
| diff --git a/third_party/WebKit/Source/core/inspector/InspectorBaseAgent.h b/third_party/WebKit/Source/core/inspector/InspectorBaseAgent.h
|
| index ebc9a41b40577c75408dc54713d0adbfc768e9ae..5acbb115a2b33523130248ff354f25f608b445b7 100644
|
| --- a/third_party/WebKit/Source/core/inspector/InspectorBaseAgent.h
|
| +++ b/third_party/WebKit/Source/core/inspector/InspectorBaseAgent.h
|
| @@ -46,8 +46,7 @@ class InspectorFrontend;
|
| class InstrumentingAgents;
|
| class LocalFrame;
|
|
|
| -class CORE_EXPORT InspectorAgent : public NoBaseWillBeGarbageCollectedFinalized<InspectorAgent> {
|
| - USING_FAST_MALLOC_WILL_BE_REMOVED(InspectorAgent);
|
| +class CORE_EXPORT InspectorAgent : public GarbageCollectedFinalized<InspectorAgent> {
|
| public:
|
| explicit InspectorAgent(const String&);
|
| virtual ~InspectorAgent();
|
| @@ -68,7 +67,7 @@ public:
|
| void appended(InstrumentingAgents*);
|
|
|
| protected:
|
| - RawPtrWillBeMember<InstrumentingAgents> m_instrumentingAgents;
|
| + Member<InstrumentingAgents> m_instrumentingAgents;
|
| RefPtr<JSONObject> m_state;
|
|
|
| private:
|
| @@ -80,7 +79,7 @@ class CORE_EXPORT InspectorAgentRegistry final {
|
| WTF_MAKE_NONCOPYABLE(InspectorAgentRegistry);
|
| public:
|
| explicit InspectorAgentRegistry(InstrumentingAgents*);
|
| - void append(PassOwnPtrWillBeRawPtr<InspectorAgent>);
|
| + void append(RawPtr<InspectorAgent>);
|
|
|
| void setFrontend(InspectorFrontend*);
|
| void clearFrontend();
|
| @@ -94,9 +93,9 @@ public:
|
| DECLARE_TRACE();
|
|
|
| private:
|
| - RawPtrWillBeMember<InstrumentingAgents> m_instrumentingAgents;
|
| + Member<InstrumentingAgents> m_instrumentingAgents;
|
| RefPtr<JSONObject> m_state;
|
| - WillBeHeapVector<OwnPtrWillBeMember<InspectorAgent> > m_agents;
|
| + HeapVector<Member<InspectorAgent> > m_agents;
|
| };
|
|
|
| template<typename AgentClass, typename FrontendClass>
|
|
|