Index: Source/testing/runner/AccessibilityUIElementChromium.h |
diff --git a/Source/testing/runner/AccessibilityUIElementChromium.h b/Source/testing/runner/AccessibilityUIElementChromium.h |
index 290d3b48d1a36301d6f76b81dc88302a81faeee4..2a4f22e1317b796cf91a9d89b9412159aa59d371 100644 |
--- a/Source/testing/runner/AccessibilityUIElementChromium.h |
+++ b/Source/testing/runner/AccessibilityUIElementChromium.h |
@@ -32,7 +32,7 @@ |
#define AccessibilityUIElementChromium_h |
#include "CppBoundClass.h" |
-#include "public/web/WebAccessibilityObject.h" |
+#include "public/web/WebAXObject.h" |
#include <vector> |
namespace WebTestRunner { |
@@ -42,19 +42,19 @@ public: |
class Factory { |
public: |
virtual ~Factory() { } |
- virtual AccessibilityUIElement* getOrCreate(const WebKit::WebAccessibilityObject&) = 0; |
+ virtual AccessibilityUIElement* getOrCreate(const WebKit::WebAXObject&) = 0; |
jamesr
2013/09/03 21:52:42
AccessibilityUIElement ... WebAXObject
The incons
dmazzoni
2013/09/06 19:53:32
Even before, AccessibilityUIElement was a confusin
|
}; |
- AccessibilityUIElement(const WebKit::WebAccessibilityObject&, Factory*); |
+ AccessibilityUIElement(const WebKit::WebAXObject&, Factory*); |
virtual AccessibilityUIElement* getChildAtIndex(unsigned); |
virtual bool isRoot() const { return false; } |
- virtual bool isEqual(const WebKit::WebAccessibilityObject&); |
+ virtual bool isEqual(const WebKit::WebAXObject&); |
virtual void notificationReceived(const char *notificationName); |
protected: |
- const WebKit::WebAccessibilityObject& accessibilityObject() const { return m_accessibilityObject; } |
+ const WebKit::WebAXObject& accessibilityObject() const { return m_accessibilityObject; } |
Factory* factory() const { return m_factory; } |
@@ -143,7 +143,7 @@ private: |
void fallbackCallback(const CppArgumentList&, CppVariant*); |
- WebKit::WebAccessibilityObject m_accessibilityObject; |
+ WebKit::WebAXObject m_accessibilityObject; |
Factory* m_factory; |
std::vector<CppVariant> m_notificationCallbacks; |
}; |
@@ -151,7 +151,7 @@ private: |
class RootAccessibilityUIElement : public AccessibilityUIElement { |
public: |
- RootAccessibilityUIElement(const WebKit::WebAccessibilityObject&, Factory*); |
+ RootAccessibilityUIElement(const WebKit::WebAXObject&, Factory*); |
virtual AccessibilityUIElement* getChildAtIndex(unsigned); |
virtual bool isRoot() const { return true; } |
@@ -167,8 +167,8 @@ public: |
virtual ~AccessibilityUIElementList(); |
void clear(); |
- virtual AccessibilityUIElement* getOrCreate(const WebKit::WebAccessibilityObject&); |
- AccessibilityUIElement* createRoot(const WebKit::WebAccessibilityObject&); |
+ virtual AccessibilityUIElement* getOrCreate(const WebKit::WebAXObject&); |
+ AccessibilityUIElement* createRoot(const WebKit::WebAXObject&); |
private: |
typedef std::vector<AccessibilityUIElement*> ElementList; |