[mutter/wip/cb2eb3: 28/55] window-actor: Work around cairo bug

[Jasper St. Pierre <jstpierre src gnome org>]

commit 11be2fa36abcc216c8b2b60cb8e3f116d4915457
Author: Jasper St. Pierre <jstpierre mecheye net>
Date:   Sat Apr 28 22:07:59 2012 -0400

    window-actor: Work around cairo bug
    
    Thank to Company and ickle, a cairo bug was identified and then fixed.
    They helped me verify I'm not going insane!
    
    http://cgit.freedesktop.org/cairo/commit/?id=ec400daf9ec3bbd8403324db7fcdaf175e185e7b

 src/compositor/meta-window-actor.c |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)
---
diff --git a/src/compositor/meta-window-actor.c b/src/compositor/meta-window-actor.c
index a6348fe..7f5d9f7 100644
--- a/src/compositor/meta-window-actor.c
+++ b/src/compositor/meta-window-actor.c
@@ -2096,8 +2096,16 @@ build_and_scan_frame_mask (MetaWindowActor       *self,
       gdk_cairo_region (cr, frame_paint_region);
       cairo_clip (cr);
 
+      /* XXX: work around cairo bug. remove when released
+       * http://cgit.freedesktop.org/cairo/commit/?id=ec400daf9ec3bbd8403324db7fcdaf175e185e7b
+       */
+      cairo_push_group (cr);
+
       meta_frame_render_background (priv->window->frame, cr);
 
+      cairo_pop_group_to_source (cr);
+      cairo_paint (cr);
+
       cairo_surface_flush (surface);
       scan_visible_region (mask_data, stride, frame_paint_region, shape_region);