Bug 743680 - don't export nsARIAMap.h, r=tbsaunde

accessible/src/base/AccGroupInfo.h

@@ -38,7 +38,7 @@
 #ifndef AccGroupInfo_h_
 #define AccGroupInfo_h_
 
-#include "nsAccessible.h"
+#include "Accessible-inl.h"
 #include "nsAccUtils.h"
 
 /**

accessible/src/base/FocusManager.cpp

@@ -37,6 +37,7 @@
 
 #include "FocusManager.h"
 
+#include "Accessible-inl.h"
 #include "nsAccessibilityService.h"
 #include "nsAccUtils.h"
 #include "nsRootAccessible.h"

accessible/src/base/Makefile.in

@@ -85,13 +85,11 @@ EXPORTS = \
   nsAccessibilityService.h \
   nsAccessible.h \
   nsAccessNode.h \
-  nsARIAMap.h \
   $(NULL)
 
 EXPORTS_NAMESPACES = mozilla/a11y
 
 EXPORTS_mozilla/a11y = \
-  ARIAStateMap.h \
   FocusManager.h \
   States.h \
   Role.h \

accessible/src/base/NotificationController.cpp

@@ -38,6 +38,7 @@
 
 #include "NotificationController.h"
 
+#include "Accessible-inl.h"
 #include "nsAccessibilityService.h"
 #include "nsAccUtils.h"
 #include "nsCoreUtils.h"

accessible/src/base/TextUpdater.cpp

@@ -38,6 +38,7 @@
 
 #include "TextUpdater.h"
 
+#include "Accessible-inl.h"
 #include "nsDocAccessible.h"
 #include "nsTextAccessible.h"
 

accessible/src/base/filters.cpp

@@ -37,7 +37,7 @@
 
 #include "filters.h"
 
-#include "nsAccessible.h"
+#include "Accessible-inl.h"
 #include "nsAccUtils.h"
 #include "Role.h"
 #include "States.h"

accessible/src/base/nsARIAMap.h

@@ -40,9 +40,8 @@
 #ifndef _nsARIAMap_H_
 #define _nsARIAMap_H_
 
-#include "mozilla/a11y/ARIAStateMap.h"
+#include "ARIAStateMap.h"
 #include "mozilla/a11y/Role.h"
-#include "prtypes.h"
 
 class nsIAtom;
 class nsIContent;

accessible/src/base/nsAccUtils.cpp

@@ -36,18 +36,18 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-#include "nsCoreUtils.h"
 #include "nsAccUtils.h"
 
-#include "nsIAccessibleTypes.h"
-#include "Role.h"
-#include "States.h"
-
+#include "Accessible-inl.h"
 #include "nsAccessibilityService.h"
 #include "nsARIAMap.h"
+#include "nsCoreUtils.h"
 #include "nsDocAccessible.h"
 #include "nsHyperTextAccessible.h"
+#include "nsIAccessibleTypes.h"
 #include "nsTextAccessible.h"
+#include "Role.h"
+#include "States.h"
 
 #include "nsIDOMXULContainerElement.h"
 #include "nsIDOMXULSelectCntrlEl.h"

accessible/src/base/nsAccUtils.h

@@ -44,7 +44,6 @@
 #include "nsIAccessibleText.h"
 #include "nsIAccessibleTable.h"
 
-#include "nsARIAMap.h"
 #include "nsAccessibilityService.h"
 #include "nsCoreUtils.h"
 
@@ -60,6 +59,7 @@ class nsAccessible;
 class nsHyperTextAccessible;
 class nsHTMLTableAccessible;
 class nsDocAccessible;
+struct nsRoleMapEntry;
 #ifdef MOZ_XUL
 class nsXULTreeAccessible;
 #endif

accessible/src/base/nsAccessibilityService.cpp

@@ -39,6 +39,7 @@
 #include "nsAccessibilityService.h"
 
 // NOTE: alphabetically ordered
+#include "Accessible-inl.h"
 #include "ARIAGridAccessibleWrap.h"
 #ifdef MOZ_ACCESSIBILITY_ATK
 #include "AtkSocketAccessible.h"

accessible/src/base/nsAccessible.cpp

@@ -37,7 +37,7 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-#include "nsAccessible.h"
+#include "Accessible-inl.h"
 
 #include "nsIXBLAccessible.h"
 

accessible/src/base/nsAccessible.h

@@ -50,7 +50,6 @@
 #include "nsIAccessibleRole.h"
 #include "nsIAccessibleStates.h"
 
-#include "nsARIAMap.h"
 #include "nsStringGlue.h"
 #include "nsTArray.h"
 #include "nsRefPtrHashtable.h"
@@ -64,6 +63,7 @@ class nsHyperTextAccessible;
 class nsHTMLImageAccessible;
 class nsHTMLImageMapAccessible;
 class nsHTMLLIAccessible;
+struct nsRoleMapEntry;
 class Relation;
 namespace mozilla {
 namespace a11y {
@@ -180,33 +180,19 @@ public:
   /**
    * Return enumerated accessible role (see constants in Role.h).
    */
