summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Huddleston <jeremyhu@apple.com>2010-08-15 20:07:28 -0700
committerJeremy Huddleston <jeremyhu@apple.com>2010-09-16 09:50:42 -0700
commitc89f0521044083a11d538ebfeaabee6fc7fb9a03 (patch)
tree64aa7e761d10706cd375c7206aa991c55d875fb3
parente615acf06feabd4de695d1237aa3891957428999 (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> (cherry picked from commit 4e09a69c5b1f3c8d6f2f92ec24aaab3a1119940c)
-rw-r--r--configure.ac2
-rw-r--r--miext/damage/damage.c6
2 files changed, 2 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac
index 9884fa7df..95f7a76a5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1926,7 +1926,7 @@ if test "x$XQUARTZ" = xyes; then
AC_CHECK_LIB([Xplugin],[xp_init],[:])
- CFLAGS="${CFLAGS} -DROOTLESS_WORKAROUND -DROOTLESS_SAFEALPHA -DNO_ALLOCA"
+ CFLAGS="${CFLAGS} -DROOTLESS_SAFEALPHA -DNO_ALLOCA"
PKG_CHECK_MODULES(XPBPROXY, $APPLEWMPROTO $LIBAPPLEWM xfixes x11)
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)