Chromium Code Reviews| Index: Source/core/inspector/InspectorCSSAgent.h |
| diff --git a/Source/core/inspector/InspectorCSSAgent.h b/Source/core/inspector/InspectorCSSAgent.h |
| index c16075ae6897a87af81e03ca61f538c6bb886c47..172f6f107e75ae1fe37ff94b1fa1222dede88b4a 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; |
| @@ -142,7 +144,7 @@ public: |
| PassRefPtr<TypeBuilder::CSS::CSSMedia> buildMediaObject(const MediaList*, MediaListSource, const String&, CSSStyleSheet*); |
| PassRefPtr<TypeBuilder::Array<TypeBuilder::CSS::CSSMedia> > buildMediaListChain(CSSRule*); |
| - static void collectAllDocumentStyleSheets(Document*, Vector<CSSStyleSheet*>&); |
| + static void collectAllDocumentStyleSheets(Document*, WillBeHeapVector<RawPtrWillBeMember<CSSStyleSheet> >&); |
| private: |
| class StyleSheetAction; |
| @@ -163,10 +165,10 @@ private: |
| void resetNonPersistentData(); |
| InspectorStyleSheetForInlineStyle* asInspectorStyleSheet(Element* element); |
| Element* elementForId(ErrorString*, int nodeId); |
| - static void collectStyleSheets(CSSStyleSheet*, Vector<CSSStyleSheet*>&); |
| + static 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; |
|
haraken
2014/06/17 14:06:17
I confirmed that these pointers are strong pointer
|
| + 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; |