1 files changed, 7 insertions, 10 deletions
diff --git a/Source/WebCore/accessibility/AccessibilityMenuListPopup.cpp b/Source/WebCore/accessibility/AccessibilityMenuListPopup.cpp
index 8890752a9..fe1bd34b8 100644
--- a/Source/WebCore/accessibility/AccessibilityMenuListPopup.cpp
+++ b/Source/WebCore/accessibility/AccessibilityMenuListPopup.cpp
@@ -70,19 +70,16 @@ bool AccessibilityMenuListPopup::computeAccessibilityIsIgnored() const
 
 AccessibilityMenuListOption* AccessibilityMenuListPopup::menuListOptionAccessibilityObject(HTMLElement* element) const
 {
-    if (!element || !isHTMLOptionElement(element) || !element->inRenderedDocument())
-        return 0;
+    if (!is<HTMLOptionElement>(element) || !element->inRenderedDocument())
+        return nullptr;
 
-    AccessibilityObject* object = document()->axObjectCache()->getOrCreate(MenuListOptionRole);
-    ASSERT_WITH_SECURITY_IMPLICATION(object->isMenuListOption());
+    auto& option = downcast<AccessibilityMenuListOption>(*document()->axObjectCache()->getOrCreate(MenuListOptionRole));
+    option.setElement(element);
 
-    AccessibilityMenuListOption* option = toAccessibilityMenuListOption(object);
-    option->setElement(element);
-
-    return option;
+    return &option;
 }
 
-bool AccessibilityMenuListPopup::press() const
+bool AccessibilityMenuListPopup::press()
 {
     if (!m_parent)
         return false;
@@ -102,7 +99,7 @@ void AccessibilityMenuListPopup::addChildren()
 
     m_haveChildren = true;
 
-    for (const auto& listItem : toHTMLSelectElement(selectNode)->listItems()) {
+    for (const auto& listItem : downcast<HTMLSelectElement>(*selectNode).listItems()) {
         AccessibilityMenuListOption* option = menuListOptionAccessibilityObject(listItem);
         if (option) {
             option->setParent(this);