Have ElementTraversal::firstWithin() take a reference

Source/core/html/HTMLFieldSetElement.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2001 Dirk Mueller (mueller@kde.org)
  * Copyright (C) 2004, 2005, 2006, 2010 Apple Inc. All rights reserved.
  *           (C) 2006 Alexey Proskuryakov (ap@nypop.com)
  *
  * 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 31 matching lines @@
     , m_documentVersion(0)
 {
     ScriptWrappable::init(this);
 }
 
 PassRefPtr<HTMLFieldSetElement> HTMLFieldSetElement::create(Document& document, HTMLFormElement* form)
 {
     return adoptRef(new HTMLFieldSetElement(document, form));
 }
 
-void HTMLFieldSetElement::invalidateDisabledStateUnder(Element* base)
+void HTMLFieldSetElement::invalidateDisabledStateUnder(Element& base)
 {
-    for (Element* element = ElementTraversal::firstWithin(base); element; element = ElementTraversal::next(*element, base)) {
+    for (Element* element = ElementTraversal::firstWithin(base); element; element = ElementTraversal::next(*element, &base)) {
         if (element->isFormControlElement())
             toHTMLFormControlElement(element)->ancestorDisabledStateWasChanged();
     }
 }
 
 void HTMLFieldSetElement::disabledAttributeChanged()
 {
     // This element must be updated before the style of nodes in its subtree gets recalculated.
     HTMLFormControlElement::disabledAttributeChanged();
-    invalidateDisabledStateUnder(this);
+    invalidateDisabledStateUnder(*this);
 }
 
 void HTMLFieldSetElement::childrenChanged(bool changedByParser, Node* beforeChange, Node* afterChange, int childCountDelta)
 {
     HTMLFormControlElement::childrenChanged(changedByParser, beforeChange, afterChange, childCountDelta);
-    for (Element* element = ElementTraversal::firstWithin(this); element; element = ElementTraversal::nextSkippingChildren(*element, this)) {
+    for (Element* element = ElementTraversal::firstWithin(*this); element; element = ElementTraversal::nextSkippingChildren(*element, this)) {
         if (element->hasTagName(legendTag))
-            invalidateDisabledStateUnder(element);
+            invalidateDisabledStateUnder(*element);
     }
 }
 
 bool HTMLFieldSetElement::supportsFocus() const
 {
     return HTMLElement::supportsFocus();
 }
 
 const AtomicString& HTMLFieldSetElement::formControlType() const
 {
     DEFINE_STATIC_LOCAL(const AtomicString, fieldset, ("fieldset", AtomicString::ConstructFromLiteral));
     return fieldset;
 }
 
 RenderObject* HTMLFieldSetElement::createRenderer(RenderStyle*)
 {
     return new RenderFieldset(this);
 }
 
 HTMLLegendElement* HTMLFieldSetElement::legend() const
 {
-    for (Element* child = ElementTraversal::firstWithin(this); child; child = ElementTraversal::nextSkippingChildren(*child, this)) {
+    for (Element* child = ElementTraversal::firstWithin(*this); child; child = ElementTraversal::nextSkippingChildren(*child, this)) {
         if (child->hasTagName(legendTag))
             return toHTMLLegendElement(child);
     }
     return 0;
 }
 
 PassRefPtr<HTMLCollection> HTMLFieldSetElement::elements()
 {
     return ensureCachedHTMLCollection(FormControls);
 }
 
 void HTMLFieldSetElement::refreshElementsIfNeeded() const
 {
     uint64_t docVersion = document().domTreeVersion();
     if (m_documentVersion == docVersion)
         return;
 
     m_documentVersion = docVersion;
 
     m_associatedElements.clear();
 
-    for (Element* element = ElementTraversal::firstWithin(this); element; element = ElementTraversal::next(*element, this)) {
+    for (Element* element = ElementTraversal::firstWithin(*this); element; element = ElementTraversal::next(*element, this)) {
         if (element->hasTagName(objectTag)) {
             m_associatedElements.append(toHTMLObjectElement(element));
             continue;
         }
 
         if (!element->isFormControlElement())
             continue;
 
         m_associatedElements.append(toHTMLFormControlElement(element));
     }
 }
 
 const Vector<FormAssociatedElement*>& HTMLFieldSetElement::associatedElements() const
 {
     refreshElementsIfNeeded();
     return m_associatedElements;
 }
 
 unsigned HTMLFieldSetElement::length() const
 {
     refreshElementsIfNeeded();
     unsigned len = 0;
     for (unsigned i = 0; i < m_associatedElements.size(); ++i)
         if (m_associatedElements[i]->isEnumeratable())
             ++len;
     return len;
 }
 
 } // namespace