Source/WebCore/accessibility/AccessibilityRenderObject.h - Issue 7058064: Merge 87856

Side by Side Diff: Source/WebCore/accessibility/AccessibilityRenderObject.h

Issue 7058064: Merge 87856 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/782/

Patch Set: Created 9 years, 6 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:

« no previous file with comments | « Source/WebCore/accessibility/AccessibilityObject.cpp ('k') | Source/WebCore/accessibility/AccessibilityRenderObject.cpp » ('j') | no next file with comments »

OLD	NEW
1	1

2 /*	2 /*

3 * Copyright (C) 2008 Apple Inc. All rights reserved.	3 * Copyright (C) 2008 Apple Inc. All rights reserved.

4 *	4 *

5 * Redistribution and use in source and binary forms, with or without	5 * Redistribution and use in source and binary forms, with or without

6 * modification, are permitted provided that the following conditions	6 * modification, are permitted provided that the following conditions

7 * are met:	7 * are met:

8 *	8 *

9 * 1. Redistributions of source code must retain the above copyright	9 * 1. Redistributions of source code must retain the above copyright

10 * notice, this list of conditions and the following disclaimer.	10 * notice, this list of conditions and the following disclaimer.

(...skipping 227 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
238	238

239 virtual VisiblePosition visiblePositionForIndex(int) const;	239 virtual VisiblePosition visiblePositionForIndex(int) const;

240 virtual int indexForVisiblePosition(const VisiblePosition&) const;	240 virtual int indexForVisiblePosition(const VisiblePosition&) const;

241	241

242 virtual PlainTextRange doAXRangeForLine(unsigned) const;	242 virtual PlainTextRange doAXRangeForLine(unsigned) const;

243 virtual PlainTextRange doAXRangeForIndex(unsigned) const;	243 virtual PlainTextRange doAXRangeForIndex(unsigned) const;

244	244

245 virtual String doAXStringForRange(const PlainTextRange&) const;	245 virtual String doAXStringForRange(const PlainTextRange&) const;

246 virtual IntRect doAXBoundsForRange(const PlainTextRange&) const;	246 virtual IntRect doAXBoundsForRange(const PlainTextRange&) const;

247	247

248 virtual void updateBackingStore();

249

250 virtual String stringValueForMSAA() const;	248 virtual String stringValueForMSAA() const;

251 virtual String stringRoleForMSAA() const;	249 virtual String stringRoleForMSAA() const;

252 virtual String nameForMSAA() const;	250 virtual String nameForMSAA() const;

253 virtual String descriptionForMSAA() const;	251 virtual String descriptionForMSAA() const;

254 virtual AccessibilityRole roleValueForMSAA() const;	252 virtual AccessibilityRole roleValueForMSAA() const;

255	253

256 protected:	254 protected:

257 RenderObject* m_renderer;	255 RenderObject* m_renderer;

258 AccessibilityRole m_ariaRole;	256 AccessibilityRole m_ariaRole;

259 mutable bool m_childrenDirty;	257 mutable bool m_childrenDirty;

(...skipping 64 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
324 ASSERT(!object \|\| object->isAccessibilityRenderObject());	322 ASSERT(!object \|\| object->isAccessibilityRenderObject());

325 return static_cast<const AccessibilityRenderObject*>(object);	323 return static_cast<const AccessibilityRenderObject*>(object);

326 }	324 }

327	325

328 // This will catch anyone doing an unnecessary cast.	326 // This will catch anyone doing an unnecessary cast.

329 void toAccessibilityRenderObject(const AccessibilityRenderObject*);	327 void toAccessibilityRenderObject(const AccessibilityRenderObject*);

330	328

331 } // namespace WebCore	329 } // namespace WebCore

332	330

333 #endif // AccessibilityRenderObject_h	331 #endif // AccessibilityRenderObject_h

OLD	NEW