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

Side by Side Diff: third_party/WebKit/Source/modules/accessibility/AXMenuListOption.cpp

Issue 2902133002: Revert of "Implement the inert attribute" (Closed)
Patch Set: Created 3 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) 2010 Apple Inc. All Rights Reserved. 2 * Copyright (C) 2010 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 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
11 * documentation and/or other materials provided with the distribution. 11 * documentation and/or other materials provided with the distribution.
12 * 12 *
13 * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY 13 * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR 16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
24 */ 24 */
25 25
26 #include "modules/accessibility/AXMenuListOption.h" 26 #include "modules/accessibility/AXMenuListOption.h"
27 27
28 #include "SkMatrix44.h" 28 #include "SkMatrix44.h"
29 #include "core/dom/AccessibleNode.h" 29 #include "core/dom/AccessibleNode.h"
30 #include "core/html/HTMLSelectElement.h"
31 #include "modules/accessibility/AXMenuListPopup.h" 30 #include "modules/accessibility/AXMenuListPopup.h"
32 #include "modules/accessibility/AXObjectCacheImpl.h" 31 #include "modules/accessibility/AXObjectCacheImpl.h"
33 32
34 namespace blink { 33 namespace blink {
35 34
36 using namespace HTMLNames; 35 using namespace HTMLNames;
37 36
38 AXMenuListOption::AXMenuListOption(HTMLOptionElement* element, 37 AXMenuListOption::AXMenuListOption(HTMLOptionElement* element,
39 AXObjectCacheImpl& ax_object_cache) 38 AXObjectCacheImpl& ax_object_cache)
40 : AXMockObject(ax_object_cache), element_(element) {} 39 : AXMockObject(ax_object_cache), element_(element) {}
(...skipping 16 matching lines...) Expand all
57 AccessibilityRole role = AriaRoleToWebCoreRole(aria_role); 56 AccessibilityRole role = AriaRoleToWebCoreRole(aria_role);
58 if (role) 57 if (role)
59 return role; 58 return role;
60 return kMenuListOptionRole; 59 return kMenuListOptionRole;
61 } 60 }
62 61
63 Element* AXMenuListOption::ActionElement() const { 62 Element* AXMenuListOption::ActionElement() const {
64 return element_; 63 return element_;
65 } 64 }
66 65
67 AXObjectImpl* AXMenuListOption::ComputeParent() const {
68 Node* node = GetNode();
69 if (!node)
70 return nullptr;
71 HTMLSelectElement* select = toHTMLOptionElement(node)->OwnerSelectElement();
72 if (!select)
73 return nullptr;
74 AXObjectImpl* select_ax_object = AxObjectCache().GetOrCreate(select);
75 if (select_ax_object->HasChildren()) {
76 const auto& child_objects = select_ax_object->Children();
77 DCHECK(!child_objects.IsEmpty());
78 DCHECK_EQ(child_objects.size(), 1UL);
79 DCHECK(child_objects[0]->IsMenuListPopup());
80 ToAXMenuListPopup(child_objects[0].Get())->UpdateChildrenIfNecessary();
81 } else {
82 select_ax_object->UpdateChildrenIfNecessary();
83 }
84 return parent_.Get();
85 }
86
87 bool AXMenuListOption::IsEnabled() const { 66 bool AXMenuListOption::IsEnabled() const {
88 // isDisabledFormControl() returns true if the parent <select> element is 67 // isDisabledFormControl() returns true if the parent <select> element is
89 // disabled, which we don't want. 68 // disabled, which we don't want.
90 return element_ && !element_->OwnElementDisabled(); 69 return element_ && !element_->OwnElementDisabled();
91 } 70 }
92 71
93 bool AXMenuListOption::IsVisible() const { 72 bool AXMenuListOption::IsVisible() const {
94 if (!parent_) 73 if (!parent_)
95 return false; 74 return false;
96 75
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
180 159
181 return text_alternative; 160 return text_alternative;
182 } 161 }
183 162
184 DEFINE_TRACE(AXMenuListOption) { 163 DEFINE_TRACE(AXMenuListOption) {
185 visitor->Trace(element_); 164 visitor->Trace(element_);
186 AXMockObject::Trace(visitor); 165 AXMockObject::Trace(visitor);
187 } 166 }
188 167
189 } // namespace blink 168 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698