Add forEach() to CSSVariablesMap

Source/core/css/StylePropertySet.cpp

 /*
  * (C) 1999-2003 Lars Knoll (knoll@kde.org)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2012, 2013 Apple Inc. All rights reserved.
  * Copyright (C) 2011 Research In Motion Limited. All rights reserved.
  * Copyright (C) 2013 Intel Corporation. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
@@ skipping 267 matching lines @@
 }
 
 bool MutableStylePropertySet::setVariableValue(const AtomicString& name, const String& value, bool important)
 {
     ASSERT(RuntimeEnabledFeatures::cssVariablesEnabled());
     if (value.isEmpty())
         return removeVariable(name);
 
     size_t index = findVariableIndex(name);
     if (index != notFound) {
-        CSSValue* cssValue = m_propertyVector.at(index).value();
+        const CSSValue* cssValue = m_propertyVector.at(index).value();
         if (toCSSVariableValue(cssValue)->value() == value)
             return false;
     }
 
     CSSProperty property(CSSPropertyVariable, CSSVariableValue::create(name, value), important);
-    if (index == notFound)
+    if (index == notFound) {
         m_propertyVector.append(property);
-    else
-        m_propertyVector.at(index) = property;
-    return true;
+        return true;
+    }
+    m_propertyVector.at(index) = property;
+    return false;
 }
 
 void MutableStylePropertySet::appendPrefixingVariantProperty(const CSSProperty& property)
 {
     m_propertyVector.append(property);
     CSSPropertyID prefixingVariant = prefixingVariantForPropertyId(property.id());
     if (prefixingVariant == property.id())
         return;
 
     m_propertyVector.append(CSSProperty(prefixingVariant, property.value(), property.isImportant(), property.isSetFromShorthand(), getIndexInShorthandVectorForPrefixingVariant(property, prefixingVariant), property.metadata().m_implicit));
@@ skipping 246 matching lines @@
     return true;
 }
 
 bool MutableStylePropertySet::clearVariables()
 {
     ASSERT(RuntimeEnabledFeatures::cssVariablesEnabled());
     CSSPropertyID variablesId = CSSPropertyVariable;
     return removePropertiesInSet(&variablesId, 1);
 }
 
+PassRefPtr<MutableStylePropertySet::VariablesIterator> MutableStylePropertySet::VariablesIterator::create(MutableStylePropertySet* propertySet)
+{
+    ASSERT(RuntimeEnabledFeatures::cssVariablesEnabled());
+    RefPtr<VariablesIterator> iterator = adoptRef(new VariablesIterator(propertySet));

[esprehn, 2013/09/28 00:44:36]

Instead of all this accessing of private vars like m_remainingNames you should
put a Vector on the stack here and then fill it and VariablesIterator's
constructor should take it.

[alancutter (OOO until 2018), 2013/09/30 02:54:52]

Done.

+    const size_t propertyCount = propertySet->propertyCount();
+    size_t variableCount = 0;
+    iterator->m_remainingNames.resize(propertyCount);
+    for (int i = propertyCount; i--;) {

[esprehn, 2013/09/28 00:44:36]

missing space after ;

[alancutter (OOO until 2018), 2013/09/30 02:54:52]

Done.

+        const PropertyReference& property = propertySet->propertyAt(i);
+        if (property.id() == CSSPropertyVariable)
+            iterator->m_remainingNames[variableCount++] = toCSSVariableValue(property.value())->name();
+    }
+    iterator->m_remainingNames.shrink(variableCount);
+
+    return iterator.release();
+}
+
+void MutableStylePropertySet::VariablesIterator::addedVariable(const AtomicString& name)
+{
+    ASSERT(!m_remainingNames.contains(name));
+    ASSERT(!m_newNames.contains(name));
+    m_newNames.append(name);
+}
+
+void MutableStylePropertySet::VariablesIterator::removedVariable(const AtomicString& name)
+{
+    size_t index = m_remainingNames.find(name);
+    if (index != notFound)
+        m_remainingNames.remove(index);
+    index = m_newNames.find(name);
+    if (index != notFound)
+        m_newNames.remove(index);
+}
+
+void MutableStylePropertySet::VariablesIterator::clearedVariables()
+{
+    m_remainingNames.clear();
+    m_newNames.clear();
+}
+
+void MutableStylePropertySet::VariablesIterator::advance()
+{
+    if (!atEnd())
+        m_remainingNames.removeLast();
+    if (!m_newNames.isEmpty()) {
+        m_remainingNames.appendVector(m_newNames);
+        m_newNames.clear();
+    }
+}
+
 PassRefPtr<MutableStylePropertySet> StylePropertySet::mutableCopy() const
 {
     return adoptRef(new MutableStylePropertySet(*this));
 }
 
 PassRefPtr<MutableStylePropertySet> StylePropertySet::copyPropertiesInSet(const Vector<CSSPropertyID>& properties) const
 {
     Vector<CSSProperty, 256> list;
     list.reserveInitialCapacity(properties.size());
     for (unsigned i = 0; i < properties.size(); ++i) {
@@ skipping 76 matching lines @@
     result.appendLiteral(": ");
     result.append(propertyValue()->cssText());
     if (isImportant())
         result.appendLiteral(" !important");
     result.append(';');
     return result.toString();
 }
 
 
 } // namespace WebCore