Index: Source/core/dom/shadow/ContentDistribution.h |
diff --git a/Source/core/dom/shadow/ContentDistribution.h b/Source/core/dom/shadow/ContentDistribution.h |
index 65a221d9ea896ee0217f95d600dcfc3aaf334690..200cd0d5019f5a1cb615d6facb608c76b4069e6c 100644 |
--- a/Source/core/dom/shadow/ContentDistribution.h |
+++ b/Source/core/dom/shadow/ContentDistribution.h |
@@ -38,18 +38,19 @@ |
namespace WebCore { |
-class ContentDistribution { |
+class ContentDistribution FINAL { |
+ DISALLOW_ALLOCATION(); |
public: |
ContentDistribution() { m_nodes.reserveInitialCapacity(32); } |
- PassRefPtr<Node> first() const { return m_nodes.first(); } |
- PassRefPtr<Node> last() const { return m_nodes.last(); } |
- PassRefPtr<Node> at(size_t index) const { return m_nodes.at(index); } |
+ PassRefPtrWillBeRawPtr<Node> first() const { return m_nodes.first(); } |
+ PassRefPtrWillBeRawPtr<Node> last() const { return m_nodes.last(); } |
+ PassRefPtrWillBeRawPtr<Node> at(size_t index) const { return m_nodes.at(index); } |
size_t size() const { return m_nodes.size(); } |
bool isEmpty() const { return m_nodes.isEmpty(); } |
- void append(PassRefPtr<Node>); |
+ void append(PassRefPtrWillBeRawPtr<Node>); |
void clear() { m_nodes.clear(); m_indices.clear(); } |
void shrinkToFit() { m_nodes.shrinkToFit(); } |
@@ -60,11 +61,13 @@ public: |
void swap(ContentDistribution& other); |
- const Vector<RefPtr<Node> >& nodes() const { return m_nodes; } |
+ const WillBeHeapVector<RefPtrWillBeMember<Node> >& nodes() const { return m_nodes; } |
+ |
+ void trace(Visitor*); |
private: |
- Vector<RefPtr<Node> > m_nodes; |
- HashMap<const Node*, size_t> m_indices; |
+ WillBeHeapVector<RefPtrWillBeMember<Node> > m_nodes; |
+ WillBeHeapHashMap<RawPtrWillBeMember<const Node>, size_t> m_indices; |
}; |
} |