Migrate the Windows embedder

Author: loic-sharma

shell/platform/common/accessibility_bridge.cc

@@ -36,6 +36,17 @@ AccessibilityBridge::~AccessibilityBridge() {
   tree_->RemoveObserver(static_cast<ui::AXTreeObserver*>(this));
 }
 
+void AccessibilityBridge::AddFlutterSemanticsNodeUpdate(
+    const FlutterSemanticsNode2* node) {
+  pending_semantics_node_updates_[node->id] = FromFlutterSemanticsNode(node);
+}
+
+void AccessibilityBridge::AddFlutterSemanticsCustomActionUpdate(
+    const FlutterSemanticsCustomAction2* action) {
+  pending_semantics_custom_action_updates_[action->id] =
+      FromFlutterSemanticsCustomAction(action);
+}
+
 void AccessibilityBridge::AddFlutterSemanticsNodeUpdate(
     const FlutterSemanticsNode* node) {
   pending_semantics_node_updates_[node->id] = FromFlutterSemanticsNode(node);
@@ -576,6 +587,74 @@ void AccessibilityBridge::SetTreeData(const SemanticsNode& node,
   }
 }
 
+AccessibilityBridge::SemanticsNode
+AccessibilityBridge::FromFlutterSemanticsNode(
+    const FlutterSemanticsNode2* flutter_node) {
+  SemanticsNode result;
+  result.id = flutter_node->id;
+  result.flags = flutter_node->flags;
+  result.actions = flutter_node->actions;
+  result.text_selection_base = flutter_node->text_selection_base;
+  result.text_selection_extent = flutter_node->text_selection_extent;
+  result.scroll_child_count = flutter_node->scroll_child_count;
+  result.scroll_index = flutter_node->scroll_index;
+  result.scroll_position = flutter_node->scroll_position;
+  result.scroll_extent_max = flutter_node->scroll_extent_max;
+  result.scroll_extent_min = flutter_node->scroll_extent_min;
+  result.elevation = flutter_node->elevation;
+  result.thickness = flutter_node->thickness;
+  if (flutter_node->label) {
+    result.label = std::string(flutter_node->label);
+  }
+  if (flutter_node->hint) {
+    result.hint = std::string(flutter_node->hint);
+  }
+  if (flutter_node->value) {
+    result.value = std::string(flutter_node->value);
+  }
+  if (flutter_node->increased_value) {
+    result.increased_value = std::string(flutter_node->increased_value);
+  }
+  if (flutter_node->decreased_value) {
+    result.decreased_value = std::string(flutter_node->decreased_value);
+  }
+  if (flutter_node->tooltip) {
+    result.tooltip = std::string(flutter_node->tooltip);
+  }
+  result.text_direction = flutter_node->text_direction;
+  result.rect = flutter_node->rect;
+  result.transform = flutter_node->transform;
+  if (flutter_node->child_count > 0) {
+    result.children_in_traversal_order = std::vector<int32_t>(
+        flutter_node->children_in_traversal_order,
+        flutter_node->children_in_traversal_order + flutter_node->child_count);
+  }
+  if (flutter_node->custom_accessibility_actions_count > 0) {
+    result.custom_accessibility_actions = std::vector<int32_t>(
+        flutter_node->custom_accessibility_actions,
+        flutter_node->custom_accessibility_actions +
+            flutter_node->custom_accessibility_actions_count);
+  }
+  return result;
+}
+
+AccessibilityBridge::SemanticsCustomAction
+AccessibilityBridge::FromFlutterSemanticsCustomAction(
+    const FlutterSemanticsCustomAction2* flutter_custom_action) {
+  SemanticsCustomAction result;
+  result.id = flutter_custom_action->id;
+  result.override_action = flutter_custom_action->override_action;
+  if (flutter_custom_action->label) {
+    result.label = std::string(flutter_custom_action->label);
+  }
+  if (flutter_custom_action->hint) {
+    result.hint = std::string(flutter_custom_action->hint);
+  }
+  return result;
+}
+
+// TODO(loicsharma): Remove this as FlutterSemanticsNode is deprecated.
+// See: https://github.com/flutter/flutter/issues/121176
 AccessibilityBridge::SemanticsNode
 AccessibilityBridge::FromFlutterSemanticsNode(
     const FlutterSemanticsNode* flutter_node) {
@@ -627,6 +706,9 @@ AccessibilityBridge::FromFlutterSemanticsNode(
   return result;
 }
 
+// TODO(loicsharma): Remove this as FlutterSemanticsCustomAction is
+// deprecated.
+// See: https://github.com/flutter/flutter/issues/121176
 AccessibilityBridge::SemanticsCustomAction
 AccessibilityBridge::FromFlutterSemanticsCustomAction(
     const FlutterSemanticsCustomAction* flutter_custom_action) {

shell/platform/common/accessibility_bridge.h

@@ -61,6 +61,27 @@ class AccessibilityBridge
   ///             To flush the pending updates, call the CommitUpdates().
   ///
   /// @param[in]  node           A pointer to the semantics node update.
+  void AddFlutterSemanticsNodeUpdate(const FlutterSemanticsNode2* node);
+
+  //------------------------------------------------------------------------------
+  /// @brief      Adds a custom semantics action update to the pending semantics
+  ///             update. Calling this method alone will NOT update the
+  ///             semantics tree. To flush the pending updates, call the
+  ///             CommitUpdates().
+  ///
+  /// @param[in]  action           A pointer to the custom semantics action
+  ///                              update.
+  void AddFlutterSemanticsCustomActionUpdate(
+      const FlutterSemanticsCustomAction2* action);
+
+  //------------------------------------------------------------------------------
+  /// @brief      Adds a semantics node update to the pending semantics update.
+  ///             Calling this method alone will NOT update the semantics tree.
+  ///             To flush the pending updates, call the CommitUpdates().
+  ///
+  /// @param[in]  node           A pointer to the semantics node update.
+  //  TODO(loicsharma): Remove this as FlutterSemanticsNode is deprecated.
+  //  See: https://github.com/flutter/flutter/issues/121176
   void AddFlutterSemanticsNodeUpdate(const FlutterSemanticsNode* node);
 
   //------------------------------------------------------------------------------
@@ -71,6 +92,9 @@ class AccessibilityBridge
   ///
   /// @param[in]  action           A pointer to the custom semantics action
   ///                              update.
+  //  TODO(loicsharma): Remove this as FlutterSemanticsCustomAction is
+  //  deprecated.
+  //  See: https://github.com/flutter/flutter/issues/121176
   void AddFlutterSemanticsCustomActionUpdate(
       const FlutterSemanticsCustomAction* action);
 
@@ -251,8 +275,19 @@ class AccessibilityBridge
   void SetTooltipFromFlutterUpdate(ui::AXNodeData& node_data,
                                    const SemanticsNode& node);
   void SetTreeData(const SemanticsNode& node, ui::AXTreeUpdate& tree_update);
+  SemanticsNode FromFlutterSemanticsNode(
+      const FlutterSemanticsNode2* flutter_node);
+  SemanticsCustomAction FromFlutterSemanticsCustomAction(
+      const FlutterSemanticsCustomAction2* flutter_custom_action);
+
+  // TODO(loicsharma): Remove this as FlutterSemanticsNode is deprecated.
+  // See: https://github.com/flutter/flutter/issues/121176
   SemanticsNode FromFlutterSemanticsNode(
       const FlutterSemanticsNode* flutter_node);
+
+  // TODO(loicsharma): Remove this as FlutterSemanticsCustomAction is
+  // deprecated.
+  // See: https://github.com/flutter/flutter/issues/121176
   SemanticsCustomAction FromFlutterSemanticsCustomAction(
       const FlutterSemanticsCustomAction* flutter_custom_action);
 

shell/platform/windows/flutter_windows_engine.cc

@@ -327,17 +327,17 @@ bool FlutterWindowsEngine::Run(std::string_view entrypoint) {
     auto host = static_cast<FlutterWindowsEngine*>(user_data);
     host->OnPreEngineRestart();
   };
-  args.update_semantics_callback = [](const FlutterSemanticsUpdate* update,
+  args.update_semantics_callback2 = [](const FlutterSemanticsUpdate2* update,
                                       void* user_data) {
     auto host = static_cast<FlutterWindowsEngine*>(user_data);
 
     for (size_t i = 0; i < update->nodes_count; i++) {
-      const FlutterSemanticsNode* node = &update->nodes[i];
+      const FlutterSemanticsNode2* node = update->nodes[i];
       host->accessibility_bridge_->AddFlutterSemanticsNodeUpdate(node);
     }
 
     for (size_t i = 0; i < update->custom_actions_count; i++) {
-      const FlutterSemanticsCustomAction* action = &update->custom_actions[i];
+      const FlutterSemanticsCustomAction2* action = update->custom_actions[i];
       host->accessibility_bridge_->AddFlutterSemanticsCustomActionUpdate(
           action);
     }

shell/platform/windows/flutter_windows_engine_unittests.cc

@@ -60,7 +60,8 @@ TEST_F(FlutterWindowsEngineTest, RunDoesExpectedInitialization) {
         EXPECT_NE(args->custom_task_runners->thread_priority_setter, nullptr);
         EXPECT_EQ(args->custom_dart_entrypoint, nullptr);
         EXPECT_NE(args->vsync_callback, nullptr);
-        EXPECT_NE(args->update_semantics_callback, nullptr);
+        EXPECT_EQ(args->update_semantics_callback, nullptr);
+        EXPECT_NE(args->update_semantics_callback2, nullptr);
         EXPECT_EQ(args->update_semantics_node_callback, nullptr);
         EXPECT_EQ(args->update_semantics_custom_action_callback, nullptr);