Index: Source/core/inspector/InspectorDOMAgent.h |
diff --git a/Source/core/inspector/InspectorDOMAgent.h b/Source/core/inspector/InspectorDOMAgent.h |
index f5174aeaac9be542fad47a5bef046c6bd9387485..5e7ed8588bab63375cf9bc462ae3487a4845272b 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,7 +254,7 @@ private: |
bool pushDocumentUponHandlelessOperation(ErrorString*); |
- InspectorPageAgent* m_pageAgent; |
+ RawPtrWillBeMember<InspectorPageAgent> m_pageAgent; |
InjectedScriptManager* m_injectedScriptManager; |
InspectorOverlay* m_overlay; |
InspectorFrontend::DOM* m_frontend; |
@@ -269,11 +270,11 @@ private: |
RefPtr<Document> m_document; |
typedef HashMap<String, Vector<RefPtr<Node> > > SearchResults; |
SearchResults m_searchResults; |
- OwnPtr<RevalidateStyleAttributeTask> m_revalidateStyleAttrTask; |
+ OwnPtrWillBeMember<RevalidateStyleAttributeTask> m_revalidateStyleAttrTask; |
SearchMode m_searchingForNode; |
OwnPtr<HighlightConfig> m_inspectModeHighlightConfig; |
- OwnPtr<InspectorHistory> m_history; |
- OwnPtr<DOMEditor> m_domEditor; |
+ OwnPtrWillBeMember<InspectorHistory> m_history; |
+ OwnPtrWillBeMember<DOMEditor> m_domEditor; |
bool m_suppressAttributeModifiedEvent; |
Listener* m_listener; |
}; |