| Index: content/browser/accessibility/browser_accessibility_cocoa.mm
|
| diff --git a/content/browser/accessibility/browser_accessibility_cocoa.mm b/content/browser/accessibility/browser_accessibility_cocoa.mm
|
| index 84415e1785bf7386e20290f7178d57c1dd5d4550..947575e6f7cd3bbb3c4b7745c01dcda39a98edad 100644
|
| --- a/content/browser/accessibility/browser_accessibility_cocoa.mm
|
| +++ b/content/browser/accessibility/browser_accessibility_cocoa.mm
|
| @@ -1775,15 +1775,15 @@ bool InitializeAccessibilityTreeSearch(
|
| return nil;
|
|
|
| DCHECK(object);
|
| - if (object->IsTextOnlyObject() &&
|
| + if ((object->IsSimpleTextControl() || object->IsTextOnlyObject()) &&
|
| offset < static_cast<int>(object->GetText().length())) {
|
| ++offset;
|
| } else {
|
| - offset = 0;
|
| - while (object &&
|
| - !(object->IsTextOnlyObject() && object->GetText().length() == 0)) {
|
| + do {
|
| object = BrowserAccessibilityManager::NextTextOnlyObject(object);
|
| - }
|
| + } while (
|
| + object &&
|
| + !(object->IsTextOnlyObject() && object->GetText().length() == 0));
|
| if (!object)
|
| return nil;
|
|
|
| @@ -1800,13 +1800,15 @@ bool InitializeAccessibilityTreeSearch(
|
| return nil;
|
|
|
| DCHECK(object);
|
| - if (object->IsTextOnlyObject() && offset > 0) {
|
| + if ((object->IsSimpleTextControl() || object->IsTextOnlyObject()) &&
|
| + offset > 0) {
|
| --offset;
|
| } else {
|
| - while (object &&
|
| - !(object->IsTextOnlyObject() && object->GetText().length() == 0)) {
|
| + do {
|
| object = BrowserAccessibilityManager::PreviousTextOnlyObject(object);
|
| - }
|
| + } while (
|
| + object &&
|
| + !(object->IsTextOnlyObject() && object->GetText().length() == 0));
|
| if (!object)
|
| return nil;
|
|
|
|
|