Changeset 159181 in webkit
- Timestamp:
- Nov 13, 2013 2:02:00 AM (10 years ago)
- Location:
- trunk/Tools
- Files:
-
- 17 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Tools/ChangeLog
r159175 r159181 1 2013-11-13 Krzysztof Czech <k.czech@samsung.com> 2 3 [ATK] Support compilation of EFL/GTK without accessibility 4 https://bugs.webkit.org/show_bug.cgi?id=122448 5 6 Reviewed by Chris Fleizach. 7 8 Added missing HAVE(ACCESSIBILITY) guards and stubs to ATK's related files, 9 so that in case of turning off the HAVE_ACCESSIBILITY macro EFL/GTK would compile properly. 10 11 * DumpRenderTree/AccessibilityController.h: 12 * DumpRenderTree/AccessibilityUIElement.h: 13 * DumpRenderTree/atk/AccessibilityCallbacks.h: 14 * DumpRenderTree/atk/AccessibilityNotificationHandlerAtk.cpp: 15 * DumpRenderTree/atk/AccessibilityNotificationHandlerAtk.h: 16 * WebKitTestRunner/InjectedBundle/AccessibilityController.cpp: 17 (WTR::AccessibilityController::rootElement): 18 (WTR::AccessibilityController::focusedElement): 19 * WebKitTestRunner/InjectedBundle/AccessibilityUIElement.cpp: 20 * WebKitTestRunner/InjectedBundle/atk/AccessibilityControllerAtk.cpp: 21 * WebKitTestRunner/InjectedBundle/atk/AccessibilityNotificationHandlerAtk.cpp: 22 * WebKitTestRunner/InjectedBundle/atk/AccessibilityNotificationHandlerAtk.h: 23 * WebKitTestRunner/InjectedBundle/atk/AccessibilityUIElementAtk.cpp: 24 * WebKitTestRunner/PlatformEfl.cmake: 25 1 26 2013-11-12 Ryuan Choi <ryuan.choi@samsung.com> 2 27 -
trunk/Tools/DumpRenderTree/AccessibilityController.h
r155448 r159181 91 91 #endif 92 92 93 #if PLATFORM(GTK) || PLATFORM(EFL)93 #if HAVE(ACCESSIBILITY) && (PLATFORM(GTK) || PLATFORM(EFL)) 94 94 RefPtr<AccessibilityNotificationHandler> m_globalNotificationHandler; 95 95 #endif -
trunk/Tools/DumpRenderTree/AccessibilityUIElement.h
r158617 r159181 282 282 #endif 283 283 284 #if PLATFORM(GTK) || PLATFORM(EFL)284 #if HAVE(ACCESSIBILITY) && (PLATFORM(GTK) || PLATFORM(EFL)) 285 285 RefPtr<AccessibilityNotificationHandler> m_notificationHandler; 286 286 #endif -
trunk/Tools/DumpRenderTree/atk/AccessibilityCallbacks.h
r155599 r159181 30 30 #define AccessibilityCallbacks_h 31 31 32 #if HAVE(ACCESSIBILITY) 33 32 34 #include "AccessibilityNotificationHandlerAtk.h" 33 35 #include "AccessibilityUIElement.h" … … 38 40 void removeAccessibilityNotificationHandler(AccessibilityNotificationHandler*); 39 41 40 #endif 42 #endif // HAVE(ACCESSIBILITY) 43 44 #endif // AccessibilityCallbacks_h -
trunk/Tools/DumpRenderTree/atk/AccessibilityNotificationHandlerAtk.cpp
r155599 r159181 20 20 #include "config.h" 21 21 #include "AccessibilityNotificationHandlerAtk.h" 22 23 #if HAVE(ACCESSIBILITY) 22 24 23 25 #include "AccessibilityCallbacks.h" … … 50 52 addAccessibilityNotificationHandler(this); 51 53 } 54 55 #endif // HAVE(ACCESSIBILITY) -
trunk/Tools/DumpRenderTree/atk/AccessibilityNotificationHandlerAtk.h
r155192 r159181 20 20 #ifndef AccessibilityNotificationHandlerAtk_h 21 21 #define AccessibilityNotificationHandlerAtk_h 22 23 #if HAVE(ACCESSIBILITY) 22 24 23 25 #include <JavaScriptCore/JSObjectRef.h> … … 45 47 }; 46 48 49 #endif // HAVE(ACCESSIBILITY) 50 47 51 #endif // AccessibilityNotificationHandlerAtk_h -
trunk/Tools/WebKitTestRunner/InjectedBundle/AccessibilityController.cpp
r158674 r159181 88 88 // Unsupported methods on various platforms. 89 89 // As they're implemented on other platforms this list should be modified. 90 #if !PLATFORM(GTK) && !PLATFORM(MAC) && !PLATFORM(EFL)90 #if (!PLATFORM(GTK) && !PLATFORM(MAC) && !PLATFORM(EFL)) || !HAVE(ACCESSIBILITY) 91 91 bool AccessibilityController::addNotificationListener(JSValueRef) { return false; } 92 92 bool AccessibilityController::removeNotificationListener() { return false; } 93 #endif94 95 #if !PLATFORM(MAC) && !PLATFORM(GTK) && !PLATFORM(EFL)96 93 PassRefPtr<AccessibilityUIElement> AccessibilityController::accessibleElementById(JSStringRef attribute) { return nullptr; } 97 #endif98 99 #if !PLATFORM(GTK) && !PLATFORM(EFL) && !PLATFORM(MAC)100 94 void AccessibilityController::logAccessibilityEvents() { } 101 95 void AccessibilityController::resetToConsistentState() { } 102 96 #endif 103 97 98 #if !HAVE(ACCESSIBILITY) && (PLATFORM(GTK) || PLATFORM(EFL)) 99 PassRefPtr<AccessibilityUIElement> AccessibilityController::rootElement() { return nullptr; } 100 PassRefPtr<AccessibilityUIElement> AccessibilityController::focusedElement() { return nullptr; } 101 #endif 102 104 103 } // namespace WTR 105 104 -
trunk/Tools/WebKitTestRunner/InjectedBundle/AccessibilityController.h
r158266 r159181 31 31 #include <JavaScriptCore/JSObjectRef.h> 32 32 #include <wtf/Platform.h> 33 #if PLATFORM(GTK) || (PLATFORM(EFL) && HAVE(ACCESSIBILITY))33 #if HAVE(ACCESSIBILITY) && (PLATFORM(GTK) || PLATFORM(EFL)) 34 34 #include "AccessibilityNotificationHandlerAtk.h" 35 35 #endif … … 69 69 #endif 70 70 71 #if PLATFORM(GTK) || (PLATFORM(EFL) && HAVE(ACCESSIBILITY))71 #if HAVE(ACCESSIBILITY) && (PLATFORM(GTK) || PLATFORM(EFL)) 72 72 RefPtr<AccessibilityNotificationHandler> m_globalNotificationHandler; 73 73 #endif -
trunk/Tools/WebKitTestRunner/InjectedBundle/AccessibilityUIElement.cpp
r158617 r159181 55 55 56 56 // Unsupported methods on various platforms. As they're implemented on other platforms this list should be modified. 57 #if !PLATFORM(MAC) && !PLATFORM(GTK) && !PLATFORM(EFL)57 #if (!PLATFORM(MAC) && !PLATFORM(GTK) && !PLATFORM(EFL)) || !HAVE(ACCESSIBILITY) 58 58 AccessibilityUIElement::AccessibilityUIElement(PlatformUIElement) { } 59 59 AccessibilityUIElement::AccessibilityUIElement(const AccessibilityUIElement&) { } -
trunk/Tools/WebKitTestRunner/InjectedBundle/AccessibilityUIElement.h
r158617 r159181 42 42 typedef struct objc_object* PlatformUIElement; 43 43 #endif 44 #elif PLATFORM(GTK) || (PLATFORM(EFL) && HAVE(ACCESSIBILITY))44 #elif HAVE(ACCESSIBILITY) && (PLATFORM(GTK) || PLATFORM(EFL)) 45 45 #include "AccessibilityNotificationHandlerAtk.h" 46 46 #include <atk/atk.h> … … 249 249 250 250 // A retained, platform specific object used to help manage notifications for this object. 251 #if HAVE(ACCESSIBILITY) 251 252 #if PLATFORM(MAC) 252 253 NotificationHandler m_notificationHandler; … … 256 257 #endif 257 258 258 #if PLATFORM(MAC) || PLATFORM(GTK) || (PLATFORM(EFL) && HAVE(ACCESSIBILITY))259 #if PLATFORM(MAC) || PLATFORM(GTK) || PLATFORM(EFL) 259 260 void getChildren(Vector<RefPtr<AccessibilityUIElement> >&); 260 261 void getChildrenWithRange(Vector<RefPtr<AccessibilityUIElement> >&, unsigned location, unsigned length); 261 262 #endif 262 263 263 #if PLATFORM(GTK) || (PLATFORM(EFL) && HAVE(ACCESSIBILITY))264 #if PLATFORM(GTK) || PLATFORM(EFL) 264 265 RefPtr<AccessibilityNotificationHandler> m_notificationHandler; 265 266 #endif 267 #endif 266 268 }; 267 269 -
trunk/Tools/WebKitTestRunner/InjectedBundle/atk/AccessibilityControllerAtk.cpp
r156386 r159181 28 28 #include "config.h" 29 29 #include "AccessibilityController.h" 30 31 #if HAVE(ACCESSIBILITY) 30 32 31 33 #include "InjectedBundle.h" … … 152 154 153 155 } // namespace WTR 156 157 #endif // HAVE(ACCESSIBILITY) -
trunk/Tools/WebKitTestRunner/InjectedBundle/atk/AccessibilityNotificationHandlerAtk.cpp
r157631 r159181 20 20 #include "config.h" 21 21 #include "AccessibilityNotificationHandlerAtk.h" 22 23 #if HAVE(ACCESSIBILITY) 22 24 23 25 #include "InjectedBundle.h" … … 284 286 285 287 } // namespace WTR 288 289 #endif // HAVE(ACCESSIBILITY) -
trunk/Tools/WebKitTestRunner/InjectedBundle/atk/AccessibilityNotificationHandlerAtk.h
r156164 r159181 20 20 #ifndef AccessibilityNotificationHandlerAtk_h 21 21 #define AccessibilityNotificationHandlerAtk_h 22 23 #if HAVE(ACCESSIBILITY) 22 24 23 25 #include <JavaScriptCore/JSObjectRef.h> … … 55 57 } // namespace WTR 56 58 59 #endif // HAVE(ACCESSIBILITY) 60 57 61 #endif // AccessibilityNotificationHandlerAtk_h -
trunk/Tools/WebKitTestRunner/InjectedBundle/atk/AccessibilityUIElementAtk.cpp
r158913 r159181 1575 1575 } // namespace WTR 1576 1576 1577 #endif 1577 #endif // HAVE(ACCESSIBILITY) -
trunk/Tools/WebKitTestRunner/InjectedBundle/mac/AccessibilityControllerMac.mm
r158674 r159181 32 32 #import "AccessibilityCommonMac.h" 33 33 #import "AccessibilityController.h" 34 35 #if HAVE(ACCESSIBILITY) 36 34 37 #import "AccessibilityNotificationHandler.h" 35 38 #import "InjectedBundle.h" … … 111 114 112 115 } // namespace WTR 116 117 #endif // HAVE(ACCESSIBILITY) -
trunk/Tools/WebKitTestRunner/InjectedBundle/mac/AccessibilityUIElementMac.mm
r158852 r159181 26 26 #import "config.h" 27 27 #import "AccessibilityCommonMac.h" 28 29 #if HAVE(ACCESSIBILITY) 30 28 31 #import "AccessibilityNotificationHandler.h" 29 32 #import "AccessibilityUIElement.h" … … 1646 1649 } // namespace WTR 1647 1650 1651 #endif // HAVE(ACCESSIBILITY) -
trunk/Tools/WebKitTestRunner/PlatformEfl.cmake
r156164 r159181 58 58 ${TOOLS_DIR}/DumpRenderTree/efl/FontManagement.cpp 59 59 60 ${WEBKIT_TESTRUNNER_INJECTEDBUNDLE_DIR}/atk/AccessibilityControllerAtk.cpp 61 ${WEBKIT_TESTRUNNER_INJECTEDBUNDLE_DIR}/atk/AccessibilityNotificationHandlerAtk.cpp 62 ${WEBKIT_TESTRUNNER_INJECTEDBUNDLE_DIR}/atk/AccessibilityUIElementAtk.cpp 63 60 64 ${WEBKIT_TESTRUNNER_INJECTEDBUNDLE_DIR}/efl/ActivateFontsEfl.cpp 61 65 ${WEBKIT_TESTRUNNER_INJECTEDBUNDLE_DIR}/efl/InjectedBundleEfl.cpp … … 69 73 70 74 if (ENABLE_ACCESSIBILITY) 71 list(APPEND WebKitTestRunnerInjectedBundle_SOURCES72 ${WEBKIT_TESTRUNNER_INJECTEDBUNDLE_DIR}/atk/AccessibilityControllerAtk.cpp73 ${WEBKIT_TESTRUNNER_INJECTEDBUNDLE_DIR}/atk/AccessibilityNotificationHandlerAtk.cpp74 ${WEBKIT_TESTRUNNER_INJECTEDBUNDLE_DIR}/atk/AccessibilityUIElementAtk.cpp75 )76 75 list(APPEND WebKitTestRunner_INCLUDE_DIRECTORIES 77 76 ${ATK_INCLUDE_DIRS}
Note: See TracChangeset
for help on using the changeset viewer.