[gtk+/gtk-3-22] GtkCssImageSurface: add cache for the last drawn size.
- From: Juan Pablo Ugarte <jpu src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/gtk-3-22] GtkCssImageSurface: add cache for the last drawn size.
- Date: Tue, 9 Jan 2018 14:30:04 +0000 (UTC)
commit 2a8e1745cfbf0674160665edb46eadfeee8d8289
Author: Juan Pablo Ugarte <ugarte endlessm com>
Date: Fri Dec 29 15:21:52 2017 -0300
GtkCssImageSurface: add cache for the last drawn size.
Keep a copy of the scaled image to speed up rendering multiple times
the image at the same size.
gtk/gtkcssimagesurface.c | 37 +++++++++++++++++++++++++++++++------
gtk/gtkcssimagesurfaceprivate.h | 3 +++
2 files changed, 34 insertions(+), 6 deletions(-)
---
diff --git a/gtk/gtkcssimagesurface.c b/gtk/gtkcssimagesurface.c
index 1570e83..8c439c9 100644
--- a/gtk/gtkcssimagesurface.c
+++ b/gtk/gtkcssimagesurface.c
@@ -20,6 +20,7 @@
#include "config.h"
#include "gtkcssimagesurfaceprivate.h"
+#include <math.h>
G_DEFINE_TYPE (GtkCssImageSurface, _gtk_css_image_surface, GTK_TYPE_CSS_IMAGE)
@@ -51,15 +52,39 @@ gtk_css_image_surface_draw (GtkCssImage *image,
image_width = cairo_image_surface_get_width (surface->surface);
image_height = cairo_image_surface_get_height (surface->surface);
- if (image_width == 0 || image_height == 0)
+ if (image_width == 0 || image_height == 0 || width <= 0 || height <= 0)
return;
+ /* Update cache image if size is different */
+ if (surface->cache == NULL ||
+ ABS (width - surface->width) > 0.001 ||
+ ABS (height - surface->height) > 0.001)
+ {
+ cairo_t *cache;
+
+ /* Save original size to preserve precision */
+ surface->width = width;
+ surface->height = height;
+
+ /* Destroy old cache if any */
+ g_clear_pointer (&surface->cache, cairo_surface_destroy);
+
+ /* Image big enough to contain scaled image with subpixel precision */
+ surface->cache = cairo_surface_create_similar_image (surface->surface,
+ CAIRO_FORMAT_ARGB32,
+ ceil (width),
+ ceil (height));
+ cache = cairo_create (surface->cache);
+ cairo_rectangle (cache, 0, 0, width, height);
+ cairo_scale (cache, width / image_width, height / image_height);
+ cairo_set_source_surface (cache, surface->surface, 0, 0);
+ cairo_fill (cache);
+
+ cairo_destroy (cache);
+ }
+
cairo_rectangle (cr, 0, 0, width, height);
- cairo_scale (cr,
- width / image_width,
- height / image_height);
- cairo_set_source_surface (cr, surface->surface, 0, 0);
- cairo_pattern_set_extend (cairo_get_source (cr), CAIRO_EXTEND_PAD);
+ cairo_set_source_surface (cr, surface->cache ? surface->cache : surface->surface, 0, 0);
cairo_fill (cr);
}
diff --git a/gtk/gtkcssimagesurfaceprivate.h b/gtk/gtkcssimagesurfaceprivate.h
index 87baab2..9619d84 100644
--- a/gtk/gtkcssimagesurfaceprivate.h
+++ b/gtk/gtkcssimagesurfaceprivate.h
@@ -39,6 +39,9 @@ struct _GtkCssImageSurface
GtkCssImage parent;
cairo_surface_t *surface; /* the surface we render - guaranteed to be an image surface */
+ cairo_surface_t *cache; /* the scaled surface - to avoid scaling every time we need to draw
*/
+ double width; /* original cache width */
+ double height; /* original cache height */
};
struct _GtkCssImageSurfaceClass
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]