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

third_party/WebKit/Source/core/html/HTMLCollection.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  * Copyright (C) 2003-2008, 2011, 2012, 2014 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 12 matching lines @@
 
 #include "core/html/HTMLCollection.h"
 
 #include "core/HTMLNames.h"
 #include "core/dom/ClassCollection.h"
 #include "core/dom/ElementTraversal.h"
 #include "core/dom/NodeRareData.h"
 #include "core/html/DocumentNameCollection.h"
 #include "core/html/HTMLDataListOptionsCollection.h"
 #include "core/html/HTMLElement.h"
+#include "core/html/HTMLFormControlElement.h"
 #include "core/html/HTMLObjectElement.h"
 #include "core/html/HTMLOptionElement.h"
 #include "core/html/HTMLOptionsCollection.h"
 #include "core/html/HTMLTagCollection.h"
 #include "core/html/WindowNameCollection.h"
 #include "wtf/HashSet.h"
 
 namespace blink {
 
 using namespace HTMLNames;
@@ skipping 28 matching lines @@
     case NameNodeListType:
     case RadioNodeListType:
     case RadioImgNodeListType:
     case LabelsNodeListType:
       break;
   }
   NOTREACHED();
   return false;
 }
 
-static NodeListRootType rootTypeFromCollectionType(CollectionType type) {
+static NodeListRootType rootTypeFromCollectionType(const ContainerNode& owner,
+                                                   CollectionType type) {
   switch (type) {
     case DocImages:
     case DocApplets:
     case DocEmbeds:
     case DocForms:
     case DocLinks:
     case DocAnchors:
     case DocScripts:
     case DocAll:
     case WindowNamedItems:
     case DocumentNamedItems:
-    case FormControls:
       return NodeListRootType::TreeScope;
     case ClassCollectionType:
     case TagCollectionType:
     case HTMLTagCollectionType:
     case NodeChildren:
     case TableTBodies:
     case TSectionRows:
     case TableRows:
     case TRCells:
     case SelectOptions:
     case SelectedOptions:
     case DataListOptions:
     case MapAreas:
       return NodeListRootType::Node;
+    case FormControls:
+      if (isHTMLFieldSetElement(owner))
+        return NodeListRootType::Node;
+      DCHECK(isHTMLFormElement(owner));
+      return NodeListRootType::TreeScope;
     case NameNodeListType:
     case RadioNodeListType:
     case RadioImgNodeListType:
     case LabelsNodeListType:
       break;
   }
   NOTREACHED();
   return NodeListRootType::Node;
 }
 
@@ skipping 39 matching lines @@
       break;
   }
   NOTREACHED();
   return DoNotInvalidateOnAttributeChanges;
 }
 
 HTMLCollection::HTMLCollection(ContainerNode& ownerNode,
                                CollectionType type,
                                ItemAfterOverrideType itemAfterOverrideType)
     : LiveNodeListBase(ownerNode,
-                       rootTypeFromCollectionType(type),
+                       rootTypeFromCollectionType(ownerNode, type),
                        invalidationTypeExcludingIdAndNameAttributes(type),
                        type),
       m_overridesItemAfter(itemAfterOverrideType == OverridesItemAfter),
       m_shouldOnlyIncludeDirectChildren(
           shouldTypeOnlyIncludeDirectChildren(type)) {
   // Keep this in the child class because |registerNodeList| requires wrapper
   // tracing and potentially calls virtual methods which is not allowed in a
   // base class constructor.
   document().registerNodeList(this);
 }
@@ skipping 48 matching lines @@
     case DocApplets:
       return isHTMLObjectElement(element) &&
              toHTMLObjectElement(element).containsJavaApplet();
     case DocEmbeds:
       return element.hasTagName(embedTag);
     case DocLinks:
       return (element.hasTagName(aTag) || element.hasTagName(areaTag)) &&
              element.fastHasAttribute(hrefAttr);
     case DocAnchors:
       return element.hasTagName(aTag) && element.fastHasAttribute(nameAttr);
+

[kochi, 2016/12/02 09:15:19]

nit: no empty lines on L242 & L246?  (following the convention in this block)

[tkent, 2016/12/02 13:09:23]

Done.

+    case FormControls:
+      DCHECK(isHTMLFieldSetElement(htmlCollection.ownerNode()));
+      return isHTMLObjectElement(element) || isHTMLFormControlElement(element);
+
     case ClassCollectionType:
     case TagCollectionType:
     case HTMLTagCollectionType:
     case DocAll:
     case NodeChildren:
-    case FormControls:
     case TableRows:
     case WindowNamedItems:
     case NameNodeListType:
     case RadioNodeListType:
     case RadioImgNodeListType:
     case LabelsNodeListType:
       NOTREACHED();
   }
   return false;
 }
@@ skipping 264 matching lines @@
 
 HTMLCollection::NamedItemCache::NamedItemCache() {}
 
 DEFINE_TRACE(HTMLCollection) {
   visitor->trace(m_namedItemCache);
   visitor->trace(m_collectionItemsCache);
   LiveNodeListBase::trace(visitor);
 }
 
 }  // namespace blink