Attachment #178768 for bug #103036

View Details Raw Unified Return to Bug 103036

| Differences between



2012-12-10  Krzysztof Czech  <k.czech@samsung.com>, Laszlo Gombos  <l.gombos@samsung.com>

        [EFL] Possibility to turn off accessibility feature for WebKit-EFL.
        https://bugs.webkit.org/show_bug.cgi?id=103036

        Reviewed by NOBODY (OOPS!).

        Guard dependencies for accessibility (ATK), so that they can be turned off.

        * Source/cmake/OptionsEfl.cmake:
        * Source/cmake/WebKitFeatures.cmake:

2012-12-08  Seokju Kwon  <seokju.kwon@gmail.com>

        [EFL][WK2] Add Remote Web Inspector



2012-12-11  Krzysztof Czech  <k.czech@samsung.com>

        [EFL] Possibility to turn off accessibility feature for WebKit-EFL.
        https://bugs.webkit.org/show_bug.cgi?id=103036

        Reviewed by NOBODY (OOPS!).

        In order to have a possibility of turning on/off accessibility in WebKit-EFL,
        we do not need always defined HAVE_ACCESSIBILITY macro for EFL platform. Declaration of
        of this macro has been moved to OptionsEfl.cmake file so that it can be easily regulate.

        * wtf/Platform.h:

2012-12-08  Patrick Gansterer  <paroga@webkit.org>

        Compiling WTF outside of WebKit failed on Windows

Lines 671-677 a/Source/WTF/wtf/Platform.h_sec1
- a/Source/WTF/wtf/Platform.h -1 / +1 lines
671	#endif	671	#endif
672		672
673	#if !defined(HAVE_ACCESSIBILITY)	673	#if !defined(HAVE_ACCESSIBILITY)
674	#if PLATFORM(IOS) \|\| PLATFORM(MAC) \|\| PLATFORM(WIN) \|\| PLATFORM(GTK) \|\| (PLATFORM(CHROMIUM) && !OS(ANDROID)) \|\| PLATFORM(EFL)	674	#if PLATFORM(IOS) \|\| PLATFORM(MAC) \|\| PLATFORM(WIN) \|\| PLATFORM(GTK) \|\| (PLATFORM(CHROMIUM) && !OS(ANDROID))
675	#define HAVE_ACCESSIBILITY 1	675	#define HAVE_ACCESSIBILITY 1
676	#endif	676	#endif
677	#endif /* !defined(HAVE_ACCESSIBILITY) */	677	#endif /* !defined(HAVE_ACCESSIBILITY) */



2012-12-11  Krzysztof Czech  <k.czech@samsung.com>,  Laszlo Gombos  <l.gombos@samsung.com>

        [EFL] Possibility to turn off accessibility feature for WebKit-EFL.
        https://bugs.webkit.org/show_bug.cgi?id=103036

        Reviewed by NOBODY (OOPS!).

        Guard dependencies for accessibility (ATK), so that they can be turned off.

        No new tests as there is no new functionality.

        * PlatformEfl.cmake:
        * accessibility/AccessibilityObject.cpp:
        (WebCore::AccessibilityObject::AccessibilityObject):
        * accessibility/AccessibilityObject.h:
        (AccessibilityObject):

2012-12-10  Alexander Pavlov  <apavlov@chromium.org>

        Web Inspector: [Overrides] Unable to change values in Device Metrics override setting



list(APPEND WebCore_INCLUDE_DIRECTORIES
    "${WEBCORE_DIR}/accessibility/atk"
    "${WEBCORE_DIR}/page/efl"
    "${WEBCORE_DIR}/platform/cairo"
    "${WEBCORE_DIR}/platform/efl"

    "${WEBCORE_DIR}/platform/network/soup"
    "${WEBCORE_DIR}/platform/text/efl"
    "${WEBCORE_DIR}/plugins/efl"
    ${ATK_INCLUDE_DIRS}
)

