Attachment 369340 Details for Bug 197680 – Patch

[patch] Patch

bug-197680.diff (text/plain), 3.50 KB, created by Don Olmstead on 2019-05-07 17:18:46 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Don Olmstead

Created: 2019-05-07 17:18:46 PDT

Size: 3.50 KB

patch

obsolete

>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 291e2ca308b..df1d6f2d65b 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,19 @@
>+2019-05-07  Don Olmstead  <don.olmstead@sony.com>
>+
>+        Fix !HAVE(ACCESSIBILITY) build
>+        https://bugs.webkit.org/show_bug.cgi?id=197680
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * 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.
>+
> 2019-05-07  Eric Carlson  <eric.carlson@apple.com>
> 
>         Define media buffering policy
>diff --git a/Source/WebCore/accessibility/AXObjectCache.h b/Source/WebCore/accessibility/AXObjectCache.h
>index 878478d46fc..eb67329a14a 100644
>--- a/Source/WebCore/accessibility/AXObjectCache.h
>+++ b/Source/WebCore/accessibility/AXObjectCache.h
>@@ -514,7 +514,7 @@ inline void AccessibilityReplacedText::postTextStateChangeNotification(AXObjectC
> inline void AXComputedObjectAttributeCache::setIgnored(AXID, AccessibilityObjectInclusion) { }
> inline 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) { }
> inline AXObjectCache::~AXObjectCache() { }
>-inline AccessibilityObjectInterface* AXObjectCache::focusedUIElementForPage(const Page*) { return nullptr; }
>+inline AccessibilityObject* AXObjectCache::focusedUIElementForPage(const Page*) { return nullptr; }
> inline AccessibilityObject* AXObjectCache::get(RenderObject*) { return nullptr; }
> inline AccessibilityObject* AXObjectCache::get(Node*) { return nullptr; }
> inline AccessibilityObject* AXObjectCache::get(Widget*) { return nullptr; }
>diff --git a/Source/WebCore/accessibility/AccessibilityObject.h b/Source/WebCore/accessibility/AccessibilityObject.h
>index 2eab8b07273..c0a19ff91fb 100644
>--- a/Source/WebCore/accessibility/AccessibilityObject.h
>+++ b/Source/WebCore/accessibility/AccessibilityObject.h
>@@ -953,6 +953,8 @@ public:
> #if HAVE(ACCESSIBILITY)
>     AccessibilityObjectWrapper* wrapper() const override { return m_wrapper.get(); }
>     void setWrapper(AccessibilityObjectWrapper* wrapper) { m_wrapper = wrapper; }
>+#else
>+    AccessibilityObjectWrapper* wrapper() const override { return nullptr; }
> #endif
> 
> #if PLATFORM(COCOA)
>diff --git a/Source/WebCore/accessibility/AccessibilityProgressIndicator.cpp b/Source/WebCore/accessibility/AccessibilityProgressIndicator.cpp
>index 5e530bc8c2e..f81069ca105 100644
>--- a/Source/WebCore/accessibility/AccessibilityProgressIndicator.cpp
>+++ b/Source/WebCore/accessibility/AccessibilityProgressIndicator.cpp
>@@ -154,8 +154,10 @@ float AccessibilityProgressIndicator::minValueForRange() const
>     
> AccessibilityRole AccessibilityProgressIndicator::roleValue() const
> {
>+#if ENABLE(METER_ELEMENT)
>     if (meterElement())
>         return AccessibilityRole::Meter;
>+#endif
>     return AccessibilityRole::ProgressIndicator;
> }
>

Actions: View | Formatted Diff | Diff

Attachments on bug 197680: 369340