Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / public / web / WebAXObject.h

diff --git a/src/third_party/WebKit/public/web/WebAXObject.h b/src/third_party/WebKit/public/web/WebAXObject.h
index 10d4646..4d96c8f 100644 (file)
--- a/src/third_party/WebKit/public/web/WebAXObject.h
+++ b/src/third_party/WebKit/public/web/WebAXObject.h
@@ -40,10 +40,9 @@
 namespace WTF { template <typename T> class PassRefPtr; }
 #endif
 
-namespace WebCore { class AXObject; }
-
-namespace WebKit {
+namespace blink {
 
+class AXObject;
 class WebNode;
 class WebDocument;
 class WebString;
@@ -72,23 +71,16 @@ public:
     // isDetached also checks for null, so it's safe to just call isDetached.
     BLINK_EXPORT bool isDetached() const;
 
-    // Static methods for enabling accessibility.
-    BLINK_EXPORT static void enableAccessibility();
-    BLINK_EXPORT static bool accessibilityEnabled();
-
-    BLINK_EXPORT void startCachingComputedObjectAttributesUntilTreeMutates();
-    BLINK_EXPORT void stopCachingComputedObjectAttributes();
-
-    // Temporary: this flag will only be toggleable until Chromium has it on by default.
-    BLINK_EXPORT static void enableInlineTextBoxAccessibility();
-
     BLINK_EXPORT int axID() const;
 
-    // Update the underlying tree, and return true if this object is
+    // Update layout on the underlying tree, and return true if this object is
     // still valid (not detached). Note that calling this method
     // can cause other WebAXObjects to become invalid, too,
     // so always call isDetached if updateBackingStoreAndCheckValidity
     // has been called on any object, or if any other WebCore code has run.
+    BLINK_EXPORT bool updateLayoutAndCheckValidity();
+
+    // FIXME: Deprecated - remove once callers use updateLayoutAndCheckValidity, instead.
     BLINK_EXPORT bool updateBackingStoreAndCheckValidity();
 
     BLINK_EXPORT WebString accessibilityDescription() const;
@@ -123,11 +115,17 @@ public:
     BLINK_EXPORT bool isVisited() const;
 
     BLINK_EXPORT WebString accessKey() const;
+    BLINK_EXPORT WebAXObject ariaActiveDescendant() const;
+    BLINK_EXPORT bool ariaControls(WebVector<WebAXObject>& controlsElements) const;
+    BLINK_EXPORT bool ariaDescribedby(WebVector<WebAXObject>& describedbyElements) const;
+    BLINK_EXPORT bool ariaFlowTo(WebVector<WebAXObject>& flowToElements) const;
     BLINK_EXPORT bool ariaHasPopup() const;
+    BLINK_EXPORT bool ariaLabelledby(WebVector<WebAXObject>& labelledbyElements) const;
     BLINK_EXPORT bool ariaLiveRegionAtomic() const;
     BLINK_EXPORT bool ariaLiveRegionBusy() const;
     BLINK_EXPORT WebString ariaLiveRegionRelevant() const;
     BLINK_EXPORT WebString ariaLiveRegionStatus() const;
+    BLINK_EXPORT bool ariaOwns(WebVector<WebAXObject>& ownsElements) const;
     BLINK_EXPORT WebRect boundingBoxRect() const;
     BLINK_EXPORT bool canvasHasFallbackContent() const;
     BLINK_EXPORT WebPoint clickPoint() const;
@@ -211,15 +209,15 @@ public:
     BLINK_EXPORT void scrollToGlobalPoint(const WebPoint&) const;
 
 #if BLINK_IMPLEMENTATION
-    WebAXObject(const WTF::PassRefPtr<WebCore::AXObject>&);
-    WebAXObject& operator=(const WTF::PassRefPtr<WebCore::AXObject>&);
-    operator WTF::PassRefPtr<WebCore::AXObject>() const;
+    WebAXObject(const WTF::PassRefPtr<AXObject>&);
+    WebAXObject& operator=(const WTF::PassRefPtr<AXObject>&);
+    operator WTF::PassRefPtr<AXObject>() const;
 #endif
 
 private:
-    WebPrivatePtr<WebCore::AXObject> m_private;
+    WebPrivatePtr<AXObject> m_private;
 };
 
-} // namespace WebKit
+} // namespace blink
 
 #endif