53889255fb384d5fe92ff1eb09aeb863b5814750
1 From: Ian Pilcher <arequipeno@gmail.com>
2 Subject: Backout commit 6dd775f57d2f94f0ddaee324aeec33b9b66ed5bc
4 Index: xorg-server/composite/compalloc.c
5 ===================================================================
6 --- xorg-server.orig/composite/compalloc.c 2011-08-24 12:52:44.405647129 +0300
7 +++ xorg-server/composite/compalloc.c 2011-08-24 12:56:49.805650625 +0300
8 @@ -508,17 +508,6 @@
9 return Success;
10 }
12 -static int
13 -bgNoneVisitWindow(WindowPtr pWin, void *null)
14 -{
15 - if (pWin->backgroundState != BackgroundPixmap)
16 - return WT_WALKCHILDREN;
17 - if (pWin->background.pixmap != None)
18 - return WT_WALKCHILDREN;
19 -
20 - return WT_STOPWALKING;
21 -}
22 -
23 static PixmapPtr
24 compNewPixmap (WindowPtr pWin, int x, int y, int w, int h, Bool map)
25 {
26 @@ -540,17 +529,6 @@
27 return pPixmap;
29 /*
30 - * If there's no bg=None in the tree, we're done.
31 - *
32 - * We could optimize this more by collection the regions of all the
33 - * bg=None subwindows and feeding that in as the clip for the
34 - * CopyArea below, but since window trees are shallow these days it
35 - * might not be worth the effort.
36 - */
37 - if (TraverseTree(pWin, bgNoneVisitWindow, NULL) == WT_NOMATCH)
38 - return pPixmap;
39 -
40 - /*
41 * Copy bits from the parent into the new pixmap so that it will
42 * have "reasonable" contents in case for background None areas.
43 */