Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(824)

Side by Side Diff: Source/modules/accessibility/AXListBox.cpp

Issue 1127283002: Revert of Fire AX notifications on list box options. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@menu_list_more
Patch Set: Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2008 Apple Inc. All rights reserved. 2 * Copyright (C) 2008 Apple Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
(...skipping 11 matching lines...) Expand all
22 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 22 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
23 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 23 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
24 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 24 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
25 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 25 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
26 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 26 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
27 */ 27 */
28 28
29 #include "config.h" 29 #include "config.h"
30 #include "modules/accessibility/AXListBox.h" 30 #include "modules/accessibility/AXListBox.h"
31 31
32 #include "core/html/HTMLOptionElement.h"
33 #include "core/html/HTMLSelectElement.h"
34 #include "core/layout/LayoutListBox.h" 32 #include "core/layout/LayoutListBox.h"
35 #include "modules/accessibility/AXListBoxOption.h" 33 #include "modules/accessibility/AXListBoxOption.h"
36 #include "modules/accessibility/AXObjectCacheImpl.h" 34 #include "modules/accessibility/AXObjectCacheImpl.h"
37 35
38 namespace blink { 36 namespace blink {
39 37
40 using namespace HTMLNames; 38 using namespace HTMLNames;
41 39
42 AXListBox::AXListBox(LayoutObject* layoutObject, AXObjectCacheImpl* axObjectCach e) 40 AXListBox::AXListBox(LayoutObject* layoutObject, AXObjectCacheImpl* axObjectCach e)
43 : AXLayoutObject(layoutObject, axObjectCache) 41 : AXLayoutObject(layoutObject, axObjectCache)
44 , m_activeIndex(-1)
45 { 42 {
46 activeIndexChanged();
47 } 43 }
48 44
49 AXListBox::~AXListBox() 45 AXListBox::~AXListBox()
50 { 46 {
51 } 47 }
52 48
53 PassRefPtr<AXListBox> AXListBox::create(LayoutObject* layoutObject, AXObjectCach eImpl* axObjectCache) 49 PassRefPtr<AXListBox> AXListBox::create(LayoutObject* layoutObject, AXObjectCach eImpl* axObjectCache)
54 { 50 {
55 return adoptRef(new AXListBox(layoutObject, axObjectCache)); 51 return adoptRef(new AXListBox(layoutObject, axObjectCache));
56 } 52 }
57 53
58 AccessibilityRole AXListBox::roleValue() const 54 AccessibilityRole AXListBox::roleValue() const
59 { 55 {
60 AccessibilityRole ariaRole = ariaRoleAttribute(); 56 AccessibilityRole ariaRole = ariaRoleAttribute();
61 if (ariaRole != UnknownRole) 57 if (ariaRole != UnknownRole)
62 return ariaRole; 58 return ariaRole;
63 return ListBoxRole; 59 return ListBoxRole;
64 } 60 }
65 61
66 AXObject* AXListBox::activeDescendant() const
67 {
68 if (!isHTMLSelectElement(node()))
69 return nullptr;
70
71 HTMLSelectElement* select = toHTMLSelectElement(node());
72 int activeIndex = select->activeSelectionEndListIndex();
73 if (activeIndex >= 0 && activeIndex < static_cast<int>(select->length())) {
74 HTMLOptionElement* option = select->item(m_activeIndex);
75 return axObjectCache()->get(option);
76 }
77
78 return nullptr;
79 }
80
81 void AXListBox::activeIndexChanged()
82 {
83 if (!isHTMLSelectElement(node()))
84 return;
85
86 HTMLSelectElement* select = toHTMLSelectElement(node());
87 int activeIndex = select->activeSelectionEndListIndex();
88 if (activeIndex == m_activeIndex)
89 return;
90
91 m_activeIndex = activeIndex;
92 if (!select->focused())
93 return;
94
95 if (m_activeIndex >= 0 && m_activeIndex < static_cast<int>(select->length()) ) {
96 HTMLOptionElement* option = select->item(m_activeIndex);
97 axObjectCache()->postNotification(option, AXObjectCacheImpl::AXFocusedUI ElementChanged);
98 } else {
99 axObjectCache()->postNotification(this, AXObjectCacheImpl::AXFocusedUIEl ementChanged);
100 }
101 }
102
103 } // namespace blink 62 } // namespace blink
OLDNEW
« no previous file with comments | « Source/modules/accessibility/AXListBox.h ('k') | Source/modules/accessibility/AXListBoxOption.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698