Move attributes-related methods from ElementData to AttributeCollection

Source/core/dom/ElementData.cpp

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 52 matching lines @@
     : m_isUnique(false)
     , m_arraySize(arraySize)
     , m_presentationAttributeStyleIsDirty(false)
     , m_styleAttributeIsDirty(false)
     , m_animatedSVGAttributesAreDirty(false)
 {
 }
 
 ElementData::ElementData(const ElementData& other, bool isUnique)
     : m_isUnique(isUnique)
-    , m_arraySize(isUnique ? 0 : other.attributeCount())
+    , m_arraySize(isUnique ? 0 : other.attributes().size())
     , m_presentationAttributeStyleIsDirty(other.m_presentationAttributeStyleIsDirty)
     , m_styleAttributeIsDirty(other.m_styleAttributeIsDirty)
     , m_animatedSVGAttributesAreDirty(other.m_animatedSVGAttributesAreDirty)
     , m_classNames(other.m_classNames)
     , m_idForStyleResolution(other.m_idForStyleResolution)
 {
     // NOTE: The inline style is copied by the subclass copy constructor since we don't know what to do with it here.
 }
 
 #if ENABLE(OILPAN)
@@ skipping 16 matching lines @@
 
 PassRefPtrWillBeRawPtr<UniqueElementData> ElementData::makeUniqueCopy() const
 {
     if (isUnique())
         return adoptRefWillBeNoop(new UniqueElementData(static_cast<const UniqueElementData&>(*this)));
     return adoptRefWillBeNoop(new UniqueElementData(static_cast<const ShareableElementData&>(*this)));
 }
 
 bool ElementData::isEquivalent(const ElementData* other) const
 {
+    AttributeCollection attributes = this->attributes();
     if (!other)
-        return !hasAttributes();
+        return attributes.isEmpty();
 
-    AttributeCollection attributes = this->attributes();
-    if (attributes.size() != other->attributeCount())
+    AttributeCollection otherAttributes = other->attributes();
+    if (attributes.size() != otherAttributes.size())
         return false;
 
     AttributeCollection::const_iterator end = attributes.end();
     for (AttributeCollection::const_iterator it = attributes.begin(); it != end; ++it) {
-        const Attribute* otherAttr = other->findAttributeByName(it->name());
+        const Attribute* otherAttr = otherAttributes.get(it->name());
         if (!otherAttr || it->value() != otherAttr->value())
             return false;
     }
     return true;
 }
 
-size_t ElementData::findAttrNodeIndex(Attr* attr) const
+size_t AttributeCollection::find(Attr* attr) const
 {
     // This relies on the fact that Attr's QualifiedName == the Attribute's name.
-    AttributeCollection attributes = this->attributes();
-    AttributeCollection::const_iterator end = attributes.end();
+    const_iterator end = this->end();
     unsigned index = 0;
-    for (AttributeCollection::const_iterator it = attributes.begin(); it != end; ++it, ++index) {
+    for (const_iterator it = begin(); it != end; ++it, ++index) {
         if (it->name() == attr->qualifiedName())
             return index;
     }
     return kNotFound;
 }
 
-size_t ElementData::findAttributeIndexByNameSlowCase(const AtomicString& name, bool shouldIgnoreAttributeCase) const
+size_t AttributeCollection::findSlowCase(const AtomicString& name, bool shouldIgnoreAttributeCase) const
 {
     // Continue to checking case-insensitively and/or full namespaced names if necessary:
-    AttributeCollection attributes = this->attributes();
-    AttributeCollection::const_iterator end = attributes.end();
+    const_iterator end = this->end();
     unsigned index = 0;
-    for (AttributeCollection::const_iterator it = attributes.begin(); it != end; ++it, ++index) {
+    for (const_iterator it = begin(); it != end; ++it, ++index) {
         // FIXME: Why check the prefix? Namespace is all that should matter
         // and all HTML/SVG attributes have a null namespace!
         if (!it->name().hasPrefix()) {
             if (shouldIgnoreAttributeCase && equalIgnoringCase(name, it->localName()))
                 return index;
         } else {
             // FIXME: Would be faster to do this comparison without calling toString, which
             // generates a temporary string by concatenation. But this branch is only reached
             // if the attribute name has a prefix, which is rare in HTML.
             if (equalPossiblyIgnoringCase(name, it->name().toString(), shouldIgnoreAttributeCase))
@@ skipping 64 matching lines @@
     m_inlineStyle = other.m_inlineStyle ? other.m_inlineStyle->mutableCopy() : nullptr;
 }
 
 UniqueElementData::UniqueElementData(const ShareableElementData& other)
     : ElementData(other, true)
 {
     // An ShareableElementData should never have a mutable inline StylePropertySet attached.
     ASSERT(!other.m_inlineStyle || !other.m_inlineStyle->isMutable());
     m_inlineStyle = other.m_inlineStyle;
 
-    unsigned length = other.attributeCount();
+    unsigned length = other.attributes().size();
     m_attributeVector.reserveCapacity(length);
     for (unsigned i = 0; i < length; ++i)
         m_attributeVector.uncheckedAppend(other.m_attributeArray[i]);
 }
 
 PassRefPtrWillBeRawPtr<UniqueElementData> UniqueElementData::create()
 {
     return adoptRefWillBeNoop(new UniqueElementData);
 }
 
@@ skipping 17 matching lines @@
     return 0;
 }
 
 void UniqueElementData::traceAfterDispatch(Visitor* visitor)
 {
     visitor->trace(m_presentationAttributeStyle);
     ElementData::traceAfterDispatch(visitor);
 }
 
 } // namespace WebCore