De-templatize ui::AXPosition

content/browser/accessibility/browser_accessibility_com_win.cc

 // Copyright (c) 2017 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_com_win.h"
 
 #include <UIAutomationClient.h>
 #include <UIAutomationCoreApi.h>
 
 #include <algorithm>
@@ skipping 202 matching lines @@
     content::AccessibilityMode::kHTML;
 
 const WCHAR* const IA2_RELATION_DETAILS = L"details";
 const WCHAR* const IA2_RELATION_DETAILS_FOR = L"detailsFor";
 const WCHAR* const IA2_RELATION_ERROR_MESSAGE = L"errorMessage";
 
 }  // namespace
 
 namespace content {
 
-using AXPlatformPositionInstance = AXPlatformPosition::AXPositionInstance;
+using AXPlatformPositionInstance = AXPlatformPosition::ConcreteInstance;
+using AXAbstractPositionInstance = AXPlatformPosition::AXPositionInstance;
 using AXPlatformRange = ui::AXRange<AXPlatformPositionInstance::element_type>;
 
 // These nonstandard GUIDs are taken directly from the Mozilla sources
 // (accessible/src/msaa/nsAccessNodeWrap.cpp); some documentation is here:
 // http://developer.mozilla.org/en/Accessibility/AT-APIs/ImplementationFeatures/MSAA
 const GUID GUID_ISimpleDOM = {0x0c539790,
                               0x12e4,
                               0x11cf,
                               {0xb6, 0x61, 0x00, 0xaa, 0x00, 0x4c, 0xd6, 0xd8}};
 const GUID GUID_IAccessibleContentDocument = {
@@ skipping 3373 matching lines @@
     else
       start_offset += 1;
   }
 
   win_attributes_->offset_to_text_attributes.swap(attributes_map);
 }
 
 // |offset| could either be a text character or a child index in case of
 // non-text objects.
 // TODO(nektar): Remove this function once selection bugs are fixed in Blink.
-AXPlatformPosition::AXPositionInstance
+AXPlatformPosition::ConcreteInstance
 BrowserAccessibilityComWin::CreatePositionForSelectionAt(int offset) const {
   if (!owner()->IsNativeTextControl() && !owner()->IsTextOnlyObject()) {
     auto* manager = Manager();
     DCHECK(manager);
     const BrowserAccessibilityComWin* child = this;
     // TODO(nektar): Make parents of text-only objects not include the text of
     // children in their hypertext.
     for (size_t i = 0; i < owner()->InternalChildCount(); ++i) {
       int new_offset = offset;
       child = ToBrowserAccessibilityComWin(owner()->InternalGetChild(i));
       DCHECK(child);
       if (child->owner()->IsTextOnlyObject()) {
         new_offset -= child->owner()->GetText().length();
       } else {
         new_offset -= 1;
       }
       if (new_offset <= 0)
         break;
       offset = new_offset;
     }
-    AXPlatformPositionInstance position =
-        AXPlatformPosition::CreateTextPosition(manager->ax_tree_id(),
-                                               child->owner()->GetId(), offset,
-                                               ui::AX_TEXT_AFFINITY_DOWNSTREAM)
-            ->AsLeafTextPosition();
+    AXPlatformPositionInstance position = AXPlatformPosition::FromBase(
+        AXPlatformPosition::CreateConcreteTextPosition(
+            manager->ax_tree_id(), child->owner()->GetId(), offset,
+            ui::AX_TEXT_AFFINITY_DOWNSTREAM)
+            ->AsLeafTextPosition());
     if (position->GetAnchor() &&
         position->GetAnchor()->GetRole() == ui::AX_ROLE_INLINE_TEXT_BOX) {
-      return position->CreateParentPosition();
+      return AXPlatformPosition::FromBase(position->CreateParentPosition());
     }
     return position;
   }
   return owner()->CreatePositionAt(offset);
 }
 
 //
 // Private methods.
 //
 
