| Index: Source/core/inspector/InspectorController.h
|
| diff --git a/Source/core/inspector/InspectorController.h b/Source/core/inspector/InspectorController.h
|
| index 8fdffd46864231a19475fe22cd345614ac4a8b12..b2ede4deb9fed875d13b6eb6d05c52e5e6c25ce9 100644
|
| --- a/Source/core/inspector/InspectorController.h
|
| +++ b/Source/core/inspector/InspectorController.h
|
| @@ -68,20 +68,21 @@ class PlatformMouseEvent;
|
| class PlatformTouchEvent;
|
| class Node;
|
|
|
| -class InspectorController {
|
| +class InspectorController : public NoBaseWillBeGarbageCollectedFinalized<InspectorController> {
|
| WTF_MAKE_NONCOPYABLE(InspectorController);
|
| - WTF_MAKE_FAST_ALLOCATED;
|
| + WTF_MAKE_FAST_ALLOCATED_WILL_BE_REMOVED;
|
| public:
|
| ~InspectorController();
|
| + void trace(Visitor*);
|
|
|
| - static PassOwnPtr<InspectorController> create(Page*, InspectorClient*);
|
| + static PassOwnPtrWillBeRawPtr<InspectorController> create(Page*, InspectorClient*);
|
|
|
| // Settings overrides.
|
| void setTextAutosizingEnabled(bool);
|
| void setDeviceScaleAdjustment(float);
|
|
|
| void willBeDestroyed();
|
| - void registerModuleAgent(PassOwnPtr<InspectorAgent>);
|
| + void registerModuleAgent(PassOwnPtrWillBeRawPtr<InspectorAgent>);
|
|
|
| void setInspectorFrontendClient(PassOwnPtr<InspectorFrontendClient>);
|
| void didClearDocumentOfWindowObject(LocalFrame*);
|
| @@ -143,19 +144,19 @@ private:
|
| OwnPtr<InspectorCompositeState> m_state;
|
| OwnPtr<InspectorOverlay> m_overlay;
|
|
|
| - InspectorDOMAgent* m_domAgent;
|
| - InspectorPageAgent* m_pageAgent;
|
| - InspectorTimelineAgent* m_timelineAgent;
|
| - InspectorLayerTreeAgent* m_layerTreeAgent;
|
| - InspectorTracingAgent* m_tracingAgent;
|
| + RawPtrWillBeMember<InspectorDOMAgent> m_domAgent;
|
| + RawPtrWillBeMember<InspectorPageAgent> m_pageAgent;
|
| + RawPtrWillBeMember<InspectorTimelineAgent> m_timelineAgent;
|
| + RawPtrWillBeMember<InspectorLayerTreeAgent> m_layerTreeAgent;
|
| + RawPtrWillBeMember<InspectorTracingAgent> m_tracingAgent;
|
|
|
| RefPtr<InspectorBackendDispatcher> m_inspectorBackendDispatcher;
|
| OwnPtr<InspectorFrontendClient> m_inspectorFrontendClient;
|
| OwnPtr<InspectorFrontend> m_inspectorFrontend;
|
| Page* m_page;
|
| InspectorClient* m_inspectorClient;
|
| - InspectorAgentRegistry m_agents;
|
| - Vector<InspectorAgent*> m_moduleAgents;
|
| + OwnPtrWillBeMember<InspectorAgentRegistry> m_agents;
|
| + WillBeHeapVector<RawPtrWillBeMember<InspectorAgent> > m_moduleAgents;
|
| bool m_isUnderTest;
|
| bool m_deferredAgentsInitialized;
|
| };
|
|
|