1 files changed, 23 insertions, 24 deletions
diff --git a/Tools/WebKitTestRunner/InjectedBundle/AccessibilityController.cpp b/Tools/WebKitTestRunner/InjectedBundle/AccessibilityController.cpp
index f5d1bd58b..0a130d4e8 100644
--- a/Tools/WebKitTestRunner/InjectedBundle/AccessibilityController.cpp
+++ b/Tools/WebKitTestRunner/InjectedBundle/AccessibilityController.cpp
@@ -32,15 +32,15 @@
 #include "JSAccessibilityController.h"
 
 #include <JavaScriptCore/JSRetainPtr.h>
-#include <WebKit2/WKBundle.h>
-#include <WebKit2/WKBundlePage.h>
-#include <WebKit2/WKBundlePagePrivate.h>
+#include <WebKit/WKBundle.h>
+#include <WebKit/WKBundlePage.h>
+#include <WebKit/WKBundlePagePrivate.h>
 
 namespace WTR {
 
-PassRefPtr<AccessibilityController> AccessibilityController::create()
+Ref<AccessibilityController> AccessibilityController::create()
 {
-    return adoptRef(new AccessibilityController);
+    return adoptRef(*new AccessibilityController);
 }
 
 AccessibilityController::AccessibilityController()
@@ -61,44 +61,43 @@ JSClassRef AccessibilityController::wrapperClass()
     return JSAccessibilityController::accessibilityControllerClass();
 }
 
+void AccessibilityController::enableEnhancedAccessibility(bool enable)
+{
+    WKAccessibilityEnableEnhancedAccessibility(enable);
+}
+
+bool AccessibilityController::enhancedAccessibilityEnabled()
+{
+    return WKAccessibilityEnhancedAccessibilityEnabled();
+}
+
 #if !PLATFORM(GTK) && !PLATFORM(EFL)
-PassRefPtr<AccessibilityUIElement> AccessibilityController::rootElement()
+Ref<AccessibilityUIElement> AccessibilityController::rootElement()
 {
-    WKBundlePageRef page = InjectedBundle::shared().page()->page();
+    WKBundlePageRef page = InjectedBundle::singleton().page()->page();
     void* root = WKAccessibilityRootObject(page);
     
     return AccessibilityUIElement::create(static_cast<PlatformUIElement>(root));    
 }
 
-PassRefPtr<AccessibilityUIElement> AccessibilityController::focusedElement()
+Ref<AccessibilityUIElement> AccessibilityController::focusedElement()
 {
-    WKBundlePageRef page = InjectedBundle::shared().page()->page();
+    WKBundlePageRef page = InjectedBundle::singleton().page()->page();
     void* root = WKAccessibilityFocusedObject(page);
     
     return AccessibilityUIElement::create(static_cast<PlatformUIElement>(root));    
 }
 #endif
 
-PassRefPtr<AccessibilityUIElement> AccessibilityController::elementAtPoint(int x, int y)
+RefPtr<AccessibilityUIElement> AccessibilityController::elementAtPoint(int x, int y)
 {
-    RefPtr<AccessibilityUIElement> uiElement = rootElement();
+    Ref<AccessibilityUIElement> uiElement = rootElement();
     return uiElement->elementAtPoint(x, y);
 }
 
-// Unsupported methods on various platforms.
-// As they're implemented on other platforms this list should be modified.
-#if (!PLATFORM(GTK) && !PLATFORM(MAC) && !PLATFORM(EFL)) || !HAVE(ACCESSIBILITY)
-bool AccessibilityController::addNotificationListener(JSValueRef) { return false; }
-bool AccessibilityController::removeNotificationListener() { return false; }
-PassRefPtr<AccessibilityUIElement> AccessibilityController::accessibleElementById(JSStringRef attribute) { return nullptr; }
-void AccessibilityController::logAccessibilityEvents() { }
-void AccessibilityController::resetToConsistentState() { }
-JSRetainPtr<JSStringRef> AccessibilityController::platformName() { return JSRetainPtr<JSStringRef>(Adopt, JSStringCreateWithUTF8CString("")); }
-#endif
-
 #if !HAVE(ACCESSIBILITY) && (PLATFORM(GTK) || PLATFORM(EFL))
-PassRefPtr<AccessibilityUIElement> AccessibilityController::rootElement() { return nullptr; }
-PassRefPtr<AccessibilityUIElement> AccessibilityController::focusedElement() { return nullptr; }
+RefPtr<AccessibilityUIElement> AccessibilityController::rootElement() { return nullptr; }
+RefPtr<AccessibilityUIElement> AccessibilityController::focusedElement() { return nullptr; }
 #endif
 
 } // namespace WTR