Add the case for figure in title() and accessibilityDescription().

Source/core/accessibility/AXNodeObject.cpp

 /*
 * Copyright (C) 2012, Google 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 1163 matching lines @@
                 continue;
             }
         }
 
         builder.append(child->textUnderElement());
     }
 
     return builder.toString();
 }
 
+AXObject* AXNodeObject::searchAXObjectFromChild(const HTMLQualifiedName& node) const

[dmazzoni, 2014/11/12 06:03:03]

The argument name should be tagName instead of node

[je_julie(Not used), 2014/11/12 13:07:04]

You're right. I updated the parameter name.

+{
+    for (AXObject* child = firstChild(); child; child = child->nextSibling()) {
+        Node* childNode = child->node();
+        if (childNode && childNode->hasTagName(node))
+            return child;
+    }
+    return 0;
+}
+
 String AXNodeObject::accessibilityDescription() const
 {
     // Static text should not have a description, it should only have a stringValue.
     if (roleValue() == StaticTextRole)
         return String();
 
     String ariaDescription = ariaAccessibilityDescription();
     if (!ariaDescription.isEmpty())
         return ariaDescription;
 
     if (isImage() || isInputImage() || isNativeImage() || isCanvas()) {
         // Images should use alt as long as the attribute is present, even if empty.
         // Otherwise, it should fallback to other methods, like the title attribute.
         const AtomicString& alt = getAttribute(altAttr);
         if (!alt.isNull())
             return alt;
     }
 
     // An element's descriptive text is comprised of title() (what's visible on the screen) and accessibilityDescription() (other descriptive text).
     // Both are used to generate what a screen reader speaks.
     // If this point is reached (i.e. there's no accessibilityDescription) and there's no title(), we should fallback to using the title attribute.
     // The title attribute is normally used as help text (because it is a tooltip), but if there is nothing else available, this should be used (according to ARIA).
     if (title().isEmpty())
         return getAttribute(titleAttr);
 
+    if (roleValue() == FigureRole) {
+        AXObject* figcaption = searchAXObjectFromChild(figcaptionTag);
+        if (figcaption)
+            return figcaption->accessibilityDescription();
+    }
+
     return String();
 }
 
 String AXNodeObject::title() const
 {
     Node* node = this->node();
     if (!node)
         return String();
 
     bool isInputElement = isHTMLInputElement(*node);
@@ skipping 25 matching lines @@
     case MenuButtonRole:
     case MenuItemRole:
     case MenuItemCheckBoxRole:
     case MenuItemRadioRole:
     case RadioButtonRole:
     case TabRole:
         return textUnderElement();
     // SVGRoots should not use the text under itself as a title. That could include the text of objects like <text>.
     case SVGRootRole:
         return String();
+    case FigureRole: {
+        AXObject* figcaption = searchAXObjectFromChild(figcaptionTag);
+        if (figcaption)
+            return figcaption->textUnderElement();
+    }
     default:
         break;
     }
 
     if (isHeading() || isLink())
         return textUnderElement();
 
     // If it's focusable but it's not content editable or a known control type, then it will appear to
     // the user as a single atomic object, so we should use its text as the default title.
     if (isGenericFocusableElement())
@@ skipping 510 matching lines @@
     float range = maxValueForRange() - minValueForRange();
     float value = valueForRange();
 
     value += range * (percentChange / 100);
     setValue(String::number(value));
 
     axObjectCache()->postNotification(node(), AXObjectCacheImpl::AXValueChanged, true);
 }
 
 } // namespace blink