]> Pileus Git - ~andy/gtk/blobdiff - gtk/gtkthemingengine.c
stylecontext: Do invalidation on first resize container
[~andy/gtk] / gtk / gtkthemingengine.c
index 13c5e34b9f8a6b49e4dd624b40f6a43be4e27398..8a0ae4700c65f1ebeef0c0247c051a1dcaf084a0 100644 (file)
@@ -12,9 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "config.h"
 #include <gtk/gtkintl.h>
 
 #include "gtkprivate.h"
+#include "gtkmodulesprivate.h"
 #include "gtkborderimageprivate.h"
 #include "gtkpango.h"
-#include "gtkshadowprivate.h"
+#include "gtkcssarrayvalueprivate.h"
+#include "gtkcsscornervalueprivate.h"
+#include "gtkcssenumvalueprivate.h"
+#include "gtkcssnumbervalueprivate.h"
+#include "gtkcssrgbavalueprivate.h"
+#include "gtkcssshadowsvalueprivate.h"
 #include "gtkcsstypesprivate.h"
+#include "gtkhslaprivate.h"
+#include "gtkthemingengineprivate.h"
+#include "gtkroundedboxprivate.h"
+#include "gtkthemingbackgroundprivate.h"
+
+#include "fallback-c89.c"
 
 /**
  * SECTION:gtkthemingengine
  * style information contained in the rendered object's #GtkStyleContext.
  */
 
-typedef struct GtkThemingEnginePrivate GtkThemingEnginePrivate;
-
-enum {
-  SIDE_LEFT   = 1,
-  SIDE_BOTTOM = 1 << 1,
-  SIDE_RIGHT  = 1 << 2,
-  SIDE_TOP    = 1 << 3,
-  SIDE_ALL    = 0xF
-};
-
 enum {
   PROP_0,
   PROP_NAME
@@ -209,6 +209,8 @@ struct GtkThemingModuleClass
 #define GTK_THEMING_MODULE(o)    (G_TYPE_CHECK_INSTANCE_CAST ((o), GTK_TYPE_THEMING_MODULE, GtkThemingModule))
 #define GTK_IS_THEMING_MODULE(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GTK_TYPE_THEMING_MODULE))
 
+GType gtk_theming_module_get_type (void);
+
 G_DEFINE_TYPE (GtkThemingModule, gtk_theming_module, G_TYPE_TYPE_MODULE);
 
 static void
@@ -336,63 +338,21 @@ _gtk_theming_engine_set_context (GtkThemingEngine *engine,
   priv->context = context;
 }
 
-/**
- * gtk_theming_engine_register_property: (skip)
- * @name_space: namespace for the property name
- * @parse_func: parsing function to use, or %NULL
- * @pspec: the #GParamSpec for the new property
- *
- * Registers a property so it can be used in the CSS file format,
- * on the CSS file the property will look like
- * "-${@name_space}-${property_name}". being
- * ${property_name} the given to @pspec. @name_space will usually
- * be the theme engine name.
- *
- * For any type a @parse_func may be provided, being this function
- * used for turning any property value (between ':' and ';') in
- * CSS to the #GValue needed. For basic types there is already
- * builtin parsing support, so %NULL may be provided for these
- * cases.
- *
- * <note>
- * Engines must ensure property registration happens exactly once,
- * usually GTK+ deals with theming engines as singletons, so this
- * should be guaranteed to happen once, but bear this in mind
- * when creating #GtkThemeEngine<!-- -->s yourself.
- * </note>
- *
- * <note>
- * In order to make use of the custom registered properties in
- * the CSS file, make sure the engine is loaded first by specifying
- * the engine property, either in a previous rule or within the same
- * one.
- * <programlisting>
- * &ast; {
- *     engine: someengine;
- *     -SomeEngine-custom-property: 2;
- * }
- * </programlisting>
- * </note>
- *
- * Since: 3.0
- **/
-void
-gtk_theming_engine_register_property (const gchar            *name_space,
-                                      GtkStylePropertyParser  parse_func,
-                                      GParamSpec             *pspec)
+GtkStyleContext *
+_gtk_theming_engine_get_context (GtkThemingEngine *engine)
 {
-  gchar *name;
+  g_return_val_if_fail (GTK_IS_THEMING_ENGINE (engine), NULL);
 
-  g_return_if_fail (name_space != NULL);
-  g_return_if_fail (strchr (name_space, ' ') == NULL);
-  g_return_if_fail (G_IS_PARAM_SPEC (pspec));
+  return engine->priv->context;
+}
 
-  /* FIXME: hack hack hack, replacing pspec->name to include namespace */
-  name = g_strdup_printf ("-%s-%s", name_space, pspec->name);
-  g_free (pspec->name);
-  pspec->name = name;
+GtkCssValue *
+_gtk_theming_engine_peek_property (GtkThemingEngine *engine,
+                                   guint             property_id)
+{
+  g_return_val_if_fail (GTK_IS_THEMING_ENGINE (engine), NULL);
 
-  gtk_style_properties_register_property (parse_func, pspec);
+  return _gtk_style_context_peek_property (engine->priv->context, property_id);
 }
 
 /**
@@ -613,18 +573,17 @@ gtk_theming_engine_get_state (GtkThemingEngine *engine)
  * Returns: %TRUE if there is a running transition animation for @state.
  *
  * Since: 3.0
+ *
+ * Deprecated: 3.6: Always returns %FALSE
  **/
 gboolean
 gtk_theming_engine_state_is_running (GtkThemingEngine *engine,
                                      GtkStateType      state,
                                      gdouble          *progress)
 {
-  GtkThemingEnginePrivate *priv;
-
   g_return_val_if_fail (GTK_IS_THEMING_ENGINE (engine), FALSE);
 
-  priv = engine->priv;
-  return gtk_style_context_state_is_running (priv->context, state, progress);
+  return FALSE;
 }
 
 /**
@@ -637,7 +596,7 @@ gtk_theming_engine_state_is_running (GtkThemingEngine *engine,
  *
  * Since: 3.0
  **/
-G_CONST_RETURN GtkWidgetPath *
+const GtkWidgetPath *
 gtk_theming_engine_get_path (GtkThemingEngine *engine)
 {
   GtkThemingEnginePrivate *priv;
@@ -711,6 +670,10 @@ gtk_theming_engine_has_region (GtkThemingEngine *engine,
  * Returns: the widget direction
  *
  * Since: 3.0
+ *
+ * Deprecated: 3.8: Use gtk_theming_engine_get_state() and
+ *   check for #GTK_STATE_FLAG_DIR_LTR and
+ *   #GTK_STATE_FLAG_DIR_RTL instead.
  **/
 GtkTextDirection
 gtk_theming_engine_get_direction (GtkThemingEngine *engine)
@@ -720,7 +683,9 @@ gtk_theming_engine_get_direction (GtkThemingEngine *engine)
   g_return_val_if_fail (GTK_IS_THEMING_ENGINE (engine), GTK_TEXT_DIR_LTR);
 
   priv = engine->priv;
+  G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
   return gtk_style_context_get_direction (priv->context);
+  G_GNUC_END_IGNORE_DEPRECATIONS;
 }
 
 /**
@@ -815,7 +780,7 @@ gtk_theming_engine_get_border_color (GtkThemingEngine *engine,
 
 /**
  * gtk_theming_engine_get_border:
- * @engine: a #GtkthemingEngine
+ * @engine: a #GtkThemingEngine
  * @state: state to retrieve the border for
  * @border: (out): return value for the border settings
  *
@@ -838,7 +803,7 @@ gtk_theming_engine_get_border (GtkThemingEngine *engine,
 
 /**
  * gtk_theming_engine_get_padding:
- * @engine: a #GtkthemingEngine
+ * @engine: a #GtkThemingEngine
  * @state: state to retrieve the padding for
  * @padding: (out): return value for the padding settings
  *
@@ -894,6 +859,8 @@ gtk_theming_engine_get_margin (GtkThemingEngine *engine,
  *          freed.
  *
  * Since: 3.0
+ *
+ * Deprecated: 3.8: Use gtk_theming_engine_get()
  **/
 const PangoFontDescription *
 gtk_theming_engine_get_font (GtkThemingEngine *engine,
@@ -903,8 +870,10 @@ gtk_theming_engine_get_font (GtkThemingEngine *engine,
 
   g_return_val_if_fail (GTK_IS_THEMING_ENGINE (engine), NULL);
 
+  G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
   priv = engine->priv;
   return gtk_style_context_get_font (priv->context, state);
+  G_GNUC_END_IGNORE_DEPRECATIONS;
 }
 
 /* GtkThemingModule */
@@ -1020,8 +989,7 @@ gtk_theming_engine_load (const gchar *name)
             }
         }
     }
