[mutter] clutter/stage-window: Pass 'view' to finish_frame() too



commit 722f7ae2c33a08b93e5cbdbf4efe1436e8aa845e
Author: Jonas Ã…dahl <jadahl gmail com>
Date:   Fri Oct 9 18:02:03 2020 +0200

    clutter/stage-window: Pass 'view' to finish_frame() too
    
    Not used yet, just done separately to decrease future diffs.
    
    Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1488>

 clutter/clutter/clutter-stage-view.c            | 2 +-
 clutter/clutter/clutter-stage-window.c          | 5 +++--
 clutter/clutter/clutter-stage-window.h          | 6 ++++--
 src/backends/native/meta-stage-native.c         | 3 ++-
 src/backends/x11/nested/meta-stage-x11-nested.c | 3 ++-
 5 files changed, 12 insertions(+), 7 deletions(-)
---
diff --git a/clutter/clutter/clutter-stage-view.c b/clutter/clutter/clutter-stage-view.c
index 8123eb7db5..d406ee37ce 100644
--- a/clutter/clutter/clutter-stage-view.c
+++ b/clutter/clutter/clutter-stage-view.c
@@ -1106,7 +1106,7 @@ handle_frame_clock_frame (ClutterFrameClock *frame_clock,
 
       clutter_stage_emit_after_paint (stage, view);
 
-      _clutter_stage_window_finish_frame (stage_window);
+      _clutter_stage_window_finish_frame (stage_window, view);
 
       result = CLUTTER_FRAME_RESULT_PENDING_PRESENTED;
     }
diff --git a/clutter/clutter/clutter-stage-window.c b/clutter/clutter/clutter-stage-window.c
index e4e358e6fe..2d3192df08 100644
--- a/clutter/clutter/clutter-stage-window.c
+++ b/clutter/clutter/clutter-stage-window.c
@@ -134,12 +134,13 @@ _clutter_stage_window_get_views (ClutterStageWindow *window)
 }
 
 void
-_clutter_stage_window_finish_frame (ClutterStageWindow *window)
+_clutter_stage_window_finish_frame (ClutterStageWindow *window,
+                                    ClutterStageView   *view)
 {
   ClutterStageWindowInterface *iface = CLUTTER_STAGE_WINDOW_GET_IFACE (window);
 
   if (iface->finish_frame)
-    iface->finish_frame (window);
+    iface->finish_frame (window, view);
 }
 
 int64_t
diff --git a/clutter/clutter/clutter-stage-window.h b/clutter/clutter/clutter-stage-window.h
index b4bb1a1bd0..0f2d5bc286 100644
--- a/clutter/clutter/clutter-stage-window.h
+++ b/clutter/clutter/clutter-stage-window.h
@@ -51,7 +51,8 @@ struct _ClutterStageWindowInterface
 
   GList            *(* get_views)               (ClutterStageWindow *stage_window);
   int64_t           (* get_frame_counter)       (ClutterStageWindow *stage_window);
-  void              (* finish_frame)            (ClutterStageWindow *stage_window);
+  void              (* finish_frame)            (ClutterStageWindow *stage_window,
+                                                 ClutterStageView   *view);
 };
 
 ClutterActor *    _clutter_stage_window_get_wrapper        (ClutterStageWindow *window);
@@ -85,7 +86,8 @@ gboolean          _clutter_stage_window_can_clip_redraws        (ClutterStageWin
 
 GList *           _clutter_stage_window_get_views               (ClutterStageWindow *window);
 
-void              _clutter_stage_window_finish_frame            (ClutterStageWindow *window);
+void              _clutter_stage_window_finish_frame            (ClutterStageWindow *window,
+                                                                 ClutterStageView   *view);
 
 int64_t           _clutter_stage_window_get_frame_counter       (ClutterStageWindow *window);
 
diff --git a/src/backends/native/meta-stage-native.c b/src/backends/native/meta-stage-native.c
index ab519886d2..00c868c422 100644
--- a/src/backends/native/meta-stage-native.c
+++ b/src/backends/native/meta-stage-native.c
@@ -106,7 +106,8 @@ meta_stage_native_get_views (ClutterStageWindow *stage_window)
 }
 
 static void
-meta_stage_native_finish_frame (ClutterStageWindow *stage_window)
+meta_stage_native_finish_frame (ClutterStageWindow *stage_window,
+                                ClutterStageView   *stage_view)
 {
   MetaBackend *backend = meta_get_backend ();
   MetaRenderer *renderer = meta_backend_get_renderer (backend);
diff --git a/src/backends/x11/nested/meta-stage-x11-nested.c b/src/backends/x11/nested/meta-stage-x11-nested.c
index 165d40c943..6dfd7cb2fd 100644
--- a/src/backends/x11/nested/meta-stage-x11-nested.c
+++ b/src/backends/x11/nested/meta-stage-x11-nested.c
@@ -158,7 +158,8 @@ draw_view (MetaStageX11Nested *stage_nested,
 }
 
 static void
-meta_stage_x11_nested_finish_frame (ClutterStageWindow *stage_window)
+meta_stage_x11_nested_finish_frame (ClutterStageWindow *stage_window,
+                                    ClutterStageView   *stage_view)
 {
   MetaStageX11Nested *stage_nested = META_STAGE_X11_NESTED (stage_window);
   MetaStageX11 *stage_x11 = META_STAGE_X11 (stage_window);


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]