Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

null-annotate SemanticsUpdateBuilder.updateNode #18552

Merged
merged 1 commit into from
Jun 2, 2020
Merged

null-annotate SemanticsUpdateBuilder.updateNode #18552

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
158 changes: 91 additions & 67 deletions lib/ui/semantics.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -645,19 +645,21 @@ class SemanticsUpdateBuilder extends NativeFieldWrapperClass2 {
/// reading direction of all these strings is given by `textDirection`.
///
/// The fields `textSelectionBase` and `textSelectionExtent` describe the
/// currently selected text within `value`.
/// currently selected text within `value`. A value of -1 indicates no
/// current text selection base or extent.
///
/// The field `maxValueLength` is used to indicate that an editable text field
/// has a limit on the number of characters entered. If it is -1 there is
/// no limit on the number of characters entered. The field
/// The field `maxValueLength` is used to indicate that an editable text
/// field has a limit on the number of characters entered. If it is -1 there
/// is no limit on the number of characters entered. The field
/// `currentValueLength` indicates how much of that limit has already been
/// used up. When `maxValueLength` is set, `currentValueLength` must also be
/// set.
/// used up. When `maxValueLength` is >= 0, `currentValueLength` must also be
/// >= 0, otherwise it should be specified to be -1.
///
/// The field `platformViewId` references the platform view, whose semantics
/// nodes will be added as children to this node. If a platform view is
/// specified, `childrenInHitTestOrder` and `childrenInTraversalOrder` must be
/// empty.
/// specified, `childrenInHitTestOrder` and `childrenInTraversalOrder` must
/// be empty. A value of -1 indicates that this node is not associated with a
/// platform view.
///
/// For scrollable nodes `scrollPosition` describes the current scroll
/// position in logical pixel. `scrollExtentMax` and `scrollExtentMin`
Expand All @@ -681,39 +683,61 @@ class SemanticsUpdateBuilder extends NativeFieldWrapperClass2 {
/// z-direction starting at `elevation`. Basically, in the z-direction the
/// node starts at `elevation` above the parent and ends at `elevation` +
/// `thickness` above the parent.
// TODO(cbracken): https://github.com/flutter/flutter/issues/57720
void updateNode({
int id,
int flags,
int actions,
int maxValueLength,
int currentValueLength,
int textSelectionBase,
int textSelectionExtent,
int platformViewId,
int scrollChildren,
int scrollIndex,
double scrollPosition,
double scrollExtentMax,
double scrollExtentMin,
double elevation,
double thickness,
Rect rect,
String label,
String hint,
String value,
String increasedValue,
String decreasedValue,
TextDirection textDirection,
Float64List transform,
Int32List childrenInTraversalOrder,
Int32List childrenInHitTestOrder,
Int32List additionalActions,
/*required*/ int/*!*/ id,
/*required*/ int/*!*/ flags,
/*required*/ int/*!*/ actions,
/*required*/ int/*!*/ maxValueLength,
/*required*/ int/*!*/ currentValueLength,
/*required*/ int/*!*/ textSelectionBase,
/*required*/ int/*!*/ textSelectionExtent,
/*required*/ int/*!*/ platformViewId,
/*required*/ int/*!*/ scrollChildren,
/*required*/ int/*!*/ scrollIndex,
/*required*/ double/*!*/ scrollPosition,
/*required*/ double/*!*/ scrollExtentMax,
/*required*/ double/*!*/ scrollExtentMin,
/*required*/ double/*!*/ elevation,
/*required*/ double/*!*/ thickness,
/*required*/ Rect/*!*/ rect,
/*required*/ String/*!*/ label,
/*required*/ String/*!*/ hint,
/*required*/ String/*!*/ value,
/*required*/ String/*!*/ increasedValue,
/*required*/ String/*!*/ decreasedValue,
TextDirection/*?*/ textDirection,
/*required*/ Float64List/*!*/ transform,
/*required*/ Int32List/*!*/ childrenInTraversalOrder,
/*required*/ Int32List/*!*/ childrenInHitTestOrder,
/*required*/ Int32List/*!*/ additionalActions,
}) {
assert(id != null);
assert(flags != null);
assert(actions != null);
assert(maxValueLength != null);
assert(currentValueLength != null);
assert(textSelectionBase != null);
assert(textSelectionExtent != null);
assert(platformViewId != null);
assert(scrollChildren != null);
assert(scrollIndex != null);
assert(scrollPosition != null);
assert(scrollExtentMax != null);
assert(scrollExtentMin != null);
assert(elevation != null);
assert(thickness != null);
assert(rect != null);
assert(label != null);
assert(hint != null);
assert(value != null);
assert(increasedValue != null);
assert(decreasedValue != null);
assert(transform != null);
assert(childrenInTraversalOrder != null);
assert(childrenInHitTestOrder != null);
assert(additionalActions != null);
assert(_matrix4IsValid(transform));
assert(
scrollChildren == 0 || scrollChildren == null || (scrollChildren > 0 && childrenInHitTestOrder != null),
'If a node has scrollChildren, it must have childrenInHitTestOrder',
);
_updateNode(
id,
flags,
Expand Down Expand Up @@ -747,35 +771,35 @@ class SemanticsUpdateBuilder extends NativeFieldWrapperClass2 {
);
}
void _updateNode(
int id,
int flags,
int actions,
int maxValueLength,
int currentValueLength,
int textSelectionBase,
int textSelectionExtent,
int platformViewId,
int scrollChildren,
int scrollIndex,
double scrollPosition,
double scrollExtentMax,
double scrollExtentMin,
double left,
double top,
double right,
double bottom,
double elevation,
double thickness,
String label,
String hint,
String value,
String increasedValue,
String decreasedValue,
int textDirection,
Float64List transform,
Int32List childrenInTraversalOrder,
Int32List childrenInHitTestOrder,
Int32List additionalActions,
int/*!*/ id,
int/*!*/ flags,
int/*!*/ actions,
int/*!*/ maxValueLength,
int/*!*/ currentValueLength,
int/*!*/ textSelectionBase,
int/*!*/ textSelectionExtent,
int/*!*/ platformViewId,
int/*!*/ scrollChildren,
int/*!*/ scrollIndex,
double/*!*/ scrollPosition,
double/*!*/ scrollExtentMax,
double/*!*/ scrollExtentMin,
double/*!*/ left,
double/*!*/ top,
double/*!*/ right,
double/*!*/ bottom,
double/*!*/ elevation,
double/*!*/ thickness,
String/*!*/ label,
String/*!*/ hint,
String/*!*/ value,
String/*!*/ increasedValue,
String/*!*/ decreasedValue,
int/*!*/ textDirection,
Float64List/*!*/ transform,
Int32List/*!*/ childrenInTraversalOrder,
Int32List/*!*/ childrenInHitTestOrder,
Int32List/*!*/ additionalActions,
) native 'SemanticsUpdateBuilder_updateNode';

/// Update the custom semantics action associated with the given `id`.
Expand Down
80 changes: 52 additions & 28 deletions lib/web_ui/lib/src/ui/semantics.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -665,35 +665,59 @@ class SemanticsUpdateBuilder {
/// The `transform` is a matrix that maps this node's coordinate system into
/// its parent's coordinate system.
void updateNode({
int id,
int flags,
int actions,
int maxValueLength,
int currentValueLength,
int textSelectionBase,
int textSelectionExtent,
int platformViewId,
int scrollChildren,
int scrollIndex,
double scrollPosition,
double scrollExtentMax,
double scrollExtentMin,
double elevation,
double thickness,
Rect rect,
String label,
String hint,
String value,
String increasedValue,
String decreasedValue,
TextDirection textDirection,
Float64List transform,
Int32List childrenInTraversalOrder,
Int32List childrenInHitTestOrder,
Int32List additionalActions,
/*required*/ int/*!*/ id,
/*required*/ int/*!*/ flags,
/*required*/ int/*!*/ actions,
/*required*/ int/*!*/ maxValueLength,
/*required*/ int/*!*/ currentValueLength,
/*required*/ int/*!*/ textSelectionBase,
/*required*/ int/*!*/ textSelectionExtent,
/*required*/ int/*!*/ platformViewId,
/*required*/ int/*!*/ scrollChildren,
/*required*/ int/*!*/ scrollIndex,
/*required*/ double/*!*/ scrollPosition,
/*required*/ double/*!*/ scrollExtentMax,
/*required*/ double/*!*/ scrollExtentMin,
/*required*/ double/*!*/ elevation,
/*required*/ double/*!*/ thickness,
/*required*/ Rect/*!*/ rect,
/*required*/ String/*!*/ label,
/*required*/ String/*!*/ hint,
/*required*/ String/*!*/ value,
/*required*/ String/*!*/ increasedValue,
/*required*/ String/*!*/ decreasedValue,
TextDirection/*?*/ textDirection,
/*required*/ Float64List/*!*/ transform,
/*required*/ Int32List/*!*/ childrenInTraversalOrder,
/*required*/ Int32List/*!*/ childrenInHitTestOrder,
/*required*/ Int32List/*!*/ additionalActions,
}) {
if (transform.length != 16)
throw ArgumentError('transform argument must have 16 entries.');
assert(id != null);
assert(flags != null);
assert(actions != null);
assert(maxValueLength != null);
assert(currentValueLength != null);
assert(textSelectionBase != null);
assert(textSelectionExtent != null);
assert(platformViewId != null);
assert(scrollChildren != null);
assert(scrollIndex != null);
assert(scrollPosition != null);
assert(scrollExtentMax != null);
assert(scrollExtentMin != null);
assert(elevation != null);
assert(thickness != null);
assert(rect != null);
assert(label != null);
assert(hint != null);
assert(value != null);
assert(increasedValue != null);
assert(decreasedValue != null);
assert(transform != null);
assert(childrenInTraversalOrder != null);
assert(childrenInHitTestOrder != null);
assert(additionalActions != null);
assert(transform.length == 16, 'transform argument must have 16 entries.');
_nodeUpdates.add(engine.SemanticsNodeUpdate(
id: id,
flags: flags,
Expand Down