frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "composite: Don't backfill non-bg-None windows" 

This reverts commit 6dd775f57d.

Bugzilla: https://bugs.freedesktop.org/34427

Acked-by: Alex Deucher <alexdeucher@gmail.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
This commit is contained in:
Adam Jackson 2011-03-29 10:09:46 -04:00
parent 6a433b67ca
commit dc0cf75967
1 changed files with 0 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
composite/compalloc.c
View File

@ -508,17 +508,6 @@ compUnredirectOneSubwindow (WindowPtr pParent, WindowPtr pWin)
return Success; return Success;
} }
static int
bgNoneVisitWindow(WindowPtr pWin, void *null)
{
if (pWin->backgroundState != BackgroundPixmap)
return WT_WALKCHILDREN;
if (pWin->background.pixmap != None)
return WT_WALKCHILDREN;
return WT_STOPWALKING;
}
static PixmapPtr static PixmapPtr
compNewPixmap (WindowPtr pWin, int x, int y, int w, int h, Bool map) compNewPixmap (WindowPtr pWin, int x, int y, int w, int h, Bool map)
{ {
@ -539,21 +528,6 @@ compNewPixmap (WindowPtr pWin, int x, int y, int w, int h, Bool map)
if (!map) if (!map)
return pPixmap; return pPixmap;
/*
* If there's no bg=None in the tree, we're done.
*
* We could optimize this more by collection the regions of all the
* bg=None subwindows and feeding that in as the clip for the
* CopyArea below, but since window trees are shallow these days it
* might not be worth the effort.
*/
if (TraverseTree(pWin, bgNoneVisitWindow, NULL) == WT_NOMATCH)
return pPixmap;
/*
* Copy bits from the parent into the new pixmap so that it will
* have "reasonable" contents in case for background None areas.
*/
if (pParent->drawable.depth == pWin->drawable.depth) if (pParent->drawable.depth == pWin->drawable.depth)
{ {
GCPtr pGC = GetScratchGC (pWin->drawable.depth, pScreen); GCPtr pGC = GetScratchGC (pWin->drawable.depth, pScreen);