Changeset 51762 in webkit

Timestamp:

Dec 7, 2009 6:27:44 AM (14 years ago)

Author:

eric@webkit.org

Message:

2009-12-07 Joanmarie Diggs <​joanmarie.diggs@gmail.com>

Reviewed by Xan Lopez.

​https://bugs.webkit.org/show_bug.cgi?id=25524
[Gtk] Expose the title attribute to assistive technologies

• platform/gtk/accessibility/title-and-alt.html: Added.
• platform/gtk/accessibility/title-and-alt-expected.txt: Added.

2009-12-07 Joanmarie Diggs <​joanmarie.diggs@gmail.com>

Reviewed by Xan Lopez.

​https://bugs.webkit.org/show_bug.cgi?id=25524
[Gtk] Expose the title attribute to assistive technologies

Expose 'alt' attribute from images as accessible name.
Expose the 'title' core HTML attribute as accessible description.
This is a modified version of the original fix submitted by Mario Sanchez Prada,
adjusted so that it doesn't impact other platforms.

• accessibility/gtk/AccessibilityObjectWrapperAtk.cpp: (webkit_accessible_get_name): (webkit_accessible_get_description):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/gtk/accessibility (added)
• LayoutTests/platform/gtk/accessibility/title-and-alt-expected.txt (added)
• LayoutTests/platform/gtk/accessibility/title-and-alt.html (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/accessibility/gtk/AccessibilityObjectWrapperAtk.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2009-12-07  Joanmarie Diggs  <joanmarie.diggs@gmail.com>
+
+        Reviewed by Xan Lopez.
+
+        https://bugs.webkit.org/show_bug.cgi?id=25524
+        [Gtk] Expose the title attribute to assistive technologies
+
+        * platform/gtk/accessibility/title-and-alt.html: Added.
+        * platform/gtk/accessibility/title-and-alt-expected.txt: Added.
+
 2009-12-07  Oliver Hunt  <oliver@apple.com>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2009-12-07  Joanmarie Diggs  <joanmarie.diggs@gmail.com>
+
+        Reviewed by Xan Lopez.
+
+        https://bugs.webkit.org/show_bug.cgi?id=25524
+        [Gtk] Expose the title attribute to assistive technologies
+
+        Expose 'alt' attribute from images as accessible name.
+        Expose the 'title' core HTML attribute as accessible description.
+        This is a modified version of the original fix submitted by Mario Sanchez Prada,
+        adjusted so that it doesn't impact other platforms.
+
+        * accessibility/gtk/AccessibilityObjectWrapperAtk.cpp:
+        (webkit_accessible_get_name):
+        (webkit_accessible_get_description):
+
 2009-12-07  Tor Arne Vestbø  <tor.arne.vestbo@nokia.com>
 

trunk/WebCore/accessibility/gtk/AccessibilityObjectWrapperAtk.cpp

@@ -160 +160 @@
 {
     AccessibilityObject* coreObject = core(object);
+    if (!coreObject->isAccessibilityRenderObject())
+        return returnString(coreObject->stringValue());
+
+    AccessibilityRenderObject* renderObject = static_cast<AccessibilityRenderObject*>(coreObject);
     if (coreObject->isControl()) {
-        AccessibilityRenderObject* renderObject = static_cast<AccessibilityRenderObject*>(coreObject);
         AccessibilityObject* label = renderObject->correspondingLabelForControlElement();
         if (label)
             return returnString(nameFromChildren(label));
     }
+
+    if (renderObject->isImage() || renderObject->isInputImage()) {
+        Node* node = renderObject->renderer()->node();
+        if (node && node->isHTMLElement()) {
+            // Get the attribute rather than altText String so as not to fall back on title.
+            String alt = static_cast<HTMLElement*>(node)->getAttribute(HTMLNames::altAttr);
+            if (!alt.isEmpty())
+                return returnString(alt);
+        }
+    }
+
     return returnString(coreObject->stringValue());
 }
@@ -172 +186 @@
 {
     AccessibilityObject* coreObject = core(object);
+    Node* node = 0;
+    if (coreObject->isAccessibilityRenderObject())
+        node = static_cast<AccessibilityRenderObject*>(coreObject)->renderer()->node();
+    if (!node || !node->isHTMLElement() || coreObject->ariaRoleAttribute() != UnknownRole)
+        return returnString(coreObject->accessibilityDescription());
 
     // atk_table_get_summary returns an AtkObject. We have no summary object, so expose summary here.
-    if (coreObject->roleValue() == TableRole && coreObject->ariaRoleAttribute() == UnknownRole) {
-        Node* node = static_cast<AccessibilityRenderObject*>(coreObject)->renderer()->node();
-        if (node && node->isHTMLElement()) {
-            String summary = static_cast<HTMLTableElement*>(node)->summary();
-            if (!summary.isEmpty())
-                return returnString(summary);
-        }
-    }
+    if (coreObject->roleValue() == TableRole) {
+        String summary = static_cast<HTMLTableElement*>(node)->summary();
+        if (!summary.isEmpty())
+            return returnString(summary);
+    }
+
+    // The title attribute should be reliably available as the object's descripton.
+    // We do not want to fall back on other attributes in its absence. See bug 25524.
+    String title = static_cast<HTMLElement*>(node)->title();
+    if (!title.isEmpty())
+        return returnString(title);
 
     return returnString(coreObject->accessibilityDescription());