Commit 3d41fb8a authored by Ian Hickson's avatar Ian Hickson

Merge pull request #215 from Hixie/crash-settings

Fix the crash when going to settings after showing the popup menu.
parents bf33f1fc a50b0651
......@@ -158,6 +158,10 @@ abstract class RenderObject extends AbstractNode implements HitTestTarget {
assert(parent == null);
assert(_relayoutSubtreeRoot == null);
_relayoutSubtreeRoot = this;
assert(() {
_debugCanParentUseSize = false;
return true;
});
_nodesNeedingLayout.add(this);
_nodesNeedingPaint.add(this);
scheduler.ensureVisualUpdate();
......@@ -183,9 +187,9 @@ abstract class RenderObject extends AbstractNode implements HitTestTarget {
RenderObject debugPreviousActiveLayout;
assert(!_debugMutationsLocked);
assert(!_debugDoingThisLayoutWithCallback);
assert(_debugCanParentUseSize != null);
assert(() {
_debugMutationsLocked = true;
_debugCanParentUseSize = false;
_debugDoingThisLayout = true;
debugPreviousActiveLayout = _debugActiveLayout;
_debugActiveLayout = this;
......@@ -195,7 +199,6 @@ abstract class RenderObject extends AbstractNode implements HitTestTarget {
assert(() {
_debugActiveLayout = debugPreviousActiveLayout;
_debugDoingThisLayout = false;
_debugCanParentUseSize = null;
_debugMutationsLocked = false;
return true;
});
......@@ -243,7 +246,6 @@ abstract class RenderObject extends AbstractNode implements HitTestTarget {
assert(() {
_debugActiveLayout = debugPreviousActiveLayout;
_debugDoingThisLayout = false;
_debugCanParentUseSize = null;
_debugMutationsLocked = false;
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