Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / core / accessibility / AXObject.h

diff --git a/src/third_party/WebKit/Source/core/accessibility/AXObject.h b/src/third_party/WebKit/Source/core/accessibility/AXObject.h
index b3fa7fd..c5e9107 100644 (file)
--- a/src/third_party/WebKit/Source/core/accessibility/AXObject.h
+++ b/src/third_party/WebKit/Source/core/accessibility/AXObject.h
@@ -37,18 +37,19 @@
 #include "wtf/RefPtr.h"
 #include "wtf/Vector.h"
 
-namespace WebCore {
+namespace blink {
 
 class AXObject;
 class AXObjectCache;
 class Element;
-class Frame;
+class LocalFrame;
 class FrameView;
 class HTMLAnchorElement;
 class HTMLAreaElement;
 class IntPoint;
 class IntSize;
 class Node;
+class Range;
 class RenderObject;
 class RenderListItem;
 class ScrollableArea;
@@ -79,6 +80,7 @@ enum AccessibilityRole {
     DefinitionRole,
     DescriptionListDetailRole,
     DescriptionListTermRole,
+    DetailsRole,
     DialogRole,
     DirectoryRole,
     DisclosureTriangleRole,
@@ -86,6 +88,9 @@ enum AccessibilityRole {
     DocumentRole,
     DrawerRole,
     EditableTextRole,
+    EmbeddedObjectRole,
+    FigcaptionRole,
+    FigureRole,
     FooterRole,
     FormRole,
     GridRole,
@@ -94,6 +99,7 @@ enum AccessibilityRole {
     HeadingRole,
     HelpTagRole,
     HorizontalRuleRole,
+    IframeRole,
     IgnoredRole,
     ImageMapLinkRole,
     ImageMapRole,
@@ -121,6 +127,7 @@ enum AccessibilityRole {
     MenuListPopupRole,
     MenuRole,
     NavigationRole,
+    NoneRole,
     NoteRole,
     OutlineRole,
     ParagraphRole,
@@ -291,9 +298,6 @@ public:
     AXObjectCache* axObjectCache() const;
     AXID axObjectID() const { return m_id; }
 
-    // Lays out the page so that the accessibility tree is based on up-to-date information.
-    void updateBackingStore();
-
     // Determine subclass type.
     virtual bool isAXNodeObject() const { return false; }
     virtual bool isAXRenderObject() const { return false; }
@@ -316,6 +320,7 @@ public:
     bool isComboBox() const { return roleValue() == ComboBoxRole; }
     virtual bool isControl() const { return false; }
     virtual bool isDataTable() const { return false; }
+    virtual bool isEmbeddedObject() const { return false; }
     virtual bool isFieldset() const { return false; }
     virtual bool isFileUploadButton() const { return false; }
     virtual bool isHeading() const { return false; }
@@ -378,7 +383,6 @@ public:
     virtual bool canSetFocusAttribute() const { return false; }
     virtual bool canSetValueAttribute() const { return false; }
     virtual bool canSetSelectedAttribute() const { return false; }
-    virtual bool canSetSelectedChildrenAttribute() const { return false; }
 
     // Whether objects are ignored, i.e. not included in the tree.
     bool accessibilityIsIgnored() const;
@@ -397,7 +401,6 @@ public:
     // 1-based, to match the aria-level spec.
     virtual unsigned hierarchicalLevel() const { return 0; }
     virtual AccessibilityOrientation orientation() const;
-    virtual int tableLevel() const { return 0; }
     virtual String text() const { return String(); }
     virtual int textLength() const { return 0; }
     virtual AXObject* titleUIElement() const { return 0; }
@@ -418,21 +421,22 @@ public:
     virtual float valueForRange() const { return 0.0f; }
     virtual float maxValueForRange() const { return 0.0f; }
     virtual float minValueForRange() const { return 0.0f; }
-    const AtomicString& placeholderValue() const;
-    virtual void selectedChildren(AccessibilityChildrenVector&) { }
     virtual String stringValue() const { return String(); }
 
     // ARIA attributes.
     virtual AXObject* activeDescendant() const { return 0; }
     virtual String ariaDescribedByAttribute() const { return String(); }
     virtual void ariaFlowToElements(AccessibilityChildrenVector&) const { }
+    virtual void ariaControlsElements(AccessibilityChildrenVector&) const { }
+    virtual void ariaDescribedbyElements(AccessibilityChildrenVector& describedby) const { };
+    virtual void ariaLabelledbyElements(AccessibilityChildrenVector& labelledby) const { };
+    virtual void ariaOwnsElements(AccessibilityChildrenVector& owns) const { };
     virtual bool ariaHasPopup() const { return false; }
     bool ariaIsMultiline() const;
     virtual String ariaLabeledByAttribute() const { return String(); }
     bool ariaPressedIsPresent() const;
     virtual AccessibilityRole ariaRoleAttribute() const { return UnknownRole; }
     virtual bool ariaRoleHasPresentationalChildren() const { return false; }
-    const AtomicString& invalidStatus() const;
     virtual bool isARIAGrabbed() { return false; }
     virtual bool isPresentationalChildOfAriaRole() const { return false; }
     virtual bool shouldFocusActiveDescendant() const { return false; }
@@ -455,7 +459,6 @@ public:
     virtual bool ariaLiveRegionBusy() const { return false; }
 
     // Accessibility Text.
-    virtual void accessibilityText(Vector<AccessibilityText>&) { };
     virtual String textUnderElement() const { return String(); }
 
     // Accessibility Text - (To be deprecated).
@@ -489,6 +492,7 @@ public:
     virtual bool canHaveChildren() const { return true; }
     bool hasChildren() const { return m_haveChildren; }
     virtual void updateChildrenIfNecessary();
+    virtual bool needsToUpdateChildren() const { return false; }
     virtual void setNeedsToUpdateChildren() { }
     virtual void clearChildren();
     virtual void detachFromParent() { }
@@ -578,6 +582,6 @@ protected:
 #define DEFINE_AX_OBJECT_TYPE_CASTS(thisType, predicate) \
     DEFINE_TYPE_CASTS(thisType, AXObject, object, object->predicate, object.predicate)
 
-} // namespace WebCore
+} // namespace blink
 
 #endif // AXObject_h