Move some AX attrs from AXNodeData to AXTreeData.

content/browser/accessibility/browser_accessibility_manager_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_manager_win.h"
 
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/win/scoped_comptr.h"
 #include "base/win/windows_version.h"
 #include "content/browser/accessibility/browser_accessibility_state_impl.h"
 #include "content/browser/accessibility/browser_accessibility_win.h"
 #include "content/browser/renderer_host/legacy_render_widget_host_win.h"
 #include "content/common/accessibility_messages.h"
 #include "ui/base/win/atl_module.h"
 
 namespace content {
 
 // static
 BrowserAccessibilityManager* BrowserAccessibilityManager::Create(
-    const SimpleAXTreeUpdate& initial_tree,
+    const ui::AXTreeUpdate& initial_tree,
     BrowserAccessibilityDelegate* delegate,
     BrowserAccessibilityFactory* factory) {
   return new BrowserAccessibilityManagerWin(initial_tree, delegate, factory);
 }
 
 BrowserAccessibilityManagerWin*
 BrowserAccessibilityManager::ToBrowserAccessibilityManagerWin() {
   return static_cast<BrowserAccessibilityManagerWin*>(this);
 }
 
 BrowserAccessibilityManagerWin::BrowserAccessibilityManagerWin(
-    const SimpleAXTreeUpdate& initial_tree,
+    const ui::AXTreeUpdate& initial_tree,
     BrowserAccessibilityDelegate* delegate,
     BrowserAccessibilityFactory* factory)
     : BrowserAccessibilityManager(delegate, factory),
       tracked_scroll_object_(NULL),
       focus_event_on_root_needed_(false),
       inside_on_window_focused_(false) {
   ui::win::CreateATLModuleIfNeeded();
   Initialize(initial_tree);
 }
 
 BrowserAccessibilityManagerWin::~BrowserAccessibilityManagerWin() {
   if (tracked_scroll_object_) {
     tracked_scroll_object_->Release();
     tracked_scroll_object_ = NULL;
   }
 }
 
 // static
-SimpleAXTreeUpdate
+ui::AXTreeUpdate
     BrowserAccessibilityManagerWin::GetEmptyDocument() {
   ui::AXNodeData empty_document;
   empty_document.id = 0;
   empty_document.role = ui::AX_ROLE_ROOT_WEB_AREA;
   empty_document.state =
       (1 << ui::AX_STATE_ENABLED) |
       (1 << ui::AX_STATE_READ_ONLY) |
       (1 << ui::AX_STATE_BUSY);
 
-  SimpleAXTreeUpdate update;
+  ui::AXTreeUpdate update;
   update.nodes.push_back(empty_document);
   return update;
 }
 
 HWND BrowserAccessibilityManagerWin::GetParentHWND() {
   if (!delegate_)
     return NULL;
   return delegate_->AccessibilityGetAcceleratedWidget();
 }
 
@@ skipping 41 matching lines @@
       (!delegate_->AccessibilityViewHasFocus())) {
     return;
   }
 
   // NVDA gets confused if we focus the main document element when it hasn't
   // finished loading and it has no children at all, so suppress that event.
   if (event == EVENT_OBJECT_FOCUS &&
       node == GetRoot() &&
       node->PlatformChildCount() == 0 &&
       !node->HasState(ui::AX_STATE_BUSY) &&
-      !node->GetBoolAttribute(ui::AX_ATTR_DOC_LOADED)) {
+      !node->manager()->GetTreeData().loaded) {
     return;
   }
 
   // If a focus event is needed on the root, fire that first before
   // this event.
   if (event == EVENT_OBJECT_FOCUS && node == GetRoot())
     focus_event_on_root_needed_ = false;
   else if (focus_event_on_root_needed_)
     OnWindowFocused();
 
@@ skipping 62 matching lines @@
       !root_delegate->AccessibilityViewHasFocus()) {
     return;
   }
 
   // NVDA gets confused if we focus the main document element when it hasn't
   // finished loading and it has no children at all, so suppress that event.
   if (event_type == ui::AX_EVENT_FOCUS &&
       node == GetRoot() &&
       node->PlatformChildCount() == 0 &&
       !node->HasState(ui::AX_STATE_BUSY) &&
-      !node->GetBoolAttribute(ui::AX_ATTR_DOC_LOADED)) {
+      !node->manager()->GetTreeData().loaded) {
     return;
   }
 
   // If a focus event is needed on the root, fire that first before
   // this event.
   if (event_type == ui::AX_EVENT_FOCUS && node == GetRoot())
     focus_event_on_root_needed_ = false;
   else if (focus_event_on_root_needed_)
     OnWindowFocused();
 
@@ skipping 188 matching lines @@
     return nullptr;
 
   BrowserAccessibility* result = GetFromID(iter->second);
   if (result && result->IsNative())
     return result->ToBrowserAccessibilityWin();
 
   return nullptr;
 }
 
 }  // namespace content