Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(650)

Unified Diff: Source/core/dom/ElementData.cpp

Issue 313973003: Rename ElementData's attribute related methods for clarity (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/dom/ElementData.h ('k') | Source/core/dom/ElementDataCache.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/dom/ElementData.cpp
diff --git a/Source/core/dom/ElementData.cpp b/Source/core/dom/ElementData.cpp
index 4d68d1e5a755bedb0f5ad55c4ac0c54695bef503..a677daeab7c2c99f5c4a30433989dc80fd7bc181 100644
--- a/Source/core/dom/ElementData.cpp
+++ b/Source/core/dom/ElementData.cpp
@@ -70,7 +70,7 @@ ElementData::ElementData(unsigned arraySize)
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)
@@ -98,22 +98,22 @@ PassRefPtr<UniqueElementData> ElementData::makeUniqueCopy() const
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();
@@ -125,7 +125,7 @@ size_t ElementData::getAttrIndex(Attr* attr) const
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();
@@ -198,7 +198,7 @@ UniqueElementData::UniqueElementData(const ShareableElementData& other)
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]);
@@ -215,7 +215,7 @@ PassRefPtr<ShareableElementData> UniqueElementData::makeShareableCopy() const
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) {
« no previous file with comments | « Source/core/dom/ElementData.h ('k') | Source/core/dom/ElementDataCache.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698