Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-28 07:13:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

bug 1261144 - call Accessible::IsText() directly from EmbeddedObjCollector r=lsocks

Browse Source
This commit is contained in:
Trevor Saunders 2016-03-30 19:20:20 -04:00
parent a6e634768b
commit 72142ef744
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
accessible/base/EmbeddedObjCollector.cpp
View File

@ -31,7 +31,7 @@ EmbeddedObjCollector::EnsureNGetObject(uint32_t aIndex)
uint32_t childCount = mRoot->ChildCount();
while (mRootChildIdx < childCount) {
Accessible* child = mRoot->GetChildAt(mRootChildIdx++);
if (!(filters::GetEmbeddedObject(child) & filters::eMatch))
if (child->IsText())
continue;
AppendObject(child);
@ -48,7 +48,7 @@ EmbeddedObjCollector::EnsureNGetIndex(Accessible* aAccessible)
uint32_t childCount = mRoot->ChildCount();
while (mRootChildIdx < childCount) {
Accessible* child = mRoot->GetChildAt(mRootChildIdx++);
if (!(filters::GetEmbeddedObject(child) & filters::eMatch))
if (child->IsText())
continue;
AppendObject(child);
@ -69,8 +69,7 @@ EmbeddedObjCollector::GetIndexAt(Accessible* aAccessible)
if (aAccessible->mInt.mIndexOfEmbeddedChild != -1)
return aAccessible->mInt.mIndexOfEmbeddedChild;
return filters::GetEmbeddedObject(aAccessible) & filters::eMatch ?
EnsureNGetIndex(aAccessible) : -1;
return !aAccessible->IsText() ? EnsureNGetIndex(aAccessible) : -1;
}
void