Changeset 245049 in webkit


Ignore:
Timestamp:
May 7, 2019 7:56:01 PM (5 years ago)
Author:
don.olmstead@sony.com
Message:

Fix !HAVE(ACCESSIBILITY) build
​https://bugs.webkit.org/show_bug.cgi?id=197680

Reviewed by Fujii Hironori.

  • accessibility/AXObjectCache.h:

(WebCore::AXObjectCache::focusedUIElementForPage):
Update declaration for !HAVE(ACCESSIBILITY)

  • accessibility/AccessibilityObject.h:

Add wrapper implementation for !HAVE(ACCESSIBILITY)

  • accessibility/AccessibilityProgressIndicator.cpp:

(WebCore::AccessibilityProgressIndicator::roleValue const):
Add ENABLE(METER_ELEMENT) guard.

Location:
trunk/Source/WebCore
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r245044 r245049  
     12019-05-07  Don Olmstead  <don.olmstead@sony.com>
     2
     3        Fix !HAVE(ACCESSIBILITY) build
     4        https://bugs.webkit.org/show_bug.cgi?id=197680
     5
     6        Reviewed by Fujii Hironori.
     7
     8        * accessibility/AXObjectCache.h:
     9        (WebCore::AXObjectCache::focusedUIElementForPage):
     10        Update declaration for !HAVE(ACCESSIBILITY)
     11        * accessibility/AccessibilityObject.h:
     12        Add wrapper implementation for !HAVE(ACCESSIBILITY)
     13        * accessibility/AccessibilityProgressIndicator.cpp:
     14        (WebCore::AccessibilityProgressIndicator::roleValue const):
     15        Add ENABLE(METER_ELEMENT) guard.
     16
    1172019-05-07  Ryan Haddad  <ryanhaddad@apple.com>
    218

  • trunk/Source/WebCore/accessibility/AXObjectCache.h

    r244200 r245049  
    515515inline AXObjectCache::AXObjectCache(Document& document) : m_document(document), m_notificationPostTimer(*this, &AXObjectCache::notificationPostTimerFired), m_passwordNotificationPostTimer(*this, &AXObjectCache::passwordNotificationPostTimerFired), m_liveRegionChangedPostTimer(*this, &AXObjectCache::liveRegionChangedNotificationPostTimerFired), m_focusModalNodeTimer(*this, &AXObjectCache::focusModalNodeTimerFired), m_performCacheUpdateTimer(*this, &AXObjectCache::performCacheUpdateTimerFired) { }
    516516inline AXObjectCache::~AXObjectCache() { }
    517 inline AccessibilityObjectInterface* AXObjectCache::focusedUIElementForPage(const Page*) { return nullptr; }
     517inline AccessibilityObject* AXObjectCache::focusedUIElementForPage(const Page*) { return nullptr; }
    518518inline AccessibilityObject* AXObjectCache::get(RenderObject*) { return nullptr; }
    519519inline AccessibilityObject* AXObjectCache::get(Node*) { return nullptr; }

  • trunk/Source/WebCore/accessibility/AccessibilityObject.h

    r244582 r245049  
    954954    AccessibilityObjectWrapper* wrapper() const override { return m_wrapper.get(); }
    955955    void setWrapper(AccessibilityObjectWrapper* wrapper) { m_wrapper = wrapper; }
     956#else
     957    AccessibilityObjectWrapper* wrapper() const override { return nullptr; }
    956958#endif
    957959

  • trunk/Source/WebCore/accessibility/AccessibilityProgressIndicator.cpp

    r241989 r245049  
    155155AccessibilityRole AccessibilityProgressIndicator::roleValue() const
    156156{
     157#if ENABLE(METER_ELEMENT)
    157158    if (meterElement())
    158159        return AccessibilityRole::Meter;
     160#endif
    159161    return AccessibilityRole::ProgressIndicator;
    160162}
Note: See TracChangeset for help on using the changeset viewer.