Changeset 162538 in webkit


Ignore:
Timestamp:
Jan 22, 2014 11:21:55 AM (10 years ago)
Author:
thiago.lacerda@openbossa.org
Message:

[EFL][GTK] Get EFL and GTK compiling with ACCESSIBILITY disabled
https://bugs.webkit.org/show_bug.cgi?id=127119

Reviewed by Mario Sanchez Prada.

Source/WebCore:

At build time, the compiler was not able to determine which Timer's constructor to call in AXObjectCache when
ACCESSIBILITY is not enabled, fixing that.
Also guarding some members in AccessibilityObject that are only being used by EFL and GTK with ACCESSIBILITY.

  • accessibility/AXObjectCache.h:

(WebCore::AXObjectCache::AXObjectCache):

  • accessibility/AccessibilityObject.h:

Source/WebKit/gtk:

Guarding ACCESSIBILITY code with HAVE(ACCESSIBILITY).

  • webkit/webkitwebview.cpp:

(webkit_web_view_class_init):

Source/WebKit2:

Guarding ACCESSIBILITY code with HAVE(ACCESSIBILITY).

  • WebProcess/WebPage/WebPage.cpp:

(WebKit::WebPage::WebPage):

  • WebProcess/WebPage/WebPage.h:
  • WebProcess/WebPage/gtk/WebPageGtk.cpp:

(WebKit::WebPage::platformInitialize):

Tools:

Guarding ACCESSIBILITY code in DumpRenderTree and WebKitTestRunner with HAVE(ACCESSIBILITY).

  • DumpRenderTree/efl/DumpRenderTreeChrome.cpp:
  • DumpRenderTree/gtk/AccessibilityControllerGtk.cpp:
  • DumpRenderTree/gtk/DumpRenderTree.cpp:

(resetDefaultsToConsistentValues):
(webViewWindowObjectCleared):
(main):

  • WebKitTestRunner/InjectedBundle/AccessibilityController.cpp:

(WTR::AccessibilityController::platformName):

  • WebKitTestRunner/InjectedBundle/AccessibilityUIElement.cpp:

(WTR::AccessibilityUIElement::isIndeterminate):