-  inline mozilla::a11y::role Role()
-  {
-    if (!mRoleMapEntry || mRoleMapEntry->roleRule != kUseMapRole)
-      return ARIATransformRole(NativeRole());
-
-    return ARIATransformRole(mRoleMapEntry->role);
-  }
+  mozilla::a11y::role Role();
 
   /**
    * Return true if ARIA role is specified on the element.
    */
-  inline bool HasARIARole() const
-  {
-    return mRoleMapEntry;
-  }
+  bool HasARIARole() const
+    { return mRoleMapEntry; }
 
   /**
    * Return accessible role specified by ARIA (see constants in
    * roles).
    */
-  inline mozilla::a11y::role ARIARole()
-  {
-    if (!mRoleMapEntry || mRoleMapEntry->roleRule != kUseMapRole)
-      return mozilla::a11y::roles::NOTHING;
-
-    return ARIATransformRole(mRoleMapEntry->role);
-  }
+  mozilla::a11y::role ARIARole();
 
   /**
    * Returns enumerated accessible role from native markup (see constants in

accessible/src/base/nsAccessiblePivot.cpp

@@ -39,7 +39,7 @@
 
 #include "nsAccessiblePivot.h"
 
-#include "nsAccessible.h"
+#include "Accessible-inl.h"
 #include "nsAccUtils.h"
 #include "nsHyperTextAccessible.h"
 #include "States.h"

accessible/src/base/nsBaseWidgetAccessible.cpp

@@ -39,6 +39,7 @@
 
 #include "nsBaseWidgetAccessible.h"
 
+#include "Accessible-inl.h"
 #include "nsAccessibilityService.h"
 #include "nsAccUtils.h"
 #include "nsCoreUtils.h"

accessible/src/base/nsDocAccessible.cpp

@@ -36,6 +36,7 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
+#include "Accessible-inl.h"
 #include "AccIterator.h"
 #include "nsAccCache.h"
 #include "nsAccessibilityService.h"

accessible/src/base/nsRootAccessible.cpp

@@ -40,6 +40,7 @@
 #define CreateEvent CreateEventA
 #include "nsIDOMDocument.h"
 
+#include "Accessible-inl.h"
 #include "nsAccessibilityService.h"
 #include "nsApplicationAccessibleWrap.h"
 #include "nsAccUtils.h"

accessible/src/base/nsTextEquivUtils.cpp

@@ -39,9 +39,9 @@
 
 #include "nsTextEquivUtils.h"
 
+#include "Accessible-inl.h"
 #include "AccIterator.h"
 #include "nsAccessibilityService.h"
-#include "nsAccessible.h"
 #include "nsAccUtils.h"
 
 #include "nsIDOMXULLabeledControlEl.h"

accessible/src/generic/ARIAGridAccessible.cpp

@@ -38,6 +38,7 @@
 
 #include "ARIAGridAccessible.h"
 
+#include "Accessible-inl.h"
 #include "AccIterator.h"
 #include "nsAccUtils.h"
 #include "Role.h"

accessible/src/generic/Accessible-inl.h

@@ -0,0 +1,31 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set ts=2 et sw=2 tw=80: */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#ifndef mozilla_a11y_Accessible_inl_h_
+#define mozilla_a11y_Accessible_inl_h_
+
+#include "nsAccessible.h"
+#include "nsARIAMap.h"
+
+inline mozilla::a11y::role
+nsAccessible::Role()
+{
+  if (!mRoleMapEntry || mRoleMapEntry->roleRule != kUseMapRole)
+    return ARIATransformRole(NativeRole());
+
+  return ARIATransformRole(mRoleMapEntry->role);
+}
+
+inline mozilla::a11y::role
+nsAccessible::ARIARole()
+{
+  if (!mRoleMapEntry || mRoleMapEntry->roleRule != kUseMapRole)
+    return mozilla::a11y::roles::NOTHING;
+
+  return ARIATransformRole(mRoleMapEntry->role);
+}
+
+#endif

accessible/src/html/nsHTMLFormControlAccessible.cpp

@@ -38,7 +38,9 @@
 
 #include "nsHTMLFormControlAccessible.h"
 
+#include "Accessible-inl.h"
 #include "nsAccUtils.h"
+#include "nsARIAMap.h"
 #include "nsTextEquivUtils.h"
 #include "Relation.h"
 #include "Role.h"

accessible/src/html/nsHTMLImageMapAccessible.cpp

@@ -40,6 +40,7 @@
 #include "nsHTMLImageMapAccessible.h"
 
 #include "nsAccUtils.h"
+#include "nsARIAMap.h"
 #include "nsDocAccessible.h"
 #include "Role.h"
 

accessible/src/html/nsHTMLSelectAccessible.cpp

