
This change enables Flutter to generate multiple Scenes to be rendered into separate FlutterViews from a single widget tree. Each Scene is described by a separate render tree, which are all associated with the single widget tree. This PR implements the framework-side mechanisms to describe the content to be rendered into multiple views. Separate engine-side changes are necessary to provide these views to the framework and to draw the framework-generated Scene into them. ## Summary of changes The details of this change are described in [flutter.dev/go/multiple-views](https://flutter.dev/go/multiple-views). Below is a high-level summary organized by layers. ### Rendering layer changes * The `RendererBinding` no longer owns a single `renderView`. In fact, it doesn't OWN any `RenderView`s at all anymore. Instead, it offers an API (`addRenderView`/`removeRenderView`) to add and remove `RenderView`s that then will be MANAGED by the binding. The `RenderView` itself is now owned by a higher-level abstraction (e.g. the `RawView` Element of the widgets layer, see below), who is also in charge of adding it to the binding. When added, the binding will interact with the `RenderView` to produce a frame (e.g. by calling `compositeFrame` on it) and to perform hit tests for incoming pointer events. Multiple `RenderView`s can be added to the binding (typically one per `FlutterView`) to produce multiple Scenes. * Instead of owning a single `pipelineOwner`, the `RendererBinding` now owns the root of the `PipelineOwner` tree (exposed as `rootPipelineOwner` on the binding). Each `PipelineOwner` in that tree (except for the root) typically manages its own render tree typically rooted in one of the `RenderView`s mentioned in the previous bullet. During frame production, the binding will instruct each `PipelineOwner` of that tree to flush layout, paint, semantics etc. A higher-level abstraction (e.g. the widgets layer, see below) is in charge of adding `PipelineOwner`s to this tree. * Backwards compatibility: The old `renderView` and `pipelineOwner` properties of the `RendererBinding` are retained, but marked as deprecated. Care has been taken to keep their original behavior for the deprecation period, i.e. if you just call `runApp`, the render tree bootstrapped by this call is rooted in the deprecated `RendererBinding.renderView` and managed by the deprecated `RendererBinding.pipelineOwner`. ### Widgets layer changes * The `WidgetsBinding` no longer attaches the widget tree to an existing render tree. Instead, it bootstraps a stand-alone widget tree that is not backed by a render tree. For this, `RenderObjectToWidgetAdapter` has been replaced by `RootWidget`. * Multiple render trees can be bootstrapped and attached to the widget tree with the help of the `View` widget, which internally is backed by a `RawView` widget. Configured with a `FlutterView` to render into, the `RawView` creates a new `PipelineOwner` and a new `RenderView` for the new render tree. It adds the new `RenderView` to the `RendererBinding` and its `PipelineOwner` to the pipeline owner tree. * The `View` widget can only appear in certain well-defined locations in the widget tree since it bootstraps a new render tree and does not insert a `RenderObject` into an ancestor. However, almost all Elements expect that their children insert `RenderObject`s, otherwise they will not function properly. To produce a good error message when the `View` widget is used in an illegal location, the `debugMustInsertRenderObjectIntoSlot` method has been added to Element, where a child can ask whether a given slot must insert a RenderObject into its ancestor or not. In practice, the `View` widget can be used as a child of the `RootWidget`, inside the `view` slot of the `ViewAnchor` (see below) and inside a `ViewCollection` (see below). In those locations, the `View` widget may be wrapped in other non-RenderObjectWidgets (e.g. InheritedWidgets). * The new `ViewAnchor` can be used to create a side-view inside a parent `View`. The `child` of the `ViewAnchor` widget renders into the parent `View` as usual, but the `view` slot can take on another `View` widget, which has access to all inherited widgets above the `ViewAnchor`. Metaphorically speaking, the view is anchored to the location of the `ViewAnchor` in the widget tree. * The new `ViewCollection` widget allows for multiple sibling views as it takes a list of `View`s as children. It can be used in all the places that accept a `View` widget. ## Google3 As of July 5, 2023 this change passed a TAP global presubmit (TGP) in google3: tap/OCL:544707016:BASE:545809771:1688597935864:e43dd651 ## Note to reviewers This change is big (sorry). I suggest focusing the initial review on the changes inside of `packages/flutter` first. The majority of the changes describe above are implemented in (listed in suggested review order): * `rendering/binding.dart` * `widgets/binding.dart` * `widgets/view.dart` * `widgets/framework.dart` All other changes included in the PR are basically the fallout of what's implemented in those files. Also note that a lot of the lines added in this PR are documentation and tests. I am also very happy to walk reviewers through the code in person or via video call, if that is helpful. I appreciate any feedback. ## Feedback to address before submitting ("TODO")
379 lines
13 KiB
Dart
379 lines
13 KiB
Dart
// Copyright 2014 The Flutter Authors. All rights reserved.
|
|
// Use of this source code is governed by a BSD-style license that can be
|
|
// found in the LICENSE file.
|
|
|
|
import 'package:flutter/foundation.dart';
|
|
import 'package:flutter/material.dart';
|
|
import 'package:flutter/rendering.dart';
|
|
import 'package:flutter/widgets.dart';
|
|
import 'package:flutter_test/flutter_test.dart';
|
|
|
|
import '../rendering/mock_canvas.dart';
|
|
|
|
const Color green = Color(0xFF00FF00);
|
|
const Color yellow = Color(0xFFFFFF00);
|
|
|
|
void main() {
|
|
testWidgets('SlottedRenderObjectWidget test', (WidgetTester tester) async {
|
|
await tester.pumpWidget(buildWidget(
|
|
topLeft: Container(
|
|
height: 100,
|
|
width: 80,
|
|
color: yellow,
|
|
child: const Text('topLeft'),
|
|
),
|
|
bottomRight: Container(
|
|
height: 120,
|
|
width: 110,
|
|
color: green,
|
|
child: const Text('bottomRight'),
|
|
),
|
|
));
|
|
|
|
expect(find.text('topLeft'), findsOneWidget);
|
|
expect(find.text('bottomRight'), findsOneWidget);
|
|
expect(tester.getSize(find.byType(_Diagonal)), const Size(80 + 110, 100 + 120));
|
|
expect(find.byType(_Diagonal), paints
|
|
..rect(
|
|
rect: const Rect.fromLTWH(0, 0, 80, 100),
|
|
color: yellow,
|
|
)
|
|
..rect(
|
|
rect: const Rect.fromLTWH(80, 100, 110, 120),
|
|
color: green,
|
|
)
|
|
);
|
|
|
|
await tester.pumpWidget(buildWidget(
|
|
topLeft: Container(
|
|
height: 200,
|
|
width: 100,
|
|
color: yellow,
|
|
child: const Text('topLeft'),
|
|
),
|
|
bottomRight: Container(
|
|
height: 220,
|
|
width: 210,
|
|
color: green,
|
|
child: const Text('bottomRight'),
|
|
),
|
|
));
|
|
|
|
expect(find.text('topLeft'), findsOneWidget);
|
|
expect(find.text('bottomRight'), findsOneWidget);
|
|
expect(tester.getSize(find.byType(_Diagonal)), const Size(100 + 210, 200 + 220));
|
|
expect(find.byType(_Diagonal), paints
|
|
..rect(
|
|
rect: const Rect.fromLTWH(0, 0, 100, 200),
|
|
color: yellow,
|
|
)
|
|
..rect(
|
|
rect: const Rect.fromLTWH(100, 200, 210, 220),
|
|
color: green,
|
|
)
|
|
);
|
|
|
|
await tester.pumpWidget(buildWidget(
|
|
topLeft: Container(
|
|
height: 200,
|
|
width: 100,
|
|
color: yellow,
|
|
child: const Text('topLeft'),
|
|
),
|
|
bottomRight: Container(
|
|
key: UniqueKey(),
|
|
height: 230,
|
|
width: 220,
|
|
color: green,
|
|
child: const Text('bottomRight'),
|
|
),
|
|
));
|
|
|
|
expect(find.text('topLeft'), findsOneWidget);
|
|
expect(find.text('bottomRight'), findsOneWidget);
|
|
expect(tester.getSize(find.byType(_Diagonal)), const Size(100 + 220, 200 + 230));
|
|
expect(find.byType(_Diagonal), paints
|
|
..rect(
|
|
rect: const Rect.fromLTWH(0, 0, 100, 200),
|
|
color: yellow,
|
|
)
|
|
..rect(
|
|
rect: const Rect.fromLTWH(100, 200, 220, 230),
|
|
color: green,
|
|
)
|
|
);
|
|
|
|
await tester.pumpWidget(buildWidget(
|
|
topLeft: Container(
|
|
height: 200,
|
|
width: 100,
|
|
color: yellow,
|
|
child: const Text('topLeft'),
|
|
),
|
|
));
|
|
|
|
expect(find.text('topLeft'), findsOneWidget);
|
|
expect(find.text('bottomRight'), findsNothing);
|
|
expect(tester.getSize(find.byType(_Diagonal)), const Size(100, 200));
|
|
expect(find.byType(_Diagonal), paints
|
|
..rect(
|
|
rect: const Rect.fromLTWH(0, 0, 100, 200),
|
|
color: yellow,
|
|
)
|
|
);
|
|
|
|
await tester.pumpWidget(buildWidget());
|
|
expect(find.text('topLeft'), findsNothing);
|
|
expect(find.text('bottomRight'), findsNothing);
|
|
expect(tester.getSize(find.byType(_Diagonal)), Size.zero);
|
|
expect(find.byType(_Diagonal), paintsNothing);
|
|
|
|
await tester.pumpWidget(Container());
|
|
expect(find.byType(_Diagonal), findsNothing);
|
|
});
|
|
|
|
test('nameForSlot', () {
|
|
expect(_RenderDiagonal().publicNameForSlot(_DiagonalSlot.bottomRight), 'bottomRight');
|
|
expect(_RenderDiagonal().publicNameForSlot(_DiagonalSlot.topLeft), 'topLeft');
|
|
final _Slot slot = _Slot();
|
|
expect(_RenderTest().publicNameForSlot(slot), slot.toString());
|
|
});
|
|
|
|
testWidgets('key reparenting', (WidgetTester tester) async {
|
|
const Widget widget1 = SizedBox(key: ValueKey<String>('smol'), height: 10, width: 10);
|
|
const Widget widget2 = SizedBox(key: ValueKey<String>('big'), height: 100, width: 100);
|
|
const Widget nullWidget = SizedBox(key: ValueKey<String>('null'), height: 50, width: 50);
|
|
|
|
await tester.pumpWidget(buildWidget(topLeft: widget1, bottomRight: widget2, nullSlot: nullWidget));
|
|
final _RenderDiagonal renderObject = tester.renderObject(find.byType(_Diagonal));
|
|
expect(renderObject._topLeft!.size, const Size(10, 10));
|
|
expect(renderObject._bottomRight!.size, const Size(100, 100));
|
|
expect(renderObject._nullSlot!.size, const Size(50, 50));
|
|
|
|
final Element widget1Element = tester.element(find.byWidget(widget1));
|
|
final Element widget2Element = tester.element(find.byWidget(widget2));
|
|
final Element nullWidgetElement = tester.element(find.byWidget(nullWidget));
|
|
|
|
// Swapping 1 and 2.
|
|
await tester.pumpWidget(buildWidget(topLeft: widget2, bottomRight: widget1, nullSlot: nullWidget));
|
|
expect(renderObject._topLeft!.size, const Size(100, 100));
|
|
expect(renderObject._bottomRight!.size, const Size(10, 10));
|
|
expect(renderObject._nullSlot!.size, const Size(50, 50));
|
|
expect(widget1Element, same(tester.element(find.byWidget(widget1))));
|
|
expect(widget2Element, same(tester.element(find.byWidget(widget2))));
|
|
expect(nullWidgetElement, same(tester.element(find.byWidget(nullWidget))));
|
|
|
|
// Shifting slots
|
|
await tester.pumpWidget(buildWidget(topLeft: nullWidget, bottomRight: widget2, nullSlot: widget1));
|
|
expect(renderObject._topLeft!.size, const Size(50, 50));
|
|
expect(renderObject._bottomRight!.size, const Size(100, 100));
|
|
expect(renderObject._nullSlot!.size, const Size(10, 10));
|
|
expect(widget1Element, same(tester.element(find.byWidget(widget1))));
|
|
expect(widget2Element, same(tester.element(find.byWidget(widget2))));
|
|
expect(nullWidgetElement, same(tester.element(find.byWidget(nullWidget))));
|
|
|
|
// Moving + Deleting.
|
|
await tester.pumpWidget(buildWidget(bottomRight: widget2));
|
|
expect(renderObject._topLeft, null);
|
|
expect(renderObject._bottomRight!.size, const Size(100, 100));
|
|
expect(renderObject._nullSlot, null);
|
|
expect(widget1Element.debugIsDefunct, isTrue);
|
|
expect(nullWidgetElement.debugIsDefunct, isTrue);
|
|
expect(widget2Element, same(tester.element(find.byWidget(widget2))));
|
|
|
|
// Moving.
|
|
await tester.pumpWidget(buildWidget(topLeft: widget2));
|
|
expect(renderObject._topLeft!.size, const Size(100, 100));
|
|
expect(renderObject._bottomRight, null);
|
|
expect(widget2Element, same(tester.element(find.byWidget(widget2))));
|
|
});
|
|
|
|
testWidgets('duplicated key error message', (WidgetTester tester) async {
|
|
const Widget widget1 = SizedBox(key: ValueKey<String>('widget 1'), height: 10, width: 10);
|
|
const Widget widget2 = SizedBox(key: ValueKey<String>('widget 1'), height: 100, width: 100);
|
|
const Widget widget3 = SizedBox(key: ValueKey<String>('widget 1'), height: 50, width: 50);
|
|
|
|
await tester.pumpWidget(buildWidget(topLeft: widget1, bottomRight: widget2, nullSlot: widget3));
|
|
|
|
expect((tester.takeException() as FlutterError).toString(), equalsIgnoringHashCodes(
|
|
'Multiple widgets used the same key in _Diagonal.\n'
|
|
"The key [<'widget 1'>] was used by multiple widgets. The offending widgets were:\n"
|
|
" - SizedBox-[<'widget 1'>](width: 50.0, height: 50.0, renderObject: RenderConstrainedBox#00000 NEEDS-LAYOUT NEEDS-PAINT)\n"
|
|
" - SizedBox-[<'widget 1'>](width: 10.0, height: 10.0, renderObject: RenderConstrainedBox#00000 NEEDS-LAYOUT NEEDS-PAINT)\n"
|
|
" - SizedBox-[<'widget 1'>](width: 100.0, height: 100.0, renderObject: RenderConstrainedBox#a4685 NEEDS-LAYOUT NEEDS-PAINT)\n"
|
|
'A key can only be specified on one widget at a time in the same parent widget.'
|
|
));
|
|
});
|
|
|
|
testWidgets('debugDescribeChildren', (WidgetTester tester) async {
|
|
await tester.pumpWidget(buildWidget(
|
|
topLeft: const SizedBox(
|
|
height: 100,
|
|
width: 80,
|
|
),
|
|
bottomRight: const SizedBox(
|
|
height: 120,
|
|
width: 110,
|
|
),
|
|
));
|
|
|
|
expect(
|
|
tester.renderObject(find.byType(_Diagonal)).toStringDeep(),
|
|
equalsIgnoringHashCodes(
|
|
'_RenderDiagonal#00000 relayoutBoundary=up1\n'
|
|
' │ creator: _Diagonal ← Align ← Directionality ← MediaQuery ←\n'
|
|
' │ _MediaQueryFromView ← _PipelineOwnerScope ← _ViewScope ←\n'
|
|
' │ _RawView-[_DeprecatedRawViewKey TestFlutterView#00000] ← View ←\n'
|
|
' │ [root]\n'
|
|
' │ parentData: offset=Offset(0.0, 0.0) (can use size)\n'
|
|
' │ constraints: BoxConstraints(0.0<=w<=800.0, 0.0<=h<=600.0)\n'
|
|
' │ size: Size(190.0, 220.0)\n'
|
|
' │\n'
|
|
' ├─topLeft: RenderConstrainedBox#00000 relayoutBoundary=up2\n'
|
|
' │ creator: SizedBox ← _Diagonal ← Align ← Directionality ←\n'
|
|
' │ MediaQuery ← _MediaQueryFromView ← _PipelineOwnerScope ←\n'
|
|
' │ _ViewScope ← _RawView-[_DeprecatedRawViewKey\n'
|
|
' │ TestFlutterView#00000] ← View ← [root]\n'
|
|
' │ parentData: offset=Offset(0.0, 0.0) (can use size)\n'
|
|
' │ constraints: BoxConstraints(unconstrained)\n'
|
|
' │ size: Size(80.0, 100.0)\n'
|
|
' │ additionalConstraints: BoxConstraints(w=80.0, h=100.0)\n'
|
|
' │\n'
|
|
' └─bottomRight: RenderConstrainedBox#00000 relayoutBoundary=up2\n'
|
|
' creator: SizedBox ← _Diagonal ← Align ← Directionality ←\n'
|
|
' MediaQuery ← _MediaQueryFromView ← _PipelineOwnerScope ←\n'
|
|
' _ViewScope ← _RawView-[_DeprecatedRawViewKey\n'
|
|
' TestFlutterView#00000] ← View ← [root]\n'
|
|
' parentData: offset=Offset(80.0, 100.0) (can use size)\n'
|
|
' constraints: BoxConstraints(unconstrained)\n'
|
|
' size: Size(110.0, 120.0)\n'
|
|
' additionalConstraints: BoxConstraints(w=110.0, h=120.0)\n',
|
|
)
|
|
);
|
|
});
|
|
}
|
|
|
|
Widget buildWidget({Widget? topLeft, Widget? bottomRight, Widget? nullSlot}) {
|
|
return Directionality(
|
|
textDirection: TextDirection.ltr,
|
|
child: Align(
|
|
alignment: Alignment.topLeft,
|
|
child: _Diagonal(
|
|
topLeft: topLeft,
|
|
bottomRight: bottomRight,
|
|
nullSlot: nullSlot,
|
|
),
|
|
),
|
|
);
|
|
}
|
|
|
|
enum _DiagonalSlot {
|
|
topLeft,
|
|
bottomRight,
|
|
}
|
|
|
|
class _Diagonal extends RenderObjectWidget with SlottedMultiChildRenderObjectWidgetMixin<_DiagonalSlot?, RenderBox> {
|
|
const _Diagonal({
|
|
this.topLeft,
|
|
this.bottomRight,
|
|
this.nullSlot,
|
|
});
|
|
|
|
final Widget? topLeft;
|
|
final Widget? bottomRight;
|
|
final Widget? nullSlot;
|
|
|
|
@override
|
|
Iterable<_DiagonalSlot?> get slots => <_DiagonalSlot?>[null, ..._DiagonalSlot.values];
|
|
|
|
@override
|
|
Widget? childForSlot(_DiagonalSlot? slot) {
|
|
switch (slot) {
|
|
case null:
|
|
return nullSlot;
|
|
case _DiagonalSlot.topLeft:
|
|
return topLeft;
|
|
case _DiagonalSlot.bottomRight:
|
|
return bottomRight;
|
|
}
|
|
}
|
|
|
|
@override
|
|
SlottedContainerRenderObjectMixin<_DiagonalSlot?, RenderBox> createRenderObject(
|
|
BuildContext context,
|
|
) {
|
|
return _RenderDiagonal();
|
|
}
|
|
}
|
|
|
|
class _RenderDiagonal extends RenderBox with SlottedContainerRenderObjectMixin<_DiagonalSlot?, RenderBox> {
|
|
RenderBox? get _topLeft => childForSlot(_DiagonalSlot.topLeft);
|
|
RenderBox? get _bottomRight => childForSlot(_DiagonalSlot.bottomRight);
|
|
RenderBox? get _nullSlot => childForSlot(null);
|
|
|
|
@override
|
|
void performLayout() {
|
|
const BoxConstraints childConstraints = BoxConstraints();
|
|
|
|
Size topLeftSize = Size.zero;
|
|
if (_topLeft != null) {
|
|
_topLeft!.layout(childConstraints, parentUsesSize: true);
|
|
_positionChild(_topLeft!, Offset.zero);
|
|
topLeftSize = _topLeft!.size;
|
|
}
|
|
|
|
Size bottomRightSize = Size.zero;
|
|
if (_bottomRight != null) {
|
|
_bottomRight!.layout(childConstraints, parentUsesSize: true);
|
|
_positionChild(
|
|
_bottomRight!,
|
|
Offset(topLeftSize.width, topLeftSize.height),
|
|
);
|
|
bottomRightSize = _bottomRight!.size;
|
|
}
|
|
|
|
Size nullSlotSize = Size.zero;
|
|
final RenderBox? nullSlot = _nullSlot;
|
|
if (nullSlot != null) {
|
|
nullSlot.layout(childConstraints, parentUsesSize: true);
|
|
_positionChild(nullSlot, Offset.zero);
|
|
nullSlotSize = nullSlot.size;
|
|
}
|
|
|
|
size = constraints.constrain(Size(
|
|
topLeftSize.width + bottomRightSize.width + nullSlotSize.width,
|
|
topLeftSize.height + bottomRightSize.height + nullSlotSize.height,
|
|
));
|
|
}
|
|
|
|
void _positionChild(RenderBox child, Offset offset) {
|
|
(child.parentData! as BoxParentData).offset = offset;
|
|
}
|
|
|
|
@override
|
|
void paint(PaintingContext context, Offset offset) {
|
|
if (_topLeft != null) {
|
|
_paintChild(_topLeft!, context, offset);
|
|
}
|
|
if (_bottomRight != null) {
|
|
_paintChild(_bottomRight!, context, offset);
|
|
}
|
|
}
|
|
|
|
void _paintChild(RenderBox child, PaintingContext context, Offset offset) {
|
|
final BoxParentData childParentData = child.parentData! as BoxParentData;
|
|
context.paintChild(child, childParentData.offset + offset);
|
|
}
|
|
|
|
String publicNameForSlot(_DiagonalSlot slot) => debugNameForSlot(slot);
|
|
}
|
|
|
|
class _Slot {
|
|
@override
|
|
String toString() => describeIdentity(this);
|
|
}
|
|
|
|
class _RenderTest extends RenderBox with SlottedContainerRenderObjectMixin<_Slot, RenderBox> {
|
|
String publicNameForSlot(_Slot slot) => debugNameForSlot(slot);
|
|
}
|