wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 943482 - remove a11y support of not existing xul:menulist@droppable, r=tbsaunde

Browse Source
This commit is contained in:
Alexander Surkov 2013-12-07 00:40:02 -05:00
parent ec57391e9c
commit 4dbdd52b3a
3 changed files with 4 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
accessible/src/base/nsAccessibilityService.cpp
View File

@ -1253,11 +1253,7 @@ nsAccessibilityService::CreateAccessibleByType(nsIContent* aContent,
accessible = new XULMenubarAccessible(aContent, aDoc);
} else if (role.EqualsLiteral("xul:menulist")) {
if (aContent->AttrValueIs(kNameSpaceID_None, nsGkAtoms::droppable,
nsGkAtoms::_false, eCaseMatters))
accessible = new XULTextFieldAccessible(aContent, aDoc);
else
accessible = new XULComboboxAccessible(aContent, aDoc);
accessible = new XULComboboxAccessible(aContent, aDoc);
} else if (role.EqualsLiteral("xul:menuitem")) {
accessible = new XULMenuitemAccessibleWrap(aContent, aDoc);

26
accessible/src/xul/XULFormControlAccessible.cpp
View File

@ -693,21 +693,8 @@ XULTextFieldAccessible::NativeState()
// the accessible state from. Doesn't add to cache into document cache.
nsRefPtr<HTMLTextFieldAccessible> tempAccessible =
new HTMLTextFieldAccessible(inputField, mDoc);
if (!tempAccessible)
return state;
state |= tempAccessible->NativeState();
nsCOMPtr<nsIDOMXULMenuListElement> menuList(do_QueryInterface(mContent));
if (menuList) {
// <xul:menulist droppable="false">
if (!mContent->AttrValueIs(kNameSpaceID_None,
nsGkAtoms::editable,
nsGkAtoms::_true, eIgnoreCase)) {
state |= states::READONLY;
}
}
if (tempAccessible)
return state | tempAccessible->NativeState();
return state;
}
@ -830,16 +817,9 @@ XULTextFieldAccessible::GetInputField() const
{
nsCOMPtr<nsIDOMNode> inputFieldDOMNode;
nsCOMPtr<nsIDOMXULTextBoxElement> textBox = do_QueryInterface(mContent);
if (textBox) {
if (textBox)
textBox->GetInputField(getter_AddRefs(inputFieldDOMNode));
} else {
// <xul:menulist droppable="false">
nsCOMPtr<nsIDOMXULMenuListElement> menuList = do_QueryInterface(mContent);
if (menuList)
menuList->GetInputField(getter_AddRefs(inputFieldDOMNode));
}
NS_ASSERTION(inputFieldDOMNode, "No input field for XULTextFieldAccessible");
nsCOMPtr<nsIContent> inputField = do_QueryInterface(inputFieldDOMNode);

1
content/base/src/nsGkAtomList.h
View File

@ -2165,7 +2165,6 @@ GK_ATOM(containerRelevant, "container-relevant")
GK_ATOM(cycles, "cycles")
GK_ATOM(datatable, "datatable")
GK_ATOM(directory, "directory")
GK_ATOM(droppable, "droppable")
GK_ATOM(eventFromInput, "event-from-input")
GK_ATOM(grammar, "grammar")
GK_ATOM(gridcell, "gridcell")