Revert of Don't keep recreating AXMenuListPopup

Source/modules/accessibility/AXMenuListOption.h

Index: Source/modules/accessibility/AXMenuListOption.h
diff --git a/Source/modules/accessibility/AXMenuListOption.h b/Source/modules/accessibility/AXMenuListOption.h
index c2df35befa89347f27cdf92d450d5b4f2294ad17..73188591614a0a2c7d1f9b47ae072cbd4e4ae7f5 100644
--- a/Source/modules/accessibility/AXMenuListOption.h
+++ b/Source/modules/accessibility/AXMenuListOption.h
@@ -26,25 +26,24 @@
 #ifndef AXMenuListOption_h
 #define AXMenuListOption_h
 
-#include "core/html/HTMLOptionElement.h"
 #include "modules/accessibility/AXMockObject.h"
 
 namespace blink {
 
 class AXObjectCacheImpl;
+class HTMLElement;
 
 class AXMenuListOption final : public AXMockObject {
 public:
-    static PassRefPtr<AXMenuListOption> create(HTMLOptionElement* element, AXObjectCacheImpl* axObjectCache) { return adoptRef(new AXMenuListOption(element, axObjectCache)); }
+    static PassRefPtr<AXMenuListOption> create(AXObjectCacheImpl* axObjectCache) { return adoptRef(new AXMenuListOption(axObjectCache)); }
+
+    void setElement(HTMLElement*);
 
 private:
-    explicit AXMenuListOption(HTMLOptionElement*, AXObjectCacheImpl*);
+    explicit AXMenuListOption(AXObjectCacheImpl*);
 
     virtual bool isMenuListOption() const override { return true; }
 
-    virtual Node* node() const override { return m_element; }
-    virtual void detach() override;
-    virtual bool isDetached() const override { return !m_element; }
     virtual AccessibilityRole roleValue() const override { return MenuListOptionRole; }
     virtual bool canHaveChildren() const override { return false; }
 
@@ -59,7 +58,7 @@
     virtual String stringValue() const override;
     virtual bool computeAccessibilityIsIgnored() const override;
 
-    HTMLOptionElement* m_element;
+    RefPtrWillBePersistent<HTMLElement> m_element;
 };
 
 DEFINE_AX_OBJECT_TYPE_CASTS(AXMenuListOption, isMenuListOption());