Skip to content

F
Front-End
Unverified Commit 8010a537 authored by Jonah Williams's avatar Jonah Williams Committed by GitHub
Browse files
Options

Revert "Do not eagerly allocate inherited widget caches when initializing element tree" (#100152)

parent 61fb2de5
Hide whitespace changes
Inline Side-by-side
Showing with 11 additions and 134 deletions
packages/flutter/lib/src/widgets/framework.dart
View file @ 8010a537
......@@ -394,53 +394,6 @@ abstract class Widget extends DiagnosticableTree {
}
}
/// A cache of inherited elements with an optional parent cache.
///
/// When looking up an inherited element, this will look through parent
/// caches until the element is found or the end is reached. When an element
/// is found, it is cached at the first element where the search began.
///
/// The intention of this cache is to speed up the initial build of widget
/// trees that contain a significant number of inherited widgets by deferring
/// expensive map allocations until they are needed, and by only allocating
/// in the "closest" hash map.
///
/// This will not cache `null` results if an inherited element is not found.
@visibleForTesting
class InheritedTreeCache {
/// Create a new [InheritedTreeCache] with an optional parent.
InheritedTreeCache([this._parent]);
final InheritedTreeCache? _parent;
final HashMap<Type, InheritedElement> _current = HashMap<Type, InheritedElement>();
/// Place the [element] in the cache under [type].
void operator []=(Type type, InheritedElement element) {
_current[type] = element;
}
/// Find the nearest [InheritedElement] of type [type], or `null` if it
/// cannot be found.
///
/// This operation will also cache the inherited element to improve the
/// speed of future lookups.
InheritedElement? operator[](Type type) {
InheritedElement? potential = _current[type];
if (potential != null) {
return potential;
}
potential = _parent?._lookupWithoutCaching(type);
if (potential != null) {
_current[type] = potential;
}
return potential;
}
InheritedElement? _lookupWithoutCaching(Type type) {
return _current[type] ?? _parent?._lookupWithoutCaching(type);
}
}
/// A widget that does not require mutable state.
///
/// A stateless widget is a widget that describes part of the user interface by
......@@ -4030,7 +3983,7 @@ abstract class Element extends DiagnosticableTree implements BuildContext {
// implementation to decide whether to rebuild based on whether we had
// dependencies here.
}
_inheritedLookup = null;
_inheritedWidgets = null;
_lifecycleState = _ElementLifecycle.inactive;
}
......@@ -4222,8 +4175,7 @@ abstract class Element extends DiagnosticableTree implements BuildContext {
return null;
}
InheritedTreeCache? _inheritedLookup;
Map<Type, InheritedElement>? _inheritedWidgets;
Set<InheritedElement>? _dependencies;
bool _hadUnsatisfiedDependencies = false;
......@@ -4260,7 +4212,7 @@ abstract class Element extends DiagnosticableTree implements BuildContext {
@override
T? dependOnInheritedWidgetOfExactType<T extends InheritedWidget>({Object? aspect}) {
assert(_debugCheckStateIsActiveForAncestorLookup());
final InheritedElement? ancestor = _inheritedLookup?[T];
final InheritedElement? ancestor = _inheritedWidgets == null ? null : _inheritedWidgets![T];
if (ancestor != null) {
return dependOnInheritedElement(ancestor, aspect: aspect) as T;
}
......@@ -4271,7 +4223,7 @@ abstract class Element extends DiagnosticableTree implements BuildContext {
@override
InheritedElement? getElementForInheritedWidgetOfExactType<T extends InheritedWidget>() {
assert(_debugCheckStateIsActiveForAncestorLookup());
final InheritedElement? ancestor = _inheritedLookup?[T];
final InheritedElement? ancestor = _inheritedWidgets == null ? null : _inheritedWidgets![T];
return ancestor;
}
......@@ -4291,7 +4243,7 @@ abstract class Element extends DiagnosticableTree implements BuildContext {
void _updateInheritance() {
assert(_lifecycleState == _ElementLifecycle.active);
_inheritedLookup = _parent?._inheritedLookup;
_inheritedWidgets = _parent?._inheritedWidgets;
}
@override
......@@ -5292,8 +5244,12 @@ class InheritedElement extends ProxyElement {
@override
void _updateInheritance() {
assert(_lifecycleState == _ElementLifecycle.active);
_inheritedLookup = InheritedTreeCache(_parent?._inheritedLookup)
..[widget.runtimeType] = this;
final Map<Type, InheritedElement>? incomingWidgets = _parent?._inheritedWidgets;
if (incomingWidgets != null)
_inheritedWidgets = HashMap<Type, InheritedElement>.of(incomingWidgets);
else
_inheritedWidgets = HashMap<Type, InheritedElement>();
_inheritedWidgets![widget.runtimeType] = this;
}
@override
......
packages/flutter/test/widgets/inherited_tree_cache_test.dart deleted 100644 → 0
View file @ 61fb2de5
// Copyright 2014 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.
import 'package:flutter/material.dart';
import 'package:flutter/src/widgets/framework.dart';
import 'package:flutter_test/flutter_test.dart';
void main() {
testWidgets('InheritedTreeCache returns null if element is not found', (WidgetTester tester) async {
final InheritedTreeCache parent = InheritedTreeCache();
expect(parent[InheritedElementA], isNull);
});
testWidgets('InheritedTreeCache can look up element from parent', (WidgetTester tester) async {
final InheritedTreeCache parent = InheritedTreeCache();
final InheritedTreeCache child = InheritedTreeCache(parent);
final InheritedElementA elementA = InheritedElementA(const InheritedWidgetA());
parent[InheritedElementA] = elementA;
expect(child[InheritedElementA], elementA);
});
testWidgets('InheritedTreeCache can look up multiple elements from parent', (WidgetTester tester) async {
final InheritedTreeCache parent = InheritedTreeCache();
final InheritedTreeCache child = InheritedTreeCache(parent);
final InheritedElementA elementA = InheritedElementA(const InheritedWidgetA());
final InheritedElementA elementB = InheritedElementA(const InheritedWidgetB());
parent[InheritedElementA] = elementA;
parent[InheritedElementB] = elementB;
expect(child[InheritedElementA], elementA);
expect(child[InheritedElementB], elementB);
});
testWidgets('InheritedTreeCache does not cache nulls', (WidgetTester tester) async {
final InheritedTreeCache parent = InheritedTreeCache();
final InheritedTreeCache child = InheritedTreeCache(parent);
final InheritedElementA elementA = InheritedElementA(const InheritedWidgetA());
// First look up element that has not been cached.
expect(child[InheritedElementA], null);
// Then manually add element to parent.
parent[InheritedElementA] = elementA;
// Then the child should be able to find it.
expect(child[InheritedElementA], elementA);
});
}
class InheritedElementA extends InheritedElement {
InheritedElementA(InheritedWidget widget) : super(widget);
}
class InheritedWidgetA extends InheritedWidget {
const InheritedWidgetA({ Key? key }) : super(child: const SizedBox(), key: key);
@override
bool updateShouldNotify(covariant InheritedWidget oldWidget) {
return true;
}
}
class InheritedElementB extends InheritedElement {
InheritedElementB(InheritedWidget widget) : super(widget);
}
class InheritedWidgetB extends InheritedWidget {
const InheritedWidgetB({ Key? key }) : super(child: const SizedBox(), key: key);
@override
bool updateShouldNotify(covariant InheritedWidget oldWidget) {
return true;
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

HIAST - GitLab