firka/flutter
firka/flutter
4
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2746 from abarth/dependent

Browse Source 
Fix spelling of dependents
This commit is contained in:
Adam Barth 2016-03-16 20:14:49 -07:00
commit 67b3ce63b2
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
packages/flutter/lib/src/widgets/framework.dart
View File

@ -932,7 +932,7 @@ abstract class Element implements BuildContext {
assert(_active); assert(_active);
if (_dependencies != null) { if (_dependencies != null) {
for (InheritedElement dependency in _dependencies) for (InheritedElement dependency in _dependencies)
dependency._dependants.remove(this); dependency._dependents.remove(this);
_dependencies.clear(); _dependencies.clear();
} }
_active = false; _active = false;
@ -970,7 +970,7 @@ abstract class Element implements BuildContext {
assert(ancestor is InheritedElement); assert(ancestor is InheritedElement);
_dependencies ??= new HashSet<InheritedElement>(); _dependencies ??= new HashSet<InheritedElement>();
_dependencies.add(ancestor); _dependencies.add(ancestor);
ancestor._dependants.add(this); ancestor._dependents.add(this);
return ancestor.widget; return ancestor.widget;
} }
return null; return null;
@ -1537,7 +1537,7 @@ class InheritedElement extends _ProxyElement {
@override @override
InheritedWidget get widget => super.widget; InheritedWidget get widget => super.widget;
final Set<Element> _dependants = new HashSet<Element>(); final Set<Element> _dependents = new HashSet<Element>();
@override @override
void _updateInheritance() { void _updateInheritance() {
@ -1552,7 +1552,7 @@ class InheritedElement extends _ProxyElement {
@override @override
void debugDeactivated() { void debugDeactivated() {
assert(() { assert(() {
assert(_dependants.isEmpty); assert(_dependents.isEmpty);
return true; return true;
}); });
super.debugDeactivated(); super.debugDeactivated();
@ -1563,7 +1563,7 @@ class InheritedElement extends _ProxyElement {
if (!widget.updateShouldNotify(oldWidget)) if (!widget.updateShouldNotify(oldWidget))
return; return;
final Type ourRuntimeType = widget.runtimeType; final Type ourRuntimeType = widget.runtimeType;
for (Element dependant in _dependants) { for (Element dependant in _dependents) {
dependant.dependenciesChanged(ourRuntimeType); dependant.dependenciesChanged(ourRuntimeType);
assert(() { assert(() {
// check that it really is our descendant // check that it really is our descendant