diff options
Diffstat (limited to 'testing/xorg-server/bg-none-revert.patch')
-rw-r--r-- | testing/xorg-server/bg-none-revert.patch | 58 |
1 files changed, 0 insertions, 58 deletions
diff --git a/testing/xorg-server/bg-none-revert.patch b/testing/xorg-server/bg-none-revert.patch deleted file mode 100644 index 1a38f1f41..000000000 --- a/testing/xorg-server/bg-none-revert.patch +++ /dev/null @@ -1,58 +0,0 @@ -From 3bc6ed2d8c9028ec28015d05b60af67a194f3694 Mon Sep 17 00:00:00 2001 -From: Adam Jackson <ajax@redhat.com> -Date: Tue, 29 Mar 2011 14:09:46 +0000 -Subject: Revert "composite: Don't backfill non-bg-None windows" - -This reverts commit 6dd775f57d2f94f0ddaee324aeec33b9b66ed5bc. - -Bugzilla: https://bugs.freedesktop.org/34427 - -Acked-by: Alex Deucher <alexdeucher@gmail.com> -Signed-off-by: Adam Jackson <ajax@redhat.com> ---- -diff --git a/composite/compalloc.c b/composite/compalloc.c -index e4064f6..7164c0d 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 v0.8.3-6-g21f6 |