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 751497 - replace nsHTMLSelectOptionAccessible::GetSelectState by nice inline, r=surkov, f=hub

Browse Source
This commit is contained in:
Mark Capella 2012-05-10 23:50:03 -04:00
parent d227b8bcca
commit 76151d0a62
2 changed files with 17 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
accessible/src/html/nsHTMLSelectAccessible.cpp
View File

@ -265,9 +265,12 @@ nsHTMLSelectOptionAccessible::NativeState()
// because we don't want EDITABLE or SELECTABLE_TEXT // because we don't want EDITABLE or SELECTABLE_TEXT
PRUint64 state = nsAccessible::NativeState(); PRUint64 state = nsAccessible::NativeState();
PRUint64 selectState = 0; nsAccessible* select = GetSelect();
nsIContent* selectContent = GetSelectState(&selectState); if (!select)
if (!selectContent || selectState & states::INVISIBLE) return state;
PRUint64 selectState = select->State();
if (selectState & states::INVISIBLE)
return state; return state;
// Focusable and selectable // Focusable and selectable
@ -391,30 +394,6 @@ nsHTMLSelectOptionAccessible::ContainerWidget() const
return mParent && mParent->IsListControl() ? mParent : nsnull; return mParent && mParent->IsListControl() ? mParent : nsnull;
} }
////////////////////////////////////////////////////////////////////////////////
// nsHTMLSelectOptionAccessible: private methods
nsIContent*
nsHTMLSelectOptionAccessible::GetSelectState(PRUint64* aState)
{
*aState = 0;
nsIContent* selectNode = mContent;
while (selectNode && selectNode->Tag() != nsGkAtoms::select) {
selectNode = selectNode->GetParent();
}
if (selectNode) {
nsAccessible* select = mDoc->GetAccessible(selectNode);
if (select) {
*aState = select->State();
return selectNode;
}
}
return nsnull;
}
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// nsHTMLSelectOptGroupAccessible // nsHTMLSelectOptGroupAccessible
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////

16
accessible/src/html/nsHTMLSelectAccessible.h
View File

@ -133,11 +133,17 @@ public:
private: private:
/** /**
* Get Select element's accessible state * Return a select accessible the option belongs to if any.
* @param aState, Select element state
* @return Select element content, returns null if not avaliable
*/ */
nsIContent* GetSelectState(PRUint64* aState); nsAccessible* GetSelect() const
{
if (mParent && mParent->IsListControl()) {
nsAccessible* combobox = mParent->Parent();
return combobox && combobox->IsCombobox() ? combobox : mParent;
}
return nsnull;
}
/** /**
* Return a combobox accessible the option belongs to if any. * Return a combobox accessible the option belongs to if any.
@ -146,7 +152,7 @@ private:
{ {
if (mParent && mParent->IsListControl()) { if (mParent && mParent->IsListControl()) {
nsAccessible* combobox = mParent->Parent(); nsAccessible* combobox = mParent->Parent();
return combobox->IsCombobox() ? combobox : nsnull; return combobox && combobox->IsCombobox() ? combobox : nsnull;
} }
return nsnull; return nsnull;