From 72142ef7443f5a757b671e31a92fcd9a3110987d Mon Sep 17 00:00:00 2001 From: Trevor Saunders Date: Wed, 30 Mar 2016 19:20:20 -0400 Subject: [PATCH] bug 1261144 - call Accessible::IsText() directly from EmbeddedObjCollector r=lsocks --- accessible/base/EmbeddedObjCollector.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/accessible/base/EmbeddedObjCollector.cpp b/accessible/base/EmbeddedObjCollector.cpp index af2445ff250f..226d1365f6c0 100644 --- a/accessible/base/EmbeddedObjCollector.cpp +++ b/accessible/base/EmbeddedObjCollector.cpp @@ -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