Index: Source/core/html/HTMLFormControlsCollection.cpp |
diff --git a/Source/core/html/HTMLFormControlsCollection.cpp b/Source/core/html/HTMLFormControlsCollection.cpp |
index 6d431e4dbca6ec7047b691d357399da485e8066a..19c5961f7045f5695f7a75a02e8fc8a505bd66ab 100644 |
--- a/Source/core/html/HTMLFormControlsCollection.cpp |
+++ b/Source/core/html/HTMLFormControlsCollection.cpp |
@@ -56,7 +56,7 @@ HTMLFormControlsCollection::~HTMLFormControlsCollection() |
{ |
} |
-const Vector<FormAssociatedElement*>& HTMLFormControlsCollection::formControlElements() const |
+const FormAssociatedElement::List& HTMLFormControlsCollection::formControlElements() const |
{ |
ASSERT(isHTMLFormElement(ownerNode()) || isHTMLFieldSetElement(ownerNode())); |
if (isHTMLFormElement(ownerNode())) |
@@ -69,7 +69,7 @@ const Vector<HTMLImageElement*>& HTMLFormControlsCollection::formImageElements() |
return toHTMLFormElement(ownerNode()).imageElements(); |
} |
-static unsigned findFormAssociatedElement(const Vector<FormAssociatedElement*>& associatedElements, Element* element) |
+static unsigned findFormAssociatedElement(const FormAssociatedElement::List& associatedElements, Element* element) |
{ |
unsigned i = 0; |
for (; i < associatedElements.size(); ++i) { |
@@ -82,7 +82,7 @@ static unsigned findFormAssociatedElement(const Vector<FormAssociatedElement*>& |
Element* HTMLFormControlsCollection::virtualItemAfter(Element* previous) const |
{ |
- const Vector<FormAssociatedElement*>& associatedElements = formControlElements(); |
+ const FormAssociatedElement::List& associatedElements = formControlElements(); |
unsigned offset; |
if (!previous) |
offset = 0; |
@@ -109,7 +109,7 @@ void HTMLFormControlsCollection::invalidateCache(Document* oldDocument) const |
m_cachedElementOffsetInArray = 0; |
} |
-static HTMLElement* firstNamedItem(const Vector<FormAssociatedElement*>& elementsArray, |
+static HTMLElement* firstNamedItem(const FormAssociatedElement::List& elementsArray, |
const Vector<HTMLImageElement*>* imageElementsArray, const QualifiedName& attrName, const String& name) |
{ |
ASSERT(attrName == idAttr || attrName == nameAttr); |
@@ -156,7 +156,7 @@ void HTMLFormControlsCollection::updateIdNameCache() const |
OwnPtr<NamedItemCache> cache = NamedItemCache::create(); |
HashSet<StringImpl*> foundInputElements; |
- const Vector<FormAssociatedElement*>& elementsArray = formControlElements(); |
+ const FormAssociatedElement::List& elementsArray = formControlElements(); |
for (unsigned i = 0; i < elementsArray.size(); ++i) { |
FormAssociatedElement* associatedElement = elementsArray[i]; |