Change <figcaption>'s ControlType to Text and AriaRole to 'description'

Change the ControlType of <figcaption> from Group to Text per https://w3c.github.io/html-aam/#el-figcaption <figcaption> Also update the AriaRole exposed to UIA from 'group' to 'description'; the spec doesn't comment on this but it is consistent with the current behavior for other inline wrappers like <mark>. Bug: 997714 Change-Id: I26c9a55bbdc02bed0707e926be332f7ebb53b27f Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1769049 Commit-Queue: Kevin Babbitt <kbabbitt@microsoft.com> Reviewed-by: Kevin Babbitt <kbabbitt@microsoft.com> Cr-Commit-Position: refs/heads/master@{#690446}

Change <figcaption>'s ControlType to Text and AriaRole to 'description'
Change the ControlType of <figcaption> from Group to Text per https://w3c.github.io/html-aam/#el-figcaption <figcaption> Also update the AriaRole exposed to UIA from 'group' to 'description'; the spec doesn't comment on this but it is consistent with the current behavior for other inline wrappers like <mark>. Bug: 997714 Change-Id: I26c9a55bbdc02bed0707e926be332f7ebb53b27f Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1769049 Commit-Queue: Kevin Babbitt <kbabbitt@microsoft.com> Reviewed-by: Kevin Babbitt <kbabbitt@microsoft.com> Cr-Commit-Position: refs/heads/master@{#690446}
19da2cde · Daniel Clark · Commit Bot · 8f29c483 · 19da2cde · 19da2cde
Commit 19da2cde authored Aug 26, 2019 by Daniel Clark Committed by Commit Bot Aug 26, 2019
3 changed files
--- a/content/test/data/accessibility/html/figcaption-expected-uia-win.txt
+++ b/content/test/data/accessibility/html/figcaption-expected-uia-win.txt
 document
 ++group Name='Fig.1 - A green Box'
 ++++img Name='This is a green box.'
-++++group
-++++++description Name='Fig.1 - A green Box'
++++description ControlType='UIA_TextControlTypeId'
++++++description ControlType='UIA_TextControlTypeId' Name='Fig.1 - A green Box'
--- a/content/test/data/accessibility/html/figcaption.html
+++ b/content/test/data/accessibility/html/figcaption.html
+<!--
+@UIA-WIN-ALLOW:ControlType='UIA_TextControlTypeId'
+-->
 <!DOCTYPE html>
 <html>
 <body>

--- a/ui/accessibility/platform/ax_platform_node_win.cc
+++ b/ui/accessibility/platform/ax_platform_node_win.cc
@@ -5408,7 +5408,7 @@ base::string16 AXPlatformNodeWin::UIAAriaRole() {
      return L"group";

    case ax::mojom::Role::kFigcaption:
-      return L"group";
+      return L"description";

    case ax::mojom::Role::kFigure:
      return L"group";
@@ -6049,7 +6049,7 @@ LONG AXPlatformNodeWin::ComputeUIAControlType() {  // NOLINT(runtime/int)
      return UIA_GroupControlTypeId;

    case ax::mojom::Role::kFigcaption:
-      return UIA_GroupControlTypeId;
+      return UIA_TextControlTypeId;

    case ax::mojom::Role::kFigure:
      return UIA_GroupControlTypeId;