a11y inspect reorg: get rid of size attribute on mac

NSAccessibility AXSize attribute is identical to dumpacctree size
attribute, thus get rid of size attribute.

Bug: 1133330
Change-Id: Ib5f16c3335f3c126369bee9e27253fbdf41cee2d
AX-Relnotes: n/a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2595604Reviewed-by: Dominic Mazzoni <dmazzoni@chromium.org>
Commit-Queue: Alexander Surkov <asurkov@igalia.com>
Cr-Commit-Position: refs/heads/master@{#838702}

content/browser/accessibility/accessibility_tree_formatter_mac.h

@@ -54,7 +54,6 @@ class CONTENT_EXPORT AccessibilityTreeFormatterMac
       const ui::AXPropertyNode& property_node,
       const a11y::LineIndexer* line_indexer) const;
 
-  base::Value PopulateSize(const BrowserAccessibilityCocoa*) const;
   base::Value PopulatePosition(const BrowserAccessibilityCocoa*) const;
   base::Value PopulatePoint(NSPoint) const;
   base::Value PopulateSize(NSSize) const;

content/browser/accessibility/accessibility_tree_formatter_mac.mm

@@ -45,9 +45,6 @@ namespace {
 const char kPositionDictAttr[] = "position";
 const char kXCoordDictAttr[] = "x";
 const char kYCoordDictAttr[] = "y";
-const char kSizeDictAttr[] = "size";
-const char kWidthDictAttr[] = "width";
-const char kHeightDictAttr[] = "height";
 const char kRangeLocDictAttr[] = "loc";
 const char kRangeLenDictAttr[] = "len";
 
@@ -171,9 +168,8 @@ void AccessibilityTreeFormatterMac::AddProperties(
     dict->SetKey("id",
                  base::Value(base::NumberToString16(owner_node->GetId())));
 
-    // Position and size
+    // Position (no size since it's exposed as standard AXSize attribute)
     dict->SetPath(kPositionDictAttr, PopulatePosition(cocoa_node));
-    dict->SetPath(kSizeDictAttr, PopulateSize(cocoa_node));
   }
 
   // Dump all attributes if match-all filter is specified.
@@ -206,15 +202,6 @@ void AccessibilityTreeFormatterMac::AddProperties(
   }
 }
 
