Diff
Modified: trunk/Tools/ChangeLog (159180 => 159181)
--- trunk/Tools/ChangeLog 2013-11-13 09:31:51 UTC (rev 159180)
+++ trunk/Tools/ChangeLog 2013-11-13 10:02:00 UTC (rev 159181)
@@ -1,3 +1,28 @@
+2013-11-13 Krzysztof Czech <[email protected]>
+
+ [ATK] Support compilation of EFL/GTK without accessibility
+ https://bugs.webkit.org/show_bug.cgi?id=122448
+
+ Reviewed by Chris Fleizach.
+
+ Added missing HAVE(ACCESSIBILITY) guards and stubs to ATK's related files,
+ so that in case of turning off the HAVE_ACCESSIBILITY macro EFL/GTK would compile properly.
+
+ * DumpRenderTree/AccessibilityController.h:
+ * DumpRenderTree/AccessibilityUIElement.h:
+ * DumpRenderTree/atk/AccessibilityCallbacks.h:
+ * DumpRenderTree/atk/AccessibilityNotificationHandlerAtk.cpp:
+ * DumpRenderTree/atk/AccessibilityNotificationHandlerAtk.h:
+ * WebKitTestRunner/InjectedBundle/AccessibilityController.cpp:
+ (WTR::AccessibilityController::rootElement):
+ (WTR::AccessibilityController::focusedElement):
+ * WebKitTestRunner/InjectedBundle/AccessibilityUIElement.cpp:
+ * WebKitTestRunner/InjectedBundle/atk/AccessibilityControllerAtk.cpp:
+ * WebKitTestRunner/InjectedBundle/atk/AccessibilityNotificationHandlerAtk.cpp:
+ * WebKitTestRunner/InjectedBundle/atk/AccessibilityNotificationHandlerAtk.h:
+ * WebKitTestRunner/InjectedBundle/atk/AccessibilityUIElementAtk.cpp:
+ * WebKitTestRunner/PlatformEfl.cmake:
+
2013-11-12 Ryuan Choi <[email protected]>
[EFL] Added libxss-dev to install-dependencies
Modified: trunk/Tools/DumpRenderTree/AccessibilityController.h (159180 => 159181)
--- trunk/Tools/DumpRenderTree/AccessibilityController.h 2013-11-13 09:31:51 UTC (rev 159180)
+++ trunk/Tools/DumpRenderTree/AccessibilityController.h 2013-11-13 10:02:00 UTC (rev 159181)
@@ -90,7 +90,7 @@
RetainPtr<NotificationHandler> m_globalNotificationHandler;
#endif
-#if PLATFORM(GTK) || PLATFORM(EFL)
+#if HAVE(ACCESSIBILITY) && (PLATFORM(GTK) || PLATFORM(EFL))
RefPtr<AccessibilityNotificationHandler> m_globalNotificationHandler;
#endif
};
Modified: trunk/Tools/DumpRenderTree/AccessibilityUIElement.h (159180 => 159181)
--- trunk/Tools/DumpRenderTree/AccessibilityUIElement.h 2013-11-13 09:31:51 UTC (rev 159180)
+++ trunk/Tools/DumpRenderTree/AccessibilityUIElement.h 2013-11-13 10:02:00 UTC (rev 159181)
@@ -281,7 +281,7 @@
NotificationHandler m_notificationHandler;
#endif
-#if PLATFORM(GTK) || PLATFORM(EFL)
+#if HAVE(ACCESSIBILITY) && (PLATFORM(GTK) || PLATFORM(EFL))
RefPtr<AccessibilityNotificationHandler> m_notificationHandler;
#endif
};
Modified: trunk/Tools/DumpRenderTree/atk/AccessibilityCallbacks.h (159180 => 159181)
--- trunk/Tools/DumpRenderTree/atk/AccessibilityCallbacks.h 2013-11-13 09:31:51 UTC (rev 159180)
+++ trunk/Tools/DumpRenderTree/atk/AccessibilityCallbacks.h 2013-11-13 10:02:00 UTC (rev 159181)
@@ -29,6 +29,8 @@
#ifndef AccessibilityCallbacks_h
#define AccessibilityCallbacks_h
+#if HAVE(ACCESSIBILITY)
+
#include "AccessibilityNotificationHandlerAtk.h"
#include "AccessibilityUIElement.h"
@@ -37,4 +39,6 @@
void addAccessibilityNotificationHandler(AccessibilityNotificationHandler*);
void removeAccessibilityNotificationHandler(AccessibilityNotificationHandler*);
-#endif
+#endif // HAVE(ACCESSIBILITY)
+
+#endif // AccessibilityCallbacks_h
Modified: trunk/Tools/DumpRenderTree/atk/AccessibilityNotificationHandlerAtk.cpp (159180 => 159181)
--- trunk/Tools/DumpRenderTree/atk/AccessibilityNotificationHandlerAtk.cpp 2013-11-13 09:31:51 UTC (rev 159180)
+++ trunk/Tools/DumpRenderTree/atk/AccessibilityNotificationHandlerAtk.cpp 2013-11-13 10:02:00 UTC (rev 159181)
@@ -20,6 +20,8 @@
#include "config.h"
#include "AccessibilityNotificationHandlerAtk.h"
+#if HAVE(ACCESSIBILITY)
+
#include "AccessibilityCallbacks.h"
AccessibilityNotificationHandler::AccessibilityNotificationHandler(void)
@@ -49,3 +51,5 @@
connectAccessibilityCallbacks();
addAccessibilityNotificationHandler(this);
}
+
+#endif // HAVE(ACCESSIBILITY)
Modified: trunk/Tools/DumpRenderTree/atk/AccessibilityNotificationHandlerAtk.h (159180 => 159181)
--- trunk/Tools/DumpRenderTree/atk/AccessibilityNotificationHandlerAtk.h 2013-11-13 09:31:51 UTC (rev 159180)
+++ trunk/Tools/DumpRenderTree/atk/AccessibilityNotificationHandlerAtk.h 2013-11-13 10:02:00 UTC (rev 159181)
@@ -20,6 +20,8 @@
#ifndef AccessibilityNotificationHandlerAtk_h
#define AccessibilityNotificationHandlerAtk_h
+#if HAVE(ACCESSIBILITY)
+
#include <_javascript_Core/JSObjectRef.h>
#include <atk/atk.h>
#include <wtf/PassRefPtr.h>
@@ -44,4 +46,6 @@
JSObjectRef m_notificationFunctionCallback;
};
+#endif // HAVE(ACCESSIBILITY)
+
#endif // AccessibilityNotificationHandlerAtk_h
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/AccessibilityController.cpp (159180 => 159181)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/AccessibilityController.cpp 2013-11-13 09:31:51 UTC (rev 159180)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/AccessibilityController.cpp 2013-11-13 10:02:00 UTC (rev 159181)
@@ -87,19 +87,18 @@
// Unsupported methods on various platforms.
// As they're implemented on other platforms this list should be modified.
-#if !PLATFORM(GTK) && !PLATFORM(MAC) && !PLATFORM(EFL)
+#if (!PLATFORM(GTK) && !PLATFORM(MAC) && !PLATFORM(EFL)) || !HAVE(ACCESSIBILITY)
bool AccessibilityController::addNotificationListener(JSValueRef) { return false; }
bool AccessibilityController::removeNotificationListener() { return false; }
-#endif
-
-#if !PLATFORM(MAC) && !PLATFORM(GTK) && !PLATFORM(EFL)
PassRefPtr<AccessibilityUIElement> AccessibilityController::accessibleElementById(JSStringRef attribute) { return nullptr; }
-#endif
-
-#if !PLATFORM(GTK) && !PLATFORM(EFL) && !PLATFORM(MAC)
void AccessibilityController::logAccessibilityEvents() { }
void AccessibilityController::resetToConsistentState() { }
#endif
+#if !HAVE(ACCESSIBILITY) && (PLATFORM(GTK) || PLATFORM(EFL))
+PassRefPtr<AccessibilityUIElement> AccessibilityController::rootElement() { return nullptr; }
+PassRefPtr<AccessibilityUIElement> AccessibilityController::focusedElement() { return nullptr; }
+#endif
+
} // namespace WTR
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/AccessibilityController.h (159180 => 159181)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/AccessibilityController.h 2013-11-13 09:31:51 UTC (rev 159180)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/AccessibilityController.h 2013-11-13 10:02:00 UTC (rev 159181)
@@ -30,7 +30,7 @@
#include "JSWrappable.h"
#include <_javascript_Core/JSObjectRef.h>
#include <wtf/Platform.h>
-#if PLATFORM(GTK) || (PLATFORM(EFL) && HAVE(ACCESSIBILITY))
+#if HAVE(ACCESSIBILITY) && (PLATFORM(GTK) || PLATFORM(EFL))
#include "AccessibilityNotificationHandlerAtk.h"
#endif
@@ -68,7 +68,7 @@
RetainPtr<NotificationHandler> m_globalNotificationHandler;
#endif
-#if PLATFORM(GTK) || (PLATFORM(EFL) && HAVE(ACCESSIBILITY))
+#if HAVE(ACCESSIBILITY) && (PLATFORM(GTK) || PLATFORM(EFL))
RefPtr<AccessibilityNotificationHandler> m_globalNotificationHandler;
#endif
};
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/AccessibilityUIElement.cpp (159180 => 159181)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/AccessibilityUIElement.cpp 2013-11-13 09:31:51 UTC (rev 159180)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/AccessibilityUIElement.cpp 2013-11-13 10:02:00 UTC (rev 159181)
@@ -54,7 +54,7 @@
}
// Unsupported methods on various platforms. As they're implemented on other platforms this list should be modified.
-#if !PLATFORM(MAC) && !PLATFORM(GTK) && !PLATFORM(EFL)
+#if (!PLATFORM(MAC) && !PLATFORM(GTK) && !PLATFORM(EFL)) || !HAVE(ACCESSIBILITY)
AccessibilityUIElement::AccessibilityUIElement(PlatformUIElement) { }
AccessibilityUIElement::AccessibilityUIElement(const AccessibilityUIElement&) { }
AccessibilityUIElement::~AccessibilityUIElement() { }
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/AccessibilityUIElement.h (159180 => 159181)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/AccessibilityUIElement.h 2013-11-13 09:31:51 UTC (rev 159180)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/AccessibilityUIElement.h 2013-11-13 10:02:00 UTC (rev 159181)
@@ -41,7 +41,7 @@
#else
typedef struct objc_object* PlatformUIElement;
#endif
-#elif PLATFORM(GTK) || (PLATFORM(EFL) && HAVE(ACCESSIBILITY))
+#elif HAVE(ACCESSIBILITY) && (PLATFORM(GTK) || PLATFORM(EFL))
#include "AccessibilityNotificationHandlerAtk.h"
#include <atk/atk.h>
#include <wtf/gobject/GRefPtr.h>
@@ -248,6 +248,7 @@
PlatformUIElement m_element;
// A retained, platform specific object used to help manage notifications for this object.
+#if HAVE(ACCESSIBILITY)
#if PLATFORM(MAC)
NotificationHandler m_notificationHandler;
@@ -255,14 +256,15 @@
void getDocumentLinks(Vector<RefPtr<AccessibilityUIElement> >&);
#endif
-#if PLATFORM(MAC) || PLATFORM(GTK) || (PLATFORM(EFL) && HAVE(ACCESSIBILITY))
+#if PLATFORM(MAC) || PLATFORM(GTK) || PLATFORM(EFL)
void getChildren(Vector<RefPtr<AccessibilityUIElement> >&);
void getChildrenWithRange(Vector<RefPtr<AccessibilityUIElement> >&, unsigned location, unsigned length);
#endif
-#if PLATFORM(GTK) || (PLATFORM(EFL) && HAVE(ACCESSIBILITY))
+#if PLATFORM(GTK) || PLATFORM(EFL)
RefPtr<AccessibilityNotificationHandler> m_notificationHandler;
#endif
+#endif
};
} // namespace WTR
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/atk/AccessibilityControllerAtk.cpp (159180 => 159181)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/atk/AccessibilityControllerAtk.cpp 2013-11-13 09:31:51 UTC (rev 159180)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/atk/AccessibilityControllerAtk.cpp 2013-11-13 10:02:00 UTC (rev 159181)
@@ -28,6 +28,8 @@
#include "config.h"
#include "AccessibilityController.h"
+#if HAVE(ACCESSIBILITY)
+
#include "InjectedBundle.h"
#include "InjectedBundlePage.h"
@@ -151,3 +153,5 @@
}
} // namespace WTR
+
+#endif // HAVE(ACCESSIBILITY)
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/atk/AccessibilityNotificationHandlerAtk.cpp (159180 => 159181)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/atk/AccessibilityNotificationHandlerAtk.cpp 2013-11-13 09:31:51 UTC (rev 159180)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/atk/AccessibilityNotificationHandlerAtk.cpp 2013-11-13 10:02:00 UTC (rev 159181)
@@ -20,6 +20,8 @@
#include "config.h"
#include "AccessibilityNotificationHandlerAtk.h"
+#if HAVE(ACCESSIBILITY)
+
#include "InjectedBundle.h"
#include "InjectedBundlePage.h"
#include "JSWrapper.h"
@@ -283,3 +285,5 @@
}
} // namespace WTR
+
+#endif // HAVE(ACCESSIBILITY)
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/atk/AccessibilityNotificationHandlerAtk.h (159180 => 159181)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/atk/AccessibilityNotificationHandlerAtk.h 2013-11-13 09:31:51 UTC (rev 159180)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/atk/AccessibilityNotificationHandlerAtk.h 2013-11-13 10:02:00 UTC (rev 159181)
@@ -20,6 +20,8 @@
#ifndef AccessibilityNotificationHandlerAtk_h
#define AccessibilityNotificationHandlerAtk_h
+#if HAVE(ACCESSIBILITY)
+
#include <_javascript_Core/JSObjectRef.h>
#include <atk/atk.h>
#include <atk/atkobject.h>
@@ -54,4 +56,6 @@
} // namespace WTR
+#endif // HAVE(ACCESSIBILITY)
+
#endif // AccessibilityNotificationHandlerAtk_h
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/atk/AccessibilityUIElementAtk.cpp (159180 => 159181)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/atk/AccessibilityUIElementAtk.cpp 2013-11-13 09:31:51 UTC (rev 159180)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/atk/AccessibilityUIElementAtk.cpp 2013-11-13 10:02:00 UTC (rev 159181)
@@ -1574,4 +1574,4 @@
} // namespace WTR
-#endif
+#endif // HAVE(ACCESSIBILITY)
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/mac/AccessibilityControllerMac.mm (159180 => 159181)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/mac/AccessibilityControllerMac.mm 2013-11-13 09:31:51 UTC (rev 159180)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/mac/AccessibilityControllerMac.mm 2013-11-13 10:02:00 UTC (rev 159181)
@@ -31,6 +31,9 @@
#import "config.h"
#import "AccessibilityCommonMac.h"
#import "AccessibilityController.h"
+
+#if HAVE(ACCESSIBILITY)
+
#import "AccessibilityNotificationHandler.h"
#import "InjectedBundle.h"
#import "InjectedBundlePage.h"
@@ -110,3 +113,5 @@
}
} // namespace WTR
+
+#endif // HAVE(ACCESSIBILITY)
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/mac/AccessibilityUIElementMac.mm (159180 => 159181)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/mac/AccessibilityUIElementMac.mm 2013-11-13 09:31:51 UTC (rev 159180)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/mac/AccessibilityUIElementMac.mm 2013-11-13 10:02:00 UTC (rev 159181)
@@ -25,6 +25,9 @@
#import "config.h"
#import "AccessibilityCommonMac.h"
+
+#if HAVE(ACCESSIBILITY)
+
#import "AccessibilityNotificationHandler.h"
#import "AccessibilityUIElement.h"
#import "InjectedBundle.h"
@@ -1645,3 +1648,4 @@
} // namespace WTR
+#endif // HAVE(ACCESSIBILITY)
Modified: trunk/Tools/WebKitTestRunner/PlatformEfl.cmake (159180 => 159181)
--- trunk/Tools/WebKitTestRunner/PlatformEfl.cmake 2013-11-13 09:31:51 UTC (rev 159180)
+++ trunk/Tools/WebKitTestRunner/PlatformEfl.cmake 2013-11-13 10:02:00 UTC (rev 159181)
@@ -57,6 +57,10 @@
list(APPEND WebKitTestRunnerInjectedBundle_SOURCES
${TOOLS_DIR}/DumpRenderTree/efl/FontManagement.cpp
+ ${WEBKIT_TESTRUNNER_INJECTEDBUNDLE_DIR}/atk/AccessibilityControllerAtk.cpp
+ ${WEBKIT_TESTRUNNER_INJECTEDBUNDLE_DIR}/atk/AccessibilityNotificationHandlerAtk.cpp
+ ${WEBKIT_TESTRUNNER_INJECTEDBUNDLE_DIR}/atk/AccessibilityUIElementAtk.cpp
+
${WEBKIT_TESTRUNNER_INJECTEDBUNDLE_DIR}/efl/ActivateFontsEfl.cpp
${WEBKIT_TESTRUNNER_INJECTEDBUNDLE_DIR}/efl/InjectedBundleEfl.cpp
${WEBKIT_TESTRUNNER_INJECTEDBUNDLE_DIR}/efl/TestRunnerEfl.cpp
@@ -68,11 +72,6 @@
-DDOWNLOADED_FONTS_DIR="${CMAKE_SOURCE_DIR}/WebKitBuild/Dependencies/Source/webkitgtk-test-fonts-0.0.3")
if (ENABLE_ACCESSIBILITY)
- list(APPEND WebKitTestRunnerInjectedBundle_SOURCES
- ${WEBKIT_TESTRUNNER_INJECTEDBUNDLE_DIR}/atk/AccessibilityControllerAtk.cpp
- ${WEBKIT_TESTRUNNER_INJECTEDBUNDLE_DIR}/atk/AccessibilityNotificationHandlerAtk.cpp
- ${WEBKIT_TESTRUNNER_INJECTEDBUNDLE_DIR}/atk/AccessibilityUIElementAtk.cpp
- )
list(APPEND WebKitTestRunner_INCLUDE_DIRECTORIES
${ATK_INCLUDE_DIRS}
)
