Merge 6723a1e into acfca7b

SaschaCowley · web-flow · commit 1fb40c1c47bc · 2024-03-06T03:27:29.000Z
diff --git a/source/NVDAObjects/IAccessible/chromium.py b/source/NVDAObjects/IAccessible/chromium.py
@@ -65,6 +65,11 @@ def _normalizeControlField(self, attrs):
 		if attrs['role'] == controlTypes.Role.TOGGLEBUTTON and controlTypes.State.CHECKABLE in attrs['states']:
 			# In Chromium, the checkable state is exposed erroneously on toggle buttons.
 			attrs['states'].discard(controlTypes.State.CHECKABLE)
+
+		if attrs['role'] == controlTypes.Role.GROUPING and attrs.get('IAccessible2::attribute_tag', "").lower() == "figure":
+			# Chromium doesn't expose the `<figure>` element as a figure.
+			log.debug(attrs['role'])
+			attrs['role'] = controlTypes.Role.FIGURE
 		return attrs
 
 
@@ -154,6 +159,12 @@ def _get_states(self):
 		return states
 
 
+class Figure(ia2Web.Ia2Web):
+	def _get_role(self):
+		return controlTypes.Role.FIGURE
+		# return super()._get_role()
+
+
 def findExtraOverlayClasses(obj, clsList):
 	"""Determine the most appropriate class(es) for Chromium objects.
 	This works similarly to L{NVDAObjects.NVDAObject.findOverlayClasses} except that it never calls any other findOverlayClasses method.
@@ -164,5 +175,7 @@ def findExtraOverlayClasses(obj, clsList):
 		clsList.append(ToggleButton)
 	elif obj.role == controlTypes.Role.LIST and obj.IA2Attributes.get('tag') in ('ul', 'dl', 'ol'):
 		clsList.append(PresentationalList)
+	elif obj.role == controlTypes.Role.GROUPING and obj.IA2Attributes.get("tag", "").casefold() == "figure":
+		clsList.append(Figure)
 	ia2Web.findExtraOverlayClasses(obj, clsList,
 		documentClass=Document)
