Upstream version 9.38.198.0

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

diff --git a/src/third_party/WebKit/Source/core/accessibility/AXRenderObject.h b/src/third_party/WebKit/Source/core/accessibility/AXRenderObject.h
index 550554b..69f52c4 100644 (file)
--- a/src/third_party/WebKit/Source/core/accessibility/AXRenderObject.h
+++ b/src/third_party/WebKit/Source/core/accessibility/AXRenderObject.h
@@ -33,12 +33,12 @@
 #include "platform/geometry/LayoutRect.h"
 #include "wtf/Forward.h"
 
-namespace WebCore {
+namespace blink {
 
 class AXSVGRoot;
 class AXObjectCache;
 class Element;
-class Frame;
+class LocalFrame;
 class FrameView;
 class HitTestResult;
 class HTMLAnchorElement;
@@ -69,10 +69,8 @@ public:
 
     void setRenderer(RenderObject*);
     RenderBoxModelObject* renderBoxModelObject() const;
-    RenderView* topRenderer() const;
     Document* topDocument() const;
     bool shouldNotifyActiveDescendant() const;
-    bool needsToUpdateChildren() const { return m_childrenDirty; }
     virtual ScrollableArea* getScrollableAreaIfScrollable() const OVERRIDE FINAL;
     virtual AccessibilityRole determineAccessibilityRole() OVERRIDE;
     void checkCachedElementRect() const;
@@ -120,12 +118,16 @@ protected:
 
     // Properties of interactive elements.
     virtual String actionVerb() const OVERRIDE;
-    virtual void selectedChildren(AccessibilityChildrenVector&) OVERRIDE;
     virtual String stringValue() const OVERRIDE;
 
     // ARIA attributes.
     virtual AXObject* activeDescendant() const OVERRIDE;
     virtual void ariaFlowToElements(AccessibilityChildrenVector&) const OVERRIDE;
+    virtual void ariaControlsElements(AccessibilityChildrenVector&) const OVERRIDE;
+    virtual void ariaDescribedbyElements(AccessibilityChildrenVector&) const OVERRIDE;
+    virtual void ariaLabelledbyElements(AccessibilityChildrenVector&) const OVERRIDE;
+    virtual void ariaOwnsElements(AccessibilityChildrenVector&) const OVERRIDE;
+
     virtual bool ariaHasPopup() const OVERRIDE;
     virtual bool ariaRoleHasPresentationalChildren() const OVERRIDE;
     virtual bool isPresentationalChildOfAriaRole() const OVERRIDE;
@@ -165,6 +167,7 @@ protected:
     virtual void addChildren() OVERRIDE;
     virtual bool canHaveChildren() const OVERRIDE;
     virtual void updateChildrenIfNecessary() OVERRIDE;
+    virtual bool needsToUpdateChildren() const { return m_childrenDirty; }
     virtual void setNeedsToUpdateChildren() OVERRIDE { m_childrenDirty = true; }
     virtual void clearChildren() OVERRIDE;
     virtual AXObject* observableObject() const OVERRIDE;
@@ -203,11 +206,10 @@ private:
     PlainTextRange ariaSelectedTextRange() const;
     bool nodeIsTextControl(const Node*) const;
     bool isTabItemSelected() const;
-    AXObject* internalLinkElement() const;
     AXObject* accessibilityImageMapHitTest(HTMLAreaElement*, const IntPoint&) const;
     bool renderObjectIsObservable(RenderObject*) const;
     RenderObject* renderParentObject() const;
-    bool isDescendantOfElementType(const QualifiedName& tagName) const;
+    bool isDescendantOfElementType(const HTMLQualifiedName& tagName) const;
     bool isSVGImage() const;
     void detachRemoteSVGRoot();
     AXSVGRoot* remoteSVGRootElement() const;
@@ -227,10 +229,11 @@ private:
     LayoutRect computeElementRect() const;
     VisibleSelection selection() const;
     int indexForVisiblePosition(const VisiblePosition&) const;
+    void accessibilityChildrenFromAttribute(QualifiedName attr, AccessibilityChildrenVector&) const;
 };
 
 DEFINE_AX_OBJECT_TYPE_CASTS(AXRenderObject, isAXRenderObject());
 
-} // namespace WebCore
+} // namespace blink
 
 #endif // AXRenderObject_h