Title: [290593] releases/WebKitGTK/webkit-2.36
- Revision
- 290593
- Author
- carlo...@webkit.org
- Date
- 2022-02-28 02:47:06 -0800 (Mon, 28 Feb 2022)
Log Message
Merge r290586 - [ATSPI] Always expose table cells (layout and CSS) that have rendered text content
https://bugs.webkit.org/show_bug.cgi?id=237204
Reviewed by Adrian Perez de Castro.
Source/WebCore:
* accessibility/atspi/AccessibilityObjectAtspi.cpp:
(WebCore::AccessibilityObject::accessibilityPlatformIncludesObject const):
LayoutTests:
* accessibility/gtk/nested-block-element-children-expected.txt: Rebaseline.
* platform/glib/TestExpectations: Remove accessibility/generated-content-with-display-table-crash.html.
* platform/gtk/TestExpectations: Remove accessibility/gtk/nested-block-element-children.html.
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.36/LayoutTests/ChangeLog (290592 => 290593)
--- releases/WebKitGTK/webkit-2.36/LayoutTests/ChangeLog 2022-02-28 10:47:00 UTC (rev 290592)
+++ releases/WebKitGTK/webkit-2.36/LayoutTests/ChangeLog 2022-02-28 10:47:06 UTC (rev 290593)
@@ -1,5 +1,16 @@
2022-02-28 Carlos Garcia Campos <cgar...@igalia.com>
+ [ATSPI] Always expose table cells (layout and CSS) that have rendered text content
+ https://bugs.webkit.org/show_bug.cgi?id=237204
+
+ Reviewed by Adrian Perez de Castro.
+
+ * accessibility/gtk/nested-block-element-children-expected.txt: Rebaseline.
+ * platform/glib/TestExpectations: Remove accessibility/generated-content-with-display-table-crash.html.
+ * platform/gtk/TestExpectations: Remove accessibility/gtk/nested-block-element-children.html.
+
+2022-02-28 Carlos Garcia Campos <cgar...@igalia.com>
+
[GTK][a11y] Test accessibility/gtk/xml-roles-exposed.html is failing since ATSPI switch
https://bugs.webkit.org/show_bug.cgi?id=237202
Modified: releases/WebKitGTK/webkit-2.36/LayoutTests/accessibility/gtk/nested-block-element-children-expected.txt (290592 => 290593)
--- releases/WebKitGTK/webkit-2.36/LayoutTests/accessibility/gtk/nested-block-element-children-expected.txt 2022-02-28 10:47:00 UTC (rev 290592)
+++ releases/WebKitGTK/webkit-2.36/LayoutTests/accessibility/gtk/nested-block-element-children-expected.txt 2022-02-28 10:47:06 UTC (rev 290593)
@@ -1,20 +1,20 @@
AXRole: AXWebArea
AXRole: AXSection AXValue: Test 1
- AXRole: AXHeading AXValue: Test 1
+ AXRole: AXHeading AXValue: <obj>
AXRole: AXLink AXValue: Test 1
AXRole: AXHeading AXValue: Test 1
AXRole: AXParagraph AXValue: Test 1
- AXRole: AXHeading AXValue: Test 2
+ AXRole: AXHeading AXValue: <obj>
AXRole: AXLink AXValue: Test 2
AXRole: AXHeading AXValue: Test 2
AXRole: AXParagraph AXValue: Test 2
AXRole: AXSection AXValue: Test 3
- AXRole: AXHeading AXValue: Test 3
+ AXRole: AXHeading AXValue: <obj>
AXRole: AXLink AXValue: Test 3
AXRole: AXHeading AXValue: Test 3
AXRole: AXHeading AXValue: Test 3
AXRole: AXParagraph AXValue: Test 3
- AXRole: AXHeading AXValue: Test 4
+ AXRole: AXHeading AXValue: <obj>
AXRole: AXLink AXValue: Test 4
AXRole: AXHeading AXValue: Test 4
AXRole: AXParagraph AXValue: Test 4
Modified: releases/WebKitGTK/webkit-2.36/LayoutTests/platform/glib/TestExpectations (290592 => 290593)
--- releases/WebKitGTK/webkit-2.36/LayoutTests/platform/glib/TestExpectations 2022-02-28 10:47:00 UTC (rev 290592)
+++ releases/WebKitGTK/webkit-2.36/LayoutTests/platform/glib/TestExpectations 2022-02-28 10:47:06 UTC (rev 290593)
@@ -415,7 +415,6 @@
# Tests failing with ATSPI implementation.
webkit.org/b/235941 accessibility/children-changed-sends-notification.html [ Failure ]
-webkit.org/b/235941 accessibility/generated-content-with-display-table-crash.html [ Failure ]
webkit.org/b/235941 accessibility/select-element-at-index.html [ Failure ]
#////////////////////////////////////////////////////////////////////////////////////////
Modified: releases/WebKitGTK/webkit-2.36/LayoutTests/platform/gtk/TestExpectations (290592 => 290593)
--- releases/WebKitGTK/webkit-2.36/LayoutTests/platform/gtk/TestExpectations 2022-02-28 10:47:00 UTC (rev 290592)
+++ releases/WebKitGTK/webkit-2.36/LayoutTests/platform/gtk/TestExpectations 2022-02-28 10:47:06 UTC (rev 290593)
@@ -135,7 +135,6 @@
accessibility/model-element-attributes.html [ Skip ]
# Tests failing with ATSPI implementation.
-webkit.org/b/235941 accessibility/gtk/nested-block-element-children.html [ Failure ]
webkit.org/b/235941 accessibility/gtk/no-notification-for-unrendered-iframe-children.html [ Failure ]
webkit.org/b/235941 accessibility/gtk/spans.html [ Failure ]
webkit.org/b/235941 accessibility/gtk/text-at-offset-embedded-objects.html [ Failure ]
Modified: releases/WebKitGTK/webkit-2.36/Source/WebCore/ChangeLog (290592 => 290593)
--- releases/WebKitGTK/webkit-2.36/Source/WebCore/ChangeLog 2022-02-28 10:47:00 UTC (rev 290592)
+++ releases/WebKitGTK/webkit-2.36/Source/WebCore/ChangeLog 2022-02-28 10:47:06 UTC (rev 290593)
@@ -1,5 +1,15 @@
2022-02-28 Carlos Garcia Campos <cgar...@igalia.com>
+ [ATSPI] Always expose table cells (layout and CSS) that have rendered text content
+ https://bugs.webkit.org/show_bug.cgi?id=237204
+
+ Reviewed by Adrian Perez de Castro.
+
+ * accessibility/atspi/AccessibilityObjectAtspi.cpp:
+ (WebCore::AccessibilityObject::accessibilityPlatformIncludesObject const):
+
+2022-02-28 Carlos Garcia Campos <cgar...@igalia.com>
+
[GTK][a11y] Test accessibility/gtk/xml-roles-exposed.html is failing since ATSPI switch
https://bugs.webkit.org/show_bug.cgi?id=237202
Modified: releases/WebKitGTK/webkit-2.36/Source/WebCore/accessibility/atspi/AccessibilityObjectAtspi.cpp (290592 => 290593)
--- releases/WebKitGTK/webkit-2.36/Source/WebCore/accessibility/atspi/AccessibilityObjectAtspi.cpp 2022-02-28 10:47:00 UTC (rev 290592)
+++ releases/WebKitGTK/webkit-2.36/Source/WebCore/accessibility/atspi/AccessibilityObjectAtspi.cpp 2022-02-28 10:47:06 UTC (rev 290593)
@@ -31,7 +31,10 @@
#include "HTMLSpanElement.h"
#include "RenderAncestorIterator.h"
#include "RenderBlock.h"
+#include "RenderInline.h"
#include "RenderObject.h"
+#include "RenderTableCell.h"
+#include "RenderText.h"
#include "TextControlInnerElements.h"
#include "TextIterator.h"
#include <glib/gi18n-lib.h>
@@ -1464,6 +1467,15 @@
return child ? AccessibilityObjectInclusion::IncludeObject : AccessibilityObjectInclusion::DefaultBehavior;
}
+ // We always want to include table cells (layout and CSS) that have rendered text content.
+ if (is<RenderTableCell>(renderObject)) {
+ for (const auto& child : childrenOfType<RenderObject>(downcast<RenderElement>(*renderObject))) {
+ if (is<RenderInline>(child) || is<RenderText>(child) || is<HTMLSpanElement>(child.node()))
+ return AccessibilityObjectInclusion::IncludeObject;
+ }
+ return AccessibilityObjectInclusion::DefaultBehavior;
+ }
+
if (renderObject->isAnonymousBlock()) {
// The text displayed by an ARIA menu item is exposed through the accessible name.
if (parent->isMenuItem())
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
