sungmg/mutter-performance-source
1
0
Fork 0
Code Activity

clutter: Remove pick mode from context

Browse source 
It is not used anywhere now.

https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1509
This commit is contained in:
Georges Basile Stavracas Neto 2020-10-16 10:11:37 -03:00
parent 8d47f79b2c
commit 56ed0bf001
3 changed files with 0 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
clutter/clutter/clutter-main.c
View file

@ -2311,14 +2311,6 @@ _clutter_clear_events_queue (void)
} }
} }
ClutterPickMode
_clutter_context_get_pick_mode (void)
{
ClutterMainContext *context = _clutter_context_get_default ();
return context->pick_mode;
}
/** /**
* clutter_add_debug_flags: (skip) * clutter_add_debug_flags: (skip)
* *

3
clutter/clutter/clutter-private.h
View file

@ -127,8 +127,6 @@ struct _ClutterMainContext
* ordered from least recently added to most recently added */ * ordered from least recently added to most recently added */
GList *event_filters; GList *event_filters;
ClutterPickMode pick_mode;
/* default FPS; this is only used if we cannot sync to vblank */ /* default FPS; this is only used if we cannot sync to vblank */
guint frame_rate; guint frame_rate;
@ -176,7 +174,6 @@ ClutterMainContext * _clutter_context_get_default (void);
void _clutter_context_lock (void); void _clutter_context_lock (void);
void _clutter_context_unlock (void); void _clutter_context_unlock (void);
gboolean _clutter_context_is_initialized (void); gboolean _clutter_context_is_initialized (void);
ClutterPickMode _clutter_context_get_pick_mode (void);
gboolean _clutter_context_get_show_fps (void); gboolean _clutter_context_get_show_fps (void);
gboolean _clutter_feature_init (GError **error); gboolean _clutter_feature_init (GError **error);

5
clutter/clutter/clutter-stage.c
View file

@ -1391,12 +1391,9 @@ _clutter_stage_do_pick_on_view (ClutterStage *stage,
ClutterPickMode mode, ClutterPickMode mode,
ClutterStageView *view) ClutterStageView *view)
{ {
ClutterMainContext *context = _clutter_context_get_default ();
ClutterStagePrivate *priv = stage->priv; ClutterStagePrivate *priv = stage->priv;
int i; int i;
g_assert (context->pick_mode == CLUTTER_PICK_NONE);
COGL_TRACE_BEGIN_SCOPED (ClutterStagePickView, "Pick (view)"); COGL_TRACE_BEGIN_SCOPED (ClutterStagePickView, "Pick (view)");
if (mode != priv->cached_pick_mode) if (mode != priv->cached_pick_mode)
@ -1407,10 +1404,8 @@ _clutter_stage_do_pick_on_view (ClutterStage *stage,
pick_context = clutter_pick_context_new_for_view (view, mode); pick_context = clutter_pick_context_new_for_view (view, mode);
context->pick_mode = mode;
priv->cached_pick_mode = CLUTTER_PICK_NONE; priv->cached_pick_mode = CLUTTER_PICK_NONE;
clutter_actor_pick (CLUTTER_ACTOR (stage), pick_context); clutter_actor_pick (CLUTTER_ACTOR (stage), pick_context);
context->pick_mode = CLUTTER_PICK_NONE;
priv->cached_pick_mode = mode; priv->cached_pick_mode = mode;
clutter_pick_context_destroy (pick_context); clutter_pick_context_destroy (pick_context);