diff options
| author | Steve Block <steveblock@google.com> | 2010-02-02 14:57:50 +0000 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2010-02-04 15:06:55 +0000 |
| commit | d0825bca7fe65beaee391d30da42e937db621564 (patch) | |
| tree | 7461c49eb5844ffd1f35d1ba2c8b7584c1620823 /WebCore/accessibility/AccessibilityRenderObject.h | |
| parent | 3db770bd97c5a59b6c7574ca80a39e5a51c1defd (diff) | |
| download | external_webkit-d0825bca7fe65beaee391d30da42e937db621564.zip external_webkit-d0825bca7fe65beaee391d30da42e937db621564.tar.gz external_webkit-d0825bca7fe65beaee391d30da42e937db621564.tar.bz2 | |
Merge webkit.org at r54127 : Initial merge by git
Change-Id: Ib661abb595522f50ea406f72d3a0ce17f7193c82
Diffstat (limited to 'WebCore/accessibility/AccessibilityRenderObject.h')
| -rw-r--r-- | WebCore/accessibility/AccessibilityRenderObject.h | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/WebCore/accessibility/AccessibilityRenderObject.h b/WebCore/accessibility/AccessibilityRenderObject.h index d537881..6735076 100644 --- a/WebCore/accessibility/AccessibilityRenderObject.h +++ b/WebCore/accessibility/AccessibilityRenderObject.h @@ -96,7 +96,7 @@ public: virtual bool isHovered() const; virtual bool isIndeterminate() const; virtual bool isLoaded() const; - virtual bool isMultiSelect() const; + virtual bool isMultiSelectable() const; virtual bool isOffScreen() const; virtual bool isPressed() const; virtual bool isReadOnly() const; @@ -125,6 +125,7 @@ public: virtual AccessibilityObject* selectedRadioButton(); virtual AccessibilityObject* selectedTabItem(); virtual int layoutCount() const; + virtual double estimatedLoadingProgress() const; virtual AccessibilityObject* doAccessibilityHitTest(const IntPoint&) const; virtual AccessibilityObject* focusedUIElement() const; @@ -207,6 +208,7 @@ public: virtual void detach(); virtual void childrenChanged(); + virtual void contentChanged(); virtual void addChildren(); virtual bool canHaveChildren() const; virtual void selectedChildren(AccessibilityChildrenVector&); @@ -248,6 +250,7 @@ public: virtual String stringRoleForMSAA() const; virtual String nameForMSAA() const; virtual String descriptionForMSAA() const; + virtual AccessibilityRole roleValueForMSAA() const; protected: RenderObject* m_renderer; @@ -264,6 +267,7 @@ private: void ariaListboxVisibleChildren(AccessibilityChildrenVector&); bool ariaIsHidden() const; bool isDescendantOfBarrenParent() const; + bool isAllowedChildOfTree() const; bool hasTextAlternative() const; String positionalDescriptionForMSAA() const; @@ -279,15 +283,23 @@ private: AccessibilityObject* accessibilityImageMapHitTest(HTMLAreaElement*, const IntPoint&) const; AccessibilityObject* accessibilityParentForImageMap(HTMLMapElement* map) const; - void ariaTreeSelectedRows(AccessibilityChildrenVector&); + void ariaSelectedRows(AccessibilityChildrenVector&); - bool elementAttributeValue(const QualifiedName&); + bool elementAttributeValue(const QualifiedName&) const; void setElementAttributeValue(const QualifiedName&, bool); String accessibilityDescriptionForElements(Vector<Element*> &elements) const; void elementsFromAttribute(Vector<Element*>& elements, const QualifiedName& name) const; - void markChildrenDirty() const { m_childrenDirty = true; } + virtual const AtomicString& ariaLiveRegionStatus() const; + virtual const AtomicString& ariaLiveRegionRelevant() const; + virtual bool ariaLiveRegionAtomic() const; + virtual bool ariaLiveRegionBusy() const; + + void setNeedsToUpdateChildren() const { m_childrenDirty = true; } + bool needsToUpdateChildren() const { return m_childrenDirty; } + + mutable AccessibilityRole m_roleForMSAA; }; } // namespace WebCore |