Focus fix

Author: yaakovschectman

shell/platform/common/accessibility_bridge.cc

@@ -527,11 +527,12 @@ void AccessibilityBridge::SetTooltipFromFlutterUpdate(
 void AccessibilityBridge::SetTreeData(const SemanticsNode& node,
                                       ui::AXTreeUpdate& tree_update) {
   FlutterSemanticsFlag flags = node.flags;
-  // Set selection if:
+  // Set selection of the focused node if:
   // 1. this text field has a valid selection
   // 2. this text field doesn't have a valid selection but had selection stored
   //    in the tree.
-  if (flags & FlutterSemanticsFlag::kFlutterSemanticsFlagIsTextField) {
+  if (flags & FlutterSemanticsFlag::kFlutterSemanticsFlagIsTextField &&
+      flags & FlutterSemanticsFlag::kFlutterSemanticsFlagIsFocused) {
     if (node.text_selection_base != -1) {
       tree_update.tree_data.sel_anchor_object_id = node.id;
       tree_update.tree_data.sel_anchor_offset = node.text_selection_base;

shell/platform/windows/accessibility_bridge_windows.cc

@@ -42,13 +42,17 @@ void AccessibilityBridgeWindows::OnAccessibilityEvent(
                                     ax::mojom::Event::kChildrenChanged);
       break;
     case ui::AXEventGenerator::Event::DOCUMENT_SELECTION_CHANGED: {
+      // An event indicating a change in document selection should be fired
+      // only for the focused node whose selection has changed.
       ui::AXNode::AXID focus_id = GetAXTreeData().sel_focus_object_id;
       auto focus_delegate =
           GetFlutterPlatformNodeDelegateFromID(focus_id).lock();
-      DispatchWinAccessibilityEvent(
-          std::static_pointer_cast<FlutterPlatformNodeDelegateWindows>(
-              focus_delegate),
-          ax::mojom::Event::kDocumentSelectionChanged);
+      if (focus_delegate) {
+        DispatchWinAccessibilityEvent(
+            std::static_pointer_cast<FlutterPlatformNodeDelegateWindows>(
+                focus_delegate),
+            ax::mojom::Event::kDocumentSelectionChanged);
+      }
       break;
     }
     case ui::AXEventGenerator::Event::FOCUS_CHANGED: