Bug 1260277 - remove empty CacheChildren's, r=marcoz

mozilla-spidermonkey · Apr 1, 2016 · cd72c69 · cd72c69
1 parent e291083
commit cd72c69
Show file tree

Hide file tree

Showing 15 changed files with 22 additions and 69 deletions.
diff --git a/accessible/generic/Accessible.cpp b/accessible/generic/Accessible.cpp
@@ -2593,7 +2593,9 @@ Accessible::EnsureChildren()
 
   // State is embedded children until text leaf accessible is appended.
   SetChildrenFlag(eEmbeddedChildren); // Prevent reentry
-  CacheChildren();
+  if (KidsFromDOM()) {
+    CacheChildren();
+  }
 }
 
 Accessible*

diff --git a/accessible/generic/Accessible.h b/accessible/generic/Accessible.h
@@ -933,7 +933,13 @@ class Accessible : public nsISupports
    * Return true if the accessible doesn't allow accessible children from XBL
    * anonymous subtree.
    */
-  bool NoXBLKids() { return mStateFlags & eNoXBLKids; }
+  bool NoXBLKids() const { return mStateFlags & eNoXBLKids; }
+
+  /**
+   * Return true if the accessible allows accessible children from subtree of
+   * a DOM element of this accessible.
+   */
+  bool KidsFromDOM() const { return !(mStateFlags & eNoKidsFromDOM); }
 
   /**
    * Return true if this accessible has a parent whose name depends on this
@@ -1032,8 +1038,9 @@ class Accessible : public nsISupports
     eSurvivingInUpdate = 1 << 8, // parent drops children to recollect them
     eRelocated = 1 << 9, // accessible was moved in tree
     eNoXBLKids = 1 << 10, // accessible don't allows XBL children
+    eNoKidsFromDOM = 1 << 11, // accessible doesn't allow children from DOM
 
-    eLastStateFlag = eNoXBLKids
+    eLastStateFlag = eNoKidsFromDOM
   };
 
   /**
@@ -1149,7 +1156,7 @@ class Accessible : public nsISupports
   int32_t mIndexInParent;
 
   static const uint8_t kChildrenFlagsBits = 2;
-  static const uint8_t kStateFlagsBits = 11;
+  static const uint8_t kStateFlagsBits = 12;
   static const uint8_t kContextFlagsBits = 3;
   static const uint8_t kTypeBits = 6;
   static const uint8_t kGenericTypesBits = 15;

diff --git a/accessible/generic/BaseAccessibles.cpp b/accessible/generic/BaseAccessibles.cpp
@@ -24,6 +24,7 @@ LeafAccessible::
   LeafAccessible(nsIContent* aContent, DocAccessible* aDoc) :
   AccessibleWrap(aContent, aDoc)
 {
+  mStateFlags |= eNoKidsFromDOM;
 }
 
 NS_IMPL_ISUPPORTS_INHERITED0(LeafAccessible, Accessible)
@@ -60,15 +61,6 @@ LeafAccessible::IsAcceptableChild(nsIContent* aEl) const
   return false;
 }
 
-////////////////////////////////////////////////////////////////////////////////
-// LeafAccessible: Accessible private
-
-void
-LeafAccessible::CacheChildren()
-{
-  // No children for leaf accessible.
-}
-
 
 ////////////////////////////////////////////////////////////////////////////////
 // LinkableAccessible

diff --git a/accessible/generic/BaseAccessibles.h b/accessible/generic/BaseAccessibles.h
@@ -42,9 +42,6 @@ class LeafAccessible : public AccessibleWrap
 
 protected:
   virtual ~LeafAccessible() {}
-
-  // Accessible
-  virtual void CacheChildren() override;
 };
 
 /**

diff --git a/accessible/generic/DocAccessible.cpp b/accessible/generic/DocAccessible.cpp
@@ -2272,8 +2272,9 @@ DocAccessible::CacheChildrenInSubtree(Accessible* aRoot,
     Accessible* child = aRoot->ContentChildAt(idx);
     NS_ASSERTION(child, "Illicit tree change while tree is created!");
     // Don't cross document boundaries.
-    if (child && child->IsContent())
+    if (child && child->IsContent()) {
       CacheChildrenInSubtree(child, aFocusedAcc);
+    }
   }
 
   // Fire document load complete on ARIA documents.

diff --git a/accessible/generic/TextLeafAccessible.cpp b/accessible/generic/TextLeafAccessible.cpp
@@ -20,6 +20,7 @@ TextLeafAccessible::
   LinkableAccessible(aContent, aDoc)
 {
   mType = eTextLeafType;
+  mStateFlags |= eNoKidsFromDOM;
 }
 
 TextLeafAccessible::~TextLeafAccessible()
@@ -50,9 +51,3 @@ TextLeafAccessible::Name(nsString& aName)
   aName = mText;
   return eNameOK;
 }
-
-void
-TextLeafAccessible::CacheChildren()
-{
-  // No children for text accessible.
-}
diff --git a/accessible/generic/TextLeafAccessible.h b/accessible/generic/TextLeafAccessible.h
@@ -30,10 +30,6 @@ class TextLeafAccessible : public LinkableAccessible
   void SetText(const nsAString& aText) { mText = aText; }
   const nsString& Text() const { return mText; }
 
-protected:
-  // Accessible
-  virtual void CacheChildren() override;
-
 protected:
   nsString mText;
 };

diff --git a/accessible/html/HTMLSelectAccessible.cpp b/accessible/html/HTMLSelectAccessible.cpp
@@ -337,6 +337,7 @@ HTMLComboboxAccessible::
 {
   mType = eHTMLComboboxType;
   mGenericTypes |= eCombobox;
+  mStateFlags |= eNoKidsFromDOM;
 
   nsIComboboxControlFrame* comboFrame = do_QueryFrame(GetFrame());
   if (comboFrame) {
@@ -369,11 +370,6 @@ HTMLComboboxAccessible::RemoveChild(Accessible* aChild)
   return false;
 }
 
-void
-HTMLComboboxAccessible::CacheChildren()
-{
-}
-
 void
 HTMLComboboxAccessible::Shutdown()
 {

diff --git a/accessible/html/HTMLSelectAccessible.h b/accessible/html/HTMLSelectAccessible.h
@@ -183,9 +183,6 @@ class HTMLComboboxAccessible final : public AccessibleWrap
   virtual void SetCurrentItem(Accessible* aItem) override;
 
 protected:
-  // Accessible
-  virtual void CacheChildren() override;
-
   /**
    * Return selected option.
    */

