diff options
| author | Konstantin Tokarev <annulen@yandex.ru> | 2016-09-28 16:39:37 +0300 |
|---|---|---|
| committer | Konstantin Tokarev <annulen@yandex.ru> | 2017-02-02 12:31:01 +0000 |
| commit | 9daf1655d7e4eaaa6ed5f44055a4b4fd399fd25c (patch) | |
| tree | 322337ad0acbc75732f916376ec6d36e7ec0e5bc /Source/WebCore/css/CSSParserValues.cpp | |
| parent | 6882a04fb36642862b11efe514251d32070c3d65 (diff) | |
| download | qtwebkit-9daf1655d7e4eaaa6ed5f44055a4b4fd399fd25c.tar.gz | |
Imported WebKit commit eb954cdcf58f9b915b2fcb6f8e4cb3a60650a4f3
Change-Id: I8dda875c38075d43b76fe3a21acb0ffa102bb82d
Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
Diffstat (limited to 'Source/WebCore/css/CSSParserValues.cpp')
| -rw-r--r-- | Source/WebCore/css/CSSParserValues.cpp | 25 |
1 files changed, 11 insertions, 14 deletions
diff --git a/Source/WebCore/css/CSSParserValues.cpp b/Source/WebCore/css/CSSParserValues.cpp index db7540e8a..7fb74c6b8 100644 --- a/Source/WebCore/css/CSSParserValues.cpp +++ b/Source/WebCore/css/CSSParserValues.cpp @@ -46,29 +46,26 @@ void destroy(const CSSParserValue& value) CSSParserValueList::~CSSParserValueList() { - for (size_t i = 0, size = m_values.size(); i < size; i++) - destroy(m_values[i]); + for (auto& value : m_values) + destroy(value); } -void CSSParserValueList::addValue(const CSSParserValue& v) +void CSSParserValueList::addValue(const CSSParserValue& value) { - m_values.append(v); + m_values.append(value); } -void CSSParserValueList::insertValueAt(unsigned i, const CSSParserValue& v) +void CSSParserValueList::insertValueAt(unsigned i, const CSSParserValue& value) { - m_values.insert(i, v); + m_values.insert(i, value); } -void CSSParserValueList::deleteValueAt(unsigned i) +void CSSParserValueList::extend(CSSParserValueList& other) { - m_values.remove(i); -} - -void CSSParserValueList::extend(CSSParserValueList& valueList) -{ - for (unsigned int i = 0; i < valueList.size(); ++i) - m_values.append(*(valueList.valueAt(i))); + for (auto& value : other.m_values) { + m_values.append(value); + value.unit = 0; // We moved the CSSParserValue from the other list; this acts like std::move. + } } bool CSSParserValueList::containsVariables() const |
