From 3f79f8cba5425e964f05fc79331dc5ff4b82c22f Mon Sep 17 00:00:00 2001 From: Jonah Williams Date: Sat, 16 Jun 2018 12:54:02 -0700 Subject: [PATCH] manual rollback of of 18530 (#18531) --- .../lib/src/rendering/sliver_multi_box_adaptor.dart | 4 +--- packages/flutter/test/widgets/keep_alive_test.dart | 12 ++++++------ .../test/widgets/list_view_viewporting_test.dart | 2 +- .../test/widgets/sliver_fill_viewport_test.dart | 6 +++--- 4 files changed, 11 insertions(+), 13 deletions(-) diff --git a/packages/flutter/lib/src/rendering/sliver_multi_box_adaptor.dart b/packages/flutter/lib/src/rendering/sliver_multi_box_adaptor.dart index 49cc1edcc7..2273acc134 100644 --- a/packages/flutter/lib/src/rendering/sliver_multi_box_adaptor.dart +++ b/packages/flutter/lib/src/rendering/sliver_multi_box_adaptor.dart @@ -524,9 +524,7 @@ abstract class RenderSliverMultiBoxAdaptor extends RenderSliver ); if (addExtent) childOffset += mainAxisUnit * paintExtentOf(child); - final double mainAxisOffset = mainAxisUnit.dx != 0 ? childOffset.dx : childOffset.dy; - if (mainAxisOffset < constraints.remainingPaintExtent && mainAxisOffset + paintExtentOf(child) > 0) - context.paintChild(child, childOffset); + context.paintChild(child, childOffset); child = childAfter(child); } } diff --git a/packages/flutter/test/widgets/keep_alive_test.dart b/packages/flutter/test/widgets/keep_alive_test.dart index 05e3bafd97..566fa0e855 100644 --- a/packages/flutter/test/widgets/keep_alive_test.dart +++ b/packages/flutter/test/widgets/keep_alive_test.dart @@ -307,14 +307,14 @@ void main() { ' │ constraints: BoxConstraints(w=800.0, h=400.0)\n' ' │ size: Size(800.0, 400.0)\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' ' │ constraints: BoxConstraints(w=800.0, h=400.0)\n' ' │ size: Size(800.0, 400.0)\n' ' │ maxWidth: 400.0\n' ' │ maxHeight: 400.0\n' ' │\n' - ' └─child: RenderCustomPaint#00000 NEEDS-PAINT\n' + ' └─child: RenderCustomPaint#00000\n' ' parentData: (can use size)\n' ' constraints: BoxConstraints(w=800.0, h=400.0)\n' ' size: Size(800.0, 400.0)\n' @@ -412,14 +412,14 @@ void main() { ' │ cacheExtent: 1100.0)\n' ' │ currently live children: 4 to 7\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' ' │ │ constraints: BoxConstraints(w=800.0, h=400.0)\n' ' │ │ size: Size(800.0, 400.0)\n' ' │ │ maxWidth: 400.0\n' ' │ │ maxHeight: 400.0\n' ' │ │\n' - ' │ └─child: RenderCustomPaint#00000 NEEDS-PAINT\n' + ' │ └─child: RenderCustomPaint#00000\n' ' │ parentData: (can use size)\n' ' │ constraints: BoxConstraints(w=800.0, h=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' ' │ size: Size(800.0, 400.0)\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' ' ╎ │ constraints: BoxConstraints(w=800.0, h=400.0)\n' ' ╎ │ size: Size(800.0, 400.0)\n' ' ╎ │ maxWidth: 400.0\n' ' ╎ │ maxHeight: 400.0\n' ' ╎ │\n' - ' ╎ └─child: RenderCustomPaint#00000 NEEDS-PAINT\n' + ' ╎ └─child: RenderCustomPaint#00000\n' ' ╎ parentData: (can use size)\n' ' ╎ constraints: BoxConstraints(w=800.0, h=400.0)\n' ' ╎ size: Size(800.0, 400.0)\n' diff --git a/packages/flutter/test/widgets/list_view_viewporting_test.dart b/packages/flutter/test/widgets/list_view_viewporting_test.dart index b4742bbe0e..c4b8632c2d 100644 --- a/packages/flutter/test/widgets/list_view_viewporting_test.dart +++ b/packages/flutter/test/widgets/list_view_viewporting_test.dart @@ -459,5 +459,5 @@ void main() { final RenderSliverList list = tester.renderObject(find.byType(SliverList)); expect(list, paintsExactlyCountTimes(#drawParagraph, 2)); - }); + }, skip: true); } diff --git a/packages/flutter/test/widgets/sliver_fill_viewport_test.dart b/packages/flutter/test/widgets/sliver_fill_viewport_test.dart index d6177f6436..3ba4b77ee0 100644 --- a/packages/flutter/test/widgets/sliver_fill_viewport_test.dart +++ b/packages/flutter/test/widgets/sliver_fill_viewport_test.dart @@ -82,7 +82,7 @@ void main() { ' │ │ constraints: BoxConstraints(w=800.0, h=600.0)\n' ' │ │ layer: OffsetLayer#00000\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' ' │ │ repaints)\n' ' │ │\n' @@ -103,9 +103,9 @@ void main() { ' └─child with index 1: RenderRepaintBoundary#00000\n' ' │ parentData: index=1; layoutOffset=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' - ' │ 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' ' │ repaints)\n' ' │\n'