brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

surface-actor: Don't use self->priv->foo directly

Browse Source 
I don't like it...
This commit is contained in:
Jasper St. Pierre 2013-12-06 12:00:13 -05:00
parent 1481836ed6
commit 57602adfe7
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/compositor/meta-surface-actor.c
View File

@ -116,7 +116,7 @@ meta_surface_actor_damage_all (MetaSurfaceActor *self,
CoglTexture *texture = meta_shaped_texture_get_texture (priv->texture); CoglTexture *texture = meta_shaped_texture_get_texture (priv->texture);
update_area (self, 0, 0, cogl_texture_get_width (texture), cogl_texture_get_height (texture)); update_area (self, 0, 0, cogl_texture_get_width (texture), cogl_texture_get_height (texture));
return meta_shaped_texture_update_area (self->priv->texture, return meta_shaped_texture_update_area (priv->texture,
0, 0, 0, 0,
cogl_texture_get_width (texture), cogl_texture_get_width (texture),
cogl_texture_get_height (texture), cogl_texture_get_height (texture),
@ -131,8 +131,10 @@ meta_surface_actor_damage_area (MetaSurfaceActor *self,
int height, int height,
cairo_region_t *unobscured_region) cairo_region_t *unobscured_region)
{ {
MetaSurfaceActorPrivate *priv = self->priv;
update_area (self, x, y, width, height); update_area (self, x, y, width, height);
return meta_shaped_texture_update_area (self->priv->texture, return meta_shaped_texture_update_area (priv->texture,
x, y, width, height, x, y, width, height,
unobscured_region); unobscured_region);
} }
@ -145,30 +147,33 @@ meta_surface_actor_attach_wayland_buffer (MetaSurfaceActor *self,
priv->buffer = buffer; priv->buffer = buffer;
if (buffer) if (buffer)
meta_shaped_texture_set_texture (self->priv->texture, buffer->texture); meta_shaped_texture_set_texture (priv->texture, buffer->texture);
else else
meta_shaped_texture_set_texture (self->priv->texture, NULL); meta_shaped_texture_set_texture (priv->texture, NULL);
} }
void void
meta_surface_actor_set_texture (MetaSurfaceActor *self, meta_surface_actor_set_texture (MetaSurfaceActor *self,
CoglTexture *texture) CoglTexture *texture)
{ {
meta_shaped_texture_set_texture (self->priv->texture, texture); MetaSurfaceActorPrivate *priv = self->priv;
meta_shaped_texture_set_texture (priv->texture, texture);
} }
void void
meta_surface_actor_set_input_region (MetaSurfaceActor *self, meta_surface_actor_set_input_region (MetaSurfaceActor *self,
cairo_region_t *region) cairo_region_t *region)
{ {
meta_shaped_texture_set_input_shape_region (self->priv->texture, region); MetaSurfaceActorPrivate *priv = self->priv;
meta_shaped_texture_set_input_shape_region (priv->texture, region);
} }
void void
meta_surface_actor_set_opaque_region (MetaSurfaceActor *self, meta_surface_actor_set_opaque_region (MetaSurfaceActor *self,
cairo_region_t *region) cairo_region_t *region)
{ {
meta_shaped_texture_set_opaque_region (self->priv->texture, region); MetaSurfaceActorPrivate *priv = self->priv;
meta_shaped_texture_set_opaque_region (priv->texture, region);
} }
MetaSurfaceActor * MetaSurfaceActor *