Use isHTML*Element() helpers more in the accessibility code

Source/core/accessibility/AXListBoxOption.cpp

 /*
  * Copyright (C) 2008 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
@@ skipping 56 matching lines @@
         return false;
 
     if (m_optionElement->hasAttribute(disabledAttr))
         return false;
 
     return true;
 }
 
 bool AXListBoxOption::isSelected() const
 {
-    if (!m_optionElement)
-        return false;
-
-    if (!m_optionElement->hasTagName(optionTag))
+    if (!isHTMLOptionElement(m_optionElement))
         return false;
 
     return toHTMLOptionElement(m_optionElement)->selected();
 }
 
 bool AXListBoxOption::isSelectedOptionActive() const
 {
     HTMLSelectElement* listBoxParentNode = listBoxOptionParentNode();
     if (!listBoxParentNode)
         return false;
@@ skipping 54 matching lines @@
 
 String AXListBoxOption::stringValue() const
 {
     if (!m_optionElement)
         return String();
 
     const AtomicString& ariaLabel = getAttribute(aria_labelAttr);
     if (!ariaLabel.isNull())
         return ariaLabel;
 
-    if (m_optionElement->hasTagName(optionTag))
+    if (isHTMLOptionElement(*m_optionElement))
         return toHTMLOptionElement(m_optionElement)->text();
 
-    if (m_optionElement->hasTagName(optgroupTag))
+    if (isHTMLOptGroupElement(*m_optionElement))
         return toHTMLOptGroupElement(m_optionElement)->groupLabelText();
 
     return String();
 }
 
 Element* AXListBoxOption::actionElement() const
 {
     return m_optionElement;
 }
 
@@ skipping 22 matching lines @@
     // Convert from the entire list index to the option index.
     int optionIndex = selectElement->listToOptionIndex(listBoxOptionIndex());
     selectElement->accessKeySetSelectedIndex(optionIndex);
 }
 
 HTMLSelectElement* AXListBoxOption::listBoxOptionParentNode() const
 {
     if (!m_optionElement)
         return 0;
 
-    if (m_optionElement->hasTagName(optionTag))
+    if (isHTMLOptionElement(*m_optionElement))
         return toHTMLOptionElement(m_optionElement)->ownerSelectElement();
 
-    if (m_optionElement->hasTagName(optgroupTag))
+    if (isHTMLOptGroupElement(*m_optionElement))
         return toHTMLOptGroupElement(m_optionElement)->ownerSelectElement();
 
     return 0;
 }
 
 int AXListBoxOption::listBoxOptionIndex() const
 {
     if (!m_optionElement)
         return -1;
 
     HTMLSelectElement* selectElement = listBoxOptionParentNode();
     if (!selectElement)
         return -1;
 
     const Vector<HTMLElement*>& listItems = selectElement->listItems();
     unsigned length = listItems.size();
     for (unsigned i = 0; i < length; i++) {
         if (listItems[i] == m_optionElement)
             return i;
     }
 
     return -1;
 }
 
 } // namespace WebCore