Move attributes-related methods from ElementData to AttributeCollection

Source/core/dom/Element.h

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2001 Peter Kelly (pmk@post.com)
  *           (C) 2001 Dirk Mueller (mueller@kde.org)
  * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2013 Apple Inc. 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
@@ skipping 157 matching lines @@
     // so this function is not suitable for non-style uses.
     const AtomicString& idForStyleResolution() const;
 
     // Internal methods that assume the existence of attribute storage, one should use hasAttributes()
     // before calling them. This is not a trivial getter and its return value should be cached for
     // performance.
     AttributeCollection attributes() const { return elementData()->attributes(); }
     size_t attributeCount() const;
     const Attribute& attributeAt(unsigned index) const;
     const Attribute* findAttributeByName(const QualifiedName&) const;
-    size_t findAttributeIndexByName(const QualifiedName& name) const { return elementData()->findAttributeIndexByName(name); }
-    size_t findAttributeIndexByName(const AtomicString& name, bool shouldIgnoreAttributeCase) const { return elementData()->findAttributeIndexByName(name, shouldIgnoreAttributeCase); }
+    size_t findAttributeIndexByName(const QualifiedName& name) const { return elementData()->attributes().findIndex(name); }
+    size_t findAttributeIndexByName(const AtomicString& name, bool shouldIgnoreAttributeCase) const { return elementData()->attributes().findIndex(name, shouldIgnoreAttributeCase); }
 
     void scrollIntoView(bool alignToTop = true);
     void scrollIntoViewIfNeeded(bool centerIfNeeded = true);
 
     void scrollByLines(int lines);
     void scrollByPages(int pages);
 
     int offsetLeft();
     int offsetTop();
     int offsetWidth();
@@ skipping 520 matching lines @@
     ASSERT(fastAttributeLookupAllowed(name));
     if (elementData()) {
         if (const Attribute* attribute = findAttributeByName(name))
             return attribute->value();
     }
     return nullAtom;
 }
 
 inline bool Element::hasAttributesWithoutUpdate() const
 {
-    return elementData() && elementData()->hasAttributes();
+    return elementData() && !elementData()->attributes().isEmpty();
 }
 
 inline const AtomicString& Element::idForStyleResolution() const
 {
     ASSERT(hasID());
     return elementData()->idForStyleResolution();
 }
 
 inline bool Element::isIdAttributeName(const QualifiedName& attributeName) const
 {
@@ skipping 31 matching lines @@
 inline const SpaceSplitString& Element::classNames() const
 {
     ASSERT(hasClass());
     ASSERT(elementData());
     return elementData()->classNames();
 }
 
 inline size_t Element::attributeCount() const
 {
     ASSERT(elementData());
-    return elementData()->attributeCount();
+    return elementData()->attributes().size();
 }
 
 inline const Attribute& Element::attributeAt(unsigned index) const
 {
     ASSERT(elementData());
-    return elementData()->attributeAt(index);
+    return elementData()->attributes()[index];
 }
 
 inline const Attribute* Element::findAttributeByName(const QualifiedName& name) const
 {
     ASSERT(elementData());
-    return elementData()->findAttributeByName(name);
+    return elementData()->attributes().find(name);
 }
 
 inline bool Element::hasID() const
 {
     return elementData() && elementData()->hasID();
 }
 
 inline bool Element::hasClass() const
 {
     return elementData() && elementData()->hasClass();
@@ skipping 89 matching lines @@
     static PassRefPtrWillBeRawPtr<T> create(const QualifiedName&, Document&)
 #define DEFINE_ELEMENT_FACTORY_WITH_TAGNAME(T) \
     PassRefPtrWillBeRawPtr<T> T::create(const QualifiedName& tagName, Document& document) \
     { \
         return adoptRefWillBeNoop(new T(tagName, document)); \
     }
 
 } // namespace
 
 #endif