Have LiveNodeListBase::ownerNode() return a reference

Source/core/html/HTMLFormControlsCollection.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2010, 2011, 2012 Apple Inc. All rights reserved.
  * Copyright (C) 2014 Samsung Electronics. 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
  * version 2 of the License, or (at your option) any later version.
@@ skipping 40 matching lines @@
 {
     return adoptRef(new HTMLFormControlsCollection(ownerNode));
 }
 
 HTMLFormControlsCollection::~HTMLFormControlsCollection()
 {
 }
 
 const Vector<FormAssociatedElement*>& HTMLFormControlsCollection::formControlElements() const
 {
-    ASSERT(ownerNode());
-    ASSERT(ownerNode()->hasTagName(formTag) || ownerNode()->hasTagName(fieldsetTag));
-    if (ownerNode()->hasTagName(formTag))
-        return toHTMLFormElement(ownerNode())->associatedElements();
-    return toHTMLFieldSetElement(ownerNode())->associatedElements();
+    ASSERT(ownerNode().hasTagName(formTag) || ownerNode().hasTagName(fieldsetTag));
+    if (ownerNode().hasTagName(formTag))
+        return toHTMLFormElement(ownerNode()).associatedElements();
+    return toHTMLFieldSetElement(ownerNode()).associatedElements();
 }
 
 const Vector<HTMLImageElement*>& HTMLFormControlsCollection::formImageElements() const
 {
-    ASSERT(ownerNode());
-    return toHTMLFormElement(ownerNode())->imageElements();
+    return toHTMLFormElement(ownerNode()).imageElements();
 }
 
 static unsigned findFormAssociatedElement(const Vector<FormAssociatedElement*>& associatedElements, Element* element)
 {
     unsigned i = 0;
     for (; i < associatedElements.size(); ++i) {
         FormAssociatedElement* associatedElement = associatedElements[i];
         if (associatedElement->isEnumeratable() && toHTMLElement(associatedElement) == element)
             break;
     }
@@ skipping 54 matching lines @@
     return 0;
 }
 
 Element* HTMLFormControlsCollection::namedItem(const AtomicString& name) const
 {
     // http://msdn.microsoft.com/workshop/author/dhtml/reference/methods/nameditem.asp
     // This method first searches for an object with a matching id
     // attribute. If a match is not found, the method then searches for an
     // object with a matching name attribute, but only on those elements
     // that are allowed a name attribute.
-    const Vector<HTMLImageElement*>* imagesElements = ownerNode()->hasTagName(fieldsetTag) ? 0 : &formImageElements();
+    const Vector<HTMLImageElement*>* imagesElements = ownerNode().hasTagName(fieldsetTag) ? 0 : &formImageElements();
     if (HTMLElement* item = firstNamedItem(formControlElements(), imagesElements, idAttr, name))
         return item;
 
     return firstNamedItem(formControlElements(), imagesElements, nameAttr, name);
 }
 
 void HTMLFormControlsCollection::updateIdNameCache() const
 {
     if (hasValidIdNameCache())
         return;
@@ skipping 12 matching lines @@
                 appendIdCache(idAttrVal, element);
                 foundInputElements.add(idAttrVal.impl());
             }
             if (!nameAttrVal.isEmpty() && idAttrVal != nameAttrVal) {
                 appendNameCache(nameAttrVal, element);
                 foundInputElements.add(nameAttrVal.impl());
             }
         }
     }
 
-    if (ownerNode()->hasTagName(formTag)) {
+    if (ownerNode().hasTagName(formTag)) {
         const Vector<HTMLImageElement*>& imageElementsArray = formImageElements();
         for (unsigned i = 0; i < imageElementsArray.size(); ++i) {
             HTMLImageElement* element = imageElementsArray[i];
             const AtomicString& idAttrVal = element->getIdAttribute();
             const AtomicString& nameAttrVal = element->getNameAttribute();
             if (!idAttrVal.isEmpty() && !foundInputElements.contains(idAttrVal.impl()))
                 appendIdCache(idAttrVal, element);
             if (!nameAttrVal.isEmpty() && idAttrVal != nameAttrVal && !foundInputElements.contains(nameAttrVal.impl()))
                 appendNameCache(nameAttrVal, element);
         }
@@ skipping 10 matching lines @@
     if (namedItems.isEmpty())
         return;
 
     if (namedItems.size() == 1) {
         elementEnabled = true;
         element = namedItems.first();
         return;
     }
 
     radioNodeListEnabled = true;
-    radioNodeList = ownerNode()->radioNodeList(name);
+    radioNodeList = ownerNode().radioNodeList(name);
 }
 
 void HTMLFormControlsCollection::supportedPropertyNames(Vector<String>& names)
 {
     // http://www.whatwg.org/specs/web-apps/current-work/multipage/common-dom-interfaces.html#htmlformcontrolscollection-0:
     // The supported property names consist of the non-empty values of all the id and name attributes
     // of all the elements represented by the collection, in tree order, ignoring later duplicates,
     // with the id of an element preceding its name if it contributes both, they differ from each
     // other, and neither is the duplicate of an earlier entry.
     HashSet<AtomicString> existingNames;
@@ skipping 10 matching lines @@
         const AtomicString& nameAttribute = element->getNameAttribute();
         if (!nameAttribute.isEmpty()) {
             HashSet<AtomicString>::AddResult addResult = existingNames.add(nameAttribute);
             if (addResult.isNewEntry)
                 names.append(nameAttribute);
         }
     }
 }
 
 }