Clean up accessibility enums for use in Chromium.

public/web/WebAccessibilityObject.h

 /*
  * Copyright (C) 2009 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 16 matching lines @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #ifndef WebAccessibilityObject_h
 #define WebAccessibilityObject_h
 
 #include "../platform/WebCommon.h"
 #include "../platform/WebPrivatePtr.h"
 #include "../platform/WebVector.h"
+#include "WebAXEnums.h"
 #include "WebAccessibilityRole.h"
 
 #if WEBKIT_IMPLEMENTATION
 namespace WTF { template <typename T> class PassRefPtr; }
 #endif
 
 namespace WebCore { class AccessibilityObject; }
 
 namespace WebKit {
 
 class WebNode;
 class WebDocument;
 class WebString;
 class WebURL;
 struct WebPoint;
 struct WebRect;
 
 // A container for passing around a reference to AccessibilityObject.
+// FIXME: rename this to WebAXObject (http://crbug.com/269034).
 class WebAccessibilityObject {
 public:
     ~WebAccessibilityObject() { reset(); }
 
     WebAccessibilityObject() { }
     WebAccessibilityObject(const WebAccessibilityObject& o) { assign(o); }
     WebAccessibilityObject& operator=(const WebAccessibilityObject& o)
     {
         assign(o);
         return *this;
@@ skipping 63 matching lines @@
     WEBKIT_EXPORT WebRect boundingBoxRect() const;
     WEBKIT_EXPORT bool canvasHasFallbackContent() const;
     WEBKIT_EXPORT WebPoint clickPoint() const;
     WEBKIT_EXPORT void colorValue(int& r, int& g, int& b) const;
     WEBKIT_EXPORT double estimatedLoadingProgress() const;
     WEBKIT_EXPORT WebString helpText() const;
     WEBKIT_EXPORT int headingLevel() const;
     WEBKIT_EXPORT int hierarchicalLevel() const;
     WEBKIT_EXPORT WebAccessibilityObject hitTest(const WebPoint&) const;
     WEBKIT_EXPORT WebString keyboardShortcut() const;
-    WEBKIT_EXPORT WebAccessibilityRole roleValue() const;
+    WEBKIT_EXPORT WebAccessibilityRole roleValue() const; // Deprecated, use role().
+    WEBKIT_EXPORT WebAXRole role() const;
     WEBKIT_EXPORT unsigned selectionEnd() const;
     WEBKIT_EXPORT unsigned selectionEndLineNumber() const;
     WEBKIT_EXPORT unsigned selectionStart() const;
     WEBKIT_EXPORT unsigned selectionStartLineNumber() const;
     WEBKIT_EXPORT WebString stringValue() const;
     WEBKIT_EXPORT WebString title() const;
     WEBKIT_EXPORT WebAccessibilityObject titleUIElement() const;
     WEBKIT_EXPORT WebURL url() const;
 
     WEBKIT_EXPORT bool supportsRangeValue() const;
@@ skipping 59 matching lines @@
     operator WTF::PassRefPtr<WebCore::AccessibilityObject>() const;
 #endif
 
 private:
     WebPrivatePtr<WebCore::AccessibilityObject> m_private;
 };
 
 } // namespace WebKit
 
 #endif