| Index: Source/core/inspector/InspectorDOMAgent.h
|
| diff --git a/Source/core/inspector/InspectorDOMAgent.h b/Source/core/inspector/InspectorDOMAgent.h
|
| index 365a3c4c883697920e5dc70a968d37c03f29a2b3..2e01f6c3716f857915a0dd42220d29ad11acbb83 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;
|
| @@ -241,7 +242,7 @@ private:
|
|
|
| bool pushDocumentUponHandlelessOperation(ErrorString*);
|
|
|
| - InspectorPageAgent* m_pageAgent;
|
| + RawPtrWillBeMember<InspectorPageAgent> m_pageAgent;
|
| InjectedScriptManager* m_injectedScriptManager;
|
| InspectorOverlay* m_overlay;
|
| InspectorFrontend::DOM* m_frontend;
|
| @@ -257,11 +258,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;
|
| - OwnPtrWillBePersistent<InspectorHistory> m_history;
|
| - OwnPtrWillBePersistent<DOMEditor> m_domEditor;
|
| + OwnPtrWillBeMember<InspectorHistory> m_history;
|
| + OwnPtrWillBeMember<DOMEditor> m_domEditor;
|
| bool m_suppressAttributeModifiedEvent;
|
| };
|
|
|
|
|