Attachment #42919 for bug #25524

View Details Raw Unified Return to Bug 25524

| Differences between



2009-11-10  Joanmarie Diggs  <joanmarie.diggs@gmail.com>

        Reviewed by NOBODY (OOPS!).

        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-11-10  Brady Eidson  <beidson@apple.com>

        Reviewed by Sam Weinig.



static const gchar* webkit_accessible_get_name(AtkObject* object)
{
    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());
}

static const gchar* webkit_accessible_get_description(AtkObject* object)
{
    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) {
        String summary = static_cast<HTMLTableElement*>(node)->summary();
        if (!summary.isEmpty())
            return returnString(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());
}

- 

Return to Bug 25524

Lines 159-187 static const gchar* nameFromChildren(AccessibilityObject* object) a/WebCore/accessibility/gtk/AccessibilityObjectWrapperAtk.cpp_sec1
- a/WebCore/accessibility/gtk/AccessibilityObjectWrapperAtk.cpp -9 / +30 lines
159	static const gchar* webkit_accessible_get_name(AtkObject* object)	159	static const gchar* webkit_accessible_get_name(AtkObject* object)
160	{	160	{
161	AccessibilityObject* coreObject = core(object);	161	AccessibilityObject* coreObject = core(object);
		162	if (!coreObject->isAccessibilityRenderObject())
		163	return returnString(coreObject->stringValue());
		164
		165	AccessibilityRenderObject* renderObject = static_cast<AccessibilityRenderObject*>(coreObject);
162	if (coreObject->isControl()) {	166	if (coreObject->isControl()) {
163	AccessibilityRenderObject* renderObject = static_cast<AccessibilityRenderObject*>(coreObject);
164	AccessibilityObject* label = renderObject->correspondingLabelForControlElement();	167	AccessibilityObject* label = renderObject->correspondingLabelForControlElement();
165	if (label)	168	if (label)
166	return returnString(nameFromChildren(label));	169	return returnString(nameFromChildren(label));
167	}	170	}
		171
		172	if (renderObject->isImage() \|\| renderObject->isInputImage()) {
		173	Node* node = renderObject->renderer()->node();
		174	if (node && node->isHTMLElement()) {
		175	// Get the attribute rather than altText String so as not to fall back on title.
		176	String alt = static_cast<HTMLElement*>(node)->getAttribute(HTMLNames::altAttr);
		177	if (!alt.isEmpty())
		178	return returnString(alt);
		179	}
		180	}
		181
168	return returnString(coreObject->stringValue());	182	return returnString(coreObject->stringValue());
169	}	183	}
170		184
171	static const gchar* webkit_accessible_get_description(AtkObject* object)	185	static const gchar* webkit_accessible_get_description(AtkObject* object)
172	{	186	{
173	AccessibilityObject* coreObject = core(object);	187	AccessibilityObject* coreObject = core(object);
		188	Node* node = 0;
		189	if (coreObject->isAccessibilityRenderObject())
		190	node = static_cast<AccessibilityRenderObject*>(coreObject)->renderer()->node();
		191	if (!node \|\| !node->isHTMLElement() \|\| coreObject->ariaRoleAttribute() != UnknownRole)
		192	return returnString(coreObject->accessibilityDescription());
174		193
175	// atk_table_get_summary returns an AtkObject. We have no summary object, so expose summary here.	194	// atk_table_get_summary returns an AtkObject. We have no summary object, so expose summary here.
176	if (coreObject->roleValue() == TableRole && coreObject->ariaRoleAttribute() == UnknownRole) {	195	if (coreObject->roleValue() == TableRole) {
177	Node* node = static_cast<AccessibilityRenderObject*>(coreObject)->renderer()->node();	196	String summary = static_cast<HTMLTableElement*>(node)->summary();
178	if (node && node->isHTMLElement()) {	197	if (!summary.isEmpty())
179	String summary = static_cast<HTMLTableElement*>(node)->summary();	198	return returnString(summary);
180	if (!summary.isEmpty())
181	return returnString(summary);
182	}
183	}	199	}
184		200
		201	// The title attribute should be reliably available as the object's descripton.
		202	// We do not want to fall back on other attributes in its absence. See bug 25524.
		203	String title = static_cast<HTMLElement*>(node)->title();
		204	if (!title.isEmpty())
		205	return returnString(title);
		206
185	return returnString(coreObject->accessibilityDescription());	207	return returnString(coreObject->accessibilityDescription());
186	}	208	}
187		209
188	-

Lines 1-3 a/WebCore/ChangeLog_sec1
- a/WebCore/ChangeLog +16 lines
		1	2009-11-10 Joanmarie Diggs <joanmarie.diggs@gmail.com>
		2
		3	Reviewed by NOBODY (OOPS!).
		4
		5	https://bugs.webkit.org/show_bug.cgi?id=25524
		6	[Gtk] Expose the title attribute to assistive technologies
		7
		8	Expose 'alt' attribute from images as accessible name.
		9	Expose the 'title' core HTML attribute as accessible description.
		10	This is a modified version of the original fix submitted by Mario Sanchez Prada,
		11	adjusted so that it doesn't impact other platforms.
		12
		13	* accessibility/gtk/AccessibilityObjectWrapperAtk.cpp:
		14	(webkit_accessible_get_name):
		15	(webkit_accessible_get_description):
		16
1	2009-11-10 Brady Eidson <beidson@apple.com>	17	2009-11-10 Brady Eidson <beidson@apple.com>
2		18
3	Reviewed by Sam Weinig.	19	Reviewed by Sam Weinig.