@@ skipping 625 matching lines @@
 }
 
 void BrowserAccessibilityComWin::SetIA2HypertextSelection(LONG start_offset,
                                                           LONG end_offset) {
   HandleSpecialTextOffset(&start_offset);
   HandleSpecialTextOffset(&end_offset);
   AXPlatformPositionInstance start_position =
       CreatePositionForSelectionAt(static_cast<int>(start_offset));
   AXPlatformPositionInstance end_position =
       CreatePositionForSelectionAt(static_cast<int>(end_offset));
-  Manager()->SetSelection(AXPlatformRange(start_position->AsTextPosition(),
-                                          end_position->AsTextPosition()));
+  Manager()->SetSelection(ui::AXAbstractRange(start_position->AsTextPosition(),
+                                              end_position->AsTextPosition()));
 }
 
 void BrowserAccessibilityComWin::StringAttributeToIA2(
     ui::AXStringAttribute attribute,
     const char* ia2_attr) {
   base::string16 value;
   if (owner()->GetString16Attribute(attribute, &value)) {
     SanitizeStringAttributeForIA2(value, &value);
     win_attributes_->ia2_attributes.push_back(base::ASCIIToUTF16(ia2_attr) +
                                               L":" + value);
@@ skipping 389 matching lines @@
   // affinity, otherwise default to downstream affinity.
   ui::AXTextAffinity affinity =
       start_offset == IA2_TEXT_OFFSET_CARET
           ? Manager()->GetTreeData().sel_focus_affinity
           : ui::AX_TEXT_AFFINITY_DOWNSTREAM;
 
   HandleSpecialTextOffset(&start_offset);
   if (ia2_boundary == IA2_TEXT_BOUNDARY_WORD) {
     switch (direction) {
       case ui::FORWARDS_DIRECTION: {
-        AXPlatformPositionInstance position =
+        AXAbstractPositionInstance position =
             owner()->CreatePositionAt(static_cast<int>(start_offset), affinity);
-        AXPlatformPositionInstance next_word =
+        AXAbstractPositionInstance next_word =
             position->CreateNextWordStartPosition();
         if (next_word->anchor_id() != owner()->GetId())
           next_word = position->CreatePositionAtEndOfAnchor();
         return next_word->text_offset();
       }
       case ui::BACKWARDS_DIRECTION: {
-        AXPlatformPositionInstance position =
+        AXAbstractPositionInstance position =
             owner()->CreatePositionAt(static_cast<int>(start_offset), affinity);
-        AXPlatformPositionInstance previous_word;
+        AXAbstractPositionInstance previous_word;
         if (!position->AtStartOfWord()) {
           previous_word = position->CreatePreviousWordStartPosition();
           if (previous_word->anchor_id() != owner()->GetId())
             previous_word = position->CreatePositionAtStartOfAnchor();
         } else {
           previous_word = std::move(position);
         }
         return previous_word->text_offset();
       }
     }
   }
 
   if (ia2_boundary == IA2_TEXT_BOUNDARY_LINE) {
     switch (direction) {
       case ui::FORWARDS_DIRECTION: {
-        AXPlatformPositionInstance position =
+        AXAbstractPositionInstance position =
             owner()->CreatePositionAt(static_cast<int>(start_offset), affinity);
-        AXPlatformPositionInstance next_line =
+        AXAbstractPositionInstance next_line =
             position->CreateNextLineStartPosition();
         if (next_line->anchor_id() != owner()->GetId())
           next_line = position->CreatePositionAtEndOfAnchor();
         return next_line->text_offset();
       }
       case ui::BACKWARDS_DIRECTION: {
-        AXPlatformPositionInstance position =
+        AXAbstractPositionInstance position =
             owner()->CreatePositionAt(static_cast<int>(start_offset), affinity);
-        AXPlatformPositionInstance previous_line;
+        AXAbstractPositionInstance previous_line;
         if (!position->AtStartOfLine()) {
           previous_line = position->CreatePreviousLineStartPosition();
           if (previous_line->anchor_id() != owner()->GetId())
             previous_line = position->CreatePositionAtStartOfAnchor();
         } else {
           previous_line = std::move(position);
         }
         return previous_line->text_offset();
       }
     }
@@ skipping 845 matching lines @@
 
 BrowserAccessibilityComWin* ToBrowserAccessibilityComWin(
     BrowserAccessibility* obj) {
   if (!obj || !obj->IsNative())
     return nullptr;
   auto* result = static_cast<BrowserAccessibilityWin*>(obj)->GetCOM();
   return result;
 }
 
 }  // namespace content