@@ -38,6 +38,7 @@
 
 #include "nsHTMLSelectAccessible.h"
 
+#include "Accessible-inl.h"
 #include "nsAccessibilityService.h"
 #include "nsAccUtils.h"
 #include "nsDocAccessible.h"

accessible/src/html/nsHTMLTableAccessible.cpp

@@ -39,6 +39,7 @@
 
 #include "nsHTMLTableAccessible.h"
 
+#include "Accessible-inl.h"
 #include "nsAccessibilityService.h"
 #include "nsAccTreeWalker.h"
 #include "nsAccUtils.h"

accessible/src/html/nsHyperTextAccessible.cpp

@@ -39,6 +39,7 @@
 
 #include "nsHyperTextAccessible.h"
 
+#include "Accessible-inl.h"
 #include "nsAccessibilityService.h"
 #include "nsAccUtils.h"
 #include "nsDocAccessible.h"

accessible/src/mac/Makefile.in

@@ -91,6 +91,7 @@ include $(topsrcdir)/config/rules.mk
 LOCAL_INCLUDES += \
   -I$(srcdir) \
   -I$(srcdir)/../base \
+  -I$(srcdir)/../generic \
   -I$(srcdir)/../html \
   -I$(srcdir)/../xul \
   $(NULL)

accessible/src/mac/mozAccessible.mm

@@ -42,23 +42,20 @@
 #import "mozView.h"
 #import "nsRoleMap.h"
 
+#include "Accessible-inl.h"
+#include "nsIAccessibleRelation.h"
+#include "nsIAccessibleText.h"
+#include "nsIAccessibleEditableText.h"
+#include "nsRootAccessible.h"
+#include "Relation.h"
+#include "Role.h"
+
+#include "mozilla/Services.h"
 #include "nsRect.h"
 #include "nsCocoaUtils.h"
 #include "nsCoord.h"
 #include "nsObjCExceptions.h"
 
-#include "nsIAccessible.h"
-#include "nsIAccessibleRelation.h"
-#include "nsIAccessibleText.h"
-#include "nsIAccessibleEditableText.h"
-#include "Relation.h"
-#include "Role.h"
-
-#include "nsAccessNode.h"
-#include "nsRootAccessible.h"
-
-#include "mozilla/Services.h"
-
 using namespace mozilla;
 using namespace mozilla::a11y;
 

accessible/src/mac/mozActionElements.mm

@@ -39,9 +39,8 @@
 #import "mozActionElements.h"
 
 #import "MacUtils.h"
-
-#import "nsIAccessible.h"
-#import "nsXULTabAccessible.h"
+#include "Accessible-inl.h"
+#include "nsXULTabAccessible.h"
 
 #include "nsObjCExceptions.h"
 

accessible/src/mac/nsAccessibleWrap.mm

@@ -41,6 +41,7 @@
 
 #import "nsRoleMap.h"
 
+#include "Accessible-inl.h"
 #include "Role.h"
 
 #import "mozAccessible.h"

accessible/src/xul/nsXULColorPickerAccessible.cpp

@@ -38,6 +38,7 @@
 
 #include "nsXULColorPickerAccessible.h"
 
+#include "Accessible-inl.h"
 #include "nsAccUtils.h"
 #include "nsAccTreeWalker.h"
 #include "nsCoreUtils.h"

accessible/src/xul/nsXULComboboxAccessible.cpp

@@ -40,6 +40,7 @@
 
 #include "nsXULComboboxAccessible.h"
 
+#include "Accessible-inl.h"
 #include "nsAccessibilityService.h"
 #include "nsDocAccessible.h"
 #include "nsCoreUtils.h"

accessible/src/xul/nsXULFormControlAccessible.cpp

@@ -39,6 +39,7 @@
 
 #include "nsXULFormControlAccessible.h"
 
+#include "Accessible-inl.h"
 #include "nsAccUtils.h"
 #include "nsAccTreeWalker.h"
 #include "nsCoreUtils.h"

accessible/src/xul/nsXULListboxAccessible.cpp

@@ -40,6 +40,7 @@
 
 #include "nsXULListboxAccessible.h"
 
+#include "Accessible-inl.h"
 #include "nsAccessibilityService.h"
 #include "nsAccUtils.h"
 #include "nsDocAccessible.h"

accessible/src/xul/nsXULMenuAccessible.cpp

@@ -38,6 +38,7 @@
 
 #include "nsXULMenuAccessible.h"
 
+#include "Accessible-inl.h"
 #include "nsAccessibilityService.h"
 #include "nsAccUtils.h"
 #include "nsDocAccessible.h"

accessible/src/xul/nsXULTextAccessible.cpp

@@ -40,6 +40,7 @@
 // NOTE: groups are alphabetically ordered
 #include "nsXULTextAccessible.h"
 
+#include "Accessible-inl.h"
 #include "nsAccUtils.h"
 #include "nsBaseWidgetAccessible.h"
 #include "nsCoreUtils.h"