Remove BrowserAccessibility::platform_node_

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 <stddef.h>
 
 #include <algorithm>
 #include <iterator>
@@ skipping 22 matching lines @@
 #if !defined(PLATFORM_HAS_NATIVE_ACCESSIBILITY_IMPL)
 // static
 BrowserAccessibility* BrowserAccessibility::Create() {
   return new BrowserAccessibility();
 }
 #endif
 
 BrowserAccessibility::BrowserAccessibility()
     : manager_(nullptr),
       node_(nullptr),
-      unique_id_(ui::GetNextAXPlatformNodeUniqueId()),
-      platform_node_(nullptr) {
+      unique_id_(ui::GetNextAXPlatformNodeUniqueId()) {
   g_unique_id_map.Get()[unique_id_] = this;
 }
 
 BrowserAccessibility::~BrowserAccessibility() {
   if (unique_id_)
     g_unique_id_map.Get().erase(unique_id_);
-  if (platform_node_)
-    platform_node_->Destroy();
 }
 
 // static
 BrowserAccessibility* BrowserAccessibility::GetFromUniqueID(int32_t unique_id) {
   auto iter = g_unique_id_map.Get().find(unique_id);
   if (iter == g_unique_id_map.Get().end())
     return nullptr;
 
   return iter->second;
 }
 
 void BrowserAccessibility::Init(BrowserAccessibilityManager* manager,
     ui::AXNode* node) {
   manager_ = manager;
   node_ = node;
-
-// Here we create the AXPlatformNode which contains a platform-specific
-// implementation of requried accessibility APIS for this node. At this point,
-// we only are creating this object for Windows. See http://crbug.com/703369
-#if defined(OS_WIN)
-  platform_node_ = ui::AXPlatformNode::Create(this);
-#endif
 }
 
 bool BrowserAccessibility::PlatformIsLeaf() const {
   if (InternalChildCount() == 0)
     return true;
 
   // These types of objects may have children that we use as internal
   // implementation details, but we want to expose them as leaves to platform
   // accessibility APIs because screen readers might be confused if they find
   // any children.
@@ skipping 1047 matching lines @@
         bounds.Offset(-sx, -sy);
       }
     }
 
     node = container;
   }
 
   return gfx::ToEnclosingRect(bounds);
 }
 
+gfx::NativeViewAccessible BrowserAccessibility::GetNativeViewAccessible() {
+  // TODO(703369) On Windows, where we have started to migrate to an
+  // AXPlatformNode implementation, the BrowserAccessibilityWin subclass has
+  // overridden this method. On all other platforms, this method should not be
+  // called yet. In the future, when all subclasses have moved over to be
+  // implemented by AXPlatformNode, we may make this method completely virtual.
+  NOTREACHED();
+  return nullptr;
+}
+
 //
 // AXPlatformNodeDelegate.
 //
 const ui::AXNodeData& BrowserAccessibility::GetData() const {
   CR_DEFINE_STATIC_LOCAL(ui::AXNodeData, empty_data, ());
   if (node_)
     return node_->data();
   else
     return empty_data;
 }
 
 gfx::NativeWindow BrowserAccessibility::GetTopLevelWidget() {
   NOTREACHED();
   return nullptr;
 }
 
 gfx::NativeViewAccessible BrowserAccessibility::GetParent() {
   auto* parent = PlatformGetParent();
-  if (parent && parent->platform_node_)
-    return parent->platform_node_->GetNativeViewAccessible();
-  return nullptr;
+  if (!parent)
+    return nullptr;
+
+  return parent->GetNativeViewAccessible();
 }
 
 int BrowserAccessibility::GetChildCount() {
   return PlatformChildCount();
 }
 
 gfx::NativeViewAccessible BrowserAccessibility::ChildAtIndex(int index) {
   auto* child = PlatformGetChild(index);
-  if (child && child->platform_node_)
-    return child->platform_node_->GetNativeViewAccessible();
-  return nullptr;
+  if (!child)
+    return nullptr;
+
+  return child->GetNativeViewAccessible();
 }
 
 gfx::Rect BrowserAccessibility::GetScreenBoundsRect() const {
   gfx::Rect bounds = GetPageBoundsRect();
 
   // Adjust the bounds by the top left corner of the containing view's bounds
   // in screen coordinates.
   bounds.Offset(manager_->GetViewBounds().OffsetFromOrigin());
 
   return bounds;
@@ skipping 15 matching lines @@
   return gfx::kNullAcceleratedWidget;
 }
 
 bool BrowserAccessibility::AccessibilityPerformAction(
     const ui::AXActionData& data) {
   NOTREACHED();
   return false;
 }
 
 }  // namespace content