-
-  if (!engine)
+  else
     {
       if (G_UNLIKELY (!default_engine))
         default_engine = g_object_new (GTK_TYPE_THEMING_ENGINE, NULL);
@@ -1066,6 +1034,18 @@ gtk_theming_engine_render_check (GtkThemingEngine *engine,
   GtkBorderStyle border_style;
   GtkBorder border;
   gint border_width;
+  GtkThemingBackground bg;
+
+  _gtk_theming_background_init (&bg, engine, 
+                                x, y,
+                                width, height,
+                                gtk_theming_engine_get_junction_sides (engine));
+
+  if (_gtk_theming_background_has_background_image (&bg))
+    {
+      _gtk_theming_background_render (&bg, cr);
+      return;
+    }
 
   flags = gtk_theming_engine_get_state (engine);
   cairo_save (cr);
@@ -1073,10 +1053,8 @@ gtk_theming_engine_render_check (GtkThemingEngine *engine,
   gtk_theming_engine_get_color (engine, flags, &fg_color);
   gtk_theming_engine_get_background_color (engine, flags, &bg_color);
   gtk_theming_engine_get_border (engine, flags, &border);
-
-  gtk_theming_engine_get (engine, flags,
-                          "border-style", &border_style,
-                          NULL);
+  border_style = _gtk_css_border_style_value_get 
+    (_gtk_theming_engine_peek_property (engine, GTK_CSS_PROPERTY_BORDER_TOP_STYLE));
 
   border_width = MIN (MIN (border.top, border.bottom),
                       MIN (border.left, border.right));
@@ -1129,22 +1107,14 @@ gtk_theming_engine_render_check (GtkThemingEngine *engine,
     }
   else
     {
-      gdouble progress;
-      gboolean running;
-
-      running = gtk_theming_engine_state_is_running (engine, GTK_STATE_ACTIVE, &progress);
-
-      if ((flags & GTK_STATE_FLAG_ACTIVE) || running)
+      if (flags & GTK_STATE_FLAG_ACTIVE)
         {
-          if (!running)
-            progress = 1;
-
           cairo_translate (cr,
                            x + pad, y + pad);
 
           cairo_scale (cr, interior_size / 7., interior_size / 7.);
 
-          cairo_rectangle (cr, 0, 0, 7 * progress, 7);
+          cairo_rectangle (cr, 0, 0, 7, 7);
           cairo_clip (cr);
 
           cairo_move_to  (cr, 7.0, 0.0);
@@ -1186,6 +1156,18 @@ gtk_theming_engine_render_option (GtkThemingEngine *engine,
   gint exterior_size, interior_size, pad, thickness, border_width;
   GtkBorderStyle border_style;
   GtkBorder border;
+  GtkThemingBackground bg;
+
+  _gtk_theming_background_init (&bg, engine, 
+                                x, y,
+                                width, height,
+                                gtk_theming_engine_get_junction_sides (engine));
+
+  if (_gtk_theming_background_has_background_image (&bg))
+    {
+      _gtk_theming_background_render (&bg, cr);
+      return;
+    }
 
   flags = gtk_theming_engine_get_state (engine);
 
@@ -1194,10 +1176,8 @@ gtk_theming_engine_render_option (GtkThemingEngine *engine,
   gtk_theming_engine_get_color (engine, flags, &fg_color);
   gtk_theming_engine_get_background_color (engine, flags, &bg_color);
   gtk_theming_engine_get_border (engine, flags, &border);
-
-  gtk_theming_engine_get (engine, flags,
-                          "border-style", &border_style,
-                          NULL);
+  border_style = _gtk_css_border_style_value_get 
+    (_gtk_theming_engine_peek_property (engine, GTK_CSS_PROPERTY_BORDER_TOP_STYLE));
 
   exterior_size = MIN (width, height);
   border_width = MIN (MIN (border.top, border.bottom),
@@ -1360,505 +1340,366 @@ color_shade (const GdkRGBA *color,
              gdouble        factor,
              GdkRGBA       *color_return)
 {
-  GtkSymbolicColor *literal, *shade;
-
-  literal = gtk_symbolic_color_new_literal (color);
-  shade = gtk_symbolic_color_new_shade (literal, factor);
-  gtk_symbolic_color_unref (literal);
+  GtkHSLA hsla;
 
-  gtk_symbolic_color_resolve (shade, NULL, color_return);
-  gtk_symbolic_color_unref (shade);
+  _gtk_hsla_init_from_rgba (&hsla, color);
+  _gtk_hsla_shade (&hsla, &hsla, factor);
+  _gdk_rgba_init_from_hsla (color_return, &hsla);
 }
 
 static void
-_cairo_ellipsis (cairo_t *cr,
-                double xc, double yc,
-                double xradius, double yradius,
-                double angle1, double angle2)
+gtk_theming_engine_render_background (GtkThemingEngine *engine,
+                                      cairo_t          *cr,
+                                      gdouble           x,
+                                      gdouble           y,
+                                      gdouble           width,
+                                      gdouble           height)
 {
-  if (xradius <= 0.0 || yradius <= 0.0)
-    {
-      /* stolen from cairo sources */
-      cairo_line_to (cr, xc, yc); /* might become a move_to */
-      cairo_line_to (cr, xc, yc);
-      return;
-    }
+  GtkThemingBackground bg;
 
-  cairo_save (cr);
-  cairo_translate (cr, xc, yc);
-  cairo_scale (cr, xradius, yradius);
-  cairo_arc (cr, 0, 0, 1.0, angle1, angle2);
-  cairo_restore (cr);
+  _gtk_theming_background_init (&bg, engine,
+                                x, y,
+                                width, height,
+                                gtk_theming_engine_get_junction_sides (engine));
+
+  _gtk_theming_background_render (&bg, cr);
 }
 
 static void
-_cairo_round_rectangle_sides (cairo_t                  *cr,
-                              const GtkCssBorderRadius *border_radius,
-                              gdouble                   x,
-                              gdouble                   y,
-                              gdouble                   width,
-                              gdouble                   height,
-                              guint                     sides)
+gtk_theming_engine_hide_border_sides (double         border[4],
+                                      GtkBorderStyle border_style[4],
+                                      guint          hidden_side)
 {
-  cairo_new_sub_path (cr);
+  guint i;
 
-  if (sides & SIDE_RIGHT)
+  for (i = 0; i < 4; i++)
     {
-      _cairo_ellipsis (cr, 
-                       x + width - border_radius->top_right.horizontal,
-                       y + border_radius->top_right.vertical,
-                       border_radius->top_right.horizontal,
-                       border_radius->top_right.vertical,
-                       - G_PI / 4, 0);
-      _cairo_ellipsis (cr,
-                       x + width - border_radius->bottom_right.horizontal,
-                       y + height - border_radius->bottom_right.vertical,
-                       border_radius->bottom_right.horizontal,
-                       border_radius->bottom_right.vertical,
-                       0, G_PI / 4);
+      if (hidden_side & (1 << i) ||
+          border_style[i] == GTK_BORDER_STYLE_NONE ||
+          border_style[i] == GTK_BORDER_STYLE_HIDDEN)
+        border[i] = 0;
     }
+}
 
-  if (sides & SIDE_BOTTOM)
+static void
+render_frame_fill (cairo_t       *cr,
+                   GtkRoundedBox *border_box,
+                   const double   border_width[4],
+                   GdkRGBA        colors[4],
+                   guint          hidden_side)
+{
+  GtkRoundedBox padding_box;
+  guint i, j;
+
+  padding_box = *border_box;
+  _gtk_rounded_box_shrink (&padding_box,
+                           border_width[GTK_CSS_TOP],
+                           border_width[GTK_CSS_RIGHT],
+                           border_width[GTK_CSS_BOTTOM],
+                           border_width[GTK_CSS_LEFT]);
+
+  if (hidden_side == 0 &&
+      gdk_rgba_equal (&colors[0], &colors[1]) &&
+      gdk_rgba_equal (&colors[0], &colors[2]) &&
+      gdk_rgba_equal (&colors[0], &colors[3]))
     {
-      _cairo_ellipsis (cr,
-                       x + width - border_radius->bottom_right.horizontal,
-                       y + height - border_radius->bottom_right.vertical,
-                       border_radius->bottom_right.horizontal,
-                       border_radius->bottom_right.vertical,
-                       G_PI / 4, G_PI / 2);
-      _cairo_ellipsis (cr,
-                       x + border_radius->bottom_left.horizontal,
-                       y + height - border_radius->bottom_left.vertical,
-                       border_radius->bottom_left.horizontal,
-                       border_radius->bottom_left.vertical,
-                       G_PI / 2, 3 * (G_PI / 4));
-    }
-  else
-    cairo_move_to (cr, x, y + height);
+      gdk_cairo_set_source_rgba (cr, &colors[0]);
 
-  if (sides & SIDE_LEFT)
-    {
-      _cairo_ellipsis (cr,
-                       x + border_radius->bottom_left.horizontal,
-                       y + height - border_radius->bottom_left.vertical,
-                       border_radius->bottom_left.horizontal,
-                       border_radius->bottom_left.vertical,
-                       3 * (G_PI / 4), G_PI);
-      _cairo_ellipsis (cr,
-                       x + border_radius->top_left.horizontal,
-                       y + border_radius->top_left.vertical,
-                       border_radius->top_left.horizontal,
-                       border_radius->top_left.vertical,
-                       G_PI, G_PI + G_PI / 4);
+      _gtk_rounded_box_path (border_box, cr);
+      _gtk_rounded_box_path (&padding_box, cr);
+      cairo_fill (cr);
     }
   else
-    cairo_move_to (cr, x, y);
-
-  if (sides & SIDE_TOP)
     {
-      _cairo_ellipsis (cr,
-                       x + border_radius->top_left.horizontal,
-                       y + border_radius->top_left.vertical,
-                       border_radius->top_left.horizontal,
-                       border_radius->top_left.vertical,
-                       5 * (G_PI / 4), 3 * (G_PI / 2));
-      _cairo_ellipsis (cr,
-                       x + width - border_radius->top_right.horizontal,
-                       y + border_radius->top_right.vertical,
-                       border_radius->top_right.horizontal,
-                       border_radius->top_right.vertical,
-                       3 * (G_PI / 2), - G_PI / 4);
-    }
-}
+      for (i = 0; i < 4; i++) 
+        {
+          if (hidden_side & (1 << i))
+            continue;
 
-static void
-_cairo_uneven_frame (cairo_t                  *cr,
-                     const GtkCssBorderRadius *border_radius,
-                     gdouble                   x,
-                     gdouble                   y,
-                     gdouble                   width,
-                     gdouble                   height,
-                     GtkBorder                *border)
-{
-  cairo_set_fill_rule (cr, CAIRO_FILL_RULE_EVEN_ODD);
-  cairo_set_line_width (cr, 1);
+          for (j = 0; j < 4; j++)
+            { 
+              if (hidden_side & (1 << j))
+                continue;
 
-  _cairo_round_rectangle_sides (cr, border_radius,
-                                x, y,
-                                width, height,
-                                SIDE_ALL);
+              if (i == j || 
+                  (gdk_rgba_equal (&colors[i], &colors[j])))
+                {
+                  /* We were already painted when i == j */
+                  if (i > j)
+                    break;
+
+                  if (j == 0)
+                    _gtk_rounded_box_path_top (border_box, &padding_box, cr);
+                  else if (j == 1)
+                    _gtk_rounded_box_path_right (border_box, &padding_box, cr);
+                  else if (j == 2)
+                    _gtk_rounded_box_path_bottom (border_box, &padding_box, cr);
+                  else if (j == 3)
+                    _gtk_rounded_box_path_left (border_box, &padding_box, cr);
+                }
+            }
+          /* We were already painted when i == j */
+          if (i > j)
+            continue;
+
+          gdk_cairo_set_source_rgba (cr, &colors[i]);
 
-  _cairo_round_rectangle_sides (cr, border_radius,
-                                x + border->left,
-                                y + border->top,
-                                width - border->left - border->right,
-                                height - border->top - border->bottom,
-                                SIDE_ALL);
+          cairo_fill (cr);
+        }
+    }
 }
 
 static void
-render_background_internal (GtkThemingEngine *engine,
-                            cairo_t          *cr,
-                            gdouble           x,
-                            gdouble           y,
-                            gdouble           width,
-                            gdouble           height,
-                            GtkJunctionSides  junction)
-{
-  GdkRGBA bg_color;
-  cairo_pattern_t *pattern;
-  GtkStateFlags flags;
-  gboolean running;
-  gdouble progress, alpha = 1;
-  GtkBorder border;
-  GtkCssBorderCornerRadius *top_left_radius, *top_right_radius;
-  GtkCssBorderCornerRadius *bottom_left_radius, *bottom_right_radius;
-  GtkCssBorderRadius border_radius = { { 0, },  };
-  gint border_width;
-  GtkBorderStyle border_style;
-  gdouble mat_w, mat_h;
-
-  /* Use unmodified size for pattern scaling */
-  mat_w = width;
-  mat_h = height;
-
-  flags = gtk_theming_engine_get_state (engine);
-
-  gtk_theming_engine_get_background_color (engine, flags, &bg_color);
-  gtk_theming_engine_get_border (engine, flags, &border);
-
-  gtk_theming_engine_get (engine, flags,
-                          "background-image", &pattern,
-                          /* Can't use border-radius as it's an int for
-                           * backwards compat */
-                          "border-top-left-radius", &top_left_radius,
-                          "border-top-right-radius", &top_right_radius,
-                          "border-bottom-right-radius", &bottom_right_radius,
-                          "border-bottom-left-radius", &bottom_left_radius,
-                          "border-style", &border_style,
-                          NULL);
-
-  if (top_left_radius)
-    border_radius.top_left = *top_left_radius;
-  g_free (top_left_radius);
-  if (top_right_radius)
-    border_radius.top_right = *top_right_radius;
-  g_free (top_right_radius);
-  if (bottom_right_radius)
-    border_radius.bottom_right = *bottom_right_radius;
-  g_free (bottom_right_radius);
-  if (bottom_left_radius)
-    border_radius.bottom_left = *bottom_left_radius;
-  g_free (bottom_left_radius);
+set_stroke_style (cairo_t        *cr,
+                  double          line_width,
+                  GtkBorderStyle  style,
+                  double          length)
+{
+  double segments[2];
+  double n;
 
-  border_width = MIN (MIN (border.top, border.bottom),
-                      MIN (border.left, border.right));
+  cairo_set_line_width (cr, line_width);
 
-  if (border_width > 1 &&
-      border_style == GTK_BORDER_STYLE_NONE)
+  if (style == GTK_BORDER_STYLE_DOTTED)
     {
-      x += (gdouble) border_width / 2;
-      y += (gdouble) border_width / 2;
-      width -= border_width;
-      height -= border_width;
-    }
-  else
-    {
-      x += border.left;
-      y += border.top;
-      width -= border.left + border.right;
-      height -= border.top + border.bottom;
-    }
-
-  if (width <= 0 || height <= 0)
-    return;
+      n = round (0.5 * length / line_width);
 
-  cairo_save (cr);
-  cairo_set_line_width (cr, border_width);
-  cairo_translate (cr, x, y);
-
-  running = gtk_theming_engine_state_is_running (engine, GTK_STATE_PRELIGHT, &progress);
+      segments[0] = 0;
+      segments[1] = n ? length / n : 2;
+      cairo_set_dash (cr, segments, G_N_ELEMENTS (segments), 0);
 
-  if (gtk_theming_engine_has_class (engine, "background"))
-    {
-      cairo_set_source_rgba (cr, 1.0, 1.0, 1.0, 0.0); /* transparent */
-      cairo_set_operator (cr, CAIRO_OPERATOR_SOURCE);
-      cairo_paint (cr);
+      cairo_set_line_cap (cr, CAIRO_LINE_CAP_ROUND);
+      cairo_set_line_join (cr, CAIRO_LINE_JOIN_ROUND);
     }
-
-  if (running)
+  else
     {
-      cairo_pattern_t *other_pattern;
-      GtkStateFlags other_flags;
-      GdkRGBA other_bg;
-      cairo_pattern_t *new_pattern = NULL;
-
-      if (flags & GTK_STATE_FLAG_PRELIGHT)
-        {
-          other_flags = flags & ~(GTK_STATE_FLAG_PRELIGHT);
-          progress = 1 - progress;
-        }
-      else
-        other_flags = flags | GTK_STATE_FLAG_PRELIGHT;
-
-      gtk_theming_engine_get_background_color (engine, other_flags, &other_bg);
-      gtk_theming_engine_get (engine, other_flags,
-                              "background-image", &other_pattern,
-                              NULL);
-
-      if (pattern && other_pattern)
-        {
-          cairo_pattern_type_t type, other_type;
-          gint n0, n1;
-
-          cairo_pattern_get_color_stop_count (pattern, &n0);
-          cairo_pattern_get_color_stop_count (other_pattern, &n1);
-          type = cairo_pattern_get_type (pattern);
-          other_type = cairo_pattern_get_type (other_pattern);
-
-          if (type == other_type && n0 == n1)
-            {
-              gdouble offset0, red0, green0, blue0, alpha0;
-              gdouble offset1, red1, green1, blue1, alpha1;
-              gdouble x00, x01, y00, y01, x10, x11, y10, y11;
-              gdouble r00, r01, r10, r11;
-              guint i;
-
-              if (type == CAIRO_PATTERN_TYPE_LINEAR)
-                {
-                  cairo_pattern_get_linear_points (pattern, &x00, &y00, &x01, &y01);
-                  cairo_pattern_get_linear_points (other_pattern, &x10, &y10, &x11, &y11);
-
-                  new_pattern = cairo_pattern_create_linear (x00 + (x10 - x00) * progress,
-                                                             y00 + (y10 - y00) * progress,
-                                                             x01 + (x11 - x01) * progress,
-                                                             y01 + (y11 - y01) * progress);
-                }
-              else
-                {
-                  cairo_pattern_get_radial_circles (pattern, &x00, &y00, &r00, &x01, &y01, &r01);
-                  cairo_pattern_get_radial_circles (other_pattern, &x10, &y10, &r10, &x11, &y11, &r11);
-
-                  new_pattern = cairo_pattern_create_radial (x00 + (x10 - x00) * progress,
-                                                             y00 + (y10 - y00) * progress,
-                                                             r00 + (r10 - r00) * progress,
-                                                             x01 + (x11 - x01) * progress,
-                                                             y01 + (y11 - y01) * progress,
-                                                             r01 + (r11 - r01) * progress);
-                }
-
-              cairo_pattern_set_filter (new_pattern, CAIRO_FILTER_FAST);
-              i = 0;
-
-              /* Blend both gradients into one */
-              while (i < n0 && i < n1)
-                {
-                  cairo_pattern_get_color_stop_rgba (pattern, i,
-                                                     &offset0,
-                                                     &red0, &green0, &blue0,
-                                                     &alpha0);
-                  cairo_pattern_get_color_stop_rgba (other_pattern, i,
-                                                     &offset1,
-                                                     &red1, &green1, &blue1,
-                                                     &alpha1);
-
-                  cairo_pattern_add_color_stop_rgba (new_pattern,
-                                                     offset0 + ((offset1 - offset0) * progress),
-                                                     red0 + ((red1 - red0) * progress),
-                                                     green0 + ((green1 - green0) * progress),
-                                                     blue0 + ((blue1 - blue0) * progress),
-                                                     alpha0 + ((alpha1 - alpha0) * progress));
-                  i++;
-                }
-            }
-          else
-            {
-              /* Different pattern types, or different color
-               * stop counts, alpha blend both patterns.
-               */
-              _cairo_round_rectangle_sides (cr, &border_radius,
-                                            0, 0, width, height,
-                                            SIDE_ALL);
-
-              cairo_scale (cr, mat_w, mat_h);
-              cairo_set_source (cr, other_pattern);
-              cairo_scale (cr, 1.0 / mat_w, 1.0 / mat_h);
-              cairo_fill_preserve (cr);
-
-              /* Set alpha for posterior drawing
-               * of the target pattern
-               */
-              alpha = 1 - progress;
-            }
-        }
-      else if (pattern || other_pattern)
+      n = length / line_width;
+      /* Optimize the common case of an integer-sized rectangle
+       * Again, we care about focus rectangles.
+       */
+      if (n == nearbyint (n))
         {
-          cairo_pattern_t *p;
-          const GdkRGBA *c;
-          gdouble x0, y0, x1, y1, r0, r1;
-          gint n, i;
-
-          /* Blend a pattern with a color */
-          if (pattern)
-            {
-              p = pattern;
-              c = &other_bg;
-              progress = 1 - progress;
-            }
-          else
-            {
-              p = other_pattern;
-              c = &bg_color;
-            }
-
-          if (cairo_pattern_get_type (p) == CAIRO_PATTERN_TYPE_LINEAR)
-            {
-              cairo_pattern_get_linear_points (p, &x0, &y0, &x1, &y1);
-              new_pattern = cairo_pattern_create_linear (x0, y0, x1, y1);
-            }
-          else
-            {
-              cairo_pattern_get_radial_circles (p, &x0, &y0, &r0, &x1, &y1, &r1);
-              new_pattern = cairo_pattern_create_radial (x0, y0, r0, x1, y1, r1);
-            }
-
-          cairo_pattern_get_color_stop_count (p, &n);
-
-          for (i = 0; i < n; i++)
-            {
-              gdouble red1, green1, blue1, alpha1;
-              gdouble offset;
-
-              cairo_pattern_get_color_stop_rgba (p, i,
-                                                 &offset,
-                                                 &red1, &green1, &blue1,
-                                                 &alpha1);
-              cairo_pattern_add_color_stop_rgba (new_pattern, offset,
-                                                 c->red + ((red1 - c->red) * progress),
-                                                 c->green + ((green1 - c->green) * progress),
-                                                 c->blue + ((blue1 - c->blue) * progress),
-                                                 c->alpha + ((alpha1 - c->alpha) * progress));
-            }
+          segments[0] = 1;
+          segments[1] = 2;
         }
       else
         {
-          /* Merge just colors */
-          new_pattern = cairo_pattern_create_rgba (CLAMP (bg_color.red + ((other_bg.red - bg_color.red) * progress), 0, 1),
-                                                   CLAMP (bg_color.green + ((other_bg.green - bg_color.green) * progress), 0, 1),
-                                                   CLAMP (bg_color.blue + ((other_bg.blue - bg_color.blue) * progress), 0, 1),
-                                                   CLAMP (bg_color.alpha + ((other_bg.alpha - bg_color.alpha) * progress), 0, 1));
-        }
+          n = round ((1. / 3) * n);
 
-      if (new_pattern)
-        {
-          /* Replace pattern to use */
-          cairo_pattern_destroy (pattern);
-          pattern = new_pattern;
+          segments[0] = n ? (1. / 3) * length / n : 1;
+          segments[1] = 2 * segments[1];
         }
+      cairo_set_dash (cr, segments, G_N_ELEMENTS (segments), 0);
 
-      if (other_pattern)
-        cairo_pattern_destroy (other_pattern);
+      cairo_set_line_cap (cr, CAIRO_LINE_CAP_SQUARE);
+      cairo_set_line_join (cr, CAIRO_LINE_JOIN_MITER);
     }
+}
 
-  _cairo_round_rectangle_sides (cr, &border_radius,
-                                0, 0, width, height,
-                                SIDE_ALL);
-  if (pattern)
+static void
+render_frame_stroke (cairo_t       *cr,
+                     GtkRoundedBox *border_box,
+                     const double   border_width[4],
+                     GdkRGBA        colors[4],
+                     guint          hidden_side,
+                     GtkBorderStyle stroke_style)
+{
+  gboolean different_colors, different_borders;
+  GtkRoundedBox stroke_box;
+  guint i;
+
+  different_colors = !gdk_rgba_equal (&colors[0], &colors[1]) ||
+                     !gdk_rgba_equal (&colors[0], &colors[2]) ||
+                     !gdk_rgba_equal (&colors[0], &colors[3]);
+  different_borders = border_width[0] != border_width[1] ||
+                      border_width[0] != border_width[2] ||
+                      border_width[0] != border_width[3] ;
+
+  stroke_box = *border_box;
+  _gtk_rounded_box_shrink (&stroke_box,
+                           border_width[GTK_CSS_TOP] / 2.0,
+                           border_width[GTK_CSS_RIGHT] / 2.0,
+                           border_width[GTK_CSS_BOTTOM] / 2.0,
+                           border_width[GTK_CSS_LEFT] / 2.0);
+
+  if (!different_colors && !different_borders && hidden_side == 0)
     {
-      cairo_scale (cr, mat_w, mat_h);
-      cairo_set_source (cr, pattern);
-      cairo_scale (cr, 1.0 / mat_w, 1.0 / mat_h);
-    }
-  else
-    gdk_cairo_set_source_rgba (cr, &bg_color);
+      double length = 0;
 
-  if (alpha == 1)
-    {
-      if (border_width > 1 &&
-          border_style != GTK_BORDER_STYLE_NONE)
+      /* FAST PATH:
+       * Mostly expected to trigger for focus rectangles */
+      for (i = 0; i < 4; i++) 
         {
-          /* stroke with the same source, so the background
-           * has exactly the shape than the frame, this
-           * is important so gtk_render_background() and
-           * gtk_render_frame() fit perfectly with round
-           * borders.
-           */
-          cairo_fill_preserve (cr);
-          cairo_stroke (cr);
+          length += _gtk_rounded_box_guess_length (&stroke_box, i);
+          _gtk_rounded_box_path_side (&stroke_box, cr, i);
         }
-      else
-        cairo_fill (cr);
+
+      gdk_cairo_set_source_rgba (cr, &colors[0]);
+      set_stroke_style (cr, border_width[0], stroke_style, length);
+      cairo_stroke (cr);
     }
   else
     {
-      cairo_save (cr);
-      _cairo_round_rectangle_sides (cr, &border_radius,
-                                    0, 0, width, height,
-                                    SIDE_ALL);
-      cairo_clip (cr);
+      GtkRoundedBox padding_box;
 
-      cairo_paint_with_alpha (cr, alpha);
+      padding_box = *border_box;
+      _gtk_rounded_box_path (&padding_box, cr);
+      _gtk_rounded_box_shrink (&padding_box,
+                               border_width[GTK_CSS_TOP],
+                               border_width[GTK_CSS_RIGHT],
+                               border_width[GTK_CSS_BOTTOM],
+                               border_width[GTK_CSS_LEFT]);
 
-      cairo_restore (cr);
-    }
+      for (i = 0; i < 4; i++) 
+        {
+          if (hidden_side & (1 << i))
+            continue;
 
-  if (pattern)
-    cairo_pattern_destroy (pattern);
+          cairo_save (cr);
 
-  cairo_restore (cr);
-}
+          if (i == 0)
+            _gtk_rounded_box_path_top (border_box, &padding_box, cr);
+          else if (i == 1)
+            _gtk_rounded_box_path_right (border_box, &padding_box, cr);
+          else if (i == 2)
+            _gtk_rounded_box_path_bottom (border_box, &padding_box, cr);
+          else if (i == 3)
+            _gtk_rounded_box_path_left (border_box, &padding_box, cr);
+          cairo_clip (cr);
 
-static void
-gtk_theming_engine_render_background (GtkThemingEngine *engine,
-                                      cairo_t          *cr,
-                                      gdouble           x,
-                                      gdouble           y,
-                                      gdouble           width,
-                                      gdouble           height)
-{
-  GtkJunctionSides junction;
+          _gtk_rounded_box_path_side (&stroke_box, cr, i);
 
-  junction = gtk_theming_engine_get_junction_sides (engine);
+          gdk_cairo_set_source_rgba (cr, &colors[i]);
+          set_stroke_style (cr,
+                            border_width[i],
+                            stroke_style,
+                            _gtk_rounded_box_guess_length (&stroke_box, i));
+          cairo_stroke (cr);
 
-  render_background_internal (engine, cr,
-                              x, y, width, height,
-                              junction);
+          cairo_restore (cr);
+        }
+    }
 }
 
-/* Renders the small triangle on corners so
- * frames with 0 radius have a 3D-like effect
- */
 static void
-_cairo_corner_triangle (cairo_t *cr,
-                        gdouble  x,
-                        gdouble  y,
-                        gint     size)
+render_border (cairo_t       *cr,
+               GtkRoundedBox *border_box,
+               const double   border_width[4],
+               guint          hidden_side,
+               GdkRGBA        colors[4],
+               GtkBorderStyle border_style[4])
 {
-  gint i;
+  guint i, j;
+
+  cairo_save (cr);
 
-  cairo_move_to (cr, x + 0.5, y + size - 0.5);
-  cairo_line_to (cr, x + size - 0.5, y + size - 0.5);
-  cairo_line_to (cr, x + size - 0.5, y + 0.5);
+  cairo_set_fill_rule (cr, CAIRO_FILL_RULE_EVEN_ODD);
 
-  for (i = 1; i < size - 1; i++)
+  for (i = 0; i < 4; i++)
     {
-      cairo_move_to (cr, x + size - 0.5, y + i + 0.5);
-      cairo_line_to (cr, x + (size - i) - 0.5, y + i + 0.5);
+      if (hidden_side & (1 << i))
+        continue;
+
+      switch (border_style[i])
+        {
+        case GTK_BORDER_STYLE_NONE:
+        case GTK_BORDER_STYLE_HIDDEN:
+        case GTK_BORDER_STYLE_SOLID:
+          break;
+        case GTK_BORDER_STYLE_INSET:
+          if (i == 1 || i == 2)
+            color_shade (&colors[i], 1.8, &colors[i]);
+          break;
+        case GTK_BORDER_STYLE_OUTSET:
+          if (i == 0 || i == 3)
+            color_shade (&colors[i], 1.8, &colors[i]);
+          break;
+        case GTK_BORDER_STYLE_DOTTED:
+        case GTK_BORDER_STYLE_DASHED:
+          {
+            guint dont_draw = hidden_side;
+
+            for (j = 0; j < 4; j++)
+              {
+                if (border_style[j] == border_style[i])
+                  hidden_side |= (1 << j);
+                else
+                  dont_draw |= (1 << j);
+              }
+            
+            render_frame_stroke (cr, border_box, border_width, colors, dont_draw, border_style[i]);
+          }
+          break;
+        case GTK_BORDER_STYLE_DOUBLE:
+          {
+            GtkRoundedBox other_box;
+            double other_border[4];
+            guint dont_draw = hidden_side;
+
+            for (j = 0; j < 4; j++)
+              {
+                if (border_style[j] == GTK_BORDER_STYLE_DOUBLE)
+                  hidden_side |= (1 << j);
+                else
+                  dont_draw |= (1 << j);
+                
+                other_border[i] = border_width[i] / 3;
+              }
+            
+            render_frame_fill (cr, border_box, other_border, colors, dont_draw);
+            
+            other_box = *border_box;
+            _gtk_rounded_box_shrink (&other_box,
+                                     2 * other_border[GTK_CSS_TOP],
+                                     2 * other_border[GTK_CSS_RIGHT],
+                                     2 * other_border[GTK_CSS_BOTTOM],
+                                     2 * other_border[GTK_CSS_LEFT]);
+            render_frame_fill (cr, &other_box, other_border, colors, dont_draw);
+          }
+          break;
+        case GTK_BORDER_STYLE_GROOVE:
+        case GTK_BORDER_STYLE_RIDGE:
+          {
+            GtkRoundedBox other_box;
+            GdkRGBA other_colors[4];
+            guint dont_draw = hidden_side;
+            double other_border[4];
+
+            for (j = 0; j < 4; j++)
+              {
+                other_colors[j] = colors[j];
+                if ((j == 0 || j == 3) ^ (border_style[j] == GTK_BORDER_STYLE_RIDGE))
+                  color_shade (&other_colors[j], 1.8, &other_colors[j]);
+                else
+                  color_shade (&colors[j], 1.8, &colors[j]);
+                if (border_style[j] == GTK_BORDER_STYLE_GROOVE ||
+                    border_style[j] == GTK_BORDER_STYLE_RIDGE)
+                  hidden_side |= (1 << j);
+                else
+                  dont_draw |= (1 << j);
+                other_border[i] = border_width[i] / 2;
+              }
+            
+            render_frame_fill (cr, border_box, other_border, colors, dont_draw);
+            
+            other_box = *border_box;
+            _gtk_rounded_box_shrink (&other_box,
+                                     other_border[GTK_CSS_TOP],
+                                     other_border[GTK_CSS_RIGHT],
+                                     other_border[GTK_CSS_BOTTOM],
+                                     other_border[GTK_CSS_LEFT]);
+            render_frame_fill (cr, &other_box, other_border, other_colors, dont_draw);
+          }
+          break;
+        default:
+          g_assert_not_reached ();
+          break;
+        }
     }
-}
+  
+  render_frame_fill (cr, border_box, border_width, colors, hidden_side);
 
-static void
-gtk_themeing_engine_apply_junction_to_radius (GtkCssBorderRadius *border_radius,
-                                              GtkJunctionSides    junction)
-{
-  if (junction & GTK_JUNCTION_CORNER_TOPLEFT)
-    border_radius->top_left.horizontal = border_radius->top_left.vertical = 0;
-  if (junction & GTK_JUNCTION_CORNER_TOPRIGHT)
-    border_radius->top_right.horizontal = border_radius->top_right.vertical = 0;
-  if (junction & GTK_JUNCTION_CORNER_BOTTOMRIGHT)
-    border_radius->bottom_right.horizontal = border_radius->bottom_right.vertical = 0;
-  if (junction & GTK_JUNCTION_CORNER_BOTTOMLEFT)
-    border_radius->bottom_left.horizontal = border_radius->bottom_left.vertical = 0;
+  cairo_restore (cr);
 }
 
 static void
@@ -1871,246 +1712,61 @@ render_frame_internal (GtkThemingEngine *engine,
                        guint             hidden_side,
                        GtkJunctionSides  junction)
 {
-  GtkStateFlags state;
-  GdkRGBA lighter;
-  GdkRGBA border_color;
-  GtkBorderStyle border_style;
-  gint border_width;
-  GtkCssBorderCornerRadius *top_left_radius, *top_right_radius;
-  GtkCssBorderCornerRadius *bottom_left_radius, *bottom_right_radius;
-  GtkCssBorderRadius border_radius = { { 0, },  };
-  gdouble progress, d1, d2, m;
-  gboolean running;
-  GtkBorder border;
-  gboolean uniform_border;
+  GtkBorderImage border_image;
+  GtkBorderStyle border_style[4];
+  GtkRoundedBox border_box;
+  double border_width[4];
+  GdkRGBA colors[4];
 
-  state = gtk_theming_engine_get_state (engine);
+  border_width[0] = _gtk_css_number_value_get (_gtk_theming_engine_peek_property (engine, GTK_CSS_PROPERTY_BORDER_TOP_WIDTH), 100);
+  border_width[1] = _gtk_css_number_value_get (_gtk_theming_engine_peek_property (engine, GTK_CSS_PROPERTY_BORDER_RIGHT_WIDTH), 100);
+  border_width[2] = _gtk_css_number_value_get (_gtk_theming_engine_peek_property (engine, GTK_CSS_PROPERTY_BORDER_BOTTOM_WIDTH), 100);
+  border_width[3] = _gtk_css_number_value_get (_gtk_theming_engine_peek_property (engine, GTK_CSS_PROPERTY_BORDER_LEFT_WIDTH), 100);
 
-  gtk_theming_engine_get_border_color (engine, state, &border_color);
-  gtk_theming_engine_get_border (engine, state, &border);
+  border_style[0] = _gtk_css_border_style_value_get (_gtk_theming_engine_peek_property (engine, GTK_CSS_PROPERTY_BORDER_TOP_STYLE));
+  border_style[1] = _gtk_css_border_style_value_get (_gtk_theming_engine_peek_property (engine, GTK_CSS_PROPERTY_BORDER_RIGHT_STYLE));
+  border_style[2] = _gtk_css_border_style_value_get (_gtk_theming_engine_peek_property (engine, GTK_CSS_PROPERTY_BORDER_BOTTOM_STYLE));
+  border_style[3] = _gtk_css_border_style_value_get (_gtk_theming_engine_peek_property (engine, GTK_CSS_PROPERTY_BORDER_LEFT_STYLE));
 
-  gtk_theming_engine_get (engine, state,
-                          "border-style", &border_style,
-                          /* Can't use border-radius as it's an int for
-                           * backwards compat */
-                          "border-top-left-radius", &top_left_radius,
-                          "border-top-right-radius", &top_right_radius,
-                          "border-bottom-right-radius", &bottom_right_radius,
-                          "border-bottom-left-radius", &bottom_left_radius,
-                          NULL);
-
-  if (top_left_radius)
-    border_radius.top_left = *top_left_radius;
-  g_free (top_left_radius);
-  if (top_right_radius)
-    border_radius.top_right = *top_right_radius;
-  g_free (top_right_radius);
-  if (bottom_right_radius)
-    border_radius.bottom_right = *bottom_right_radius;
-  g_free (bottom_right_radius);
-  if (bottom_left_radius)
-    border_radius.bottom_left = *bottom_left_radius;
-  g_free (bottom_left_radius);
-
-  gtk_themeing_engine_apply_junction_to_radius (&border_radius, junction);
-
-  running = gtk_theming_engine_state_is_running (engine, GTK_STATE_PRELIGHT, &progress);
-  border_width = MIN (MIN (border.top, border.bottom),
-                      MIN (border.left, border.right));
-  uniform_border = (border.top == border.bottom &&
-                    border.top == border.left &&
-                    border.top == border.right);
+  gtk_theming_engine_hide_border_sides (border_width, border_style, hidden_side);
 
-  if (running)
+  if (_gtk_border_image_init (&border_image, engine))
+    _gtk_border_image_render (&border_image, border_width, cr, x, y, width, height);
+  else
     {
-      GtkStateFlags other_state;
-      GdkRGBA other_color;
+      colors[0] = *_gtk_css_rgba_value_get_rgba (_gtk_theming_engine_peek_property (engine, GTK_CSS_PROPERTY_BORDER_TOP_COLOR));
+      colors[1] = *_gtk_css_rgba_value_get_rgba (_gtk_theming_engine_peek_property (engine, GTK_CSS_PROPERTY_BORDER_RIGHT_COLOR));
+      colors[2] = *_gtk_css_rgba_value_get_rgba (_gtk_theming_engine_peek_property (engine, GTK_CSS_PROPERTY_BORDER_BOTTOM_COLOR));
+      colors[3] = *_gtk_css_rgba_value_get_rgba (_gtk_theming_engine_peek_property (engine, GTK_CSS_PROPERTY_BORDER_LEFT_COLOR));
 
-      if (state & GTK_STATE_FLAG_PRELIGHT)
-        {
-          other_state = state & ~(GTK_STATE_FLAG_PRELIGHT);
-          progress = 1 - progress;
-        }
-      else
-        other_state = state | GTK_STATE_FLAG_PRELIGHT;
-
-      gtk_theming_engine_get_border_color (engine, other_state, &other_color);
+      _gtk_rounded_box_init_rect (&border_box, x, y, width, height);
+      _gtk_rounded_box_apply_border_radius_for_engine (&border_box, engine, junction);
 
-      border_color.red = CLAMP (border_color.red + ((other_color.red - border_color.red) * progress), 0, 1);
-      border_color.green = CLAMP (border_color.green + ((other_color.green - border_color.green) * progress), 0, 1);
-      border_color.blue = CLAMP (border_color.blue + ((other_color.blue - border_color.blue) * progress), 0, 1);
-      border_color.alpha = CLAMP (border_color.alpha + ((other_color.alpha - border_color.alpha) * progress), 0, 1);
+      render_border (cr, &border_box, border_width, hidden_side, colors, border_style);
     }
 
-  cairo_save (cr);
-
-  color_shade (&border_color, 1.8, &lighter);
-
-  switch (border_style)
+  border_style[0] = _gtk_css_border_style_value_get (_gtk_theming_engine_peek_property (engine, GTK_CSS_PROPERTY_OUTLINE_STYLE));
+  if (border_style[0] != GTK_BORDER_STYLE_NONE)
     {
-    case GTK_BORDER_STYLE_NONE:
-      break;
-    case GTK_BORDER_STYLE_SOLID:
-      cairo_set_line_width (cr, border_width);
-      cairo_set_line_cap (cr, CAIRO_LINE_CAP_SQUARE);
-
-      gdk_cairo_set_source_rgba (cr, &border_color);
-
-      if (uniform_border)
-        {
-          if (border_width > 1)
-            {
-              x += (gdouble) border_width / 2;
-              y += (gdouble) border_width / 2;
-              width -= border_width;
-              height -= border_width;
-            }
-          else if (border_width == 1)
-            {
-              x += 0.5;
-              y += 0.5;
-              width -= 1;
-              height -= 1;
-            }
-
-          _cairo_round_rectangle_sides (cr, &border_radius,
-                                        x, y, width, height,
-                                        SIDE_ALL & ~(hidden_side));
-          cairo_stroke (cr);
-        }
-      else
-        {
-          cairo_save (cr);
-          _cairo_uneven_frame (cr, &border_radius,
-                               x, y, width, height,
-                               &border);
-          cairo_fill (cr);
-          cairo_restore (cr);
-        }
-
-      break;
-    case GTK_BORDER_STYLE_INSET:
-    case GTK_BORDER_STYLE_OUTSET:
-      cairo_set_line_width (cr, border_width);
-      cairo_set_line_cap (cr, CAIRO_LINE_CAP_BUTT);
-
-      if (border_width > 1)
-        {
-          d1 = (gdouble) border_width / 2;
-          d2 = border_width;
-        }
-      else
-        {
-          d1 = 0.5;
-          d2 = 1;
-        }
-
-      cairo_save (cr);
-
-      m = MIN (width, height);
-      m /= 2;
-
-      if (uniform_border)
-        {
-          if (border_style == GTK_BORDER_STYLE_INSET)
-            gdk_cairo_set_source_rgba (cr, &lighter);
-          else
-            gdk_cairo_set_source_rgba (cr, &border_color);
-
-          _cairo_round_rectangle_sides (cr, &border_radius,
-                                        x + d1, y + d1,
-                                        width - d2, height - d2,
-                                        (SIDE_BOTTOM | SIDE_RIGHT) & ~(hidden_side));
-          cairo_stroke (cr);
-
-          if (border_style == GTK_BORDER_STYLE_INSET)
-            gdk_cairo_set_source_rgba (cr, &border_color);
-          else
-            gdk_cairo_set_source_rgba (cr, &lighter);
-
-          _cairo_round_rectangle_sides (cr, &border_radius,
-                                        x + d1, y + d1,
-                                        width - d2, height - d2,
-                                        (SIDE_TOP | SIDE_LEFT) & ~(hidden_side));
-          cairo_stroke (cr);
-        }
-      else
-        {
-          cairo_save (cr);
-
-          /* Bottom/right */
-          if (border_style == GTK_BORDER_STYLE_INSET)
-            gdk_cairo_set_source_rgba (cr, &lighter);
-          else
-            gdk_cairo_set_source_rgba (cr, &border_color);
-
-          _cairo_uneven_frame (cr, &border_radius,
-                               x, y, width, height,
-                               &border);
-          cairo_fill (cr);
-
-          /* Top/left */
-          cairo_move_to (cr, x, y);
-          cairo_line_to (cr, x + width, y);
-          cairo_line_to (cr, 
-                         x + width - border.right - border_radius.top_right.horizontal / 2,
-                         y + border.top + border_radius.top_right.vertical / 2);
-          cairo_line_to (cr, 
-                         x + width - border.right - border_radius.bottom_right.horizontal / 2,
-                         y + height - border.bottom - border_radius.bottom_right.vertical / 2);
-          cairo_line_to (cr, 
-                         x + border.left + border_radius.bottom_left.horizontal / 2,
-                         y + height - border.bottom - border_radius.bottom_left.vertical / 2);
-          cairo_line_to (cr, x, y + height);
-          cairo_close_path (cr);
-
-          cairo_clip (cr);
-
-          if (border_style == GTK_BORDER_STYLE_INSET)
-            gdk_cairo_set_source_rgba (cr, &border_color);
-          else
-            gdk_cairo_set_source_rgba (cr, &lighter);
-
-          _cairo_uneven_frame (cr, &border_radius,
-                               x, y, width, height,
-                               &border);
-          cairo_fill (cr);
-          cairo_restore (cr);
-        }
-
-      if (border_width > 1)
-        {
-          /* overprint top/right and bottom/left corner
-           * triangles if there are square corners there,
-           * to give the box a 3D-like appearance.
-           */
-          cairo_save (cr);
-
-          if (border_style == GTK_BORDER_STYLE_INSET)
-            gdk_cairo_set_source_rgba (cr, &lighter);
-          else
-            gdk_cairo_set_source_rgba (cr, &border_color);
-
-          cairo_set_line_width (cr, 1);
-
-          if ((junction & GTK_JUNCTION_CORNER_TOPRIGHT) != 0)
-            _cairo_corner_triangle (cr,
-                                    x + width - border_width, y,
-                                    border_width);
-
-          if ((junction & GTK_JUNCTION_CORNER_BOTTOMLEFT) != 0)
-            _cairo_corner_triangle (cr,
-                                    x, y + height - border_width,
-                                    border_width);
-          cairo_stroke (cr);
-          cairo_restore (cr);
-        }
-
-      cairo_restore (cr);
-      break;
+      int offset;
+
+      border_style[1] = border_style[2] = border_style[3] = border_style[0];
+      border_width[0] = _gtk_css_number_value_get (_gtk_theming_engine_peek_property (engine, GTK_CSS_PROPERTY_OUTLINE_WIDTH), 100);
+      border_width[3] = border_width[2] = border_width[1] = border_width[0];
+      colors[0] = *_gtk_css_rgba_value_get_rgba (_gtk_theming_engine_peek_property (engine, GTK_CSS_PROPERTY_OUTLINE_COLOR));
+      colors[3] = colors[2] = colors[1] = colors[0];
+      offset = _gtk_css_number_value_get (_gtk_theming_engine_peek_property (engine, GTK_CSS_PROPERTY_OUTLINE_OFFSET), 100);
+      
+      /* reinit box here - outlines don't have a border radius */
+      _gtk_rounded_box_init_rect (&border_box, x, y, width, height);
+      _gtk_rounded_box_shrink (&border_box,
+                               - border_width[GTK_CSS_TOP] - offset,
+                               - border_width[GTK_CSS_RIGHT] - offset,
+                               - border_width[GTK_CSS_LEFT] - offset,
+                               - border_width[GTK_CSS_BOTTOM] - offset);
+      
+      render_border (cr, &border_box, border_width, hidden_side, colors, border_style);
     }
-
-  cairo_restore (cr);
 }
 
 static void
@@ -2121,31 +1777,13 @@ gtk_theming_engine_render_frame (GtkThemingEngine *engine,
                                  gdouble           width,
                                  gdouble           height)
 {
-  GtkStateFlags flags;
-  GtkBorderStyle border_style;
   GtkJunctionSides junction;
-  GtkBorderImage *border_image;
-  GtkBorder border;
 
-  flags = gtk_theming_engine_get_state (engine);
   junction = gtk_theming_engine_get_junction_sides (engine);
-  gtk_theming_engine_get_border (engine, flags, &border);
-
-  gtk_theming_engine_get (engine, flags,
-                          "border-image", &border_image,
-                          "border-style", &border_style,
-                          NULL);
 
-  if (border_image != NULL)
-    {
-      _gtk_border_image_render (border_image, &border,
-                                cr, x, y, width, height);
-      _gtk_border_image_unref (border_image);
-    }
-  else if (border_style != GTK_BORDER_STYLE_NONE)
-    render_frame_internal (engine, cr,
-                           x, y, width, height,
-                           0, junction);
+  render_frame_internal (engine, cr,
+                         x, y, width, height,
+                         0, junction);
 }
 
 static void
@@ -2167,7 +1805,7 @@ gtk_theming_engine_render_expander (GtkThemingEngine *engine,
   double x_double, y_double;
   gdouble angle;
   gint line_width;
-  gboolean running, is_rtl;
+  gboolean is_rtl;
   gdouble progress;
 
   cairo_save (cr);
@@ -2176,12 +1814,9 @@ gtk_theming_engine_render_expander (GtkThemingEngine *engine,
   gtk_theming_engine_get_color (engine, flags, &fg_color);
   gtk_theming_engine_get_border_color (engine, flags, &outline_color);
 
-  running = gtk_theming_engine_state_is_running (engine, GTK_STATE_ACTIVE, &progress);
-  is_rtl = (gtk_theming_engine_get_direction (engine) == GTK_TEXT_DIR_RTL);
+  is_rtl = (gtk_theming_engine_get_state (engine) & GTK_STATE_FLAG_DIR_RTL);
   line_width = 1;
-
-  if (!running)
-    progress = (flags & GTK_STATE_FLAG_ACTIVE) ? 1 : 0;
+  progress = (flags & GTK_STATE_FLAG_ACTIVE) ? 1 : 0;
 
   if (!gtk_theming_engine_has_class (engine, GTK_STYLE_CLASS_HORIZONTAL))
     {
@@ -2334,68 +1969,22 @@ gtk_theming_engine_render_line (GtkThemingEngine *engine,
                                 gdouble           x1,
                                 gdouble           y1)
 {
-  GdkRGBA bg_color, darker, lighter;
+  GdkRGBA color;
   GtkStateFlags flags;
-  gint i, thickness, thickness_dark, thickness_light, len;
-  cairo_matrix_t matrix;
-  gdouble angle;
-
-  /* FIXME: thickness */
-  thickness = 2;
-  thickness_dark = thickness / 2;
-  thickness_light = thickness - thickness_dark;
 
   flags = gtk_theming_engine_get_state (engine);
   cairo_save (cr);
 
-  gtk_theming_engine_get_background_color (engine, flags, &bg_color);
-  color_shade (&bg_color, 0.7, &darker);
-  color_shade (&bg_color, 1.3, &lighter);
+  gtk_theming_engine_get_color (engine, flags, &color);
 
   cairo_set_line_cap (cr, CAIRO_LINE_CAP_SQUARE);
   cairo_set_line_width (cr, 1);
 
-  angle = atan2 (x1 - x0, y1 - y0);
-  angle = (2 * G_PI) - angle;
-  angle += G_PI / 2;
-
-  cairo_get_matrix (cr, &matrix);
-  cairo_matrix_translate (&matrix, x0, y0);
-  cairo_matrix_rotate (&matrix, angle);
-  cairo_set_matrix (cr, &matrix);
-
-  x1 -= x0;
-  y1 -= y0;
-
-  len = (gint) sqrt ((x1 * x1) + (y1 * y1));
-
-  y0 = -thickness_dark;
-
-  for (i = 0; i < thickness_dark; i++)
-    {
-      gdk_cairo_set_source_rgba (cr, &lighter);
-      add_path_line (cr, len - i - 1.5, y0, len - 0.5, y0);
-      cairo_stroke (cr);
-
-      gdk_cairo_set_source_rgba (cr, &darker);
-      add_path_line (cr, 0.5, y0, len - i - 1.5, y0);
-      cairo_stroke (cr);
-
-      y0++;
-    }
-
-  for (i = 0; i < thickness_light; i++)
-    {
-      gdk_cairo_set_source_rgba (cr, &darker);
-      add_path_line (cr, 0.5, y0, thickness_light - i + 0.5, y0);
-      cairo_stroke (cr);
-
-      gdk_cairo_set_source_rgba (cr, &lighter);
-      add_path_line (cr, thickness_light - i + 0.5, y0, len - 0.5, y0);
-      cairo_stroke (cr);
+  cairo_move_to (cr, x0 + 0.5, y0 + 0.5);
+  cairo_line_to (cr, x1 + 0.5, y1 + 0.5);
 
-      y0++;
-    }
+  gdk_cairo_set_source_rgba (cr, &color);
+  cairo_stroke (cr);
 
   cairo_restore (cr);
 }
@@ -2433,49 +2022,16 @@ gtk_theming_engine_render_layout (GtkThemingEngine *engine,
                                   PangoLayout      *layout)
 {
   GdkRGBA fg_color;
-  GtkShadow *text_shadow = NULL;
   GtkStateFlags flags;
-  gdouble progress;
-  gboolean running;
 
   cairo_save (cr);
   flags = gtk_theming_engine_get_state (engine);
   gtk_theming_engine_get_color (engine, flags, &fg_color);
 
-  running = gtk_theming_engine_state_is_running (engine, GTK_STATE_PRELIGHT, &progress);
-
-  if (running)
-    {
-      GtkStateFlags other_flags;
-      GdkRGBA other_fg;
-
-      if (flags & GTK_STATE_FLAG_PRELIGHT)
-        {
-          other_flags = flags & ~(GTK_STATE_FLAG_PRELIGHT);
-          progress = 1 - progress;
-        }
-      else
-        other_flags = flags | GTK_STATE_FLAG_PRELIGHT;
-
-      gtk_theming_engine_get_color (engine, other_flags, &other_fg);
-
-      fg_color.red = CLAMP (fg_color.red + ((other_fg.red - fg_color.red) * progress), 0, 1);
-      fg_color.green = CLAMP (fg_color.green + ((other_fg.green - fg_color.green) * progress), 0, 1);
-      fg_color.blue = CLAMP (fg_color.blue + ((other_fg.blue - fg_color.blue) * progress), 0, 1);
-      fg_color.alpha = CLAMP (fg_color.alpha + ((other_fg.alpha - fg_color.alpha) * progress), 0, 1);
-    }
-
-  gtk_theming_engine_get (engine, flags,
-                          "text-shadow", &text_shadow,
-                          NULL);
-
   prepare_context_for_layout (cr, x, y, layout);
 
-  if (text_shadow != NULL)
-    {
-      _gtk_text_shadow_paint_layout (text_shadow, cr, layout);
-      _gtk_shadow_unref (text_shadow);
-    }
+  _gtk_css_shadows_value_paint_layout (_gtk_theming_engine_peek_property (engine, GTK_CSS_PROPERTY_TEXT_SHADOW),
+                                       cr, layout);
 
   gdk_cairo_set_source_rgba (cr, &fg_color);
   pango_cairo_show_layout (cr, layout);
@@ -2492,32 +2048,8 @@ gtk_theming_engine_render_slider (GtkThemingEngine *engine,
                                   gdouble           height,
                                   GtkOrientation    orientation)
 {
-  const GtkWidgetPath *path;
-  gint thickness;
-
-  path = gtk_theming_engine_get_path (engine);
-
   gtk_theming_engine_render_background (engine, cr, x, y, width, height);
   gtk_theming_engine_render_frame (engine, cr, x, y, width, height);
-
-  /* FIXME: thickness */
-  thickness = 2;
-
-  if (gtk_widget_path_is_type (path, GTK_TYPE_SCALE))
-    {
-      if (orientation == GTK_ORIENTATION_VERTICAL)
-        gtk_theming_engine_render_line (engine, cr,
-                                        x + thickness,
-                                        y + (gint) height / 2,
-                                        x + width - thickness - 1,
-                                        y + (gint) height / 2);
-      else
-        gtk_theming_engine_render_line (engine, cr,
-                                        x + (gint) width / 2,
-                                        y + thickness,
-                                        x + (gint) width / 2,
-                                        y + height - thickness - 1);
-    }
 }
 
 static void
@@ -2534,9 +2066,7 @@ gtk_theming_engine_render_frame_gap (GtkThemingEngine *engine,
   GtkJunctionSides junction;
   GtkStateFlags state;
   gint border_width;
-  GtkCssBorderCornerRadius *top_left_radius, *top_right_radius;
-  GtkCssBorderCornerRadius *bottom_left_radius, *bottom_right_radius;
-  GtkCssBorderRadius border_radius = { { 0, },  };
+  GtkCssValue *corner[4];
   gdouble x0, y0, x1, y1, xc, yc, wc, hc;
   GtkBorder border;
 
@@ -2545,27 +2075,10 @@ gtk_theming_engine_render_frame_gap (GtkThemingEngine *engine,
   junction = gtk_theming_engine_get_junction_sides (engine);
 
   gtk_theming_engine_get_border (engine, state, &border);
-  gtk_theming_engine_get (engine, state,
-                          /* Can't use border-radius as it's an int for
-                           * backwards compat */
-                          "border-top-left-radius", &top_left_radius,
-                          "border-top-right-radius", &top_right_radius,
-                          "border-bottom-right-radius", &bottom_right_radius,
-                          "border-bottom-left-radius", &bottom_left_radius,
-                          NULL);
-
-  if (top_left_radius)
-    border_radius.top_left = *top_left_radius;
-  g_free (top_left_radius);
-  if (top_right_radius)
-    border_radius.top_right = *top_right_radius;
-  g_free (top_right_radius);
-  if (bottom_right_radius)
-    border_radius.bottom_right = *bottom_right_radius;
-  g_free (bottom_right_radius);
-  if (bottom_left_radius)
-    border_radius.bottom_left = *bottom_left_radius;
-  g_free (bottom_left_radius);
+  corner[GTK_CSS_TOP_LEFT] = _gtk_theming_engine_peek_property (engine, GTK_CSS_PROPERTY_BORDER_TOP_LEFT_RADIUS);
+  corner[GTK_CSS_TOP_RIGHT] = _gtk_theming_engine_peek_property (engine, GTK_CSS_PROPERTY_BORDER_TOP_RIGHT_RADIUS);
+  corner[GTK_CSS_BOTTOM_LEFT] = _gtk_theming_engine_peek_property (engine, GTK_CSS_PROPERTY_BORDER_BOTTOM_LEFT_RADIUS);
+  corner[GTK_CSS_BOTTOM_RIGHT] = _gtk_theming_engine_peek_property (engine, GTK_CSS_PROPERTY_BORDER_BOTTOM_RIGHT_RADIUS);
 
   border_width = MIN (MIN (border.top, border.bottom),
                       MIN (border.left, border.right));
@@ -2580,10 +2093,10 @@ gtk_theming_engine_render_frame_gap (GtkThemingEngine *engine,
       wc = MAX (xy1_gap - xy0_gap - 2 * border_width, 0);
       hc = border_width;
 
-      if (xy0_gap < border_radius.top_left.horizontal)
+      if (xy0_gap < _gtk_css_corner_value_get_x (corner[GTK_CSS_TOP_LEFT], width))
         junction |= GTK_JUNCTION_CORNER_TOPLEFT;
 
-      if (xy1_gap > width - border_radius.top_right.horizontal)
+      if (xy1_gap > width - _gtk_css_corner_value_get_x (corner[GTK_CSS_TOP_RIGHT], width))
         junction |= GTK_JUNCTION_CORNER_TOPRIGHT;
       break;
     case GTK_POS_BOTTOM:
@@ -2592,10 +2105,10 @@ gtk_theming_engine_render_frame_gap (GtkThemingEngine *engine,
       wc = MAX (xy1_gap - xy0_gap - 2 * border_width, 0);
       hc = border_width;
 
-      if (xy0_gap < border_radius.bottom_left.horizontal)
+      if (xy0_gap < _gtk_css_corner_value_get_x (corner[GTK_CSS_BOTTOM_LEFT], width))
         junction |= GTK_JUNCTION_CORNER_BOTTOMLEFT;
 
-      if (xy1_gap > width - border_radius.bottom_right.horizontal)
+      if (xy1_gap > width - _gtk_css_corner_value_get_x (corner[GTK_CSS_BOTTOM_RIGHT], width))
         junction |= GTK_JUNCTION_CORNER_BOTTOMRIGHT;
 
       break;
@@ -2605,10 +2118,10 @@ gtk_theming_engine_render_frame_gap (GtkThemingEngine *engine,
       wc = border_width;
       hc = MAX (xy1_gap - xy0_gap - 2 * border_width, 0);
 
-      if (xy0_gap < border_radius.top_left.vertical)
+      if (xy0_gap < _gtk_css_corner_value_get_y (corner[GTK_CSS_TOP_LEFT], height))
         junction |= GTK_JUNCTION_CORNER_TOPLEFT;
 
-      if (xy1_gap > height - border_radius.bottom_left.vertical)
+      if (xy1_gap > height - _gtk_css_corner_value_get_y (corner[GTK_CSS_BOTTOM_LEFT], height))
         junction |= GTK_JUNCTION_CORNER_BOTTOMLEFT;
 
       break;
@@ -2618,10 +2131,10 @@ gtk_theming_engine_render_frame_gap (GtkThemingEngine *engine,
       wc = border_width;
       hc = MAX (xy1_gap - xy0_gap - 2 * border_width, 0);
 
-      if (xy0_gap < border_radius.top_right.vertical)
+      if (xy0_gap < _gtk_css_corner_value_get_y (corner[GTK_CSS_TOP_RIGHT], height))
         junction |= GTK_JUNCTION_CORNER_TOPRIGHT;
 
-      if (xy1_gap > height - border_radius.bottom_right.vertical)
+      if (xy1_gap > height - _gtk_css_corner_value_get_y (corner[GTK_CSS_BOTTOM_RIGHT], height))
         junction |= GTK_JUNCTION_CORNER_BOTTOMRIGHT;
 
       break;
@@ -2650,60 +2163,39 @@ gtk_theming_engine_render_extension (GtkThemingEngine *engine,
                                      gdouble           height,
                                      GtkPositionType   gap_side)
 {
+  GtkThemingBackground bg;
   GtkJunctionSides junction = 0;
   guint hidden_side = 0;
 
-  cairo_save (cr);
-
   switch (gap_side)
     {
     case GTK_POS_LEFT:
       junction = GTK_JUNCTION_LEFT;
-      hidden_side = SIDE_LEFT;
-
-      cairo_translate (cr, x + width, y);
-      cairo_rotate (cr, G_PI / 2);
+      hidden_side = (1 << GTK_CSS_LEFT);
       break;
     case GTK_POS_RIGHT:
       junction = GTK_JUNCTION_RIGHT;
-      hidden_side = SIDE_RIGHT;
-
-      cairo_translate (cr, x, y + height);
-      cairo_rotate (cr, - G_PI / 2);
+      hidden_side = (1 << GTK_CSS_RIGHT);
       break;
     case GTK_POS_TOP:
       junction = GTK_JUNCTION_TOP;
-      hidden_side = SIDE_TOP;
-
-      cairo_translate (cr, x + width, y + height);
-      cairo_rotate (cr, G_PI);
+      hidden_side = (1 << GTK_CSS_TOP);
       break;
     case GTK_POS_BOTTOM:
       junction = GTK_JUNCTION_BOTTOM;
-      hidden_side = SIDE_BOTTOM;
-
-      cairo_translate (cr, x, y);
+      hidden_side = (1 << GTK_CSS_BOTTOM);
       break;
     }
 
-  if (gap_side == GTK_POS_TOP ||
-      gap_side == GTK_POS_BOTTOM)
-    render_background_internal (engine, cr,
-                                0, 0, width, height,
-                                GTK_JUNCTION_BOTTOM);
-  else
-    render_background_internal (engine, cr,
-                                0, 0, height, width,
-                                GTK_JUNCTION_BOTTOM);
-  cairo_restore (cr);
-
-  cairo_save (cr);
+  _gtk_theming_background_init (&bg, engine, 
+                                x, y,
+                                width, height,
+                                junction);
+  _gtk_theming_background_render (&bg, cr);
 
   render_frame_internal (engine, cr,
                          x, y, width, height,
                          hidden_side, junction);
-
-  cairo_restore (cr);
 }
 
 static void
@@ -2748,7 +2240,9 @@ gtk_theming_engine_render_handle (GtkThemingEngine *engine,
   GtkStateFlags flags;
   GdkRGBA bg_color, lighter, darker;
   GtkJunctionSides sides;
+  GtkThemingBackground bg;
   gint xx, yy;
+  gboolean has_image;
 
   cairo_save (cr);
   flags = gtk_theming_engine_get_state (engine);
@@ -2760,7 +2254,11 @@ gtk_theming_engine_render_handle (GtkThemingEngine *engine,
   color_shade (&bg_color, 0.7, &darker);
   color_shade (&bg_color, 1.3, &lighter);
 
-  render_background_internal (engine, cr, x, y, width, height, sides);
+  _gtk_theming_background_init (&bg, engine, x, y, width, height, sides);
+  has_image = _gtk_theming_background_has_background_image (&bg);
+  _gtk_theming_background_render (&bg, cr);
+
+  gtk_theming_engine_render_frame (engine, cr, x, y, width, height);
 
   if (gtk_theming_engine_has_class (engine, GTK_STYLE_CLASS_GRIP))
     {
@@ -3011,12 +2509,15 @@ gtk_theming_engine_render_handle (GtkThemingEngine *engine,
     }
   else if (gtk_theming_engine_has_class (engine, GTK_STYLE_CLASS_PANE_SEPARATOR))
     {
-      if (width > height)
-        for (xx = x + width / 2 - 15; xx <= x + width / 2 + 15; xx += 5)
-          render_dot (cr, &lighter, &darker, xx, y + height / 2 - 1, 3);
-      else
-        for (yy = y + height / 2 - 15; yy <= y + height / 2 + 15; yy += 5)
-          render_dot (cr, &lighter, &darker, x + width / 2 - 1, yy, 3);
+      if (!has_image)
+        {
+          if (width > height)
+            for (xx = x + width / 2 - 15; xx <= x + width / 2 + 15; xx += 5)
+              render_dot (cr, &lighter, &darker, xx, y + height / 2 - 1, 3);
+          else
+            for (yy = y + height / 2 - 15; yy <= y + height / 2 + 15; yy += 5)
+              render_dot (cr, &lighter, &darker, x + width / 2 - 1, yy, 3);
+        }
     }
   else
     {
@@ -3031,72 +2532,111 @@ gtk_theming_engine_render_handle (GtkThemingEngine *engine,
   cairo_restore (cr);
 }
 
-static void
-gtk_theming_engine_render_activity (GtkThemingEngine *engine,
-                                    cairo_t          *cr,
-                                    gdouble           x,
-                                    gdouble           y,
-                                    gdouble           width,
-                                    gdouble           height)
+void
+_gtk_theming_engine_paint_spinner (cairo_t       *cr,
+                                   gdouble        radius,
+                                   gdouble        progress,
+                                   const GdkRGBA *color)
 {
-  if (gtk_theming_engine_has_class (engine, GTK_STYLE_CLASS_SPINNER))
+  guint num_steps, step;
+  gdouble half;
+  gint i;
+
+  num_steps = 12;
+
+  if (progress >= 0)
+    step = (guint) (progress * num_steps);
+  else
+    step = 0;
+
+  cairo_save (cr);
+
+  cairo_set_operator (cr, CAIRO_OPERATOR_OVER);
+  cairo_set_line_width (cr, 2.0);
+
+  half = num_steps / 2;
+
+  for (i = 0; i < num_steps; i++)
     {
-      GtkStateFlags state;
-      guint num_steps, step;
-      GdkRGBA color;
-      gdouble progress;
-      gdouble radius;
-      gdouble half;
-      gint i;
+      gint inset = 0.7 * radius;
+
+      /* transparency is a function of time and intial value */
+      gdouble t = 1.0 - (gdouble) ((i + step) % num_steps) / num_steps;
+      gdouble xscale = - sin (i * G_PI / half);
+      gdouble yscale = - cos (i * G_PI / half);
+
+      cairo_set_source_rgba (cr,
+                             color->red,
+                             color->green,
+                             color->blue,
+                             color->alpha * t);
+
+      cairo_move_to (cr,
+                     (radius - inset) * xscale,
+                     (radius - inset) * yscale);
+      cairo_line_to (cr,
+                     radius * xscale,
+                     radius * yscale);
 
-      num_steps = 12;
+      cairo_stroke (cr);
+    }
 
-      state = gtk_theming_engine_get_state (engine);
-      gtk_theming_engine_get_color (engine, state, &color);
+  cairo_restore (cr);
+}
 
-      if (gtk_theming_engine_state_is_running (engine, GTK_STATE_ACTIVE, &progress))
-        step = (guint) (progress * num_steps);
-      else
-        step = 0;
+static void
+render_spinner (GtkThemingEngine *engine,
+                cairo_t          *cr,
+                gdouble           x,
+                gdouble           y,
+                gdouble           width,
+                gdouble           height)
+{
+  GtkStateFlags state;
+  GdkRGBA color;
+  gdouble radius;
 
-      cairo_save (cr);
+  state = gtk_theming_engine_get_state (engine);
+  radius = MIN (width / 2, height / 2);
 
-      cairo_set_operator (cr, CAIRO_OPERATOR_OVER);
-      cairo_set_line_width (cr, 2.0);
-      cairo_translate (cr, x + width / 2, y + height / 2);
+  gtk_theming_engine_get_color (engine, state, &color);
 
-      radius = MIN (width / 2, height / 2);
-      half = num_steps / 2;
+  cairo_save (cr);
+  cairo_translate (cr, x + width / 2, y + height / 2);
 
-      for (i = 0; i < num_steps; i++)
-        {
-          gint inset = 0.7 * radius;
-
-          /* transparency is a function of time and intial value */
-          gdouble t = 1.0 - (gdouble) ((i + step) % num_steps) / num_steps;
-          gdouble xscale = - sin (i * G_PI / half);
-          gdouble yscale = - cos (i * G_PI / half);
-
-          cairo_set_source_rgba (cr,
-                                 color.red,
-                                 color.green,
-                                 color.blue,
-                                 color.alpha * t);
-
-          cairo_move_to (cr,
-                         (radius - inset) * xscale,
-                         (radius - inset) * yscale);
-          cairo_line_to (cr,
-                         radius * xscale,
-                         radius * yscale);
-          cairo_stroke (cr);
-        }
+  _gtk_css_shadows_value_paint_spinner (_gtk_theming_engine_peek_property (engine, GTK_CSS_PROPERTY_ICON_SHADOW),
+                                        cr,
+                                        radius,
+                                        -1);
+
+  _gtk_theming_engine_paint_spinner (cr,
+                                     radius,
+                                     -1,
+                                     &color);
 
-      cairo_restore (cr);
+  cairo_restore (cr);
+}
+
+static void
+gtk_theming_engine_render_activity (GtkThemingEngine *engine,
+                                    cairo_t          *cr,
+                                    gdouble           x,
+                                    gdouble           y,
+                                    gdouble           width,
+                                    gdouble           height)
+{
+  GtkThemingBackground bg;
+  
+  _gtk_theming_background_init (&bg, engine, x, y, width, height, 0);
+  
+  if (gtk_theming_engine_has_class (engine, GTK_STYLE_CLASS_SPINNER) &&
+      !_gtk_theming_background_has_background_image (&bg))
+    {
+      render_spinner (engine, cr, x, y, width, height);
     }
   else
     {
-      gtk_theming_engine_render_background (engine, cr, x, y, width, height);
+      _gtk_theming_background_render (&bg, cr);
       gtk_theming_engine_render_frame (engine, cr, x, y, width, height);
     }
 }
@@ -3203,6 +2743,7 @@ gtk_theming_engine_render_icon_pixbuf (GtkThemingEngine    *engine,
          stated = gdk_pixbuf_get_from_surface (surface, 0, 0,
                                                cairo_image_surface_get_width (surface),
                                                cairo_image_surface_get_height (surface));
+         cairo_surface_destroy (surface);
         }
       else if (state & GTK_STATE_FLAG_PRELIGHT)
         {
@@ -3220,6 +2761,7 @@ gtk_theming_engine_render_icon_pixbuf (GtkThemingEngine    *engine,
          stated = gdk_pixbuf_get_from_surface (surface, 0, 0,
                                                cairo_image_surface_get_width (surface),
                                                cairo_image_surface_get_height (surface));
+         cairo_surface_destroy (surface);
         }
       else
         stated = scaled;
@@ -3237,24 +2779,11 @@ gtk_theming_engine_render_icon (GtkThemingEngine *engine,
                                 gdouble x,
                                 gdouble y)
 {
-  GtkStateFlags state;
-  GtkShadow *icon_shadow;
-
-  state = gtk_theming_engine_get_state (engine);
-
   cairo_save (cr);
 
   gdk_cairo_set_source_pixbuf (cr, pixbuf, x, y);
 
-  gtk_theming_engine_get (engine, state,
-                          "icon-shadow", &icon_shadow,
-                          NULL);
-
-  if (icon_shadow != NULL)
-    {
-      _gtk_icon_shadow_paint (icon_shadow, cr);
-      _gtk_shadow_unref (icon_shadow);
-    }
+  _gtk_css_shadows_value_paint_icon (_gtk_theming_engine_peek_property (engine, GTK_CSS_PROPERTY_ICON_SHADOW), cr);
 
   cairo_paint (cr);