Chromium Code Reviews| Index: Source/core/inspector/InspectorDOMAgent.h | 
| diff --git a/Source/core/inspector/InspectorDOMAgent.h b/Source/core/inspector/InspectorDOMAgent.h | 
| index c4cc6289deca1368161f3ec347646d01a6f28548..bb6bfa6dde245b5b48a26e21bb5cbd10f3b26652 100644 | 
| --- a/Source/core/inspector/InspectorDOMAgent.h | 
| +++ b/Source/core/inspector/InspectorDOMAgent.h | 
| @@ -95,14 +95,15 @@ public: | 
| virtual void didModifyDOMAttr(Element*) = 0; | 
| }; | 
| - static PassOwnPtr<InspectorDOMAgent> create(InspectorPageAgent* pageAgent, InjectedScriptManager* injectedScriptManager, InspectorOverlay* overlay) | 
| + static PassOwnPtrWillBeRawPtr<InspectorDOMAgent> create(InspectorPageAgent* pageAgent, InjectedScriptManager* injectedScriptManager, InspectorOverlay* overlay) | 
| { | 
| - return adoptPtr(new InspectorDOMAgent(pageAgent, injectedScriptManager, overlay)); | 
| + return adoptPtrWillBeNoop(new InspectorDOMAgent(pageAgent, injectedScriptManager, overlay)); | 
| } | 
| static String toErrorString(ExceptionState&); | 
| virtual ~InspectorDOMAgent(); | 
| + virtual void trace(Visitor*); | 
| virtual void setFrontend(InspectorFrontend*) OVERRIDE; | 
| virtual void clearFrontend() OVERRIDE; | 
| @@ -253,27 +254,27 @@ private: | 
| bool pushDocumentUponHandlelessOperation(ErrorString*); | 
| - InspectorPageAgent* m_pageAgent; | 
| + RawPtrWillBeMember<InspectorPageAgent> m_pageAgent; | 
| InjectedScriptManager* m_injectedScriptManager; | 
| InspectorOverlay* m_overlay; | 
| InspectorFrontend::DOM* m_frontend; | 
| DOMListener* m_domListener; | 
| - OwnPtrWillBePersistent<NodeToIdMap> m_documentNodeToIdMap; | 
| + OwnPtrWillBeMember<NodeToIdMap> m_documentNodeToIdMap; | 
| // Owns node mappings for dangling nodes. | 
| - WillBePersistentHeapVector<OwnPtrWillBeMember<NodeToIdMap> > m_danglingNodeToIdMaps; | 
| - WillBePersistentHeapHashMap<int, RawPtrWillBeMember<Node> > m_idToNode; | 
| - WillBePersistentHeapHashMap<int, RawPtrWillBeMember<NodeToIdMap> > m_idToNodesMap; | 
| + WillBeHeapVector<OwnPtrWillBeMember<NodeToIdMap> > m_danglingNodeToIdMaps; | 
| + WillBeHeapHashMap<int, RawPtrWillBeMember<Node> > m_idToNode; | 
| + WillBeHeapHashMap<int, RawPtrWillBeMember<NodeToIdMap> > m_idToNodesMap; | 
| HashSet<int> m_childrenRequested; | 
| HashMap<int, int> m_cachedChildCount; | 
| int m_lastNodeId; | 
| - RefPtrWillBePersistent<Document> m_document; | 
| - typedef WillBePersistentHeapHashMap<String, WillBeHeapVector<RefPtrWillBeMember<Node> > > SearchResults; | 
| + RefPtrWillBeMember<Document> m_document; | 
| + typedef WillBeHeapHashMap<String, WillBeHeapVector<RefPtrWillBeMember<Node> > > SearchResults; | 
| SearchResults m_searchResults; | 
| OwnPtr<RevalidateStyleAttributeTask> m_revalidateStyleAttrTask; | 
| SearchMode m_searchingForNode; | 
| OwnPtr<HighlightConfig> m_inspectModeHighlightConfig; | 
| - OwnPtrWillBePersistent<InspectorHistory> m_history; | 
| - OwnPtrWillBePersistent<DOMEditor> m_domEditor; | 
| + OwnPtrWillBeMember<InspectorHistory> m_history; | 
| 
 
tkent
2014/06/10 09:50:55
InspectorHistory isn't on-heap yet, rigtht?
 
keishi
2014/06/10 13:11:12
I will land this CL first
https://codereview.chrom
 
 | 
| + OwnPtrWillBeMember<DOMEditor> m_domEditor; | 
| 
 
tkent
2014/06/10 09:50:55
Ditto.
 
 | 
| bool m_suppressAttributeModifiedEvent; | 
| Listener* m_listener; | 
| }; |