Fix user-font with foreground in group failures on image, PDF, and PS

1 files changed, 0 insertions, 33 deletions

diff --git a/src/cairo-surface-wrapper.c b/src/cairo-surface-wrapper.c
index 8ba82bd40..7fb417a20 100644
--- a/src/cairo-surface-wrapper.c
+++ b/src/cairo-surface-wrapper.c
@@ -144,9 +144,6 @@ _cairo_surface_wrapper_paint (cairo_surface_wrapper_t *wrapper,
     if (_cairo_clip_is_all_clipped (dev_clip))
 	return CAIRO_INT_STATUS_NOTHING_TO_DO;
 
-    if (source->is_userfont_foreground && wrapper->foreground_source)
-        source = wrapper->foreground_source;
-
     if (wrapper->needs_transform) {
 	cairo_matrix_t m;
 
@@ -185,9 +182,6 @@ _cairo_surface_wrapper_mask (cairo_surface_wrapper_t *wrapper,
     if (_cairo_clip_is_all_clipped (dev_clip))
 	return CAIRO_INT_STATUS_NOTHING_TO_DO;
 
-    if (source->is_userfont_foreground && wrapper->foreground_source)
-        source = wrapper->foreground_source;
-
     if (wrapper->needs_transform) {
 	cairo_matrix_t m;
 
@@ -235,9 +229,6 @@ _cairo_surface_wrapper_stroke (cairo_surface_wrapper_t *wrapper,
     if (_cairo_clip_is_all_clipped (dev_clip))
 	return CAIRO_INT_STATUS_NOTHING_TO_DO;
 
-    if (source->is_userfont_foreground && wrapper->foreground_source)
-        source = wrapper->foreground_source;
-
     if (wrapper->needs_transform) {
 	cairo_matrix_t m;
 
@@ -306,12 +297,6 @@ _cairo_surface_wrapper_fill_stroke (cairo_surface_wrapper_t *wrapper,
     if (_cairo_clip_is_all_clipped (dev_clip))
 	return CAIRO_INT_STATUS_NOTHING_TO_DO;
 
-    if (fill_source->is_userfont_foreground && wrapper->foreground_source)
-        fill_source = wrapper->foreground_source;
-
-    if (stroke_source->is_userfont_foreground && wrapper->foreground_source)
-        stroke_source = wrapper->foreground_source;
-
     if (wrapper->needs_transform) {
 	cairo_matrix_t m;
 
@@ -377,9 +362,6 @@ _cairo_surface_wrapper_fill (cairo_surface_wrapper_t	*wrapper,
     if (_cairo_clip_is_all_clipped (dev_clip))
 	return CAIRO_INT_STATUS_NOTHING_TO_DO;
 
-    if (source->is_userfont_foreground && wrapper->foreground_source)
-        source = wrapper->foreground_source;
-
     if (wrapper->needs_transform) {
 	cairo_matrix_t m;
 
@@ -443,9 +425,6 @@ _cairo_surface_wrapper_show_text_glyphs (cairo_surface_wrapper_t *wrapper,
     cairo_surface_get_font_options (wrapper->target, &options);
     cairo_font_options_merge (&options, &scaled_font->options);
 
-    if (source->is_userfont_foreground && wrapper->foreground_source)
-        source = wrapper->foreground_source;
-
     if (wrapper->needs_transform) {
 	cairo_matrix_t m;
 	int i;
@@ -613,14 +592,6 @@ _cairo_surface_wrapper_set_clip (cairo_surface_wrapper_t *wrapper,
 }
 
 void
-_cairo_surface_wrapper_set_foreground_color (cairo_surface_wrapper_t *wrapper,
-                                             const cairo_color_t *color)
-{
-    if (color)
-        wrapper->foreground_source = _cairo_pattern_create_solid (color);
-}
-
-void
 _cairo_surface_wrapper_get_font_options (cairo_surface_wrapper_t    *wrapper,
 					 cairo_font_options_t	    *options)
 {
@@ -651,7 +622,6 @@ _cairo_surface_wrapper_init (cairo_surface_wrapper_t *wrapper,
     wrapper->has_extents = FALSE;
     wrapper->extents.x = wrapper->extents.y = 0;
     wrapper->clip = NULL;
-    wrapper->foreground_source = NULL;
 
     wrapper->needs_transform = FALSE;
     if (target) {
@@ -663,9 +633,6 @@ _cairo_surface_wrapper_init (cairo_surface_wrapper_t *wrapper,
 void
 _cairo_surface_wrapper_fini (cairo_surface_wrapper_t *wrapper)
 {
-    if (wrapper->foreground_source)
-        cairo_pattern_destroy (wrapper->foreground_source);
-
     cairo_surface_destroy (wrapper->target);
 }