Move some AX attrs from AXNodeData to AXTreeData.

content/browser/accessibility/browser_accessibility_win.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_win.h"
 
 #include <UIAutomationClient.h>
 #include <UIAutomationCoreApi.h>
 
 #include <algorithm>
@@ skipping 2647 matching lines @@
 // ISimpleDOMDocument methods.
 //
 
 STDMETHODIMP BrowserAccessibilityWin::get_URL(BSTR* url) {
   if (!instance_active())
     return E_FAIL;
 
   if (!url)
     return E_INVALIDARG;
 
-  return GetStringAttributeAsBstr(ui::AX_ATTR_DOC_URL, url);
+  if (this != manager()->GetRoot())
+    return E_FAIL;
+
+  std::string str = manager()->GetTreeData().url;
+  if (str.empty())
+    return S_FALSE;
+
+  *url = SysAllocString(base::UTF8ToUTF16(str).c_str());
+  DCHECK(*url);
+
+  return S_OK;
 }
 
 STDMETHODIMP BrowserAccessibilityWin::get_title(BSTR* title) {
   if (!instance_active())
     return E_FAIL;
 
   if (!title)
     return E_INVALIDARG;
 
-  return GetStringAttributeAsBstr(ui::AX_ATTR_DOC_TITLE, title);
+  std::string str = manager()->GetTreeData().title;
+  if (str.empty())
+    return S_FALSE;
+
+  *title = SysAllocString(base::UTF8ToUTF16(str).c_str());
+  DCHECK(*title);
+
+  return S_OK;
 }
 
 STDMETHODIMP BrowserAccessibilityWin::get_mimeType(BSTR* mime_type) {
   if (!instance_active())
     return E_FAIL;
 
   if (!mime_type)
     return E_INVALIDARG;
 
-  return GetStringAttributeAsBstr(
-      ui::AX_ATTR_DOC_MIMETYPE, mime_type);
+  std::string str = manager()->GetTreeData().mimetype;
+  if (str.empty())
+    return S_FALSE;
+
+  *mime_type = SysAllocString(base::UTF8ToUTF16(str).c_str());
+  DCHECK(*mime_type);
+
+  return S_OK;
 }
 
 STDMETHODIMP BrowserAccessibilityWin::get_docType(BSTR* doc_type) {
   if (!instance_active())
     return E_FAIL;
 
   if (!doc_type)
     return E_INVALIDARG;
 
-  return GetStringAttributeAsBstr(
-      ui::AX_ATTR_DOC_DOCTYPE, doc_type);
+  std::string str = manager()->GetTreeData().doctype;
+  if (str.empty())
+    return S_FALSE;
+
+  *doc_type = SysAllocString(base::UTF8ToUTF16(str).c_str());
+  DCHECK(*doc_type);
+
+  return S_OK;
 }
 
 STDMETHODIMP
 BrowserAccessibilityWin::get_nameSpaceURIForID(short name_space_id,
                                                BSTR* name_space_uri) {
   return E_NOTIMPL;
 }
 STDMETHODIMP
 BrowserAccessibilityWin::put_alternateViewMediaTypes(
     BSTR* comma_separated_media_types) {
@@ skipping 726 matching lines @@
     if (name.empty() && !title_elem_id) {
       name = placeholder;
     } else if (description.empty()) {
       description = placeholder;
     }
   }
 
   // On Windows, the value of a document should be its url.
   if (GetRole() == ui::AX_ROLE_ROOT_WEB_AREA ||
       GetRole() == ui::AX_ROLE_WEB_AREA) {
-    value = GetString16Attribute(ui::AX_ATTR_DOC_URL);
+    value = base::UTF8ToUTF16(manager()->GetTreeData().url);
   }
 
   // For certain roles (listbox option, static text, and list marker)
   // WebKit stores the main accessible text in the "value" - swap it so
   // that it's the "name".
   if (name.empty() &&
       (GetRole() == ui::AX_ROLE_STATIC_TEXT ||
        GetRole() == ui::AX_ROLE_LIST_MARKER ||
        IsListBoxOptionOrMenuListOption())) {
     base::string16 tmp = value;
@@ skipping 420 matching lines @@
   if (endpoint_index_in_common_parent < index_in_common_parent)
     return 0;
   if (endpoint_index_in_common_parent > index_in_common_parent)
     return TextForIAccessibleText().length();
 
   NOTREACHED();
   return -1;
 }
 
 int BrowserAccessibilityWin::GetSelectionAnchor() const {
-  BrowserAccessibility* root = manager()->GetRoot();
-  int32 anchor_id;
-  if (!root || !root->GetIntAttribute(ui::AX_ATTR_ANCHOR_OBJECT_ID, &anchor_id))
-    return -1;
-
+  int32 anchor_id = manager()->GetTreeData().sel_anchor_object_id;
   BrowserAccessibilityWin* anchor_object = manager()->GetFromID(
       anchor_id)->ToBrowserAccessibilityWin();
   if (!anchor_object)
     return -1;
 
-  int anchor_offset;
-  if (!root->GetIntAttribute(ui::AX_ATTR_ANCHOR_OFFSET, &anchor_offset))
-    return -1;
-
+  int32 anchor_offset = manager()->GetTreeData().sel_anchor_offset;
   return GetHypertextOffsetFromEndpoint(*anchor_object, anchor_offset);
 }
 
 int BrowserAccessibilityWin::GetSelectionFocus() const {
-  BrowserAccessibility* root = manager()->GetRoot();
-  int32 focus_id;
-  if (!root || !root->GetIntAttribute(ui::AX_ATTR_FOCUS_OBJECT_ID, &focus_id))
-    return -1;
-
+  int32 focus_id = manager()->GetTreeData().sel_focus_object_id;
   BrowserAccessibilityWin* focus_object = manager()->GetFromID(
       focus_id)->ToBrowserAccessibilityWin();
   if (!focus_object)
     return -1;
 
-  int focus_offset;
-  if (!root->GetIntAttribute(ui::AX_ATTR_FOCUS_OFFSET, &focus_offset))
-    return -1;
-
+  int focus_offset = manager()->GetTreeData().sel_focus_offset;
   return GetHypertextOffsetFromEndpoint(*focus_object, focus_offset);
 }
 
 void BrowserAccessibilityWin::GetSelectionOffsets(
     int* selection_start, int* selection_end) const {
   DCHECK(selection_start && selection_end);
 
   if (IsEditableText() && !HasState(ui::AX_STATE_RICHLY_EDITABLE) &&
       GetIntAttribute(ui::AX_ATTR_TEXT_SEL_START, selection_start) &&
       GetIntAttribute(ui::AX_ATTR_TEXT_SEL_END, selection_end)) {
@@ skipping 839 matching lines @@
     ia2_role = ia_role;
 
   win_attributes_->ia_role = ia_role;
   win_attributes_->ia_state = ia_state;
   win_attributes_->role_name = role_name;
   win_attributes_->ia2_role = ia2_role;
   win_attributes_->ia2_state = ia2_state;
 }
 
 }  // namespace content