Diff
Modified: trunk/ChangeLog (137474 => 137475)
--- trunk/ChangeLog 2012-12-12 17:23:07 UTC (rev 137474)
+++ trunk/ChangeLog 2012-12-12 17:31:01 UTC (rev 137475)
@@ -1,3 +1,15 @@
+2012-12-12 Krzysztof Czech <[email protected]>
+
+ [EFL] Possibility to turn off accessibility feature for WebKit-EFL.
+ https://bugs.webkit.org/show_bug.cgi?id=103036
+
+ Reviewed by Laszlo Gombos.
+
+ Guard dependencies for accessibility (ATK), so that they can be turned off.
+
+ * Source/cmake/OptionsEfl.cmake:
+ * Source/cmake/WebKitFeatures.cmake:
+
2012-12-12 Zan Dobersek <[email protected]>
[GTK] Remove the last of unnecessary configuration options in configure.ac
Modified: trunk/Source/WebCore/ChangeLog (137474 => 137475)
--- trunk/Source/WebCore/ChangeLog 2012-12-12 17:23:07 UTC (rev 137474)
+++ trunk/Source/WebCore/ChangeLog 2012-12-12 17:31:01 UTC (rev 137475)
@@ -1,3 +1,20 @@
+2012-12-12 Krzysztof Czech <[email protected]>
+
+ [EFL] Possibility to turn off accessibility feature for WebKit-EFL.
+ https://bugs.webkit.org/show_bug.cgi?id=103036
+
+ Reviewed by Laszlo Gombos.
+
+ 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-12 Justin Novosad <[email protected]>
Use render box background over border draw strategy in cases with background-image
Modified: trunk/Source/WebCore/PlatformEfl.cmake (137474 => 137475)
--- trunk/Source/WebCore/PlatformEfl.cmake 2012-12-12 17:23:07 UTC (rev 137474)
+++ trunk/Source/WebCore/PlatformEfl.cmake 2012-12-12 17:31:01 UTC (rev 137475)
@@ -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 @@
"${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 @@
endif ()
list(APPEND WebCore_LIBRARIES
- ${ATK_LIBRARIES}
${CAIRO_LIBRARIES}
${ECORE_LIBRARIES}
${ECORE_EVAS_LIBRARIES}
@@ -338,3 +319,31 @@
${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 ()
Modified: trunk/Source/WebCore/accessibility/AccessibilityObject.cpp (137474 => 137475)
--- trunk/Source/WebCore/accessibility/AccessibilityObject.cpp 2012-12-12 17:23:07 UTC (rev 137474)
+++ trunk/Source/WebCore/accessibility/AccessibilityObject.cpp 2012-12-12 17:31:01 UTC (rev 137475)
@@ -75,7 +75,7 @@
, m_haveChildren(false)
, m_role(UnknownRole)
, m_cachedIsIgnoredValue(DefaultBehavior)
-#if PLATFORM(GTK) || PLATFORM(EFL)
+#if PLATFORM(GTK) || (PLATFORM(EFL) && HAVE(ACCESSIBILITY))
, m_wrapper(0)
#elif PLATFORM(CHROMIUM)
, m_detached(false)
Modified: trunk/Source/WebCore/accessibility/AccessibilityObject.h (137474 => 137475)
--- trunk/Source/WebCore/accessibility/AccessibilityObject.h 2012-12-12 17:23:07 UTC (rev 137474)
+++ trunk/Source/WebCore/accessibility/AccessibilityObject.h 2012-12-12 17:31:01 UTC (rev 137475)
@@ -61,7 +61,7 @@
typedef WebAccessibilityObjectWrapper AccessibilityObjectWrapper;
-#elif PLATFORM(GTK) || PLATFORM(EFL)
+#elif PLATFORM(GTK) || (PLATFORM(EFL) && HAVE(ACCESSIBILITY))
typedef struct _AtkObject AtkObject;
typedef struct _AtkObject AccessibilityObjectWrapper;
#elif PLATFORM(CHROMIUM)
@@ -825,8 +825,8 @@
static bool isAccessibilityTextSearchMatch(AccessibilityObject*, AccessibilitySearchCriteria*);
static bool objectMatchesSearchCriteriaWithResultLimit(AccessibilityObject*, AccessibilitySearchCriteria*, AccessibilityChildrenVector&);
virtual AccessibilityRole buttonRoleType() const;
-
-#if PLATFORM(GTK) || PLATFORM(EFL)
+
+#if PLATFORM(GTK) || (PLATFORM(EFL) && HAVE(ACCESSIBILITY))
bool allowsTextRanges() const;
unsigned getLengthForTextRange() const;
#else
@@ -838,7 +838,7 @@
RetainPtr<WebAccessibilityObjectWrapper> m_wrapper;
#elif PLATFORM(WIN) && !OS(WINCE)
COMPtr<AccessibilityObjectWrapper> m_wrapper;
-#elif PLATFORM(GTK) || PLATFORM(EFL)
+#elif PLATFORM(GTK) || (PLATFORM(EFL) && HAVE(ACCESSIBILITY))
AtkObject* m_wrapper;
#elif PLATFORM(CHROMIUM)
bool m_detached;
Modified: trunk/Source/cmake/OptionsEfl.cmake (137474 => 137475)
--- trunk/Source/cmake/OptionsEfl.cmake 2012-12-12 17:23:07 UTC (rev 137474)
+++ trunk/Source/cmake/OptionsEfl.cmake 2012-12-12 17:31:01 UTC (rev 137475)
@@ -47,6 +47,7 @@
WEBKIT_OPTION_BEGIN()
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_3D_RENDERING ON)
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ACCESSIBILITY ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ANIMATION_API ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_API_TESTS ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_BATTERY_STATUS ON)
@@ -214,4 +215,8 @@
find_package(Enchant REQUIRED)
endif ()
-find_package(ATK REQUIRED)
+if (ENABLE_ACCESSIBILITY)
+ find_package(ATK REQUIRED)
+else ()
+ add_definitions(-DHAVE_ACCESSIBILITY=0)
+endif ()
Modified: trunk/Source/cmake/WebKitFeatures.cmake (137474 => 137475)
--- trunk/Source/cmake/WebKitFeatures.cmake 2012-12-12 17:23:07 UTC (rev 137474)
+++ trunk/Source/cmake/WebKitFeatures.cmake 2012-12-12 17:31:01 UTC (rev 137475)
@@ -13,6 +13,7 @@
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)
Modified: trunk/Tools/ChangeLog (137474 => 137475)
--- trunk/Tools/ChangeLog 2012-12-12 17:23:07 UTC (rev 137474)
+++ trunk/Tools/ChangeLog 2012-12-12 17:31:01 UTC (rev 137475)
@@ -1,3 +1,16 @@
+2012-12-12 Krzysztof Czech <[email protected]>
+
+ [EFL] Possibility to turn off accessibility feature for WebKit-EFL.
+ https://bugs.webkit.org/show_bug.cgi?id=103036
+
+ Reviewed by Laszlo Gombos.
+
+ Guard dependencies for accessibility (ATK), so that they can be turned off.
+
+ * WebKitTestRunner/InjectedBundle/AccessibilityUIElement.h:
+ (AccessibilityUIElement):
+ * WebKitTestRunner/PlatformEfl.cmake:
+
2012-12-12 Simon Fraser <[email protected]>
Add some entries in the watchlist, and register me for them.
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/AccessibilityUIElement.h (137474 => 137475)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/AccessibilityUIElement.h 2012-12-12 17:23:07 UTC (rev 137474)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/AccessibilityUIElement.h 2012-12-12 17:31:01 UTC (rev 137475)
@@ -49,7 +49,7 @@
#include <oleacc.h>
typedef COMPtr<IAccessible> PlatformUIElement;
-#elif PLATFORM(GTK) || PLATFORM(EFL)
+#elif PLATFORM(GTK) || (PLATFORM(EFL) && HAVE(ACCESSIBILITY))
#include <atk/atk.h>
typedef AtkObject* PlatformUIElement;
#else
@@ -247,7 +247,7 @@
void getDocumentLinks(Vector<RefPtr<AccessibilityUIElement> >&);
#endif
-#if PLATFORM(MAC) || PLATFORM(GTK) || PLATFORM(EFL)
+#if PLATFORM(MAC) || PLATFORM(GTK) || (PLATFORM(EFL) && HAVE(ACCESSIBILITY))
void getChildren(Vector<RefPtr<AccessibilityUIElement> >&);
void getChildrenWithRange(Vector<RefPtr<AccessibilityUIElement> >&, unsigned location, unsigned length);
#endif
Modified: trunk/Tools/WebKitTestRunner/PlatformEfl.cmake (137474 => 137475)
--- trunk/Tools/WebKitTestRunner/PlatformEfl.cmake 2012-12-12 17:23:07 UTC (rev 137474)
+++ trunk/Tools/WebKitTestRunner/PlatformEfl.cmake 2012-12-12 17:31:01 UTC (rev 137475)
@@ -21,7 +21,6 @@
${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_LIBRARIES
- ${ATK_LIBRARIES}
${CAIRO_LIBRARIES}
${ECORE_LIBRARIES}
${ECORE_EVAS_LIBRARIES}
@@ -56,8 +54,6 @@
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 @@
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 ()
