Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Make SceneBuilder.push* not return nullable objects #25991

Merged
merged 2 commits into from
May 8, 2021
Merged

Make SceneBuilder.push* not return nullable objects #25991

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
46b120f
Make SceneBuilder.push* not return nullable objects
dnfield May 6, 2021
15c177e
Merge remote-tracking branch 'upstream/master' into scene_nnbd
dnfield May 8, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions lib/ui/compositing.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,7 @@ class SceneBuilder extends NativeFieldWrapperClass2 {
/// {@endtemplate}
///
/// See [pop] for details about the operation stack.
TransformEngineLayer? pushTransform(
TransformEngineLayer pushTransform(
Float64List matrix4, {
TransformEngineLayer? oldLayer,
}) {
Expand All @@ -308,7 +308,7 @@ class SceneBuilder extends NativeFieldWrapperClass2 {
/// {@macro dart.ui.sceneBuilder.oldLayerVsRetained}
///
/// See [pop] for details about the operation stack.
OffsetEngineLayer? pushOffset(
OffsetEngineLayer pushOffset(
double dx,
double dy, {
OffsetEngineLayer? oldLayer,
Expand All @@ -334,7 +334,7 @@ class SceneBuilder extends NativeFieldWrapperClass2 {
///
/// See [pop] for details about the operation stack, and [Clip] for different clip modes.
/// By default, the clip will be anti-aliased (clip = [Clip.antiAlias]).
ClipRectEngineLayer? pushClipRect(
ClipRectEngineLayer pushClipRect(
Rect rect, {
Clip clipBehavior = Clip.antiAlias,
ClipRectEngineLayer? oldLayer,
Expand Down Expand Up @@ -363,7 +363,7 @@ class SceneBuilder extends NativeFieldWrapperClass2 {
///
/// See [pop] for details about the operation stack, and [Clip] for different clip modes.
/// By default, the clip will be anti-aliased (clip = [Clip.antiAlias]).
ClipRRectEngineLayer? pushClipRRect(
ClipRRectEngineLayer pushClipRRect(
RRect rrect, {
Clip clipBehavior = Clip.antiAlias,
ClipRRectEngineLayer? oldLayer,
Expand Down Expand Up @@ -391,7 +391,7 @@ class SceneBuilder extends NativeFieldWrapperClass2 {
///
/// See [pop] for details about the operation stack. See [Clip] for different clip modes.
/// By default, the clip will be anti-aliased (clip = [Clip.antiAlias]).
ClipPathEngineLayer? pushClipPath(
ClipPathEngineLayer pushClipPath(
Path path, {
Clip clipBehavior = Clip.antiAlias,
ClipPathEngineLayer? oldLayer,
Expand Down Expand Up @@ -421,7 +421,7 @@ class SceneBuilder extends NativeFieldWrapperClass2 {
/// {@macro dart.ui.sceneBuilder.oldLayerVsRetained}
///
/// See [pop] for details about the operation stack.
OpacityEngineLayer? pushOpacity(
OpacityEngineLayer pushOpacity(
int alpha, {
Offset? offset = Offset.zero,
OpacityEngineLayer? oldLayer,
Expand All @@ -447,7 +447,7 @@ class SceneBuilder extends NativeFieldWrapperClass2 {
/// {@macro dart.ui.sceneBuilder.oldLayerVsRetained}
///
/// See [pop] for details about the operation stack.
ColorFilterEngineLayer? pushColorFilter(
ColorFilterEngineLayer pushColorFilter(
ColorFilter filter, {
ColorFilterEngineLayer? oldLayer,
}) {
Expand Down Expand Up @@ -475,7 +475,7 @@ class SceneBuilder extends NativeFieldWrapperClass2 {
/// {@macro dart.ui.sceneBuilder.oldLayerVsRetained}
///
/// See [pop] for details about the operation stack.
ImageFilterEngineLayer? pushImageFilter(
ImageFilterEngineLayer pushImageFilter(
ImageFilter filter, {
ImageFilterEngineLayer? oldLayer,
}) {
Expand Down Expand Up @@ -504,7 +504,7 @@ class SceneBuilder extends NativeFieldWrapperClass2 {
/// {@macro dart.ui.sceneBuilder.oldLayerVsRetained}
///
/// See [pop] for details about the operation stack.
BackdropFilterEngineLayer? pushBackdropFilter(
BackdropFilterEngineLayer pushBackdropFilter(
ImageFilter filter, {
BlendMode blendMode = BlendMode.srcOver,
BackdropFilterEngineLayer? oldLayer,
Expand All @@ -530,7 +530,7 @@ class SceneBuilder extends NativeFieldWrapperClass2 {
/// {@macro dart.ui.sceneBuilder.oldLayerVsRetained}
///
/// See [pop] for details about the operation stack.
ShaderMaskEngineLayer? pushShaderMask(
ShaderMaskEngineLayer pushShaderMask(
Shader shader,
Rect maskRect,
BlendMode blendMode, {
Expand Down Expand Up @@ -582,7 +582,7 @@ class SceneBuilder extends NativeFieldWrapperClass2 {
/// {@macro dart.ui.sceneBuilder.oldLayerVsRetained}
///
/// See [pop] for details about the operation stack, and [Clip] for different clip modes.
PhysicalShapeEngineLayer? pushPhysicalShape({
PhysicalShapeEngineLayer pushPhysicalShape({
required Path path,
required double elevation,
required Color color,
Expand Down
14 changes: 7 additions & 7 deletions lib/web_ui/lib/src/engine/canvaskit/layer_scene_builder.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ class LayerSceneBuilder implements ui.SceneBuilder {
}

@override
BackdropFilterEngineLayer? pushBackdropFilter(
BackdropFilterEngineLayer pushBackdropFilter(
ui.ImageFilter filter, {
ui.BlendMode blendMode = ui.BlendMode.srcOver,
ui.EngineLayer? oldLayer,
Expand All @@ -110,7 +110,7 @@ class LayerSceneBuilder implements ui.SceneBuilder {
}

@override
ClipPathEngineLayer? pushClipPath(
ClipPathEngineLayer pushClipPath(
ui.Path path, {
ui.Clip clipBehavior = ui.Clip.antiAlias,
ui.EngineLayer? oldLayer,
Expand All @@ -119,7 +119,7 @@ class LayerSceneBuilder implements ui.SceneBuilder {
}

@override
ClipRRectEngineLayer? pushClipRRect(
ClipRRectEngineLayer pushClipRRect(
ui.RRect rrect, {
ui.Clip? clipBehavior,
ui.EngineLayer? oldLayer,
Expand All @@ -128,7 +128,7 @@ class LayerSceneBuilder implements ui.SceneBuilder {
}

@override
ClipRectEngineLayer? pushClipRect(
ClipRectEngineLayer pushClipRect(
ui.Rect rect, {
ui.Clip clipBehavior = ui.Clip.antiAlias,
ui.EngineLayer? oldLayer,
Expand All @@ -137,15 +137,15 @@ class LayerSceneBuilder implements ui.SceneBuilder {
}

@override
ColorFilterEngineLayer? pushColorFilter(
ColorFilterEngineLayer pushColorFilter(
ui.ColorFilter filter, {
ui.ColorFilterEngineLayer? oldLayer,
}) {
assert(filter != null); // ignore: unnecessary_null_comparison
return pushLayer<ColorFilterEngineLayer>(ColorFilterEngineLayer(filter));
}

ImageFilterEngineLayer? pushImageFilter(
ImageFilterEngineLayer pushImageFilter(
ui.ImageFilter filter, {
ui.ImageFilterEngineLayer? oldLayer,
}) {
Expand Down Expand Up @@ -202,7 +202,7 @@ class LayerSceneBuilder implements ui.SceneBuilder {
}

@override
TransformEngineLayer? pushTransform(
TransformEngineLayer pushTransform(
Float64List matrix4, {
ui.EngineLayer? oldLayer,
}) {
Expand Down
22 changes: 11 additions & 11 deletions lib/web_ui/lib/src/ui/compositing.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,56 +39,56 @@ abstract class SceneBuilder {
return engine.SurfaceSceneBuilder();
}
}
OffsetEngineLayer? pushOffset(
OffsetEngineLayer pushOffset(
double dx,
double dy, {
OffsetEngineLayer? oldLayer,
});
TransformEngineLayer? pushTransform(
TransformEngineLayer pushTransform(
Float64List matrix4, {
TransformEngineLayer? oldLayer,
});
ClipRectEngineLayer? pushClipRect(
ClipRectEngineLayer pushClipRect(
Rect rect, {
Clip clipBehavior = Clip.antiAlias,
ClipRectEngineLayer? oldLayer,
});
ClipRRectEngineLayer? pushClipRRect(
ClipRRectEngineLayer pushClipRRect(
RRect rrect, {
required Clip clipBehavior,
ClipRRectEngineLayer? oldLayer,
});
ClipPathEngineLayer? pushClipPath(
ClipPathEngineLayer pushClipPath(
Path path, {
Clip clipBehavior = Clip.antiAlias,
ClipPathEngineLayer? oldLayer,
});
OpacityEngineLayer? pushOpacity(
OpacityEngineLayer pushOpacity(
int alpha, {
Offset offset = Offset.zero,
OpacityEngineLayer? oldLayer,
});
ColorFilterEngineLayer? pushColorFilter(
ColorFilterEngineLayer pushColorFilter(
ColorFilter filter, {
ColorFilterEngineLayer? oldLayer,
});
ImageFilterEngineLayer? pushImageFilter(
ImageFilterEngineLayer pushImageFilter(
ImageFilter filter, {
ImageFilterEngineLayer? oldLayer,
});
BackdropFilterEngineLayer? pushBackdropFilter(
BackdropFilterEngineLayer pushBackdropFilter(
ImageFilter filter, {
BlendMode blendMode = BlendMode.srcOver,
BackdropFilterEngineLayer? oldLayer,
});
ShaderMaskEngineLayer? pushShaderMask(
ShaderMaskEngineLayer pushShaderMask(
Shader shader,
Rect maskRect,
BlendMode blendMode, {
ShaderMaskEngineLayer? oldLayer,
FilterQuality filterQuality = FilterQuality.low,
});
PhysicalShapeEngineLayer? pushPhysicalShape({
PhysicalShapeEngineLayer pushPhysicalShape({
required Path path,
required double elevation,
required Color color,
Expand Down