Fixed IAccessibleText::TextAtOffset with IA2_TEXT_BOUNDARY_WORD to return text that spans from the …

content/browser/accessibility/browser_accessibility_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_win.h"
 
 #include <UIAutomationClient.h>
 #include <UIAutomationCoreApi.h>
 
 #include "base/strings/string_number_conversions.h"
@@ skipping 3279 matching lines @@
       NOTREACHED();
       return ui::CHAR_BOUNDARY;
   }
 }
 
 LONG BrowserAccessibilityWin::FindBoundary(
     const base::string16& text,
     IA2TextBoundaryType ia2_boundary,
     LONG start_offset,
     ui::TextBoundaryDirection direction) {
+  if (ia2_boundary == IA2_TEXT_BOUNDARY_WORD && IsEditableText())

[dmazzoni, 2014/11/03 16:26:49]

The fact that you're calling IsEditableText() here makes me think that this code
isn't going to work when moving by word in non-editable text. Did you notice a
difference in behavior in NVDA or JAWS when moving by word in static text?
Honestly I didn't even realize they call IAccessibleText for static text - do
they?

+    return GetWordStartBoundary(static_cast<int>(start_offset), direction);
+
   HandleSpecialTextOffset(text, &start_offset);

[dmazzoni, 2014/11/03 16:26:49]

I think you should do this call before GetWordStartBoundary, otherwise you
wont't handle IA2_TEXT_OFFSET_LENGTH and IA2_TEXT_OFFSET_CARET correctly.

   ui::TextBoundaryType boundary = IA2TextBoundaryToTextBoundary(ia2_boundary);
   const std::vector<int32>& line_breaks = GetIntListAttribute(
       ui::AX_ATTR_LINE_BREAKS);
   return ui::FindAccessibleTextBoundary(
       text, line_breaks, boundary, start_offset, direction);
 }
 
 BrowserAccessibilityWin* BrowserAccessibilityWin::GetFromID(int32 id) {
   return manager()->GetFromID(id)->ToBrowserAccessibilityWin();
 }
@@ skipping 546 matching lines @@
   // The role should always be set.
   DCHECK(!role_name_.empty() || ia_role_);
 
   // If we didn't explicitly set the IAccessible2 role, make it the same
   // as the MSAA role.
   if (!ia2_role_)
     ia2_role_ = ia_role_;
 }
 
 }  // namespace content