Title: [140389] trunk
- Revision
- 140389
- Author
- [email protected]
- Date
- 2013-01-22 00:02:36 -0800 (Tue, 22 Jan 2013)
Log Message
Source/WebKit: [EFL] Adds Accessibility support to wk1
https://bugs.webkit.org/show_bug.cgi?id=107440
Patch by Krzysztof Czech <[email protected]> on 2013-01-22
Reviewed by Gyuyoung Kim.
* PlatformEfl.cmake: Adds ATK headers and libraries.
Source/WebKit/efl: [EFL] Adds Accessibility support to wk1.
https://bugs.webkit.org/show_bug.cgi?id=107440
Patch by Krzysztof Czech <[email protected]> on 2013-01-22
Reviewed by Gyuyoung Kim.
Adds possibility of focusing and retrieving accessible object.
* WebCoreSupport/DumpRenderTreeSupportEfl.cpp:
(DumpRenderTreeSupportEfl::rootAccessibleElement):
(DumpRenderTreeSupportEfl::focusedAccessibleElement):
* WebCoreSupport/DumpRenderTreeSupportEfl.h:
Tools: [EFL] Adds Accessibility support to wk1
https://bugs.webkit.org/show_bug.cgi?id=107440
Patch by Krzysztof Czech <[email protected]> on 2013-01-22
Reviewed by Gyuyoung Kim.
* DumpRenderTree/efl/CMakeLists.txt: Adds ATK headers and libraries.
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (140388 => 140389)
--- trunk/Source/WebKit/ChangeLog 2013-01-22 07:39:52 UTC (rev 140388)
+++ trunk/Source/WebKit/ChangeLog 2013-01-22 08:02:36 UTC (rev 140389)
@@ -1,3 +1,12 @@
+2013-01-22 Krzysztof Czech <[email protected]>
+
+ [EFL] Adds Accessibility support to wk1
+ https://bugs.webkit.org/show_bug.cgi?id=107440
+
+ Reviewed by Gyuyoung Kim.
+
+ * PlatformEfl.cmake: Adds ATK headers and libraries.
+
2013-01-17 Poul Sysolyatin <[email protected]>
32-bit build for Qt5 on Mac OS fails.
Modified: trunk/Source/WebKit/PlatformEfl.cmake (140388 => 140389)
--- trunk/Source/WebKit/PlatformEfl.cmake 2013-01-22 07:39:52 UTC (rev 140388)
+++ trunk/Source/WebKit/PlatformEfl.cmake 2013-01-22 08:02:36 UTC (rev 140389)
@@ -89,6 +89,17 @@
)
endif ()
+if (ENABLE_ACCESSIBILITY)
+ list(APPEND WebKit_INCLUDE_DIRECTORIES
+ "${WEBCORE_DIR}/accessibility"
+ "${WEBCORE_DIR}/accessibility/atk"
+ ${ATK_INCLUDE_DIRS}
+ )
+ list(APPEND WebKit_LIBRARIES
+ ${ATK_LIBRARIES}
+ )
+endif ()
+
list(APPEND WebKit_SOURCES
efl/WebCoreSupport/AcceleratedCompositingContextEfl.cpp
efl/WebCoreSupport/AssertMatchingEnums.cpp
Modified: trunk/Source/WebKit/efl/ChangeLog (140388 => 140389)
--- trunk/Source/WebKit/efl/ChangeLog 2013-01-22 07:39:52 UTC (rev 140388)
+++ trunk/Source/WebKit/efl/ChangeLog 2013-01-22 08:02:36 UTC (rev 140389)
@@ -1,3 +1,17 @@
+2013-01-22 Krzysztof Czech <[email protected]>
+
+ [EFL] Adds Accessibility support to wk1.
+ https://bugs.webkit.org/show_bug.cgi?id=107440
+
+ Reviewed by Gyuyoung Kim.
+
+ Adds possibility of focusing and retrieving accessible object.
+
+ * WebCoreSupport/DumpRenderTreeSupportEfl.cpp:
+ (DumpRenderTreeSupportEfl::rootAccessibleElement):
+ (DumpRenderTreeSupportEfl::focusedAccessibleElement):
+ * WebCoreSupport/DumpRenderTreeSupportEfl.h:
+
2013-01-15 Gyuyoung Kim <[email protected]>
Unreviewed. Fix build break by r139796.
Modified: trunk/Source/WebKit/efl/WebCoreSupport/DumpRenderTreeSupportEfl.cpp (140388 => 140389)
--- trunk/Source/WebKit/efl/WebCoreSupport/DumpRenderTreeSupportEfl.cpp 2013-01-22 07:39:52 UTC (rev 140388)
+++ trunk/Source/WebKit/efl/WebCoreSupport/DumpRenderTreeSupportEfl.cpp 2013-01-22 08:02:36 UTC (rev 140389)
@@ -72,6 +72,12 @@
#include <wtf/CurrentTime.h>
#endif
+#if HAVE(ACCESSIBILITY)
+#include "AXObjectCache.h"
+#include "AccessibilityObject.h"
+#include "WebKitAccessibleWrapperAtk.h"
+#endif
+
#define DRT_SUPPORT_FRAME_GET_OR_RETURN(ewkFrame, frame, ...) \
WebCore::Frame* frame = EWKPrivate::coreFrame(ewkFrame); \
if (!frame) \
@@ -888,3 +894,31 @@
return 0;
#endif
}
+
+#if HAVE(ACCESSIBILITY)
+AtkObject* DumpRenderTreeSupportEfl::rootAccessibleElement(const Evas_Object* ewkFrame)
+{
+ DRT_SUPPORT_FRAME_GET_OR_RETURN(ewkFrame, frame, 0);
+
+ if (!WebCore::AXObjectCache::accessibilityEnabled())
+ WebCore::AXObjectCache::enableAccessibility();
+
+ if (!frame->document())
+ return 0;
+
+ AtkObject* wrapper = frame->document()->axObjectCache()->rootObject()->wrapper();
+ if (!wrapper)
+ return 0;
+
+ return wrapper;
+}
+
+AtkObject* DumpRenderTreeSupportEfl::focusedAccessibleElement(const Evas_Object* ewkFrame)
+{
+ AtkObject* wrapper = rootAccessibleElement(ewkFrame);
+ if (!wrapper)
+ return 0;
+
+ return webkitAccessibleGetFocusedElement(WEBKIT_ACCESSIBLE(wrapper));
+}
+#endif
Modified: trunk/Source/WebKit/efl/WebCoreSupport/DumpRenderTreeSupportEfl.h (140388 => 140389)
--- trunk/Source/WebKit/efl/WebCoreSupport/DumpRenderTreeSupportEfl.h 2013-01-22 07:39:52 UTC (rev 140388)
+++ trunk/Source/WebKit/efl/WebCoreSupport/DumpRenderTreeSupportEfl.h 2013-01-22 08:02:36 UTC (rev 140389)
@@ -30,6 +30,10 @@
#include <wtf/Vector.h>
#include <wtf/text/WTFString.h>
+#if HAVE(ACCESSIBILITY)
+#include <atk/atk.h>
+#endif
+
typedef struct _Ewk_History_Item Ewk_History_Item;
typedef struct _Ewk_Intent Ewk_Intent;
typedef struct _Ewk_Intent_Request Ewk_Intent_Request;
@@ -139,6 +143,11 @@
static void setMockGeolocationPositionUnavailableError(const Evas_Object*, const char* errorMessage);
static int numberOfPendingGeolocationPermissionRequests(const Evas_Object*);
+#if HAVE(ACCESSIBILITY)
+ static AtkObject* focusedAccessibleElement(const Evas_Object*);
+ static AtkObject* rootAccessibleElement(const Evas_Object*);
+#endif
+
private:
static bool s_drtRun;
};
Modified: trunk/Tools/ChangeLog (140388 => 140389)
--- trunk/Tools/ChangeLog 2013-01-22 07:39:52 UTC (rev 140388)
+++ trunk/Tools/ChangeLog 2013-01-22 08:02:36 UTC (rev 140389)
@@ -1,3 +1,12 @@
+2013-01-22 Krzysztof Czech <[email protected]>
+
+ [EFL] Adds Accessibility support to wk1
+ https://bugs.webkit.org/show_bug.cgi?id=107440
+
+ Reviewed by Gyuyoung Kim.
+
+ * DumpRenderTree/efl/CMakeLists.txt: Adds ATK headers and libraries.
+
2013-01-21 Joseph Pecoraro <[email protected]>
[Mac] WK1 MiniBrowser should clear delegates before releasing webview
Modified: trunk/Tools/DumpRenderTree/efl/CMakeLists.txt (140388 => 140389)
--- trunk/Tools/DumpRenderTree/efl/CMakeLists.txt 2013-01-22 07:39:52 UTC (rev 140388)
+++ trunk/Tools/DumpRenderTree/efl/CMakeLists.txt 2013-01-22 08:02:36 UTC (rev 140389)
@@ -111,6 +111,15 @@
${LIBSOUP_INCLUDE_DIRS}
)
+if (ENABLE_ACCESSIBILITY)
+ list(APPEND DumpRenderTree_INCLUDE_DIRECTORIES
+ ${ATK_INCLUDE_DIRS}
+ )
+ list(APPEND DumpRenderTree_LIBRARIES
+ ${ATK_LIBRARIES}
+ )
+endif ()
+
# FIXME: DOWNLOADED_FONTS_DIR should not hardcode the directory
# structure. See <https://bugs.webkit.org/show_bug.cgi?id=81475>.
add_definitions(-DFONTS_CONF_DIR="${TOOLS_DIR}/DumpRenderTree/gtk/fonts"
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