diff --git a/accessible/windows/msaa/HTMLWin32ObjectAccessible.cpp b/accessible/windows/msaa/HTMLWin32ObjectAccessible.cpp
@@ -19,6 +19,8 @@ HTMLWin32ObjectOwnerAccessible::
                                  DocAccessible* aDoc, void* aHwnd) :
   AccessibleWrap(aContent, aDoc), mHwnd(aHwnd)
 {
+  mStateFlags |= eNoKidsFromDOM;
+
   // Our only child is a HTMLWin32ObjectAccessible object.
   if (mHwnd) {
     mNativeAccessible = new HTMLWin32ObjectAccessible(mHwnd, aDoc);
@@ -50,15 +52,6 @@ HTMLWin32ObjectOwnerAccessible::NativelyUnavailable() const
   return !mHwnd;
 }
 
-////////////////////////////////////////////////////////////////////////////////
-// HTMLWin32ObjectOwnerAccessible: Accessible protected implementation
-
-void
-HTMLWin32ObjectOwnerAccessible::CacheChildren()
-{
-}
-
-
 ////////////////////////////////////////////////////////////////////////////////
 // HTMLWin32ObjectAccessible
 ////////////////////////////////////////////////////////////////////////////////

diff --git a/accessible/windows/msaa/HTMLWin32ObjectAccessible.h b/accessible/windows/msaa/HTMLWin32ObjectAccessible.h
@@ -32,10 +32,6 @@ class HTMLWin32ObjectOwnerAccessible : public AccessibleWrap
   virtual bool NativelyUnavailable() const;
 
 protected:
-
-  // Accessible
-  virtual void CacheChildren();
-
   void* mHwnd;
   RefPtr<Accessible> mNativeAccessible;
 };

diff --git a/accessible/xul/XULTreeAccessible.cpp b/accessible/xul/XULTreeAccessible.cpp
@@ -1070,6 +1070,7 @@ XULTreeItemAccessible::
                         nsITreeView* aTreeView, int32_t aRow) :
   XULTreeItemAccessibleBase(aContent, aDoc, aParent, aTree, aTreeView, aRow)
 {
+  mStateFlags |= eNoKidsFromDOM;
   mColumn = nsCoreUtils::GetFirstSensibleColumn(mTree);
   GetCellName(mColumn, mCachedName);
 }
@@ -1143,14 +1144,6 @@ XULTreeItemAccessible::RowInvalidated(int32_t aStartColIdx, int32_t aEndColIdx)
   }
 }
 
-////////////////////////////////////////////////////////////////////////////////
-// XULTreeItemAccessible: Accessible protected implementation
-
-void
-XULTreeItemAccessible::CacheChildren()
-{
-}
-
 
 ////////////////////////////////////////////////////////////////////////////////
 //  XULTreeColumAccessible

diff --git a/accessible/xul/XULTreeAccessible.h b/accessible/xul/XULTreeAccessible.h
@@ -241,9 +241,6 @@ class XULTreeItemAccessible : public XULTreeItemAccessibleBase
 protected:
   virtual ~XULTreeItemAccessible();
 
-  // Accessible
-  virtual void CacheChildren() override;
-
   // XULTreeItemAccessible
   nsCOMPtr<nsITreeColumn> mColumn;
   nsString mCachedName;

diff --git a/accessible/xul/XULTreeGridAccessible.cpp b/accessible/xul/XULTreeGridAccessible.cpp
@@ -249,6 +249,7 @@ XULTreeGridRowAccessible::
   mAccessibleCache(kDefaultTreeCacheLength)
 {
   mGenericTypes |= eTableRow;
+  mStateFlags |= eNoKidsFromDOM;
 }
 
 XULTreeGridRowAccessible::~XULTreeGridRowAccessible()
@@ -409,13 +410,6 @@ XULTreeGridRowAccessible::RowInvalidated(int32_t aStartColIdx,
 
 }
 
-////////////////////////////////////////////////////////////////////////////////
-// XULTreeGridRowAccessible: Accessible protected implementation
-
-void
-XULTreeGridRowAccessible::CacheChildren()
-{
-}
 
 ////////////////////////////////////////////////////////////////////////////////
 // XULTreeGridCellAccessible

diff --git a/accessible/xul/XULTreeGridAccessible.h b/accessible/xul/XULTreeGridAccessible.h
@@ -97,9 +97,6 @@ class XULTreeGridRowAccessible final : public XULTreeItemAccessibleBase
 protected:
   virtual ~XULTreeGridRowAccessible();
 
-  // Accessible
-  virtual void CacheChildren() override;
-
   // XULTreeItemAccessibleBase
   mutable nsRefPtrHashtable<nsPtrHashKey<const void>, XULTreeGridCellAccessible>
     mAccessibleCache;