Chromium Code Reviews| Index: Source/core/inspector/InspectorController.h |
| diff --git a/Source/core/inspector/InspectorController.h b/Source/core/inspector/InspectorController.h |
| index 8fdffd46864231a19475fe22cd345614ac4a8b12..3d03504d35a5347935335145f3ad8d52fd0ffa0a 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*); |
| @@ -135,6 +136,7 @@ private: |
| InspectorController(Page*, InspectorClient*); |
| void initializeDeferredAgents(); |
| + InspectorAgentRegistry& agents() { return *m_agents; } |
| friend InstrumentingAgents* instrumentationForPage(Page*); |
| @@ -143,19 +145,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; |
|
haraken
2014/06/11 06:09:48
Page is on-heap, so we should use RawPtrWillBeMemb
Mads Ager (chromium)
2014/06/11 06:20:48
We should make m_page a Member as well and trace i
keishi
2014/06/11 14:10:53
Done.
|
| InspectorClient* m_inspectorClient; |
|
haraken
2014/06/11 06:09:48
This raw pointer looks safe, since it's explicitly
|
| - InspectorAgentRegistry m_agents; |
| - Vector<InspectorAgent*> m_moduleAgents; |
| + OwnPtrWillBeMember<InspectorAgentRegistry> m_agents; |
| + WillBeHeapVector<RawPtrWillBeMember<InspectorAgent> > m_moduleAgents; |
| bool m_isUnderTest; |
| bool m_deferredAgentsInitialized; |
| }; |