This repository was archived by the owner on Feb 25, 2025. It is now read-only.
Merge MSAA alert functionality with UIA #38745
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,41 @@ | ||
| // Copyright 2013 The Flutter Authors. All rights reserved. | ||
| // Use of this source code is governed by a BSD-style license that can be | ||
| // found in the LICENSE file. | ||
|
|
||
| #include "alert_platform_node_delegate.h" | ||
|
|
||
| namespace flutter { | ||
|
|
||
| AlertPlatformNodeDelegate::AlertPlatformNodeDelegate( | ||
| ui::AXPlatformNodeDelegate& parent_delegate) | ||
| : parent_delegate_(parent_delegate) { | ||
| data_.role = ax::mojom::Role::kAlert; | ||
| data_.id = id_.Get(); | ||
| } | ||
|
|
||
| AlertPlatformNodeDelegate::~AlertPlatformNodeDelegate() {} | ||
|
|
||
| gfx::AcceleratedWidget | ||
| AlertPlatformNodeDelegate::GetTargetForNativeAccessibilityEvent() { | ||
| return parent_delegate_.GetTargetForNativeAccessibilityEvent(); | ||
| } | ||
|
|
||
| gfx::NativeViewAccessible AlertPlatformNodeDelegate::GetParent() { | ||
| return parent_delegate_.GetNativeViewAccessible(); | ||
| } | ||
|
|
||
| const ui::AXUniqueId& AlertPlatformNodeDelegate::GetUniqueId() const { | ||
| return id_; | ||
| } | ||
|
|
||
| const ui::AXNodeData& AlertPlatformNodeDelegate::GetData() const { | ||
| return data_; | ||
| } | ||
|
|
||
| void AlertPlatformNodeDelegate::SetText(const std::u16string& text) { | ||
| data_.SetName(text); | ||
| data_.SetDescription(text); | ||
| data_.SetValue(text); | ||
| } | ||
|
|
||
| } // namespace flutter |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,51 @@ | ||
| // Copyright 2013 The Flutter Authors. All rights reserved. | ||
| // Use of this source code is governed by a BSD-style license that can be | ||
| // found in the LICENSE file. | ||
|
|
||
| #ifndef FLUTTER_SHELL_PLATFORM_COMMON_ALERT_PLATFORM_NODE_DELEGATE_H_ | ||
| #define FLUTTER_SHELL_PLATFORM_COMMON_ALERT_PLATFORM_NODE_DELEGATE_H_ | ||
|
|
||
| #include "flutter/third_party/accessibility/ax/ax_node_data.h" | ||
| #include "flutter/third_party/accessibility/ax/platform/ax_platform_node_delegate_base.h" | ||
|
|
||
| namespace flutter { | ||
|
|
||
| // A delegate for a node that holds the text of an a11y alert that a | ||
| // screen-reader should announce. The delegate is used to construct an | ||
| // AXPlatformNode, and in order to serve as an alert, only needs to be able to | ||
| // hold a text announcement and make that text available to the platform node. | ||
| class AlertPlatformNodeDelegate : public ui::AXPlatformNodeDelegateBase { | ||
| public: | ||
| explicit AlertPlatformNodeDelegate( | ||
| ui::AXPlatformNodeDelegate& parent_delegate); | ||
| ~AlertPlatformNodeDelegate(); | ||
|
|
||
| AlertPlatformNodeDelegate(const AlertPlatformNodeDelegate& other) = delete; | ||
| AlertPlatformNodeDelegate operator=(const AlertPlatformNodeDelegate& other) = | ||
| delete; | ||
|
|
||
| // Set the alert text of the node for which this is the delegate. | ||
| void SetText(const std::u16string& text); | ||
|
Member
There was a problem hiding this comment. Consider
Contributor
Author
There was a problem hiding this comment. The
Member
There was a problem hiding this comment. I'm also leaning towards keeping this a string reference, but, the string reference is also copied when
Member
There was a problem hiding this comment.
Yes - to benefit from this, you'd need any methods this gets passed to to also take a view rather than a string ref. If the current implementation is doing so, then leave as-is; at some point we can do a sweep of the codebase to clean these up across the board. |
||
|
|
||
| // |AXPlatformNodeDelegate| | ||
| gfx::NativeViewAccessible GetParent() override; | ||
|
|
||
| private: | ||
| // AXPlatformNodeDelegate overrides. | ||
| gfx::AcceleratedWidget GetTargetForNativeAccessibilityEvent() override; | ||
| const ui::AXUniqueId& GetUniqueId() const override; | ||
| const ui::AXNodeData& GetData() const override; | ||
|
|
||
| // Delegate of the parent of this node. Returned by GetParent. | ||
| ui::AXPlatformNodeDelegate& parent_delegate_; | ||
|
|
||
| // Node Data that contains the alert text. Returned by GetData. | ||
| ui::AXNodeData data_; | ||
|
|
||
| // A unique ID used to identify this node. Returned by GetUniqueId. | ||
| ui::AXUniqueId id_; | ||
| }; | ||
|
|
||
| } // namespace flutter | ||
|
|
||
| #endif // FLUTTER_SHELL_PLATFORM_COMMON_ALERT_PLATFORM_NODE_DELEGATE_H_ | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Add a doc comment. (True, we lack a lot in existing code but good to remedy in new code)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please do a pass, there's several other fields that are also missing comments