From edfb6305d803fb0aaed0def47d355a2d3e48232d Mon Sep 17 00:00:00 2001 From: Michael Goderbauer Date: Fri, 8 Jan 2021 10:24:10 -0800 Subject: [PATCH] Revert "Fix _LateInitializationError for RenderObjectElement.renderObject (#70974)" (#73575) This reverts commit c243d834ce41bc5d279b0264efbc6b3c9e0df53d. --- packages/flutter/lib/src/widgets/framework.dart | 8 ++++---- packages/flutter/test/widgets/framework_test.dart | 10 ---------- 2 files changed, 4 insertions(+), 14 deletions(-) diff --git a/packages/flutter/lib/src/widgets/framework.dart b/packages/flutter/lib/src/widgets/framework.dart index 71b3bc791e..3978fc3a7f 100644 --- a/packages/flutter/lib/src/widgets/framework.dart +++ b/packages/flutter/lib/src/widgets/framework.dart @@ -5463,8 +5463,8 @@ abstract class RenderObjectElement extends Element { /// The underlying [RenderObject] for this element. @override - RenderObject get renderObject => _renderObject!; - RenderObject? _renderObject; + RenderObject get renderObject => _renderObject; + late RenderObject _renderObject; bool _debugDoingBuild = false; @override @@ -5566,7 +5566,7 @@ abstract class RenderObjectElement extends Element { void _debugUpdateRenderObjectOwner() { assert(() { - renderObject.debugCreator = DebugCreator(this); + _renderObject.debugCreator = DebugCreator(this); return true; }()); } @@ -6058,7 +6058,7 @@ abstract class RenderObjectElement extends Element { @override void debugFillProperties(DiagnosticPropertiesBuilder properties) { super.debugFillProperties(properties); - properties.add(DiagnosticsProperty('renderObject', _renderObject, defaultValue: null)); + properties.add(DiagnosticsProperty('renderObject', renderObject, defaultValue: null)); } } diff --git a/packages/flutter/test/widgets/framework_test.dart b/packages/flutter/test/widgets/framework_test.dart index 9b8e7a12fb..7dc9e7e44a 100644 --- a/packages/flutter/test/widgets/framework_test.dart +++ b/packages/flutter/test/widgets/framework_test.dart @@ -1494,12 +1494,6 @@ void main() { expect(GestureBinding.instance!.pointerRouter.debugGlobalRouteCount, pointerRouterCount); expect(RawKeyboard.instance.keyEventHandler, same(rawKeyEventHandler)); }); - - testWidgets('Can access debugFillProperties without _LateInitializationError', (WidgetTester tester) async { - final DiagnosticPropertiesBuilder builder = DiagnosticPropertiesBuilder(); - TestRenderObjectElement().debugFillProperties(builder); - expect(builder.properties.any((DiagnosticsNode property) => property.name == 'renderObject' && property.value == null), isTrue); - }); } class _FakeFocusManager implements FocusManager { @@ -1843,7 +1837,3 @@ class FakeLeafRenderObject extends RenderBox { size = constraints.biggest; } } - -class TestRenderObjectElement extends RenderObjectElement { - TestRenderObjectElement() : super(Table()); -}