Index: Source/core/inspector/InspectorStyleSheet.h |
diff --git a/Source/core/inspector/InspectorStyleSheet.h b/Source/core/inspector/InspectorStyleSheet.h |
index 63b343ab28ceadc09caa9e272967c467b8ea1791..ef453faae3cbe8627c5da5b01f1596afbbf90e3a 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 { |
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; |
@@ -247,9 +249,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; |
@@ -259,7 +261,7 @@ private: |
class InspectorStyleSheetForInlineStyle FINAL : public InspectorStyleSheetBase { |
public: |
- static PassRefPtr<InspectorStyleSheetForInlineStyle> create(const String& id, PassRefPtr<Element>, Listener*); |
+ static PassRefPtrWillBeRawPtr<InspectorStyleSheetForInlineStyle> create(const String& id, PassRefPtr<Element>, Listener*); |
void didModifyElementAttribute(); |
virtual Document* ownerDocument() const OVERRIDE; |
@@ -270,6 +272,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; } |
@@ -285,7 +289,7 @@ private: |
PassRefPtrWillBeRawPtr<CSSRuleSourceData> getStyleAttributeData() const; |
RefPtr<Element> m_element; |
- RefPtrWillBePersistent<CSSRuleSourceData> m_ruleSourceData; |
+ RefPtrWillBeMember<CSSRuleSourceData> m_ruleSourceData; |
RefPtr<InspectorStyle> m_inspectorStyle; |
// Contains "style" attribute value. |