diff options
| author | dmazzoni@chromium.org <dmazzoni@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-08 08:59:51 +0000 |
|---|---|---|
| committer | dmazzoni@chromium.org <dmazzoni@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-08 08:59:51 +0000 |
| commit | f7351e245beb3ae31e49fe7f8f97e185c4cc3e5f (patch) | |
| tree | 2d6cf6188a979b28e266b67b3401650b6124424c /content | |
| parent | a96cf1423c5c82a2d601457ba953586ecfbe74d9 (diff) | |
| download | chromium_src-f7351e245beb3ae31e49fe7f8f97e185c4cc3e5f.zip chromium_src-f7351e245beb3ae31e49fe7f8f97e185c4cc3e5f.tar.gz chromium_src-f7351e245beb3ae31e49fe7f8f97e185c4cc3e5f.tar.bz2 | |
Fix infinite recursion in Android accessibility.
Bug introduced by r232429.
BUG=314812,314376
Review URL: https://codereview.chromium.org/63873002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@233833 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
| -rw-r--r-- | content/browser/accessibility/browser_accessibility_android.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/content/browser/accessibility/browser_accessibility_android.cc b/content/browser/accessibility/browser_accessibility_android.cc index 6fe3afb..77b5348 100644 --- a/content/browser/accessibility/browser_accessibility_android.cc +++ b/content/browser/accessibility/browser_accessibility_android.cc @@ -339,8 +339,10 @@ int BrowserAccessibilityAndroid::GetEditableTextLength() const { } bool BrowserAccessibilityAndroid::HasFocusableChild() const { - for (uint32 i = 0; i < PlatformChildCount(); i++) { - BrowserAccessibility* child = PlatformGetChild(i); + // This is called from PlatformIsLeaf, so don't call PlatformChildCount + // from within this! + for (uint32 i = 0; i < child_count(); i++) { + BrowserAccessibility* child = children()[i]; if (child->HasState(blink::WebAXStateFocusable)) return true; if (static_cast<BrowserAccessibilityAndroid*>(child)->HasFocusableChild()) |