Title: [245566] trunk/Tools
Revision
245566
Author
[email protected]
Date
2019-05-21 05:53:59 -0700 (Tue, 21 May 2019)

Log Message

Unreviewed. Fix the build with HAVE(ACCESSIBILITY) disabled

* WebKitTestRunner/InjectedBundle/AccessibilityController.cpp:
(WTR::AccessibilityController::elementAtPoint):
* WebKitTestRunner/InjectedBundle/AccessibilityController.h:
(WTR::AccessibilityController::rootElement):
(WTR::AccessibilityController::focusedElement):

Modified Paths

Diff

Modified: trunk/Tools/ChangeLog (245565 => 245566)


--- trunk/Tools/ChangeLog	2019-05-21 12:45:08 UTC (rev 245565)
+++ trunk/Tools/ChangeLog	2019-05-21 12:53:59 UTC (rev 245566)
@@ -1,5 +1,15 @@
 2019-05-21  Carlos Garcia Campos  <[email protected]>
 
+        Unreviewed. Fix the build with HAVE(ACCESSIBILITY) disabled
+
+        * WebKitTestRunner/InjectedBundle/AccessibilityController.cpp:
+        (WTR::AccessibilityController::elementAtPoint):
+        * WebKitTestRunner/InjectedBundle/AccessibilityController.h:
+        (WTR::AccessibilityController::rootElement):
+        (WTR::AccessibilityController::focusedElement):
+
+2019-05-21  Carlos Garcia Campos  <[email protected]>
+
         [WPE] Add initial accessibility support using ATK
         https://bugs.webkit.org/show_bug.cgi?id=197413
 

Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/AccessibilityController.cpp (245565 => 245566)


--- trunk/Tools/WebKitTestRunner/InjectedBundle/AccessibilityController.cpp	2019-05-21 12:45:08 UTC (rev 245565)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/AccessibilityController.cpp	2019-05-21 12:53:59 UTC (rev 245566)
@@ -90,13 +90,8 @@
 
 RefPtr<AccessibilityUIElement> AccessibilityController::elementAtPoint(int x, int y)
 {
-    Ref<AccessibilityUIElement> uiElement = rootElement();
+    auto uiElement = rootElement();
     return uiElement->elementAtPoint(x, y);
 }
 
-#if !HAVE(ACCESSIBILITY) && (PLATFORM(GTK) || PLATFORM(WPE))
-RefPtr<AccessibilityUIElement> AccessibilityController::rootElement() { return nullptr; }
-RefPtr<AccessibilityUIElement> AccessibilityController::focusedElement() { return nullptr; }
-#endif
-
 } // namespace WTR

Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/AccessibilityController.h (245565 => 245566)


--- trunk/Tools/WebKitTestRunner/InjectedBundle/AccessibilityController.h	2019-05-21 12:45:08 UTC (rev 245565)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/AccessibilityController.h	2019-05-21 12:53:59 UTC (rev 245566)
@@ -25,8 +25,6 @@
 
 #pragma once
 
-#if HAVE(ACCESSIBILITY)
-
 #include "AccessibilityUIElement.h"
 #include "JSWrappable.h"
 #include <_javascript_Core/JSObjectRef.h>
@@ -52,8 +50,10 @@
     JSRetainPtr<JSStringRef> platformName();
 
     // Controller Methods - platform-independent implementations.
+#if HAVE(ACCESSIBILITY)
     Ref<AccessibilityUIElement> rootElement();
     Ref<AccessibilityUIElement> focusedElement();
+#endif
     RefPtr<AccessibilityUIElement> elementAtPoint(int x, int y);
     RefPtr<AccessibilityUIElement> accessibleElementById(JSStringRef idAttribute);
 
@@ -68,6 +68,11 @@
 
     void resetToConsistentState();
 
+#if !HAVE(ACCESSIBILITY) && (PLATFORM(GTK) || PLATFORM(WPE))
+    RefPtr<AccessibilityUIElement> rootElement() { return nullptr; }
+    RefPtr<AccessibilityUIElement> focusedElement() { return nullptr; }
+#endif
+
 private:
     AccessibilityController();
 
@@ -79,5 +84,3 @@
 };
 
 } // namespace WTR
-
-#endif // HAVE(ACCESSIBILITY)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to