Index: Source/core/css/CSSValueList.h |
diff --git a/Source/core/css/CSSValueList.h b/Source/core/css/CSSValueList.h |
index f3f8ae456b6990f8652593ea7329bab662dc562a..3f97f3852b904ad0f3c9689f83df429177c6ebfc 100644 |
--- a/Source/core/css/CSSValueList.h |
+++ b/Source/core/css/CSSValueList.h |
@@ -30,20 +30,20 @@ namespace blink { |
class CORE_EXPORT CSSValueList : public CSSValue { |
public: |
- using iterator = WillBeHeapVector<RefPtrWillBeMember<CSSValue>, 4>::iterator; |
- using const_iterator = WillBeHeapVector<RefPtrWillBeMember<CSSValue>, 4>::const_iterator; |
+ using iterator = Vector<RefPtr<CSSValue>, 4>::iterator; |
+ using const_iterator = Vector<RefPtr<CSSValue>, 4>::const_iterator; |
- static PassRefPtrWillBeRawPtr<CSSValueList> createCommaSeparated() |
+ static PassRefPtr<CSSValueList> createCommaSeparated() |
{ |
- return adoptRefWillBeNoop(new CSSValueList(CommaSeparator)); |
+ return adoptRef(new CSSValueList(CommaSeparator)); |
} |
- static PassRefPtrWillBeRawPtr<CSSValueList> createSpaceSeparated() |
+ static PassRefPtr<CSSValueList> createSpaceSeparated() |
{ |
- return adoptRefWillBeNoop(new CSSValueList(SpaceSeparator)); |
+ return adoptRef(new CSSValueList(SpaceSeparator)); |
} |
- static PassRefPtrWillBeRawPtr<CSSValueList> createSlashSeparated() |
+ static PassRefPtr<CSSValueList> createSlashSeparated() |
{ |
- return adoptRefWillBeNoop(new CSSValueList(SlashSeparator)); |
+ return adoptRef(new CSSValueList(SlashSeparator)); |
} |
iterator begin() { return m_values.begin(); } |
@@ -57,26 +57,24 @@ public: |
CSSValue* itemWithBoundsCheck(size_t index) { return index < m_values.size() ? m_values[index].get() : 0; } |
const CSSValue* itemWithBoundsCheck(size_t index) const { return index < m_values.size() ? m_values[index].get() : 0; } |
- void append(PassRefPtrWillBeRawPtr<CSSValue> value) { m_values.append(value); } |
- void prepend(PassRefPtrWillBeRawPtr<CSSValue> value) { m_values.prepend(value); } |
+ void append(PassRefPtr<CSSValue> value) { m_values.append(value); } |
+ void prepend(PassRefPtr<CSSValue> value) { m_values.prepend(value); } |
bool removeAll(CSSValue*); |
bool hasValue(CSSValue*) const; |
- PassRefPtrWillBeRawPtr<CSSValueList> copy(); |
+ PassRefPtr<CSSValueList> copy(); |
String customCSSText() const; |
bool equals(const CSSValueList&) const; |
bool hasFailedOrCanceledSubresources() const; |
- DECLARE_TRACE_AFTER_DISPATCH(); |
- |
protected: |
CSSValueList(ClassType, ValueListSeparator); |
private: |
explicit CSSValueList(ValueListSeparator); |
- WillBeHeapVector<RefPtrWillBeMember<CSSValue>, 4> m_values; |
+ Vector<RefPtr<CSSValue>, 4> m_values; |
}; |
DEFINE_CSS_VALUE_TYPE_CASTS(CSSValueList, isValueList()); |