Bug 760064 - don't include NotificationController.h into headers, r=tbsaunde

This commit is contained in:
Alexander Surkov 2012-06-02 03:39:47 +09:00
parent 77f9509454
commit 484a2a4159
8 changed files with 42 additions and 22 deletions

View File

@ -5,6 +5,7 @@
#include "FocusManager.h"
#include "Accessible-inl.h"
#include "DocAccessible-inl.h"
#include "nsAccessibilityService.h"
#include "nsAccUtils.h"
#include "Role.h"

View File

@ -6,6 +6,7 @@
#include "nsAccDocManager.h"
#include "ApplicationAccessible.h"
#include "DocAccessible-inl.h"
#include "nsAccessibilityService.h"
#include "nsAccUtils.h"
#include "nsARIAMap.h"

View File

@ -12,6 +12,7 @@
#ifdef MOZ_ACCESSIBILITY_ATK
#include "AtkSocketAccessible.h"
#endif
#include "DocAccessible-inl.h"
#include "FocusManager.h"
#include "HTMLListAccessible.h"
#include "HyperTextAccessibleWrap.h"

View File

@ -5,6 +5,7 @@
#include "nsCaretAccessible.h"
#include "DocAccessible-inl.h"
#include "nsAccessibilityService.h"
#include "nsAccUtils.h"
#include "nsCoreUtils.h"

View File

@ -7,7 +7,6 @@
#define __nsCaretAccessible_h__
#include "HyperTextAccessible.h"
#include "NotificationController.h"
#include "nsISelectionListener.h"

View File

@ -9,6 +9,7 @@
#include "DocAccessible.h"
#include "nsAccessibilityService.h"
#include "NotificationController.h"
inline DocAccessible*
DocAccessible::ParentDocument() const
@ -16,4 +17,32 @@ DocAccessible::ParentDocument() const
return GetAccService()->GetDocAccessible(mDocument->GetParentDocument());
}
inline void
DocAccessible::BindChildDocument(DocAccessible* aDocument)
{
mNotificationController->ScheduleChildDocBinding(aDocument);
}
template<class Class, class Arg>
inline void
DocAccessible::HandleNotification(Class* aInstance,
typename TNotification<Class, Arg>::Callback aMethod,
Arg* aArg)
{
if (mNotificationController) {
mNotificationController->HandleNotification<Class, Arg>(aInstance,
aMethod, aArg);
}
}
inline void
DocAccessible::UpdateText(nsIContent* aTextNode)
{
NS_ASSERTION(mNotificationController, "The document was shut down!");
// Ignore the notification if initial tree construction hasn't been done yet.
if (mNotificationController && HasLoadState(eTreeConstructed))
mNotificationController->ScheduleTextUpdate(aTextNode);
}
#endif

View File

@ -12,7 +12,6 @@
#include "HyperTextAccessibleWrap.h"
#include "nsEventShell.h"
#include "NotificationController.h"
#include "nsClassHashtable.h"
#include "nsDataHashtable.h"
@ -26,6 +25,10 @@
#include "nsCOMArray.h"
#include "nsIDocShellTreeNode.h"
template<class Class, class Arg>
class TNotification;
class NotificationController;
class nsIScrollableView;
class nsAccessiblePivot;
@ -208,10 +211,7 @@ public:
/**
* Bind the child document to the tree.
*/
void BindChildDocument(DocAccessible* aDocument)
{
mNotificationController->ScheduleChildDocBinding(aDocument);
}
void BindChildDocument(DocAccessible* aDocument);
/**
* Process the generic notification.
@ -222,14 +222,8 @@ public:
*/
template<class Class, class Arg>
void HandleNotification(Class* aInstance,
typename TNotification<Class, Arg>::Callback aMethod,
Arg* aArg)
{
if (mNotificationController) {
mNotificationController->HandleNotification<Class, Arg>(aInstance,
aMethod, aArg);
}
}
typename TNotification<Class, Arg>::Callback aMethod,
Arg* aArg);
/**
* Return the cached accessible by the given DOM node if it's in subtree of
@ -329,14 +323,7 @@ public:
/**
* Updates accessible tree when rendered text is changed.
*/
void UpdateText(nsIContent* aTextNode)
{
NS_ASSERTION(mNotificationController, "The document was shut down!");
// Ignore the notification if initial tree construction hasn't been done yet.
if (mNotificationController && HasLoadState(eTreeConstructed))
mNotificationController->ScheduleTextUpdate(aTextNode);
}
void UpdateText(nsIContent* aTextNode);
/**
* Recreate an accessible, results in hide/show events pair.

View File

@ -11,6 +11,7 @@
#include "nsIDOMDocument.h"
#include "Accessible-inl.h"
#include "DocAccessible-inl.h"
#include "nsAccessibilityService.h"
#include "nsAccUtils.h"
#include "nsCoreUtils.h"