Index: Source/core/inspector/InspectorCSSAgent.h |
diff --git a/Source/core/inspector/InspectorCSSAgent.h b/Source/core/inspector/InspectorCSSAgent.h |
index 7056869d1ab7128ba6c8fdc07d1b82f26bd6c9c5..66d3a3883e0eaf27dd73401d99cbf46b44c4b1b9 100644 |
--- a/Source/core/inspector/InspectorCSSAgent.h |
+++ b/Source/core/inspector/InspectorCSSAgent.h |
@@ -65,6 +65,7 @@ class InspectorCSSAgent FINAL |
, public InspectorBackendDispatcher::CSSCommandHandler |
, public InspectorStyleSheetBase::Listener { |
WTF_MAKE_NONCOPYABLE(InspectorCSSAgent); |
+ WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(InspectorCSSAgent); |
public: |
enum MediaListSource { |
MediaListSourceLinkedSheet, |
@@ -97,11 +98,12 @@ public: |
static CSSStyleRule* asCSSStyleRule(CSSRule*); |
- static PassOwnPtr<InspectorCSSAgent> create(InspectorDOMAgent* domAgent, InspectorPageAgent* pageAgent, InspectorResourceAgent* resourceAgent) |
+ static PassOwnPtrWillBeRawPtr<InspectorCSSAgent> create(InspectorDOMAgent* domAgent, InspectorPageAgent* pageAgent, InspectorResourceAgent* resourceAgent) |
{ |
- return adoptPtr(new InspectorCSSAgent(domAgent, pageAgent, resourceAgent)); |
+ return adoptPtrWillBeNoop(new InspectorCSSAgent(domAgent, pageAgent, resourceAgent)); |
} |
virtual ~InspectorCSSAgent(); |
+ virtual void trace(Visitor*) OVERRIDE; |
bool forcePseudoState(Element*, CSSSelector::PseudoType); |
virtual void setFrontend(InspectorFrontend*) OVERRIDE; |
@@ -162,11 +164,11 @@ private: |
InspectorStyleSheetForInlineStyle* asInspectorStyleSheet(Element* element); |
Element* elementForId(ErrorString*, int nodeId); |
void collectAllStyleSheets(Vector<InspectorStyleSheet*>&); |
- void collectAllDocumentStyleSheets(Document*, Vector<CSSStyleSheet*>&); |
- void collectStyleSheets(CSSStyleSheet*, Vector<CSSStyleSheet*>&); |
+ void collectAllDocumentStyleSheets(Document*, WillBeHeapVector<RawPtrWillBeMember<CSSStyleSheet> >&); |
+ void collectStyleSheets(CSSStyleSheet*, WillBeHeapVector<RawPtrWillBeMember<CSSStyleSheet> >&); |
void updateActiveStyleSheets(Document*, StyleSheetsUpdateType); |
- void setActiveStyleSheets(Document*, const Vector<CSSStyleSheet*>&, StyleSheetsUpdateType); |
+ void setActiveStyleSheets(Document*, const WillBeHeapVector<RawPtrWillBeMember<CSSStyleSheet> >&, StyleSheetsUpdateType); |
void collectPlatformFontsForRenderer(RenderText*, HashCountedSet<String>*); |
@@ -195,22 +197,22 @@ private: |
void resetPseudoStates(); |
InspectorFrontend::CSS* m_frontend; |
- InspectorDOMAgent* m_domAgent; |
- InspectorPageAgent* m_pageAgent; |
- InspectorResourceAgent* m_resourceAgent; |
+ RawPtrWillBeMember<InspectorDOMAgent> m_domAgent; |
+ RawPtrWillBeMember<InspectorPageAgent> m_pageAgent; |
+ RawPtrWillBeMember<InspectorResourceAgent> m_resourceAgent; |
IdToInspectorStyleSheet m_idToInspectorStyleSheet; |
IdToInspectorStyleSheetForInlineStyle m_idToInspectorStyleSheetForInlineStyle; |
- HashMap<CSSStyleSheet*, RefPtr<InspectorStyleSheet> > m_cssStyleSheetToInspectorStyleSheet; |
- typedef HashMap<Document*, OwnPtr<HashSet<CSSStyleSheet*> > > DocumentStyleSheets; |
+ WillBeHeapHashMap<RawPtrWillBeMember<CSSStyleSheet>, RefPtr<InspectorStyleSheet> > m_cssStyleSheetToInspectorStyleSheet; |
+ typedef WillBeHeapHashMap<RawPtrWillBeMember<Document>, OwnPtrWillBeMember<WillBeHeapHashSet<RawPtrWillBeMember<CSSStyleSheet> > > > DocumentStyleSheets; |
DocumentStyleSheets m_documentToCSSStyleSheets; |
- HashSet<Document*> m_invalidatedDocuments; |
+ WillBeHeapHashSet<RawPtrWillBeMember<Document> > m_invalidatedDocuments; |
NodeToInspectorStyleSheet m_nodeToInspectorStyleSheet; |
- WillBePersistentHeapHashMap<RefPtrWillBeMember<Document>, RefPtr<InspectorStyleSheet> > m_documentToViaInspectorStyleSheet; // "via inspector" stylesheets |
+ WillBeHeapHashMap<RefPtrWillBeMember<Document>, RefPtr<InspectorStyleSheet> > m_documentToViaInspectorStyleSheet; // "via inspector" stylesheets |
NodeIdToForcedPseudoState m_nodeIdToForcedPseudoState; |
- RefPtrWillBePersistent<CSSStyleSheet> m_inspectorUserAgentStyleSheet; |
+ RefPtrWillBeMember<CSSStyleSheet> m_inspectorUserAgentStyleSheet; |
int m_lastStyleSheetId; |
int m_styleSheetsPendingMutation; |