[metacity] compositor: remove MetaDisplay parameter from shadow_picture



commit 765f2e42cedb3e7cabc7eb84e8c2c4887bd2cd83
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date:   Sat Mar 4 18:22:07 2017 +0200

    compositor: remove MetaDisplay parameter from shadow_picture

 src/compositor/meta-compositor-xrender.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/src/compositor/meta-compositor-xrender.c b/src/compositor/meta-compositor-xrender.c
index 3b1fc62..4024383 100644
--- a/src/compositor/meta-compositor-xrender.c
+++ b/src/compositor/meta-compositor-xrender.c
@@ -663,7 +663,6 @@ shadow_picture_clip (Display          *xdisplay,
 
 static Picture
 shadow_picture (MetaCompositorXRender *xrender,
-                MetaDisplay           *display,
                 MetaCompWindow        *cw,
                 double                 opacity,
                 MetaFrameBorders       borders,
@@ -672,7 +671,7 @@ shadow_picture (MetaCompositorXRender *xrender,
                 int                   *wp,
                 int                   *hp)
 {
-  Display *xdisplay = meta_display_get_xdisplay (display);
+  Display *xdisplay;
   XImage *shadow_image;
   Pixmap shadow_pixmap;
   Picture shadow_picture;
@@ -683,6 +682,7 @@ shadow_picture (MetaCompositorXRender *xrender,
   if (!shadow_image)
     return None;
 
+  xdisplay = xrender->xdisplay;
   shadow_pixmap = XCreatePixmap (xdisplay, DefaultRootWindow (xdisplay),
                                  shadow_image->width, shadow_image->height, 8);
   if (!shadow_pixmap)
@@ -1084,7 +1084,7 @@ win_extents (MetaCompositorXRender *xrender,
           if (cw->opacity != (guint) OPAQUE)
             opacity = opacity * ((double) cw->opacity) / ((double) OPAQUE);
 
-          cw->shadow = shadow_picture (xrender, display, cw, opacity, borders,
+          cw->shadow = shadow_picture (xrender, cw, opacity, borders,
                                        cw->attrs.width - invisible_width + cw->attrs.border_width * 2,
                                        cw->attrs.height - invisible_height + cw->attrs.border_width * 2,
                                        &cw->shadow_width, &cw->shadow_height);


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]