Reland "Refactor OverlayPortal semantics (flutter#173005)" (flutter#178095)

Reverts flutter#178007

This PR is to reland flutter#173005 and
add a fix to avoid infinite loop. The fix doesn't contain engine
changes.

Author: QuncCccccc

engine/src/flutter/lib/ui/fixtures/ui_test.dart

@@ -176,6 +176,7 @@ void sendSemanticsUpdate() {
   String tooltip = "tooltip";
 
   final Float64List transform = Float64List(16);
+  final Float64List hitTestTransform = Float64List(16);
   final Int32List childrenInTraversalOrder = Int32List(0);
   final Int32List childrenInHitTestOrder = Int32List(0);
   final Int32List additionalActions = Int32List(0);
@@ -198,6 +199,26 @@ void sendSemanticsUpdate() {
   transform[13] = 0;
   transform[14] = 0;
   transform[15] = 0;
+
+  hitTestTransform[0] = 1;
+  hitTestTransform[1] = 0;
+  hitTestTransform[2] = 0;
+  hitTestTransform[3] = 0;
+
+  hitTestTransform[4] = 0;
+  hitTestTransform[5] = 1;
+  hitTestTransform[6] = 0;
+  hitTestTransform[7] = 0;
+
+  hitTestTransform[8] = 0;
+  hitTestTransform[9] = 0;
+  hitTestTransform[10] = 1;
+  hitTestTransform[11] = 0;
+
+  hitTestTransform[12] = 0;
+  hitTestTransform[13] = 0;
+  hitTestTransform[14] = 0;
+  hitTestTransform[15] = 0;
   builder.updateNode(
     id: 0,
     flags: SemanticsFlags.none,
@@ -209,6 +230,7 @@ void sendSemanticsUpdate() {
     platformViewId: -1,
     scrollChildren: 0,
     scrollIndex: 0,
+    traversalParent: 0,
     scrollPosition: 0,
     scrollExtentMax: 0,
     scrollExtentMin: 0,
@@ -227,6 +249,7 @@ void sendSemanticsUpdate() {
     tooltip: tooltip,
     textDirection: TextDirection.ltr,
     transform: transform,
+    hitTestTransform: hitTestTransform,
     childrenInTraversalOrder: childrenInTraversalOrder,
     childrenInHitTestOrder: childrenInHitTestOrder,
     additionalActions: additionalActions,
@@ -244,13 +267,18 @@ void sendSemanticsUpdateWithRole() {
   final SemanticsUpdateBuilder builder = SemanticsUpdateBuilder();
 
   final Float64List transform = Float64List(16);
+  final Float64List hitTestTransform = Float64List(16);
   final Int32List childrenInTraversalOrder = Int32List(0);
   final Int32List childrenInHitTestOrder = Int32List(0);
   final Int32List additionalActions = Int32List(0);
   // Identity matrix 4x4.
   transform[0] = 1;
   transform[5] = 1;
   transform[10] = 1;
+
+  hitTestTransform[0] = 1;
+  hitTestTransform[5] = 1;
+  hitTestTransform[10] = 1;
   builder.updateNode(
     id: 0,
     flags: SemanticsFlags.none,
@@ -262,6 +290,7 @@ void sendSemanticsUpdateWithRole() {
     platformViewId: -1,
     scrollChildren: 0,
     scrollIndex: 0,
+    traversalParent: 0,
     scrollPosition: 0,
     scrollExtentMax: 0,
     scrollExtentMin: 0,
@@ -280,6 +309,7 @@ void sendSemanticsUpdateWithRole() {
     tooltip: "tooltip",
     textDirection: TextDirection.ltr,
     transform: transform,
+    hitTestTransform: hitTestTransform,
     childrenInTraversalOrder: childrenInTraversalOrder,
     childrenInHitTestOrder: childrenInHitTestOrder,
     additionalActions: additionalActions,
@@ -298,13 +328,18 @@ void sendSemanticsUpdateWithLocale() {
   final SemanticsUpdateBuilder builder = SemanticsUpdateBuilder();
 
   final Float64List transform = Float64List(16);
+  final Float64List hitTestTransform = Float64List(16);
   final Int32List childrenInTraversalOrder = Int32List(0);
   final Int32List childrenInHitTestOrder = Int32List(0);
   final Int32List additionalActions = Int32List(0);
   // Identity matrix 4x4.
   transform[0] = 1;
   transform[5] = 1;
   transform[10] = 1;
+
+  hitTestTransform[0] = 1;
+  hitTestTransform[5] = 1;
+  hitTestTransform[10] = 1;
   builder.updateNode(
     id: 0,
     flags: SemanticsFlags.none,
@@ -319,6 +354,7 @@ void sendSemanticsUpdateWithLocale() {
     scrollPosition: 0,
     scrollExtentMax: 0,
     scrollExtentMin: 0,
+    traversalParent: 0,
     rect: Rect.fromLTRB(0, 0, 10, 10),
     identifier: "identifier",
     label: "label",
@@ -334,6 +370,7 @@ void sendSemanticsUpdateWithLocale() {
     tooltip: "tooltip",
     textDirection: TextDirection.ltr,
     transform: transform,
+    hitTestTransform: hitTestTransform,
     childrenInTraversalOrder: childrenInTraversalOrder,
     childrenInHitTestOrder: childrenInHitTestOrder,
     additionalActions: additionalActions,
@@ -370,6 +407,7 @@ void sendSemanticsUpdateWithIsLink() {
     platformViewId: -1,
     scrollChildren: 0,
     scrollIndex: 0,
+    traversalParent: 0,
     scrollPosition: 0,
     scrollExtentMax: 0,
     scrollExtentMin: 0,
@@ -388,6 +426,7 @@ void sendSemanticsUpdateWithIsLink() {
     tooltip: "tooltip",
     textDirection: TextDirection.ltr,
     transform: transform,
+    hitTestTransform: transform,
     childrenInTraversalOrder: childrenInTraversalOrder,
     childrenInHitTestOrder: childrenInHitTestOrder,
     additionalActions: additionalActions,

engine/src/flutter/lib/ui/semantics.dart

@@ -1871,6 +1871,21 @@ abstract class SemanticsUpdateBuilder {
   /// total number of child nodes that contribute semantics and `scrollIndex`
   /// is the index of the first visible child node that contributes semantics.
   ///
+  /// The `traversalParent` specifies the ID of the semantics node that serves as
+  /// the logical parent of this node for accessibility traversal. This
+  /// parameter is only used by the web engine to establish parent-child
+  /// relationships between nodes that are not directly connected in paint order.
+  /// To ensure correct accessibility traversal, `traversalParent` should be set
+  /// to the logical traversal parent node ID. This parameter is web-specific
+  /// because other platforms can complete grafting when generating the
+  /// semantics tree in traversal order. After grafting, the traversal order and
+  /// hit-test order will be different, which is acceptable for other platforms.
+  /// However, the web engine assumes these two orders are exactly the same, so
+  /// grafting cannot be performed ahead of time on web. Instead, the traversal
+  /// order is updated in the web engine by setting the `aria-owns` attribute
+  /// through this parameter. A value of -1 indicates no special traversal
+  /// parent. This parameter has no effect on other platforms.
+  ///
   /// The `rect` is the region occupied by this node in its own coordinate
   /// system.
   ///
@@ -1929,6 +1944,7 @@ abstract class SemanticsUpdateBuilder {
     required int platformViewId,
     required int scrollChildren,
     required int scrollIndex,
+    required int traversalParent,
     required double scrollPosition,
     required double scrollExtentMax,
     required double scrollExtentMin,
@@ -1947,6 +1963,7 @@ abstract class SemanticsUpdateBuilder {
     required String tooltip,
     required TextDirection? textDirection,
     required Float64List transform,
+    required Float64List hitTestTransform,
     required Int32List childrenInTraversalOrder,
     required Int32List childrenInHitTestOrder,
     required Int32List additionalActions,
@@ -2008,6 +2025,7 @@ base class _NativeSemanticsUpdateBuilder extends NativeFieldWrapperClass1
     required int platformViewId,
     required int scrollChildren,
     required int scrollIndex,
+    required int traversalParent,
     required double scrollPosition,
     required double scrollExtentMax,
     required double scrollExtentMin,
@@ -2026,6 +2044,7 @@ base class _NativeSemanticsUpdateBuilder extends NativeFieldWrapperClass1
     required String tooltip,
     required TextDirection? textDirection,
     required Float64List transform,
+    required Float64List hitTestTransform,
     required Int32List childrenInTraversalOrder,
     required Int32List childrenInHitTestOrder,
     required Int32List additionalActions,
@@ -2054,6 +2073,7 @@ base class _NativeSemanticsUpdateBuilder extends NativeFieldWrapperClass1
       platformViewId,
       scrollChildren,
       scrollIndex,
+      traversalParent,
       scrollPosition,
       scrollExtentMax,
       scrollExtentMin,
@@ -2075,6 +2095,7 @@ base class _NativeSemanticsUpdateBuilder extends NativeFieldWrapperClass1
       tooltip,
       textDirection != null ? textDirection.index + 1 : 0,
       transform,
+      hitTestTransform,
       childrenInTraversalOrder,
       childrenInHitTestOrder,
       additionalActions,
@@ -2102,6 +2123,7 @@ base class _NativeSemanticsUpdateBuilder extends NativeFieldWrapperClass1
       Int32,
       Int32,
       Int32,
+      Int32,
       Double,
       Double,
       Double,
@@ -2126,6 +2148,7 @@ base class _NativeSemanticsUpdateBuilder extends NativeFieldWrapperClass1
       Handle,
       Handle,
       Handle,
+      Handle,
       Int32,
       Handle,
       Int32,
@@ -2147,6 +2170,7 @@ base class _NativeSemanticsUpdateBuilder extends NativeFieldWrapperClass1
     int platformViewId,
     int scrollChildren,
     int scrollIndex,
+    int traversalParent,
     double scrollPosition,
     double scrollExtentMax,
     double scrollExtentMin,
@@ -2168,6 +2192,7 @@ base class _NativeSemanticsUpdateBuilder extends NativeFieldWrapperClass1
     String tooltip,
     int textDirection,
     Float64List transform,
+    Float64List hitTestTransform,
     Int32List childrenInTraversalOrder,
     Int32List childrenInHitTestOrder,
     Int32List additionalActions,

engine/src/flutter/lib/ui/semantics/semantics_node.h

@@ -141,6 +141,7 @@ struct SemanticsNode {
   int32_t platformViewId = -1;
   int32_t scrollChildren = 0;
   int32_t scrollIndex = 0;
+  int32_t traversalParent = 0;
   double scrollPosition = std::nan("");
   double scrollExtentMax = std::nan("");
   double scrollExtentMin = std::nan("");
@@ -160,6 +161,7 @@ struct SemanticsNode {
 
   SkRect rect = SkRect::MakeEmpty();  // Local space, relative to parent.
   SkM44 transform = SkM44{};          // Identity
+  SkM44 hitTestTransform = SkM44{};   // Identity
   std::vector<int32_t> childrenInTraversalOrder;
   std::vector<int32_t> childrenInHitTestOrder;
   std::vector<int32_t> customAccessibilityActions;

engine/src/flutter/lib/ui/semantics/semantics_update_builder.cc

@@ -41,6 +41,7 @@ void SemanticsUpdateBuilder::updateNode(
     int platformViewId,
     int scrollChildren,
     int scrollIndex,
+    int traversalParent,
     double scrollPosition,
     double scrollExtentMax,
     double scrollExtentMin,
@@ -62,6 +63,7 @@ void SemanticsUpdateBuilder::updateNode(
     std::string tooltip,
     int textDirection,
     const tonic::Float64List& transform,
+    const tonic::Float64List& hitTestTransform,
     const tonic::Int32List& childrenInTraversalOrder,
     const tonic::Int32List& childrenInHitTestOrder,
     const tonic::Int32List& localContextActions,
@@ -90,6 +92,7 @@ void SemanticsUpdateBuilder::updateNode(
   node.platformViewId = platformViewId;
   node.scrollChildren = scrollChildren;
   node.scrollIndex = scrollIndex;
+  node.traversalParent = traversalParent;
   node.scrollPosition = scrollPosition;
   node.scrollExtentMax = scrollExtentMax;
   node.scrollExtentMin = scrollExtentMin;
@@ -113,6 +116,11 @@ void SemanticsUpdateBuilder::updateNode(
     scalarTransform[i] = SafeNarrow(transform.data()[i]);
   }
   node.transform = SkM44::ColMajor(scalarTransform);
+  SkScalar scalarHitTestTransform[16];
+  for (int i = 0; i < 16; ++i) {
+    scalarHitTestTransform[i] = SafeNarrow(hitTestTransform.data()[i]);
+  }
+  node.hitTestTransform = SkM44::ColMajor(scalarHitTestTransform);
   node.childrenInTraversalOrder =
       std::vector<int32_t>(childrenInTraversalOrder.data(),
                            childrenInTraversalOrder.data() +

engine/src/flutter/lib/ui/semantics/semantics_update_builder.h

@@ -40,6 +40,7 @@ class SemanticsUpdateBuilder
       int platformViewId,
       int scrollChildren,
       int scrollIndex,
+      int traversalParent,
       double scrollPosition,
       double scrollExtentMax,
       double scrollExtentMin,
@@ -61,6 +62,7 @@ class SemanticsUpdateBuilder
       std::string tooltip,
       int textDirection,
       const tonic::Float64List& transform,
+      const tonic::Float64List& hitTestTransform,
       const tonic::Int32List& childrenInTraversalOrder,
       const tonic::Int32List& childrenInHitTestOrder,
       const tonic::Int32List& customAccessibilityActions,

engine/src/flutter/lib/web_ui/lib/semantics.dart

@@ -722,6 +722,7 @@ class SemanticsUpdateBuilder {
     required int platformViewId,
     required int scrollChildren,
     required int scrollIndex,
+    required int? traversalParent,
     required double scrollPosition,
     required double scrollExtentMax,
     required double scrollExtentMin,
@@ -740,6 +741,7 @@ class SemanticsUpdateBuilder {
     String? tooltip,
     TextDirection? textDirection,
     required Float64List transform,
+    required Float64List hitTestTransform,
     required Int32List childrenInTraversalOrder,
     required Int32List childrenInHitTestOrder,
     required Int32List additionalActions,
@@ -766,6 +768,7 @@ class SemanticsUpdateBuilder {
         textSelectionExtent: textSelectionExtent,
         scrollChildren: scrollChildren,
         scrollIndex: scrollIndex,
+        traversalParent: traversalParent,
         scrollPosition: scrollPosition,
         scrollExtentMax: scrollExtentMax,
         scrollExtentMin: scrollExtentMin,
@@ -784,6 +787,7 @@ class SemanticsUpdateBuilder {
         tooltip: tooltip,
         textDirection: textDirection,
         transform: engine.toMatrix32(transform),
+        hitTestTransform: engine.toMatrix32(hitTestTransform),
         childrenInTraversalOrder: childrenInTraversalOrder,
         childrenInHitTestOrder: childrenInHitTestOrder,
         additionalActions: additionalActions,