From adc79c3cf3d22a8853ff2c9cab7eb8906f84de38 Mon Sep 17 00:00:00 2001
From: yaakovschectman <109111084+yaakovschectman@users.noreply.github.com>
Date: Wed, 16 Nov 2022 17:02:09 -0500
Subject: [PATCH] Add back tooltip to Embedder (flutter/engine#37676)

* Add back tooltip to Embedder

* Test inclusion of tooltip data

* Change to constexpr

* Lint
---
 engine/src/flutter/shell/platform/embedder/embedder.cc    | 1 +
 .../flutter/shell/platform/embedder/fixtures/main.dart    | 8 ++++----
 .../platform/embedder/tests/embedder_a11y_unittests.cc    | 4 ++++
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/engine/src/flutter/shell/platform/embedder/embedder.cc b/engine/src/flutter/shell/platform/embedder/embedder.cc
index 3511162c89..6240bc9efc 100644
--- a/engine/src/flutter/shell/platform/embedder/embedder.cc
+++ b/engine/src/flutter/shell/platform/embedder/embedder.cc
@@ -1292,6 +1292,7 @@ FlutterSemanticsNode CreateEmbedderSemanticsNode(
       node.customAccessibilityActions.size(),
       node.customAccessibilityActions.data(),
       node.platformViewId,
+      node.tooltip.c_str(),
   };
 }
 
diff --git a/engine/src/flutter/shell/platform/embedder/fixtures/main.dart b/engine/src/flutter/shell/platform/embedder/fixtures/main.dart
index a8098c8fda..1726c56373 100644
--- a/engine/src/flutter/shell/platform/embedder/fixtures/main.dart
+++ b/engine/src/flutter/shell/platform/embedder/fixtures/main.dart
@@ -165,7 +165,7 @@ void a11y_main() async {
       increasedValueAttributes: <StringAttribute>[],
       decreasedValue: '',
       decreasedValueAttributes: <StringAttribute>[],
-      tooltip: '',
+      tooltip: 'tooltip',
       additionalActions: Int32List(0),
     )
     ..updateNode(
@@ -196,7 +196,7 @@ void a11y_main() async {
       increasedValueAttributes: <StringAttribute>[],
       decreasedValue: '',
       decreasedValueAttributes: <StringAttribute>[],
-      tooltip: '',
+      tooltip: 'tooltip',
       additionalActions: Int32List(0),
       childrenInHitTestOrder: Int32List(0),
       childrenInTraversalOrder: Int32List(0),
@@ -231,7 +231,7 @@ void a11y_main() async {
       increasedValueAttributes: <StringAttribute>[],
       decreasedValue: '',
       decreasedValueAttributes: <StringAttribute>[],
-      tooltip: '',
+      tooltip: 'tooltip',
       additionalActions: Int32List(0),
     )
     ..updateNode(
@@ -263,7 +263,7 @@ void a11y_main() async {
       increasedValueAttributes: <StringAttribute>[],
       decreasedValue: '',
       decreasedValueAttributes: <StringAttribute>[],
-      tooltip: '',
+      tooltip: 'tooltip',
       childrenInHitTestOrder: Int32List(0),
       childrenInTraversalOrder: Int32List(0),
     )
diff --git a/engine/src/flutter/shell/platform/embedder/tests/embedder_a11y_unittests.cc b/engine/src/flutter/shell/platform/embedder/tests/embedder_a11y_unittests.cc
index a4c3588032..4007bb9e0c 100644
--- a/engine/src/flutter/shell/platform/embedder/tests/embedder_a11y_unittests.cc
+++ b/engine/src/flutter/shell/platform/embedder/tests/embedder_a11y_unittests.cc
@@ -24,6 +24,8 @@ namespace testing {
 
 using EmbedderA11yTest = testing::EmbedderTest;
 
+constexpr static char kTooltip[] = "tooltip";
+
 TEST_F(EmbedderTest, CannotProvideNewAndLegacySemanticsCallback) {
   EmbedderConfigBuilder builder(
       GetEmbedderContext(EmbedderTestContextType::kSoftwareContext));
@@ -101,6 +103,7 @@ TEST_F(EmbedderA11yTest, A11yTreeIsConsistent) {
       ASSERT_EQ(7.0, node->transform.pers0);
       ASSERT_EQ(8.0, node->transform.pers1);
       ASSERT_EQ(9.0, node->transform.pers2);
+      ASSERT_EQ(std::strncmp(kTooltip, node->tooltip, sizeof(kTooltip) - 1), 0);
 
       if (node->id == 128) {
         ASSERT_EQ(0x3f3, node->platform_view_id);
@@ -285,6 +288,7 @@ TEST_F(EmbedderA11yTest, A11yTreeIsConsistentUsingLegacyCallbacks) {
       ASSERT_EQ(7.0, node->transform.pers0);
       ASSERT_EQ(8.0, node->transform.pers1);
       ASSERT_EQ(9.0, node->transform.pers2);
+      ASSERT_EQ(std::strncmp(kTooltip, node->tooltip, sizeof(kTooltip) - 1), 0);
 
       if (node->id == 128) {
         ASSERT_EQ(0x3f3, node->platform_view_id);