gfx/cairo/surface-clipper.patch

Thu, 22 Jan 2015 13:21:57 +0100

author
Michael Schloh von Bennewitz <michael@schloh.com>
date
Thu, 22 Jan 2015 13:21:57 +0100
branch
TOR_BUG_9701
changeset 15
b8a032363ba2
permissions
-rw-r--r--

Incorporate requested changes from Mozilla in review:
https://bugzilla.mozilla.org/show_bug.cgi?id=1123480#c6

     1 commit 061cc774a861f349334117203c301dee202f9f26
     2 Author: Jeff Muizelaar <jmuizelaar@mozilla.com>
     3 Date:   Wed Apr 7 23:05:48 2010 -0400
     5     Remove an incorrect optimization that was causing the clip
     6     not to be set when it should've been.
     8     This happens when the path is equal but the parents aren't shared.
    10 diff --git a/src/cairo-surface-clipper.c b/src/cairo-surface-clipper.c
    11 index d536f0c..03610d1 100644
    12 --- a/src/cairo-surface-clipper.c
    13 +++ b/src/cairo-surface-clipper.c
    14 @@ -78,12 +78,6 @@ _cairo_surface_clipper_set_clip (cairo_surface_clipper_t *clipper,
    15      if (clip != NULL && clip->path == clipper->clip.path)
    16  	return CAIRO_STATUS_SUCCESS;
    18 -    if (clip != NULL && clipper->clip.path != NULL &&
    19 -	_cairo_path_fixed_equal (&clip->path->path, &clipper->clip.path->path))
    20 -    {
    21 -	return CAIRO_STATUS_SUCCESS;
    22 -    }
    23 -
    24      /* all clipped out state should never propagate this far */
    25      assert (clip == NULL || clip->path != NULL);

mercurial