1 files changed, 17 insertions, 14 deletions

diff --git a/Tools/WebKitTestRunner/InjectedBundle/AccessibilityController.h b/Tools/WebKitTestRunner/InjectedBundle/AccessibilityController.h
index 7ce1a45c3..5cf0d739c 100644
--- a/Tools/WebKitTestRunner/InjectedBundle/AccessibilityController.h
+++ b/Tools/WebKitTestRunner/InjectedBundle/AccessibilityController.h
@@ -23,14 +23,15 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
-#ifndef AccessibilityController_h
-#define AccessibilityController_h
+#pragma once
+
+#if HAVE(ACCESSIBILITY)
 
 #include "AccessibilityUIElement.h"
 #include "JSWrappable.h"
 #include <JavaScriptCore/JSObjectRef.h>
 #include <wtf/Platform.h>
-#if HAVE(ACCESSIBILITY) && (PLATFORM(GTK) || PLATFORM(EFL))
+#if PLATFORM(GTK) || PLATFORM(EFL)
 #include "AccessibilityNotificationHandlerAtk.h"
 #endif
 
@@ -38,19 +39,23 @@ namespace WTR {
     
 class AccessibilityController : public JSWrappable {
 public:
-    static PassRefPtr<AccessibilityController> create();
+    static Ref<AccessibilityController> create();
     ~AccessibilityController();
 
     void makeWindowObject(JSContextRef, JSObjectRef windowObject, JSValueRef* exception);
     virtual JSClassRef wrapperClass();
     
+    // Enhanced accessibility.
+    void enableEnhancedAccessibility(bool);
+    bool enhancedAccessibilityEnabled();
+    
     JSRetainPtr<JSStringRef> platformName();
 
     // Controller Methods - platform-independent implementations.
-    PassRefPtr<AccessibilityUIElement> rootElement();
-    PassRefPtr<AccessibilityUIElement> focusedElement();
-    PassRefPtr<AccessibilityUIElement> elementAtPoint(int x, int y);
-    PassRefPtr<AccessibilityUIElement> accessibleElementById(JSStringRef idAttribute);
+    Ref<AccessibilityUIElement> rootElement();
+    Ref<AccessibilityUIElement> focusedElement();
+    RefPtr<AccessibilityUIElement> elementAtPoint(int x, int y);
+    RefPtr<AccessibilityUIElement> accessibleElementById(JSStringRef idAttribute);
 
     bool addNotificationListener(JSValueRef functionCallback);
     bool removeNotificationListener();
@@ -59,22 +64,20 @@ public:
     void logFocusEvents() { }
     void logValueChangeEvents() { }
     void logScrollingStartEvents() { }
-    void logAccessibilityEvents();
+    void logAccessibilityEvents() { };
 
     void resetToConsistentState();
 
 private:
     AccessibilityController();
 
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
     RetainPtr<NotificationHandler> m_globalNotificationHandler;
-#endif
-
-#if HAVE(ACCESSIBILITY) && (PLATFORM(GTK) || PLATFORM(EFL))
+#else
     RefPtr<AccessibilityNotificationHandler> m_globalNotificationHandler;
 #endif
 };
 
 } // namespace WTR
 
-#endif // AccessibilityController_h
+#endif // HAVE(ACCESSIBILITY)