Rename ElementData's attribute related methods for clarity

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.length())
+    , m_arraySize(isUnique ? 0 : other.attributeCount())
     , 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.
 }
 
 void ElementData::destroy()
 {
     if (m_isUnique)
         delete static_cast<UniqueElementData*>(this);
     else
         delete static_cast<ShareableElementData*>(this);
 }
 
 PassRefPtr<UniqueElementData> ElementData::makeUniqueCopy() const
 {
     if (isUnique())
         return adoptRef(new UniqueElementData(static_cast<const UniqueElementData&>(*this)));
     return adoptRef(new UniqueElementData(static_cast<const ShareableElementData&>(*this)));
 }
 
 bool ElementData::isEquivalent(const ElementData* other) const
 {
     if (!other)
-        return isEmpty();
+        return !hasAttributes();
 
     AttributeIteratorAccessor attributes = attributesIterator();
-    if (attributes.size() != other->length())
+    if (attributes.size() != other->attributeCount())
         return false;
 
     AttributeConstIterator end = attributes.end();
     for (AttributeConstIterator it = attributes.begin(); it != end; ++it) {
-        const Attribute* otherAttr = other->getAttributeItem(it->name());
+        const Attribute* otherAttr = other->findAttributeByName(it->name());
         if (!otherAttr || it->value() != otherAttr->value())
             return false;
     }
     return true;
 }
 
-size_t ElementData::getAttrIndex(Attr* attr) const
+size_t ElementData::findAttrNodeIndex(Attr* attr) const
 {
     // This relies on the fact that Attr's QualifiedName == the Attribute's name.
     AttributeIteratorAccessor attributes = attributesIterator();
     AttributeConstIterator end = attributes.end();
     for (AttributeConstIterator it = attributes.begin(); it != end; ++it) {
         if (it->name() == attr->qualifiedName())
             return it.index();
     }
     return kNotFound;
 }
 
-size_t ElementData::getAttributeItemIndexSlowCase(const AtomicString& name, bool shouldIgnoreAttributeCase) const
+size_t ElementData::findAttributeIndexByNameSlowCase(const AtomicString& name, bool shouldIgnoreAttributeCase) const
 {
     // Continue to checking case-insensitively and/or full namespaced names if necessary:
     AttributeIteratorAccessor attributes = attributesIterator();
     AttributeConstIterator end = attributes.end();
     for (AttributeConstIterator it = attributes.begin(); it != end; ++it) {
         // 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 it.index();
@@ skipping 52 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.length();
+    unsigned length = other.attributeCount();
     m_attributeVector.reserveCapacity(length);
     for (unsigned i = 0; i < length; ++i)
         m_attributeVector.uncheckedAppend(other.m_attributeArray[i]);
 }
 
 PassRefPtr<UniqueElementData> UniqueElementData::create()
 {
     return adoptRef(new UniqueElementData);
 }
 
 PassRefPtr<ShareableElementData> UniqueElementData::makeShareableCopy() const
 {
     void* slot = WTF::fastMalloc(sizeForShareableElementDataWithAttributeCount(m_attributeVector.size()));
     return adoptRef(new (slot) ShareableElementData(*this));
 }
 
-Attribute* UniqueElementData::getAttributeItem(const QualifiedName& name)
+Attribute* UniqueElementData::findAttributeByName(const QualifiedName& name)
 {
     unsigned length = m_attributeVector.size();
     for (unsigned i = 0; i < length; ++i) {
         if (m_attributeVector.at(i).name().matches(name))
             return &m_attributeVector.at(i);
     }
     return 0;
 }
 
 } // namespace WebCore