[clutter/clutter-1.10] cairo: Always update texture after ClutterCairoTexture::draw

[Andy Wingo <apwingo src gnome org>]

commit b6a0b708c3d6a056a3f3bf12e655b58d407fd5fd
Author: Andy Wingo <wingo pobox com>
Date:   Wed Jun 20 10:26:49 2012 +0200

    cairo: Always update texture after ClutterCairoTexture::draw
    
    * clutter/clutter-cairo-texture.c (clutter_cairo_texture_emit_draw):
      Always update the Cogl texture after emitting ::draw, since we control
      the dynamic extent in which drawing should happen on the cairo_t.
    
      Fixes #677966.

 clutter/clutter-cairo-texture.c |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)
---
diff --git a/clutter/clutter-cairo-texture.c b/clutter/clutter-cairo-texture.c
index c1c31e7..28d2a26 100644
--- a/clutter/clutter-cairo-texture.c
+++ b/clutter/clutter-cairo-texture.c
@@ -342,9 +342,6 @@ clutter_cairo_texture_emit_draw (ClutterCairoTexture        *self,
   g_assert (self->priv->cr_surface != NULL);
 
   cr = cairo_create (self->priv->cr_surface);
-  cairo_set_user_data (cr, &clutter_cairo_texture_context_key,
-                       ctxt,
-                       clutter_cairo_texture_context_destroy);
 
   if (ctxt->is_clipped)
     {
@@ -363,6 +360,8 @@ clutter_cairo_texture_emit_draw (ClutterCairoTexture        *self,
 
   self->priv->cr_context = NULL;
 
+  clutter_cairo_texture_context_destroy (ctxt);
+
   cairo_destroy (cr);
 }