diff options
| author | Bryce Harrington <bryce@osg.samsung.com> | 2014-09-17 17:14:01 -0700 |
|---|---|---|
| committer | Bryce Harrington <bryce@osg.samsung.com> | 2014-09-17 17:30:04 -0700 |
| commit | e0c0a673ee757615bd3d22f46767535e9f53d6f5 (patch) | |
| tree | 04ef3a6038bc8253b23cbdd85c81157efca3d030 /src/cairo-xcb-screen.c | |
| parent | 0aa43ed886c0f8468a21a470f2f024bd4d8a4513 (diff) | |
| download | cairo-e0c0a673ee757615bd3d22f46767535e9f53d6f5.tar.gz | |
Disable font options for xcb.
This patch makes a bunch of tests pass again. The first hunk one fixes a
shameful oversight (whoops), the second one effectively reverts
e691d242. That change broke 102 xcb and 70 xlib tests, including a
bunch of *twin-antialias-* test cases. Patch thanks to Uli Schlachter.
Signed-off-by: Bryce Harrington <b.harrington@samsung.com>
Diffstat (limited to 'src/cairo-xcb-screen.c')
| -rw-r--r-- | src/cairo-xcb-screen.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/cairo-xcb-screen.c b/src/cairo-xcb-screen.c index 30295af6c..69ea4599b 100644 --- a/src/cairo-xcb-screen.c +++ b/src/cairo-xcb-screen.c @@ -242,6 +242,7 @@ _cairo_xcb_screen_get (xcb_connection_t *xcb_connection, screen->connection = connection; screen->xcb_screen = xcb_screen; + screen->has_font_options = FALSE; _cairo_freelist_init (&screen->pattern_cache_entry_freelist, sizeof (struct pattern_cache_entry)); @@ -460,7 +461,12 @@ _cairo_xcb_screen_get_font_options (cairo_xcb_screen_t *screen) _cairo_font_options_init_default (&screen->font_options); _cairo_font_options_set_round_glyph_positions (&screen->font_options, CAIRO_ROUND_GLYPH_POS_ON); - if (! _cairo_xcb_connection_acquire (screen->connection)) { + /* XXX: This is disabled because something seems to be merging + font options incorrectly for xcb. This effectively reverts + the changes brought in git e691d242, and restores ~150 tests + to resume passing. See mailing list archives for Sep 17, + 2014 for more discussion. */ + if (0 && ! _cairo_xcb_connection_acquire (screen->connection)) { _cairo_xcb_init_screen_font_options (screen); _cairo_xcb_connection_release (screen->connection); } |