Fix developer mode build for configuration with Accessibility without ATK

Author: emutavchi

Tools/MiniBrowser/wpe/main.cpp

@@ -309,7 +309,7 @@ int main(int argc, char *argv[])
     g_object_unref(settings);
 
     backendPtr->setInputClient(std::make_unique<InputClient>(loop, webView));
-#if defined(ENABLE_ACCESSIBILITY) && ENABLE_ACCESSIBILITY
+#if defined(ENABLE_ACCESSIBILITY) && ENABLE_ACCESSIBILITY && defined(USE_ATK) && USE_ATK
     auto* accessible = wpe_view_backend_dispatch_get_accessible(wpeBackend);
     if (ATK_IS_OBJECT(accessible))
         backendPtr->setAccessibleChild(ATK_OBJECT(accessible));

Tools/WebKitTestRunner/InjectedBundle/InjectedBundle.cpp

@@ -26,6 +26,9 @@
 #include "config.h"
 #include "InjectedBundle.h"
 
+#if ENABLE(ACCESSIBILITY)
+#include "AccessibilityController.h"
+#endif
 #include "ActivateFonts.h"
 #include "DictionaryFunctions.h"
 #include "InjectedBundlePage.h"

Tools/WebKitTestRunner/InjectedBundle/InjectedBundle.h

@@ -37,14 +37,14 @@
 #include <wtf/RefPtr.h>
 #include <wtf/Vector.h>
 
-#if ENABLE(ACCESSIBILITY)
-#include "AccessibilityController.h"
-#endif
-
 namespace WTR {
 
 class InjectedBundlePage;
 
+#if ENABLE(ACCESSIBILITY)
+class AccessibilityController;
+#endif
+
 class InjectedBundle {
 public:
     static InjectedBundle& singleton();

Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp

@@ -26,6 +26,9 @@
 #include "config.h"
 #include "InjectedBundlePage.h"
 
+#if ENABLE(ACCESSIBILITY)
+#include "AccessibilityController.h"
+#endif
 #include "ActivateFonts.h"
 #include "InjectedBundle.h"
 #include "StringFunctions.h"

Tools/WebKitTestRunner/InjectedBundle/atspi/AccessibilityUIElementAtspi.cpp

@@ -27,6 +27,7 @@
 #include "AccessibilityUIElement.h"
 
 #if USE(ATSPI)
+#include "AccessibilityController.h"
 #include "AccessibilityNotificationHandler.h"
 #include "InjectedBundle.h"
 #include "InjectedBundlePage.h"

Tools/wpe/backends/PlatformWPE.cmake

@@ -11,7 +11,6 @@ list(APPEND WPEToolingBackends_PUBLIC_HEADERS
 list(APPEND WPEToolingBackends_SOURCES
     ${WPEToolingBackends_DERIVED_SOURCES_DIR}/xdg-shell-unstable-v6-protocol.c
 
-    atk/ViewBackendAtk.cpp
     atk/WebKitAccessibleApplication.cpp
 
     fdo/HeadlessViewBackendFdo.cpp
@@ -64,5 +63,11 @@ if (ENABLE_ACCESSIBILITY)
     list(APPEND WPEToolingBackends_PRIVATE_DEFINITIONS
         GLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_40
     )
-    list(APPEND WPEToolingBackends_LIBRARIES ATK::Bridge)
+    if (USE_ATK)
+        list(APPEND WPEToolingBackends_DEFINITIONS USE_ATK=1)
+        list(APPEND WPEToolingBackends_LIBRARIES ATK::Bridge)
+        list(APPEND WPEToolingBackends_SOURCES
+          atk/ViewBackendAtk.cpp
+        )
+    endif ()
 endif ()

Tools/wpe/backends/ViewBackend.cpp

@@ -36,7 +36,7 @@ ViewBackend::ViewBackend(uint32_t width, uint32_t height)
 
 ViewBackend::~ViewBackend() = default;
 
-#if !(defined(ENABLE_ACCESSIBILITY) && ENABLE_ACCESSIBILITY)
+#if !(defined(ENABLE_ACCESSIBILITY) && ENABLE_ACCESSIBILITY && defined(USE_ATK) && USE_ATK)
 void ViewBackend::initializeAccessibility()
 {
 }
@@ -81,7 +81,7 @@ void ViewBackend::dispatchInputAxisEvent(struct wpe_input_axis_event* event)
 
 void ViewBackend::dispatchInputKeyboardEvent(struct wpe_input_keyboard_event* event)
 {
-#if defined(ENABLE_ACCESSIBILITY) && ENABLE_ACCESSIBILITY
+#if defined(ENABLE_ACCESSIBILITY) && ENABLE_ACCESSIBILITY && defined(USE_ATK) && USE_ATK
     notifyAccessibilityKeyEventListeners(event);
 #endif