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

manual rollback of of 18530 (#18531)

Browse Source
This commit is contained in:
Jonah Williams 2018-06-16 12:54:02 -07:00 committed by GitHub
parent ebb174b0bf
commit 3f79f8cba5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -524,9 +524,7 @@ abstract class RenderSliverMultiBoxAdaptor extends RenderSliver
); );
if (addExtent) if (addExtent)
childOffset += mainAxisUnit * paintExtentOf(child); childOffset += mainAxisUnit * paintExtentOf(child);
final double mainAxisOffset = mainAxisUnit.dx != 0 ? childOffset.dx : childOffset.dy; context.paintChild(child, childOffset);
if (mainAxisOffset < constraints.remainingPaintExtent && mainAxisOffset + paintExtentOf(child) > 0)
context.paintChild(child, childOffset);
child = childAfter(child); child = childAfter(child);
} }
} }

12
packages/flutter/test/widgets/keep_alive_test.dart
View File

@ -307,14 +307,14 @@ void main() {
' │ constraints: BoxConstraints(w=800.0, h=400.0)\n' ' │ constraints: BoxConstraints(w=800.0, h=400.0)\n'
' │ size: Size(800.0, 400.0)\n' ' │ size: Size(800.0, 400.0)\n'
' │\n' ' │\n'
' └─child with index 2: RenderLimitedBox#00000 NEEDS-PAINT\n' ' └─child with index 2: RenderLimitedBox#00000\n'
' │ parentData: index=2; layoutOffset=800.0\n' ' │ parentData: index=2; layoutOffset=800.0\n'
' │ constraints: BoxConstraints(w=800.0, h=400.0)\n' ' │ constraints: BoxConstraints(w=800.0, h=400.0)\n'
' │ size: Size(800.0, 400.0)\n' ' │ size: Size(800.0, 400.0)\n'
' │ maxWidth: 400.0\n' ' │ maxWidth: 400.0\n'
' │ maxHeight: 400.0\n' ' │ maxHeight: 400.0\n'
' │\n' ' │\n'
' └─child: RenderCustomPaint#00000 NEEDS-PAINT\n' ' └─child: RenderCustomPaint#00000\n'
' parentData: <none> (can use size)\n' ' parentData: <none> (can use size)\n'
' constraints: BoxConstraints(w=800.0, h=400.0)\n' ' constraints: BoxConstraints(w=800.0, h=400.0)\n'
' size: Size(800.0, 400.0)\n' ' size: Size(800.0, 400.0)\n'
@ -412,14 +412,14 @@ void main() {
' │ cacheExtent: 1100.0)\n' ' │ cacheExtent: 1100.0)\n'
' │ currently live children: 4 to 7\n' ' │ currently live children: 4 to 7\n'
' │\n' ' │\n'
' ├─child with index 4: RenderLimitedBox#00000 NEEDS-PAINT\n' ' ├─child with index 4: RenderLimitedBox#00000\n'
' │ │ parentData: index=4; layoutOffset=1600.0\n' ' │ │ parentData: index=4; layoutOffset=1600.0\n'
' │ │ constraints: BoxConstraints(w=800.0, h=400.0)\n' ' │ │ constraints: BoxConstraints(w=800.0, h=400.0)\n'
' │ │ size: Size(800.0, 400.0)\n' ' │ │ size: Size(800.0, 400.0)\n'
' │ │ maxWidth: 400.0\n' ' │ │ maxWidth: 400.0\n'
' │ │ maxHeight: 400.0\n' ' │ │ maxHeight: 400.0\n'
' │ │\n' ' │ │\n'
' │ └─child: RenderCustomPaint#00000 NEEDS-PAINT\n' ' │ └─child: RenderCustomPaint#00000\n'
' │ parentData: <none> (can use size)\n' ' │ parentData: <none> (can use size)\n'
' │ constraints: BoxConstraints(w=800.0, h=400.0)\n' ' │ constraints: BoxConstraints(w=800.0, h=400.0)\n'
' │ size: Size(800.0, 400.0)\n' ' │ size: Size(800.0, 400.0)\n'
@ -448,14 +448,14 @@ void main() {
' │ constraints: BoxConstraints(w=800.0, h=400.0)\n' ' │ constraints: BoxConstraints(w=800.0, h=400.0)\n'
' │ size: Size(800.0, 400.0)\n' ' │ size: Size(800.0, 400.0)\n'
' │\n' ' │\n'
' ├─child with index 7: RenderLimitedBox#00000 NEEDS-PAINT\n' ' ├─child with index 7: RenderLimitedBox#00000\n'
' ╎ │ parentData: index=7; layoutOffset=2800.0\n' ' ╎ │ parentData: index=7; layoutOffset=2800.0\n'
' ╎ │ constraints: BoxConstraints(w=800.0, h=400.0)\n' ' ╎ │ constraints: BoxConstraints(w=800.0, h=400.0)\n'
' ╎ │ size: Size(800.0, 400.0)\n' ' ╎ │ size: Size(800.0, 400.0)\n'
' ╎ │ maxWidth: 400.0\n' ' ╎ │ maxWidth: 400.0\n'
' ╎ │ maxHeight: 400.0\n' ' ╎ │ maxHeight: 400.0\n'
' ╎ │\n' ' ╎ │\n'
' ╎ └─child: RenderCustomPaint#00000 NEEDS-PAINT\n' ' ╎ └─child: RenderCustomPaint#00000\n'
' ╎ parentData: <none> (can use size)\n' ' ╎ parentData: <none> (can use size)\n'
' ╎ constraints: BoxConstraints(w=800.0, h=400.0)\n' ' ╎ constraints: BoxConstraints(w=800.0, h=400.0)\n'
' ╎ size: Size(800.0, 400.0)\n' ' ╎ size: Size(800.0, 400.0)\n'

2
packages/flutter/test/widgets/list_view_viewporting_test.dart
View File

@ -459,5 +459,5 @@ void main() {
final RenderSliverList list = tester.renderObject(find.byType(SliverList)); final RenderSliverList list = tester.renderObject(find.byType(SliverList));
expect(list, paintsExactlyCountTimes(#drawParagraph, 2)); expect(list, paintsExactlyCountTimes(#drawParagraph, 2));
}); }, skip: true);
} }

