From dc0cf7596782087bdda0e7f9cd2f60907c45b2c4 Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Tue, 29 Mar 2011 10:09:46 -0400 Subject: Revert "composite: Don't backfill non-bg-None windows" This reverts commit 6dd775f57d2f94f0ddaee324aeec33b9b66ed5bc. Bugzilla: https://bugs.freedesktop.org/34427 Acked-by: Alex Deucher Signed-off-by: Adam Jackson --- composite/compalloc.c | 26 -------------------------- 1 file changed, 26 deletions(-) diff --git a/composite/compalloc.c b/composite/compalloc.c index e4064f6b1..7164c0d3c 100644 --- a/composite/compalloc.c +++ b/composite/compalloc.c @@ -508,17 +508,6 @@ compUnredirectOneSubwindow (WindowPtr pParent, WindowPtr pWin) 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 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) 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) { GCPtr pGC = GetScratchGC (pWin->drawable.depth, pScreen); -- cgit v1.2.3