Move some AX attrs from AXNodeData to AXTreeData.

content/browser/accessibility/browser_accessibility.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.h"
 
 #include <algorithm>
 
 #include "base/logging.h"
 #include "base/strings/string_number_conversions.h"
@@ skipping 634 matching lines @@
           GetRole() == ui::AX_ROLE_ROW_HEADER);
 }
 
 bool BrowserAccessibility::HasCaret() const {
   if (IsEditableText() && !HasState(ui::AX_STATE_RICHLY_EDITABLE) &&
       HasIntAttribute(ui::AX_ATTR_TEXT_SEL_START) &&
       HasIntAttribute(ui::AX_ATTR_TEXT_SEL_END)) {
     return true;
   }
 
-  BrowserAccessibility* root = manager()->GetRoot();
   // The caret is always at the focus of the selection.
-  int32 focus_id;
-  if (!root || !root->GetIntAttribute(ui::AX_ATTR_FOCUS_OBJECT_ID, &focus_id))
+  int32 focus_id = manager()->GetTreeData().sel_focus_object_id;
+  if (focus_id == -1)
     return false;
 
   BrowserAccessibility* focus_object = manager()->GetFromID(focus_id);
   if (!focus_object)
     return false;
 
   if (!focus_object->IsDescendantOf(this))
     return false;
 
   return true;
@@ skipping 124 matching lines @@
       }
       need_to_offset_web_area = true;
     }
     parent = parent->GetParent();
   }
 
   return bounds;
 }
 
 }  // namespace content