Chromium Code Reviews| Index: Source/core/inspector/InspectorCSSAgent.h |
| diff --git a/Source/core/inspector/InspectorCSSAgent.h b/Source/core/inspector/InspectorCSSAgent.h |
| index 7056869d1ab7128ba6c8fdc07d1b82f26bd6c9c5..acdf38a0dd15fa649e5d5f6e248181a5698fbb57 100644 |
| --- a/Source/core/inspector/InspectorCSSAgent.h |
| +++ b/Source/core/inspector/InspectorCSSAgent.h |
| @@ -97,11 +97,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; |
| @@ -195,22 +196,22 @@ private: |
| void resetPseudoStates(); |
| InspectorFrontend::CSS* m_frontend; |
|
keishi
2014/06/11 14:10:54
SAFE: InspectorFrontend::CSS is owned by Inspector
|
| - 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; |
|
haraken
2014/06/12 05:53:01
I haven't checked in details, but are you sure tha
keishi
2014/06/13 03:37:33
m_cssStyleSheetToInspectorStyleSheet is in charge
haraken
2014/06/13 08:02:53
We don't want to make things weak as much as possi
|
| 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; |