Title: [91718] trunk/Source/WebCore
- Revision
- 91718
- Author
- [email protected]
- Date
- 2011-07-25 16:12:42 -0700 (Mon, 25 Jul 2011)
Log Message
Fix AtomicString vs. String usage in accessibility code
https://bugs.webkit.org/show_bug.cgi?id=65086
Reviewed by Darin Adler.
Use AtomicString instead of String where appropriate
to avoid implicit type conversations.
Also fix a invalid reference to a temporary String.
* accessibility/AccessibilityObject.h:
(WebCore::AccessibilityObject::setAccessibleName):
* accessibility/AccessibilityRenderObject.cpp:
(WebCore::AccessibilityRenderObject::elementsFromAttribute):
(WebCore::AccessibilityRenderObject::ariaAccessibilityDescription):
(WebCore::AccessibilityRenderObject::setAccessibleName):
* accessibility/AccessibilityRenderObject.h:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (91717 => 91718)
--- trunk/Source/WebCore/ChangeLog 2011-07-25 23:10:40 UTC (rev 91717)
+++ trunk/Source/WebCore/ChangeLog 2011-07-25 23:12:42 UTC (rev 91718)
@@ -1,3 +1,22 @@
+2011-07-25 Patrick Gansterer <[email protected]>
+
+ Fix AtomicString vs. String usage in accessibility code
+ https://bugs.webkit.org/show_bug.cgi?id=65086
+
+ Reviewed by Darin Adler.
+
+ Use AtomicString instead of String where appropriate
+ to avoid implicit type conversations.
+ Also fix a invalid reference to a temporary String.
+
+ * accessibility/AccessibilityObject.h:
+ (WebCore::AccessibilityObject::setAccessibleName):
+ * accessibility/AccessibilityRenderObject.cpp:
+ (WebCore::AccessibilityRenderObject::elementsFromAttribute):
+ (WebCore::AccessibilityRenderObject::ariaAccessibilityDescription):
+ (WebCore::AccessibilityRenderObject::setAccessibleName):
+ * accessibility/AccessibilityRenderObject.h:
+
2011-07-25 Dan Bernstein <[email protected]>
Reverted r91699 due to
Modified: trunk/Source/WebCore/accessibility/AccessibilityObject.h (91717 => 91718)
--- trunk/Source/WebCore/accessibility/AccessibilityObject.h 2011-07-25 23:10:40 UTC (rev 91717)
+++ trunk/Source/WebCore/accessibility/AccessibilityObject.h 2011-07-25 23:12:42 UTC (rev 91718)
@@ -342,7 +342,7 @@
virtual bool canSetExpandedAttribute() const { return false; }
// A programmatic way to set a name on an AccessibleObject.
- virtual void setAccessibleName(String&) { }
+ virtual void setAccessibleName(const AtomicString&) { }
virtual Node* node() const { return 0; }
virtual RenderObject* renderer() const { return 0; }
Modified: trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp (91717 => 91718)
--- trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp 2011-07-25 23:10:40 UTC (rev 91717)
+++ trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp 2011-07-25 23:12:42 UTC (rev 91718)
@@ -1233,7 +1233,7 @@
unsigned size = idVector.size();
for (unsigned i = 0; i < size; ++i) {
- String idName = idVector[i];
+ AtomicString idName(idVector[i]);
Element* idElement = scope->getElementById(idName);
if (idElement)
elements.append(idElement);
@@ -1341,7 +1341,7 @@
String AccessibilityRenderObject::ariaAccessibilityDescription() const
{
- const AtomicString& ariaLabeledBy = ariaLabeledByAttribute();
+ String ariaLabeledBy = ariaLabeledByAttribute();
if (!ariaLabeledBy.isEmpty())
return ariaLabeledBy;
@@ -3615,7 +3615,7 @@
}
}
-void AccessibilityRenderObject::setAccessibleName(String& name)
+void AccessibilityRenderObject::setAccessibleName(const AtomicString& name)
{
// Setting the accessible name can store the value in the DOM
if (!m_renderer)
Modified: trunk/Source/WebCore/accessibility/AccessibilityRenderObject.h (91717 => 91718)
--- trunk/Source/WebCore/accessibility/AccessibilityRenderObject.h 2011-07-25 23:10:40 UTC (rev 91717)
+++ trunk/Source/WebCore/accessibility/AccessibilityRenderObject.h 2011-07-25 23:12:42 UTC (rev 91718)
@@ -107,7 +107,7 @@
virtual bool canSetValueAttribute() const;
virtual bool canSetExpandedAttribute() const;
- virtual void setAccessibleName(String&);
+ virtual void setAccessibleName(const AtomicString&);
// Provides common logic used by all elements when determining isIgnored.
AccessibilityObjectInclusion accessibilityIsIgnoredBase() const;
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
