Thu, 15 Jan 2015 21:03:48 +0100
Integrate friendly tips from Tor colleagues to make (or not) 4.5 alpha 3;
This includes removal of overloaded (but unused) methods, and addition of
a overlooked call to DataStruct::SetData(nsISupports, uint32_t, bool.)
1 Fix a clip test to test the right coordinate.
3 Fixed upstream by 498c10032ea3f8631a928cd7df96766f2c8ddca4
4 diff --git a/gfx/cairo/cairo/src/cairo-clip.c b/gfx/cairo/cairo/src/cairo-clip.c
5 --- a/gfx/cairo/cairo/src/cairo-clip.c
6 +++ b/gfx/cairo/cairo/src/cairo-clip.c
7 @@ -408,7 +408,7 @@ _cairo_clip_rectangle (cairo_clip_t
8 /* if a smaller clip has already been set, ignore the new path */
9 if (clip->path != NULL) {
10 if (rectangle->x <= clip->path->extents.x &&
11 - rectangle->y <= clip->path->extents.x &&
12 + rectangle->y <= clip->path->extents.y &&
13 rectangle->x + rectangle->width >= clip->path->extents.x + clip->path->extents.width &&
14 rectangle->y + rectangle->height >= clip->path->extents.y + clip->path->extents.height)
15 {