Skip to content

Commit 8306ee6

Browse files
Chris Yangiskakaushik
authored andcommitted
Move the mutators stack handling to preroll (flutter#9651)
* refactoring to move the mutator stack handling to preroll * more review fixes
1 parent 511b9f2 commit 8306ee6

18 files changed

Lines changed: 77 additions & 74 deletions

‎flow/embedded_views.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -185,14 +185,14 @@ class ExternalViewEmbedder {
185185

186186
virtual void BeginFrame(SkISize frame_size) = 0;
187187

188-
virtual void PrerollCompositeEmbeddedView(int view_id) = 0;
188+
virtual void PrerollCompositeEmbeddedView(
189+
int view_id,
190+
std::unique_ptr<EmbeddedViewParams> params) = 0;
189191

190192
virtual std::vector<SkCanvas*> GetCurrentCanvases() = 0;
191193

192194
// Must be called on the UI thread.
193-
virtual SkCanvas* CompositeEmbeddedView(
194-
int view_id,
195-
std::unique_ptr<flutter::EmbeddedViewParams> params) = 0;
195+
virtual SkCanvas* CompositeEmbeddedView(int view_id) = 0;
196196

197197
virtual bool SubmitFrame(GrContext* context);
198198

‎flow/layers/clip_path_layer.cc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,14 @@ void ClipPathLayer::Preroll(PrerollContext* context, const SkMatrix& matrix) {
2323
SkRect previous_cull_rect = context->cull_rect;
2424
SkRect clip_path_bounds = clip_path_.getBounds();
2525
if (context->cull_rect.intersect(clip_path_bounds)) {
26+
context->mutators_stack.pushClipPath(clip_path_);
2627
SkRect child_paint_bounds = SkRect::MakeEmpty();
2728
PrerollChildren(context, matrix, &child_paint_bounds);
2829

2930
if (child_paint_bounds.intersect(clip_path_bounds)) {
3031
set_paint_bounds(child_paint_bounds);
3132
}
33+
context->mutators_stack.pop();
3234
}
3335
context->cull_rect = previous_cull_rect;
3436
}
@@ -60,7 +62,6 @@ void ClipPathLayer::Paint(PaintContext& context) const {
6062
SkAutoCanvasRestore save(context.internal_nodes_canvas, true);
6163
context.internal_nodes_canvas->clipPath(clip_path_,
6264
clip_behavior_ != Clip::hardEdge);
63-
context.mutators_stack.pushClipPath(clip_path_);
6465

6566
if (clip_behavior_ == Clip::antiAliasWithSaveLayer) {
6667
context.internal_nodes_canvas->saveLayer(paint_bounds(), nullptr);
@@ -69,7 +70,6 @@ void ClipPathLayer::Paint(PaintContext& context) const {
6970
if (clip_behavior_ == Clip::antiAliasWithSaveLayer) {
7071
context.internal_nodes_canvas->restore();
7172
}
72-
context.mutators_stack.pop();
7373
}
7474

7575
} // namespace flutter

‎flow/layers/clip_rect_layer.cc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,14 @@ ClipRectLayer::~ClipRectLayer() = default;
1616
void ClipRectLayer::Preroll(PrerollContext* context, const SkMatrix& matrix) {
1717
SkRect previous_cull_rect = context->cull_rect;
1818
if (context->cull_rect.intersect(clip_rect_)) {
19+
context->mutators_stack.pushClipRect(clip_rect_);
1920
SkRect child_paint_bounds = SkRect::MakeEmpty();
2021
PrerollChildren(context, matrix, &child_paint_bounds);
2122

2223
if (child_paint_bounds.intersect(clip_rect_)) {
2324
set_paint_bounds(child_paint_bounds);
2425
}
26+
context->mutators_stack.pop();
2527
}
2628
context->cull_rect = previous_cull_rect;
2729
}
@@ -50,7 +52,6 @@ void ClipRectLayer::Paint(PaintContext& context) const {
5052
SkAutoCanvasRestore save(context.internal_nodes_canvas, true);
5153
context.internal_nodes_canvas->clipRect(clip_rect_,
5254
clip_behavior_ != Clip::hardEdge);
53-
context.mutators_stack.pushClipRect(clip_rect_);
5455

5556
if (clip_behavior_ == Clip::antiAliasWithSaveLayer) {
5657
context.internal_nodes_canvas->saveLayer(clip_rect_, nullptr);
@@ -59,7 +60,6 @@ void ClipRectLayer::Paint(PaintContext& context) const {
5960
if (clip_behavior_ == Clip::antiAliasWithSaveLayer) {
6061
context.internal_nodes_canvas->restore();
6162
}
62-
context.mutators_stack.pop();
6363
}
6464

6565
} // namespace flutter

‎flow/layers/clip_rrect_layer.cc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,14 @@ void ClipRRectLayer::Preroll(PrerollContext* context, const SkMatrix& matrix) {
1717
SkRect previous_cull_rect = context->cull_rect;
1818
SkRect clip_rrect_bounds = clip_rrect_.getBounds();
1919
if (context->cull_rect.intersect(clip_rrect_bounds)) {
20+
context->mutators_stack.pushClipRRect(clip_rrect_);
2021
SkRect child_paint_bounds = SkRect::MakeEmpty();
2122
PrerollChildren(context, matrix, &child_paint_bounds);
2223

2324
if (child_paint_bounds.intersect(clip_rrect_bounds)) {
2425
set_paint_bounds(child_paint_bounds);
2526
}
27+
context->mutators_stack.pop();
2628
}
2729
context->cull_rect = previous_cull_rect;
2830
}
@@ -58,7 +60,6 @@ void ClipRRectLayer::Paint(PaintContext& context) const {
5860
SkAutoCanvasRestore save(context.internal_nodes_canvas, true);
5961
context.internal_nodes_canvas->clipRRect(clip_rrect_,
6062
clip_behavior_ != Clip::hardEdge);
61-
context.mutators_stack.pushClipRRect(clip_rrect_);
6263

6364
if (clip_behavior_ == Clip::antiAliasWithSaveLayer) {
6465
context.internal_nodes_canvas->saveLayer(paint_bounds(), nullptr);
@@ -67,7 +68,6 @@ void ClipRRectLayer::Paint(PaintContext& context) const {
6768
if (clip_behavior_ == Clip::antiAliasWithSaveLayer) {
6869
context.internal_nodes_canvas->restore();
6970
}
70-
context.mutators_stack.pop();
7171
}
7272

7373
} // namespace flutter

‎flow/layers/layer.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ struct PrerollContext {
4848
RasterCache* raster_cache;
4949
GrContext* gr_context;
5050
ExternalViewEmbedder* view_embedder;
51+
MutatorsStack& mutators_stack;
5152
SkColorSpace* dst_color_space;
5253
SkRect cull_rect;
5354

@@ -83,7 +84,6 @@ class Layer {
8384
SkCanvas* leaf_nodes_canvas;
8485
GrContext* gr_context;
8586
ExternalViewEmbedder* view_embedder;
86-
MutatorsStack& mutators_stack;
8787
const Stopwatch& raster_time;
8888
const Stopwatch& ui_time;
8989
TextureRegistry& texture_registry;

‎flow/layers/layer_tree.cc‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,12 @@ void LayerTree::Preroll(CompositorContext::ScopedFrame& frame,
3131
frame.canvas() ? frame.canvas()->imageInfo().colorSpace() : nullptr;
3232
frame.context().raster_cache().SetCheckboardCacheImages(
3333
checkerboard_raster_cache_images_);
34+
MutatorsStack stack;
3435
PrerollContext context = {
3536
ignore_raster_cache ? nullptr : &frame.context().raster_cache(),
3637
frame.gr_context(),
3738
frame.view_embedder(),
39+
stack,
3840
color_space,
3941
kGiantRect,
4042
frame.context().raster_time(),
@@ -83,13 +85,11 @@ void LayerTree::Paint(CompositorContext::ScopedFrame& frame,
8385
}
8486
}
8587

86-
MutatorsStack stack;
8788
Layer::PaintContext context = {
8889
(SkCanvas*)&internal_nodes_canvas,
8990
frame.canvas(),
9091
frame.gr_context(),
9192
frame.view_embedder(),
92-
stack,
9393
frame.context().raster_time(),
9494
frame.context().ui_time(),
9595
frame.context().texture_registry(),
@@ -121,6 +121,7 @@ sk_sp<SkPicture> LayerTree::Flatten(const SkRect& bounds) {
121121
nullptr, // raster_cache (don't consult the cache)
122122
nullptr, // gr_context (used for the raster cache)
123123
nullptr, // external view embedder
124+
unused_stack, // mutator stack
124125
nullptr, // SkColorSpace* dst_color_space
125126
kGiantRect, // SkRect cull_rect
126127
unused_stopwatch, // frame time (dont care)
@@ -138,7 +139,6 @@ sk_sp<SkPicture> LayerTree::Flatten(const SkRect& bounds) {
138139
canvas, // canvas
139140
nullptr,
140141
nullptr,
141-
unused_stack,
142142
unused_stopwatch, // frame time (dont care)
143143
unused_stopwatch, // engine time (dont care)
144144
unused_texture_registry, // texture registry (not supported)

‎flow/layers/performance_overlay_layer_unittests.cc‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -47,13 +47,9 @@ TEST(PerformanceOverlayLayer, Gold) {
4747
ASSERT_TRUE(surface != nullptr);
4848

4949
flutter::TextureRegistry unused_texture_registry;
50-
flutter::MutatorsStack unused_stack;
5150
flutter::Layer::PaintContext paintContext = {
52-
nullptr, surface->getCanvas(),
53-
nullptr, nullptr,
54-
unused_stack, mock_stopwatch,
55-
mock_stopwatch, unused_texture_registry,
56-
nullptr, false};
51+
nullptr, surface->getCanvas(), nullptr, nullptr, mock_stopwatch,
52+
mock_stopwatch, unused_texture_registry, nullptr, false};
5753

5854
// Specify font file to ensure the same font across different operation
5955
// systems.

‎flow/layers/physical_shape_layer_unittests.cc‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,12 @@ TEST(PhysicalShapeLayer, TotalElevation) {
2828

2929
const Stopwatch unused_stopwatch;
3030
TextureRegistry unused_texture_registry;
31+
MutatorsStack unused_stack;
3132
PrerollContext preroll_context{
3233
nullptr, // raster_cache (don't consult the cache)
3334
nullptr, // gr_context (used for the raster cache)
3435
nullptr, // external view embedder
36+
unused_stack, // mutator stack
3537
nullptr, // SkColorSpace* dst_color_space
3638
kGiantRect, // SkRect cull_rect
3739
unused_stopwatch, // frame time (dont care)

‎flow/layers/platform_view_layer.cc‎

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,14 @@ void PlatformViewLayer::Preroll(PrerollContext* context,
2323
"does not support embedding";
2424
return;
2525
}
26-
context->view_embedder->PrerollCompositeEmbeddedView(view_id_);
26+
std::unique_ptr<EmbeddedViewParams> params =
27+
std::make_unique<EmbeddedViewParams>();
28+
params->offsetPixels =
29+
SkPoint::Make(matrix.getTranslateX(), matrix.getTranslateY());
30+
params->sizePoints = size_;
31+
params->mutatorsStack = context->mutators_stack;
32+
context->view_embedder->PrerollCompositeEmbeddedView(view_id_,
33+
std::move(params));
2734
}
2835

2936
void PlatformViewLayer::Paint(PaintContext& context) const {
@@ -32,16 +39,7 @@ void PlatformViewLayer::Paint(PaintContext& context) const {
3239
"does not support embedding";
3340
return;
3441
}
35-
std::unique_ptr<EmbeddedViewParams> params =
36-
std::make_unique<EmbeddedViewParams>();
37-
SkMatrix transform = context.leaf_nodes_canvas->getTotalMatrix();
38-
params->offsetPixels =
39-
SkPoint::Make(transform.getTranslateX(), transform.getTranslateY());
40-
params->sizePoints = size_;
41-
params->mutatorsStack = context.mutators_stack;
42-
43-
SkCanvas* canvas =
44-
context.view_embedder->CompositeEmbeddedView(view_id_, std::move(params));
42+
SkCanvas* canvas = context.view_embedder->CompositeEmbeddedView(view_id_);
4543
context.leaf_nodes_canvas = canvas;
4644
}
4745
} // namespace flutter

‎flow/layers/transform_layer.cc‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ TransformLayer::~TransformLayer() = default;
2929
void TransformLayer::Preroll(PrerollContext* context, const SkMatrix& matrix) {
3030
SkMatrix child_matrix;
3131
child_matrix.setConcat(matrix, transform_);
32-
32+
context->mutators_stack.pushTransform(transform_);
3333
SkRect previous_cull_rect = context->cull_rect;
3434
SkMatrix inverse_transform_;
3535
// Perspective projections don't produce rectangles that are useful for
@@ -47,6 +47,7 @@ void TransformLayer::Preroll(PrerollContext* context, const SkMatrix& matrix) {
4747
set_paint_bounds(child_paint_bounds);
4848

4949
context->cull_rect = previous_cull_rect;
50+
context->mutators_stack.pop();
5051
}
5152

5253
#if defined(OS_FUCHSIA)
@@ -66,10 +67,8 @@ void TransformLayer::Paint(PaintContext& context) const {
6667

6768
SkAutoCanvasRestore save(context.internal_nodes_canvas, true);
6869
context.internal_nodes_canvas->concat(transform_);
69-
context.mutators_stack.pushTransform(transform_);
7070

7171
PaintChildren(context);
72-
context.mutators_stack.pop();
7372
}
7473

7574
} // namespace flutter

0 commit comments

Comments
 (0)