bug 1261144 - move EnsureNGetObject to EmbeddedObjCollector r=lsocks

accessible/base/AccCollector.cpp

@@ -43,7 +43,7 @@ EmbeddedObjCollector::GetAccessibleAt(uint32_t aIndex)
 // nsAccCollector protected
 
 Accessible*
-AccCollector::EnsureNGetObject(uint32_t aIndex)
+EmbeddedObjCollector::EnsureNGetObject(uint32_t aIndex)
 {
   uint32_t childCount = mRoot->ChildCount();
   while (mRootChildIdx < childCount) {

accessible/base/AccCollector.h

@@ -25,11 +25,6 @@ public:
   virtual ~AccCollector();
 
 protected:
-  /**
-   * Ensure accessible at the given index is stored and return it.
-   */
-  Accessible* EnsureNGetObject(uint32_t aIndex);
-
   /**
    * Ensure index for the given accessible is stored and return it.
    */
@@ -78,6 +73,11 @@ public:
   Accessible* GetAccessibleAt(uint32_t aIndex);
 
 protected:
+  /**
+   * Ensure accessible at the given index is stored and return it.
+   */
+  Accessible* EnsureNGetObject(uint32_t aIndex);
+
   // Make sure it's used by Accessible class only.
   explicit EmbeddedObjCollector(Accessible* aRoot) :
     AccCollector(aRoot, filters::GetEmbeddedObject) { }