Title: [285524] trunk/Source/WebCore
- Revision
- 285524
- Author
- don.olmst...@sony.com
- Date
- 2021-11-09 12:44:59 -0800 (Tue, 09 Nov 2021)
Log Message
Fix !ENABLE(ACCESSIBILITY) after r285427
https://bugs.webkit.org/show_bug.cgi?id=232893
<rdar://problem/85210424>
Reviewed by Andres Gonzalez.
In r285399 a number of AXObjectCache methods were affected by a removal of an
ENABLE(ACCESSIBILITY) guard. The definitions were pushed down to the large
!ENABLE(ACCESSIBILITY) block at the bottom of the file but `inline static` isn't valid
code so the compile issue was fixed in r285427. However the commits had also introduced a
linker error around AXObjectCache::accessibilityEnabled and
AXObjectCache::accessibilityEnhancedUserInterfaceEnabled.
To fix the static member variables referenced in those methods are `static constexpr` when
!ENABLE(ACCESSIBILITY).
* accessibility/AXObjectCache.h:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (285523 => 285524)
--- trunk/Source/WebCore/ChangeLog 2021-11-09 20:44:17 UTC (rev 285523)
+++ trunk/Source/WebCore/ChangeLog 2021-11-09 20:44:59 UTC (rev 285524)
@@ -1,3 +1,23 @@
+2021-11-09 Don Olmstead <don.olmst...@sony.com>
+
+ Fix !ENABLE(ACCESSIBILITY) after r285427
+ https://bugs.webkit.org/show_bug.cgi?id=232893
+ <rdar://problem/85210424>
+
+ Reviewed by Andres Gonzalez.
+
+ In r285399 a number of AXObjectCache methods were affected by a removal of an
+ ENABLE(ACCESSIBILITY) guard. The definitions were pushed down to the large
+ !ENABLE(ACCESSIBILITY) block at the bottom of the file but `inline static` isn't valid
+ code so the compile issue was fixed in r285427. However the commits had also introduced a
+ linker error around AXObjectCache::accessibilityEnabled and
+ AXObjectCache::accessibilityEnhancedUserInterfaceEnabled.
+
+ To fix the static member variables referenced in those methods are `static constexpr` when
+ !ENABLE(ACCESSIBILITY).
+
+ * accessibility/AXObjectCache.h:
+
2021-11-09 Alan Bujtas <za...@apple.com>
[LFC][IFC] Horizontal constraint change should not purge the inline item cache.
Modified: trunk/Source/WebCore/accessibility/AXObjectCache.h (285523 => 285524)
--- trunk/Source/WebCore/accessibility/AXObjectCache.h 2021-11-09 20:44:17 UTC (rev 285523)
+++ trunk/Source/WebCore/accessibility/AXObjectCache.h 2021-11-09 20:44:59 UTC (rev 285524)
@@ -480,8 +480,14 @@
HashMap<Node*, AXID> m_nodeObjectMapping;
ListHashSet<Node*> m_textMarkerNodes;
std::unique_ptr<AXComputedObjectAttributeCache> m_computedObjectAttributeCache;
+
+#if ENABLE(ACCESSIBILITY)
WEBCORE_EXPORT static bool gAccessibilityEnabled;
WEBCORE_EXPORT static bool gAccessibilityEnhancedUserInterfaceEnabled;
+#else
+ static constexpr bool gAccessibilityEnabled = false;
+ static constexpr bool gAccessibilityEnhancedUserInterfaceEnabled = false;
+#endif
HashSet<AXID> m_idsInUse;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
