| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2013 Google Inc. All rights reserved. | 2 * Copyright (C) 2013 Google Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * This library is free software; you can redistribute it and/or | 4 * This library is free software; you can redistribute it and/or |
| 5 * modify it under the terms of the GNU Library General Public | 5 * modify it under the terms of the GNU Library General Public |
| 6 * License as published by the Free Software Foundation; either | 6 * License as published by the Free Software Foundation; either |
| 7 * version 2 of the License, or (at your option) any later version. | 7 * version 2 of the License, or (at your option) any later version. |
| 8 * | 8 * |
| 9 * This library is distributed in the hope that it will be useful, | 9 * This library is distributed in the hope that it will be useful, |
| 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of | 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
| 11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | 11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
| 12 * Library General Public License for more details. | 12 * Library General Public License for more details. |
| 13 * | 13 * |
| 14 * You should have received a copy of the GNU Library General Public License | 14 * You should have received a copy of the GNU Library General Public License |
| 15 * along with this library; see the file COPYING.LIB. If not, write to | 15 * along with this library; see the file COPYING.LIB. If not, write to |
| 16 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, | 16 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, |
| 17 * Boston, MA 02110-1301, USA. | 17 * Boston, MA 02110-1301, USA. |
| 18 */ | 18 */ |
| 19 | 19 |
| 20 #include "config.h" | 20 #include "config.h" |
| 21 #include "core/css/VariablesIterator.h" | 21 #include "core/css/VariablesIterator.h" |
| 22 | 22 |
| 23 #include "RuntimeEnabledFeatures.h" | 23 #include "RuntimeEnabledFeatures.h" |
| 24 #include "core/css/CSSVariableValue.h" | 24 #include "core/css/CSSVariableValue.h" |
| 25 #include "core/css/StylePropertySet.h" | 25 #include "core/css/StylePropertySet.h" |
| 26 #include "core/dom/Element.h" |
| 26 | 27 |
| 27 namespace WebCore { | 28 namespace WebCore { |
| 28 | 29 |
| 29 PassRefPtr<VariablesIterator> VariablesIterator::create(MutableStylePropertySet*
propertySet) | 30 void AbstractVariablesIterator::initRemainingNames( |
| 31 const StylePropertySet* propertySet) |
| 30 { | 32 { |
| 31 ASSERT(RuntimeEnabledFeatures::cssVariablesEnabled()); | |
| 32 const size_t propertyCount = propertySet->propertyCount(); | 33 const size_t propertyCount = propertySet->propertyCount(); |
| 33 size_t variableCount = 0; | 34 size_t variableCount = 0; |
| 34 Vector<AtomicString> remainingNames(propertyCount); | 35 Vector<AtomicString> remainingNames(propertyCount); |
| 35 for (int i = propertyCount; i--; ) { | 36 for (int i = propertyCount; i--; ) { |
| 36 const StylePropertySet::PropertyReference& property = propertySet->prope
rtyAt(i); | 37 const StylePropertySet::PropertyReference& property = propertySet->prope
rtyAt(i); |
| 37 if (property.id() == CSSPropertyVariable) | 38 if (property.id() == CSSPropertyVariable) |
| 38 remainingNames[variableCount++] = toCSSVariableValue(property.value(
))->name(); | 39 remainingNames[variableCount++] = toCSSVariableValue(property.value(
))->name(); |
| 39 } | 40 } |
| 41 // FIXME: Make use of the Vector move constructor when rvalues are supported
on all platforms. |
| 40 remainingNames.shrink(variableCount); | 42 remainingNames.shrink(variableCount); |
| 41 | 43 |
| 42 RefPtr<VariablesIterator> iterator = adoptRef(new VariablesIterator(property
Set)); | 44 takeRemainingNames(remainingNames); |
| 43 // FIXME: Make use of the Vector move constructor when rvalues are supported
on all platforms. | 45 } |
| 44 iterator->takeRemainingNames(remainingNames); | 46 |
| 45 return iterator.release(); | 47 VariablesIterator::VariablesIterator(MutableStylePropertySet* propertySet) : |
| 48 m_propertySet(propertySet) |
| 49 { |
| 50 ASSERT(RuntimeEnabledFeatures::cssVariablesEnabled()); |
| 51 initRemainingNames(propertySet); |
| 52 } |
| 53 |
| 54 PassRefPtr<VariablesIterator> VariablesIterator::create(MutableStylePropertySet*
propertySet) |
| 55 { |
| 56 return adoptRef(new VariablesIterator(propertySet)); |
| 46 } | 57 } |
| 47 | 58 |
| 48 String AbstractVariablesIterator::value() const | 59 String AbstractVariablesIterator::value() const |
| 49 { | 60 { |
| 50 return propertySet()->variableValue(name()); | 61 return propertySet()->variableValue(name()); |
| 51 } | 62 } |
| 52 | 63 |
| 53 void AbstractVariablesIterator::addedVariable(const AtomicString& name) | 64 void AbstractVariablesIterator::addedVariable(const AtomicString& name) |
| 54 { | 65 { |
| 55 ASSERT(!m_remainingNames.contains(name)); | 66 ASSERT(!m_remainingNames.contains(name)); |
| (...skipping 21 matching lines...) Expand all Loading... |
| 77 { | 88 { |
| 78 if (!atEnd()) | 89 if (!atEnd()) |
| 79 m_remainingNames.removeLast(); | 90 m_remainingNames.removeLast(); |
| 80 if (!m_newNames.isEmpty()) { | 91 if (!m_newNames.isEmpty()) { |
| 81 m_remainingNames.appendVector(m_newNames); | 92 m_remainingNames.appendVector(m_newNames); |
| 82 m_newNames.clear(); | 93 m_newNames.clear(); |
| 83 } | 94 } |
| 84 } | 95 } |
| 85 | 96 |
| 86 } // namespace WebCore | 97 } // namespace WebCore |
| OLD | NEW |