Changeset 82934 in webkit
- Timestamp:
- Apr 5, 2011 6:38:17 AM (13 years ago)
- Location:
- trunk/Source/WebCore
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r82932 r82934 1 2011-04-05 Nikolas Zimmermann <nzimmermann@rim.com> 2 3 Reviewed by Andreas Kling. 4 5 Switch from Vector<UChar> to StringBuilder in accessibility/ 6 https://bugs.webkit.org/show_bug.cgi?id=57837 7 8 * accessibility/AccessibilityObject.cpp: 9 (WebCore::AccessibilityObject::listMarkerTextForNodeAndPosition): 10 (WebCore::AccessibilityObject::stringForVisiblePositionRange): 11 * accessibility/AccessibilityRenderObject.cpp: 12 (WebCore::AccessibilityRenderObject::accessibilityDescriptionForElements): 13 1 14 2011-04-05 Andrey Adaikin <aandrey@google.com> 2 15 -
trunk/Source/WebCore/accessibility/AccessibilityObject.cpp
r80059 r82934 53 53 #include "visible_units.h" 54 54 #include <wtf/StdLibExtras.h> 55 #include <wtf/text/StringBuilder.h> 56 #include <wtf/text/StringConcatenate.h> 55 57 #include <wtf/unicode/CharacterNames.h> 56 58 … … 431 433 // FIXME: Not all list marker styles are followed by a period, but this 432 434 // sounds much better when there is a synthesized pause because of a period. 433 Vector<UChar> resultVector; 434 resultVector.append(markerText.characters(), markerText.length()); 435 resultVector.append('.'); 436 resultVector.append(' '); 437 438 return String::adopt(resultVector); 435 return makeString(markerText, ". "); 439 436 } 440 437 … … 444 441 return String(); 445 442 446 Vector<UChar> resultVector;443 StringBuilder builder; 447 444 RefPtr<Range> range = makeRange(visiblePositionRange.start, visiblePositionRange.end); 448 445 for (TextIterator it(range.get()); !it.atEnd(); it.advance()) { … … 452 449 String listMarkerText = listMarkerTextForNodeAndPosition(it.node(), visiblePositionRange.start); 453 450 if (!listMarkerText.isEmpty()) 454 resultVector.append(listMarkerText.characters(), listMarkerText.length());455 456 resultVector.append(it.characters(), it.length());451 builder.append(listMarkerText); 452 453 builder.append(it.characters(), it.length()); 457 454 } else { 458 455 // locate the node and starting offset for this replaced range … … 463 460 464 461 if (replacedNodeNeedsCharacter(node->childNode(offset))) 465 resultVector.append(objectReplacementCharacter);462 builder.append(objectReplacementCharacter); 466 463 } 467 464 } 468 465 469 return String::adopt(resultVector);466 return builder.toString(); 470 467 } 471 468 -
trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp
r82886 r82934 78 78 #include "visible_units.h" 79 79 #include <wtf/StdLibExtras.h> 80 #include <wtf/text/StringBuilder.h> 80 81 #include <wtf/unicode/CharacterNames.h> 81 82 … … 1177 1178 String AccessibilityRenderObject::accessibilityDescriptionForElements(Vector<Element*> &elements) const 1178 1179 { 1179 Vector<UChar> ariaLabel;1180 StringBuilder builder; 1180 1181 unsigned size = elements.size(); 1181 1182 for (unsigned i = 0; i < size; ++i) { 1182 1183 Element* idElement = elements[i]; 1183 1184 String nameFragment = accessibleNameForNode(idElement); 1185 ariaLabel.append(nameFragment.characters(), nameFragment.length()); 1186 for (Node* n = idElement->firstChild(); n; n = n->traverseNextNode(idElement)) { 1187 nameFragment = accessibleNameForNode(n); 1188 ariaLabel.append(nameFragment.characters(), nameFragment.length()); 1189 } 1190 1184 1185 builder.append(accessibleNameForNode(idElement)); 1186 for (Node* n = idElement->firstChild(); n; n = n->traverseNextNode(idElement)) 1187 builder.append(accessibleNameForNode(n)); 1188 1191 1189 if (i != size - 1) 1192 ariaLabel.append(' '); 1193 } 1194 return String::adopt(ariaLabel); 1195 } 1196 1197 1190 builder.append(' '); 1191 } 1192 return builder.toString(); 1193 } 1194 1198 1195 void AccessibilityRenderObject::elementsFromAttribute(Vector<Element*>& elements, const QualifiedName& attribute) const 1199 1196 {
Note: See TracChangeset
for help on using the changeset viewer.