Have ElementTraversal / NodeTraversal's next() methods take a reference

Source/core/html/FormAssociatedElement.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, 2007 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 117 matching lines @@
 
 void FormAssociatedElement::setForm(HTMLFormElement* newForm)
 {
     if (m_form == newForm)
         return;
     willChangeForm();
     if (m_form)
         m_form->removeFormElement(this);
     m_form = newForm;
     if (m_form)
-        m_form->registerFormElement(this);
+        m_form->registerFormElement(*this);
     didChangeForm();
 }
 
 void FormAssociatedElement::willChangeForm()
 {
 }
 
 void FormAssociatedElement::didChangeForm()
 {
 }
@@ skipping 118 matching lines @@
 {
     const AtomicString& name = toHTMLElement(this)->getNameAttribute();
     return name.isNull() ? emptyAtom : name;
 }
 
 bool FormAssociatedElement::isFormControlElementWithState() const
 {
     return false;
 }
 
+const HTMLElement& toHTMLElement(const FormAssociatedElement& associatedElement)
+{
+    if (associatedElement.isFormControlElement())
+        return toHTMLFormControlElement(associatedElement);
+    // Assumes the element is an HTMLObjectElement
+    return toHTMLObjectElement(associatedElement);
+}
+
 const HTMLElement* toHTMLElement(const FormAssociatedElement* associatedElement)
 {
-    if (associatedElement->isFormControlElement())
-        return toHTMLFormControlElement(associatedElement);
-    // Assumes the element is an HTMLObjectElement
-    return toHTMLObjectElement(associatedElement);
+    ASSERT(associatedElement);
+    return &toHTMLElement(*associatedElement);
 }
 
 HTMLElement* toHTMLElement(FormAssociatedElement* associatedElement)
 {
     return const_cast<HTMLElement*>(toHTMLElement(static_cast<const FormAssociatedElement*>(associatedElement)));
 }
 
+HTMLElement& toHTMLElement(FormAssociatedElement& associatedElement)
+{
+    return const_cast<HTMLElement&>(toHTMLElement(static_cast<const FormAssociatedElement&>(associatedElement)));
+}
+
 PassOwnPtr<FormAttributeTargetObserver> FormAttributeTargetObserver::create(const AtomicString& id, FormAssociatedElement* element)
 {
     return adoptPtr(new FormAttributeTargetObserver(id, element));
 }
 
 FormAttributeTargetObserver::FormAttributeTargetObserver(const AtomicString& id, FormAssociatedElement* element)
     : IdTargetObserver(toHTMLElement(element)->treeScope().idTargetObserverRegistry(), id)
     , m_element(element)
 {
 }
 
 void FormAttributeTargetObserver::idTargetChanged()
 {
     m_element->formAttributeTargetChanged();
 }
 
 } // namespace Webcore