FIELDSET element: |elements| IDL attribute should return an HTMLCollection, not HTMLFormControlsCol…

third_party/WebKit/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.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public License
  * along with this library; see the file COPYING.LIB.  If not, write to
  * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  *
  */
 
 #include "core/html/HTMLFormControlsCollection.h"
 
 #include "bindings/core/v8/RadioNodeListOrElement.h"
 #include "core/HTMLNames.h"
 #include "core/frame/UseCounter.h"
-#include "core/html/HTMLFieldSetElement.h"
 #include "core/html/HTMLFormElement.h"
 #include "core/html/HTMLImageElement.h"
 #include "wtf/HashSet.h"
 
 namespace blink {
 
 using namespace HTMLNames;
 
 // Since the collections are to be "live", we have to do the
 // calculation every time if anything has changed.
 
 HTMLFormControlsCollection::HTMLFormControlsCollection(ContainerNode& ownerNode)
     : HTMLCollection(ownerNode, FormControls, OverridesItemAfter),
       m_cachedElement(nullptr),
       m_cachedElementOffsetInArray(0) {
-  DCHECK(isHTMLFormElement(ownerNode) || isHTMLFieldSetElement(ownerNode));
+  DCHECK(isHTMLFormElement(ownerNode));
 }
 
 HTMLFormControlsCollection* HTMLFormControlsCollection::create(
     ContainerNode& ownerNode,
     CollectionType type) {
   DCHECK_EQ(type, FormControls);
   return new HTMLFormControlsCollection(ownerNode);
 }
 
 HTMLFormControlsCollection::~HTMLFormControlsCollection() {}
 
 const FormAssociatedElement::List&
 HTMLFormControlsCollection::formControlElements() const {
-  DCHECK(isHTMLFormElement(ownerNode()) || isHTMLFieldSetElement(ownerNode()));
-  if (isHTMLFormElement(ownerNode()))
-    return toHTMLFormElement(ownerNode()).associatedElements();
-  return toHTMLFieldSetElement(ownerNode()).associatedElements();
+  return toHTMLFormElement(ownerNode()).associatedElements();
 }
 
 const HeapVector<Member<HTMLImageElement>>&
 HTMLFormControlsCollection::formImageElements() const {
   return toHTMLFormElement(ownerNode()).imageElements();
 }
 
 static unsigned findFormAssociatedElement(
     const FormAssociatedElement::List& associatedElements,
     Element* element) {
@@ skipping 81 matching lines @@
         cache->addElementWithId(idAttrVal, element);
         foundInputElements.add(idAttrVal.impl());
       }
       if (!nameAttrVal.isEmpty() && idAttrVal != nameAttrVal) {
         cache->addElementWithName(nameAttrVal, element);
         foundInputElements.add(nameAttrVal.impl());
       }
     }
   }
 
-  if (isHTMLFormElement(ownerNode())) {
-    // HTMLFormControlsCollection doesn't support named getter for IMG
-    // elements. However we still need to handle IMG elements here because
-    // HTMLFormElement named getter relies on this.
-    const HeapVector<Member<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()))
-        cache->addElementWithId(idAttrVal, element);
-      if (!nameAttrVal.isEmpty() && idAttrVal != nameAttrVal &&
-          !foundInputElements.contains(nameAttrVal.impl()))
-        cache->addElementWithName(nameAttrVal, element);
-    }
+  // HTMLFormControlsCollection doesn't support named getter for IMG
+  // elements. However we still need to handle IMG elements here because
+  // HTMLFormElement named getter relies on this.
+  const HeapVector<Member<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()))
+      cache->addElementWithId(idAttrVal, element);
+    if (!nameAttrVal.isEmpty() && idAttrVal != nameAttrVal &&
+        !foundInputElements.contains(nameAttrVal.impl()))
+      cache->addElementWithName(nameAttrVal, element);
   }
 
   // Set the named item cache last as traversing the tree may cause cache
   // invalidation.
   setNamedItemCache(cache);
 }
 
 void HTMLFormControlsCollection::namedGetter(
     const AtomicString& name,
     RadioNodeListOrElement& returnValue) {
   HeapVector<Member<Element>> namedItems;
   this->namedItems(name, namedItems);
 
   if (namedItems.isEmpty())
     return;
 
   if (namedItems.size() == 1) {
     if (!isHTMLImageElement(*namedItems[0]))
       returnValue.setElement(namedItems.at(0));
     return;
   }
 
   // This path never returns a RadioNodeList for <img> because
   // onlyMatchingImgElements flag is false by default.
   returnValue.setRadioNodeList(ownerNode().radioNodeList(name));
-  if (isHTMLFieldSetElement(ownerNode()))
-    UseCounter::count(
-        document(),
-        UseCounter::FormControlsCollectionReturnsRadioNodeListForFieldSet);
 }
 
 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 17 matching lines @@
     }
   }
 }
 
 DEFINE_TRACE(HTMLFormControlsCollection) {
   visitor->trace(m_cachedElement);
   HTMLCollection::trace(visitor);
 }
 
 }  // namespace blink