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

Side by Side Diff: Source/core/accessibility/AXRenderObject.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
« no previous file with comments | « Source/core/accessibility/AXProgressIndicator.h ('k') | Source/core/accessibility/AXSVGRoot.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
57 class Widget; 57 class Widget;
58 58
59 class AXRenderObject : public AXNodeObject { 59 class AXRenderObject : public AXNodeObject {
60 protected: 60 protected:
61 explicit AXRenderObject(RenderObject*); 61 explicit AXRenderObject(RenderObject*);
62 public: 62 public:
63 static PassRefPtr<AXRenderObject> create(RenderObject*); 63 static PassRefPtr<AXRenderObject> create(RenderObject*);
64 virtual ~AXRenderObject(); 64 virtual ~AXRenderObject();
65 65
66 // Public, overridden from AXObject. 66 // Public, overridden from AXObject.
67 virtual RenderObject* renderer() const OVERRIDE FINAL { return m_renderer; } 67 virtual RenderObject* renderer() const override final { return m_renderer; }
68 virtual LayoutRect elementRect() const OVERRIDE; 68 virtual LayoutRect elementRect() const override;
69 69
70 void setRenderer(RenderObject*); 70 void setRenderer(RenderObject*);
71 RenderBoxModelObject* renderBoxModelObject() const; 71 RenderBoxModelObject* renderBoxModelObject() const;
72 Document* topDocument() const; 72 Document* topDocument() const;
73 bool shouldNotifyActiveDescendant() const; 73 bool shouldNotifyActiveDescendant() const;
74 virtual ScrollableArea* getScrollableAreaIfScrollable() const OVERRIDE FINAL ; 74 virtual ScrollableArea* getScrollableAreaIfScrollable() const override final ;
75 virtual AccessibilityRole determineAccessibilityRole() OVERRIDE; 75 virtual AccessibilityRole determineAccessibilityRole() override;
76 void checkCachedElementRect() const; 76 void checkCachedElementRect() const;
77 void updateCachedElementRect() const; 77 void updateCachedElementRect() const;
78 78
79 protected: 79 protected:
80 RenderObject* m_renderer; 80 RenderObject* m_renderer;
81 mutable LayoutRect m_cachedElementRect; 81 mutable LayoutRect m_cachedElementRect;
82 mutable LayoutRect m_cachedFrameRect; 82 mutable LayoutRect m_cachedFrameRect;
83 mutable IntPoint m_cachedScrollPosition; 83 mutable IntPoint m_cachedScrollPosition;
84 mutable bool m_cachedElementRectDirty; 84 mutable bool m_cachedElementRectDirty;
85 85
86 // 86 //
87 // Overridden from AXObject. 87 // Overridden from AXObject.
88 // 88 //
89 89
90 virtual void init() OVERRIDE; 90 virtual void init() override;
91 virtual void detach() OVERRIDE; 91 virtual void detach() override;
92 virtual bool isDetached() const OVERRIDE { return !m_renderer; } 92 virtual bool isDetached() const override { return !m_renderer; }
93 virtual bool isAXRenderObject() const OVERRIDE { return true; } 93 virtual bool isAXRenderObject() const override { return true; }
94 94
95 // Check object role or purpose. 95 // Check object role or purpose.
96 virtual bool isAttachment() const OVERRIDE; 96 virtual bool isAttachment() const override;
97 virtual bool isFileUploadButton() const OVERRIDE; 97 virtual bool isFileUploadButton() const override;
98 virtual bool isLinked() const OVERRIDE; 98 virtual bool isLinked() const override;
99 virtual bool isLoaded() const OVERRIDE; 99 virtual bool isLoaded() const override;
100 virtual bool isOffScreen() const OVERRIDE; 100 virtual bool isOffScreen() const override;
101 virtual bool isReadOnly() const OVERRIDE; 101 virtual bool isReadOnly() const override;
102 virtual bool isVisited() const OVERRIDE; 102 virtual bool isVisited() const override;
103 103
104 // Check object state. 104 // Check object state.
105 virtual bool isFocused() const OVERRIDE; 105 virtual bool isFocused() const override;
106 virtual bool isSelected() const OVERRIDE; 106 virtual bool isSelected() const override;
107 107
108 // Whether objects are ignored, i.e. not included in the tree. 108 // Whether objects are ignored, i.e. not included in the tree.
109 virtual AXObjectInclusion defaultObjectInclusion() const OVERRIDE; 109 virtual AXObjectInclusion defaultObjectInclusion() const override;
110 virtual bool computeAccessibilityIsIgnored() const OVERRIDE; 110 virtual bool computeAccessibilityIsIgnored() const override;
111 111
112 // Properties of static elements. 112 // Properties of static elements.
113 virtual const AtomicString& accessKey() const OVERRIDE; 113 virtual const AtomicString& accessKey() const override;
114 virtual AccessibilityOrientation orientation() const OVERRIDE; 114 virtual AccessibilityOrientation orientation() const override;
115 virtual String text() const OVERRIDE; 115 virtual String text() const override;
116 virtual int textLength() const OVERRIDE; 116 virtual int textLength() const override;
117 virtual KURL url() const OVERRIDE; 117 virtual KURL url() const override;
118 118
119 // Properties of interactive elements. 119 // Properties of interactive elements.
120 virtual String actionVerb() const OVERRIDE; 120 virtual String actionVerb() const override;
121 virtual String stringValue() const OVERRIDE; 121 virtual String stringValue() const override;
122 122
123 // ARIA attributes. 123 // ARIA attributes.
124 virtual AXObject* activeDescendant() const OVERRIDE; 124 virtual AXObject* activeDescendant() const override;
125 virtual void ariaFlowToElements(AccessibilityChildrenVector&) const OVERRIDE ; 125 virtual void ariaFlowToElements(AccessibilityChildrenVector&) const override ;
126 virtual void ariaControlsElements(AccessibilityChildrenVector&) const OVERRI DE; 126 virtual void ariaControlsElements(AccessibilityChildrenVector&) const overri de;
127 virtual void ariaDescribedbyElements(AccessibilityChildrenVector&) const OVE RRIDE; 127 virtual void ariaDescribedbyElements(AccessibilityChildrenVector&) const ove rride;
128 virtual void ariaLabelledbyElements(AccessibilityChildrenVector&) const OVER RIDE; 128 virtual void ariaLabelledbyElements(AccessibilityChildrenVector&) const over ride;
129 virtual void ariaOwnsElements(AccessibilityChildrenVector&) const OVERRIDE; 129 virtual void ariaOwnsElements(AccessibilityChildrenVector&) const override;
130 130
131 virtual bool ariaHasPopup() const OVERRIDE; 131 virtual bool ariaHasPopup() const override;
132 virtual bool ariaRoleHasPresentationalChildren() const OVERRIDE; 132 virtual bool ariaRoleHasPresentationalChildren() const override;
133 virtual bool isPresentationalChildOfAriaRole() const OVERRIDE; 133 virtual bool isPresentationalChildOfAriaRole() const override;
134 virtual bool shouldFocusActiveDescendant() const OVERRIDE; 134 virtual bool shouldFocusActiveDescendant() const override;
135 virtual bool supportsARIADragging() const OVERRIDE; 135 virtual bool supportsARIADragging() const override;
136 virtual bool supportsARIADropping() const OVERRIDE; 136 virtual bool supportsARIADropping() const override;
137 virtual bool supportsARIAFlowTo() const OVERRIDE; 137 virtual bool supportsARIAFlowTo() const override;
138 virtual bool supportsARIAOwns() const OVERRIDE; 138 virtual bool supportsARIAOwns() const override;
139 139
140 // ARIA live-region features. 140 // ARIA live-region features.
141 virtual const AtomicString& ariaLiveRegionStatus() const OVERRIDE; 141 virtual const AtomicString& ariaLiveRegionStatus() const override;
142 virtual const AtomicString& ariaLiveRegionRelevant() const OVERRIDE; 142 virtual const AtomicString& ariaLiveRegionRelevant() const override;
143 virtual bool ariaLiveRegionAtomic() const OVERRIDE; 143 virtual bool ariaLiveRegionAtomic() const override;
144 virtual bool ariaLiveRegionBusy() const OVERRIDE; 144 virtual bool ariaLiveRegionBusy() const override;
145 145
146 // Accessibility Text. 146 // Accessibility Text.
147 virtual String textUnderElement() const OVERRIDE; 147 virtual String textUnderElement() const override;
148 148
149 // Accessibility Text - (To be deprecated). 149 // Accessibility Text - (To be deprecated).
150 virtual String helpText() const OVERRIDE; 150 virtual String helpText() const override;
151 151
152 // Location and click point in frame-relative coordinates. 152 // Location and click point in frame-relative coordinates.
153 virtual void markCachedElementRectDirty() const OVERRIDE; 153 virtual void markCachedElementRectDirty() const override;
154 virtual IntPoint clickPoint() OVERRIDE; 154 virtual IntPoint clickPoint() override;
155 155
156 // Hit testing. 156 // Hit testing.
157 virtual AXObject* accessibilityHitTest(const IntPoint&) const OVERRIDE; 157 virtual AXObject* accessibilityHitTest(const IntPoint&) const override;
158 virtual AXObject* elementAccessibilityHitTest(const IntPoint&) const OVERRID E; 158 virtual AXObject* elementAccessibilityHitTest(const IntPoint&) const overrid e;
159 159
160 // High-level accessibility tree access. Other modules should only use these functions. 160 // High-level accessibility tree access. Other modules should only use these functions.
161 virtual AXObject* parentObject() const OVERRIDE; 161 virtual AXObject* parentObject() const override;
162 virtual AXObject* parentObjectIfExists() const OVERRIDE; 162 virtual AXObject* parentObjectIfExists() const override;
163 163
164 // Low-level accessibility tree exploration, only for use within the accessi bility module. 164 // Low-level accessibility tree exploration, only for use within the accessi bility module.
165 virtual AXObject* firstChild() const OVERRIDE; 165 virtual AXObject* firstChild() const override;
166 virtual AXObject* nextSibling() const OVERRIDE; 166 virtual AXObject* nextSibling() const override;
167 virtual void addChildren() OVERRIDE; 167 virtual void addChildren() override;
168 virtual bool canHaveChildren() const OVERRIDE; 168 virtual bool canHaveChildren() const override;
169 virtual void updateChildrenIfNecessary() OVERRIDE; 169 virtual void updateChildrenIfNecessary() override;
170 virtual bool needsToUpdateChildren() const { return m_childrenDirty; } 170 virtual bool needsToUpdateChildren() const { return m_childrenDirty; }
171 virtual void setNeedsToUpdateChildren() OVERRIDE { m_childrenDirty = true; } 171 virtual void setNeedsToUpdateChildren() override { m_childrenDirty = true; }
172 virtual void clearChildren() OVERRIDE; 172 virtual void clearChildren() override;
173 virtual AXObject* observableObject() const OVERRIDE; 173 virtual AXObject* observableObject() const override;
174 174
175 // Properties of the object's owning document or page. 175 // Properties of the object's owning document or page.
176 virtual double estimatedLoadingProgress() const OVERRIDE; 176 virtual double estimatedLoadingProgress() const override;
177 177
178 // DOM and Render tree access. 178 // DOM and Render tree access.
179 virtual Node* node() const OVERRIDE; 179 virtual Node* node() const override;
180 virtual Document* document() const OVERRIDE; 180 virtual Document* document() const override;
181 virtual FrameView* documentFrameView() const OVERRIDE; 181 virtual FrameView* documentFrameView() const override;
182 virtual Element* anchorElement() const OVERRIDE; 182 virtual Element* anchorElement() const override;
183 virtual Widget* widgetForAttachmentView() const OVERRIDE; 183 virtual Widget* widgetForAttachmentView() const override;
184 184
185 // Selected text. 185 // Selected text.
186 virtual PlainTextRange selectedTextRange() const OVERRIDE; 186 virtual PlainTextRange selectedTextRange() const override;
187 187
188 // Modify or take an action on an object. 188 // Modify or take an action on an object.
189 virtual void setSelectedTextRange(const PlainTextRange&) OVERRIDE; 189 virtual void setSelectedTextRange(const PlainTextRange&) override;
190 virtual void setValue(const String&) OVERRIDE; 190 virtual void setValue(const String&) override;
191 virtual void scrollTo(const IntPoint&) const OVERRIDE; 191 virtual void scrollTo(const IntPoint&) const override;
192 192
193 // Notifications that this object may have changed. 193 // Notifications that this object may have changed.
194 virtual void handleActiveDescendantChanged() OVERRIDE; 194 virtual void handleActiveDescendantChanged() override;
195 virtual void handleAriaExpandedChanged() OVERRIDE; 195 virtual void handleAriaExpandedChanged() override;
196 virtual void textChanged() OVERRIDE; 196 virtual void textChanged() override;
197 197
198 // Text metrics. Most of these should be deprecated, needs major cleanup. 198 // Text metrics. Most of these should be deprecated, needs major cleanup.
199 virtual int index(const VisiblePosition&) const OVERRIDE; 199 virtual int index(const VisiblePosition&) const override;
200 virtual VisiblePosition visiblePositionForIndex(int) const OVERRIDE; 200 virtual VisiblePosition visiblePositionForIndex(int) const override;
201 virtual void lineBreaks(Vector<int>&) const OVERRIDE; 201 virtual void lineBreaks(Vector<int>&) const override;
202 202
203 private: 203 private:
204 bool isAllowedChildOfTree() const; 204 bool isAllowedChildOfTree() const;
205 void ariaListboxSelectedChildren(AccessibilityChildrenVector&); 205 void ariaListboxSelectedChildren(AccessibilityChildrenVector&);
206 PlainTextRange ariaSelectedTextRange() const; 206 PlainTextRange ariaSelectedTextRange() const;
207 bool nodeIsTextControl(const Node*) const; 207 bool nodeIsTextControl(const Node*) const;
208 bool isTabItemSelected() const; 208 bool isTabItemSelected() const;
209 AXObject* accessibilityImageMapHitTest(HTMLAreaElement*, const IntPoint&) co nst; 209 AXObject* accessibilityImageMapHitTest(HTMLAreaElement*, const IntPoint&) co nst;
210 bool renderObjectIsObservable(RenderObject*) const; 210 bool renderObjectIsObservable(RenderObject*) const;
211 RenderObject* renderParentObject() const; 211 RenderObject* renderParentObject() const;
(...skipping 19 matching lines...) Expand all
231 VisibleSelection selection() const; 231 VisibleSelection selection() const;
232 int indexForVisiblePosition(const VisiblePosition&) const; 232 int indexForVisiblePosition(const VisiblePosition&) const;
233 void accessibilityChildrenFromAttribute(QualifiedName attr, AccessibilityChi ldrenVector&) const; 233 void accessibilityChildrenFromAttribute(QualifiedName attr, AccessibilityChi ldrenVector&) const;
234 }; 234 };
235 235
236 DEFINE_AX_OBJECT_TYPE_CASTS(AXRenderObject, isAXRenderObject()); 236 DEFINE_AX_OBJECT_TYPE_CASTS(AXRenderObject, isAXRenderObject());
237 237
238 } // namespace blink 238 } // namespace blink
239 239
240 #endif // AXRenderObject_h 240 #endif // AXRenderObject_h
OLDNEW
« no previous file with comments | « Source/core/accessibility/AXProgressIndicator.h ('k') | Source/core/accessibility/AXSVGRoot.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698