Cleanup of blink::HTMLFieldSetElement

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

Index: third_party/WebKit/Source/core/html/HTMLFieldSetElement.cpp
diff --git a/third_party/WebKit/Source/core/html/HTMLFieldSetElement.cpp b/third_party/WebKit/Source/core/html/HTMLFieldSetElement.cpp
index cc31336796d9bc2b4d0117d355e5bf1f7be7b83f..6cfd1bbf73af08255db41480daf398be6c793545 100644
--- a/third_party/WebKit/Source/core/html/HTMLFieldSetElement.cpp
+++ b/third_party/WebKit/Source/core/html/HTMLFieldSetElement.cpp
@@ -28,9 +28,7 @@
 #include "core/dom/ElementTraversal.h"
 #include "core/dom/NodeListsNodeData.h"
 #include "core/html/HTMLCollection.h"
-#include "core/html/HTMLFormControlsCollection.h"
 #include "core/html/HTMLLegendElement.h"
-#include "core/html/HTMLObjectElement.h"
 #include "core/layout/LayoutFieldset.h"
 #include "wtf/StdLibExtras.h"
 
@@ -40,30 +38,23 @@ using namespace HTMLNames;
 
 inline HTMLFieldSetElement::HTMLFieldSetElement(Document& document,
                                                 HTMLFormElement* form)
-    : HTMLFormControlElement(fieldsetTag, document, form),
-      m_documentVersion(0) {}
+    : HTMLFormControlElement(fieldsetTag, document, form) {}
 
 HTMLFieldSetElement* HTMLFieldSetElement::create(Document& document,
                                                  HTMLFormElement* form) {
   return new HTMLFieldSetElement(document, form);
 }
 
-DEFINE_TRACE(HTMLFieldSetElement) {
-  visitor->trace(m_listedElements);
-  HTMLFormControlElement::trace(visitor);
-}
-
 bool HTMLFieldSetElement::matchesValidityPseudoClasses() const {
   return true;
 }
 
 bool HTMLFieldSetElement::isValidElement() {
-  const ListedElement::List& elements = listedElements();
-  for (unsigned i = 0; i < elements.size(); ++i) {
-    if (elements[i]->isFormControlElement()) {
-      HTMLFormControlElement* control =
-          toHTMLFormControlElement(elements[i].get());
-      if (!control->checkValidity(0, CheckValidityDispatchNoEvent))
+  HTMLCollection* elements = this->elements();
+  for (unsigned i = 0; i < elements->length(); ++i) {
+    if (elements->item(i)->isFormControlElement()) {
+      if (!toHTMLFormControlElement(elements->item(i))
+               ->checkValidity(nullptr, CheckValidityDispatchNoEvent))
         return false;
     }
   }
@@ -115,33 +106,6 @@ HTMLCollection* HTMLFieldSetElement::elements() {
   return ensureCachedCollection<HTMLCollection>(FormControls);
 }
 
-void HTMLFieldSetElement::refreshElementsIfNeeded() const {
-  uint64_t docVersion = document().domTreeVersion();
-  if (m_documentVersion == docVersion)
-    return;
-
-  m_documentVersion = docVersion;
-
-  m_listedElements.clear();
-
-  for (HTMLElement& element : Traversal<HTMLElement>::descendantsOf(*this)) {
-    if (isHTMLObjectElement(element)) {
-      m_listedElements.append(toHTMLObjectElement(&element));
-      continue;
-    }
-
-    if (!element.isFormControlElement())
-      continue;
-
-    m_listedElements.append(toHTMLFormControlElement(&element));
-  }
-}
-
-const ListedElement::List& HTMLFieldSetElement::listedElements() const {
-  refreshElementsIfNeeded();
-  return m_listedElements;
-}
-
 int HTMLFieldSetElement::tabIndex() const {
   return HTMLElement::tabIndex();
 }