[metacity] compositor: remove get_window_surface vfunc
- From: Alberts Muktupāvels <muktupavels src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [metacity] compositor: remove get_window_surface vfunc
- Date: Fri, 18 Oct 2019 16:44:04 +0000 (UTC)
commit 17525422e3c9da0651e82491923a9a0fc569f414
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date: Fri Oct 18 16:54:06 2019 +0300
compositor: remove get_window_surface vfunc
src/compositor/meta-compositor-none.c | 8 --------
src/compositor/meta-compositor-private.h | 3 ---
src/compositor/meta-compositor-vulkan.c | 8 --------
src/compositor/meta-compositor-xrender.c | 8 --------
src/compositor/meta-compositor.c | 4 +---
5 files changed, 1 insertion(+), 30 deletions(-)
---
diff --git a/src/compositor/meta-compositor-none.c b/src/compositor/meta-compositor-none.c
index 4abc409f..c2b3aacd 100644
--- a/src/compositor/meta-compositor-none.c
+++ b/src/compositor/meta-compositor-none.c
@@ -80,13 +80,6 @@ meta_compositor_none_process_event (MetaCompositor *compositor,
{
}
-static cairo_surface_t *
-meta_compositor_none_get_window_surface (MetaCompositor *compositor,
- MetaSurface *surface)
-{
- return NULL;
-}
-
static void
meta_compositor_none_maximize_window (MetaCompositor *compositor,
MetaWindow *window)
@@ -136,7 +129,6 @@ meta_compositor_none_class_init (MetaCompositorNoneClass *none_class)
compositor_class->window_opacity_changed = meta_compositor_none_window_opacity_changed;
compositor_class->set_updates_frozen = meta_compositor_none_set_updates_frozen;
compositor_class->process_event = meta_compositor_none_process_event;
- compositor_class->get_window_surface = meta_compositor_none_get_window_surface;
compositor_class->maximize_window = meta_compositor_none_maximize_window;
compositor_class->unmaximize_window = meta_compositor_none_unmaximize_window;
compositor_class->sync_screen_size = meta_compositor_none_sync_screen_size;
diff --git a/src/compositor/meta-compositor-private.h b/src/compositor/meta-compositor-private.h
index 11ae2cd2..7a9ea540 100644
--- a/src/compositor/meta-compositor-private.h
+++ b/src/compositor/meta-compositor-private.h
@@ -57,9 +57,6 @@ struct _MetaCompositorClass
XEvent *event,
MetaWindow *window);
- cairo_surface_t * (* get_window_surface) (MetaCompositor *compositor,
- MetaSurface *surface);
-
void (* maximize_window) (MetaCompositor *compositor,
MetaWindow *window);
diff --git a/src/compositor/meta-compositor-vulkan.c b/src/compositor/meta-compositor-vulkan.c
index f574413e..469cf911 100644
--- a/src/compositor/meta-compositor-vulkan.c
+++ b/src/compositor/meta-compositor-vulkan.c
@@ -1315,13 +1315,6 @@ meta_compositor_vulkan_process_event (MetaCompositor *compositor,
{
}
-static cairo_surface_t *
-meta_compositor_vulkan_get_window_surface (MetaCompositor *compositor,
- MetaSurface *surface)
-{
- return NULL;
-}
-
static void
meta_compositor_vulkan_maximize_window (MetaCompositor *compositor,
MetaWindow *window)
@@ -1375,7 +1368,6 @@ meta_compositor_vulkan_class_init (MetaCompositorVulkanClass *vulkan_class)
compositor_class->window_opacity_changed = meta_compositor_vulkan_window_opacity_changed;
compositor_class->set_updates_frozen = meta_compositor_vulkan_set_updates_frozen;
compositor_class->process_event = meta_compositor_vulkan_process_event;
- compositor_class->get_window_surface = meta_compositor_vulkan_get_window_surface;
compositor_class->maximize_window = meta_compositor_vulkan_maximize_window;
compositor_class->unmaximize_window = meta_compositor_vulkan_unmaximize_window;
compositor_class->sync_screen_size = meta_compositor_vulkan_sync_screen_size;
diff --git a/src/compositor/meta-compositor-xrender.c b/src/compositor/meta-compositor-xrender.c
index b3cfc1d5..a7333c16 100644
--- a/src/compositor/meta-compositor-xrender.c
+++ b/src/compositor/meta-compositor-xrender.c
@@ -1869,13 +1869,6 @@ meta_compositor_xrender_process_event (MetaCompositor *compositor,
meta_error_trap_pop (display);
}
-static cairo_surface_t *
-meta_compositor_xrender_get_window_surface (MetaCompositor *compositor,
- MetaSurface *surface)
-{
- return meta_surface_get_image (surface);
-}
-
static void
meta_compositor_xrender_maximize_window (MetaCompositor *compositor,
MetaWindow *window)
@@ -2022,7 +2015,6 @@ meta_compositor_xrender_class_init (MetaCompositorXRenderClass *xrender_class)
compositor_class->window_opacity_changed = meta_compositor_xrender_window_opacity_changed;
compositor_class->set_updates_frozen = meta_compositor_xrender_set_updates_frozen;
compositor_class->process_event = meta_compositor_xrender_process_event;
- compositor_class->get_window_surface = meta_compositor_xrender_get_window_surface;
compositor_class->maximize_window = meta_compositor_xrender_maximize_window;
compositor_class->unmaximize_window = meta_compositor_xrender_unmaximize_window;
compositor_class->sync_screen_size = meta_compositor_xrender_sync_screen_size;
diff --git a/src/compositor/meta-compositor.c b/src/compositor/meta-compositor.c
index 11092671..1e8349e0 100644
--- a/src/compositor/meta-compositor.c
+++ b/src/compositor/meta-compositor.c
@@ -567,17 +567,15 @@ meta_compositor_get_window_surface (MetaCompositor *compositor,
MetaWindow *window)
{
MetaCompositorPrivate *priv;
- MetaCompositorClass *compositor_class;
MetaSurface *surface;
priv = meta_compositor_get_instance_private (compositor);
- compositor_class = META_COMPOSITOR_GET_CLASS (compositor);
surface = g_hash_table_lookup (priv->surfaces, window);
if (surface == NULL)
return NULL;
- return compositor_class->get_window_surface (compositor, surface);
+ return meta_surface_get_image (surface);
}
void
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]