From 6fc6568bde66dd109e8a54ee18dee7c1fbce6b18 Mon Sep 17 00:00:00 2001 From: schectman Date: Wed, 16 Nov 2022 12:28:34 -0500 Subject: [PATCH 1/4] Add back tooltip to Embedder --- shell/platform/embedder/embedder.cc | 1 + 1 file changed, 1 insertion(+) diff --git a/shell/platform/embedder/embedder.cc b/shell/platform/embedder/embedder.cc index 3511162c89d40..6240bc9efcf80 100644 --- a/shell/platform/embedder/embedder.cc +++ b/shell/platform/embedder/embedder.cc @@ -1292,6 +1292,7 @@ FlutterSemanticsNode CreateEmbedderSemanticsNode( node.customAccessibilityActions.size(), node.customAccessibilityActions.data(), node.platformViewId, + node.tooltip.c_str(), }; } From 7568bcd657e4f481cf09edf69bdcda3656d370a0 Mon Sep 17 00:00:00 2001 From: schectman Date: Wed, 16 Nov 2022 14:44:39 -0500 Subject: [PATCH 2/4] Test inclusion of tooltip data --- shell/platform/embedder/fixtures/main.dart | 8 ++++---- shell/platform/embedder/tests/embedder_a11y_unittests.cc | 3 +++ 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/shell/platform/embedder/fixtures/main.dart b/shell/platform/embedder/fixtures/main.dart index a8098c8fda34f..1726c5637389b 100644 --- a/shell/platform/embedder/fixtures/main.dart +++ b/shell/platform/embedder/fixtures/main.dart @@ -165,7 +165,7 @@ void a11y_main() async { increasedValueAttributes: [], decreasedValue: '', decreasedValueAttributes: [], - tooltip: '', + tooltip: 'tooltip', additionalActions: Int32List(0), ) ..updateNode( @@ -196,7 +196,7 @@ void a11y_main() async { increasedValueAttributes: [], decreasedValue: '', decreasedValueAttributes: [], - tooltip: '', + tooltip: 'tooltip', additionalActions: Int32List(0), childrenInHitTestOrder: Int32List(0), childrenInTraversalOrder: Int32List(0), @@ -231,7 +231,7 @@ void a11y_main() async { increasedValueAttributes: [], decreasedValue: '', decreasedValueAttributes: [], - tooltip: '', + tooltip: 'tooltip', additionalActions: Int32List(0), ) ..updateNode( @@ -263,7 +263,7 @@ void a11y_main() async { increasedValueAttributes: [], decreasedValue: '', decreasedValueAttributes: [], - tooltip: '', + tooltip: 'tooltip', childrenInHitTestOrder: Int32List(0), childrenInTraversalOrder: Int32List(0), ) diff --git a/shell/platform/embedder/tests/embedder_a11y_unittests.cc b/shell/platform/embedder/tests/embedder_a11y_unittests.cc index a4c3588032d8c..812a9fd733c98 100644 --- a/shell/platform/embedder/tests/embedder_a11y_unittests.cc +++ b/shell/platform/embedder/tests/embedder_a11y_unittests.cc @@ -24,6 +24,8 @@ namespace testing { using EmbedderA11yTest = testing::EmbedderTest; +const static char tooltip[] = "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(tooltip, node->tooltip, sizeof(tooltip) - 1), 0); if (node->id == 128) { ASSERT_EQ(0x3f3, node->platform_view_id); From d1492fae699e417e14235bfbfd8e26481896028e Mon Sep 17 00:00:00 2001 From: schectman Date: Wed, 16 Nov 2022 15:43:28 -0500 Subject: [PATCH 3/4] Change to constexpr --- shell/platform/embedder/tests/embedder_a11y_unittests.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/shell/platform/embedder/tests/embedder_a11y_unittests.cc b/shell/platform/embedder/tests/embedder_a11y_unittests.cc index 812a9fd733c98..623041d83f818 100644 --- a/shell/platform/embedder/tests/embedder_a11y_unittests.cc +++ b/shell/platform/embedder/tests/embedder_a11y_unittests.cc @@ -24,7 +24,7 @@ namespace testing { using EmbedderA11yTest = testing::EmbedderTest; -const static char tooltip[] = "tooltip"; +constexpr static char tooltip[] = "tooltip"; TEST_F(EmbedderTest, CannotProvideNewAndLegacySemanticsCallback) { EmbedderConfigBuilder builder( @@ -288,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(node->tooltip, tooltip, sizeof(tooltip) - 1), 0); if (node->id == 128) { ASSERT_EQ(0x3f3, node->platform_view_id); From 5da0ee483a08481bd36d27fb110f822f41d8b001 Mon Sep 17 00:00:00 2001 From: schectman Date: Wed, 16 Nov 2022 16:02:51 -0500 Subject: [PATCH 4/4] Lint --- shell/platform/embedder/tests/embedder_a11y_unittests.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/shell/platform/embedder/tests/embedder_a11y_unittests.cc b/shell/platform/embedder/tests/embedder_a11y_unittests.cc index 623041d83f818..4007bb9e0c23c 100644 --- a/shell/platform/embedder/tests/embedder_a11y_unittests.cc +++ b/shell/platform/embedder/tests/embedder_a11y_unittests.cc @@ -24,7 +24,7 @@ namespace testing { using EmbedderA11yTest = testing::EmbedderTest; -constexpr static char tooltip[] = "tooltip"; +constexpr static char kTooltip[] = "tooltip"; TEST_F(EmbedderTest, CannotProvideNewAndLegacySemanticsCallback) { EmbedderConfigBuilder builder( @@ -103,7 +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(tooltip, node->tooltip, sizeof(tooltip) - 1), 0); + ASSERT_EQ(std::strncmp(kTooltip, node->tooltip, sizeof(kTooltip) - 1), 0); if (node->id == 128) { ASSERT_EQ(0x3f3, node->platform_view_id); @@ -288,7 +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(node->tooltip, tooltip, sizeof(tooltip) - 1), 0); + ASSERT_EQ(std::strncmp(kTooltip, node->tooltip, sizeof(kTooltip) - 1), 0); if (node->id == 128) { ASSERT_EQ(0x3f3, node->platform_view_id);