Reland "CDP: make a11y info optional"

This is a reland of aa42f61e

Original change's description:
> CDP: make a11y info optional
>
> This CL adds an attribute to the highlight config object to control
> whether a11y info should be shown. The test expectations have been
> updated accordingly. There is an accompanying CL in DevTools which makes
> use of the new attribute[1].
>
> [1] https://crrev.com/c/2238230
>
> Bug: 1092841
> Change-Id: Ic4a888ecf134b852fd67430b924da3812f244dac
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2238828
> Commit-Queue: Alex Rudenko <alexrudenko@chromium.org>
> Reviewed-by: Peter Marshall <petermarshall@chromium.org>
> Reviewed-by: Andrey Kosyakov <caseq@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#778791}

Bug: 1092841
TBR: caseq@chromium.org
Change-Id: I9b14d446efe6355af0e8a8f43dcf1f866783a216
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2248680Reviewed-by: Mathias Bynens <mathias@chromium.org>
Reviewed-by: Peter Marshall <petermarshall@chromium.org>
Commit-Queue: Alex Rudenko <alexrudenko@chromium.org>
Cr-Commit-Position: refs/heads/master@{#779322}

third_party/blink/public/devtools_protocol/browser_protocol.pdl

@@ -5220,6 +5220,8 @@ experimental domain Overlay
       optional boolean showStyles
       # Whether the rulers should be shown (default: false).
       optional boolean showRulers
+      # Whether the a11y info should be shown (default: true).
+      optional boolean showAccessibilityInfo
       # Whether the extension lines from node to the rulers should be shown (default: false).
       optional boolean showExtensionLines
       # The content box highlight fill color (default: transparent).
@@ -5282,8 +5284,10 @@ experimental domain Overlay
       optional boolean includeDistance
       # Whether to include style info.
       optional boolean includeStyle
-      # The color format to get config with (default: hex)
+      # The color format to get config with (default: hex).
       optional ColorFormat colorFormat
+      # Whether to show accessibility info (default: true).
+      optional boolean showAccessibilityInfo
     returns
       # Highlight data for the node.
       object highlight

third_party/blink/renderer/core/inspector/inspector_highlight.cc

@@ -331,11 +331,11 @@ std::unique_ptr<protocol::DictionaryValue> BuildElementInfo(Element* element) {
   element_info->setString("nodeWidth", String::Number(bounding_box->width()));
   element_info->setString("nodeHeight", String::Number(bounding_box->height()));
 
-  element_info->setBoolean("showAccessibilityInfo", true);
   element_info->setBoolean("isKeyboardFocusable",
                            element->IsKeyboardFocusable());
   element_info->setString("accessibleName", element->computedName());
   element_info->setString("accessibleRole", element->computedRole());
+
   return element_info;
 }
 
@@ -653,12 +653,14 @@ InspectorHighlightConfig::InspectorHighlightConfig()
       show_styles(false),
       show_rulers(false),
       show_extension_lines(false),
+      show_accessibility_info(true),
       color_format(ColorFormat::HEX) {}
 
 InspectorHighlight::InspectorHighlight(float scale)
     : highlight_paths_(protocol::ListValue::create()),
       show_rulers_(false),
       show_extension_lines_(false),
+      show_accessibility_info_(true),
       scale_(scale),
       color_format_(ColorFormat::HEX) {}
 
@@ -679,6 +681,7 @@ InspectorHighlight::InspectorHighlight(
     : highlight_paths_(protocol::ListValue::create()),
       show_rulers_(highlight_config.show_rulers),
       show_extension_lines_(highlight_config.show_extension_lines),
+      show_accessibility_info_(highlight_config.show_accessibility_info),
       scale_(1.f),
       color_format_(highlight_config.color_format) {
   DCHECK(!DisplayLockUtilities::NearestLockedExclusiveAncestor(*node));
@@ -700,6 +703,10 @@ InspectorHighlight::InspectorHighlight(
 
   if (element_info_ && is_locked_ancestor)
     element_info_->setString("isLockedAncestor", "true");
+  if (element_info_) {
+    element_info_->setBoolean("showAccessibilityInfo",
+                              show_accessibility_info_);
+  }
   if (append_distance_info)
     AppendDistanceInfo(node);
 }
@@ -902,6 +909,7 @@ std::unique_ptr<protocol::DictionaryValue> InspectorHighlight::AsProtocolValue()
   object->setValue("paths", highlight_paths_->clone());
   object->setBoolean("showRulers", show_rulers_);
   object->setBoolean("showExtensionLines", show_extension_lines_);
+  object->setBoolean("showAccessibilityInfo", show_accessibility_info_);
   switch (color_format_) {
     case ColorFormat::RGB:
       object->setString("colorFormat", "rgb");

third_party/blink/renderer/core/inspector/inspector_highlight.h

@@ -58,6 +58,7 @@ struct CORE_EXPORT InspectorHighlightConfig {
   bool show_styles;
   bool show_rulers;
   bool show_extension_lines;
+  bool show_accessibility_info;
 
   String selector_list;
   ColorFormat color_format;
@@ -130,6 +131,7 @@ class CORE_EXPORT InspectorHighlight {
   std::unique_ptr<protocol::ListValue> grid_info_;
   bool show_rulers_;
   bool show_extension_lines_;
+  bool show_accessibility_info_;
   float scale_;
   ColorFormat color_format_;
 };

third_party/blink/renderer/core/inspector/inspector_overlay_agent.cc

@@ -729,6 +729,7 @@ Response InspectorOverlayAgent::getHighlightObjectForTest(
     Maybe<bool> include_distance,
     Maybe<bool> include_style,
     Maybe<String> colorFormat,
+    Maybe<bool> show_accessibility_info,
     std::unique_ptr<protocol::DictionaryValue>* result) {
   Node* node = nullptr;
   Response response = dom_agent_->AssertNode(node_id, node);
@@ -738,6 +739,7 @@ Response InspectorOverlayAgent::getHighlightObjectForTest(
   auto config = std::make_unique<InspectorHighlightConfig>(
       InspectorHighlight::DefaultConfig());
   config->show_styles = include_style.fromMaybe(false);
+  config->show_accessibility_info = show_accessibility_info.fromMaybe(true);
   String format = colorFormat.fromMaybe("hex");
   namespace ColorFormatEnum = protocol::Overlay::ColorFormatEnum;
   if (format == ColorFormatEnum::Hsl) {
@@ -1349,6 +1351,8 @@ InspectorOverlayAgent::ToHighlightConfig(
   std::unique_ptr<InspectorHighlightConfig> highlight_config =
       std::make_unique<InspectorHighlightConfig>();
   highlight_config->show_info = config->getShowInfo(false);
+  highlight_config->show_accessibility_info =
+      config->getShowAccessibilityInfo(true);
   highlight_config->show_styles = config->getShowStyles(false);
   highlight_config->show_rulers = config->getShowRulers(false);
   highlight_config->show_extension_lines = config->getShowExtensionLines(false);

third_party/blink/renderer/core/inspector/inspector_overlay_agent.h

@@ -184,6 +184,7 @@ class CORE_EXPORT InspectorOverlayAgent final
       protocol::Maybe<bool> include_distance,
       protocol::Maybe<bool> include_style,
       protocol::Maybe<String> color_format,
+      protocol::Maybe<bool> show_accessibility_info,
       std::unique_ptr<protocol::DictionaryValue>* highlight) override;
   protocol::Response setShowHinge(
       protocol::Maybe<protocol::Overlay::HingeConfig> hinge_config) override;

third_party/blink/web_tests/http/tests/devtools/elements/highlight/highlight-css-grid-expected.txt

@@ -82,6 +82,7 @@ paddedGrid{
   ],
   "showRulers": true,
   "showExtensionLines": true,
+  "showAccessibilityInfo": true,
   "colorFormat": "hex",
   "elementInfo": {
     "tagName": "div",
@@ -89,10 +90,10 @@ paddedGrid{
     "className": ".grid.padded.fixed",
     "nodeWidth": "175",
     "nodeHeight": "1130",
-    "showAccessibilityInfo": true,
     "isKeyboardFocusable": false,
     "accessibleName": "",
-    "accessibleRole": "generic"
+    "accessibleRole": "generic",
+    "showAccessibilityInfo": true
   },
   "gridInfo": [
     {
@@ -310,6 +311,7 @@ nestedGrid{
   ],
   "showRulers": true,
   "showExtensionLines": true,
+  "showAccessibilityInfo": true,
   "colorFormat": "hex",
   "elementInfo": {
     "tagName": "div",
@@ -317,10 +319,10 @@ nestedGrid{
     "className": ".grid",
     "nodeWidth": "100",
     "nodeHeight": "1000",
-    "showAccessibilityInfo": true,
     "isKeyboardFocusable": false,
     "accessibleName": "",
-    "accessibleRole": "generic"
+    "accessibleRole": "generic",
+    "showAccessibilityInfo": true
   },
   "gridInfo": [
     {

third_party/blink/web_tests/http/tests/devtools/elements/highlight/highlight-css-grid-huge-expected.txt

@@ -82,16 +82,17 @@ big-grid{
   ],
   "showRulers": true,
   "showExtensionLines": true,
+  "showAccessibilityInfo": true,
   "colorFormat": "hex",
   "elementInfo": {
     "tagName": "div",
     "idValue": "big-grid",
     "nodeWidth": "769",
     "nodeHeight": "995",
-    "showAccessibilityInfo": true,
     "isKeyboardFocusable": false,
     "accessibleName": "",
-    "accessibleRole": "generic"
+    "accessibleRole": "generic",
+    "showAccessibilityInfo": true
   },
   "gridInfo": [
     {

third_party/blink/web_tests/http/tests/devtools/elements/highlight/highlight-css-shapes-outside-expected.txt

@@ -180,6 +180,7 @@ circle{
   ],
   "showRulers": true,
   "showExtensionLines": true,
+  "showAccessibilityInfo": true,
   "colorFormat": "hex",
   "elementInfo": {
     "tagName": "div",
@@ -187,10 +188,10 @@ circle{
     "className": ".float.circle",
     "nodeWidth": "128",
     "nodeHeight": "128",
-    "showAccessibilityInfo": true,
     "isKeyboardFocusable": false,
     "accessibleName": "",
-    "accessibleRole": "generic"
+    "accessibleRole": "generic",
+    "showAccessibilityInfo": true
   }
 }
 insetSimpleRound{
@@ -373,6 +374,7 @@ insetSimpleRound{
   ],
   "showRulers": true,
   "showExtensionLines": true,
+  "showAccessibilityInfo": true,
   "colorFormat": "hex",
   "elementInfo": {
     "tagName": "div",
@@ -380,10 +382,10 @@ insetSimpleRound{
     "className": ".float.insetSimpleRound",
     "nodeWidth": "128",
     "nodeHeight": "128",
-    "showAccessibilityInfo": true,
     "isKeyboardFocusable": false,
     "accessibleName": "",
-    "accessibleRole": "generic"
+    "accessibleRole": "generic",
+    "showAccessibilityInfo": true
   }
 }
 insetComplexRound{
@@ -590,6 +592,7 @@ insetComplexRound{
   ],
   "showRulers": true,
   "showExtensionLines": true,
+  "showAccessibilityInfo": true,
   "colorFormat": "hex",
   "elementInfo": {
     "tagName": "div",
@@ -597,10 +600,10 @@ insetComplexRound{
     "className": ".float.insetComplexRound",
     "nodeWidth": "128",
     "nodeHeight": "128",
-    "showAccessibilityInfo": true,
     "isKeyboardFocusable": false,
     "accessibleName": "",
-    "accessibleRole": "generic"
+    "accessibleRole": "generic",
+    "showAccessibilityInfo": true
   }
 }
 ellipse{
@@ -783,6 +786,7 @@ ellipse{
   ],
   "showRulers": true,
   "showExtensionLines": true,
+  "showAccessibilityInfo": true,
   "colorFormat": "hex",
   "elementInfo": {
     "tagName": "div",
@@ -790,10 +794,10 @@ ellipse{
     "className": ".float.ellipse",
     "nodeWidth": "128",
     "nodeHeight": "80",
-    "showAccessibilityInfo": true,
     "isKeyboardFocusable": false,
     "accessibleName": "",
-    "accessibleRole": "generic"
+    "accessibleRole": "generic",
+    "showAccessibilityInfo": true
   }
 }
 contentBox{
@@ -1000,6 +1004,7 @@ contentBox{
   ],
   "showRulers": true,
   "showExtensionLines": true,
+  "showAccessibilityInfo": true,
   "colorFormat": "hex",
   "elementInfo": {
     "tagName": "div",
@@ -1007,10 +1012,10 @@ contentBox{
     "className": ".float.contentBox",
     "nodeWidth": "176",
     "nodeHeight": "160",
-    "showAccessibilityInfo": true,
     "isKeyboardFocusable": false,
     "accessibleName": "",
-    "accessibleRole": "generic"
+    "accessibleRole": "generic",
+    "showAccessibilityInfo": true
   }
 }
 polygon{
@@ -1110,6 +1115,7 @@ polygon{
   ],
   "showRulers": true,
   "showExtensionLines": true,
+  "showAccessibilityInfo": true,
   "colorFormat": "hex",
   "elementInfo": {
     "tagName": "div",
@@ -1117,10 +1123,10 @@ polygon{
     "className": ".float.polygon",
     "nodeWidth": "128",
     "nodeHeight": "128",
-    "showAccessibilityInfo": true,
     "isKeyboardFocusable": false,
     "accessibleName": "",
-    "accessibleRole": "generic"
+    "accessibleRole": "generic",
+    "showAccessibilityInfo": true
   }
 }
 raster{
@@ -1553,6 +1559,7 @@ raster{
   ],
   "showRulers": true,
   "showExtensionLines": true,
+  "showAccessibilityInfo": true,
   "colorFormat": "hex",
   "elementInfo": {
     "tagName": "div",
@@ -1560,10 +1567,10 @@ raster{
     "className": ".float.raster",
     "nodeWidth": "128",
     "nodeHeight": "128",
-    "showAccessibilityInfo": true,
     "isKeyboardFocusable": false,
     "accessibleName": "",
-    "accessibleRole": "generic"
+    "accessibleRole": "generic",
+    "showAccessibilityInfo": true
   }
 }
 

third_party/blink/web_tests/http/tests/devtools/elements/highlight/highlight-css-shapes-outside-scroll-expected.txt

@@ -180,6 +180,7 @@ circle{
   ],
   "showRulers": true,
   "showExtensionLines": true,
+  "showAccessibilityInfo": true,
   "colorFormat": "hex",
   "elementInfo": {
     "tagName": "div",
@@ -187,10 +188,10 @@ circle{
     "className": ".float.circle",
     "nodeWidth": "128",
     "nodeHeight": "128",
-    "showAccessibilityInfo": true,
     "isKeyboardFocusable": false,
     "accessibleName": "",
-    "accessibleRole": "generic"
+    "accessibleRole": "generic",
+    "showAccessibilityInfo": true
   }
 }
 circle{
@@ -373,6 +374,7 @@ circle{
   ],
   "showRulers": true,
   "showExtensionLines": true,
+  "showAccessibilityInfo": true,
   "colorFormat": "hex",
   "elementInfo": {
     "tagName": "div",
@@ -380,10 +382,10 @@ circle{
     "className": ".float.circle",
     "nodeWidth": "128",
     "nodeHeight": "128",
-    "showAccessibilityInfo": true,
     "isKeyboardFocusable": false,
     "accessibleName": "",
-    "accessibleRole": "generic"
+    "accessibleRole": "generic",
+    "showAccessibilityInfo": true
   }
 }
 

third_party/blink/web_tests/http/tests/devtools/elements/highlight/highlight-display-locked-expected.txt

@@ -82,16 +82,17 @@ container{
   ],
   "showRulers": true,
   "showExtensionLines": true,
+  "showAccessibilityInfo": true,
   "colorFormat": "hex",
   "elementInfo": {
     "tagName": "div",
     "idValue": "container",
     "nodeWidth": "784",
     "nodeHeight": "10",
-    "showAccessibilityInfo": true,
     "isKeyboardFocusable": false,
     "accessibleName": "",
-    "accessibleRole": "generic"
+    "accessibleRole": "generic",
+    "showAccessibilityInfo": true
   }
 }
 child{
@@ -176,17 +177,18 @@ child{
   ],
   "showRulers": true,
   "showExtensionLines": true,
+  "showAccessibilityInfo": true,
   "colorFormat": "hex",
   "elementInfo": {
     "tagName": "div",
     "idValue": "container",
     "nodeWidth": "784",
     "nodeHeight": "10",
-    "showAccessibilityInfo": true,
     "isKeyboardFocusable": false,
     "accessibleName": "",
     "accessibleRole": "generic",
-    "isLockedAncestor": "true"
+    "isLockedAncestor": "true",
+    "showAccessibilityInfo": true
   }
 }
 

third_party/blink/web_tests/http/tests/devtools/elements/highlight/highlight-node-scaled-and-scrolled-expected.txt

@@ -82,16 +82,17 @@ div{
   ],
   "showRulers": true,
   "showExtensionLines": true,
+  "showAccessibilityInfo": true,
   "colorFormat": "hex",
   "elementInfo": {
     "tagName": "div",
     "idValue": "div",
     "nodeWidth": "69",
     "nodeHeight": "80",
-    "showAccessibilityInfo": true,
     "isKeyboardFocusable": false,
     "accessibleName": "",
-    "accessibleRole": "generic"
+    "accessibleRole": "generic",
+    "showAccessibilityInfo": true
   }
 }
 

third_party/blink/web_tests/http/tests/devtools/elements/highlight/highlight-node-scaled-expected.txt

@@ -82,16 +82,17 @@ div{
   ],
   "showRulers": true,
   "showExtensionLines": true,
+  "showAccessibilityInfo": true,
   "colorFormat": "hex",
   "elementInfo": {
     "tagName": "div",
     "idValue": "div",
     "nodeWidth": "69",
     "nodeHeight": "80",
-    "showAccessibilityInfo": true,
     "isKeyboardFocusable": false,
     "accessibleName": "",
-    "accessibleRole": "generic"
+    "accessibleRole": "generic",
+    "showAccessibilityInfo": true
   }
 }
 

third_party/blink/web_tests/http/tests/devtools/elements/highlight/highlight-node-scroll-expected.txt

@@ -82,6 +82,7 @@ inspectedElement1{
   ],
   "showRulers": true,
   "showExtensionLines": true,
+  "showAccessibilityInfo": true,
   "colorFormat": "hex",
   "elementInfo": {
     "tagName": "div",
@@ -89,10 +90,10 @@ inspectedElement1{
     "className": ".inspected",
     "nodeWidth": "250",
     "nodeHeight": "250",
-    "showAccessibilityInfo": true,
     "isKeyboardFocusable": false,
     "accessibleName": "",
-    "accessibleRole": "generic"
+    "accessibleRole": "generic",
+    "showAccessibilityInfo": true
   }
 }
 inspectedElement2{
@@ -177,6 +178,7 @@ inspectedElement2{
   ],
   "showRulers": true,
   "showExtensionLines": true,
+  "showAccessibilityInfo": true,
   "colorFormat": "hex",
   "elementInfo": {
     "tagName": "div",
@@ -184,10 +186,10 @@ inspectedElement2{
     "className": ".inspected",
     "nodeWidth": "250",
     "nodeHeight": "250",
-    "showAccessibilityInfo": true,
     "isKeyboardFocusable": false,
     "accessibleName": "",
-    "accessibleRole": "generic"
+    "accessibleRole": "generic",
+    "showAccessibilityInfo": true
   }
 }
 

third_party/blink/web_tests/http/tests/devtools/elements/highlight/highlight-node-transformed-expected.txt

@@ -82,16 +82,17 @@ div{
   ],
   "showRulers": true,
   "showExtensionLines": true,
+  "showAccessibilityInfo": true,
   "colorFormat": "hex",
   "elementInfo": {
     "tagName": "div",
     "idValue": "div",
     "nodeWidth": "100",
     "nodeHeight": "80",
-    "showAccessibilityInfo": true,
     "isKeyboardFocusable": false,
     "accessibleName": "",
-    "accessibleRole": "generic"
+    "accessibleRole": "generic",
+    "showAccessibilityInfo": true
   }
 }
 

third_party/blink/web_tests/http/tests/devtools/elements/highlight/highlight-node-vertical-rl-expected.txt

@@ -82,16 +82,17 @@ container{
   ],
   "showRulers": true,
   "showExtensionLines": true,
+  "showAccessibilityInfo": true,
   "colorFormat": "hex",
   "elementInfo": {
     "tagName": "div",
     "idValue": "container",
     "nodeWidth": "300",
     "nodeHeight": "300",
-    "showAccessibilityInfo": true,
     "isKeyboardFocusable": false,
     "accessibleName": "",
-    "accessibleRole": "generic"
+    "accessibleRole": "generic",
+    "showAccessibilityInfo": true
   }
 }
 child{
@@ -176,16 +177,17 @@ child{
   ],
   "showRulers": true,
   "showExtensionLines": true,
+  "showAccessibilityInfo": true,
   "colorFormat": "hex",
   "elementInfo": {
     "tagName": "div",
     "idValue": "child",
     "nodeWidth": "240",
     "nodeHeight": "220",
-    "showAccessibilityInfo": true,
     "isKeyboardFocusable": false,
     "accessibleName": "",
-    "accessibleRole": "generic"
+    "accessibleRole": "generic",
+    "showAccessibilityInfo": true
   }
 }
 span{
@@ -270,16 +272,17 @@ span{
   ],
   "showRulers": true,
   "showExtensionLines": true,
+  "showAccessibilityInfo": true,
   "colorFormat": "hex",
   "elementInfo": {
     "tagName": "span",
     "idValue": "span",
     "nodeWidth": "10",
     "nodeHeight": "70",
-    "showAccessibilityInfo": true,
     "isKeyboardFocusable": false,
     "accessibleName": "",
-    "accessibleRole": "generic"
+    "accessibleRole": "generic",
+    "showAccessibilityInfo": true
   }
 }
 TEXT{
@@ -364,12 +367,13 @@ TEXT{
   ],
   "showRulers": true,
   "showExtensionLines": true,
+  "showAccessibilityInfo": true,
   "colorFormat": "hex",
   "elementInfo": {
     "nodeWidth": "10",
     "nodeHeight": "70",
     "tagName": "#text",
-    "showAccessibilityInfo": false
+    "showAccessibilityInfo": true
   }
 }
 

third_party/blink/web_tests/http/tests/devtools/elements/highlight/highlight-svg-content-inside-iframe-expected.txt

@@ -24,16 +24,17 @@ svg-rect{
   ],
   "showRulers": true,
   "showExtensionLines": true,
+  "showAccessibilityInfo": true,
   "colorFormat": "hex",
   "elementInfo": {
     "tagName": "rect",
     "idValue": "svg-rect",
     "nodeWidth": "60",
     "nodeHeight": "80",
-    "showAccessibilityInfo": true,
     "isKeyboardFocusable": false,
     "accessibleName": "",
-    "accessibleRole": "generic"
+    "accessibleRole": "generic",
+    "showAccessibilityInfo": true
   }
 }
 

third_party/blink/web_tests/http/tests/devtools/elements/highlight/highlight-svg-root-expected.txt

@@ -82,16 +82,17 @@ svg-root{
   ],
   "showRulers": true,
   "showExtensionLines": true,
+  "showAccessibilityInfo": true,
   "colorFormat": "hex",
   "elementInfo": {
     "tagName": "svg",
     "idValue": "svg-root",
     "nodeWidth": "150",
     "nodeHeight": "150",
-    "showAccessibilityInfo": true,
     "isKeyboardFocusable": false,
     "accessibleName": "",
-    "accessibleRole": ""
+    "accessibleRole": "",
+    "showAccessibilityInfo": true
   }
 }
 

third_party/blink/web_tests/http/tests/devtools/elements/highlight/highlight-svg-root-zoomed-expected.txt

@@ -82,16 +82,17 @@ svg-root{
   ],
   "showRulers": true,
   "showExtensionLines": true,
+  "showAccessibilityInfo": true,
   "colorFormat": "hex",
   "elementInfo": {
     "tagName": "svg",
     "idValue": "svg-root",
     "nodeWidth": "280",
     "nodeHeight": "380",
-    "showAccessibilityInfo": true,
     "isKeyboardFocusable": false,
     "accessibleName": "",
-    "accessibleRole": ""
+    "accessibleRole": "",
+    "showAccessibilityInfo": true
   }
 }
 

third_party/blink/web_tests/platform/linux/http/tests/devtools/elements/highlight/highlight-node-a11y-expected.txt

@@ -82,16 +82,17 @@ button{
   ],
   "showRulers": true,
   "showExtensionLines": true,
+  "showAccessibilityInfo": true,
   "colorFormat": "hex",
   "elementInfo": {
     "tagName": "button",
     "idValue": "button",
     "nodeWidth": "43",
     "nodeHeight": "22",
-    "showAccessibilityInfo": true,
     "isKeyboardFocusable": true,
     "accessibleName": "click",
-    "accessibleRole": "button"
+    "accessibleRole": "button",
+    "showAccessibilityInfo": true
   }
 }
 input{
@@ -176,16 +177,17 @@ input{
   ],
   "showRulers": true,
   "showExtensionLines": true,
+  "showAccessibilityInfo": true,
   "colorFormat": "hex",
   "elementInfo": {
     "tagName": "input",
     "idValue": "input",
     "nodeWidth": "185",
     "nodeHeight": "22",
-    "showAccessibilityInfo": true,
     "isKeyboardFocusable": true,
     "accessibleName": "",
-    "accessibleRole": "textbox"
+    "accessibleRole": "textbox",
+    "showAccessibilityInfo": true
   }
 }
 div{
@@ -270,16 +272,17 @@ div{
   ],
   "showRulers": true,
   "showExtensionLines": true,
+  "showAccessibilityInfo": true,
   "colorFormat": "hex",
   "elementInfo": {
     "tagName": "div",
     "idValue": "div",
     "nodeWidth": "784",
     "nodeHeight": "20",
-    "showAccessibilityInfo": true,
     "isKeyboardFocusable": true,
     "accessibleName": "click",
-    "accessibleRole": "button"
+    "accessibleRole": "button",
+    "showAccessibilityInfo": true
   }
 }
 

third_party/blink/web_tests/platform/mac/http/tests/devtools/elements/highlight/highlight-node-a11y-expected.txt

@@ -82,16 +82,17 @@ button{
   ],
   "showRulers": true,
   "showExtensionLines": true,
+  "showAccessibilityInfo": true,
   "colorFormat": "hex",
   "elementInfo": {
     "tagName": "button",
     "idValue": "button",
     "nodeWidth": "41.9219",
     "nodeHeight": "21",
-    "showAccessibilityInfo": true,
     "isKeyboardFocusable": true,
     "accessibleName": "click",
-    "accessibleRole": "button"
+    "accessibleRole": "button",
+    "showAccessibilityInfo": true
   }
 }
 input{
@@ -176,16 +177,17 @@ input{
   ],
   "showRulers": true,
   "showExtensionLines": true,
+  "showAccessibilityInfo": true,
   "colorFormat": "hex",
   "elementInfo": {
     "tagName": "input",
     "idValue": "input",
     "nodeWidth": "153",
     "nodeHeight": "21",
-    "showAccessibilityInfo": true,
     "isKeyboardFocusable": true,
     "accessibleName": "",
-    "accessibleRole": "textbox"
+    "accessibleRole": "textbox",
+    "showAccessibilityInfo": true
   }
 }
 div{
@@ -270,16 +272,17 @@ div{
   ],
   "showRulers": true,
   "showExtensionLines": true,
+  "showAccessibilityInfo": true,
   "colorFormat": "hex",
   "elementInfo": {
     "tagName": "div",
     "idValue": "div",
     "nodeWidth": "784",
     "nodeHeight": "18",
-    "showAccessibilityInfo": true,
     "isKeyboardFocusable": true,
     "accessibleName": "click",
-    "accessibleRole": "button"
+    "accessibleRole": "button",
+    "showAccessibilityInfo": true
   }
 }
 

third_party/blink/web_tests/platform/mac/http/tests/devtools/elements/highlight/highlight-node-expected.txt

@@ -82,16 +82,17 @@ inspectedElement{
   ],
   "showRulers": true,
   "showExtensionLines": true,
+  "showAccessibilityInfo": true,
   "colorFormat": "hex",
   "elementInfo": {
     "tagName": "div",
     "idValue": "inspectedElement",
     "nodeWidth": "250",
     "nodeHeight": "250",
-    "showAccessibilityInfo": true,
     "isKeyboardFocusable": false,
     "accessibleName": "",
-    "accessibleRole": "generic"
+    "accessibleRole": "generic",
+    "showAccessibilityInfo": true
   }
 }
 inspectedElement with RGB format{
@@ -176,16 +177,17 @@ inspectedElement with RGB format{
   ],
   "showRulers": true,
   "showExtensionLines": true,
+  "showAccessibilityInfo": true,
   "colorFormat": "rgb",
   "elementInfo": {
     "tagName": "div",
     "idValue": "inspectedElement",
     "nodeWidth": "250",
     "nodeHeight": "250",
-    "showAccessibilityInfo": true,
     "isKeyboardFocusable": false,
     "accessibleName": "",
-    "accessibleRole": "generic"
+    "accessibleRole": "generic",
+    "showAccessibilityInfo": true
   }
 }
 inspectedElement with HSL format{
@@ -270,16 +272,17 @@ inspectedElement with HSL format{
   ],
   "showRulers": true,
   "showExtensionLines": true,
+  "showAccessibilityInfo": true,
   "colorFormat": "hsl",
   "elementInfo": {
     "tagName": "div",
     "idValue": "inspectedElement",
     "nodeWidth": "250",
     "nodeHeight": "250",
-    "showAccessibilityInfo": true,
     "isKeyboardFocusable": false,
     "accessibleName": "",
-    "accessibleRole": "generic"
+    "accessibleRole": "generic",
+    "showAccessibilityInfo": true
   }
 }
 
@@ -365,12 +368,13 @@ First text node{
   ],
   "showRulers": true,
   "showExtensionLines": true,
+  "showAccessibilityInfo": true,
   "colorFormat": "hex",
   "elementInfo": {
     "nodeWidth": "Width within 3px from 28? true",
     "nodeHeight": "Height within 3px from 25? false",
     "tagName": "#text",
-    "showAccessibilityInfo": false
+    "showAccessibilityInfo": true
   }
 }
 
@@ -456,12 +460,13 @@ Second text node{
   ],
   "showRulers": true,
   "showExtensionLines": true,
+  "showAccessibilityInfo": true,
   "colorFormat": "hex",
   "elementInfo": {
     "nodeWidth": "Width within 3px from 30? true",
     "nodeHeight": "Height within 3px from 24? true",
     "tagName": "#text",
-    "showAccessibilityInfo": false
+    "showAccessibilityInfo": true
   }
 }
 

third_party/blink/web_tests/platform/win/http/tests/devtools/elements/highlight/highlight-node-a11y-expected.txt

@@ -82,16 +82,17 @@ button{
   ],
   "showRulers": true,
   "showExtensionLines": true,
+  "showAccessibilityInfo": true,
   "colorFormat": "hex",
   "elementInfo": {
     "tagName": "button",
     "idValue": "button",
     "nodeWidth": "43",
     "nodeHeight": "22",
-    "showAccessibilityInfo": true,
     "isKeyboardFocusable": true,
     "accessibleName": "click",
-    "accessibleRole": "button"
+    "accessibleRole": "button",
+    "showAccessibilityInfo": true
   }
 }
 input{
@@ -176,16 +177,17 @@ input{
   ],
   "showRulers": true,
   "showExtensionLines": true,
+  "showAccessibilityInfo": true,
   "colorFormat": "hex",
   "elementInfo": {
     "tagName": "input",
     "idValue": "input",
     "nodeWidth": "177",
     "nodeHeight": "22",
-    "showAccessibilityInfo": true,
     "isKeyboardFocusable": true,
     "accessibleName": "",
-    "accessibleRole": "textbox"
+    "accessibleRole": "textbox",
+    "showAccessibilityInfo": true
   }
 }
 div{
@@ -270,16 +272,17 @@ div{
   ],
   "showRulers": true,
   "showExtensionLines": true,
+  "showAccessibilityInfo": true,
   "colorFormat": "hex",
   "elementInfo": {
     "tagName": "div",
     "idValue": "div",
     "nodeWidth": "784",
     "nodeHeight": "20",
-    "showAccessibilityInfo": true,
     "isKeyboardFocusable": true,
     "accessibleName": "click",
-    "accessibleRole": "button"
+    "accessibleRole": "button",
+    "showAccessibilityInfo": true
   }
 }
 

third_party/blink/web_tests/platform/win/http/tests/devtools/elements/highlight/highlight-node-expected.txt

@@ -82,16 +82,17 @@ inspectedElement{
   ],
   "showRulers": true,
   "showExtensionLines": true,
+  "showAccessibilityInfo": true,
   "colorFormat": "hex",
   "elementInfo": {
     "tagName": "div",
     "idValue": "inspectedElement",
     "nodeWidth": "250",
     "nodeHeight": "250",
-    "showAccessibilityInfo": true,
     "isKeyboardFocusable": false,
     "accessibleName": "",
-    "accessibleRole": "generic"
+    "accessibleRole": "generic",
+    "showAccessibilityInfo": true
   }
 }
 inspectedElement with RGB format{
@@ -176,16 +177,17 @@ inspectedElement with RGB format{
   ],
   "showRulers": true,
   "showExtensionLines": true,
+  "showAccessibilityInfo": true,
   "colorFormat": "rgb",
   "elementInfo": {
     "tagName": "div",
     "idValue": "inspectedElement",
     "nodeWidth": "250",
     "nodeHeight": "250",
-    "showAccessibilityInfo": true,
     "isKeyboardFocusable": false,
     "accessibleName": "",
-    "accessibleRole": "generic"
+    "accessibleRole": "generic",
+    "showAccessibilityInfo": true
   }
 }
 inspectedElement with HSL format{
@@ -270,16 +272,17 @@ inspectedElement with HSL format{
   ],
   "showRulers": true,
   "showExtensionLines": true,
+  "showAccessibilityInfo": true,
   "colorFormat": "hsl",
   "elementInfo": {
     "tagName": "div",
     "idValue": "inspectedElement",
     "nodeWidth": "250",
     "nodeHeight": "250",
-    "showAccessibilityInfo": true,
     "isKeyboardFocusable": false,
     "accessibleName": "",
-    "accessibleRole": "generic"
+    "accessibleRole": "generic",
+    "showAccessibilityInfo": true
   }
 }
 
@@ -365,12 +368,13 @@ First text node{
   ],
   "showRulers": true,
   "showExtensionLines": true,
+  "showAccessibilityInfo": true,
   "colorFormat": "hex",
   "elementInfo": {
     "nodeWidth": "Width within 3px from 28? true",
     "nodeHeight": "Height within 3px from 25? true",
     "tagName": "#text",
-    "showAccessibilityInfo": false
+    "showAccessibilityInfo": true
   }
 }
 
@@ -456,12 +460,13 @@ Second text node{
   ],
   "showRulers": true,
   "showExtensionLines": true,
+  "showAccessibilityInfo": true,
   "colorFormat": "hex",
   "elementInfo": {
     "nodeWidth": "Width within 3px from 30? true",
     "nodeHeight": "Height within 3px from 24? true",
     "tagName": "#text",
-    "showAccessibilityInfo": false
+    "showAccessibilityInfo": true
   }
 }