wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

b=456467; revisit cairo xlib buggy repeat handling; r=roc

Browse Source
This commit is contained in:
Vladimir Vukicevic 2008-09-25 13:07:11 -07:00
parent ae7b0c793c
commit 33105ca61f
2 changed files with 39 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
gfx/cairo/buggy-repeat.patch
View File

@ -1,30 +1,39 @@
diff --git a/gfx/cairo/cairo/src/cairo-xlib-display.c b/gfx/cairo/cairo/src/cairo-xlib-display.c diff --git a/gfx/cairo/cairo/src/cairo-xlib-display.c b/gfx/cairo/cairo/src/cairo-xlib-display.c
--- a/gfx/cairo/cairo/src/cairo-xlib-display.c --- a/gfx/cairo/cairo/src/cairo-xlib-display.c
+++ b/gfx/cairo/cairo/src/cairo-xlib-display.c +++ b/gfx/cairo/cairo/src/cairo-xlib-display.c
@@ -63,6 +63,8 @@ struct _cairo_xlib_job { @@ -216,6 +216,8 @@ _cairo_xlib_display_get (Display *dpy)
}; XExtCodes *codes;
int major_unused, minor_unused;
static cairo_xlib_display_t *_cairo_xlib_display_list; + static int buggy_repeat_force = -1;
+ +
+static int buggy_repeat_force = -1; /* There is an apparent deadlock between this mutex and the
* mutex for the display, but it's actually safe. For the
static void * app to call XCloseDisplay() while any other thread is
_cairo_xlib_call_close_display_hooks (cairo_xlib_display_t *display) @@ -308,6 +310,26 @@ _cairo_xlib_display_get (Display *dpy)
@@ -302,6 +304,17 @@ _cairo_xlib_display_get (Display *dpy) if (VendorRelease (dpy) <= 40500000)
display->buggy_repeat = TRUE; display->buggy_repeat = TRUE;
} }
+
+ /* XXX workaround; see https://bugzilla.mozilla.org/show_bug.cgi?id=413583 */ + /* XXX workaround; see https://bugzilla.mozilla.org/show_bug.cgi?id=413583 */
+ /* If buggy_repeat_force == -1, then initialize.
+ * - set to -2, meaning "nothing was specified", and we trust the above detection.
+ * - if MOZ_CAIRO_BUGGY_REPEAT is '0' (exactly), then force buggy repeat off
+ * - if MOZ_CAIRO_BUGGY_REPEAT is '1' (exactly), then force buggy repeat on
+ */
+ if (buggy_repeat_force == -1) { + if (buggy_repeat_force == -1) {
+ if (getenv("MOZ_CAIRO_NO_BUGGY_REPEAT")) + const char *flag = getenv("MOZ_CAIRO_FORCE_BUGGY_REPEAT");
+
+ buggy_repeat_force = -2;
+
+ if (flag && flag[0] == '0')
+ buggy_repeat_force = 0; + buggy_repeat_force = 0;
+ else + else if (flag && flag[0] == '1')
+ buggy_repeat_force = 1; + buggy_repeat_force = 1;
+ } + }
+ +
+ if (buggy_repeat_force) + if (buggy_repeat_force != -2)
+ display->buggy_repeat = TRUE; + display->buggy_repeat = (buggy_repeat_force == 1);
+
display->next = _cairo_xlib_display_list; display->next = _cairo_xlib_display_list;
_cairo_xlib_display_list = display; _cairo_xlib_display_list = display;

21
gfx/cairo/cairo/src/cairo-xlib-display.c
View File

@ -66,8 +66,6 @@ struct _cairo_xlib_job {
static cairo_xlib_display_t *_cairo_xlib_display_list; static cairo_xlib_display_t *_cairo_xlib_display_list;
static int buggy_repeat_force = -1;
static void static void
_cairo_xlib_remove_close_display_hook_internal (cairo_xlib_display_t *display, _cairo_xlib_remove_close_display_hook_internal (cairo_xlib_display_t *display,
cairo_xlib_hook_t *hook); cairo_xlib_hook_t *hook);
@ -218,6 +216,8 @@ _cairo_xlib_display_get (Display *dpy)
XExtCodes *codes; XExtCodes *codes;
int major_unused, minor_unused; int major_unused, minor_unused;
static int buggy_repeat_force = -1;
/* There is an apparent deadlock between this mutex and the /* There is an apparent deadlock between this mutex and the
* mutex for the display, but it's actually safe. For the * mutex for the display, but it's actually safe. For the
* app to call XCloseDisplay() while any other thread is * app to call XCloseDisplay() while any other thread is
@ -312,15 +312,24 @@ _cairo_xlib_display_get (Display *dpy)
} }
/* XXX workaround; see https://bugzilla.mozilla.org/show_bug.cgi?id=413583 */ /* XXX workaround; see https://bugzilla.mozilla.org/show_bug.cgi?id=413583 */
/* If buggy_repeat_force == -1, then initialize.
* - set to -2, meaning "nothing was specified", and we trust the above detection.
* - if MOZ_CAIRO_BUGGY_REPEAT is '0' (exactly), then force buggy repeat off
* - if MOZ_CAIRO_BUGGY_REPEAT is '1' (exactly), then force buggy repeat on
*/
if (buggy_repeat_force == -1) { if (buggy_repeat_force == -1) {
if (getenv("MOZ_CAIRO_NO_BUGGY_REPEAT")) const char *flag = getenv("MOZ_CAIRO_FORCE_BUGGY_REPEAT");
buggy_repeat_force = -2;
if (flag && flag[0] == '0')
buggy_repeat_force = 0; buggy_repeat_force = 0;
else else if (flag && flag[0] == '1')
buggy_repeat_force = 1; buggy_repeat_force = 1;
} }
if (buggy_repeat_force) if (buggy_repeat_force != -2)
display->buggy_repeat = TRUE; display->buggy_repeat = (buggy_repeat_force == 1);
display->next = _cairo_xlib_display_list; display->next = _cairo_xlib_display_list;
_cairo_xlib_display_list = display; _cairo_xlib_display_list = display;