corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1279214 - Use DOM instead of layout in HTMLComboboxAccessible::SelectedOption. r=surkov

Browse Source 
MozReview-Commit-ID: GrBSyR9bABT
This commit is contained in:
Eitan Isaacson
2016-06-30 19:59:38 -07:00
parent ccdb472139
commit 1b053fcef8
1 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
accessible/html/HTMLSelectAccessible.cpp
View File

@@ -16,6 +16,7 @@
#include "nsCOMPtr.h"
#include "mozilla/dom/HTMLOptionElement.h"
#include "mozilla/dom/HTMLSelectElement.h"
#include "nsIComboboxControlFrame.h"
#include "nsContainerFrame.h"
#include "nsIListControlFrame.h"
@@ -498,19 +499,15 @@ HTMLComboboxAccessible::SetCurrentItem(Accessible* aItem)
Accessible*
HTMLComboboxAccessible::SelectedOption() const
{
nsIFrame* frame = GetFrame();
nsIComboboxControlFrame* comboboxFrame = do_QueryFrame(frame);
if (!comboboxFrame)
return nullptr;
HTMLSelectElement* select = HTMLSelectElement::FromContent(mContent);
int32_t selectedIndex = select->SelectedIndex();
nsIListControlFrame* listControlFrame =
do_QueryFrame(comboboxFrame->GetDropDown());
if (listControlFrame) {
nsCOMPtr<nsIContent> activeOptionNode = listControlFrame->GetCurrentOption();
if (activeOptionNode) {
if (selectedIndex >= 0) {
HTMLOptionElement* option = select->Item(selectedIndex);
if (option) {
DocAccessible* document = Document();
if (document)
return document->GetAccessible(activeOptionNode);
return document->GetAccessible(option);
}
}