list(APPEND WebCore_SOURCES
    accessibility/atk/AXObjectCacheAtk.cpp
    accessibility/atk/AccessibilityObjectAtk.cpp
    accessibility/atk/WebKitAccessibleHyperlink.cpp
    accessibility/atk/WebKitAccessibleInterfaceAction.cpp
    accessibility/atk/WebKitAccessibleInterfaceComponent.cpp
    accessibility/atk/WebKitAccessibleInterfaceDocument.cpp
    accessibility/atk/WebKitAccessibleInterfaceEditableText.cpp
    accessibility/atk/WebKitAccessibleInterfaceHyperlinkImpl.cpp
    accessibility/atk/WebKitAccessibleInterfaceHypertext.cpp
    accessibility/atk/WebKitAccessibleInterfaceImage.cpp
    accessibility/atk/WebKitAccessibleInterfaceSelection.cpp
    accessibility/atk/WebKitAccessibleInterfaceTable.cpp
    accessibility/atk/WebKitAccessibleInterfaceText.cpp
    accessibility/atk/WebKitAccessibleInterfaceValue.cpp
    accessibility/atk/WebKitAccessibleUtil.cpp
    accessibility/atk/WebKitAccessibleWrapperAtk.cpp
    editing/SmartReplaceICU.cpp
    page/efl/DragControllerEfl.cpp
    page/efl/EventHandlerEfl.cpp

endif ()

list(APPEND WebCore_LIBRARIES
    ${ATK_LIBRARIES}
    ${CAIRO_LIBRARIES}
    ${ECORE_LIBRARIES}
    ${ECORE_EVAS_LIBRARIES}

        ${ENCHANT_LIBRARIES}
    )
endif ()

if (ENABLE_ACCESSIBILITY)
    list(APPEND WebCore_SOURCES
        accessibility/atk/AccessibilityObjectAtk.cpp
        accessibility/atk/AXObjectCacheAtk.cpp
        accessibility/atk/WebKitAccessibleHyperlink.cpp
        accessibility/atk/WebKitAccessibleInterfaceAction.cpp
        accessibility/atk/WebKitAccessibleInterfaceComponent.cpp
        accessibility/atk/WebKitAccessibleInterfaceDocument.cpp
        accessibility/atk/WebKitAccessibleInterfaceEditableText.cpp
        accessibility/atk/WebKitAccessibleInterfaceHyperlinkImpl.cpp
        accessibility/atk/WebKitAccessibleInterfaceHypertext.cpp
        accessibility/atk/WebKitAccessibleInterfaceImage.cpp
        accessibility/atk/WebKitAccessibleInterfaceSelection.cpp
        accessibility/atk/WebKitAccessibleInterfaceTable.cpp
        accessibility/atk/WebKitAccessibleInterfaceText.cpp
        accessibility/atk/WebKitAccessibleInterfaceValue.cpp
        accessibility/atk/WebKitAccessibleUtil.cpp
        accessibility/atk/WebKitAccessibleWrapperAtk.cpp
    )
    list(APPEND WebCore_INCLUDE_DIRECTORIES
        "${WEBCORE_DIR}/accessibility/atk"
        ${ATK_INCLUDE_DIRS}
    )
    list(APPEND WebCore_LIBRARIES
        ${ATK_LIBRARIES}
    )
endif ()

Lines 74-80 AccessibilityObject::AccessibilityObject() a/Source/WebCore/accessibility/AccessibilityObject.cpp_sec1
- a/Source/WebCore/accessibility/AccessibilityObject.cpp -1 / +1 lines
74	, m_haveChildren(false)	74	, m_haveChildren(false)
75	, m_role(UnknownRole)	75	, m_role(UnknownRole)
76	, m_cachedIsIgnoredValue(DefaultBehavior)	76	, m_cachedIsIgnoredValue(DefaultBehavior)
77	#if PLATFORM(GTK) \|\| PLATFORM(EFL)	77	#if PLATFORM(GTK) \|\| (PLATFORM(EFL) && HAVE(ACCESSIBILITY))
78	, m_wrapper(0)	78	, m_wrapper(0)
79	#elif PLATFORM(CHROMIUM)	79	#elif PLATFORM(CHROMIUM)
80	, m_detached(false)	80	, m_detached(false)




typedef WebAccessibilityObjectWrapper AccessibilityObjectWrapper;

#elif PLATFORM(GTK) || (PLATFORM(EFL) && HAVE(ACCESSIBILITY))
typedef struct _AtkObject AtkObject;
typedef struct _AtkObject AccessibilityObjectWrapper;
#elif PLATFORM(CHROMIUM)

#if PLATFORM(GTK) || PLATFORM(EFL)
    AccessibilityObjectWrapper* wrapper() const;
    void setWrapper(AccessibilityObjectWrapper*);
#elif !PLATFORM(CHROMIUM) 
    AccessibilityObjectWrapper* wrapper() const { return m_wrapper.get(); }
    void setWrapper(AccessibilityObjectWrapper* wrapper) 
    {

    static bool isAccessibilityTextSearchMatch(AccessibilityObject*, AccessibilitySearchCriteria*);
    static bool objectMatchesSearchCriteriaWithResultLimit(AccessibilityObject*, AccessibilitySearchCriteria*, AccessibilityChildrenVector&);
    virtual AccessibilityRole buttonRoleType() const;

#if PLATFORM(GTK) || (PLATFORM(EFL) && HAVE(ACCESSIBILITY))
    bool allowsTextRanges() const;
    unsigned getLengthForTextRange() const;
#else

    RetainPtr<WebAccessibilityObjectWrapper> m_wrapper;
#elif PLATFORM(WIN) && !OS(WINCE)
    COMPtr<AccessibilityObjectWrapper> m_wrapper;
#elif PLATFORM(GTK) || (PLATFORM(EFL) && HAVE(ACCESSIBILITY))
    AtkObject* m_wrapper;
#elif PLATFORM(CHROMIUM)
    bool m_detached;

Lines 47-52 set(VERSION_SCRIPT "-Wl,--version-script,${CMAKE_MODULE_PATH}/eflsymbols.filter" a/Source/cmake/OptionsEfl.cmake_sec1
- a/Source/cmake/OptionsEfl.cmake -1 / +5 lines
47		47
48	WEBKIT_OPTION_BEGIN()	48	WEBKIT_OPTION_BEGIN()
49	WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_3D_RENDERING ON)	49	WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_3D_RENDERING ON)
		50	WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ACCESSIBILITY ON)