6
packages/flutter/test/widgets/sliver_fill_viewport_test.dart
View File

@ -82,7 +82,7 @@ void main() {
' │ │ constraints: BoxConstraints(w=800.0, h=600.0)\n' ' │ │ constraints: BoxConstraints(w=800.0, h=600.0)\n'
' │ │ layer: OffsetLayer#00000\n' ' │ │ layer: OffsetLayer#00000\n'
' │ │ size: Size(800.0, 600.0)\n' ' │ │ size: Size(800.0, 600.0)\n'
' │ │ metrics: 66.7% useful (1 bad vs 2 good)\n' ' │ │ metrics: 75.0% useful (1 bad vs 3 good)\n'
' │ │ diagnosis: insufficient data to draw conclusion (less than five\n' ' │ │ diagnosis: insufficient data to draw conclusion (less than five\n'
' │ │ repaints)\n' ' │ │ repaints)\n'
' │ │\n' ' │ │\n'
@ -103,9 +103,9 @@ void main() {
' └─child with index 1: RenderRepaintBoundary#00000\n' ' └─child with index 1: RenderRepaintBoundary#00000\n'
' │ parentData: index=1; layoutOffset=600.0\n' ' │ parentData: index=1; layoutOffset=600.0\n'
' │ constraints: BoxConstraints(w=800.0, h=600.0)\n' ' │ constraints: BoxConstraints(w=800.0, h=600.0)\n'
' │ layer: OffsetLayer#00000 DETACHED\n' ' │ layer: OffsetLayer#00000\n'
' │ size: Size(800.0, 600.0)\n' ' │ size: Size(800.0, 600.0)\n'
' │ metrics: 50.0% useful (1 bad vs 1 good)\n' ' │ metrics: 75.0% useful (1 bad vs 3 good)\n'
' │ diagnosis: insufficient data to draw conclusion (less than five\n' ' │ diagnosis: insufficient data to draw conclusion (less than five\n'
' │ repaints)\n' ' │ repaints)\n'
' │\n' ' │\n'