Make AccessibilityNodeData more compact.

content/browser/accessibility/browser_accessibility_gtk.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/accessibility/browser_accessibility_gtk.h"
 
 #include <gtk/gtk.h>
 
 #include "base/strings/utf_string_conversions.h"
 #include "content/browser/accessibility/browser_accessibility_manager_gtk.h"
@@ skipping 160 matching lines @@
   if (!IS_BROWSER_ACCESSIBILITY(atk_object))
     return NULL;
 
   return ToBrowserAccessibilityGtk(BROWSER_ACCESSIBILITY(atk_object));
 }
 
 static const gchar* browser_accessibility_get_name(AtkObject* atk_object) {
   BrowserAccessibilityGtk* obj = ToBrowserAccessibilityGtk(atk_object);
   if (!obj)
     return NULL;
-  return obj->atk_acc_name().c_str();
+
+  return obj->GetStringAttribute(AccessibilityNodeData::ATTR_NAME).c_str();
 }
 
 static const gchar* browser_accessibility_get_description(
     AtkObject* atk_object) {
   BrowserAccessibilityGtk* obj = ToBrowserAccessibilityGtk(atk_object);
   if (!obj)
     return NULL;
-  return obj->atk_acc_description().c_str();
+
+  return obj->GetStringAttribute(
+      AccessibilityNodeData::ATTR_DESCRIPTION).c_str();
 }
 
 static AtkObject* browser_accessibility_get_parent(AtkObject* atk_object) {
   BrowserAccessibilityGtk* obj = ToBrowserAccessibilityGtk(atk_object);
   if (!obj)
     return NULL;
   if (obj->parent())
     return obj->parent()->ToBrowserAccessibilityGtk()->GetAtkObject();
 
   BrowserAccessibilityManagerGtk* manager =
@@ skipping 260 matching lines @@
           this->parent()->ToBrowserAccessibilityGtk()->GetAtkObject());
     }
   }
 }
 
 bool BrowserAccessibilityGtk::IsNative() const {
   return true;
 }
 
 void BrowserAccessibilityGtk::InitRoleAndState() {
-  atk_acc_name_ = UTF16ToUTF8(name());
-
-  string16 description;
-  GetStringAttribute(AccessibilityNodeData::ATTR_DESCRIPTION, &description);
-  atk_acc_description_ = UTF16ToUTF8(description);
-
   switch(role_) {
     case AccessibilityNodeData::ROLE_DOCUMENT:
     case AccessibilityNodeData::ROLE_ROOT_WEB_AREA:
     case AccessibilityNodeData::ROLE_WEB_AREA:
       atk_role_ = ATK_ROLE_DOCUMENT_WEB;
       break;
     case AccessibilityNodeData::ROLE_GROUP:
     case AccessibilityNodeData::ROLE_DIV:
       atk_role_ = ATK_ROLE_SECTION;
       break;
@@ skipping 24 matching lines @@
     case AccessibilityNodeData::ROLE_WEBCORE_LINK:
       atk_role_ = ATK_ROLE_LINK;
       break;
     default:
       atk_role_ = ATK_ROLE_UNKNOWN;
       break;
   }
 }
 
 }  // namespace content