Change LocalizedControlType of <mark> to 'highlight'

Per https://w3c.github.io/html-aam/#el-mark, update the
LocalizedControlType of <mark> from "text" to "highlight".

Bug: 996459
Change-Id: I5f435988e16663df295cd195f3de6d97aab0dd70
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1762581
Commit-Queue: Dan Clark <daniec@microsoft.com>
Reviewed-by: Daniel Cheng <dcheng@chromium.org>
Reviewed-by: Aaron Leventhal <aleventhal@chromium.org>
Reviewed-by: Ken Rockot <rockot@google.com>
Reviewed-by: Kevin Babbitt <kbabbitt@microsoft.com>
Cr-Commit-Position: refs/heads/master@{#699887}

content/browser/accessibility/browser_accessibility.cc

@@ -1897,6 +1897,9 @@ base::string16 BrowserAccessibility::GetLocalizedStringForRoleDescription()
     case ax::mojom::Role::kHeaderAsNonLandmark:
       return content_client->GetLocalizedString(IDS_AX_ROLE_HEADER);
 
+    case ax::mojom::Role::kMark:
+      return content_client->GetLocalizedString(IDS_AX_ROLE_MARK);
+
     case ax::mojom::Role::kMeter:
       return content_client->GetLocalizedString(IDS_AX_ROLE_METER);
 

content/browser/accessibility/cross_platform_accessibility_browsertest.cc

@@ -720,6 +720,7 @@ IN_PROC_BROWSER_TEST_F(CrossPlatformAccessibilityBrowserTest,
       "<input type='tel'>"
       "<input type='url'>"
       "<input type='week'>"
+      "<mark></mark>"
       "<meter></meter>"
       "<output></output>"
       "<time></time>"
@@ -730,7 +731,7 @@ IN_PROC_BROWSER_TEST_F(CrossPlatformAccessibilityBrowserTest,
 
   BrowserAccessibility* root = GetManager()->GetRoot();
   ASSERT_NE(nullptr, root);
-  ASSERT_EQ(18u, root->PlatformChildCount());
+  ASSERT_EQ(19u, root->PlatformChildCount());
 
   auto TestLocalizedRoleDescription =
       [root](int child_index,
@@ -758,10 +759,11 @@ IN_PROC_BROWSER_TEST_F(CrossPlatformAccessibilityBrowserTest,
   TestLocalizedRoleDescription(11, base::ASCIIToUTF16("telephone"));
   TestLocalizedRoleDescription(12, base::ASCIIToUTF16("url"));
   TestLocalizedRoleDescription(13, base::ASCIIToUTF16("week picker"));
-  TestLocalizedRoleDescription(14, base::ASCIIToUTF16("meter"));
-  TestLocalizedRoleDescription(15, base::ASCIIToUTF16("output"));
-  TestLocalizedRoleDescription(16, base::ASCIIToUTF16("time"));
-  TestLocalizedRoleDescription(17, base::ASCIIToUTF16("content information"));
+  TestLocalizedRoleDescription(14, base::ASCIIToUTF16("highlight"));
+  TestLocalizedRoleDescription(15, base::ASCIIToUTF16("meter"));
+  TestLocalizedRoleDescription(16, base::ASCIIToUTF16("output"));
+  TestLocalizedRoleDescription(17, base::ASCIIToUTF16("time"));
+  TestLocalizedRoleDescription(18, base::ASCIIToUTF16("content information"));
 }
 
 IN_PROC_BROWSER_TEST_F(CrossPlatformAccessibilityBrowserTest,
@@ -803,17 +805,16 @@ IN_PROC_BROWSER_TEST_F(CrossPlatformAccessibilityBrowserTest,
                                              ax::mojom::Role::kStaticText);
 
   BrowserAccessibility* mark_node = para_node->PlatformGetChild(1);
-  TestGetStyleNameAttributeAsLocalizedString(
-      mark_node, ax::mojom::Role::kMark,
-      base::ASCIIToUTF16("highlighted content"));
+  TestGetStyleNameAttributeAsLocalizedString(mark_node, ax::mojom::Role::kMark,
+                                             base::ASCIIToUTF16("highlight"));
 
   // Android doesn't always have a child in this case.
   if (mark_node->PlatformChildCount() > 0u) {
     BrowserAccessibility* mark_text_node = mark_node->PlatformGetChild(0);
     ASSERT_EQ(0u, mark_text_node->PlatformChildCount());
-    TestGetStyleNameAttributeAsLocalizedString(
-        mark_text_node, ax::mojom::Role::kStaticText,
-        base::ASCIIToUTF16("highlighted content"));
+    TestGetStyleNameAttributeAsLocalizedString(mark_text_node,
+                                               ax::mojom::Role::kStaticText,
+                                               base::ASCIIToUTF16("highlight"));
   }
 }
 

content/test/data/accessibility/html/mark-expected-mac.txt

 AXWebArea AXRoleDescription='HTML content'
 ++AXGroup AXRoleDescription='group'
 ++++AXStaticText AXRoleDescription='text' AXValue='This test is to check '
-++++AXGroup AXRoleDescription='highlighted content'
+++++AXGroup AXRoleDescription='highlight'
 ++++++AXStaticText AXRoleDescription='text' AXValue='mark tag'
 ++++AXStaticText AXRoleDescription='text' AXValue='.'

content/test/data/accessibility/html/mark-expected-uia-win.txt

 document
 ++group
 ++++description Name='This test is to check '
-++++description
+++++description LocalizedControlType='highlight'
 ++++++description Name='mark tag'
 ++++description Name='.'

content/test/data/accessibility/html/mark-expected-win.txt

 ROLE_SYSTEM_DOCUMENT READONLY FOCUSABLE
 ++IA2_ROLE_PARAGRAPH
 ++++ROLE_SYSTEM_STATICTEXT name='This test is to check '
-++++IA2_ROLE_TEXT_FRAME
+++++IA2_ROLE_TEXT_FRAME localized_extended_role='highlight'
 ++++++ROLE_SYSTEM_STATICTEXT name='mark tag'
 ++++ROLE_SYSTEM_STATICTEXT name='.'

content/test/data/accessibility/html/mark.html

 <!--
 @MAC-ALLOW:AXRole*
+@UIA-WIN-ALLOW:LocalizedControlType='highlight'
+@WIN-ALLOW:localized_extended_role='highlight'
 -->
 <!DOCTYPE html>
 <html>

third_party/blink/public/strings/blink_strings.grd

@@ -477,8 +477,9 @@ below:
       <message name="IDS_AX_ROLE_MAIN_CONTENT" desc="Accessibility role description for main content of the document.">
         main
       </message>
+      <!-- https://w3c.github.io/html-aam/#el-mark -->
       <message name="IDS_AX_ROLE_MARK" desc="Accessibility role description for highlighted content.">
-        highlighted content
+        highlight
       </message>
       <message name="IDS_AX_ROLE_MATH" desc="Accessibility role description for math">
         math

ui/accessibility/platform/test_ax_node_wrapper.cc

@@ -638,6 +638,9 @@ base::string16 TestAXNodeWrapper::GetLocalizedStringForRoleDescription() const {
     case ax::mojom::Role::kHeaderAsNonLandmark:
       return base::ASCIIToUTF16("header");
 
+    case ax::mojom::Role::kMark:
+      return base::ASCIIToUTF16("highlight");
+
     case ax::mojom::Role::kMeter:
       return base::ASCIIToUTF16("meter");