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

window-actor: Complete the removal of update_shape

Browse source 
I accidentally stashed the rest of the stuff and forgot to
commit it... oops.
This commit is contained in:
Jasper St. Pierre 2014-02-26 19:56:38 -05:00
parent 64a82c8d77
commit 21f9bf530d
1 changed files with 1 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
src/compositor/meta-window-actor.c
View file

@ -106,7 +106,6 @@ struct _MetaWindowActorPrivate
guint needs_frame_drawn : 1; guint needs_frame_drawn : 1;
guint needs_pixmap : 1; guint needs_pixmap : 1;
guint needs_reshape : 1;
guint recompute_focused_shadow : 1; guint recompute_focused_shadow : 1;
guint recompute_unfocused_shadow : 1; guint recompute_unfocused_shadow : 1;
guint size_changed : 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 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_drawn (MetaWindowActor *self, FrameData *frame);
static void do_send_frame_timings (MetaWindowActor *self, static void do_send_frame_timings (MetaWindowActor *self,
FrameData *frame, FrameData *frame,
@ -1310,10 +1307,7 @@ meta_window_actor_sync_actor_geometry (MetaWindowActor *self,
return; return;
if (priv->size_changed) if (priv->size_changed)
{ meta_window_actor_queue_create_pixmap (self);
meta_window_actor_queue_create_pixmap (self);
meta_window_actor_update_shape (self);
}
if (meta_window_actor_effect_in_progress (self)) if (meta_window_actor_effect_in_progress (self))
return; return;
@ -2084,34 +2078,6 @@ meta_window_actor_update_opaque_region (MetaWindowActor *self)
cairo_region_destroy (opaque_region); 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 static void
meta_window_actor_handle_updates (MetaWindowActor *self) meta_window_actor_handle_updates (MetaWindowActor *self)
{ {
@ -2163,7 +2129,6 @@ meta_window_actor_handle_updates (MetaWindowActor *self)
} }
check_needs_pixmap (self); check_needs_pixmap (self);
check_needs_reshape (self);
check_needs_shadow (self); check_needs_shadow (self);
} }