Location:
trunk
Files:
15 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebCore/ChangeLog

    r162537 r162538  
     12014-01-22  Thiago de Barros Lacerda  <thiago.lacerda@openbossa.org>
     2
     3        [EFL][GTK] Get EFL and GTK compiling with ACCESSIBILITY disabled
     4        https://bugs.webkit.org/show_bug.cgi?id=127119
     5
     6        Reviewed by Mario Sanchez Prada.
     7
     8        At build time, the compiler was not able to determine which Timer's constructor to call in AXObjectCache when
     9        ACCESSIBILITY is not enabled, fixing that.
     10        Also guarding some members in AccessibilityObject that are only being used by EFL and GTK with ACCESSIBILITY.
     11
     12        * accessibility/AXObjectCache.h:
     13        (WebCore::AXObjectCache::AXObjectCache):
     14        * accessibility/AccessibilityObject.h:
     15
    1162014-01-22  Peter Molnar  <pmolnar.u-szeged@partner.samsung.com>
    217
  • trunk/Source/WebCore/accessibility/AXObjectCache.h

    r162132 r162538  
    265265inline AccessibilityObjectInclusion AXComputedObjectAttributeCache::getIgnored(AXID) const { return DefaultBehavior; }
    266266inline void AXComputedObjectAttributeCache::setIgnored(AXID, AccessibilityObjectInclusion) { }
    267 inline AXObjectCache::AXObjectCache(Document& document) : m_document(document), m_notificationPostTimer(this, 0) { }
     267inline AXObjectCache::AXObjectCache(Document& document) : m_document(document), m_notificationPostTimer(this, (Timer<AXObjectCache>::TimerFiredFunction) nullptr) { }
    268268inline AXObjectCache::~AXObjectCache() { }
    269269inline AccessibilityObject* AXObjectCache::focusedUIElementForPage(const Page*) { return 0; }
  • trunk/Source/WebCore/accessibility/AccessibilityObject.h

    r161309 r162538  
    925925    bool isOnscreen() const;
    926926   
    927 #if PLATFORM(GTK) || (PLATFORM(EFL) && HAVE(ACCESSIBILITY))
     927#if (PLATFORM(GTK) || PLATFORM(EFL)) && HAVE(ACCESSIBILITY)
    928928    bool allowsTextRanges() const;
    929929    unsigned getLengthForTextRange() const;
  • trunk/Source/WebKit/gtk/ChangeLog

    r162264 r162538  
     12014-01-22  Thiago de Barros Lacerda  <thiago.lacerda@openbossa.org>
     2
     3        [EFL][GTK] Get EFL and GTK compiling with ACCESSIBILITY disabled
     4        https://bugs.webkit.org/show_bug.cgi?id=127119
     5
     6        Reviewed by Mario Sanchez Prada.
     7
     8        Guarding ACCESSIBILITY code with HAVE(ACCESSIBILITY).
     9
     10        * webkit/webkitwebview.cpp:
     11        (webkit_web_view_class_init):
     12
    1132014-01-18  Brian Burg  <bburg@apple.com>
    214
  • trunk/Source/WebKit/gtk/webkit/webkitwebview.cpp

    r162069 r162538  
    14181418}
    14191419
     1420#if HAVE(ACCESSIBILITY)
    14201421static AtkObject* webkit_web_view_get_accessible(GtkWidget* widget)
    14211422{
     
    14491450    return axRoot;
    14501451}
     1452#endif
    14511453
    14521454static double screenDPI(GdkScreen* screen)
     
    31083110    widgetClass->focus_in_event = webkit_web_view_focus_in_event;
    31093111    widgetClass->focus_out_event = webkit_web_view_focus_out_event;
     3112#if HAVE(ACCESSIBILITY)
    31103113    widgetClass->get_accessible = webkit_web_view_get_accessible;
     3114#endif
    31113115    widgetClass->screen_changed = webkit_web_view_screen_changed;
    31123116#if ENABLE(DRAG_SUPPORT)
  • trunk/Source/WebKit2/ChangeLog

    r162536 r162538  
     12014-01-22  Thiago de Barros Lacerda  <thiago.lacerda@openbossa.org>
     2
     3        [EFL][GTK] Get EFL and GTK compiling with ACCESSIBILITY disabled
     4        https://bugs.webkit.org/show_bug.cgi?id=127119
     5
     6        Reviewed by Mario Sanchez Prada.
     7
     8        Guarding ACCESSIBILITY code with HAVE(ACCESSIBILITY).
     9
     10        * WebProcess/WebPage/WebPage.cpp:
     11        (WebKit::WebPage::WebPage):
     12        * WebProcess/WebPage/WebPage.h:
     13        * WebProcess/WebPage/gtk/WebPageGtk.cpp:
     14        (WebKit::WebPage::platformInitialize):
     15
    1162014-01-22  Martin Robinson  <mrobinson@igalia.com>
    217
  • trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp

    r162467 r162538  
    249249    , m_keyboardEventBeingInterpreted(0)
    250250    , m_viewGestureGeometryCollector(*this)
    251 #elif PLATFORM(GTK)
     251#elif PLATFORM(GTK) && HAVE(ACCESSIBILITY)
    252252    , m_accessibilityObject(0)
    253253#endif
  • trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h

    r162467 r162538  
    949949#elif HAVE(ACCESSIBILITY) && (PLATFORM(GTK) || PLATFORM(EFL))
    950950    GRefPtr<WebPageAccessibilityObject> m_accessibilityObject;
    951 
    952 #if USE(TEXTURE_MAPPER_GL)
     951#endif
     952
     953#if PLATFORM(GTK) && USE(TEXTURE_MAPPER_GL)
    953954    // Our view's window in the UI process.
    954955    uint64_t m_nativeWindowHandle;
    955 #endif
    956956#endif
    957957
  • trunk/Source/WebKit2/WebProcess/WebPage/gtk/WebPageGtk.cpp

    r158002 r162538  
    5050void WebPage::platformInitialize()
    5151{
     52#if HAVE(ACCESSIBILITY)
    5253    // Create the accessible object (the plug) that will serve as the
    5354    // entry point to the Web process, and send a message to the UI
     
    5758    GOwnPtr<gchar> plugID(atk_plug_get_id(ATK_PLUG(m_accessibilityObject.get())));
    5859    send(Messages::WebPageProxy::BindAccessibilityTree(String(plugID.get())));
     60#endif
    5961
    6062#if USE(TEXTURE_MAPPER_GL)
     
    6365}
    6466
     67#if HAVE(ACCESSIBILITY)
    6568void WebPage::updateAccessibilityTree()
    6669{
     
    7073    webPageAccessibilityObjectRefresh(m_accessibilityObject.get());
    7174}
     75#endif
    7276
    7377void WebPage::platformPreferencesDidChange(const WebPreferencesStore&)
  • trunk/Tools/ChangeLog

    r162516 r162538  
     12014-01-22  Thiago de Barros Lacerda  <thiago.lacerda@openbossa.org>
     2
     3        [EFL][GTK] Get EFL and GTK compiling with ACCESSIBILITY disabled
     4        https://bugs.webkit.org/show_bug.cgi?id=127119
     5
     6        Reviewed by Mario Sanchez Prada.
     7
     8        Guarding ACCESSIBILITY code in DumpRenderTree and WebKitTestRunner with HAVE(ACCESSIBILITY).
     9
     10        * DumpRenderTree/efl/DumpRenderTreeChrome.cpp:
     11        * DumpRenderTree/gtk/AccessibilityControllerGtk.cpp:
     12        * DumpRenderTree/gtk/DumpRenderTree.cpp:
     13        (resetDefaultsToConsistentValues):
     14        (webViewWindowObjectCleared):
     15        (main):
     16        * WebKitTestRunner/InjectedBundle/AccessibilityController.cpp:
     17        (WTR::AccessibilityController::platformName):
     18        * WebKitTestRunner/InjectedBundle/AccessibilityUIElement.cpp:
     19        (WTR::AccessibilityUIElement::isIndeterminate):
     20
    1212014-01-22  Carlos Garcia Campos  <cgarcia@igalia.com>
    222
  • trunk/Tools/DumpRenderTree/efl/DumpRenderTreeChrome.cpp

    r161134 r162538  
    3434#include "EventSender.h"
    3535#include "GCController.h"
     36#include "JSRetainPtr.h"
    3637#include "URL.h"
    3738#include "NotImplemented.h"
  • trunk/Tools/DumpRenderTree/gtk/AccessibilityControllerGtk.cpp

    r145014 r162538  
    2626
    2727#include "config.h"
     28
     29#if HAVE(ACCESSIBILITY)
     30
    2831#include "AccessibilityController.h"
    2932
     
    7376
    7477}
     78
     79#endif // HAVE(ACCESSIBILITY)
  • trunk/Tools/DumpRenderTree/gtk/DumpRenderTree.cpp

    r160434 r162538  
    8282static int useTimeoutWatchdog = 1;
    8383
     84#if HAVE(ACCESSIBILITY)
    8485AccessibilityController* axController = 0;
     86#endif
    8587RefPtr<TestRunner> gTestRunner;
    8688static GCController* gcController = 0;
     
    530532    DumpRenderTreeSupportGtk::setSerializeHTTPLoads(false);
    531533
     534#if HAVE(ACCESSIBILITY)
    532535    if (axController)
    533536        axController->resetToConsistentState();
     537#endif
    534538
    535539    DumpRenderTreeSupportGtk::clearOpener(mainFrame);
     
    922926    ASSERT(!exception);
    923927
     928#if HAVE(ACCESSIBILITY)
    924929    axController->makeWindowObject(context, windowObject, &exception);
    925930    ASSERT(!exception);
     931#endif
    926932
    927933    addControllerToWindow(context, windowObject, "eventSender", makeEventSender(context, !webkit_web_frame_get_parent(frame)));
     
    15251531
    15261532    gcController = new GCController();
     1533#if HAVE(ACCESSIBILITY)
    15271534    axController = new AccessibilityController();
     1535#endif
    15281536
    15291537    if (useLongRunningServerMode(argc, argv)) {
     
    15391547    gcController = 0;
    15401548
     1549#if HAVE(ACCESSIBILITY)
    15411550    delete axController;
    15421551    axController = 0;
     1552#endif
    15431553
    15441554    gtk_widget_destroy(window);
  • trunk/Tools/WebKitTestRunner/InjectedBundle/AccessibilityController.cpp

    r159181 r162538  
    9494void AccessibilityController::logAccessibilityEvents() { }
    9595void AccessibilityController::resetToConsistentState() { }
     96JSRetainPtr<JSStringRef> AccessibilityController::platformName() { return JSRetainPtr<JSStringRef>(Adopt, JSStringCreateWithUTF8CString("")); }
    9697#endif
    9798
  • trunk/Tools/WebKitTestRunner/InjectedBundle/AccessibilityUIElement.cpp

    r160316 r162538  
    130130bool AccessibilityUIElement::isExpanded() const { return false; }
    131131bool AccessibilityUIElement::isChecked() const { return false; }
     132bool AccessibilityUIElement::isIndeterminate() const { return false; }
    132133bool AccessibilityUIElement::isVisible() const { return false; }
    133134bool AccessibilityUIElement::isOffScreen() const { return false; }
Note: See TracChangeset for help on using the changeset viewer.