50	WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ANIMATION_API ON)	51	WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ANIMATION_API ON)
51	WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_API_TESTS ON)	52	WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_API_TESTS ON)
52	WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_BATTERY_STATUS ON)	53	WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_BATTERY_STATUS ON)
Lines 211-214 if (ENABLE_SPELLCHECK) a/Source/cmake/OptionsEfl.cmake_sec2
211	find_package(Enchant REQUIRED)	212	find_package(Enchant REQUIRED)
212	endif ()	213	endif ()
213		214
214	find_package(ATK REQUIRED)	215	if (ENABLE_ACCESSIBILITY)
		216	find_package(ATK REQUIRED)
		217	add_definitions(-DHAVE_ACCESSIBILITY=1)
		218	endif ()

Lines 13-18 endmacro() a/Source/cmake/WebKitFeatures.cmake_sec1
- a/Source/cmake/WebKitFeatures.cmake +1 lines
13	macro(WEBKIT_OPTION_BEGIN)	13	macro(WEBKIT_OPTION_BEGIN)
14	WEBKIT_OPTION_DEFINE(ENABLE_3D_RENDERING "Toggle 3D rendering support" OFF)	14	WEBKIT_OPTION_DEFINE(ENABLE_3D_RENDERING "Toggle 3D rendering support" OFF)
15	WEBKIT_OPTION_DEFINE(ENABLE_ACCELERATED_2D_CANVAS "Toggle accelerated 2D canvas support" OFF)	15	WEBKIT_OPTION_DEFINE(ENABLE_ACCELERATED_2D_CANVAS "Toggle accelerated 2D canvas support" OFF)
		16	WEBKIT_OPTION_DEFINE(ENABLE_ACCESSIBILITY "Toggle accessibility support" OFF)
16	WEBKIT_OPTION_DEFINE(ENABLE_ANIMATION_API "Toggle animation API support" OFF)	17	WEBKIT_OPTION_DEFINE(ENABLE_ANIMATION_API "Toggle animation API support" OFF)
17	WEBKIT_OPTION_DEFINE(ENABLE_API_TESTS "Enable public API unit tests" OFF)	18	WEBKIT_OPTION_DEFINE(ENABLE_API_TESTS "Enable public API unit tests" OFF)
18	WEBKIT_OPTION_DEFINE(ENABLE_ASSEMBLER_WX_EXCLUSIVE "Toggel Assembler WX Exclusive support" OFF)	19	WEBKIT_OPTION_DEFINE(ENABLE_ASSEMBLER_WX_EXCLUSIVE "Toggel Assembler WX Exclusive support" OFF)



2012-12-10  Krzysztof Czech  <k.czech@samsung.com>

        [EFL] Possibility to turn off accessibility feature for WebKit-EFL.
        https://bugs.webkit.org/show_bug.cgi?id=103036

        Reviewed by NOBODY (OOPS!).

        Guard dependencies for accessibility (ATK), so that they can be turned off.

        * WebKitTestRunner/InjectedBundle/AccessibilityUIElement.h:
        (AccessibilityUIElement):
        * WebKitTestRunner/PlatformEfl.cmake:

2012-12-10  Simon Hausmann  <simon.hausmann@digia.com>

        [Qt] Use QLibraryInfo::LibraryExecutablesPath unconditionally



#include <oleacc.h>

