Changeset 159181 in webkit


Ignore:
Timestamp:
Nov 13, 2013 2:02:00 AM (10 years ago)
Author:
commit-queue@webkit.org
Message:

[ATK] Support compilation of EFL/GTK without accessibility
​https://bugs.webkit.org/show_bug.cgi?id=122448

Patch by Krzysztof Czech <​k.czech@samsung.com> on 2013-11-13
Reviewed by Chris Fleizach.

Added missing HAVE(ACCESSIBILITY) guards and stubs to ATK's related files,
so that in case of turning off the HAVE_ACCESSIBILITY macro EFL/GTK would compile properly.

  • DumpRenderTree/AccessibilityController.h:
  • DumpRenderTree/AccessibilityUIElement.h:
  • DumpRenderTree/atk/AccessibilityCallbacks.h:
  • DumpRenderTree/atk/AccessibilityNotificationHandlerAtk.cpp:
  • DumpRenderTree/atk/AccessibilityNotificationHandlerAtk.h:
  • WebKitTestRunner/InjectedBundle/AccessibilityController.cpp:

(WTR::AccessibilityController::rootElement):
(WTR::AccessibilityController::focusedElement):

  • WebKitTestRunner/InjectedBundle/AccessibilityUIElement.cpp:
  • WebKitTestRunner/InjectedBundle/atk/AccessibilityControllerAtk.cpp:
  • WebKitTestRunner/InjectedBundle/atk/AccessibilityNotificationHandlerAtk.cpp:
  • WebKitTestRunner/InjectedBundle/atk/AccessibilityNotificationHandlerAtk.h:
  • WebKitTestRunner/InjectedBundle/atk/AccessibilityUIElementAtk.cpp:
  • WebKitTestRunner/PlatformEfl.cmake:
Location:
trunk/Tools
Files:
17 edited

Legend:

Unmodified
Added
Removed

  • trunk/Tools/ChangeLog

    r159175 r159181  
     12013-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
    1262013-11-12  Ryuan Choi  <ryuan.choi@samsung.com>
    227

  • trunk/Tools/DumpRenderTree/AccessibilityController.h

    r155448 r159181  
    9191#endif
    9292
    93 #if PLATFORM(GTK) || PLATFORM(EFL)
     93#if HAVE(ACCESSIBILITY) && (PLATFORM(GTK) || PLATFORM(EFL))
    9494    RefPtr<AccessibilityNotificationHandler> m_globalNotificationHandler;
    9595#endif

  • trunk/Tools/DumpRenderTree/AccessibilityUIElement.h

    r158617 r159181  
    282282#endif
    283283
    284 #if PLATFORM(GTK) || PLATFORM(EFL)
     284#if HAVE(ACCESSIBILITY) && (PLATFORM(GTK) || PLATFORM(EFL))
    285285    RefPtr<AccessibilityNotificationHandler> m_notificationHandler;
    286286#endif

  • trunk/Tools/DumpRenderTree/atk/AccessibilityCallbacks.h

    r155599 r159181  
    3030#define AccessibilityCallbacks_h
    3131
     32#if HAVE(ACCESSIBILITY)
     33
    3234#include "AccessibilityNotificationHandlerAtk.h"
    3335#include "AccessibilityUIElement.h"
    … …  
    3840void removeAccessibilityNotificationHandler(AccessibilityNotificationHandler*);
    3941
    40 #endif
     42#endif // HAVE(ACCESSIBILITY)
     43
     44#endif // AccessibilityCallbacks_h

  • trunk/Tools/DumpRenderTree/atk/AccessibilityNotificationHandlerAtk.cpp

    r155599 r159181  
    2020#include "config.h"
    2121#include "AccessibilityNotificationHandlerAtk.h"
     22
     23#if HAVE(ACCESSIBILITY)
    2224
    2325#include "AccessibilityCallbacks.h"
    … …  
    5052    addAccessibilityNotificationHandler(this);
    5153}
     54
     55#endif // HAVE(ACCESSIBILITY)

  • trunk/Tools/DumpRenderTree/atk/AccessibilityNotificationHandlerAtk.h

    r155192 r159181  
    2020#ifndef AccessibilityNotificationHandlerAtk_h
    2121#define AccessibilityNotificationHandlerAtk_h
     22
     23#if HAVE(ACCESSIBILITY)
    2224
    2325#include <JavaScriptCore/JSObjectRef.h>
    … …  
    4547};
    4648
     49#endif // HAVE(ACCESSIBILITY)
     50
    4751#endif // AccessibilityNotificationHandlerAtk_h

  • trunk/Tools/WebKitTestRunner/InjectedBundle/AccessibilityController.cpp

    r158674 r159181  
    8888// Unsupported methods on various platforms.
    8989// 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)
    9191bool AccessibilityController::addNotificationListener(JSValueRef) { return false; }
    9292bool AccessibilityController::removeNotificationListener() { return false; }
    93 #endif
    94 
    95 #if !PLATFORM(MAC) && !PLATFORM(GTK) && !PLATFORM(EFL)
    9693PassRefPtr<AccessibilityUIElement> AccessibilityController::accessibleElementById(JSStringRef attribute) { return nullptr; }
    97 #endif
    98 
    99 #if !PLATFORM(GTK) && !PLATFORM(EFL) && !PLATFORM(MAC)
    10094void AccessibilityController::logAccessibilityEvents() { }
    10195void AccessibilityController::resetToConsistentState() { }
    10296#endif
    10397
     98#if !HAVE(ACCESSIBILITY) && (PLATFORM(GTK) || PLATFORM(EFL))
     99PassRefPtr<AccessibilityUIElement> AccessibilityController::rootElement() { return nullptr; }
     100PassRefPtr<AccessibilityUIElement> AccessibilityController::focusedElement() { return nullptr; }
     101#endif
     102
    104103} // namespace WTR
    105104

  • trunk/Tools/WebKitTestRunner/InjectedBundle/AccessibilityController.h

    r158266 r159181  
    3131#include <JavaScriptCore/JSObjectRef.h>
    3232#include <wtf/Platform.h>
    33 #if PLATFORM(GTK) || (PLATFORM(EFL) && HAVE(ACCESSIBILITY))
     33#if HAVE(ACCESSIBILITY) && (PLATFORM(GTK) || PLATFORM(EFL))
    3434#include "AccessibilityNotificationHandlerAtk.h"
    3535#endif
    … …  
    6969#endif
    7070
    71 #if PLATFORM(GTK) || (PLATFORM(EFL) && HAVE(ACCESSIBILITY))
     71#if HAVE(ACCESSIBILITY) && (PLATFORM(GTK) || PLATFORM(EFL))
    7272    RefPtr<AccessibilityNotificationHandler> m_globalNotificationHandler;
    7373#endif

  • trunk/Tools/WebKitTestRunner/InjectedBundle/AccessibilityUIElement.cpp

    r158617 r159181  
    5555
    5656// 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)
    5858AccessibilityUIElement::AccessibilityUIElement(PlatformUIElement) { }
    5959AccessibilityUIElement::AccessibilityUIElement(const AccessibilityUIElement&) { }

  • trunk/Tools/WebKitTestRunner/InjectedBundle/AccessibilityUIElement.h

    r158617 r159181  
    4242typedef struct objc_object* PlatformUIElement;
    4343#endif
    44 #elif PLATFORM(GTK) || (PLATFORM(EFL) && HAVE(ACCESSIBILITY))
     44#elif HAVE(ACCESSIBILITY) && (PLATFORM(GTK) || PLATFORM(EFL))
    4545#include "AccessibilityNotificationHandlerAtk.h"
    4646#include <atk/atk.h>
    … …  
    249249   
    250250    // A retained, platform specific object used to help manage notifications for this object.
     251#if HAVE(ACCESSIBILITY)
    251252#if PLATFORM(MAC)
    252253    NotificationHandler m_notificationHandler;
    … …  
    256257#endif
    257258
    258 #if PLATFORM(MAC) || PLATFORM(GTK) || (PLATFORM(EFL) && HAVE(ACCESSIBILITY))
     259#if PLATFORM(MAC) || PLATFORM(GTK) || PLATFORM(EFL)
    259260    void getChildren(Vector<RefPtr<AccessibilityUIElement> >&);
    260261    void getChildrenWithRange(Vector<RefPtr<AccessibilityUIElement> >&, unsigned location, unsigned length);
    261262#endif
    262263
    263 #if PLATFORM(GTK) || (PLATFORM(EFL) && HAVE(ACCESSIBILITY))
     264#if PLATFORM(GTK) || PLATFORM(EFL)
    264265    RefPtr<AccessibilityNotificationHandler> m_notificationHandler;
    265266#endif
     267#endif
    266268};
    267269   

  • trunk/Tools/WebKitTestRunner/InjectedBundle/atk/AccessibilityControllerAtk.cpp

    r156386 r159181  
    2828#include "config.h"
    2929#include "AccessibilityController.h"
     30
     31#if HAVE(ACCESSIBILITY)
    3032
    3133#include "InjectedBundle.h"
    … …  
    152154
    153155} // namespace WTR
     156
     157#endif // HAVE(ACCESSIBILITY)

  • trunk/Tools/WebKitTestRunner/InjectedBundle/atk/AccessibilityNotificationHandlerAtk.cpp

    r157631 r159181  
    2020#include "config.h"
    2121#include "AccessibilityNotificationHandlerAtk.h"
     22
     23#if HAVE(ACCESSIBILITY)
    2224
    2325#include "InjectedBundle.h"
    … …  
    284286
    285287} // namespace WTR
     288
     289#endif // HAVE(ACCESSIBILITY)

  • trunk/Tools/WebKitTestRunner/InjectedBundle/atk/AccessibilityNotificationHandlerAtk.h

    r156164 r159181  
    2020#ifndef AccessibilityNotificationHandlerAtk_h
    2121#define AccessibilityNotificationHandlerAtk_h
     22
     23#if HAVE(ACCESSIBILITY)
    2224
    2325#include <JavaScriptCore/JSObjectRef.h>
    … …  
    5557} // namespace WTR
    5658
     59#endif // HAVE(ACCESSIBILITY)
     60
    5761#endif // AccessibilityNotificationHandlerAtk_h

  • trunk/Tools/WebKitTestRunner/InjectedBundle/atk/AccessibilityUIElementAtk.cpp

    r158913 r159181  
    15751575} // namespace WTR
    15761576
    1577 #endif
     1577#endif // HAVE(ACCESSIBILITY)

  • trunk/Tools/WebKitTestRunner/InjectedBundle/mac/AccessibilityControllerMac.mm

    r158674 r159181  
    3232#import "AccessibilityCommonMac.h"
    3333#import "AccessibilityController.h"
     34
     35#if HAVE(ACCESSIBILITY)
     36
    3437#import "AccessibilityNotificationHandler.h"
    3538#import "InjectedBundle.h"
    … …  
    111114
    112115} // namespace WTR
     116
     117#endif // HAVE(ACCESSIBILITY)

  • trunk/Tools/WebKitTestRunner/InjectedBundle/mac/AccessibilityUIElementMac.mm

    r158852 r159181  
    2626#import "config.h"
    2727#import "AccessibilityCommonMac.h"
     28
     29#if HAVE(ACCESSIBILITY)
     30
    2831#import "AccessibilityNotificationHandler.h"
    2932#import "AccessibilityUIElement.h"
    … …  
    16461649} // namespace WTR
    16471650
     1651#endif // HAVE(ACCESSIBILITY)

  • trunk/Tools/WebKitTestRunner/PlatformEfl.cmake

    r156164 r159181  
    5858    ${TOOLS_DIR}/DumpRenderTree/efl/FontManagement.cpp
    5959
     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
    6064    ${WEBKIT_TESTRUNNER_INJECTEDBUNDLE_DIR}/efl/ActivateFontsEfl.cpp
    6165    ${WEBKIT_TESTRUNNER_INJECTEDBUNDLE_DIR}/efl/InjectedBundleEfl.cpp
    … …  
    6973
    7074if (ENABLE_ACCESSIBILITY)
    71     list(APPEND WebKitTestRunnerInjectedBundle_SOURCES
    72         ${WEBKIT_TESTRUNNER_INJECTEDBUNDLE_DIR}/atk/AccessibilityControllerAtk.cpp
    73         ${WEBKIT_TESTRUNNER_INJECTEDBUNDLE_DIR}/atk/AccessibilityNotificationHandlerAtk.cpp
    74         ${WEBKIT_TESTRUNNER_INJECTEDBUNDLE_DIR}/atk/AccessibilityUIElementAtk.cpp
    75     )
    7675    list(APPEND WebKitTestRunner_INCLUDE_DIRECTORIES
    7776        ${ATK_INCLUDE_DIRS}
Note: See TracChangeset for help on using the changeset viewer.