| Index: Source/core/html/HTMLFormElement.cpp
|
| diff --git a/Source/core/html/HTMLFormElement.cpp b/Source/core/html/HTMLFormElement.cpp
|
| index ae110acc3f4f2d73c57fcce4d1083d39e5bf86f5..2ec0ca1a0223533f4545786a58431ce6d236eab7 100644
|
| --- a/Source/core/html/HTMLFormElement.cpp
|
| +++ b/Source/core/html/HTMLFormElement.cpp
|
| @@ -612,12 +612,12 @@ PassRefPtrWillBeRawPtr<HTMLFormControlsCollection> HTMLFormElement::elements()
|
| void HTMLFormElement::collectAssociatedElements(Node& root, FormAssociatedElement::List& elements) const
|
| {
|
| elements.clear();
|
| - for (HTMLElement* element = Traversal<HTMLElement>::firstWithin(root); element; element = Traversal<HTMLElement>::next(*element)) {
|
| + for (HTMLElement& element : Traversal<HTMLElement>::from(root)) {
|
| FormAssociatedElement* associatedElement = 0;
|
| - if (element->isFormControlElement())
|
| - associatedElement = toHTMLFormControlElement(element);
|
| - else if (isHTMLObjectElement(*element))
|
| - associatedElement = toHTMLObjectElement(element);
|
| + if (element.isFormControlElement())
|
| + associatedElement = toHTMLFormControlElement(&element);
|
| + else if (isHTMLObjectElement(element))
|
| + associatedElement = toHTMLObjectElement(&element);
|
| else
|
| continue;
|
| if (associatedElement->form()== this)
|
| @@ -646,9 +646,9 @@ const FormAssociatedElement::List& HTMLFormElement::associatedElements() const
|
| void HTMLFormElement::collectImageElements(Node& root, WillBeHeapVector<RawPtrWillBeMember<HTMLImageElement> >& elements)
|
| {
|
| elements.clear();
|
| - for (HTMLImageElement* image = Traversal<HTMLImageElement>::firstWithin(root); image; image = Traversal<HTMLImageElement>::next(*image)) {
|
| - if (image->formOwner() == this)
|
| - elements.append(image);
|
| + for (HTMLImageElement& image : Traversal<HTMLImageElement>::from(root)) {
|
| + if (image.formOwner() == this)
|
| + elements.append(&image);
|
| }
|
| }
|
|
|
|
|