Revert of Correctly compute parent of AXMenuListOption (patchset #8 id:160001 of https://codereview…

third_party/WebKit/Source/modules/accessibility/AXMenuListOption.cpp

Index: third_party/WebKit/Source/modules/accessibility/AXMenuListOption.cpp
diff --git a/third_party/WebKit/Source/modules/accessibility/AXMenuListOption.cpp b/third_party/WebKit/Source/modules/accessibility/AXMenuListOption.cpp
index c59a31d2fb5dd842be1ebb5f6013d392ad683d22..db27248dfeec9904266e0b304201c2089fb57e33 100644
--- a/third_party/WebKit/Source/modules/accessibility/AXMenuListOption.cpp
+++ b/third_party/WebKit/Source/modules/accessibility/AXMenuListOption.cpp
@@ -26,7 +26,6 @@
 #include "modules/accessibility/AXMenuListOption.h"
 
 #include "SkMatrix44.h"
-#include "core/html/HTMLSelectElement.h"
 #include "modules/accessibility/AXMenuListPopup.h"
 #include "modules/accessibility/AXObjectCacheImpl.h"
 
@@ -39,7 +38,7 @@ AXMenuListOption::AXMenuListOption(HTMLOptionElement* element,
     : AXMockObject(axObjectCache), m_element(element) {}
 
 AXMenuListOption::~AXMenuListOption() {
-  DCHECK(!m_element);
+  ASSERT(!m_element);
 }
 
 void AXMenuListOption::detach() {
@@ -58,26 +57,6 @@ AccessibilityRole AXMenuListOption::roleValue() const {
   return MenuListOptionRole;
 }
 
-AXObject* AXMenuListOption::computeParent() const {
-  Node* node = getNode();
-  if (!node)
-    return nullptr;
-  Node* select = toHTMLOptionElement(node)->ownerSelectElement();
-  if (!select)
-    return nullptr;
-  AXObject* selectAXObject = axObjectCache().getOrCreate(select);
-  if (selectAXObject->hasChildren()) {
-    const auto& childObjects = selectAXObject->children();
-    DCHECK(!childObjects.isEmpty());
-    DCHECK_EQ(childObjects.size(), 1UL);
-    DCHECK(childObjects[0]->isMenuListPopup());
-    toAXMenuListPopup(childObjects[0].get())->updateChildrenIfNecessary();
-  } else {
-    selectAXObject->updateChildrenIfNecessary();
-  }
-  return m_parent.get();
-}
-
 Element* AXMenuListOption::actionElement() const {
   return m_element;
 }
@@ -136,12 +115,12 @@ void AXMenuListOption::getRelativeBounds(
   AXObject* parent = parentObject();
   if (!parent)
     return;
-  DCHECK(parent->isMenuListPopup());
+  ASSERT(parent->isMenuListPopup());
 
   AXObject* grandparent = parent->parentObject();
   if (!grandparent)
     return;
-  DCHECK(grandparent->isMenuList());
+  ASSERT(grandparent->isMenuList());
   grandparent->getRelativeBounds(outContainer, outBoundsInContainer,
                                  outContainerTransform);
 }
@@ -155,7 +134,7 @@ String AXMenuListOption::textAlternative(bool recursive,
   // If nameSources is non-null, relatedObjects is used in filling it in, so it
   // must be non-null as well.
   if (nameSources)
-    DCHECK(relatedObjects);
+    ASSERT(relatedObjects);
 
   if (!getNode())
     return String();