Index: Source/core/dom/shadow/ShadowRootRareData.h |
diff --git a/Source/core/dom/shadow/ShadowRootRareData.h b/Source/core/dom/shadow/ShadowRootRareData.h |
index eb87ceb32d8a4f4659a20d2d41fad9d8c1ff7c35..abe5fbc51101297a74c0e14d1aa181c393c9859d 100644 |
--- a/Source/core/dom/shadow/ShadowRootRareData.h |
+++ b/Source/core/dom/shadow/ShadowRootRareData.h |
@@ -37,7 +37,7 @@ |
namespace WebCore { |
-class ShadowRootRareData : public NoBaseWillBeGarbageCollectedFinalized<ShadowRootRareData> { |
+class ShadowRootRareData : public NoBaseWillBeGarbageCollected<ShadowRootRareData> { |
public: |
ShadowRootRareData() |
: m_descendantShadowElementCount(0) |
@@ -47,7 +47,7 @@ public: |
} |
HTMLShadowElement* shadowInsertionPointOfYoungerShadowRoot() const { return m_shadowInsertionPointOfYoungerShadowRoot.get(); } |
- void setShadowInsertionPointOfYoungerShadowRoot(PassRefPtr<HTMLShadowElement> shadowInsertionPoint) { m_shadowInsertionPointOfYoungerShadowRoot = shadowInsertionPoint; } |
+ void setShadowInsertionPointOfYoungerShadowRoot(PassRefPtrWillBeRawPtr<HTMLShadowElement> shadowInsertionPoint) { m_shadowInsertionPointOfYoungerShadowRoot = shadowInsertionPoint; } |
void didAddInsertionPoint(InsertionPoint*); |
void didRemoveInsertionPoint(InsertionPoint*); |
@@ -63,21 +63,26 @@ public: |
unsigned childShadowRootCount() const { return m_childShadowRootCount; } |
- const Vector<RefPtr<InsertionPoint> >& descendantInsertionPoints() { return m_descendantInsertionPoints; } |
- void setDescendantInsertionPoints(Vector<RefPtr<InsertionPoint> >& list) { m_descendantInsertionPoints.swap(list); } |
+ const WillBeHeapVector<RefPtrWillBeMember<InsertionPoint> >& descendantInsertionPoints() { return m_descendantInsertionPoints; } |
+ void setDescendantInsertionPoints(WillBeHeapVector<RefPtrWillBeMember<InsertionPoint> >& list) { m_descendantInsertionPoints.swap(list); } |
void clearDescendantInsertionPoints() { m_descendantInsertionPoints.clear(); } |
StyleSheetList* styleSheets() { return m_styleSheetList.get(); } |
void setStyleSheets(PassRefPtrWillBeRawPtr<StyleSheetList> styleSheetList) { m_styleSheetList = styleSheetList; } |
- void trace(Visitor* visitor) { visitor->trace(m_styleSheetList); } |
+ void trace(Visitor* visitor) |
+ { |
+ visitor->trace(m_shadowInsertionPointOfYoungerShadowRoot); |
+ visitor->trace(m_descendantInsertionPoints); |
+ visitor->trace(m_styleSheetList); |
+ } |
private: |
- RefPtr<HTMLShadowElement> m_shadowInsertionPointOfYoungerShadowRoot; |
+ RefPtrWillBeMember<HTMLShadowElement> m_shadowInsertionPointOfYoungerShadowRoot; |
unsigned m_descendantShadowElementCount; |
unsigned m_descendantContentElementCount; |
unsigned m_childShadowRootCount; |
- Vector<RefPtr<InsertionPoint> > m_descendantInsertionPoints; |
+ WillBeHeapVector<RefPtrWillBeMember<InsertionPoint> > m_descendantInsertionPoints; |
RefPtrWillBeMember<StyleSheetList> m_styleSheetList; |
}; |