From 39da6e10fad4311dd14d31b241534ae2c6d1c9b3 Mon Sep 17 00:00:00 2001
From: Bilal Elmoussaoui <belmouss@redhat.com>
Date: Tue, 20 Aug 2024 16:59:16 +0200
Subject: [PATCH] clutter/context: Move get_show_fps to it correct namespace

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3962>
---
 clutter/clutter/clutter-context-private.h | 2 ++
 clutter/clutter/clutter-context.c         | 6 ++++++
 clutter/clutter/clutter-main.c            | 8 --------
 clutter/clutter/clutter-private.h         | 2 --
 clutter/clutter/clutter-stage-view.c      | 7 ++++---
 5 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/clutter/clutter/clutter-context-private.h b/clutter/clutter/clutter-context-private.h
index 65dcf974a..34f9d35fe 100644
--- a/clutter/clutter/clutter-context-private.h
+++ b/clutter/clutter/clutter-context-private.h
@@ -48,3 +48,5 @@ struct _ClutterContext
 };
 
 ClutterStageManager * clutter_context_get_stage_manager (ClutterContext *context);
+
+gboolean clutter_context_get_show_fps (ClutterContext *context);
diff --git a/clutter/clutter/clutter-context.c b/clutter/clutter/clutter-context.c
index 2d37e2394..0a9ebd0b8 100644
--- a/clutter/clutter/clutter-context.c
+++ b/clutter/clutter/clutter-context.c
@@ -379,3 +379,9 @@ clutter_context_get_stage_manager (ClutterContext *context)
 {
   return context->stage_manager;
 }
+
+gboolean
+clutter_context_get_show_fps (ClutterContext *context)
+{
+  return context->show_fps;
+}
diff --git a/clutter/clutter/clutter-main.c b/clutter/clutter/clutter-main.c
index 1619d83c7..86b555be8 100644
--- a/clutter/clutter/clutter-main.c
+++ b/clutter/clutter/clutter-main.c
@@ -67,14 +67,6 @@ guint clutter_pick_debug_flags  = 0;
  */
 int clutter_max_render_time_constant_us = 1000;
 
-gboolean
-_clutter_context_get_show_fps (void)
-{
-  ClutterContext *context = _clutter_context_get_default ();
-
-  return context->show_fps;
-}
-
 static gboolean
 _clutter_threads_dispatch (gpointer data)
 {
diff --git a/clutter/clutter/clutter-private.h b/clutter/clutter/clutter-private.h
index 24f5a3ac5..99381cf58 100644
--- a/clutter/clutter/clutter-private.h
+++ b/clutter/clutter/clutter-private.h
@@ -94,8 +94,6 @@ typedef enum
 
 ClutterContext *        _clutter_context_get_default                    (void);
 
-gboolean                _clutter_context_get_show_fps                   (void);
-
 /* Diagnostic mode */
 gboolean        _clutter_diagnostic_enabled     (void);
 
diff --git a/clutter/clutter/clutter-stage-view.c b/clutter/clutter/clutter-stage-view.c
index 3434988ed..8fe7f9929 100644
--- a/clutter/clutter/clutter-stage-view.c
+++ b/clutter/clutter/clutter-stage-view.c
@@ -24,10 +24,10 @@
 
 #include <math.h>
 
+#include "clutter/clutter-context-private.h"
 #include "clutter/clutter-damage-history.h"
 #include "clutter/clutter-frame-clock.h"
 #include "clutter/clutter-frame-private.h"
-#include "clutter/clutter-private.h"
 #include "clutter/clutter-mutter.h"
 #include "clutter/clutter-stage-private.h"
 #include "cogl/cogl.h"
@@ -1045,6 +1045,7 @@ handle_frame_clock_frame (ClutterFrameClock *frame_clock,
     clutter_stage_view_get_instance_private (view);
   ClutterStage *stage = priv->stage;
   ClutterStageWindow *stage_window = _clutter_stage_get_window (stage);
+  ClutterContext *context = clutter_actor_get_context (CLUTTER_ACTOR (stage));
 
   if (CLUTTER_ACTOR_IN_DESTRUCTION (stage))
     return CLUTTER_FRAME_RESULT_IDLE;
@@ -1055,7 +1056,7 @@ handle_frame_clock_frame (ClutterFrameClock *frame_clock,
   if (!clutter_actor_is_mapped (CLUTTER_ACTOR (stage)))
     return CLUTTER_FRAME_RESULT_IDLE;
 
-  if (_clutter_context_get_show_fps ())
+  if (clutter_context_get_show_fps (context))
     begin_frame_timing_measurement (view);
 
   _clutter_run_repaint_functions (CLUTTER_REPAINT_FLAGS_PRE_PAINT);
@@ -1079,7 +1080,7 @@ handle_frame_clock_frame (ClutterFrameClock *frame_clock,
 
       clutter_stage_emit_after_paint (stage, view, frame);
 
-      if (_clutter_context_get_show_fps ())
+      if (clutter_context_get_show_fps (context))
         end_frame_timing_measurement (view);
     }