From bc17ca2619de52232c4c9a9e340368ae5cba0e52 Mon Sep 17 00:00:00 2001 From: Robert O'Callahan Date: Wed, 26 Sep 2012 21:34:30 +1200 Subject: [PATCH] Cairo patch update for bug 792903. DONTBUILD --- gfx/cairo/README | 2 ++ gfx/cairo/d2d-gradient-ensure-stops.patch | 32 +++++++++++++++++++++++ 2 files changed, 34 insertions(+) create mode 100644 gfx/cairo/d2d-gradient-ensure-stops.patch diff --git a/gfx/cairo/README b/gfx/cairo/README index cb7c0fcff33..84cfe4aa0c3 100644 --- a/gfx/cairo/README +++ b/gfx/cairo/README @@ -190,6 +190,8 @@ gdi-RGB24-ARGB32.patch: bug 788794 dwrite-font-printing.patch: bug 468568; don't substitute a GDI font for a DWrite font if the name tables aren't equal +d2d-gradient-ensure-stops.patch: bug 792903, ensure we don't set num_stops to 0 + ==== pixman patches ==== pixman-android-cpu-detect.patch: Add CPU detection support for Android, where we can't reliably access /proc/self/auxv. diff --git a/gfx/cairo/d2d-gradient-ensure-stops.patch b/gfx/cairo/d2d-gradient-ensure-stops.patch new file mode 100644 index 00000000000..2f7bb9334e5 --- /dev/null +++ b/gfx/cairo/d2d-gradient-ensure-stops.patch @@ -0,0 +1,32 @@ +# HG changeset patch +# User Robert O'Callahan +# Date 1348618772 -43200 +# Node ID 55ccbc8d52e69b020f2ba493e92ad2e214388df0 +# Parent e0d69219dd2b3b2826d186dc99c673b879409ea6 +Bug 792903. Prevent num_stops from being set to zero. r=bas + +diff --git a/gfx/cairo/cairo/src/cairo-d2d-surface.cpp b/gfx/cairo/cairo/src/cairo-d2d-surface.cpp +--- a/gfx/cairo/cairo/src/cairo-d2d-surface.cpp ++++ b/gfx/cairo/cairo/src/cairo-d2d-surface.cpp +@@ -1641,17 +1641,20 @@ static RefPtr + min_dist = MIN(_cairo_d2d_dot_product(u, _cairo_d2d_subtract_point(top_left, p1)), + _cairo_d2d_dot_product(u, _cairo_d2d_subtract_point(top_right, p1))); + min_dist = MIN(min_dist, _cairo_d2d_dot_product(u, _cairo_d2d_subtract_point(bottom_left, p1))); + min_dist = MIN(min_dist, _cairo_d2d_dot_product(u, _cairo_d2d_subtract_point(bottom_right, p1))); + + min_dist = MAX(-min_dist, 0); + + // Repeats after gradient start. +- int after_repeat = (int)ceil(max_dist / gradient_length); ++ // It's possible for max_dist and min_dist to both be zero, in which case ++ // we'll set num_stops to 0 and crash D2D. Let's just ensure after_repeat ++ // is at least 1. ++ int after_repeat = MAX((int)ceil(max_dist / gradient_length), 1); + int before_repeat = (int)ceil(min_dist / gradient_length); + num_stops *= (after_repeat + before_repeat); + + p2.x = p1.x + u.x * after_repeat * gradient_length; + p2.y = p1.y + u.y * after_repeat * gradient_length; + p1.x = p1.x - u.x * before_repeat * gradient_length; + p1.y = p1.y - u.y * before_repeat * gradient_length; +