summaryrefslogtreecommitdiff
path: root/miext/damage
diff options
context:
space:
mode:
authorJeremy Huddleston <jeremyhu@apple.com>2010-08-15 20:07:28 -0700
committerJeremy Huddleston <jeremyhu@apple.com>2010-09-11 14:14:43 -0700
commit4e09a69c5b1f3c8d6f2f92ec24aaab3a1119940c (patch)
treeb141c1b154233d38b5bb753fda4f6de780c5e275 /miext/damage
parent63b7d9448abbded1cb91e82a13319d5e4313ca0c (diff)
rootless: Remove ROOTLESS_WORKAROUND
This was already removed for XWin (20701522be803fe47e921fcf059dadf64c7f287d) with no reported side effects. XQuartz seems to be behaving ok without it as well. While this possibly brings back bug #1168, we don't have any reproduction steps for that issue, and if it crops up again, we should fix it a real way rather than this hokey workaround which doesn't even work for COMPOSITE. This effectively reverts the following two changes: b2135e589baeb2ea26da50b9167feaea23bcce3c d7fef52254126aa5897a5c58faeda1f61d5b13d8 Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com> Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Diffstat (limited to 'miext/damage')
-rw-r--r--miext/damage/damage.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/miext/damage/damage.c b/miext/damage/damage.c
index 1cf0513d0..e0e96f276 100644
--- a/miext/damage/damage.c
+++ b/miext/damage/damage.c
@@ -89,11 +89,7 @@ getDrawableDamageRef (DrawablePtr pDrawable)
ScreenPtr pScreen = pDrawable->pScreen;
pPixmap = 0;
- if (pScreen->GetWindowPixmap
-#ifdef ROOTLESS_WORKAROUND
- && ((WindowPtr)pDrawable)->viewable
-#endif
- )
+ if (pScreen->GetWindowPixmap)
pPixmap = (*pScreen->GetWindowPixmap) ((WindowPtr)pDrawable);
if (!pPixmap)