PR

Author: yaakovschectman

shell/platform/windows/accessibility_alert.cc

@@ -10,6 +10,8 @@ namespace flutter {
 
 AccessibilityAlert::AccessibilityAlert() : text_(L""), parent_(nullptr) {}
 
+// IAccessible methods.
+
 IFACEMETHODIMP AccessibilityAlert::accHitTest(LONG screen_physical_pixel_x,
                                               LONG screen_physical_pixel_y,
                                               VARIANT* child) {
@@ -157,6 +159,8 @@ IFACEMETHODIMP AccessibilityAlert::put_accName(VARIANT var_id, BSTR put_name) {
   return E_NOTIMPL;
 }
 
+// End of IAccessible methods.
+
 void AccessibilityAlert::SetText(const std::wstring& text) {
   text_ = text;
 }

shell/platform/windows/accessibility_alert.h

@@ -16,6 +16,11 @@ namespace flutter {
 class AccessibilityRootNode;
 
 // An IAccessible node representing an alert read to the screen reader.
+// When an announcement is requested by the framework, an instance of
+// this class, if none exists already, is created and made a child of
+// the root AccessibilityRootNode node, and is therefore also a sibling
+// of the window's root node.
+// This node is not interactable to the user.
 class AccessibilityAlert : public CComObjectRootEx<CComMultiThreadModel>,
                            public IDispatchImpl<IAccessible> {
  public:
@@ -31,8 +36,6 @@ class AccessibilityAlert : public CComObjectRootEx<CComMultiThreadModel>,
                             LONG screen_physical_pixel_y,
                             VARIANT* child) override;
 
-  // Performs the object's default action.
-
   // Retrieves an IDispatch interface pointer for the specified child.
   IFACEMETHODIMP get_accChild(VARIANT var_child,
                               IDispatch** disp_child) override;
@@ -47,8 +50,6 @@ class AccessibilityAlert : public CComObjectRootEx<CComMultiThreadModel>,
   // Retrieves the tooltip description.
   IFACEMETHODIMP get_accDescription(VARIANT var_id, BSTR* desc) override;
 
-  // Retrieves the object that has the keyboard focus.
-
   // Retrieves the name of the specified object.
   IFACEMETHODIMP get_accName(VARIANT var_id, BSTR* name) override;
 
@@ -64,9 +65,7 @@ class AccessibilityAlert : public CComObjectRootEx<CComMultiThreadModel>,
   // Gets the help string for the specified object.
   IFACEMETHODIMP get_accHelp(VARIANT var_id, BSTR* help) override;
 
-  // Retrieve or set the string value associated with the specified object.
-  // Setting the value is not typically used by screen readers, but it's
-  // used frequently by automation software.
+  // Retrieve the string value associated with the specified object.
   IFACEMETHODIMP get_accValue(VARIANT var_id, BSTR* value) override;
 
   // IAccessible methods not implemented.
@@ -90,6 +89,8 @@ class AccessibilityAlert : public CComObjectRootEx<CComMultiThreadModel>,
   IFACEMETHODIMP put_accName(VARIANT var_id, BSTR put_name) override;
   IFACEMETHODIMP put_accValue(VARIANT var_id, BSTR new_value) override;
 
+  // End of IAccessible methods.
+
   AccessibilityAlert();
   ~AccessibilityAlert() = default;
 

shell/platform/windows/accessibility_root_node.cc

@@ -170,7 +170,7 @@ IFACEMETHODIMP AccessibilityRootNode::get_accName(VARIANT var_id,
   }
   IAccessible* target;
   if ((target = GetTargetAndChildID(&var_id))) {
-    return window_accessible_->get_accName(var_id, name_bstr);
+    return target->get_accName(var_id, name_bstr);
   }
   return S_FALSE;
 }