Changeset 61730 in webkit
- Timestamp:
- Jun 23, 2010 8:18:17 PM (14 years ago)
- Location:
- trunk
- Files:
-
- 2 added
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r61728 r61730 1 2010-06-23 Mario Sanchez Prada <msanchez@igalia.com> 2 3 Reviewed by Chris Fleizach. 4 5 [Gtk] nameFromChildren is obsolete 6 https://bugs.webkit.org/show_bug.cgi?id=36128 7 8 Added new tests, based on a previous patch by Joanmarie Diggs. 9 10 * platform/gtk/accessibility/name-from-label-expected.txt: Added. 11 * platform/gtk/accessibility/name-from-label.html: Added. 12 1 13 2010-06-23 Tony Chang <tony@chromium.org> 2 14 -
trunk/WebCore/ChangeLog
r61729 r61730 1 2010-06-23 Joanmarie Diggs <joanmarie.diggs@gmail.com> 2 3 Reviewed by Chris Fleizach. 4 5 [Gtk] nameFromChildren is obsolete 6 https://bugs.webkit.org/show_bug.cgi?id=36128 7 8 Look to the AtkText interface implemented by the objects in 9 question. 10 11 Test: platform/gtk/accessibility/name-from-label.html 12 13 * accessibility/gtk/AccessibilityObjectWrapperAtk.cpp: 14 (webkit_accessible_get_name): 15 (webkit_accessible_table_get_column_description): 16 (webkit_accessible_table_get_row_description): 17 1 18 2010-06-23 Kwang Yul Seo <skyul@company100.net> 2 19 -
trunk/WebCore/accessibility/gtk/AccessibilityObjectWrapperAtk.cpp
r61176 r61730 144 144 } 145 145 146 static const gchar* nameFromChildren(AccessibilityObject* object) 147 { 148 if (!object) 149 return 0; 150 151 AccessibilityRenderObject::AccessibilityChildrenVector children = object->children(); 152 // Currently, object->stringValue() should be an empty String. This might not be the case down the road. 153 String name = object->stringValue(); 154 for (unsigned i = 0; i < children.size(); ++i) 155 name += children.at(i).get()->stringValue(); 156 return returnString(name); 157 } 146 static gchar* webkit_accessible_text_get_text(AtkText* text, gint startOffset, gint endOffset); 158 147 159 148 static const gchar* webkit_accessible_get_name(AtkObject* object) … … 166 155 if (coreObject->isControl()) { 167 156 AccessibilityObject* label = renderObject->correspondingLabelForControlElement(); 168 if (label) 169 return returnString(nameFromChildren(label)); 157 if (label) { 158 AtkObject* atkObject = label->wrapper(); 159 if (ATK_IS_TEXT(atkObject)) 160 return webkit_accessible_text_get_text(ATK_TEXT(atkObject), 0, -1); 161 } 170 162 } 171 163 … … 1496 1488 { 1497 1489 AtkObject* columnHeader = atk_table_get_column_header(table, column); 1498 if (columnHeader )1499 return returnString(nameFromChildren(core(columnHeader)));1490 if (columnHeader && ATK_IS_TEXT(columnHeader)) 1491 return webkit_accessible_text_get_text(ATK_TEXT(columnHeader), 0, -1); 1500 1492 1501 1493 return 0; … … 1505 1497 { 1506 1498 AtkObject* rowHeader = atk_table_get_row_header(table, row); 1507 if (rowHeader )1508 return returnString(nameFromChildren(core(rowHeader)));1499 if (rowHeader && ATK_IS_TEXT(rowHeader)) 1500 return webkit_accessible_text_get_text(ATK_TEXT(rowHeader), 0, -1); 1509 1501 1510 1502 return 0;
Note: See TracChangeset
for help on using the changeset viewer.