| OLD | NEW |
| 1 /* | 1 /* |
| 2 * (C) 1999-2003 Lars Knoll (knoll@kde.org) | 2 * (C) 1999-2003 Lars Knoll (knoll@kde.org) |
| 3 * Copyright (C) 2004, 2005, 2006, 2007, 2010 Apple Inc. All rights reserved. | 3 * Copyright (C) 2004, 2005, 2006, 2007, 2010 Apple Inc. All rights reserved. |
| 4 * | 4 * |
| 5 * This library is free software; you can redistribute it and/or | 5 * This library is free software; you can redistribute it and/or |
| 6 * modify it under the terms of the GNU Library General Public | 6 * modify it under the terms of the GNU Library General Public |
| 7 * License as published by the Free Software Foundation; either | 7 * License as published by the Free Software Foundation; either |
| 8 * version 2 of the License, or (at your option) any later version. | 8 * version 2 of the License, or (at your option) any later version. |
| 9 * | 9 * |
| 10 * This library is distributed in the hope that it will be useful, | 10 * This library is distributed in the hope that it will be useful, |
| 11 * but WITHOUT ANY WARRANTY; without even the implied warranty of | 11 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
| 12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | 12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
| 13 * Library General Public License for more details. | 13 * Library General Public License for more details. |
| 14 * | 14 * |
| 15 * You should have received a copy of the GNU Library General Public License | 15 * You should have received a copy of the GNU Library General Public License |
| 16 * along with this library; see the file COPYING.LIB. If not, write to | 16 * along with this library; see the file COPYING.LIB. If not, write to |
| 17 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, | 17 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, |
| 18 * Boston, MA 02110-1301, USA. | 18 * Boston, MA 02110-1301, USA. |
| 19 */ | 19 */ |
| 20 | 20 |
| 21 #include "config.h" | 21 #include "config.h" |
| 22 #include "core/css/CSSValueList.h" | 22 #include "core/css/CSSValueList.h" |
| 23 | 23 |
| 24 #include "core/css/CSSPrimitiveValue.h" | 24 #include "core/css/CSSPrimitiveValue.h" |
| 25 #include "wtf/text/StringBuilder.h" | 25 #include "wtf/text/StringBuilder.h" |
| 26 | 26 |
| 27 namespace blink { | 27 namespace blink { |
| 28 | 28 |
| 29 CSSValueList::CSSValueList(ClassType classType, ValueListSeparator listSeparator
) | 29 CSSValueList::CSSValueList(ClassType classType, ValueListSeparator listSeparator
) |
| 30 : CSSValue(classType) | 30 : CSSValueObject(classType) |
| 31 { | 31 { |
| 32 m_valueListSeparator = listSeparator; | 32 m_valueListSeparator = listSeparator; |
| 33 } | 33 } |
| 34 | 34 |
| 35 CSSValueList::CSSValueList(ValueListSeparator listSeparator) | 35 CSSValueList::CSSValueList(ValueListSeparator listSeparator) |
| 36 : CSSValue(ValueListClass) | 36 : CSSValueObject(ValueListClass) |
| 37 { | 37 { |
| 38 m_valueListSeparator = listSeparator; | 38 m_valueListSeparator = listSeparator; |
| 39 } | 39 } |
| 40 | 40 |
| 41 bool CSSValueList::removeAll(CSSValue* val) | 41 bool CSSValueList::removeAll(CSSValue val) |
| 42 { | 42 { |
| 43 bool found = false; | 43 bool found = false; |
| 44 for (size_t index = 0; index < m_values.size(); index++) { | 44 for (size_t index = 0; index < m_values.size(); index++) { |
| 45 RefPtrWillBeMember<CSSValue>& value = m_values.at(index); | 45 CSSValue& value = m_values.at(index); |
| 46 if (value && val && value->equals(*val)) { | 46 if (value.equals(val)) { |
| 47 m_values.remove(index); | 47 m_values.remove(index); |
| 48 found = true; | 48 found = true; |
| 49 } | 49 } |
| 50 } | 50 } |
| 51 | 51 |
| 52 return found; | 52 return found; |
| 53 } | 53 } |
| 54 | 54 |
| 55 bool CSSValueList::hasValue(CSSValue* val) const | 55 bool CSSValueList::hasValue(CSSValue val) const |
| 56 { | 56 { |
| 57 for (size_t index = 0; index < m_values.size(); index++) { | 57 for (size_t index = 0; index < m_values.size(); index++) { |
| 58 const RefPtrWillBeMember<CSSValue>& value = m_values.at(index); | 58 const CSSValue& value = m_values.at(index); |
| 59 if (value && val && value->equals(*val)) | 59 if (value.equals(val)) |
| 60 return true; | 60 return true; |
| 61 } | 61 } |
| 62 return false; | 62 return false; |
| 63 } | 63 } |
| 64 | 64 |
| 65 PassRefPtrWillBeRawPtr<CSSValueList> CSSValueList::copy() | 65 PassRefPtrWillBeRawPtr<CSSValueList> CSSValueList::copy() |
| 66 { | 66 { |
| 67 RefPtrWillBeRawPtr<CSSValueList> newList = nullptr; | 67 RefPtrWillBeRawPtr<CSSValueList> newList = nullptr; |
| 68 switch (m_valueListSeparator) { | 68 switch (m_valueListSeparator) { |
| 69 case SpaceSeparator: | 69 case SpaceSeparator: |
| (...skipping 28 matching lines...) Expand all Loading... |
| 98 separator = " / "; | 98 separator = " / "; |
| 99 break; | 99 break; |
| 100 default: | 100 default: |
| 101 ASSERT_NOT_REACHED(); | 101 ASSERT_NOT_REACHED(); |
| 102 } | 102 } |
| 103 | 103 |
| 104 unsigned size = m_values.size(); | 104 unsigned size = m_values.size(); |
| 105 for (unsigned i = 0; i < size; i++) { | 105 for (unsigned i = 0; i < size; i++) { |
| 106 if (!result.isEmpty()) | 106 if (!result.isEmpty()) |
| 107 result.append(separator); | 107 result.append(separator); |
| 108 result.append(m_values[i]->cssText()); | 108 result.append(m_values[i].cssText()); |
| 109 } | 109 } |
| 110 | 110 |
| 111 return result.toString(); | 111 return result.toString(); |
| 112 } | 112 } |
| 113 | 113 |
| 114 bool CSSValueList::equals(const CSSValueList& other) const | 114 bool CSSValueList::equals(const CSSValueList& other) const |
| 115 { | 115 { |
| 116 return m_valueListSeparator == other.m_valueListSeparator && compareCSSValue
Vector(m_values, other.m_values); | 116 return m_valueListSeparator == other.m_valueListSeparator && compareCSSValue
Vector(m_values, other.m_values); |
| 117 } | 117 } |
| 118 | 118 |
| 119 bool CSSValueList::hasFailedOrCanceledSubresources() const | 119 bool CSSValueList::hasFailedOrCanceledSubresources() const |
| 120 { | 120 { |
| 121 for (unsigned i = 0; i < m_values.size(); ++i) { | 121 for (unsigned i = 0; i < m_values.size(); ++i) { |
| 122 if (m_values[i]->hasFailedOrCanceledSubresources()) | 122 if (m_values[i].hasFailedOrCanceledSubresources()) |
| 123 return true; | 123 return true; |
| 124 } | 124 } |
| 125 return false; | 125 return false; |
| 126 } | 126 } |
| 127 | 127 |
| 128 DEFINE_TRACE_AFTER_DISPATCH(CSSValueList) | 128 DEFINE_TRACE_AFTER_DISPATCH(CSSValueList) |
| 129 { | 129 { |
| 130 visitor->trace(m_values); | 130 for (unsigned i = 0; i < m_values.size(); ++i) { |
| 131 CSSValue::traceAfterDispatch(visitor); | 131 visitor->trace(m_values[i]); |
| 132 } |
| 133 CSSValueObject::traceAfterDispatch(visitor); |
| 132 } | 134 } |
| 133 | 135 |
| 134 } // namespace blink | 136 } // namespace blink |
| OLD | NEW |