From 1bf1084f2b10c3b47fd1a588d85d21ed0eb41d0c Mon Sep 17 00:00:00 2001 From: Lorry Tar Creator Date: Tue, 27 Jun 2017 06:07:23 +0000 Subject: webkitgtk-2.16.5 --- .../InjectedBundle/AccessibilityController.cpp | 47 +++++++++++----------- 1 file changed, 23 insertions(+), 24 deletions(-) (limited to 'Tools/WebKitTestRunner/InjectedBundle/AccessibilityController.cpp') 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 -#include -#include -#include +#include +#include +#include namespace WTR { -PassRefPtr AccessibilityController::create() +Ref 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 AccessibilityController::rootElement() +Ref AccessibilityController::rootElement() { - WKBundlePageRef page = InjectedBundle::shared().page()->page(); + WKBundlePageRef page = InjectedBundle::singleton().page()->page(); void* root = WKAccessibilityRootObject(page); return AccessibilityUIElement::create(static_cast(root)); } -PassRefPtr AccessibilityController::focusedElement() +Ref AccessibilityController::focusedElement() { - WKBundlePageRef page = InjectedBundle::shared().page()->page(); + WKBundlePageRef page = InjectedBundle::singleton().page()->page(); void* root = WKAccessibilityFocusedObject(page); return AccessibilityUIElement::create(static_cast(root)); } #endif -PassRefPtr AccessibilityController::elementAtPoint(int x, int y) +RefPtr AccessibilityController::elementAtPoint(int x, int y) { - RefPtr uiElement = rootElement(); + Ref 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 AccessibilityController::accessibleElementById(JSStringRef attribute) { return nullptr; } -void AccessibilityController::logAccessibilityEvents() { } -void AccessibilityController::resetToConsistentState() { } -JSRetainPtr AccessibilityController::platformName() { return JSRetainPtr(Adopt, JSStringCreateWithUTF8CString("")); } -#endif - #if !HAVE(ACCESSIBILITY) && (PLATFORM(GTK) || PLATFORM(EFL)) -PassRefPtr AccessibilityController::rootElement() { return nullptr; } -PassRefPtr AccessibilityController::focusedElement() { return nullptr; } +RefPtr AccessibilityController::rootElement() { return nullptr; } +RefPtr AccessibilityController::focusedElement() { return nullptr; } #endif } // namespace WTR -- cgit v1.2.1