From c0a6b1fb907f4947328af3ae307fd4ccfe874a1d Mon Sep 17 00:00:00 2001
From: Benjamin Otte <otte@redhat.com>
Date: Tue, 7 Jun 2011 16:48:47 +0200
Subject: borderimage: No need to resolve

border-image is a shorthand, so it's unpacked unresolved and repacked
resolved.
---
 gtk/gtkborderimage.c | 32 --------------------------------
 1 file changed, 32 deletions(-)

(limited to 'gtk/gtkborderimage.c')

diff --git a/gtk/gtkborderimage.c b/gtk/gtkborderimage.c
index f38b4f9b7a..cf9da9cf0a 100644
--- a/gtk/gtkborderimage.c
+++ b/gtk/gtkborderimage.c
@@ -55,7 +55,6 @@ struct _GtkBorderImage {
   GtkCssBorderImageRepeat repeat;
 
   gint ref_count;
-  gboolean resolved;
 };
 
 GtkBorderImage *
@@ -77,8 +76,6 @@ _gtk_border_image_new (cairo_pattern_t      *pattern,
   if (repeat != NULL)
     image->repeat = *repeat;
 
-  image->resolved = TRUE;
-
   return image;
 }
 
@@ -101,38 +98,9 @@ _gtk_border_image_new_for_gradient (GtkGradient          *gradient,
   if (repeat != NULL)
     image->repeat = *repeat;
 
-  image->resolved = FALSE;
-
   return image;  
 }
 
-gboolean
-_gtk_border_image_get_resolved (GtkBorderImage *image)
-{
-  return image->resolved;
-}
-
-GtkBorderImage *
-_gtk_border_image_resolve (GtkBorderImage     *image,
-                           GtkStyleProperties *props)
-{
-  GtkBorderImage *resolved_image;
-  cairo_pattern_t *pattern;
-
-  if (image->resolved)
-    return _gtk_border_image_ref (image);
-
-  image->resolved =
-    gtk_gradient_resolve (image->source_gradient, props, &pattern);
-
-  if (!image->resolved)
-    return NULL;
-
-  resolved_image = _gtk_border_image_new (pattern, &image->slice, &image->repeat);
-
-  return resolved_image;
-}
-
 GtkBorderImage *
 _gtk_border_image_ref (GtkBorderImage *image)
 {
-- 
cgit v1.2.1