-base::Value AccessibilityTreeFormatterMac::PopulateSize(
-    const BrowserAccessibilityCocoa* cocoa_node) const {
-  base::Value size(base::Value::Type::DICTIONARY);
-  NSSize node_size = [[cocoa_node size] sizeValue];
-  size.SetIntPath(kHeightDictAttr, static_cast<int>(node_size.height));
-  size.SetIntPath(kWidthDictAttr, static_cast<int>(node_size.width));
-  return size;
-}
-
 base::Value AccessibilityTreeFormatterMac::PopulatePosition(
     const BrowserAccessibilityCocoa* cocoa_node) const {
   BrowserAccessibility* node = [cocoa_node owner];
@@ -261,10 +248,14 @@ base::Value AccessibilityTreeFormatterMac::PopulateObject(
     return base::Value([value intValue]);
   }
 
-  // NSRange
-  if ([value isKindOfClass:[NSValue class]] &&
-      0 == strcmp([value objCType], @encode(NSRange))) {
-    return PopulateRange([value rangeValue]);
+  // NSRange, NSSize
+  if ([value isKindOfClass:[NSValue class]]) {
+    if (0 == strcmp([value objCType], @encode(NSRange))) {
+      return PopulateRange([value rangeValue]);
+    }
+    if (0 == strcmp([value objCType], @encode(NSSize))) {
+      return PopulateSize([value sizeValue]);
+    }
   }
 
   // AXTextMarker
@@ -465,14 +456,6 @@ std::string AccessibilityTreeFormatterMac::ProcessTreeForOutput(
                      &line);
       continue;
     }
-    // Special case: size.
-    if (item.first == kSizeDictAttr) {
-      WriteAttribute(false,
-                     FormatCoordinates(item.second, kSizeDictAttr,
-                                       kWidthDictAttr, kHeightDictAttr),
-                     &line);
-      continue;
-    }
 
     // Write formatted value.
     std::string formatted_value = FormatAttributeValue(item.second);

content/test/data/accessibility/aria/aria-owns-list-expected-mac.txt

 AXWebArea
-++AXList size=(400, 400)
-++++AXGroup size=(400, 200)
+++AXList AXSize={h: 400, w: 400}
+++++AXGroup AXSize={h: 200, w: 400}
 ++++++AXStaticText AXValue='One'
-++++AXGroup size=(400, 200)
+++++AXGroup AXSize={h: 200, w: 400}
 ++++++AXStaticText AXValue='Two'

content/test/data/accessibility/aria/aria-owns-list.html

 <!--
-@MAC-ALLOW:size=(400*
+@MAC-ALLOW:AXSize={h: *, w: 400}
 @BLINK-ALLOW:pageSize=(400*
 -->
 <html>

content/test/data/accessibility/html/iframe-coordinates-cross-process-expected-mac.txt

-AXWebArea position=(0, 0) size=(800, 600)
-++AXGroup position=(0, 0) size=(300, 150)
-++++AXButton position=(25, 25) size=(250, 50)
-++AXGroup position=(0, 150) size=(300, 150)
-++++AXButton position=(25, 175) size=(250, 50)
-++AXGroup position=(0, 300) size=(300, 150)
-++++AXGroup position=(0, 300) size=(300, 100)
-++++++AXWebArea position=(0, 300) size=(300, 100)
-++++++++AXGroup position=(0, 300) size=(300, 100)
-++++++++++AXButton position=(25, 325) size=(250, 50)
-++AXGroup position=(0, 450) size=(300, 150)
-++++AXGroup position=(0, 450) size=(150, 50)
-++++++AXWebArea position=(0, 450) size=(150, 50)
-++++++++AXGroup position=(0, 450) size=(150, 50)
-++++++++++AXButton position=(0, 450) size=(125, 25)
+AXWebArea position=(0, 0) AXSize={h: 600, w: 800}
+++AXGroup position=(0, 0) AXSize={h: 150, w: 300}
+++++AXButton position=(25, 25) AXSize={h: 50, w: 250}
+++AXGroup position=(0, 150) AXSize={h: 150, w: 300}
+++++AXButton position=(25, 175) AXSize={h: 50, w: 250}
+++AXGroup position=(0, 300) AXSize={h: 150, w: 300}
+++++AXGroup position=(0, 300) AXSize={h: 100, w: 300}
+++++++AXWebArea position=(0, 300) AXSize={h: 100, w: 300}
+++++++++AXGroup position=(0, 300) AXSize={h: 100, w: 300}
+++++++++++AXButton position=(25, 325) AXSize={h: 50, w: 250}
+++AXGroup position=(0, 450) AXSize={h: 150, w: 300}
+++++AXGroup position=(0, 450) AXSize={h: 50, w: 150}
+++++++AXWebArea position=(0, 450) AXSize={h: 50, w: 150}
+++++++++AXGroup position=(0, 450) AXSize={h: 50, w: 150}
+++++++++++AXButton position=(0, 450) AXSize={h: 25, w: 125}
\ No newline at end of file

content/test/data/accessibility/html/iframe-coordinates-cross-process.html

@@ -2,7 +2,7 @@
 @MAC-DENY:AXTitle
 @MAC-DENY:AXValue
 @MAC-ALLOW:position*
-@MAC-ALLOW:size*
+@MAC-ALLOW:AXSize
 
 @WIN-DENY:title*
 @WIN-ALLOW:location*

content/test/data/accessibility/html/iframe-coordinates-expected-mac.txt

-AXWebArea position=(0, 0) size=(800, 600)
-++AXGroup position=(0, 0) size=(300, 150)
-++++AXButton position=(25, 25) size=(250, 50)
-++AXGroup position=(0, 150) size=(300, 150)
-++++AXButton position=(25, 175) size=(250, 50)
-++AXGroup position=(0, 300) size=(300, 150)
-++++AXGroup position=(0, 300) size=(300, 100)
-++++++AXWebArea position=(0, 300) size=(300, 100)
-++++++++AXGroup position=(0, 300) size=(300, 100)
-++++++++++AXButton position=(25, 325) size=(250, 50)
-++AXGroup position=(0, 450) size=(300, 150)
-++++AXGroup position=(0, 450) size=(150, 50)
-++++++AXWebArea position=(0, 450) size=(150, 50)
-++++++++AXGroup position=(0, 450) size=(150, 50)
-++++++++++AXButton position=(0, 450) size=(125, 25)
+AXWebArea AXSize={h: 600, w: 800} position=(0, 0)
+++AXGroup AXSize={h: 150, w: 300} position=(0, 0)
+++++AXButton AXSize={h: 50, w: 250} position=(25, 25)
+++AXGroup AXSize={h: 150, w: 300} position=(0, 150)
+++++AXButton AXSize={h: 50, w: 250} position=(25, 175)
+++AXGroup AXSize={h: 150, w: 300} position=(0, 300)
+++++AXGroup AXSize={h: 100, w: 300} position=(0, 300)
+++++++AXWebArea AXSize={h: 100, w: 300} position=(0, 300)
+++++++++AXGroup AXSize={h: 100, w: 300} position=(0, 300)
+++++++++++AXButton AXSize={h: 50, w: 250} position=(25, 325)
+++AXGroup AXSize={h: 150, w: 300} position=(0, 450)
+++++AXGroup AXSize={h: 50, w: 150} position=(0, 450)
+++++++AXWebArea AXSize={h: 50, w: 150} position=(0, 450)
+++++++++AXGroup AXSize={h: 50, w: 150} position=(0, 450)
+++++++++++AXButton AXSize={h: 25, w: 125} position=(0, 450)

content/test/data/accessibility/html/iframe-coordinates.html

@@ -2,7 +2,7 @@
 @MAC-DENY:AXTitle
 @MAC-DENY:AXValue
 @MAC-ALLOW:position*
-@MAC-ALLOW:size*
+@MAC-ALLOW:AXSize
 
 @WIN-DENY:title*
 @WIN-ALLOW:location*

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

 AXWebArea
 ++AXGroup
-++++AXButton AXTitle='GrowButton' size=(600, 300)
+++++AXButton AXTitle='GrowButton' AXSize={h: 300, w: 600}
 ++++AXStaticText AXValue='Done'

content/test/data/accessibility/html/transition.html

@@ -7,8 +7,7 @@ the test framework to keep waiting for accessibility events and
 not diff the dump against the expectations until the text "Done"
 appears in the dump.
 
-@MAC-ALLOW:size=(400, 200)
-@MAC-ALLOW:size=(600, 300)
+@MAC-ALLOW:AXSize={h: 300, w: 600}
 @WIN-ALLOW:size=(400, 200)
 @WIN-ALLOW:size=(600, 300)
 @WAIT-FOR:Done