зеркало из https://github.com/mozilla/gecko-dev.git
bug 1261144 - call Accessible::IsText() directly from EmbeddedObjCollector r=lsocks
This commit is contained in:
Родитель
a6e634768b
Коммит
72142ef744
|
@ -31,7 +31,7 @@ EmbeddedObjCollector::EnsureNGetObject(uint32_t aIndex)
|
||||||
uint32_t childCount = mRoot->ChildCount();
|
uint32_t childCount = mRoot->ChildCount();
|
||||||
while (mRootChildIdx < childCount) {
|
while (mRootChildIdx < childCount) {
|
||||||
Accessible* child = mRoot->GetChildAt(mRootChildIdx++);
|
Accessible* child = mRoot->GetChildAt(mRootChildIdx++);
|
||||||
if (!(filters::GetEmbeddedObject(child) & filters::eMatch))
|
if (child->IsText())
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
AppendObject(child);
|
AppendObject(child);
|
||||||
|
@ -48,7 +48,7 @@ EmbeddedObjCollector::EnsureNGetIndex(Accessible* aAccessible)
|
||||||
uint32_t childCount = mRoot->ChildCount();
|
uint32_t childCount = mRoot->ChildCount();
|
||||||
while (mRootChildIdx < childCount) {
|
while (mRootChildIdx < childCount) {
|
||||||
Accessible* child = mRoot->GetChildAt(mRootChildIdx++);
|
Accessible* child = mRoot->GetChildAt(mRootChildIdx++);
|
||||||
if (!(filters::GetEmbeddedObject(child) & filters::eMatch))
|
if (child->IsText())
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
AppendObject(child);
|
AppendObject(child);
|
||||||
|
@ -69,8 +69,7 @@ EmbeddedObjCollector::GetIndexAt(Accessible* aAccessible)
|
||||||
if (aAccessible->mInt.mIndexOfEmbeddedChild != -1)
|
if (aAccessible->mInt.mIndexOfEmbeddedChild != -1)
|
||||||
return aAccessible->mInt.mIndexOfEmbeddedChild;
|
return aAccessible->mInt.mIndexOfEmbeddedChild;
|
||||||
|
|
||||||
return filters::GetEmbeddedObject(aAccessible) & filters::eMatch ?
|
return !aAccessible->IsText() ? EnsureNGetIndex(aAccessible) : -1;
|
||||||
EnsureNGetIndex(aAccessible) : -1;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
|
|
Загрузка…
Ссылка в новой задаче