development/flutter
development/flutter
1
0
Fork 0
mirror of https://github.com/flutter/flutter synced 2024-10-13 19:52:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "[Perf/codesize] Reduce constraint member reads during layout (#51418)" (#51489)

Browse source 
This reverts commit 69080e07e6.
This commit is contained in:
Ferhat 2020-02-26 15:51:30 -08:00 committed by GitHub
parent e31521eab5
commit 2132a0c7a3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
32 changed files with 1 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
packages/flutter/lib/src/cupertino/action_sheet.dart
View file

@ -668,7 +668,6 @@ class _RenderCupertinoAlert extends RenderBox {
@override
void performLayout() {
final BoxConstraints constraints = this.constraints;
final bool hasDivider = contentSection.getMaxIntrinsicHeight(constraints.maxWidth) > 0.0
&& actionsSection.getMaxIntrinsicHeight(constraints.maxWidth) > 0.0;
final double dividerThickness = hasDivider ? _dividerThickness : 0.0;

1
packages/flutter/lib/src/cupertino/dialog.dart
View file

@ -1540,7 +1540,6 @@ class _RenderCupertinoDialogActions extends RenderBox
@override
void performLayout() {
final BoxConstraints constraints = this.constraints;
if (_isSingleButtonRow(dialogWidth)) {
if (childCount == 1) {
// We have 1 button. Our size is the width of the dialog and the height

1
packages/flutter/lib/src/cupertino/refresh.dart
View file

@ -104,7 +104,6 @@ class _RenderCupertinoSliverRefresh extends RenderSliver
@override
void performLayout() {
final SliverConstraints constraints = this.constraints;
// Only pulling to refresh from the top is currently supported.
assert(constraints.axisDirection == AxisDirection.down);
assert(constraints.growthDirection == GrowthDirection.forward);

1
packages/flutter/lib/src/cupertino/segmented_control.dart
View file

@ -628,7 +628,6 @@ class _RenderSegmentedControl<T> extends RenderBox
@override
void performLayout() {
final BoxConstraints constraints = this.constraints;
double maxHeight = _kMinSegmentedControlHeight;
double childWidth = constraints.minWidth / childCount;

1
packages/flutter/lib/src/cupertino/sliding_segmented_control.dart
View file

@ -828,7 +828,6 @@ class _RenderSegmentedControl<T> extends RenderBox
@override
void performLayout() {
final BoxConstraints constraints = this.constraints;
double childWidth = (constraints.minWidth - totalSeparatorWidth) / childCount;
double maxHeight = _kMinSegmentedControlHeight;

1
packages/flutter/lib/src/cupertino/text_selection.dart
View file

@ -159,7 +159,6 @@ class _ToolbarRenderBox extends RenderShiftedBox {
@override
void performLayout() {
final BoxConstraints constraints = this.constraints;
size = constraints.biggest;
if (child == null) {

1
packages/flutter/lib/src/material/app_bar.dart
View file

@ -1346,7 +1346,6 @@ class _RenderAppBarTitleBox extends RenderAligningShiftedBox {
@override
void performLayout() {
final BoxConstraints constraints = this.constraints;
final BoxConstraints innerConstraints = constraints.copyWith(maxHeight: double.infinity);
child.layout(innerConstraints, parentUsesSize: true);
size = constraints.constrain(child.size);

1
packages/flutter/lib/src/material/button.dart
View file

@ -509,7 +509,6 @@ class _RenderInputPadding extends RenderShiftedBox {
@override
void performLayout() {
final BoxConstraints constraints = this.constraints;
if (child != null) {
child.layout(constraints, parentUsesSize: true);
final double height = math.max(child.size.width, minSize.width);

1
packages/flutter/lib/src/material/floating_action_button.dart
View file

@ -582,7 +582,6 @@ class _RenderChildOverflowBox extends RenderAligningShiftedBox {
@override
void performLayout() {
final BoxConstraints constraints = this.constraints;
if (child != null) {
child.layout(const BoxConstraints(), parentUsesSize: true);
size = Size(

1
packages/flutter/lib/src/material/input_decorator.dart
View file

@ -1257,7 +1257,6 @@ class _RenderDecoration extends RenderBox {
@override
void performLayout() {
final BoxConstraints constraints = this.constraints;
_labelTransform = null;
final _RenderDecorationLayout layout = _layout(constraints);

1
packages/flutter/lib/src/material/list_tile.dart
View file

@ -1328,7 +1328,6 @@ class _RenderListTile extends RenderBox {
// https://material.io/design/components/lists.html#specs
@override
void performLayout() {
final BoxConstraints constraints = this.constraints;
final bool hasLeading = leading != null;
final bool hasSubtitle = subtitle != null;
final bool hasTrailing = trailing != null;

2
packages/flutter/lib/src/rendering/animated_size.dart
View file

@ -170,7 +170,7 @@ class RenderAnimatedSize extends RenderAligningShiftedBox {
void performLayout() {
_lastValue = _controller.value;
_hasVisualOverflow = false;
final BoxConstraints constraints = this.constraints;
if (child == null || constraints.isTight) {
_controller.stop();
size = _sizeTween.begin = _sizeTween.end = constraints.smallest;

1
packages/flutter/lib/src/rendering/editable.dart
View file

@ -1743,7 +1743,6 @@ class RenderEditable extends RenderBox with RelayoutWhenSystemFontsChangeMixin {
}
@override
void performLayout() {
final BoxConstraints constraints = this.constraints;
_layoutText(minWidth: constraints.minWidth, maxWidth: constraints.maxWidth);
_caretPrototype = _getCaretPrototype;
_selectionRects = null;

2
packages/flutter/lib/src/rendering/flex.dart
View file

@ -636,8 +636,6 @@ class RenderFlex extends RenderBox with ContainerRenderObjectMixin<RenderBox, Fl
@override
void performLayout() {
assert(_debugHasNecessaryDirections);
final BoxConstraints constraints = this.constraints;
// Determine used flex factor, size inflexible items, calculate free space.
int totalFlex = 0;
int totalChildren = 0;

1
packages/flutter/lib/src/rendering/flow.dart
View file

@ -279,7 +279,6 @@ class RenderFlow extends RenderBox
@override
void performLayout() {
final BoxConstraints constraints = this.constraints;
size = _getSize(constraints);
int i = 0;
_randomAccessChildren.clear();

1
packages/flutter/lib/src/rendering/list_body.dart
View file

@ -63,7 +63,6 @@ class RenderListBody extends RenderBox
@override
void performLayout() {
final BoxConstraints constraints = this.constraints;
assert(() {
switch (mainAxis) {
case Axis.horizontal:

1
packages/flutter/lib/src/rendering/paragraph.dart
View file

@ -575,7 +575,6 @@ class RenderParagraph extends RenderBox
@override
void performLayout() {
final BoxConstraints constraints = this.constraints;
_layoutChildren(constraints);
_layoutTextWithConstraints(constraints);
_setParentData();

2
packages/flutter/lib/src/rendering/proxy_box.dart
View file

@ -260,7 +260,6 @@ class RenderConstrainedBox extends RenderProxyBox {
@override
void performLayout() {
final BoxConstraints constraints = this.constraints;
if (child != null) {
child.layout(_additionalConstraints.enforce(constraints), parentUsesSize: true);
size = child.size;
@ -352,7 +351,6 @@ class RenderLimitedBox extends RenderProxyBox {
@override
void performLayout() {
if (child != null) {
final BoxConstraints constraints = this.constraints;
child.layout(_limitConstraints(constraints), parentUsesSize: true);
size = constraints.constrain(child.size);
} else {

4
packages/flutter/lib/src/rendering/shifted_box.dart
View file

@ -193,7 +193,6 @@ class RenderPadding extends RenderShiftedBox {
@override
void performLayout() {
final BoxConstraints constraints = this.constraints;
_resolve();
assert(_resolvedPadding != null);
if (child == null) {
@ -386,7 +385,6 @@ class RenderPositionedBox extends RenderAligningShiftedBox {
@override
void performLayout() {
final BoxConstraints constraints = this.constraints;
final bool shrinkWrapWidth = _widthFactor != null || constraints.maxWidth == double.infinity;
final bool shrinkWrapHeight = _heightFactor != null || constraints.maxHeight == double.infinity;
@ -651,7 +649,6 @@ class RenderUnconstrainedBox extends RenderAligningShiftedBox with DebugOverflow
@override
void performLayout() {
final BoxConstraints constraints = this.constraints;
if (child != null) {
// Let the child lay itself out at it's "natural" size, but if
// constrainedAxis is non-null, keep any constraints on that axis.
@ -1186,7 +1183,6 @@ class RenderBaseline extends RenderShiftedBox {
@override
void performLayout() {
if (child != null) {
final BoxConstraints constraints = this.constraints;
child.layout(constraints.loosen(), parentUsesSize: true);
final double childBaseline = child.getDistanceToBaseline(baselineType);
final double actualBaseline = baseline;

1
packages/flutter/lib/src/rendering/sliver.dart
View file

@ -1813,7 +1813,6 @@ class RenderSliverToBoxAdapter extends RenderSliverSingleBoxAdapter {
geometry = SliverGeometry.zero;
return;
}
final SliverConstraints constraints = this.constraints;
child.layout(constraints.asBoxConstraints(), parentUsesSize: true);
double childExtent;
switch (constraints.axis) {

3
packages/flutter/lib/src/rendering/sliver_fill.dart
View file

@ -87,7 +87,6 @@ class RenderSliverFillRemainingWithScrollable extends RenderSliverSingleBoxAdapt
@override
void performLayout() {
final SliverConstraints constraints = this.constraints;
// TODO(Piinks): This may fill too much space for NestedScrollView, https://github.com/flutter/flutter/issues/46028
final double extent = constraints.remainingPaintExtent - math.min(constraints.overlap, 0.0);
@ -138,7 +137,6 @@ class RenderSliverFillRemaining extends RenderSliverSingleBoxAdapter {
@override
void performLayout() {
final SliverConstraints constraints = this.constraints;
// The remaining space in the viewportMainAxisExtent. Can be <= 0 if we have
// scrolled beyond the extent of the screen.
double extent = constraints.viewportMainAxisExtent - constraints.precedingScrollExtent;
@ -211,7 +209,6 @@ class RenderSliverFillRemainingAndOverscroll extends RenderSliverSingleBoxAdapte
@override
void performLayout() {
final SliverConstraints constraints = this.constraints;
// The remaining space in the viewportMainAxisExtent. Can be <= 0 if we have
// scrolled beyond the extent of the screen.
double extent = constraints.viewportMainAxisExtent - constraints.precedingScrollExtent;

1
packages/flutter/lib/src/rendering/sliver_fixed_extent_list.dart
View file

@ -164,7 +164,6 @@ abstract class RenderSliverFixedExtentBoxAdaptor extends RenderSliverMultiBoxAda
@override
void performLayout() {
final SliverConstraints constraints = this.constraints;
childManager.didStartLayout();
childManager.setDidUnderflow(false);

1
packages/flutter/lib/src/rendering/sliver_grid.dart
View file

@ -511,7 +511,6 @@ class RenderSliverGrid extends RenderSliverMultiBoxAdaptor {
@override
void performLayout() {
final SliverConstraints constraints = this.constraints;
childManager.didStartLayout();
childManager.setDidUnderflow(false);

1
packages/flutter/lib/src/rendering/sliver_list.dart
View file

@ -44,7 +44,6 @@ class RenderSliverList extends RenderSliverMultiBoxAdaptor {
@override
void performLayout() {
final SliverConstraints constraints = this.constraints;
childManager.didStartLayout();
childManager.setDidUnderflow(false);

1
packages/flutter/lib/src/rendering/sliver_padding.dart
View file

@ -118,7 +118,6 @@ abstract class RenderSliverEdgeInsetsPadding extends RenderSliver with RenderObj
@override
void performLayout() {
final SliverConstraints constraints = this.constraints;
assert(resolvedPadding != null);
final double beforePadding = this.beforePadding;
final double afterPadding = this.afterPadding;

3
packages/flutter/lib/src/rendering/sliver_persistent_header.dart
View file

@ -331,7 +331,6 @@ abstract class RenderSliverScrollingPersistentHeader extends RenderSliverPersist
@override
void performLayout() {
final SliverConstraints constraints = this.constraints;
final double maxExtent = this.maxExtent;
layoutChild(constraints.scrollOffset, maxExtent);
final double paintExtent = maxExtent - constraints.scrollOffset;
@ -370,7 +369,6 @@ abstract class RenderSliverPinnedPersistentHeader extends RenderSliverPersistent
@override
void performLayout() {
final SliverConstraints constraints = this.constraints;
final double maxExtent = this.maxExtent;
final bool overlapsContent = constraints.overlap > 0.0;
excludeFromSemanticsScrolling = overlapsContent || (constraints.scrollOffset > maxExtent - minExtent);
@ -554,7 +552,6 @@ abstract class RenderSliverFloatingPersistentHeader extends RenderSliverPersiste
@override
void performLayout() {
final SliverConstraints constraints = this.constraints;
final double maxExtent = this.maxExtent;
if (_lastActualScrollOffset != null && // We've laid out at least once to get an initial position, and either
((constraints.scrollOffset < _lastActualScrollOffset) || // we are scrolling back, so should reveal, or

1
packages/flutter/lib/src/rendering/stack.dart
View file

@ -517,7 +517,6 @@ class RenderStack extends RenderBox
@override
void performLayout() {
final BoxConstraints constraints = this.constraints;
_resolve();
assert(_resolvedAlignment != null);
_hasVisualOverflow = false;

1
packages/flutter/lib/src/rendering/table.dart
View file

@ -992,7 +992,6 @@ class RenderTable extends RenderBox {
@override
void performLayout() {
final BoxConstraints constraints = this.constraints;
final int rows = this.rows;
final int columns = this.columns;
assert(_children.length == rows * columns);

1
packages/flutter/lib/src/rendering/viewport.dart
View file

@ -1699,7 +1699,6 @@ class RenderShrinkWrappingViewport extends RenderViewportBase<SliverLogicalConta
@override
void performLayout() {
final BoxConstraints constraints = this.constraints;
if (firstChild == null) {
switch (axis) {
case Axis.vertical:

1
packages/flutter/lib/src/rendering/wrap.dart
View file

@ -565,7 +565,6 @@ class RenderWrap extends RenderBox with ContainerRenderObjectMixin<RenderBox, Wr
@override
void performLayout() {
final BoxConstraints constraints = this.constraints;
assert(_debugHasNecessaryDirections);
_hasVisualOverflow = false;
RenderBox child = firstChild;

1
packages/flutter/lib/src/widgets/layout_builder.dart
View file

@ -238,7 +238,6 @@ class _RenderLayoutBuilder extends RenderBox with RenderObjectWithChildMixin<Ren
@override
void performLayout() {
final BoxConstraints constraints = this.constraints;
layoutAndBuildChild();
if (child != null) {
child.layout(constraints, parentUsesSize: true);

1
packages/flutter/lib/src/widgets/single_child_scroll_view.dart
View file

@ -505,7 +505,6 @@ class _RenderSingleChildViewport extends RenderBox with RenderObjectWithChildMix
@override
void performLayout() {
final BoxConstraints constraints = this.constraints;
if (child == null) {
size = constraints.smallest;
} else {