Introduce isHTMLOptGroupElement and toHTMLOptGroupElement

Source/core/accessibility/AccessibilityListBoxOption.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 41 matching lines @@
     
 PassRefPtr<AccessibilityListBoxOption> AccessibilityListBoxOption::create()
 {
     return adoptRef(new AccessibilityListBoxOption());
 }
     
 bool AccessibilityListBoxOption::isEnabled() const
 {
     if (!m_optionElement)
         return false;
-    
-    if (m_optionElement->hasTagName(optgroupTag))
+
+    if (isHTMLOptGroupElement(m_optionElement))
         return false;
 
     if (equalIgnoringCase(getAttribute(aria_disabledAttr), "true"))
         return false;
 
     if (m_optionElement->hasAttribute(disabledAttr))
         return false;
     
     return true;
 }
@@ skipping 73 matching lines @@
 {
     if (!m_optionElement)
         return String();
     
     const AtomicString& ariaLabel = getAttribute(aria_labelAttr);
     if (!ariaLabel.isNull())
         return ariaLabel;
     
     if (m_optionElement->hasTagName(optionTag))
         return toHTMLOptionElement(m_optionElement)->text();
-    
-    if (m_optionElement->hasTagName(optgroupTag))
-        return static_cast<HTMLOptGroupElement*>(m_optionElement)->groupLabelText();
-    
+
+    if (isHTMLOptGroupElement(m_optionElement))
+        return toHTMLOptGroupElement(m_optionElement)->groupLabelText();
+
     return String();
 }
 
 Element* AccessibilityListBoxOption::actionElement() const
 {
     return m_optionElement;
 }
 
 AccessibilityObject* AccessibilityListBoxOption::parentObject() const
 {
@@ skipping 22 matching lines @@
     selectElement->accessKeySetSelectedIndex(optionIndex);
 }
 
 HTMLSelectElement* AccessibilityListBoxOption::listBoxOptionParentNode() const
 {
     if (!m_optionElement)
         return 0;
     
     if (m_optionElement->hasTagName(optionTag))
         return toHTMLOptionElement(m_optionElement)->ownerSelectElement();
-    
-    if (m_optionElement->hasTagName(optgroupTag))
-        return static_cast<HTMLOptGroupElement*>(m_optionElement)->ownerSelectElement();
-    
+
+    if (isHTMLOptGroupElement(m_optionElement))
+        return toHTMLOptGroupElement(m_optionElement)->ownerSelectElement();
+
     return 0;
 }
 
 int AccessibilityListBoxOption::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