From 21f9bf530d3fca83f72c5bb3d63a3d38ac0ccdc2 Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Wed, 26 Feb 2014 19:56:38 -0500 Subject: [PATCH] window-actor: Complete the removal of update_shape I accidentally stashed the rest of the stuff and forgot to commit it... oops. --- src/compositor/meta-window-actor.c | 37 +----------------------------- 1 file changed, 1 insertion(+), 36 deletions(-) diff --git a/src/compositor/meta-window-actor.c b/src/compositor/meta-window-actor.c index 63658b144..b3f8d9e0f 100644 --- a/src/compositor/meta-window-actor.c +++ b/src/compositor/meta-window-actor.c @@ -106,7 +106,6 @@ struct _MetaWindowActorPrivate guint needs_frame_drawn : 1; guint needs_pixmap : 1; - guint needs_reshape : 1; guint recompute_focused_shadow : 1; guint recompute_unfocused_shadow : 1; guint size_changed : 1; @@ -162,8 +161,6 @@ static gboolean meta_window_actor_has_shadow (MetaWindowActor *self); static void meta_window_actor_handle_updates (MetaWindowActor *self); -static void check_needs_reshape (MetaWindowActor *self); - static void do_send_frame_drawn (MetaWindowActor *self, FrameData *frame); static void do_send_frame_timings (MetaWindowActor *self, FrameData *frame, @@ -1310,10 +1307,7 @@ meta_window_actor_sync_actor_geometry (MetaWindowActor *self, return; if (priv->size_changed) - { - meta_window_actor_queue_create_pixmap (self); - meta_window_actor_update_shape (self); - } + meta_window_actor_queue_create_pixmap (self); if (meta_window_actor_effect_in_progress (self)) return; @@ -2084,34 +2078,6 @@ meta_window_actor_update_opaque_region (MetaWindowActor *self) cairo_region_destroy (opaque_region); } -static void -check_needs_reshape (MetaWindowActor *self) -{ - MetaWindowActorPrivate *priv = self->priv; - - if (!priv->needs_reshape) - return; - - meta_window_actor_update_shape_region (self); - meta_window_actor_update_input_region (self); - meta_window_actor_update_opaque_region (self); - - priv->needs_reshape = FALSE; -} - -void -meta_window_actor_update_shape (MetaWindowActor *self) -{ - MetaWindowActorPrivate *priv = self->priv; - - priv->needs_reshape = TRUE; - - if (is_frozen (self)) - return; - - clutter_actor_queue_redraw (priv->actor); -} - static void meta_window_actor_handle_updates (MetaWindowActor *self) { @@ -2163,7 +2129,6 @@ meta_window_actor_handle_updates (MetaWindowActor *self) } check_needs_pixmap (self); - check_needs_reshape (self); check_needs_shadow (self); }