WIP: Modified AXPosition to work with objects with both embedded object characters and text.

content/browser/accessibility/ax_platform_position.cc

 // Copyright 2016 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/ax_platform_position.h"
 
 #include "content/browser/accessibility/browser_accessibility.h"
 #include "content/browser/accessibility/browser_accessibility_manager.h"
 #include "ui/accessibility/ax_enums.h"
 
@@ skipping 81 matching lines @@
     return nullptr;
   return manager->GetFromID(node_id);
 }
 
 int AXPlatformPosition::MaxTextOffset() const {
   if (IsNullPosition())
     return INVALID_OFFSET;
   return static_cast<int>(GetInnerText().length());
 }
 
+#if defined(OS_WIN) || \

[dmazzoni, 2017/03/10 19:32:25]

Nit: put the #if inside the function, not outside it.

Add a comment explaining the different semantics of
MaxTextOffsetInParent.

+    (defined(OS_LINUX) && defined(USE_X11) && !defined(OS_CHROMEOS))
+int AXPlatformPosition::MaxTextOffsetInParent() const {
+  if (IsNullPosition())
+    return INVALID_OFFSET;
+  if (GetAnchor()->IsTextOnlyObject())
+    return MaxTextOffset();
+  return 1;
+}
+#else
+int AXPlatformPosition::MaxTextOffsetInParent() const {
+  return MaxTextOffset();
+}
+#endif
+
 bool AXPlatformPosition::IsInLineBreak() const {
   if (IsNullPosition())
     return false;
 
   DCHECK(GetAnchor());
   return GetAnchor()->IsLineBreakObject();
 }
 
 std::vector<int32_t> AXPlatformPosition::GetWordStartOffsets() const {
   if (IsNullPosition())
@@ skipping 28 matching lines @@
   int previous_on_line_id;
   if (!node ||
       !node->GetIntAttribute(ui::AX_ATTR_PREVIOUS_ON_LINE_ID,
                              &previous_on_line_id)) {
     return INVALID_ANCHOR_ID;
   }
   return static_cast<int32_t>(previous_on_line_id);
 }
 
 }  // namespace content