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

Trivial cleanup of getDistanceToBaseline

Browse Source 
Turns out we don't need 'parent' outside the assert at all.
This commit is contained in:
Hixie 2016-02-23 11:18:11 -08:00
parent 8a53753427
commit 16e7c3a61c
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/flutter/lib/src/rendering/box.dart
View File

@ -533,19 +533,19 @@ abstract class RenderBox extends RenderObject {
double getDistanceToBaseline(TextBaseline baseline, { bool onlyReal: false }) {
assert(!needsLayout);
assert(!_debugDoingBaseline);
final RenderObject parent = this.parent;
assert(() {
final RenderObject parent = this.parent;
if (RenderObject.debugDoingLayout)
return (RenderObject.debugActiveLayout == parent) && parent.debugDoingThisLayout;
if (RenderObject.debugDoingPaint)
return ((RenderObject.debugActivePaint == parent) && parent.debugDoingThisPaint) ||
((RenderObject.debugActivePaint == this) && debugDoingThisPaint);
assert(parent == this.parent);
return false;
});
assert(_debugSetDoingBaseline(true));
double result = getDistanceToActualBaseline(baseline);
assert(_debugSetDoingBaseline(false));
assert(parent == this.parent);
if (result == null && !onlyReal)
return size.height;
return result;