1 files changed, 5 insertions, 18 deletions
diff --git a/WebCore/accessibility/AccessibilityRenderObject.cpp b/WebCore/accessibility/AccessibilityRenderObject.cpp
index 3c6079b..141d725 100644
--- a/WebCore/accessibility/AccessibilityRenderObject.cpp
+++ b/WebCore/accessibility/AccessibilityRenderObject.cpp
@@ -1325,30 +1325,17 @@ String AccessibilityRenderObject::ariaDescribedByAttribute() const
     
     return accessibilityDescriptionForElements(elements);
 }
-    
-String AccessibilityRenderObject::ariaAccessibilityDescription() const
-{
-    const AtomicString& ariaLabel = getAttribute(aria_labelAttr);
-    if (!ariaLabel.isEmpty())
-        return ariaLabel;
-    
-    String ariaDescription = ariaDescribedByAttribute();
-    if (!ariaDescription.isEmpty())
-        return ariaDescription;
-    
-    return String();
-}
 
 String AccessibilityRenderObject::accessibilityDescription() const
 {
     if (!m_renderer)
         return String();
 
-    // Static text should not have a description, it should only have a stringValue.
-    if (roleValue() == StaticTextRole)
-        return String();
+    const AtomicString& ariaLabel = getAttribute(aria_labelAttr);
+    if (!ariaLabel.isEmpty())
+        return ariaLabel;
     
-    String ariaDescription = ariaAccessibilityDescription();
+    String ariaDescription = ariaDescribedByAttribute();
     if (!ariaDescription.isEmpty())
         return ariaDescription;
     
@@ -1908,7 +1895,7 @@ String AccessibilityRenderObject::text() const
 {
     // If this is a user defined static text, use the accessible name computation.
     if (ariaRoleAttribute() == StaticTextRole)
-        return ariaAccessibilityDescription();
+        return accessibilityDescription();
     
     if (!isTextControl() || isPasswordField())
         return String();