Diff
Modified: trunk/LayoutTests/ChangeLog (135618 => 135619)
--- trunk/LayoutTests/ChangeLog 2012-11-23 16:40:33 UTC (rev 135618)
+++ trunk/LayoutTests/ChangeLog 2012-11-23 16:47:57 UTC (rev 135619)
@@ -1,3 +1,15 @@
+2012-11-23 Mateusz Leszko <[email protected]>
+
+ [EFL][GTK] Adapt accessibility feature to WebKitTestRunner.
+ https://bugs.webkit.org/show_bug.cgi?id=100757
+
+ Reviewed by Laszlo Gombos.
+
+ Unskipping EFL Accessiblity tests for wk2.
+
+ * platform/efl-wk1/TestExpectations:
+ * platform/efl/TestExpectations:
+
2012-11-23 Robert Kroeger <[email protected]>
Unreviewed gardening: test expectations failures.
Modified: trunk/LayoutTests/platform/efl/TestExpectations (135618 => 135619)
--- trunk/LayoutTests/platform/efl/TestExpectations 2012-11-23 16:40:33 UTC (rev 135618)
+++ trunk/LayoutTests/platform/efl/TestExpectations 2012-11-23 16:47:57 UTC (rev 135619)
@@ -611,10 +611,6 @@
# EFL port does not implement DeviceMotion
webkit.org/b/95300 fast/dom/DeviceMotion [ Skip ]
-# The EFL port has no support for accessibility features
-Bug(EFL) accessibility [ Skip ]
-webkit.org/b/98895 perf/accessibility-title-ui-element.html [ Skip ]
-
# Taken from Chromium, this test verifies that a mismatch reftest will fail if both results are the
# same. Because the whole point is that this test should fail when run, it's
# not SKIP, just WONTFIX.
Modified: trunk/LayoutTests/platform/efl-wk1/TestExpectations (135618 => 135619)
--- trunk/LayoutTests/platform/efl-wk1/TestExpectations 2012-11-23 16:40:33 UTC (rev 135618)
+++ trunk/LayoutTests/platform/efl-wk1/TestExpectations 2012-11-23 16:47:57 UTC (rev 135619)
@@ -54,6 +54,10 @@
http/tests/xmlhttprequest/failed-auth.html
http/tests/xmlhttprequest/remember-bad-password.html
+# The EFL port has no support for accessibility features in efl-wk1
+Bug(EFL) accessibility [ Skip ]
+webkit.org/b/98895 perf/accessibility-title-ui-element.html [ Skip ]
+
#////////////////////////////////////////////////////////////////////////////////////////
# CRASHES
#////////////////////////////////////////////////////////////////////////////////////////
Modified: trunk/Tools/ChangeLog (135618 => 135619)
--- trunk/Tools/ChangeLog 2012-11-23 16:40:33 UTC (rev 135618)
+++ trunk/Tools/ChangeLog 2012-11-23 16:47:57 UTC (rev 135619)
@@ -1,3 +1,25 @@
+2012-11-23 Mateusz Leszko <[email protected]>
+
+ [EFL][GTK] Adapt accessibility feature to WebKitTestRunner.
+ https://bugs.webkit.org/show_bug.cgi?id=100757
+
+ Reviewed by Laszlo Gombos.
+
+ Allow to build accessibility feature in WebkitTestRunner for EFL Platform.
+ Updating CMake files due to changes from Bug 99011.
+
+ * WebKitTestRunner/InjectedBundle/AccessibilityController.cpp:
+ (WTR::AccessibilityController::AccessibilityController):
+ (WTR):
+ * WebKitTestRunner/InjectedBundle/AccessibilityController.h:
+ (AccessibilityController):
+ * WebKitTestRunner/InjectedBundle/AccessibilityUIElement.cpp:
+ (WTR):
+ * WebKitTestRunner/InjectedBundle/AccessibilityUIElement.h:
+ (AccessibilityUIElement):
+ * WebKitTestRunner/InjectedBundle/atk/AccessibilityUIElementAtk.cpp: - Removed gtk/gtk.h dependency.
+ * WebKitTestRunner/PlatformEfl.cmake: - Adding atk includes.
+
2012-11-16 Yury Semikhatsky <[email protected]>
Memory instrumentation: extract MemoryObjectInfo declaration into a separate file
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/AccessibilityController.cpp (135618 => 135619)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/AccessibilityController.cpp 2012-11-23 16:40:33 UTC (rev 135618)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/AccessibilityController.cpp 2012-11-23 16:47:57 UTC (rev 135619)
@@ -44,7 +44,7 @@
}
AccessibilityController::AccessibilityController()
-#if PLATFORM(GTK)
+#if PLATFORM(GTK) || PLATFORM(EFL)
: m_stateChangeListenerId(0)
, m_focusEventListenerId(0)
, m_activeDescendantChangedListenerId(0)
@@ -109,7 +109,7 @@
PassRefPtr<AccessibilityUIElement> AccessibilityController::accessibleElementById(JSStringRef attribute) { return 0; }
#endif
-#if !PLATFORM(GTK)
+#if !PLATFORM(GTK) && !PLATFORM(EFL)
void AccessibilityController::logAccessibilityEvents() { }
void AccessibilityController::resetToConsistentState() { }
#endif
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/AccessibilityController.h (135618 => 135619)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/AccessibilityController.h 2012-11-23 16:40:33 UTC (rev 135618)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/AccessibilityController.h 2012-11-23 16:47:57 UTC (rev 135619)
@@ -68,7 +68,7 @@
RetainPtr<NotificationHandler> m_globalNotificationHandler;
#endif
-#if PLATFORM(GTK)
+#if PLATFORM(GTK) || PLATFORM(EFL)
unsigned m_stateChangeListenerId;
unsigned m_focusEventListenerId;
unsigned m_activeDescendantChangedListenerId;
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/AccessibilityUIElement.cpp (135618 => 135619)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/AccessibilityUIElement.cpp 2012-11-23 16:40:33 UTC (rev 135618)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/AccessibilityUIElement.cpp 2012-11-23 16:47:57 UTC (rev 135619)
@@ -52,9 +52,9 @@
{
return m_element;
}
-
+
// Unsupported methods on various platforms. As they're implemented on other platforms this list should be modified.
-#if !PLATFORM(MAC) && !PLATFORM(GTK)
+#if !PLATFORM(MAC) && !PLATFORM(GTK) && !PLATFORM(EFL)
AccessibilityUIElement::AccessibilityUIElement(PlatformUIElement) { }
AccessibilityUIElement::AccessibilityUIElement(const AccessibilityUIElement&) { }
AccessibilityUIElement::~AccessibilityUIElement() { }
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/AccessibilityUIElement.h (135618 => 135619)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/AccessibilityUIElement.h 2012-11-23 16:40:33 UTC (rev 135618)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/AccessibilityUIElement.h 2012-11-23 16:47:57 UTC (rev 135619)
@@ -49,7 +49,7 @@
#include <oleacc.h>
typedef COMPtr<IAccessible> PlatformUIElement;
-#elif PLATFORM(GTK)
+#elif PLATFORM(GTK) || PLATFORM(EFL)
#include <atk/atk.h>
typedef AtkObject* PlatformUIElement;
#else
@@ -245,7 +245,7 @@
void getDocumentLinks(Vector<RefPtr<AccessibilityUIElement> >&);
#endif
-#if PLATFORM(MAC) || PLATFORM(GTK)
+#if PLATFORM(MAC) || PLATFORM(GTK) || PLATFORM(EFL)
void getChildren(Vector<RefPtr<AccessibilityUIElement> >&);
void getChildrenWithRange(Vector<RefPtr<AccessibilityUIElement> >&, unsigned location, unsigned length);
#endif
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/atk/AccessibilityUIElementAtk.cpp (135618 => 135619)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/atk/AccessibilityUIElementAtk.cpp 2012-11-23 16:40:33 UTC (rev 135618)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/atk/AccessibilityUIElementAtk.cpp 2012-11-23 16:47:57 UTC (rev 135619)
@@ -31,7 +31,6 @@
#include "InjectedBundlePage.h"
#include <_javascript_Core/JSStringRef.h>
#include <atk/atk.h>
-#include <gtk/gtk.h>
#include <wtf/Assertions.h>
#include <wtf/gobject/GOwnPtr.h>
#include <wtf/gobject/GRefPtr.h>
Modified: trunk/Tools/WebKitTestRunner/PlatformEfl.cmake (135618 => 135619)
--- trunk/Tools/WebKitTestRunner/PlatformEfl.cmake 2012-11-23 16:40:33 UTC (rev 135618)
+++ trunk/Tools/WebKitTestRunner/PlatformEfl.cmake 2012-11-23 16:47:57 UTC (rev 135619)
@@ -21,7 +21,7 @@
${TOOLS_DIR}/DumpRenderTree/efl/
${WEBKIT2_DIR}/UIProcess/API/efl
"${WTF_DIR}/wtf/gobject"
-
+ ${ATK_INCLUDE_DIRS}
${CAIRO_INCLUDE_DIRS}
${ECORE_INCLUDE_DIRS}
${ECORE_EVAS_INCLUDE_DIRS}
@@ -31,6 +31,7 @@
)
LIST(APPEND WebKitTestRunner_LIBRARIES
+ ${ATK_LIBRARIES}
${CAIRO_LIBRARIES}
${ECORE_LIBRARIES}
${ECORE_EVAS_LIBRARIES}
@@ -55,6 +56,8 @@
LIST(APPEND WebKitTestRunnerInjectedBundle_SOURCES
${TOOLS_DIR}/DumpRenderTree/efl/FontManagement.cpp
+ ${WEBKIT_TESTRUNNER_INJECTEDBUNDLE_DIR}/atk/AccessibilityControllerAtk.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
