[mutter] surface-actor: Remove get_window() API and vfunc
- From: Robert Mader <rmader src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [mutter] surface-actor: Remove get_window() API and vfunc
- Date: Wed, 19 Feb 2020 22:47:35 +0000 (UTC)
commit ac2c8701776a006b22a5adf357f51c187d638655
Author: Jonas Ã…dahl <jadahl gmail com>
Date: Tue Oct 8 22:52:50 2019 +0200
surface-actor: Remove get_window() API and vfunc
It was unused.
https://gitlab.gnome.org/GNOME/mutter/merge_requests/835
src/compositor/meta-surface-actor-wayland.c | 14 --------------
src/compositor/meta-surface-actor-x11.c | 9 ---------
src/compositor/meta-surface-actor.c | 6 ------
src/compositor/meta-surface-actor.h | 3 ---
4 files changed, 32 deletions(-)
---
diff --git a/src/compositor/meta-surface-actor-wayland.c b/src/compositor/meta-surface-actor-wayland.c
index 0308010f5..dbdd49017 100644
--- a/src/compositor/meta-surface-actor-wayland.c
+++ b/src/compositor/meta-surface-actor-wayland.c
@@ -86,18 +86,6 @@ meta_surface_actor_wayland_add_frame_callbacks (MetaSurfaceActorWayland *self,
wl_list_insert_list (&self->frame_callback_list, frame_callbacks);
}
-static MetaWindow *
-meta_surface_actor_wayland_get_window (MetaSurfaceActor *actor)
-{
- MetaSurfaceActorWayland *self = META_SURFACE_ACTOR_WAYLAND (actor);
- MetaWaylandSurface *surface = meta_surface_actor_wayland_get_surface (self);
-
- if (!surface)
- return NULL;
-
- return surface->window;
-}
-
static void
meta_surface_actor_wayland_paint (ClutterActor *actor,
ClutterPaintContext *paint_context)
@@ -155,8 +143,6 @@ meta_surface_actor_wayland_class_init (MetaSurfaceActorWaylandClass *klass)
surface_actor_class->is_visible = meta_surface_actor_wayland_is_visible;
surface_actor_class->is_opaque = meta_surface_actor_wayland_is_opaque;
- surface_actor_class->get_window = meta_surface_actor_wayland_get_window;
-
object_class->dispose = meta_surface_actor_wayland_dispose;
}
diff --git a/src/compositor/meta-surface-actor-x11.c b/src/compositor/meta-surface-actor-x11.c
index 5a3acecff..162568de1 100644
--- a/src/compositor/meta-surface-actor-x11.c
+++ b/src/compositor/meta-surface-actor-x11.c
@@ -348,13 +348,6 @@ meta_surface_actor_x11_dispose (GObject *object)
G_OBJECT_CLASS (meta_surface_actor_x11_parent_class)->dispose (object);
}
-static MetaWindow *
-meta_surface_actor_x11_get_window (MetaSurfaceActor *actor)
-{
- MetaSurfaceActorX11 *self = META_SURFACE_ACTOR_X11 (actor);
- return self->window;
-}
-
static void
meta_surface_actor_x11_class_init (MetaSurfaceActorX11Class *klass)
{
@@ -367,8 +360,6 @@ meta_surface_actor_x11_class_init (MetaSurfaceActorX11Class *klass)
surface_actor_class->pre_paint = meta_surface_actor_x11_pre_paint;
surface_actor_class->is_visible = meta_surface_actor_x11_is_visible;
surface_actor_class->is_opaque = meta_surface_actor_x11_is_opaque;
-
- surface_actor_class->get_window = meta_surface_actor_x11_get_window;
}
static void
diff --git a/src/compositor/meta-surface-actor.c b/src/compositor/meta-surface-actor.c
index 3a8cdf869..15bf24c07 100644
--- a/src/compositor/meta-surface-actor.c
+++ b/src/compositor/meta-surface-actor.c
@@ -567,12 +567,6 @@ meta_surface_actor_is_frozen (MetaSurfaceActor *self)
return priv->frozen;
}
-MetaWindow *
-meta_surface_actor_get_window (MetaSurfaceActor *self)
-{
- return META_SURFACE_ACTOR_GET_CLASS (self)->get_window (self);
-}
-
void
meta_surface_actor_set_transform (MetaSurfaceActor *self,
MetaMonitorTransform transform)
diff --git a/src/compositor/meta-surface-actor.h b/src/compositor/meta-surface-actor.h
index 1d10303a0..f136b7561 100644
--- a/src/compositor/meta-surface-actor.h
+++ b/src/compositor/meta-surface-actor.h
@@ -27,15 +27,12 @@ struct _MetaSurfaceActorClass
void (* pre_paint) (MetaSurfaceActor *actor);
gboolean (* is_visible) (MetaSurfaceActor *actor);
gboolean (* is_opaque) (MetaSurfaceActor *actor);
-
- MetaWindow *(* get_window) (MetaSurfaceActor *actor);
};
cairo_surface_t *meta_surface_actor_get_image (MetaSurfaceActor *self,
cairo_rectangle_int_t *clip);
MetaShapedTexture *meta_surface_actor_get_texture (MetaSurfaceActor *self);
-MetaWindow *meta_surface_actor_get_window (MetaSurfaceActor *self);
gboolean meta_surface_actor_is_obscured (MetaSurfaceActor *self);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]