Skip to content

Commit 78e111f

Browse files
Refactor compositor classes (#171414)
Present frames directly to each view, which maintains its own compositor. This simplifies the compositor so it doesn't need to maintain a map from views to buffers.
1 parent 596b149 commit 78e111f

17 files changed

Lines changed: 389 additions & 554 deletions

‎engine/src/flutter/shell/platform/linux/fl_compositor.cc‎

Lines changed: 1 addition & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -18,28 +18,6 @@ FlutterRendererType fl_compositor_get_renderer_type(FlCompositor* self) {
1818
return FL_COMPOSITOR_GET_CLASS(self)->get_renderer_type(self);
1919
}
2020

21-
void fl_compositor_setup(FlCompositor* self) {
22-
g_return_if_fail(FL_IS_COMPOSITOR(self));
23-
FL_COMPOSITOR_GET_CLASS(self)->setup(self);
24-
}
25-
26-
gboolean fl_compositor_create_backing_store(
27-
FlCompositor* self,
28-
const FlutterBackingStoreConfig* config,
29-
FlutterBackingStore* backing_store_out) {
30-
g_return_val_if_fail(FL_IS_COMPOSITOR(self), FALSE);
31-
return FL_COMPOSITOR_GET_CLASS(self)->create_backing_store(self, config,
32-
backing_store_out);
33-
}
34-
35-
gboolean fl_compositor_collect_backing_store(
36-
FlCompositor* self,
37-
const FlutterBackingStore* backing_store) {
38-
g_return_val_if_fail(FL_IS_COMPOSITOR(self), FALSE);
39-
return FL_COMPOSITOR_GET_CLASS(self)->collect_backing_store(self,
40-
backing_store);
41-
}
42-
4321
void fl_compositor_wait_for_frame(FlCompositor* self,
4422
int target_width,
4523
int target_height) {
@@ -49,10 +27,9 @@ void fl_compositor_wait_for_frame(FlCompositor* self,
4927
}
5028

5129
gboolean fl_compositor_present_layers(FlCompositor* self,
52-
FlutterViewId view_id,
5330
const FlutterLayer** layers,
5431
size_t layers_count) {
5532
g_return_val_if_fail(FL_IS_COMPOSITOR(self), FALSE);
56-
return FL_COMPOSITOR_GET_CLASS(self)->present_layers(self, view_id, layers,
33+
return FL_COMPOSITOR_GET_CLASS(self)->present_layers(self, layers,
5734
layers_count);
5835
}

‎engine/src/flutter/shell/platform/linux/fl_compositor.h‎

Lines changed: 0 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -18,17 +18,7 @@ struct _FlCompositorClass {
1818

1919
FlutterRendererType (*get_renderer_type)(FlCompositor* compositor);
2020

21-
void (*setup)(FlCompositor* compositor);
22-
23-
gboolean (*create_backing_store)(FlCompositor* compositor,
24-
const FlutterBackingStoreConfig* config,
25-
FlutterBackingStore* backing_store_out);
26-
27-
gboolean (*collect_backing_store)(FlCompositor* compositor,
28-
const FlutterBackingStore* backing_store);
29-
3021
gboolean (*present_layers)(FlCompositor* compositor,
31-
FlutterViewId view_id,
3222
const FlutterLayer** layers,
3323
size_t layers_count);
3424

@@ -53,47 +43,9 @@ struct _FlCompositorClass {
5343
*/
5444
FlutterRendererType fl_compositor_get_renderer_type(FlCompositor* compositor);
5545

56-
/**
57-
* fl_compositor_setup:
58-
* @compositor: an #FlCompositor.
59-
*
60-
* Creates resources required before rendering.
61-
*/
62-
void fl_compositor_setup(FlCompositor* compositor);
63-
64-
/**
65-
* fl_compositor_create_backing_store:
66-
* @compositor: an #FlCompositor.
67-
* @config: backing store config.
68-
* @backing_store_out: saves created backing store.
69-
*
70-
* Obtain a backing store for a specific #FlutterLayer.
71-
*
72-
* Returns %TRUE if successful.
73-
*/
74-
gboolean fl_compositor_create_backing_store(
75-
FlCompositor* compositor,
76-
const FlutterBackingStoreConfig* config,
77-
FlutterBackingStore* backing_store_out);
78-
79-
/**
80-
* fl_compositor_collect_backing_store:
81-
* @compositor: an #FlCompositor.
82-
* @backing_store: backing store to be released.
83-
*
84-
* A callback invoked by the engine to release the backing store. The
85-
* embedder may collect any resources associated with the backing store.
86-
*
87-
* Returns %TRUE if successful.
88-
*/
89-
gboolean fl_compositor_collect_backing_store(
90-
FlCompositor* compositor,
91-
const FlutterBackingStore* backing_store);
92-
9346
/**
9447
* fl_compositor_present_layers:
9548
* @compositor: an #FlCompositor.
96-
* @view_id: view to present.
9749
* @layers: layers to be composited.
9850
* @layers_count: number of layers.
9951
*
@@ -103,7 +55,6 @@ gboolean fl_compositor_collect_backing_store(
10355
* Returns %TRUE if successful.
10456
*/
10557
gboolean fl_compositor_present_layers(FlCompositor* compositor,
106-
FlutterViewId view_id,
10758
const FlutterLayer** layers,
10859
size_t layers_count);
10960

0 commit comments

Comments
 (0)