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

Side by Side Diff: Source/core/accessibility/AXNodeObject.h

Issue 603423002: Replace OVERRIDE and FINAL with their C++11 counterparts in core/accessibility (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Narrowing area to core/accessibility Created 6 years, 2 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) 2012, Google Inc. All rights reserved. 2 * Copyright (C) 2012, Google 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 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
64 virtual ~AXNodeObject(); 64 virtual ~AXNodeObject();
65 65
66 protected: 66 protected:
67 // Protected data. 67 // Protected data.
68 AccessibilityRole m_ariaRole; 68 AccessibilityRole m_ariaRole;
69 bool m_childrenDirty; 69 bool m_childrenDirty;
70 #if ENABLE(ASSERT) 70 #if ENABLE(ASSERT)
71 bool m_initialized; 71 bool m_initialized;
72 #endif 72 #endif
73 73
74 virtual bool computeAccessibilityIsIgnored() const OVERRIDE; 74 virtual bool computeAccessibilityIsIgnored() const override;
75 virtual AccessibilityRole determineAccessibilityRole(); 75 virtual AccessibilityRole determineAccessibilityRole();
76 76
77 String accessibilityDescriptionForElements(WillBeHeapVector<RawPtrWillBeMemb er<Element> > &elements) const; 77 String accessibilityDescriptionForElements(WillBeHeapVector<RawPtrWillBeMemb er<Element> > &elements) const;
78 void alterSliderValue(bool increase); 78 void alterSliderValue(bool increase);
79 String ariaAccessibilityDescription() const; 79 String ariaAccessibilityDescription() const;
80 void ariaLabeledByElements(WillBeHeapVector<RawPtrWillBeMember<Element> >& e lements) const; 80 void ariaLabeledByElements(WillBeHeapVector<RawPtrWillBeMember<Element> >& e lements) const;
81 void changeValueByStep(bool increase); 81 void changeValueByStep(bool increase);
82 AccessibilityRole determineAriaRoleAttribute() const; 82 AccessibilityRole determineAriaRoleAttribute() const;
83 void elementsFromAttribute(WillBeHeapVector<RawPtrWillBeMember<Element> >& e lements, const QualifiedName&) const; 83 void elementsFromAttribute(WillBeHeapVector<RawPtrWillBeMember<Element> >& e lements, const QualifiedName&) const;
84 bool hasContentEditableAttributeSet() const; 84 bool hasContentEditableAttributeSet() const;
85 bool isDescendantOfBarrenParent() const; 85 bool isDescendantOfBarrenParent() const;
86 // This returns true if it's focusable but it's not content editable and it' s not a control or ARIA control. 86 // This returns true if it's focusable but it's not content editable and it' s not a control or ARIA control.
87 bool isGenericFocusableElement() const; 87 bool isGenericFocusableElement() const;
88 HTMLLabelElement* labelForElement(Element*) const; 88 HTMLLabelElement* labelForElement(Element*) const;
89 AXObject* menuButtonForMenu() const; 89 AXObject* menuButtonForMenu() const;
90 Element* menuItemElementForMenu() const; 90 Element* menuItemElementForMenu() const;
91 Element* mouseButtonListener() const; 91 Element* mouseButtonListener() const;
92 AccessibilityRole remapAriaRoleDueToParent(AccessibilityRole) const; 92 AccessibilityRole remapAriaRoleDueToParent(AccessibilityRole) const;
93 bool isNativeCheckboxOrRadio() const; 93 bool isNativeCheckboxOrRadio() const;
94 void setNode(Node*); 94 void setNode(Node*);
95 AXObject* correspondingControlForLabelElement() const; 95 AXObject* correspondingControlForLabelElement() const;
96 HTMLLabelElement* labelElementContainer() const; 96 HTMLLabelElement* labelElementContainer() const;
97 97
98 // 98 //
99 // Overridden from AXObject. 99 // Overridden from AXObject.
100 // 100 //
101 101
102 virtual void init() OVERRIDE; 102 virtual void init() override;
103 virtual void detach() OVERRIDE; 103 virtual void detach() override;
104 virtual bool isDetached() const OVERRIDE { return !m_node; } 104 virtual bool isDetached() const override { return !m_node; }
105 virtual bool isAXNodeObject() const OVERRIDE FINAL { return true; } 105 virtual bool isAXNodeObject() const override final { return true; }
106 106
107 // Check object role or purpose. 107 // Check object role or purpose.
108 virtual bool isAnchor() const OVERRIDE FINAL; 108 virtual bool isAnchor() const override final;
109 virtual bool isControl() const OVERRIDE; 109 virtual bool isControl() const override;
110 virtual bool isEmbeddedObject() const OVERRIDE FINAL; 110 virtual bool isEmbeddedObject() const override final;
111 virtual bool isFieldset() const OVERRIDE FINAL; 111 virtual bool isFieldset() const override final;
112 virtual bool isHeading() const OVERRIDE FINAL; 112 virtual bool isHeading() const override final;
113 virtual bool isHovered() const OVERRIDE FINAL; 113 virtual bool isHovered() const override final;
114 virtual bool isImage() const OVERRIDE FINAL; 114 virtual bool isImage() const override final;
115 bool isImageButton() const; 115 bool isImageButton() const;
116 virtual bool isInputImage() const OVERRIDE FINAL; 116 virtual bool isInputImage() const override final;
117 virtual bool isLink() const OVERRIDE FINAL; 117 virtual bool isLink() const override final;
118 virtual bool isMenu() const OVERRIDE FINAL; 118 virtual bool isMenu() const override final;
119 virtual bool isMenuButton() const OVERRIDE FINAL; 119 virtual bool isMenuButton() const override final;
120 virtual bool isMultiSelectable() const OVERRIDE; 120 virtual bool isMultiSelectable() const override;
121 bool isNativeImage() const; 121 bool isNativeImage() const;
122 virtual bool isNativeTextControl() const OVERRIDE FINAL; 122 virtual bool isNativeTextControl() const override final;
123 virtual bool isNonNativeTextControl() const OVERRIDE FINAL; 123 virtual bool isNonNativeTextControl() const override final;
124 virtual bool isPasswordField() const OVERRIDE FINAL; 124 virtual bool isPasswordField() const override final;
125 virtual bool isProgressIndicator() const OVERRIDE; 125 virtual bool isProgressIndicator() const override;
126 virtual bool isSlider() const OVERRIDE; 126 virtual bool isSlider() const override;
127 127
128 // Check object state. 128 // Check object state.
129 virtual bool isChecked() const OVERRIDE FINAL; 129 virtual bool isChecked() const override final;
130 virtual bool isClickable() const OVERRIDE FINAL; 130 virtual bool isClickable() const override final;
131 virtual bool isEnabled() const OVERRIDE; 131 virtual bool isEnabled() const override;
132 virtual bool isIndeterminate() const OVERRIDE FINAL; 132 virtual bool isIndeterminate() const override final;
133 virtual bool isPressed() const OVERRIDE FINAL; 133 virtual bool isPressed() const override final;
134 virtual bool isReadOnly() const OVERRIDE; 134 virtual bool isReadOnly() const override;
135 virtual bool isRequired() const OVERRIDE FINAL; 135 virtual bool isRequired() const override final;
136 136
137 // Check whether certain properties can be modified. 137 // Check whether certain properties can be modified.
138 virtual bool canSetFocusAttribute() const OVERRIDE; 138 virtual bool canSetFocusAttribute() const override;
139 virtual bool canSetValueAttribute() const OVERRIDE; 139 virtual bool canSetValueAttribute() const override;
140 140
141 // Properties of static elements. 141 // Properties of static elements.
142 virtual bool canvasHasFallbackContent() const OVERRIDE FINAL; 142 virtual bool canvasHasFallbackContent() const override final;
143 virtual bool exposesTitleUIElement() const OVERRIDE; 143 virtual bool exposesTitleUIElement() const override;
144 virtual int headingLevel() const OVERRIDE FINAL; 144 virtual int headingLevel() const override final;
145 virtual unsigned hierarchicalLevel() const OVERRIDE FINAL; 145 virtual unsigned hierarchicalLevel() const override final;
146 virtual String text() const OVERRIDE; 146 virtual String text() const override;
147 virtual AXObject* titleUIElement() const OVERRIDE; 147 virtual AXObject* titleUIElement() const override;
148 148
149 // Properties of interactive elements. 149 // Properties of interactive elements.
150 virtual AccessibilityButtonState checkboxOrRadioValue() const OVERRIDE FINAL ; 150 virtual AccessibilityButtonState checkboxOrRadioValue() const override final ;
151 virtual void colorValue(int& r, int& g, int& b) const OVERRIDE FINAL; 151 virtual void colorValue(int& r, int& g, int& b) const override final;
152 virtual String valueDescription() const OVERRIDE; 152 virtual String valueDescription() const override;
153 virtual float valueForRange() const OVERRIDE; 153 virtual float valueForRange() const override;
154 virtual float maxValueForRange() const OVERRIDE; 154 virtual float maxValueForRange() const override;
155 virtual float minValueForRange() const OVERRIDE; 155 virtual float minValueForRange() const override;
156 virtual String stringValue() const OVERRIDE; 156 virtual String stringValue() const override;
157 virtual const AtomicString& textInputType() const OVERRIDE; 157 virtual const AtomicString& textInputType() const override;
158 158
159 // ARIA attributes. 159 // ARIA attributes.
160 virtual String ariaDescribedByAttribute() const OVERRIDE FINAL; 160 virtual String ariaDescribedByAttribute() const override final;
161 virtual String ariaLabeledByAttribute() const OVERRIDE FINAL; 161 virtual String ariaLabeledByAttribute() const override final;
162 virtual AccessibilityRole ariaRoleAttribute() const OVERRIDE FINAL; 162 virtual AccessibilityRole ariaRoleAttribute() const override final;
163 163
164 // Accessibility Text. 164 // Accessibility Text.
165 virtual String textUnderElement() const OVERRIDE; 165 virtual String textUnderElement() const override;
166 166
167 // Accessibility Text - (To be deprecated). 167 // Accessibility Text - (To be deprecated).
168 virtual String accessibilityDescription() const OVERRIDE; 168 virtual String accessibilityDescription() const override;
169 virtual String title() const OVERRIDE; 169 virtual String title() const override;
170 virtual String helpText() const OVERRIDE; 170 virtual String helpText() const override;
171 171
172 // Location and click point in frame-relative coordinates. 172 // Location and click point in frame-relative coordinates.
173 virtual LayoutRect elementRect() const OVERRIDE; 173 virtual LayoutRect elementRect() const override;
174 174
175 // High-level accessibility tree access. 175 // High-level accessibility tree access.
176 virtual AXObject* parentObject() const OVERRIDE; 176 virtual AXObject* parentObject() const override;
177 virtual AXObject* parentObjectIfExists() const OVERRIDE; 177 virtual AXObject* parentObjectIfExists() const override;
178 178
179 // Low-level accessibility tree exploration. 179 // Low-level accessibility tree exploration.
180 virtual AXObject* firstChild() const OVERRIDE; 180 virtual AXObject* firstChild() const override;
181 virtual AXObject* nextSibling() const OVERRIDE; 181 virtual AXObject* nextSibling() const override;
182 virtual void addChildren() OVERRIDE; 182 virtual void addChildren() override;
183 virtual bool canHaveChildren() const OVERRIDE; 183 virtual bool canHaveChildren() const override;
184 void addChild(AXObject*); 184 void addChild(AXObject*);
185 void insertChild(AXObject*, unsigned index); 185 void insertChild(AXObject*, unsigned index);
186 186
187 // DOM and Render tree access. 187 // DOM and Render tree access.
188 virtual Element* actionElement() const OVERRIDE FINAL; 188 virtual Element* actionElement() const override final;
189 virtual Element* anchorElement() const OVERRIDE; 189 virtual Element* anchorElement() const override;
190 virtual Document* document() const OVERRIDE; 190 virtual Document* document() const override;
191 virtual Node* node() const OVERRIDE { return m_node; } 191 virtual Node* node() const override { return m_node; }
192 192
193 // Modify or take an action on an object. 193 // Modify or take an action on an object.
194 virtual void setFocused(bool) OVERRIDE FINAL; 194 virtual void setFocused(bool) override final;
195 virtual void increment() OVERRIDE FINAL; 195 virtual void increment() override final;
196 virtual void decrement() OVERRIDE FINAL; 196 virtual void decrement() override final;
197 197
198 // Notifications that this object may have changed. 198 // Notifications that this object may have changed.
199 virtual void childrenChanged() OVERRIDE; 199 virtual void childrenChanged() override;
200 virtual void selectionChanged() OVERRIDE FINAL; 200 virtual void selectionChanged() override final;
201 virtual void textChanged() OVERRIDE; 201 virtual void textChanged() override;
202 virtual void updateAccessibilityRole() OVERRIDE FINAL; 202 virtual void updateAccessibilityRole() override final;
203 203
204 private: 204 private:
205 Node* m_node; 205 Node* m_node;
206 206
207 String alternativeTextForWebArea() const; 207 String alternativeTextForWebArea() const;
208 void alternativeText(Vector<AccessibilityText>&) const; 208 void alternativeText(Vector<AccessibilityText>&) const;
209 void ariaLabeledByText(Vector<AccessibilityText>&) const; 209 void ariaLabeledByText(Vector<AccessibilityText>&) const;
210 void changeValueByPercent(float percentChange); 210 void changeValueByPercent(float percentChange);
211 float stepValueForRange() const; 211 float stepValueForRange() const;
212 }; 212 };
213 213
214 DEFINE_AX_OBJECT_TYPE_CASTS(AXNodeObject, isAXNodeObject()); 214 DEFINE_AX_OBJECT_TYPE_CASTS(AXNodeObject, isAXNodeObject());
215 215
216 } // namespace blink 216 } // namespace blink
217 217
218 #endif // AXNodeObject_h 218 #endif // AXNodeObject_h
OLDNEW
« no previous file with comments | « Source/core/accessibility/AXMockObject.h ('k') | Source/core/accessibility/AXProgressIndicator.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698