Make HasVisibleCaretOrSelection() virtual

* I added the pure virtual function HasVisibleCaretOrSelection() on
AXPlatformNodeDelegate so we can use it in AXPlatformNodeTextProviderWin
without a dynamic cast.

* The default value in the AXPlatformNodeDelegateBase is false.

* The implementation is unchanged, but I moved it with other
AXPlatformNodeDelgate overrides.

Bug: 928948
Change-Id: If80c0a441415cb57ea0b4c352132a4d330fb56d1
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1881993Reviewed-by: Dominic Mazzoni <dmazzoni@chromium.org>
Reviewed-by: Kurt Catti-Schmidt <kschmi@microsoft.com>
Commit-Queue: Benjamin Beaudry <benjamin.beaudry@microsoft.com>
Cr-Commit-Position: refs/heads/master@{#710855}

content/browser/accessibility/browser_accessibility.cc

@@ -1077,28 +1077,6 @@ bool BrowserAccessibility::HasAction(ax::mojom::Action action_enum) const {
   return GetData().HasAction(action_enum);
 }
 
-bool BrowserAccessibility::HasVisibleCaretOrSelection() const {
-  ui::AXTree::Selection unignored_selection =
-      manager()->ax_tree()->GetUnignoredSelection();
-  int32_t focus_id = unignored_selection.focus_object_id;
-  BrowserAccessibility* focus_object = manager()->GetFromID(focus_id);
-  if (!focus_object)
-    return false;
-
-  // Selection or caret will be visible in a focused editable area.
-  if (HasState(ax::mojom::State::kEditable)) {
-    return IsPlainTextField() ? focus_object == this
-                              : focus_object->IsDescendantOf(this);
-  }
-
-  // The selection will be visible in non-editable content only if it is not
-  // collapsed into a caret.
-  return (focus_id != unignored_selection.anchor_object_id ||
-          unignored_selection.focus_offset !=
-              unignored_selection.anchor_offset) &&
-         focus_object->IsDescendantOf(this);
-}
-
 bool BrowserAccessibility::IsWebAreaForPresentationalIframe() const {
   if (GetRole() != ax::mojom::Role::kWebArea &&
       GetRole() != ax::mojom::Role::kRootWebArea) {
@@ -1296,6 +1274,28 @@ bool BrowserAccessibility::IsWebContent() const {
   return true;
 }
 
+bool BrowserAccessibility::HasVisibleCaretOrSelection() const {
+  ui::AXTree::Selection unignored_selection =
+      manager()->ax_tree()->GetUnignoredSelection();
+  int32_t focus_id = unignored_selection.focus_object_id;
+  BrowserAccessibility* focus_object = manager()->GetFromID(focus_id);
+  if (!focus_object)
+    return false;
+
+  // Selection or caret will be visible in a focused editable area.
+  if (HasState(ax::mojom::State::kEditable)) {
+    return IsPlainTextField() ? focus_object == this
+                              : focus_object->IsDescendantOf(this);
+  }
+
+  // The selection will be visible in non-editable content only if it is not
+  // collapsed into a caret.
+  return (focus_id != unignored_selection.anchor_object_id ||
+          unignored_selection.focus_offset !=
+              unignored_selection.anchor_offset) &&
+         focus_object->IsDescendantOf(this);
+}
+
 std::set<ui::AXPlatformNode*> BrowserAccessibility::GetNodesForNodeIdSet(
     const std::set<int32_t>& ids) {
   std::set<ui::AXPlatformNode*> nodes;

content/browser/accessibility/browser_accessibility.h

@@ -386,9 +386,6 @@ class CONTENT_EXPORT BrowserAccessibility : public ui::AXPlatformNodeDelegate {
   bool HasState(ax::mojom::State state_enum) const;
   bool HasAction(ax::mojom::Action action_enum) const;
 
-  // Returns true if the caret or selection is visible on this object.
-  bool HasVisibleCaretOrSelection() const;
-
   // True if this is a web area, and its grandparent is a presentational iframe.
   bool IsWebAreaForPresentationalIframe() const;
 
@@ -533,6 +530,7 @@ class CONTENT_EXPORT BrowserAccessibility : public ui::AXPlatformNodeDelegate {
   bool IsOffscreen() const override;
   bool IsMinimized() const override;
   bool IsWebContent() const override;
+  bool HasVisibleCaretOrSelection() const override;
   ui::AXPlatformNode* GetTargetNodeForRelation(
       ax::mojom::IntAttribute attr) override;
   std::set<ui::AXPlatformNode*> GetTargetNodesForRelation(

ui/accessibility/platform/ax_platform_node_delegate.h

@@ -220,6 +220,9 @@ class AX_EXPORT AXPlatformNodeDelegate {
   // Get whether this node is in web content.
   virtual bool IsWebContent() const = 0;
 
+  // Returns true if the caret or selection is visible on this object.
+  virtual bool HasVisibleCaretOrSelection() const = 0;
+
   // Get another node from this same tree.
   virtual AXPlatformNode* GetFromNodeID(int32_t id) = 0;
 

ui/accessibility/platform/ax_platform_node_delegate_base.cc

@@ -445,6 +445,10 @@ bool AXPlatformNodeDelegateBase::IsWebContent() const {
   return false;
 }
 
+bool AXPlatformNodeDelegateBase::HasVisibleCaretOrSelection() const {
+  return false;
+}
+
 AXPlatformNode* AXPlatformNodeDelegateBase::GetTargetNodeForRelation(
     ax::mojom::IntAttribute attr) {
   DCHECK(IsNodeIdIntAttribute(attr));

ui/accessibility/platform/ax_platform_node_delegate_base.h

@@ -149,6 +149,9 @@ class AX_EXPORT AXPlatformNodeDelegateBase : public AXPlatformNodeDelegate {
   // Get whether this node is in web content.
   bool IsWebContent() const override;
 
+  // Returns true if the caret or selection is visible on this object.
+  bool HasVisibleCaretOrSelection() const override;
+
   // Get another node from this same tree.
   AXPlatformNode* GetFromNodeID(int32_t id) override;