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

Merge pull request #215 from Hixie/crash-settings

Browse Source 
Fix the crash when going to settings after showing the popup menu.
This commit is contained in:
Ian Hickson 2015-07-22 18:16:08 -07:00
commit 3d41fb8a89
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
packages/flutter/lib/rendering/object.dart
View File

@ -158,6 +158,10 @@ abstract class RenderObject extends AbstractNode implements HitTestTarget {
assert(parent == null); assert(parent == null);
assert(_relayoutSubtreeRoot == null); assert(_relayoutSubtreeRoot == null);
_relayoutSubtreeRoot = this; _relayoutSubtreeRoot = this;
assert(() {
_debugCanParentUseSize = false;
return true;
});
_nodesNeedingLayout.add(this); _nodesNeedingLayout.add(this);
_nodesNeedingPaint.add(this); _nodesNeedingPaint.add(this);
scheduler.ensureVisualUpdate(); scheduler.ensureVisualUpdate();
@ -183,9 +187,9 @@ abstract class RenderObject extends AbstractNode implements HitTestTarget {
RenderObject debugPreviousActiveLayout; RenderObject debugPreviousActiveLayout;
assert(!_debugMutationsLocked); assert(!_debugMutationsLocked);
assert(!_debugDoingThisLayoutWithCallback); assert(!_debugDoingThisLayoutWithCallback);
assert(_debugCanParentUseSize != null);
assert(() { assert(() {
_debugMutationsLocked = true; _debugMutationsLocked = true;
_debugCanParentUseSize = false;
_debugDoingThisLayout = true; _debugDoingThisLayout = true;
debugPreviousActiveLayout = _debugActiveLayout; debugPreviousActiveLayout = _debugActiveLayout;
_debugActiveLayout = this; _debugActiveLayout = this;
@ -195,7 +199,6 @@ abstract class RenderObject extends AbstractNode implements HitTestTarget {
assert(() { assert(() {
_debugActiveLayout = debugPreviousActiveLayout; _debugActiveLayout = debugPreviousActiveLayout;
_debugDoingThisLayout = false; _debugDoingThisLayout = false;
_debugCanParentUseSize = null;
_debugMutationsLocked = false; _debugMutationsLocked = false;
return true; return true;
}); });
@ -243,7 +246,6 @@ abstract class RenderObject extends AbstractNode implements HitTestTarget {
assert(() { assert(() {
_debugActiveLayout = debugPreviousActiveLayout; _debugActiveLayout = debugPreviousActiveLayout;
_debugDoingThisLayout = false; _debugDoingThisLayout = false;
_debugCanParentUseSize = null;
_debugMutationsLocked = false; _debugMutationsLocked = false;
return true; return true;
}); });