Attachment 178552 Details for Bug 103036 – [EFL] Possibility to turn off accessibility feature for WebKit-EFL.

[patch] [EFL] Possibility to turn off accessibility feature for WebKit-EFL.

turn-off-a11y.patch (text/plain), 15.63 KB, created by Krzysztof Czech on 2012-12-10 07:53:28 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Krzysztof Czech

Created: 2012-12-10 07:53:28 PST

Size: 15.63 KB

patch

obsolete

>diff --git a/ChangeLog b/ChangeLog
>index 50f9bde..bcdfab5 100644
>--- a/ChangeLog
>+++ b/ChangeLog
>@@ -1,3 +1,15 @@
>+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
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 8825346..2417985 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,35 @@
>+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.
>+
>+        No new tests as there is no new functionality.
>+
>+        * PlatformEfl.cmake:
>+        * accessibility/AXObjectCache.h:
>+        (WebCore):
>+        (WebCore::AXObjectCache::detachWrapper):
>+        (WebCore::AXObjectCache::attachWrapper):
>+        (WebCore::AXObjectCache::postPlatformNotification):
>+        (WebCore::AXObjectCache::frameLoadingEventPlatformNotification):
>+        (WebCore::AXObjectCache::handleScrolledToAnchor):
>+        (WebCore::AXObjectCache::nodeTextChangePlatformNotification):
>+        * accessibility/AccessibilityObject.cpp:
>+        (WebCore::AccessibilityObject::AccessibilityObject):
>+        * accessibility/AccessibilityObject.h:
>+        (AccessibilityObject):
>+        (WebCore::AccessibilityObject::wrapper):
>+        (WebCore::AccessibilityObject::setWrapper):
>+        (WebCore):
>+        (WebCore::AccessibilityObject::accessibilityIgnoreAttachment):
>+        (WebCore::AccessibilityObject::accessibilityPlatformIncludesObject):
>+        * accessibility/atk/AccessibilityObjectAtk.cpp:
>+        (WebCore):
>+
> 2012-12-10  Alexander Pavlov  <apavlov@chromium.org>
> 
>         Web Inspector: [Overrides] Unable to change values in Device Metrics override setting
>diff --git a/Source/WebCore/PlatformEfl.cmake b/Source/WebCore/PlatformEfl.cmake
>index 7924d57..d787a38 100644
>--- a/Source/WebCore/PlatformEfl.cmake
>+++ b/Source/WebCore/PlatformEfl.cmake
>@@ -1,5 +1,4 @@
> list(APPEND WebCore_INCLUDE_DIRECTORIES
>-    "${WEBCORE_DIR}/accessibility/atk"
>     "${WEBCORE_DIR}/page/efl"
>     "${WEBCORE_DIR}/platform/cairo"
>     "${WEBCORE_DIR}/platform/efl"
>@@ -13,26 +12,9 @@ list(APPEND WebCore_INCLUDE_DIRECTORIES
>     "${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
>@@ -177,7 +159,6 @@ if (WTF_USE_TEXTURE_MAPPER)
> endif ()
> 
> list(APPEND WebCore_LIBRARIES
>-    ${ATK_LIBRARIES}
>     ${CAIRO_LIBRARIES}
>     ${ECORE_LIBRARIES}
>     ${ECORE_EVAS_LIBRARIES}
>@@ -338,3 +319,31 @@ if (ENABLE_SPELLCHECK)
>         ${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()
>diff --git a/Source/WebCore/accessibility/AXObjectCache.h b/Source/WebCore/accessibility/AXObjectCache.h
>index 4edf815..c3517f1 100644
>--- a/Source/WebCore/accessibility/AXObjectCache.h
>+++ b/Source/WebCore/accessibility/AXObjectCache.h
>@@ -270,6 +270,15 @@ inline void AXObjectCache::selectedChildrenChanged(RenderObject*) { }
> inline void AXObjectCache::selectedChildrenChanged(Node*) { }
> #endif
> 
>+#if (PLATFORM(EFL) && !ENABLE(ACCESSIBILITY_EFL))
>+inline void AXObjectCache::detachWrapper(AccessibilityObject*) { }
>+inline void AXObjectCache::attachWrapper(AccessibilityObject*) { }
>+inline void AXObjectCache::postPlatformNotification(AccessibilityObject*, AXNotification) { }
>+inline void AXObjectCache::frameLoadingEventPlatformNotification(AccessibilityObject*, AXLoadingEvent) { }
>+inline void AXObjectCache::handleScrolledToAnchor(const Node*) { }
>+inline void AXObjectCache::nodeTextChangePlatformNotification(AccessibilityObject*, AXTextChange, unsigned, const String&) { }
>+#endif
>+
> }
> 
> #endif
>diff --git a/Source/WebCore/accessibility/AccessibilityObject.cpp b/Source/WebCore/accessibility/AccessibilityObject.cpp
>index f5c2a44..2a0bde8 100644
>--- a/Source/WebCore/accessibility/AccessibilityObject.cpp
>+++ b/Source/WebCore/accessibility/AccessibilityObject.cpp
>@@ -74,7 +74,7 @@ AccessibilityObject::AccessibilityObject()
>     , m_haveChildren(false)
>     , m_role(UnknownRole)
>     , m_cachedIsIgnoredValue(DefaultBehavior)
>-#if PLATFORM(GTK) || PLATFORM(EFL)
>+#if PLATFORM(GTK) || (PLATFORM(EFL) && ENABLE(ACCESSIBILITY_EFL))
>     , m_wrapper(0)
> #elif PLATFORM(CHROMIUM)
>     , m_detached(false)
>diff --git a/Source/WebCore/accessibility/AccessibilityObject.h b/Source/WebCore/accessibility/AccessibilityObject.h
>index 8b4acfa..78fe0d5 100644
>--- a/Source/WebCore/accessibility/AccessibilityObject.h
>+++ b/Source/WebCore/accessibility/AccessibilityObject.h
>@@ -61,7 +61,7 @@ OBJC_CLASS WebAccessibilityObjectWrapper;
> 
> typedef WebAccessibilityObjectWrapper AccessibilityObjectWrapper;
> 
>-#elif PLATFORM(GTK) || PLATFORM(EFL)
>+#elif PLATFORM(GTK) || (PLATFORM(EFL) && ENABLE(ACCESSIBILITY_EFL))
> typedef struct _AtkObject AtkObject;
> typedef struct _AtkObject AccessibilityObjectWrapper;
> #elif PLATFORM(CHROMIUM)
>@@ -778,14 +778,24 @@ public:
>     virtual String mathFencedCloseString() const { return String(); }
>     
> #if HAVE(ACCESSIBILITY)
>-#if PLATFORM(GTK) || PLATFORM(EFL)
>+#if PLATFORM(GTK) || (PLATFORM(EFL) && ENABLE(ACCESSIBILITY_EFL))
>     AccessibilityObjectWrapper* wrapper() const;
>     void setWrapper(AccessibilityObjectWrapper*);
>-#elif !PLATFORM(CHROMIUM)
>-    AccessibilityObjectWrapper* wrapper() const { return m_wrapper.get(); }
>+#elif !PLATFORM(CHROMIUM) 
>+    AccessibilityObjectWrapper* wrapper() const {
>+#if (PLATFORM(EFL) && !ENABLE(ACCESSIBILITY_EFL))
>+        return 0;
>+#else
>+        return m_wrapper.get();
>+#endif
>+    }
>     void setWrapper(AccessibilityObjectWrapper* wrapper) 
>     {
>+#if (PLATFORM(EFL) && !ENABLE(ACCESSIBILITY_EFL))
>+        UNUSED_PARAM(wrapper);
>+#else
>         m_wrapper = wrapper;
>+#endif
>     }
> #endif
> #endif
>@@ -826,7 +836,7 @@ protected:
>     static bool objectMatchesSearchCriteriaWithResultLimit(AccessibilityObject*, AccessibilitySearchCriteria*, AccessibilityChildrenVector&);
>     virtual AccessibilityRole buttonRoleType() const;
>     
>-#if PLATFORM(GTK) || PLATFORM(EFL)
>+#if PLATFORM(GTK) || (PLATFORM(EFL) && ENABLE(ACCESSIBILITY_EFL))
>     bool allowsTextRanges() const;
>     unsigned getLengthForTextRange() const;
> #else
>@@ -838,7 +848,7 @@ protected:
>     RetainPtr<WebAccessibilityObjectWrapper> m_wrapper;
> #elif PLATFORM(WIN) && !OS(WINCE)
>     COMPtr<AccessibilityObjectWrapper> m_wrapper;
>-#elif PLATFORM(GTK) || PLATFORM(EFL)
>+#elif PLATFORM(GTK) || (PLATFORM(EFL) && ENABLE(ACCESSIBILITY_EFL))
>     AtkObject* m_wrapper;
> #elif PLATFORM(CHROMIUM)
>     bool m_detached;
>@@ -852,6 +862,11 @@ inline int AccessibilityObject::lineForPosition(const VisiblePosition&) const {
> inline void AccessibilityObject::updateBackingStore() { }
> #endif
> 
>+#if (PLATFORM(EFL) && !ENABLE(ACCESSIBILITY_EFL))
>+inline bool AccessibilityObject::accessibilityIgnoreAttachment() const  { return true; }
>+inline AccessibilityObjectInclusion AccessibilityObject::accessibilityPlatformIncludesObject() const { return DefaultBehavior; }
>+#endif
>+
> } // namespace WebCore
> 
> #endif // AccessibilityObject_h
>diff --git a/Source/WebCore/accessibility/atk/AccessibilityObjectAtk.cpp b/Source/WebCore/accessibility/atk/AccessibilityObjectAtk.cpp
>index 0cb7a96..a379aac 100644
>--- a/Source/WebCore/accessibility/atk/AccessibilityObjectAtk.cpp
>+++ b/Source/WebCore/accessibility/atk/AccessibilityObjectAtk.cpp
>@@ -114,6 +114,7 @@ AccessibilityObjectInclusion AccessibilityObject::accessibilityPlatformIncludesO
>     return DefaultBehavior;
> }
> 
>+#if PLATFORM(GTK) || (PLATFORM(EFL) && ENABLE(ACCESSIBILITY_EFL))
> AccessibilityObjectWrapper* AccessibilityObject::wrapper() const
> {
>     return m_wrapper;
>@@ -166,6 +167,7 @@ unsigned AccessibilityObject::getLengthForTextRange() const
> 
>     return textLength;
> }
>+#endif
> 
> } // namespace WebCore
> 
>diff --git a/Source/cmake/OptionsEfl.cmake b/Source/cmake/OptionsEfl.cmake
>index dcacfa8..b596bb4 100644
>--- a/Source/cmake/OptionsEfl.cmake
>+++ b/Source/cmake/OptionsEfl.cmake
>@@ -46,6 +46,7 @@ file(MAKE_DIRECTORY ${THEME_BINARY_DIR})
> set(VERSION_SCRIPT "-Wl,--version-script,${CMAKE_MODULE_PATH}/eflsymbols.filter")
> 
> WEBKIT_OPTION_BEGIN()
>+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ACCESSIBILITY ON)
> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_3D_RENDERING ON)
> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ANIMATION_API ON)
> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_API_TESTS ON)
>@@ -211,4 +212,7 @@ if (ENABLE_SPELLCHECK)
>     find_package(Enchant REQUIRED)
> endif ()
> 
>-find_package(ATK REQUIRED)
>+if (ENABLE_ACCESSIBILITY)
>+    find_package(ATK REQUIRED)
>+    add_definitions(-DENABLE_ACCESSIBILITY_EFL=1)
>+endif ()
>diff --git a/Source/cmake/WebKitFeatures.cmake b/Source/cmake/WebKitFeatures.cmake
>index 094c983..993e2a3 100644
>--- a/Source/cmake/WebKitFeatures.cmake
>+++ b/Source/cmake/WebKitFeatures.cmake
>@@ -13,6 +13,7 @@ endmacro()
> macro(WEBKIT_OPTION_BEGIN)
>     WEBKIT_OPTION_DEFINE(ENABLE_3D_RENDERING "Toggle 3D rendering support" OFF)
>     WEBKIT_OPTION_DEFINE(ENABLE_ACCELERATED_2D_CANVAS "Toggle accelerated 2D canvas support" OFF)
>+    WEBKIT_OPTION_DEFINE(ENABLE_ACCESSIBILITY "Toggle accessibility support" OFF)
>     WEBKIT_OPTION_DEFINE(ENABLE_ANIMATION_API "Toggle animation API support" OFF)
>     WEBKIT_OPTION_DEFINE(ENABLE_API_TESTS "Enable public API unit tests" OFF)
>     WEBKIT_OPTION_DEFINE(ENABLE_ASSEMBLER_WX_EXCLUSIVE "Toggel Assembler WX Exclusive support" OFF)
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index fcfe7c5..8cc5135 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,16 @@
>+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
>diff --git a/Tools/WebKitTestRunner/InjectedBundle/AccessibilityUIElement.h b/Tools/WebKitTestRunner/InjectedBundle/AccessibilityUIElement.h
>index 2da56c3..2047a91 100644
>--- a/Tools/WebKitTestRunner/InjectedBundle/AccessibilityUIElement.h
>+++ b/Tools/WebKitTestRunner/InjectedBundle/AccessibilityUIElement.h
>@@ -49,7 +49,7 @@ typedef struct objc_object* PlatformUIElement;
> #include <oleacc.h>
> 
> typedef COMPtr<IAccessible> PlatformUIElement;
>-#elif PLATFORM(GTK) || PLATFORM(EFL)
>+#elif PLATFORM(GTK) || ENABLE(ACCESSIBILITY_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) || PLATFORM(EFL)
>+#if PLATFORM(MAC) || PLATFORM(GTK) || ENABLE(ACCESSIBILITY_EFL)
>     void getChildren(Vector<RefPtr<AccessibilityUIElement> >&);
>     void getChildrenWithRange(Vector<RefPtr<AccessibilityUIElement> >&, unsigned location, unsigned length);
> #endif
>diff --git a/Tools/WebKitTestRunner/PlatformEfl.cmake b/Tools/WebKitTestRunner/PlatformEfl.cmake
>index ad34322..9ef1346 100644
>--- a/Tools/WebKitTestRunner/PlatformEfl.cmake
>+++ b/Tools/WebKitTestRunner/PlatformEfl.cmake
>@@ -21,7 +21,6 @@ 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,7 +30,6 @@ list(APPEND WebKitTestRunner_INCLUDE_DIRECTORIES
> )
> 
> list(APPEND WebKitTestRunner_LIBRARIES
>-    ${ATK_LIBRARIES}
>     ${CAIRO_LIBRARIES}
>     ${ECORE_LIBRARIES}
>     ${ECORE_EVAS_LIBRARIES}
>@@ -56,8 +54,6 @@ 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
>@@ -68,3 +64,16 @@ list(APPEND WebKitTestRunnerInjectedBundle_SOURCES
> 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 ()

Actions: View | Formatted Diff | Diff

Attachments on bug 103036: 177339 | 178547 | 178552 | 178553 | 178562 | 178768 | 179052 | 179058