[Bug 779386] Clean up some includes in a11y r=surkov

accessible/src/base/Logging.cpp

@@ -19,6 +19,7 @@
 #include "nsTraceRefcntImpl.h"
 #include "nsIWebProgress.h"
 #include "prenv.h"
+#include "nsIDocShellTreeItem.h"
 
 using namespace mozilla;
 using namespace mozilla::a11y;

accessible/src/base/TextAttrs.cpp

@@ -208,6 +208,9 @@ TextAttrsMgr::LangTextAttr::
   }
 }
 
+TextAttrsMgr::LangTextAttr::
+  ~LangTextAttr() {}
+
 bool
 TextAttrsMgr::LangTextAttr::
   GetValueFor(Accessible* aAccessible, nsString* aValue)

accessible/src/base/TextAttrs.h

@@ -6,12 +6,16 @@
 #ifndef nsTextAttrs_h_
 #define nsTextAttrs_h_
 
-#include "nsIContent.h"
-#include "nsIFrame.h"
-#include "nsIPersistentProperties2.h"
+#include "nsCOMPtr.h"
+#include "nsColor.h"
 #include "nsStyleConsts.h"
 
 class HyperTextAccessible;
+class nsIFrame;
+class nsIPersistentProperties;
+class nsIContent;
+class Accessible;
+class nsDeviceContext;
 
 namespace mozilla {
 namespace a11y {
@@ -193,7 +197,7 @@ protected:
   public:
     LangTextAttr(HyperTextAccessible* aRoot, nsIContent* aRootElm,
                  nsIContent* aElm);
-    virtual ~LangTextAttr() { }
+    virtual ~LangTextAttr();
 
   protected:
 

accessible/src/base/nsAccUtils.cpp

@@ -15,6 +15,7 @@
 #include "Role.h"
 #include "States.h"
 #include "TextLeafAccessible.h"
+#include "nsIMutableArray.h"
 
 #include "nsIDOMXULContainerElement.h"
 #include "nsIDOMXULSelectCntrlEl.h"

accessible/src/base/nsAccUtils.h

@@ -16,6 +16,7 @@
 
 #include "mozilla/dom/Element.h"
 #include "nsIDocShell.h"
+#include "nsIDocShellTreeItem.h"
 #include "nsIDOMNode.h"
 #include "nsIPersistentProperties2.h"
 #include "nsIPresShell.h"

accessible/src/base/nsAccessNode.cpp

@@ -148,6 +148,18 @@ nsAccessNode::GetFrame() const
   return mContent ? mContent->GetPrimaryFrame() : nullptr;
 }
 
+nsINode*
+nsAccessNode::GetNode() const
+{
+  return mContent;
+}
+
+nsIDocument*
+nsAccessNode::GetDocumentNode() const
+{
+  return mContent ? mContent->OwnerDoc() : nullptr;
+}
+
 bool
 nsAccessNode::IsPrimaryForNode() const
 {

accessible/src/base/nsAccessNode.h

@@ -11,18 +11,13 @@
 #define _nsAccessNode_H_
 
 #include "nsIAccessibleTypes.h"
-
+#include "nsINode.h"
 #include "a11yGeneric.h"
 
-#include "nsIContent.h"
-#include "nsIDOMNode.h"
-#include "nsINameSpaceManager.h"
-#include "nsIStringBundle.h"
-#include "nsWeakReference.h"
-
 class nsAccessNode;
 class DocAccessible;
 class nsIAccessibleDocument;
+class nsIContent;
 
 namespace mozilla {
 namespace a11y {
@@ -75,10 +70,9 @@ public:
   /**
    * Return DOM node associated with the accessible.
    */
-  virtual nsINode* GetNode() const { return mContent; }
+  virtual nsINode* GetNode() const;
   nsIContent* GetContent() const { return mContent; }
-  virtual nsIDocument* GetDocumentNode() const
-    { return mContent ? mContent->OwnerDoc() : nullptr; }
+  virtual nsIDocument* GetDocumentNode() const;
 
   /**
    * Return node type information of DOM node associated with the accessible.

accessible/src/base/nsCoreUtils.cpp

@@ -34,6 +34,10 @@
 #include "nsIInterfaceRequestorUtils.h"
 #include "mozilla/dom/Element.h"
 
+#include "nsITreeBoxObject.h"
+#include "nsIDocShellTreeItem.h"
+#include "nsITreeColumns.h"
+
 ////////////////////////////////////////////////////////////////////////////////
 // nsCoreUtils
 ////////////////////////////////////////////////////////////////////////////////

accessible/src/base/nsCoreUtils.h

@@ -7,21 +7,21 @@
 #define nsCoreUtils_h_
 
 
-#include "nsIDOMNode.h"
 #include "nsIContent.h"
 #include "nsIBoxObject.h"
-#include "nsITreeBoxObject.h"
-#include "nsITreeColumns.h"
+#include "nsIPresShell.h"
 
-#include "nsIFrame.h"
-#include "nsIDocShellTreeItem.h"
-#include "nsIDOMCSSStyleDeclaration.h"
 #include "nsIDOMDOMStringList.h"
-#include "nsIMutableArray.h"
 #include "nsPoint.h"
 #include "nsTArray.h"
 
 class nsRange;
+class nsIDOMNode;
+class nsIFrame;
+class nsIDocShellTreeItem;
+class nsITreeColumn;
+class nsITreeBoxObject;
+class nsIWidget;
 
 /**
  * Core utils.

accessible/src/generic/Accessible.h

@@ -14,8 +14,8 @@
 #include "nsIAccessibleHyperLink.h"
 #include "nsIAccessibleSelectable.h"
 #include "nsIAccessibleValue.h"
-#include "nsIAccessibleRole.h"
 #include "nsIAccessibleStates.h"
+#include "nsIContent.h"
 
 #include "nsStringGlue.h"
 #include "nsTArray.h"

accessible/src/generic/ApplicationAccessible.cpp

@@ -19,6 +19,7 @@
 #include "nsIWindowMediator.h"
 #include "nsServiceManagerUtils.h"
 #include "mozilla/Services.h"
+#include "nsIStringBundle.h"
 
 using namespace mozilla::a11y;
 

accessible/src/generic/DocAccessible.h

@@ -22,7 +22,6 @@
 #include "nsIScrollPositionListener.h"
 #include "nsITimer.h"
 #include "nsIWeakReference.h"
-#include "nsCOMArray.h"
 #include "nsIDocShellTreeNode.h"
 
 template<class Class, class Arg>

accessible/src/html/HTMLTableAccessible.cpp

@@ -14,6 +14,7 @@
 #include "Relation.h"
 #include "Role.h"
 #include "States.h"
+#include "nsIMutableArray.h"
 
 #include "nsIAccessibleRelation.h"
 #include "nsIDOMElement.h"

accessible/src/xul/XULListboxAccessible.cpp

@@ -20,6 +20,7 @@
 #include "nsIDOMNodeList.h"
 #include "nsIDOMXULPopupElement.h"
 #include "nsIDOMXULSelectCntrlItemEl.h"
+#include "nsIMutableArray.h"
 
 using namespace mozilla::a11y;
 

accessible/src/xul/XULTreeGridAccessible.cpp

@@ -14,6 +14,7 @@
 #include "Role.h"
 #include "States.h"
 
+#include "nsIMutableArray.h"
 #include "nsITreeSelection.h"
 #include "nsComponentManagerUtils.h"