зеркало из https://github.com/mozilla/gecko-dev.git
Bug 726507 - Replace GetAccService()->GetAccessible() with mDoc->GetAccessible() in html/ and xul/ subfolders of accessibility/src/ folder, r=surkov
This commit is contained in:
Родитель
f276ee1b9f
Коммит
58ceb0c1a6
|
@ -431,16 +431,16 @@ nsHTMLSelectOptionAccessible::GetSelectState(PRUint64* aState)
|
|||
{
|
||||
*aState = 0;
|
||||
|
||||
nsIContent *content = mContent;
|
||||
while (content && content->Tag() != nsGkAtoms::select) {
|
||||
content = content->GetParent();
|
||||
nsIContent* selectNode = mContent;
|
||||
while (selectNode && selectNode->Tag() != nsGkAtoms::select) {
|
||||
selectNode = selectNode->GetParent();
|
||||
}
|
||||
|
||||
if (content) {
|
||||
nsAccessible* selAcc = GetAccService()->GetAccessible(content, nsnull);
|
||||
if (selAcc) {
|
||||
*aState = selAcc->State();
|
||||
return content;
|
||||
if (selectNode) {
|
||||
nsAccessible* select = mDoc->GetAccessible(selectNode);
|
||||
if (select) {
|
||||
*aState = select->State();
|
||||
return selectNode;
|
||||
}
|
||||
}
|
||||
return nsnull;
|
||||
|
|
|
@ -887,7 +887,7 @@ nsXULListboxAccessible::ContainerWidget() const
|
|||
nsCOMPtr<nsINode> inputNode = do_QueryInterface(inputElm);
|
||||
if (inputNode) {
|
||||
nsAccessible* input =
|
||||
GetAccService()->GetAccessible(inputNode, nsnull);
|
||||
mDoc->GetAccessible(inputNode);
|
||||
return input ? input->ContainerWidget() : nsnull;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -647,7 +647,7 @@ nsXULMenubarAccessible::CurrentItem()
|
|||
nsMenuFrame* menuFrame = menuBarFrame->GetCurrentMenuItem();
|
||||
if (menuFrame) {
|
||||
nsIContent* menuItemNode = menuFrame->GetContent();
|
||||
return GetAccService()->GetAccessible(menuItemNode, nsnull);
|
||||
return mDoc->GetAccessible(menuItemNode);
|
||||
}
|
||||
}
|
||||
return nsnull;
|
||||
|
|
|
@ -517,7 +517,7 @@ nsXULTreeAccessible::ContainerWidget() const
|
|||
nsCOMPtr<nsINode> inputNode = do_QueryInterface(inputElm);
|
||||
if (inputNode) {
|
||||
nsAccessible* input =
|
||||
GetAccService()->GetAccessible(inputNode, nsnull);
|
||||
mDoc->GetAccessible(inputNode);
|
||||
return input ? input->ContainerWidget() : nsnull;
|
||||
}
|
||||
}
|
||||
|
|
Загрузка…
Ссылка в новой задаче