Skip to content

Commit 17473be

Browse files
committed
Sync engine 3.29.0 source code
1 parent be4bc52 commit 17473be

File tree

6 files changed

+32
-3
lines changed

6 files changed

+32
-3
lines changed

flutter/shell/platform/common/BUILD.gn

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,11 +57,13 @@ source_set("common_cpp_input") {
5757
source_set("common_cpp_accessibility") {
5858
public = [
5959
"accessibility_bridge.h",
60+
"alert_platform_node_delegate.h",
6061
"flutter_platform_node_delegate.h",
6162
]
6263

6364
sources = [
6465
"accessibility_bridge.cc",
66+
"alert_platform_node_delegate.cc",
6567
"flutter_platform_node_delegate.cc",
6668
]
6769

flutter/shell/platform/common/accessibility_bridge.cc

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -163,6 +163,17 @@ void AccessibilityBridge::OnRoleChanged(ui::AXTree* tree,
163163
ax::mojom::Role old_role,
164164
ax::mojom::Role new_role) {}
165165

166+
void AccessibilityBridge::OnNodeDataChanged(
167+
ui::AXTree* tree,
168+
const ui::AXNodeData& old_node_data,
169+
const ui::AXNodeData& new_node_data) {
170+
auto platform_view =
171+
GetFlutterPlatformNodeDelegateFromID(new_node_data.id).lock();
172+
if (platform_view) {
173+
platform_view->NodeDataChanged(old_node_data, new_node_data);
174+
}
175+
}
176+
166177
void AccessibilityBridge::OnNodeCreated(ui::AXTree* tree, ui::AXNode* node) {
167178
BASE_DCHECK(node);
168179
id_wrapper_map_[node->id()] = CreateFlutterPlatformNodeDelegate();

flutter/shell/platform/common/accessibility_bridge.h

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -260,6 +260,11 @@ class AccessibilityBridge
260260
ax::mojom::Role old_role,
261261
ax::mojom::Role new_role) override;
262262

263+
// |AXTreeObserver|
264+
void OnNodeDataChanged(ui::AXTree* tree,
265+
const ui::AXNodeData& old_node_data,
266+
const ui::AXNodeData& new_node_data) override;
267+
263268
// |AXTreeObserver|
264269
void OnAtomicUpdateFinished(
265270
ui::AXTree* tree,

flutter/shell/platform/common/client_wrapper/include/flutter/event_channel.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,9 +67,9 @@ class EventChannel {
6767
BinaryMessageHandler binary_handler =
6868
[shared_handler, codec, channel_name, messenger,
6969
// Mutable state to track the handler's listening status.
70-
is_listening = bool(false)](const uint8_t* message,
71-
const size_t message_size,
72-
const BinaryReply& reply) mutable {
70+
is_listening = false](const uint8_t* message,
71+
const size_t message_size,
72+
const BinaryReply& reply) mutable {
7373
constexpr char kOnListenMethod[] = "listen";
7474
constexpr char kOnCancelMethod[] = "cancel";
7575

flutter/shell/platform/common/flutter_platform_node_delegate.h

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,12 @@ class FlutterPlatformNodeDelegate : public ui::AXPlatformNodeDelegateBase {
139139
/// Subclasses must call super.
140140
virtual void Init(std::weak_ptr<OwnerBridge> bridge, ui::AXNode* node);
141141

142+
//------------------------------------------------------------------------------
143+
// @brief Called when node was updated. Subclasses can override this
144+
// to update platform nodes.
145+
virtual void NodeDataChanged(const ui::AXNodeData& old_node_data,
146+
const ui::AXNodeData& new_node_data) {}
147+
142148
//------------------------------------------------------------------------------
143149
/// @brief Gets the underlying ax node for this platform node delegate.
144150
ui::AXNode* GetAXNode() const;

flutter/shell/platform/embedder/test_utils/proc_table_replacement.h

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22
// Use of this source code is governed by a BSD-style license that can be
33
// found in the LICENSE file.
44

5+
#ifndef FLUTTER_SHELL_PLATFORM_EMBEDDER_TEST_UTILS_PROC_TABLE_REPLACEMENT_H_
6+
#define FLUTTER_SHELL_PLATFORM_EMBEDDER_TEST_UTILS_PROC_TABLE_REPLACEMENT_H_
7+
58
#include "flutter/shell/platform/embedder/embedder.h"
69

710
// Wraps capturing lambas with non-capturing version that can be assigned to
@@ -22,3 +25,5 @@
2225
static auto non_capturing = [](auto... args) { return closure(args...); }; \
2326
return non_capturing; \
2427
})()
28+
29+
#endif // FLUTTER_SHELL_PLATFORM_EMBEDDER_TEST_UTILS_PROC_TABLE_REPLACEMENT_H_

0 commit comments

Comments
 (0)