Chromium Code Reviews| Index: Source/core/inspector/InspectorStyleSheet.h |
| diff --git a/Source/core/inspector/InspectorStyleSheet.h b/Source/core/inspector/InspectorStyleSheet.h |
| index 87d06af31630b3fb8542269b0d8fc5e80805fcc6..6e9c5e8ace3264de1f389a64c60c17a83bcb792c 100644 |
| --- a/Source/core/inspector/InspectorStyleSheet.h |
| +++ b/Source/core/inspector/InspectorStyleSheet.h |
| @@ -52,7 +52,7 @@ class InspectorPageAgent; |
| class InspectorResourceAgent; |
| class InspectorStyleSheetBase; |
| -typedef WillBePersistentHeapVector<RefPtrWillBeMember<CSSRule> > CSSRuleVector; |
| +typedef WillBeHeapVector<RefPtrWillBeMember<CSSRule> > CSSRuleVector; |
| typedef String ErrorString; |
| class InspectorCSSId { |
| @@ -140,7 +140,7 @@ private: |
| mutable bool m_formatAcquired; |
| }; |
| -class InspectorStyleSheetBase : public RefCounted<InspectorStyleSheetBase> { |
| +class InspectorStyleSheetBase : public RefCountedWillBeGarbageCollectedFinalized<InspectorStyleSheetBase> { |
| public: |
| class Listener { |
|
haraken
2014/06/19 05:49:53
You can make this a GC-mixin and use a Member for
|
| public: |
| @@ -151,6 +151,7 @@ public: |
| virtual void didReparseStyleSheet() = 0; |
| }; |
| virtual ~InspectorStyleSheetBase() { } |
| + virtual void trace(Visitor*) { } |
| String id() const { return m_id; } |
| @@ -192,9 +193,10 @@ private: |
| class InspectorStyleSheet : public InspectorStyleSheetBase { |
| public: |
| - static PassRefPtr<InspectorStyleSheet> create(InspectorPageAgent*, InspectorResourceAgent*, const String& id, PassRefPtrWillBeRawPtr<CSSStyleSheet> pageStyleSheet, TypeBuilder::CSS::StyleSheetOrigin::Enum, const String& documentURL, Listener*); |
| + static PassRefPtrWillBeRawPtr<InspectorStyleSheet> create(InspectorPageAgent*, InspectorResourceAgent*, const String& id, PassRefPtrWillBeRawPtr<CSSStyleSheet> pageStyleSheet, TypeBuilder::CSS::StyleSheetOrigin::Enum, const String& documentURL, Listener*); |
| virtual ~InspectorStyleSheet(); |
| + virtual void trace(Visitor*) OVERRIDE; |
| String finalURL() const; |
| virtual Document* ownerDocument() const OVERRIDE; |
| @@ -249,9 +251,9 @@ private: |
| bool hasSourceURL() const; |
| bool startsAtZero() const; |
| - InspectorPageAgent* m_pageAgent; |
| - InspectorResourceAgent* m_resourceAgent; |
| - RefPtrWillBePersistent<CSSStyleSheet> m_pageStyleSheet; |
| + RawPtrWillBeMember<InspectorPageAgent> m_pageAgent; |
| + RawPtrWillBeMember<InspectorResourceAgent> m_resourceAgent; |
| + RefPtrWillBeMember<CSSStyleSheet> m_pageStyleSheet; |
| TypeBuilder::CSS::StyleSheetOrigin::Enum m_origin; |
| String m_documentURL; |
| OwnPtr<ParsedStyleSheet> m_parsedStyleSheet; |
| @@ -261,7 +263,7 @@ private: |
| class InspectorStyleSheetForInlineStyle FINAL : public InspectorStyleSheetBase { |
| public: |
| - static PassRefPtr<InspectorStyleSheetForInlineStyle> create(const String& id, PassRefPtrWillBeRawPtr<Element>, Listener*); |
| + static PassRefPtrWillBeRawPtr<InspectorStyleSheetForInlineStyle> create(const String& id, PassRefPtrWillBeRawPtr<Element>, Listener*); |
| void didModifyElementAttribute(); |
| virtual Document* ownerDocument() const OVERRIDE; |
| @@ -272,6 +274,8 @@ public: |
| virtual InspectorCSSId styleId(CSSStyleDeclaration* style) const OVERRIDE { return InspectorCSSId(id(), 0); } |
| virtual bool setStyleText(const InspectorCSSId&, const String&) OVERRIDE; |
| + virtual void trace(Visitor*) OVERRIDE; |
| + |
| protected: |
| virtual PassRefPtr<InspectorStyle> inspectorStyleForId(const InspectorCSSId&) OVERRIDE; |
| virtual unsigned ruleCount() OVERRIDE { return 1; } |
| @@ -286,8 +290,8 @@ private: |
| const String& elementStyleText() const; |
| PassRefPtrWillBeRawPtr<CSSRuleSourceData> getStyleAttributeData() const; |
| - RefPtrWillBePersistent<Element> m_element; |
| - RefPtrWillBePersistent<CSSRuleSourceData> m_ruleSourceData; |
| + RefPtrWillBeMember<Element> m_element; |
| + RefPtrWillBeMember<CSSRuleSourceData> m_ruleSourceData; |
| RefPtr<InspectorStyle> m_inspectorStyle; |
| // Contains "style" attribute value. |