Include SVG <g> elements in accessibility tree, marked as ignored.

This is needed as a first step to preserve grouping information for text nodes within an SVG. Grouping information will help Select-to-Speak properly re-order text nodes within an SVG to match a natural reading order. AX-Relnotes: n/a R=dmazzoni@chromium.org Bug: 892822 Change-Id: I29ad9db045df95fef0acb1a5bab5aa9337911211 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2352614Reviewed-by: Dominic Mazzoni <dmazzoni@chromium.org> Commit-Queue: Joel Riley <joelriley@google.com> Cr-Commit-Position: refs/heads/master@{#798357}

Include SVG <g> elements in accessibility tree, marked as ignored.
This is needed as a first step to preserve grouping information for text nodes within an SVG. Grouping information will help Select-to-Speak properly re-order text nodes within an SVG to match a natural reading order. AX-Relnotes: n/a R=dmazzoni@chromium.org Bug: 892822 Change-Id: I29ad9db045df95fef0acb1a5bab5aa9337911211 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2352614Reviewed-by: Dominic Mazzoni <dmazzoni@chromium.org> Commit-Queue: Joel Riley <joelriley@google.com> Cr-Commit-Position: refs/heads/master@{#798357}
4ccc554f · Joel Riley · Commit Bot · 274d2c72 · 4ccc554f · 4ccc554f
Commit 4ccc554f authored Aug 14, 2020 by Joel Riley Committed by Commit Bot Aug 14, 2020
4 changed files
--- a/content/browser/accessibility/dump_accessibility_tree_browsertest.cc
+++ b/content/browser/accessibility/dump_accessibility_tree_browsertest.cc
@@ -2227,6 +2227,10 @@ IN_PROC_BROWSER_TEST_P(DumpAccessibilityTreeTest, AccessibilitySvg) {
  RunHtmlTest(FILE_PATH_LITERAL("svg.html"));
 }

+IN_PROC_BROWSER_TEST_P(DumpAccessibilityTreeTest, AccessibilitySvgG) {
+  RunHtmlTest(FILE_PATH_LITERAL("svg-g.html"));
+}
+
 IN_PROC_BROWSER_TEST_P(DumpAccessibilityTreeTest, AccessibilityTableSimple) {
  RunHtmlTest(FILE_PATH_LITERAL("table-simple.html"));
 }

--- a/content/test/data/accessibility/html/svg-g-expected-blink.txt
+++ b/content/test/data/accessibility/html/svg-g-expected-blink.txt
+rootWebArea
++genericContainer ignored
++++genericContainer
++++++svgRoot name='svg'
++++++++genericContainer ignored htmlTag='g'
++++++++++genericContainer
++++++++++++staticText name='Group 1 Text 1'
++++++++++++++inlineTextBox name='Group 1 Text 1'
++++++++++genericContainer
++++++++++++staticText name='Group 1 Text 2'
++++++++++++++inlineTextBox name='Group 1 Text 2'
++++++++genericContainer ignored htmlTag='g'
++++++++++genericContainer
++++++++++++staticText name='Group 2 Text 1'
++++++++++++++inlineTextBox name='Group 2 Text 1'
--- a/content/test/data/accessibility/html/svg-g.html
+++ b/content/test/data/accessibility/html/svg-g.html
+<!--
+@BLINK-ALLOW:htmlTag='g'
+-->
+<!DOCTYPE html>
+<html>
+<body>
+
+<svg aria-label="svg">
+  <g>
+    <text x="10" y="10" fill="red">Group 1 Text 1</text>
+    <text x="10" y="100" fill="red">Group 1 Text 2</text>
+  </g>
+  <g>
+    <text x="200" y="10" fill="red">Group 2 Text 1</text>
+  </g>
+</svg>
+
+</body>
+</html>
+
--- a/third_party/blink/renderer/modules/accessibility/ax_object.cc
+++ b/third_party/blink/renderer/modules/accessibility/ax_object.cc
@@ -60,6 +60,7 @@
 #include "third_party/blink/renderer/core/page/page.h"
 #include "third_party/blink/renderer/core/page/scrolling/top_document_root_scroller_controller.h"
 #include "third_party/blink/renderer/core/svg/svg_element.h"
+#include "third_party/blink/renderer/core/svg/svg_g_element.h"
 #include "third_party/blink/renderer/core/svg/svg_style_element.h"
 #include "third_party/blink/renderer/modules/accessibility/ax_menu_list.h"
 #include "third_party/blink/renderer/modules/accessibility/ax_menu_list_option.h"
@@ -1542,6 +1543,10 @@ bool AXObject::ComputeAccessibilityIsIgnoredButIncludedInTree() const {
  if (GetLayoutObject() && AriaHiddenRoot())
    return true;

+  // Preserve SVG grouping elements.
+  if (GetNode() && IsA<SVGGElement>(GetNode()))
+    return true;
+
  return false;
 }