pixman: Branch 'master'

[Søren Sandmann Pedersen]

 pixman/pixman-utils.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 40fcc14d1cf8cb6b6c71f27b0a3d3ccc9a845949
Author: Søren Sandmann Pedersen <sandmann at redhat.com>
Date:   Mon Jul 6 20:37:14 2009 -0400

    Expand comment in miClipPictureSrc() to explain why a client clip is required.

diff --git a/pixman/pixman-utils.c b/pixman/pixman-utils.c
index 188cde8..b7f3af9 100644
--- a/pixman/pixman-utils.c
+++ b/pixman/pixman-utils.c
@@ -86,7 +86,9 @@ miClipPictureSrc (pixman_region32_t *	pRegion,
 		  int		dy)
 {
     /* Source clips are ignored, unless they are explicitly turned on
-     * and the clip in question was set by an X client
+     * and the clip in question was set by an X client. (Because if
+     * the clip was not set by a client, then it is a hierarchy
+     * clip and those should always be ignored for sources).
      */
     if (!pPicture->common.clip_sources || !pPicture->common.client_clip)
 	return TRUE;