typedef COMPtr<IAccessible> PlatformUIElement;
#elif PLATFORM(GTK) || (PLATFORM(EFL) && HAVE(ACCESSIBILITY))
#include <atk/atk.h>
typedef AtkObject* PlatformUIElement;
#else

    void getDocumentLinks(Vector<RefPtr<AccessibilityUIElement> >&);
#endif

#if PLATFORM(MAC) || PLATFORM(GTK) || (PLATFORM(EFL) && HAVE(ACCESSIBILITY))
    void getChildren(Vector<RefPtr<AccessibilityUIElement> >&);
    void getChildrenWithRange(Vector<RefPtr<AccessibilityUIElement> >&, unsigned location, unsigned length);
#endif



    ${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}

)

list(APPEND WebKitTestRunner_LIBRARIES
    ${ATK_LIBRARIES}
    ${CAIRO_LIBRARIES}
    ${ECORE_LIBRARIES}
    ${ECORE_EVAS_LIBRARIES}

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

add_definitions(-DFONTS_CONF_DIR="${TOOLS_DIR}/DumpRenderTree/gtk/fonts"
                -DDOWNLOADED_FONTS_DIR="${CMAKE_SOURCE_DIR}/WebKitBuild/Dependencies/Source/webkitgtk-test-fonts-0.0.3"
                -DTHEME_DIR="${THEME_BINARY_DIR}")

if (ENABLE_ACCESSIBILITY)
    list(APPEND WebKitTestRunnerInjectedBundle_SOURCES
        ${WEBKIT_TESTRUNNER_INJECTEDBUNDLE_DIR}/atk/AccessibilityControllerAtk.cpp
        ${WEBKIT_TESTRUNNER_INJECTEDBUNDLE_DIR}/atk/AccessibilityUIElementAtk.cpp
    )
    list(APPEND WebKitTestRunner_INCLUDE_DIRECTORIES
        ${ATK_INCLUDE_DIRS}
    )
    list(APPEND WebKitTestRunner_LIBRARIES
        ${ATK_LIBRARIES}
    )
endif ()

Return to Bug 103036

Lines 61-67 OBJC_CLASS WebAccessibilityObjectWrapper; a/Source/WebCore/accessibility/AccessibilityObject.h_sec1
- a/Source/WebCore/accessibility/AccessibilityObject.h -5 / +5 lines
61		61
62	typedef WebAccessibilityObjectWrapper AccessibilityObjectWrapper;	62	typedef WebAccessibilityObjectWrapper AccessibilityObjectWrapper;
63		63
64	#elif PLATFORM(GTK) \|\| PLATFORM(EFL)	64	#elif PLATFORM(GTK) \|\| (PLATFORM(EFL) && HAVE(ACCESSIBILITY))
65	typedef struct _AtkObject AtkObject;	65	typedef struct _AtkObject AtkObject;
66	typedef struct _AtkObject AccessibilityObjectWrapper;	66	typedef struct _AtkObject AccessibilityObjectWrapper;
67	#elif PLATFORM(CHROMIUM)	67	#elif PLATFORM(CHROMIUM)
Lines 781-787 public: a/Source/WebCore/accessibility/AccessibilityObject.h_sec2
781	#if PLATFORM(GTK) \|\| PLATFORM(EFL)	781	#if PLATFORM(GTK) \|\| PLATFORM(EFL)
782	AccessibilityObjectWrapper* wrapper() const;	782	AccessibilityObjectWrapper* wrapper() const;
783	void setWrapper(AccessibilityObjectWrapper*);	783	void setWrapper(AccessibilityObjectWrapper*);
784	#elif !PLATFORM(CHROMIUM)	784	#elif !PLATFORM(CHROMIUM)
785	AccessibilityObjectWrapper* wrapper() const { return m_wrapper.get(); }	785	AccessibilityObjectWrapper* wrapper() const { return m_wrapper.get(); }
786	void setWrapper(AccessibilityObjectWrapper* wrapper)	786	void setWrapper(AccessibilityObjectWrapper* wrapper)
787	{	787	{
Lines 825-832 protected: a/Source/WebCore/accessibility/AccessibilityObject.h_sec3
825	static bool isAccessibilityTextSearchMatch(AccessibilityObject, AccessibilitySearchCriteria);	825	static bool isAccessibilityTextSearchMatch(AccessibilityObject, AccessibilitySearchCriteria);
826	static bool objectMatchesSearchCriteriaWithResultLimit(AccessibilityObject, AccessibilitySearchCriteria, AccessibilityChildrenVector&);	826	static bool objectMatchesSearchCriteriaWithResultLimit(AccessibilityObject, AccessibilitySearchCriteria, AccessibilityChildrenVector&);
827	virtual AccessibilityRole buttonRoleType() const;	827	virtual AccessibilityRole buttonRoleType() const;
828		828
829	#if PLATFORM(GTK) \|\| PLATFORM(EFL)	829	#if PLATFORM(GTK) \|\| (PLATFORM(EFL) && HAVE(ACCESSIBILITY))
830	bool allowsTextRanges() const;	830	bool allowsTextRanges() const;
831	unsigned getLengthForTextRange() const;	831	unsigned getLengthForTextRange() const;
832	#else	832	#else
Lines 838-844 protected: a/Source/WebCore/accessibility/AccessibilityObject.h_sec4
838	RetainPtr<WebAccessibilityObjectWrapper> m_wrapper;	838	RetainPtr<WebAccessibilityObjectWrapper> m_wrapper;
839	#elif PLATFORM(WIN) && !OS(WINCE)	839	#elif PLATFORM(WIN) && !OS(WINCE)
840	COMPtr<AccessibilityObjectWrapper> m_wrapper;	840	COMPtr<AccessibilityObjectWrapper> m_wrapper;
841	#elif PLATFORM(GTK) \|\| PLATFORM(EFL)	841	#elif PLATFORM(GTK) \|\| (PLATFORM(EFL) && HAVE(ACCESSIBILITY))
842	AtkObject* m_wrapper;	842	AtkObject* m_wrapper;
843	#elif PLATFORM(CHROMIUM)	843	#elif PLATFORM(CHROMIUM)
844	bool m_detached;	844	bool m_detached;

Lines 1-3 a/ChangeLog_sec1
- a/ChangeLog +12 lines
		1	2012-12-10 Krzysztof Czech <k.czech@samsung.com>, Laszlo Gombos <l.gombos@samsung.com>
		2
		3	[EFL] Possibility to turn off accessibility feature for WebKit-EFL.
		4	https://bugs.webkit.org/show_bug.cgi?id=103036
		5
		6	Reviewed by NOBODY (OOPS!).
		7
		8	Guard dependencies for accessibility (ATK), so that they can be turned off.
		9
		10	* Source/cmake/OptionsEfl.cmake:
		11	* Source/cmake/WebKitFeatures.cmake:
		12
1	2012-12-08 Seokju Kwon <seokju.kwon@gmail.com>	13	2012-12-08 Seokju Kwon <seokju.kwon@gmail.com>
2		14
3	[EFL][WK2] Add Remote Web Inspector	15	[EFL][WK2] Add Remote Web Inspector

Lines 1-3 a/Source/WTF/ChangeLog_sec1
- a/Source/WTF/ChangeLog +13 lines
		1	2012-12-11 Krzysztof Czech <k.czech@samsung.com>
		2
		3	[EFL] Possibility to turn off accessibility feature for WebKit-EFL.
		4	https://bugs.webkit.org/show_bug.cgi?id=103036
		5
		6	Reviewed by NOBODY (OOPS!).
		7
		8	In order to have a possibility of turning on/off accessibility in WebKit-EFL,
		9	we do not need always defined HAVE_ACCESSIBILITY macro for EFL platform. Declaration of
		10	of this macro has been moved to OptionsEfl.cmake file so that it can be easily regulate.
		11
		12	* wtf/Platform.h:
		13
1	2012-12-08 Patrick Gansterer <paroga@webkit.org>	14	2012-12-08 Patrick Gansterer <paroga@webkit.org>
2		15
3	Compiling WTF outside of WebKit failed on Windows	16	Compiling WTF outside of WebKit failed on Windows

Lines 1-3 a/Source/WebCore/ChangeLog_sec1
- a/Source/WebCore/ChangeLog +17 lines
		1	2012-12-11 Krzysztof Czech <k.czech@samsung.com>, Laszlo Gombos <l.gombos@samsung.com>
		2
		3	[EFL] Possibility to turn off accessibility feature for WebKit-EFL.
		4	https://bugs.webkit.org/show_bug.cgi?id=103036
		5
		6	Reviewed by NOBODY (OOPS!).
		7
		8	Guard dependencies for accessibility (ATK), so that they can be turned off.
		9
		10	No new tests as there is no new functionality.
		11
		12	* PlatformEfl.cmake:
		13	* accessibility/AccessibilityObject.cpp:
		14	(WebCore::AccessibilityObject::AccessibilityObject):
		15	* accessibility/AccessibilityObject.h:
		16	(AccessibilityObject):
		17
1	2012-12-10 Alexander Pavlov <apavlov@chromium.org>	18	2012-12-10 Alexander Pavlov <apavlov@chromium.org>
2		19
3	Web Inspector: [Overrides] Unable to change values in Device Metrics override setting	20	Web Inspector: [Overrides] Unable to change values in Device Metrics override setting

Lines 1-5 a/Source/WebCore/PlatformEfl.cmake_sec1
- a/Source/WebCore/PlatformEfl.cmake -19 / +28 lines
1	list(APPEND WebCore_INCLUDE_DIRECTORIES	1	list(APPEND WebCore_INCLUDE_DIRECTORIES
2	"${WEBCORE_DIR}/accessibility/atk"
3	"${WEBCORE_DIR}/page/efl"	2	"${WEBCORE_DIR}/page/efl"
4	"${WEBCORE_DIR}/platform/cairo"	3	"${WEBCORE_DIR}/platform/cairo"
5	"${WEBCORE_DIR}/platform/efl"	4	"${WEBCORE_DIR}/platform/efl"
Lines 13-38 list(APPEND WebCore_INCLUDE_DIRECTORIES a/Source/WebCore/PlatformEfl.cmake_sec2
13	"${WEBCORE_DIR}/platform/network/soup"	12	"${WEBCORE_DIR}/platform/network/soup"
14	"${WEBCORE_DIR}/platform/text/efl"	13	"${WEBCORE_DIR}/platform/text/efl"
15	"${WEBCORE_DIR}/plugins/efl"	14	"${WEBCORE_DIR}/plugins/efl"
16	${ATK_INCLUDE_DIRS}
17	)	15	)
18		16
19	list(APPEND WebCore_SOURCES	17	list(APPEND WebCore_SOURCES
20	accessibility/atk/AXObjectCacheAtk.cpp
21	accessibility/atk/AccessibilityObjectAtk.cpp
22	accessibility/atk/WebKitAccessibleHyperlink.cpp
23	accessibility/atk/WebKitAccessibleInterfaceAction.cpp
24	accessibility/atk/WebKitAccessibleInterfaceComponent.cpp
25	accessibility/atk/WebKitAccessibleInterfaceDocument.cpp
26	accessibility/atk/WebKitAccessibleInterfaceEditableText.cpp
27	accessibility/atk/WebKitAccessibleInterfaceHyperlinkImpl.cpp
28	accessibility/atk/WebKitAccessibleInterfaceHypertext.cpp
29	accessibility/atk/WebKitAccessibleInterfaceImage.cpp
30	accessibility/atk/WebKitAccessibleInterfaceSelection.cpp
31	accessibility/atk/WebKitAccessibleInterfaceTable.cpp
32	accessibility/atk/WebKitAccessibleInterfaceText.cpp
33	accessibility/atk/WebKitAccessibleInterfaceValue.cpp
34	accessibility/atk/WebKitAccessibleUtil.cpp
35	accessibility/atk/WebKitAccessibleWrapperAtk.cpp
36	editing/SmartReplaceICU.cpp	18	editing/SmartReplaceICU.cpp
37	page/efl/DragControllerEfl.cpp	19	page/efl/DragControllerEfl.cpp
38	page/efl/EventHandlerEfl.cpp	20	page/efl/EventHandlerEfl.cpp
Lines 177-183 if (WTF_USE_TEXTURE_MAPPER) a/Source/WebCore/PlatformEfl.cmake_sec3
177	endif ()	159	endif ()
178		160
179	list(APPEND WebCore_LIBRARIES	161	list(APPEND WebCore_LIBRARIES
180	${ATK_LIBRARIES}
181	${CAIRO_LIBRARIES}	162	${CAIRO_LIBRARIES}
182	${ECORE_LIBRARIES}	163	${ECORE_LIBRARIES}
183	${ECORE_EVAS_LIBRARIES}	164	${ECORE_EVAS_LIBRARIES}
Lines 338-340 if (ENABLE_SPELLCHECK) a/Source/WebCore/PlatformEfl.cmake_sec4
338	${ENCHANT_LIBRARIES}	319	${ENCHANT_LIBRARIES}
339	)	320	)
340	endif ()	321	endif ()
		322
		323	if (ENABLE_ACCESSIBILITY)
		324	list(APPEND WebCore_SOURCES
		325	accessibility/atk/AccessibilityObjectAtk.cpp
		326	accessibility/atk/AXObjectCacheAtk.cpp
		327	accessibility/atk/WebKitAccessibleHyperlink.cpp
		328	accessibility/atk/WebKitAccessibleInterfaceAction.cpp
		329	accessibility/atk/WebKitAccessibleInterfaceComponent.cpp
		330	accessibility/atk/WebKitAccessibleInterfaceDocument.cpp
		331	accessibility/atk/WebKitAccessibleInterfaceEditableText.cpp
		332	accessibility/atk/WebKitAccessibleInterfaceHyperlinkImpl.cpp
		333	accessibility/atk/WebKitAccessibleInterfaceHypertext.cpp
		334	accessibility/atk/WebKitAccessibleInterfaceImage.cpp
		335	accessibility/atk/WebKitAccessibleInterfaceSelection.cpp
		336	accessibility/atk/WebKitAccessibleInterfaceTable.cpp
		337	accessibility/atk/WebKitAccessibleInterfaceText.cpp
		338	accessibility/atk/WebKitAccessibleInterfaceValue.cpp
		339	accessibility/atk/WebKitAccessibleUtil.cpp
		340	accessibility/atk/WebKitAccessibleWrapperAtk.cpp
		341	)
		342	list(APPEND WebCore_INCLUDE_DIRECTORIES
		343	"${WEBCORE_DIR}/accessibility/atk"
		344	${ATK_INCLUDE_DIRS}
		345	)
		346	list(APPEND WebCore_LIBRARIES
		347	${ATK_LIBRARIES}
		348	)
		349	endif ()

Lines 1-3 a/Tools/ChangeLog_sec1
- a/Tools/ChangeLog +13 lines
		1	2012-12-10 Krzysztof Czech <k.czech@samsung.com>
		2
		3	[EFL] Possibility to turn off accessibility feature for WebKit-EFL.
		4	https://bugs.webkit.org/show_bug.cgi?id=103036
		5
		6	Reviewed by NOBODY (OOPS!).
		7
		8	Guard dependencies for accessibility (ATK), so that they can be turned off.
		9
		10	* WebKitTestRunner/InjectedBundle/AccessibilityUIElement.h:
		11	(AccessibilityUIElement):
		12	* WebKitTestRunner/PlatformEfl.cmake:
		13
1	2012-12-10 Simon Hausmann <simon.hausmann@digia.com>	14	2012-12-10 Simon Hausmann <simon.hausmann@digia.com>
2		15
3	[Qt] Use QLibraryInfo::LibraryExecutablesPath unconditionally	16	[Qt] Use QLibraryInfo::LibraryExecutablesPath unconditionally

Lines 49-55 typedef struct objc_object* PlatformUIElement; a/Tools/WebKitTestRunner/InjectedBundle/AccessibilityUIElement.h_sec1
- a/Tools/WebKitTestRunner/InjectedBundle/AccessibilityUIElement.h -2 / +2 lines
49	#include <oleacc.h>	49	#include <oleacc.h>
50		50
51	typedef COMPtr<IAccessible> PlatformUIElement;	51	typedef COMPtr<IAccessible> PlatformUIElement;
52	#elif PLATFORM(GTK) \|\| PLATFORM(EFL)	52	#elif PLATFORM(GTK) \|\| (PLATFORM(EFL) && HAVE(ACCESSIBILITY))
53	#include <atk/atk.h>	53	#include <atk/atk.h>
54	typedef AtkObject* PlatformUIElement;	54	typedef AtkObject* PlatformUIElement;
55	#else	55	#else
Lines 245-251 private: a/Tools/WebKitTestRunner/InjectedBundle/AccessibilityUIElement.h_sec2
245	void getDocumentLinks(Vector<RefPtr<AccessibilityUIElement> >&);	245	void getDocumentLinks(Vector<RefPtr<AccessibilityUIElement> >&);
246	#endif	246	#endif
247		247
248	#if PLATFORM(MAC) \|\| PLATFORM(GTK) \|\| PLATFORM(EFL)	248	#if PLATFORM(MAC) \|\| PLATFORM(GTK) \|\| (PLATFORM(EFL) && HAVE(ACCESSIBILITY))
249	void getChildren(Vector<RefPtr<AccessibilityUIElement> >&);	249	void getChildren(Vector<RefPtr<AccessibilityUIElement> >&);
250	void getChildrenWithRange(Vector<RefPtr<AccessibilityUIElement> >&, unsigned location, unsigned length);	250	void getChildrenWithRange(Vector<RefPtr<AccessibilityUIElement> >&, unsigned location, unsigned length);
251	#endif	251	#endif

Lines 21-27 list(APPEND WebKitTestRunner_INCLUDE_DIRECTORIES a/Tools/WebKitTestRunner/PlatformEfl.cmake_sec1
- a/Tools/WebKitTestRunner/PlatformEfl.cmake -4 / +13 lines
21	${TOOLS_DIR}/DumpRenderTree/efl/	21	${TOOLS_DIR}/DumpRenderTree/efl/
22	${WEBKIT2_DIR}/UIProcess/API/efl	22	${WEBKIT2_DIR}/UIProcess/API/efl
23	"${WTF_DIR}/wtf/gobject"	23	"${WTF_DIR}/wtf/gobject"
24	${ATK_INCLUDE_DIRS}
25	${CAIRO_INCLUDE_DIRS}	24	${CAIRO_INCLUDE_DIRS}
26	${ECORE_INCLUDE_DIRS}	25	${ECORE_INCLUDE_DIRS}
27	${ECORE_EVAS_INCLUDE_DIRS}	26	${ECORE_EVAS_INCLUDE_DIRS}
Lines 31-37 list(APPEND WebKitTestRunner_INCLUDE_DIRECTORIES a/Tools/WebKitTestRunner/PlatformEfl.cmake_sec2
31	)	30	)
32		31
33	list(APPEND WebKitTestRunner_LIBRARIES	32	list(APPEND WebKitTestRunner_LIBRARIES
34	${ATK_LIBRARIES}
35	${CAIRO_LIBRARIES}	33	${CAIRO_LIBRARIES}
36	${ECORE_LIBRARIES}	34	${ECORE_LIBRARIES}
37	${ECORE_EVAS_LIBRARIES}	35	${ECORE_EVAS_LIBRARIES}
Lines 56-63 endif () a/Tools/WebKitTestRunner/PlatformEfl.cmake_sec3
56	list(APPEND WebKitTestRunnerInjectedBundle_SOURCES	54	list(APPEND WebKitTestRunnerInjectedBundle_SOURCES
57	${TOOLS_DIR}/DumpRenderTree/efl/FontManagement.cpp	55	${TOOLS_DIR}/DumpRenderTree/efl/FontManagement.cpp
58		56
59	${WEBKIT_TESTRUNNER_INJECTEDBUNDLE_DIR}/atk/AccessibilityControllerAtk.cpp
60	${WEBKIT_TESTRUNNER_INJECTEDBUNDLE_DIR}/atk/AccessibilityUIElementAtk.cpp
61	${WEBKIT_TESTRUNNER_INJECTEDBUNDLE_DIR}/efl/ActivateFontsEfl.cpp	57	${WEBKIT_TESTRUNNER_INJECTEDBUNDLE_DIR}/efl/ActivateFontsEfl.cpp
62	${WEBKIT_TESTRUNNER_INJECTEDBUNDLE_DIR}/efl/InjectedBundleEfl.cpp	58	${WEBKIT_TESTRUNNER_INJECTEDBUNDLE_DIR}/efl/InjectedBundleEfl.cpp
63	${WEBKIT_TESTRUNNER_INJECTEDBUNDLE_DIR}/efl/TestRunnerEfl.cpp	59	${WEBKIT_TESTRUNNER_INJECTEDBUNDLE_DIR}/efl/TestRunnerEfl.cpp
Lines 68-70 list(APPEND WebKitTestRunnerInjectedBundle_SOURCES a/Tools/WebKitTestRunner/PlatformEfl.cmake_sec4
68	add_definitions(-DFONTS_CONF_DIR="${TOOLS_DIR}/DumpRenderTree/gtk/fonts"	64	add_definitions(-DFONTS_CONF_DIR="${TOOLS_DIR}/DumpRenderTree/gtk/fonts"
69	-DDOWNLOADED_FONTS_DIR="${CMAKE_SOURCE_DIR}/WebKitBuild/Dependencies/Source/webkitgtk-test-fonts-0.0.3"	65	-DDOWNLOADED_FONTS_DIR="${CMAKE_SOURCE_DIR}/WebKitBuild/Dependencies/Source/webkitgtk-test-fonts-0.0.3"
70	-DTHEME_DIR="${THEME_BINARY_DIR}")	66	-DTHEME_DIR="${THEME_BINARY_DIR}")
		67
		68	if (ENABLE_ACCESSIBILITY)
		69	list(APPEND WebKitTestRunnerInjectedBundle_SOURCES
		70	${WEBKIT_TESTRUNNER_INJECTEDBUNDLE_DIR}/atk/AccessibilityControllerAtk.cpp
		71	${WEBKIT_TESTRUNNER_INJECTEDBUNDLE_DIR}/atk/AccessibilityUIElementAtk.cpp
		72	)
		73	list(APPEND WebKitTestRunner_INCLUDE_DIRECTORIES
		74	${ATK_INCLUDE_DIRS}
		75	)
		76	list(APPEND WebKitTestRunner_LIBRARIES
		77	${ATK_LIBRARIES}
		78	)
		79	endif ()