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

Revert "Call mark* methods before attaching child (#25239)" (#25382)

Browse Source 
This reverts commit 5c1f1d7618e27a3ed5a97971edc95eff9d0ba967.

Reverting to see if that fixes flakiness of flutter_gallery__transition_perf_with_semantics in devicelab.
This commit is contained in:
Michael Goderbauer 2018-12-14 10:30:49 -08:00 committed by GitHub
parent d01f574a4a
commit ea7d086e11
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1138,10 +1138,10 @@ abstract class RenderObject extends AbstractNode with DiagnosticableTreeMixin im
assert(_debugCanPerformMutations); assert(_debugCanPerformMutations);
assert(child != null); assert(child != null);
setupParentData(child); setupParentData(child);
super.adoptChild(child);
markNeedsLayout(); markNeedsLayout();
markNeedsCompositingBitsUpdate(); markNeedsCompositingBitsUpdate();
markNeedsSemanticsUpdate(); markNeedsSemanticsUpdate();
super.adoptChild(child);
} }
/// Called by subclasses when they decide a render object is no longer a child. /// Called by subclasses when they decide a render object is no longer a child.
@ -1830,9 +1830,6 @@ abstract class RenderObject extends AbstractNode with DiagnosticableTreeMixin im
bool _needsCompositingBitsUpdate = false; // set to true when a child is added bool _needsCompositingBitsUpdate = false; // set to true when a child is added
/// Mark the compositing state for this render object as dirty. /// Mark the compositing state for this render object as dirty.
/// ///
/// This is called to indicate that the value for [needsCompositing] needs to
/// be recomputed during the next [flushCompositingBits] engine phase.
///
/// When the subtree is mutated, we need to recompute our /// When the subtree is mutated, we need to recompute our
/// [needsCompositing] bit, and some of our ancestors need to do the /// [needsCompositing] bit, and some of our ancestors need to do the
/// same (in case ours changed in a way that will change theirs). To /// same (in case ours changed in a way that will change theirs). To
@ -1870,9 +1867,6 @@ abstract class RenderObject extends AbstractNode with DiagnosticableTreeMixin im
bool _needsCompositing; // initialised in the constructor bool _needsCompositing; // initialised in the constructor
/// Whether we or one of our descendants has a compositing layer. /// Whether we or one of our descendants has a compositing layer.
/// ///
/// If this node needs compositing as indicated by this bit, then all ancestor
/// nodes will also need compositing.
///
/// Only legal to call after [PipelineOwner.flushLayout] and /// Only legal to call after [PipelineOwner.flushLayout] and
/// [PipelineOwner.flushCompositingBits] have been called. /// [PipelineOwner.flushCompositingBits] have been called.
bool get needsCompositing { bool get needsCompositing {

17
packages/flutter/test/rendering/repaint_boundary_test.dart
View File

@ -34,21 +34,4 @@ void main() {
c.opacity = 0.7; c.opacity = 0.7;
pumpFrame(phase: EnginePhase.flushSemantics); pumpFrame(phase: EnginePhase.flushSemantics);
}); });
test('Repaint boundary can get new parent after markNeedsCompositingBitsUpdate', () {
// Regression test for https://github.com/flutter/flutter/issues/24029.
final RenderRepaintBoundary repaintBoundary = RenderRepaintBoundary();
layout(repaintBoundary, phase: EnginePhase.flushSemantics);
repaintBoundary.markNeedsCompositingBitsUpdate();
renderer.renderView.child = null;
final RenderPadding padding = RenderPadding(
padding: const EdgeInsets.all(50),
);
renderer.renderView.child = padding;
padding.child = repaintBoundary;
pumpFrame(phase: EnginePhase.flushSemantics);
});
} }