Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(8594)

Unified Diff: content/browser/accessibility/accessibility_tree_formatter_auralinux.cc

Issue 2833843005: Handling of different types of empty alt (Closed)
Patch Set: Ready to land Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/browser/accessibility/accessibility_tree_formatter_auralinux.cc
diff --git a/content/browser/accessibility/accessibility_tree_formatter_auralinux.cc b/content/browser/accessibility/accessibility_tree_formatter_auralinux.cc
index 67f70f15a90695a54f0d53ecb3325026b908c888..f1512552bc4361499c3ae23daa1614c276657b91 100644
--- a/content/browser/accessibility/accessibility_tree_formatter_auralinux.cc
+++ b/content/browser/accessibility/accessibility_tree_formatter_auralinux.cc
@@ -51,9 +51,14 @@ void AccessibilityTreeFormatterAuraLinux::AddProperties(
AtkObject* atk_object = acc_obj->GetAtkObject();
AtkRole role = acc_obj->atk_role();
if (role != ATK_ROLE_UNKNOWN)
- dict->SetString("role", atk_role_get_name(role));
- dict->SetString("name", atk_object_get_name(atk_object));
- dict->SetString("description", atk_object_get_description(atk_object));
+ dict->SetString("role", std::string(atk_role_get_name(role)));
+ const gchar* name = atk_object_get_name(atk_object);
+ if (name)
+ dict->SetString("name", std::string(name));
+ const gchar* description = atk_object_get_description(atk_object);
+ if (description)
+ dict->SetString("description", std::string(description));
+
AtkStateSet* state_set = atk_object_ref_state_set(atk_object);
base::ListValue* states = new base::ListValue;
for (int i = ATK_STATE_INVALID; i < ATK_STATE_LAST_DEFINED; i++) {
@@ -74,9 +79,9 @@ base::string16 AccessibilityTreeFormatterAuraLinux::ToString(
}
std::string name_value;
- node.GetString("name", &name_value);
- WriteAttribute(true, base::StringPrintf("name='%s'", name_value.c_str()),
- &line);
+ if (node.GetString("name", &name_value))
+ WriteAttribute(true, base::StringPrintf("name='%s'", name_value.c_str()),
+ &line);
std::string description_value;
node.GetString("description", &description_value);
« no previous file with comments | « chrome/common/extensions/api/automation.idl ('k') | content/browser/accessibility/accessibility_tree_formatter_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698