[EFL][GTK] Adapt accessibility feature to WebKitTestRunner.
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 23 Nov 2012 16:47:57 +0000 (16:47 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 23 Nov 2012 16:47:57 +0000 (16:47 +0000)
https://bugs.webkit.org/show_bug.cgi?id=100757

Patch by Mateusz Leszko <m.leszko@samsung.com> on 2012-11-23
Reviewed by Laszlo Gombos.

Tools:

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.

LayoutTests:

Unskipping EFL Accessiblity tests for wk2.

* platform/efl-wk1/TestExpectations:
* platform/efl/TestExpectations:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@135619 268f45cc-cd09-0410-ab3c-d52691b4dbfc

LayoutTests/ChangeLog
LayoutTests/platform/efl-wk1/TestExpectations
LayoutTests/platform/efl/TestExpectations
Tools/ChangeLog
Tools/WebKitTestRunner/InjectedBundle/AccessibilityController.cpp
Tools/WebKitTestRunner/InjectedBundle/AccessibilityController.h
Tools/WebKitTestRunner/InjectedBundle/AccessibilityUIElement.cpp
Tools/WebKitTestRunner/InjectedBundle/AccessibilityUIElement.h
Tools/WebKitTestRunner/InjectedBundle/atk/AccessibilityUIElementAtk.cpp
Tools/WebKitTestRunner/PlatformEfl.cmake

index dca7be5..6f4a201 100644 (file)
@@ -1,3 +1,15 @@
+2012-11-23  Mateusz Leszko  <m.leszko@samsung.com>
+
+        [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  <rjkroege@chromium.org>
 
         Unreviewed gardening: test expectations failures.
index dde0bf0..edd2b13 100644 (file)
@@ -54,6 +54,10 @@ http/tests/xmlhttprequest/basic-auth-nouser.html
 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
 #////////////////////////////////////////////////////////////////////////////////////////
index 0dad0d1..d759487 100644 (file)
@@ -611,10 +611,6 @@ webkit.org/b/90928 fast/dom/Orientation [ Skip ]
 # 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.
index 49b1441..46d1ccb 100644 (file)
@@ -1,3 +1,25 @@
+2012-11-23  Mateusz Leszko  <m.leszko@samsung.com>
+
+        [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  <yurys@chromium.org>
 
         Memory instrumentation: extract MemoryObjectInfo declaration into a separate file
index c6f7d75..0964064 100644 (file)
@@ -44,7 +44,7 @@ PassRefPtr<AccessibilityController> AccessibilityController::create()
 }
 
 AccessibilityController::AccessibilityController()
-#if PLATFORM(GTK)
+#if PLATFORM(GTK) || PLATFORM(EFL)
     : m_stateChangeListenerId(0)
     , m_focusEventListenerId(0)
     , m_activeDescendantChangedListenerId(0)
@@ -109,7 +109,7 @@ bool AccessibilityController::removeNotificationListener() { return false; }
 PassRefPtr<AccessibilityUIElement> AccessibilityController::accessibleElementById(JSStringRef attribute) { return 0; }
 #endif
 
-#if !PLATFORM(GTK)
+#if !PLATFORM(GTK) && !PLATFORM(EFL)
 void AccessibilityController::logAccessibilityEvents() { }
 void AccessibilityController::resetToConsistentState() { }
 #endif
index f02feac..247de34 100644 (file)
@@ -68,7 +68,7 @@ private:
     RetainPtr<NotificationHandler> m_globalNotificationHandler;
 #endif
 
-#if PLATFORM(GTK)
+#if PLATFORM(GTK) || PLATFORM(EFL)
     unsigned m_stateChangeListenerId;
     unsigned m_focusEventListenerId;
     unsigned m_activeDescendantChangedListenerId;
index 42e2571..edec732 100644 (file)
@@ -52,9 +52,9 @@ bool AccessibilityUIElement::isValid() const
 {
     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() { }
index 551f591..2da56c3 100644 (file)
@@ -49,7 +49,7 @@ typedef struct objc_object* PlatformUIElement;
 #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 @@ private:
     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
index 0bfe9ac..0083e35 100644 (file)
@@ -31,7 +31,6 @@
 #include "InjectedBundlePage.h"
 #include <JavaScriptCore/JSStringRef.h>
 #include <atk/atk.h>
-#include <gtk/gtk.h>
 #include <wtf/Assertions.h>
 #include <wtf/gobject/GOwnPtr.h>
 #include <wtf/gobject/GRefPtr.h>
index 1c69472..39c68a9 100644 (file)
@@ -21,7 +21,7 @@ LIST(APPEND WebKitTestRunner_INCLUDE_DIRECTORIES
     ${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_INCLUDE_DIRECTORIES
 )
 
 LIST(APPEND WebKitTestRunner_LIBRARIES
+    ${ATK_LIBRARIES}
     ${CAIRO_LIBRARIES}
     ${ECORE_LIBRARIES}
     ${ECORE_EVAS_LIBRARIES}
@@ -55,6 +56,8 @@ ENDIF ()
 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