DEV/flutter_flutter
1
0
Fork 0
mirror of https://github.com/flutter/flutter.git synced 2026-02-20 02:29:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix benchmark regression in layer.find<S>(Offset) (#32425)

Browse Source 
This fixes a benchmark regression introduced in #32350. The performance is improved by just reverting the Layer.find<S> routines to use their old definitions, instead of defining them in terms of the findAll<S> lazy iterators.

Fixes #32387
This commit is contained in:
Greg Spencer 2019-05-09 12:25:52 -07:00 committed by GitHub
parent 3436e165c8
commit 66a6726306
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 46 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
packages/flutter/lib/src/rendering/layer.dart
View File

@ -634,11 +634,15 @@ class ContainerLayer extends Layer {
@override
S find<S>(Offset regionOffset) {
final Iterable<S> all = findAll<S>(regionOffset);
if (all.isEmpty) {
return null;
Layer current = lastChild;
while (current != null) {
final Object value = current.find<S>(regionOffset);
if (value != null) {
return value;
}
current = current.previousSibling;
}
return all.first;
return null;
}
@override
@ -1263,26 +1267,31 @@ class TransformLayer extends OffsetLayer {
return null; // this does not return an engine layer yet.
}
@override
S find<S>(Offset regionOffset) {
final Iterable<S> all = findAll<S>(regionOffset);
if (all.isEmpty) {
return null;
}
return all.first;
}
@override
Iterable<S> findAll<S>(Offset regionOffset) sync* {
Offset _transformOffset(Offset regionOffset) {
if (_inverseDirty) {
_invertedTransform = Matrix4.tryInvert(transform);
_inverseDirty = false;
}
if (_invertedTransform == null)
return;
return null;
final Vector4 vector = Vector4(regionOffset.dx, regionOffset.dy, 0.0, 1.0);
final Vector4 result = _invertedTransform.transform(vector);
yield* super.findAll<S>(Offset(result[0], result[1]));
return Offset(result[0], result[1]);
}
@override
S find<S>(Offset regionOffset) {
final Offset transformedOffset = _transformOffset(regionOffset);
return transformedOffset == null ? null : super.find<S>(transformedOffset);
}
@override
Iterable<S> findAll<S>(Offset regionOffset) sync* {
final Offset transformedOffset = _transformOffset(regionOffset);
if (transformedOffset == null) {
return;
}
yield* super.findAll<S>(transformedOffset);
}
@override
@ -1588,11 +1597,9 @@ class PhysicalModelLayer extends ContainerLayer {
@override
S find<S>(Offset regionOffset) {
final Iterable<S> all = findAll<S>(regionOffset);
if (all.isEmpty) {
if (!clipPath.contains(regionOffset))
return null;
}
return all.first;
return super.find<S>(regionOffset);
}
@override
@ -1844,11 +1851,11 @@ class FollowerLayer extends ContainerLayer {
@override
S find<S>(Offset regionOffset) {
final Iterable<S> all = findAll<S>(regionOffset);
if (all.isEmpty) {
return null;
if (link.leader == null) {
return showWhenUnlinked ? super.find<S>(regionOffset - unlinkedOffset) : null;
}
return all.first;
final Offset transformedOffset = _transformOffset<S>(regionOffset);
return transformedOffset == null ? null : super.find<S>(transformedOffset);
}
@override
@ -1856,7 +1863,11 @@ class FollowerLayer extends ContainerLayer {
if (link.leader == null) {
return showWhenUnlinked ? super.findAll<S>(regionOffset - unlinkedOffset) : <S>[];
}
return super.findAll<S>(_transformOffset<S>(regionOffset));
final Offset transformedOffset = _transformOffset<S>(regionOffset);
if (transformedOffset == null) {
return <S>[];
}
return super.findAll<S>(transformedOffset);
}
/// The transform that was used during the last composition phase.
@ -2031,11 +2042,17 @@ class AnnotatedRegionLayer<T> extends ContainerLayer {
@override
S find<S>(Offset regionOffset) {
final Iterable<S> all = findAll<S>(regionOffset);
if (all.isEmpty) {
final S result = super.find<S>(regionOffset);
if (result != null)
return result;
if (size != null && !(offset & size).contains(regionOffset))
return null;
if (T == S) {
final Object untypedResult = value;
final S typedResult = untypedResult;
return typedResult;
}
return all.first;
return super.find<S>(regionOffset);
}
@override