Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1249)

Unified Diff: Source/core/inspector/InspectorDOMAgent.h

Issue 307943002: Oilpan: Prepare moving InspectorController and InspectorAgents to oilpan. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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*);
haraken 2014/06/12 05:53:01 Add OVERRIDE.
keishi 2014/06/13 03:37:33 Done.
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;
keishi 2014/06/11 14:10:54 SAFE: InspectorOverlay is owned by InspectorContro
haraken 2014/06/12 05:53:01 Let's move this to the heap in a follow-up. FIXME
keishi 2014/06/13 03:37:33 Done.
InspectorFrontend::DOM* m_frontend;
keishi 2014/06/11 14:10:54 SAFE: InspectorFrontend::DOM is part of InspectorF
DOMListener* m_domListener;
keishi 2014/06/11 14:10:54 SAFE: DOMListener here is InspectorCSSAgent. Clear
haraken 2014/06/12 05:53:01 Given that InspectorCSSAgent is already on-heap, c
keishi 2014/06/13 03:37:33 Done.
- 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;
+ OwnPtrWillBeMember<DOMEditor> m_domEditor;
bool m_suppressAttributeModifiedEvent;
Listener* m_listener;
};

Powered by Google App Engine
This is Rietveld 408576698