зеркало из https://github.com/mozilla/gecko-dev.git
Bug 347851 Building XULRunner with --embedding-profile=minimal failed
Make accessible tree support only build ifdef MOZ_XUL patch by romaxa@gmail.com r=timeless r=aaronl sr=bz
This commit is contained in:
Родитель
f15cc043d3
Коммит
fa6e4316d6
|
@ -60,7 +60,6 @@ XPIDLSRCS = \
|
|||
nsPIAccessibleDocument.idl \
|
||||
nsIAccessibleProvider.idl \
|
||||
nsIAccessibleSelectable.idl \
|
||||
nsIAccessibleTreeCache.idl \
|
||||
nsIAccessNode.idl \
|
||||
nsPIAccessNode.idl \
|
||||
nsIAccessibleEvent.idl \
|
||||
|
@ -72,5 +71,11 @@ XPIDLSRCS = \
|
|||
nsIAccessibleValue.idl \
|
||||
$(NULL)
|
||||
|
||||
ifdef MOZ_XUL
|
||||
XPIDLSRCS += \
|
||||
nsIAccessibleTreeCache.idl \
|
||||
$(NULL)
|
||||
endif
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
|
|
|
@ -79,11 +79,11 @@ CPPSRCS = \
|
|||
nsMaiInterfaceTable.cpp \
|
||||
$(NULL)
|
||||
|
||||
#ifdef MOZ_XUL
|
||||
ifdef MOZ_XUL
|
||||
CPPSRCS += \
|
||||
nsXULTreeAccessibleWrap.cpp \
|
||||
$(NULL)
|
||||
#endif
|
||||
endif
|
||||
|
||||
EXPORTS = \
|
||||
nsAccessNodeWrap.h \
|
||||
|
|
|
@ -755,12 +755,15 @@ NS_IMETHODIMP nsRootAccessible::HandleEventWithTarget(nsIDOMEvent* aEvent,
|
|||
#else
|
||||
AtkStateChange stateData;
|
||||
if (eventType.LowerCaseEqualsLiteral("focus")) {
|
||||
#ifdef MOZ_XUL
|
||||
if (treeItemAccessible) { // use focused treeitem
|
||||
privAcc = do_QueryInterface(treeItemAccessible);
|
||||
privAcc->FireToolkitEvent(nsIAccessibleEvent::EVENT_FOCUS,
|
||||
treeItemAccessible, nsnull);
|
||||
}
|
||||
else if (localName.EqualsIgnoreCase("radiogroup")) {
|
||||
else
|
||||
#endif
|
||||
if (localName.EqualsIgnoreCase("radiogroup")) {
|
||||
// fire focus event for checked radio instead of radiogroup
|
||||
PRInt32 childCount = 0;
|
||||
accessible->GetChildCount(&childCount);
|
||||
|
@ -782,13 +785,16 @@ NS_IMETHODIMP nsRootAccessible::HandleEventWithTarget(nsIDOMEvent* aEvent,
|
|||
FireAccessibleFocusEvent(accessible, targetNode, aEvent);
|
||||
}
|
||||
else if (eventType.LowerCaseEqualsLiteral("select")) {
|
||||
#ifdef MOZ_XUL
|
||||
if (treeItemAccessible) { // it's a XUL <tree>
|
||||
// use EVENT_FOCUS instead of EVENT_ATK_SELECTION_CHANGE
|
||||
privAcc = do_QueryInterface(treeItemAccessible);
|
||||
privAcc->FireToolkitEvent(nsIAccessibleEvent::EVENT_FOCUS,
|
||||
treeItemAccessible, nsnull);
|
||||
}
|
||||
else if (localName.LowerCaseEqualsLiteral("tabpanels")) {
|
||||
else
|
||||
#endif
|
||||
if (localName.LowerCaseEqualsLiteral("tabpanels")) {
|
||||
// make GOK refresh "UI-Grab" window
|
||||
privAcc->FireToolkitEvent(nsIAccessibleEvent::EVENT_REORDER, accessible, nsnull);
|
||||
}
|
||||
|
|
Загрузка…
Ссылка в новой задаче