|
 |
f325b2 |
From d89abe0806947149eafbd9d7ce4b3095ec38b236 Mon Sep 17 00:00:00 2001
|
|
|
f325b2 |
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
|
|
|
f325b2 |
Date: Thu, 4 Aug 2016 17:23:30 +0100
|
|
|
f325b2 |
Subject: [PATCH] Resolves: tdf#101213 drop use of CAIRO_OPERATOR_DIFFERENCE
|
|
|
f325b2 |
|
|
|
f325b2 |
for tdf#99446 and rhbz#1283420 there is a hackaround which ended up in 5.1.5,
|
|
|
f325b2 |
which is not in 5.1.4, for corrupt glyphs under X. I can still reproduce the
|
|
|
f325b2 |
problem if I drop the CAIRO_OPERATOR_DIFFERENCE usage here with master and
|
|
|
f325b2 |
gtk2.
|
|
|
f325b2 |
|
|
|
f325b2 |
This alternative hackaround to force a read of the underlying surface works
|
|
|
f325b2 |
just as well (help->license information is the reproducer) but reportedly
|
|
|
f325b2 |
solves the performance regression.
|
|
|
f325b2 |
|
|
|
f325b2 |
(cherry picked from commit 705d7597480b2307d7e4929ce9386d80ce2a0f16)
|
|
|
f325b2 |
|
|
|
f325b2 |
Change-Id: Ie3c5b07409537a1734226b4ce034620351297e25
|
|
|
f325b2 |
Reviewed-on: https://gerrit.libreoffice.org/27984
|
|
|
f325b2 |
Tested-by: Jenkins <ci@libreoffice.org>
|
|
|
f325b2 |
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
|
|
|
f325b2 |
---
|
|
|
f325b2 |
vcl/unx/generic/gdi/x11cairotextrender.cxx | 23 +++++++++--------------
|
|
|
f325b2 |
1 file changed, 9 insertions(+), 14 deletions(-)
|
|
|
f325b2 |
|
|
|
f325b2 |
diff --git a/vcl/unx/generic/gdi/x11cairotextrender.cxx b/vcl/unx/generic/gdi/x11cairotextrender.cxx
|
|
|
f325b2 |
index 17cb462..c2242b5 100644
|
|
|
f325b2 |
--- a/vcl/unx/generic/gdi/x11cairotextrender.cxx
|
|
|
f325b2 |
+++ b/vcl/unx/generic/gdi/x11cairotextrender.cxx
|
|
|
f325b2 |
@@ -42,10 +42,6 @@ struct _XRegion
|
|
|
f325b2 |
BOX extents;
|
|
|
f325b2 |
};
|
|
|
f325b2 |
|
|
|
f325b2 |
-#if CAIRO_VERSION < CAIRO_VERSION_ENCODE(1, 10, 0)
|
|
|
f325b2 |
-# define CAIRO_OPERATOR_DIFFERENCE (static_cast<cairo_operator_t>(23))
|
|
|
f325b2 |
-#endif
|
|
|
f325b2 |
-
|
|
|
f325b2 |
X11CairoTextRender::X11CairoTextRender(X11SalGraphics& rParent)
|
|
|
f325b2 |
: mrParent(rParent)
|
|
|
f325b2 |
{
|
|
|
f325b2 |
@@ -83,17 +79,16 @@ cairo_t* X11CairoTextRender::getCairoContext()
|
|
|
f325b2 |
cairo_t *cr = cairo_create(surface);
|
|
|
f325b2 |
cairo_surface_destroy(surface);
|
|
|
f325b2 |
|
|
|
f325b2 |
- //rhbz#1283420 bodge to draw and undraw something which has the side effect
|
|
|
f325b2 |
- //of making the mysterious xrender related problem go away
|
|
|
f325b2 |
- if (cairo_version() >= CAIRO_VERSION_ENCODE(1, 10, 0))
|
|
|
f325b2 |
+ //rhbz#1283420 bodge to force a read from the underlying surface which has
|
|
|
f325b2 |
+ //the side effect of making the mysterious xrender related problem go away
|
|
|
f325b2 |
{
|
|
|
f325b2 |
- cairo_save(cr);
|
|
|
f325b2 |
- cairo_set_source_rgb(cr, 1.0, 1.0, 1.0);
|
|
|
f325b2 |
- cairo_set_operator(cr, CAIRO_OPERATOR_DIFFERENCE);
|
|
|
f325b2 |
- cairo_rectangle(cr, 0, 0, 1, 1);
|
|
|
f325b2 |
- cairo_fill_preserve(cr);
|
|
|
f325b2 |
- cairo_fill(cr);
|
|
|
f325b2 |
- cairo_restore(cr);
|
|
|
f325b2 |
+ cairo_surface_t *target = cairo_get_target(cr);
|
|
|
f325b2 |
+ cairo_surface_t *throw_away = cairo_surface_create_similar(target, cairo_surface_get_content(target), 1, 1);
|
|
|
f325b2 |
+ cairo_t *force_read_cr = cairo_create(throw_away);
|
|
|
f325b2 |
+ cairo_set_source_surface(force_read_cr, target, 0, 0);
|
|
|
f325b2 |
+ cairo_paint(force_read_cr);
|
|
|
f325b2 |
+ cairo_destroy(force_read_cr);
|
|
|
f325b2 |
+ cairo_surface_destroy(throw_away);
|
|
|
f325b2 |
}
|
|
|
f325b2 |
|
|
|
f325b2 |
return cr;
|
|
|
f325b2 |
--
|
|
|
f325b2 |
2.9.3
|
|
|
f325b2 |
|