themingengine: Move actual render functions to gtkrender.c

GtkThemingEngine just always calls
  gtk_do_render_foo(engine->priv->context, ...)
now. Other than that, the code is unchanged.

8 files changed, 1929 insertions, 1627 deletions

diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index bb9b080ee6..931a50d178 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -638,6 +638,7 @@ gtk_private_h_sources =		\
 	gtkrecentchooserdefault.h \
 	gtkrecentchooserprivate.h \
 	gtkrecentchooserutils.h	\
+	gtkrenderprivate.h	\
 	gtkresources.h		\
 	gtkroundedboxprivate.h	\
 	gtkscaleprivate.h	\
diff --git a/gtk/deprecated/gtkthemingengine.c b/gtk/deprecated/gtkthemingengine.c
index 988dd409aa..120732329d 100644
--- a/gtk/deprecated/gtkthemingengine.c
+++ b/gtk/deprecated/gtkthemingengine.c
@@ -27,23 +27,10 @@
 
 #include "gtkprivate.h"
 #include "gtkmodulesprivate.h"
-#include "gtkborderimageprivate.h"
 #include "gtkpango.h"
-#include "gtkcssarrayvalueprivate.h"
-#include "gtkcsscornervalueprivate.h"
-#include "gtkcssenumvalueprivate.h"
-#include "gtkcssimagevalueprivate.h"
-#include "gtkcssnumbervalueprivate.h"
-#include "gtkcssrgbavalueprivate.h"
-#include "gtkcssshadowsvalueprivate.h"
-#include "gtkcsstransformvalueprivate.h"
-#include "gtkcsstypesprivate.h"
-#include "gtkhslaprivate.h"
-#include "gtkroundedboxprivate.h"
+#include "gtkrenderprivate.h"
 #include "gtkstylecontextprivate.h"
-#include "gtkthemingbackgroundprivate.h"
-
-#include "fallback-c89.c"
+#include "gtkthemingengineprivate.h"
 
 G_GNUC_BEGIN_IGNORE_DEPRECATIONS
 
@@ -1048,52 +1035,6 @@ gtk_theming_engine_get_screen (GtkThemingEngine *engine)
   return gtk_style_context_get_screen (priv->context);
 }
 
-static gboolean
-render_icon_image (GtkStyleContext  *context,
-                   cairo_t          *cr,
-                   double            x,
-                   double            y,
-                   double            width,
-                   double            height)
-{
-  const GtkCssValue *shadows;
-  cairo_matrix_t matrix, transform_matrix;
-  GtkCssImage *image;
-
-  image = _gtk_css_image_value_get_image (_gtk_style_context_peek_property (context, GTK_CSS_PROPERTY_ICON_SOURCE));
-  if (image == NULL)
-    return FALSE;
-
-  shadows = _gtk_style_context_peek_property (context, GTK_CSS_PROPERTY_ICON_SHADOW);
-
-  cairo_translate (cr, x, y);
-
-  if (_gtk_css_transform_value_get_matrix (_gtk_style_context_peek_property (context, GTK_CSS_PROPERTY_ICON_TRANSFORM), &transform_matrix))
-    {
-      /* XXX: Implement -gtk-icon-transform-origin instead of hardcoding "50% 50%" here */
-      cairo_matrix_init_translate (&matrix, width / 2, height / 2);
-      cairo_matrix_multiply (&matrix, &transform_matrix, &matrix);
-      cairo_matrix_translate (&matrix, - width / 2, - height / 2);
-
-      if (_gtk_css_shadows_value_is_none (shadows))
-        {
-          cairo_transform (cr, &matrix);
-          _gtk_css_image_draw (image, cr, width, height);
-        }
-      else
-        {
-          cairo_push_group (cr);
-          cairo_transform (cr, &matrix);
-          _gtk_css_image_draw (image, cr, width, height);
-          cairo_pop_group_to_source (cr);
-          _gtk_css_shadows_value_paint_icon (shadows, cr);
-          cairo_paint (cr);
-        }
-    }
-
-  return TRUE;
-}
-
 /* Paint method implementations */
 static void
 gtk_theming_engine_render_check (GtkThemingEngine *engine,
@@ -1103,113 +1044,7 @@ gtk_theming_engine_render_check (GtkThemingEngine *engine,
                                  gdouble           width,
                                  gdouble           height)
 {
-  GdkRGBA fg_color, bg_color;
-  GtkStateFlags flags;
-  GtkStyleContext *context;
-  gint exterior_size, interior_size, thickness, pad;
-  GtkBorderStyle border_style;
-  GtkBorder border;
-  gint border_width;
-
-  context = engine->priv->context;
-
-  if (render_icon_image (context, cr, x, y, width, height))
-    return;
-
-  flags = gtk_theming_engine_get_state (engine);
-  cairo_save (cr);
-
-  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);
-  border_style = _gtk_css_border_style_value_get 
-    (_gtk_style_context_peek_property (context, GTK_CSS_PROPERTY_BORDER_TOP_STYLE));
-
-  border_width = MIN (MIN (border.top, border.bottom),
-                      MIN (border.left, border.right));
-  exterior_size = MIN (width, height);
-
-  if (exterior_size % 2 == 0) /* Ensure odd */
-    exterior_size -= 1;
-
-  /* FIXME: thickness */
-  thickness = 1;
-  pad = thickness + MAX (1, (exterior_size - 2 * thickness) / 9);
-  interior_size = MAX (1, exterior_size - 2 * pad);
-
-  if (interior_size < 7)
-    {
-      interior_size = 7;
-      pad = MAX (0, (exterior_size - interior_size) / 2);
-    }
-
-  x -= (1 + exterior_size - (gint) width) / 2;
-  y -= (1 + exterior_size - (gint) height) / 2;
-
-  if (border_style == GTK_BORDER_STYLE_SOLID)
-    {
-      GdkRGBA border_color;
-
-      cairo_set_line_width (cr, border_width);
-      gtk_theming_engine_get_border_color (engine, flags, &border_color);
-
-      cairo_rectangle (cr, x + 0.5, y + 0.5, exterior_size - 1, exterior_size - 1);
-      gdk_cairo_set_source_rgba (cr, &bg_color);
-      cairo_fill_preserve (cr);
-
-      gdk_cairo_set_source_rgba (cr, &border_color);
-      cairo_stroke (cr);
-    }
-
-  gdk_cairo_set_source_rgba (cr, &fg_color);
-
-  if (flags & GTK_STATE_FLAG_INCONSISTENT)
-    {
-      int line_thickness = MAX (1, (3 + interior_size * 2) / 7);
-
-      cairo_rectangle (cr,
-		       x + pad,
-		       y + pad + (1 + interior_size - line_thickness) / 2,
-		       interior_size,
-		       line_thickness);
-      cairo_fill (cr);
-    }
-  else
-    {
-      if (flags & GTK_STATE_FLAG_ACTIVE)
-        {
-          cairo_translate (cr,
-                           x + pad, y + pad);
-
-          cairo_scale (cr, interior_size / 7., interior_size / 7.);
-
-          cairo_rectangle (cr, 0, 0, 7, 7);
-          cairo_clip (cr);
-
-          cairo_move_to  (cr, 7.0, 0.0);
-          cairo_line_to  (cr, 7.5, 1.0);
-          cairo_curve_to (cr, 5.3, 2.0,
-                          4.3, 4.0,
-                          3.5, 7.0);
-          cairo_curve_to (cr, 3.0, 5.7,
-                          1.3, 4.7,
-                          0.0, 4.7);
-          cairo_line_to  (cr, 0.2, 3.5);
-          cairo_curve_to (cr, 1.1, 3.5,
-                          2.3, 4.3,
-                          3.0, 5.0);
-          cairo_curve_to (cr, 1.0, 3.9,
-                          2.4, 4.1,
-                          3.2, 4.9);
-          cairo_curve_to (cr, 3.5, 3.1,
-                          5.2, 2.0,
-                          7.0, 0.0);
-
-          cairo_fill (cr);
-        }
-    }
-
-  cairo_restore (cr);
+  gtk_do_render_check (engine->priv->context, cr, x, y, width, height);
 }
 
 static void
@@ -1220,107 +1055,7 @@ gtk_theming_engine_render_option (GtkThemingEngine *engine,
                                   gdouble           width,
                                   gdouble           height)
 {
-  GtkStateFlags flags;
-  GdkRGBA fg_color, bg_color;
-  gint exterior_size, interior_size, pad, thickness, border_width;
-  GtkStyleContext *context;
-  GtkBorderStyle border_style;
-  GtkBorder border;
-
-  context = engine->priv->context;
-
-  if (render_icon_image (context, cr, x, y, width, height))
-    return;
-
-  flags = gtk_theming_engine_get_state (engine);
-
-  cairo_save (cr);
-
-  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);
-  border_style = _gtk_css_border_style_value_get 
-    (_gtk_style_context_peek_property (context, GTK_CSS_PROPERTY_BORDER_TOP_STYLE));
-
-  exterior_size = MIN (width, height);
-  border_width = MIN (MIN (border.top, border.bottom),
-                      MIN (border.left, border.right));
-
-  if (exterior_size % 2 == 0) /* Ensure odd */
-    exterior_size -= 1;
-
-  x -= (1 + exterior_size - width) / 2;
-  y -= (1 + exterior_size - height) / 2;
-
-  if (border_style == GTK_BORDER_STYLE_SOLID)
-    {
-      GdkRGBA border_color;
-
-      cairo_set_line_width (cr, border_width);
-      gtk_theming_engine_get_border_color (engine, flags, &border_color);
-
-      cairo_new_sub_path (cr);
-      cairo_arc (cr,
-                 x + exterior_size / 2.,
-                 y + exterior_size / 2.,
-                 (exterior_size - 1) / 2.,
-                 0, 2 * G_PI);
-
-      gdk_cairo_set_source_rgba (cr, &bg_color);
-      cairo_fill_preserve (cr);
-
-      gdk_cairo_set_source_rgba (cr, &border_color);
-      cairo_stroke (cr);
-    }
-
-  gdk_cairo_set_source_rgba (cr, &fg_color);
-
-  /* FIXME: thickness */
-  thickness = 1;
-
-  if (flags & GTK_STATE_FLAG_INCONSISTENT)
-    {
-      gint line_thickness;
-
-      pad = thickness + MAX (1, (exterior_size - 2 * thickness) / 9);
-      interior_size = MAX (1, exterior_size - 2 * pad);
-
-      if (interior_size < 7)
-        {
-          interior_size = 7;
-          pad = MAX (0, (exterior_size - interior_size) / 2);
-        }
-
-      line_thickness = MAX (1, (3 + interior_size * 2) / 7);
-
-      cairo_rectangle (cr,
-                       x + pad,
-                       y + pad + (interior_size - line_thickness) / 2.,
-                       interior_size,
-                       line_thickness);
-      cairo_fill (cr);
-    }
-  if (flags & GTK_STATE_FLAG_ACTIVE)
-    {
-      pad = thickness + MAX (1, 2 * (exterior_size - 2 * thickness) / 9);
-      interior_size = MAX (1, exterior_size - 2 * pad);
-
-      if (interior_size < 5)
-        {
-          interior_size = 7;
-          pad = MAX (0, (exterior_size - interior_size) / 2);
-        }
-
-      cairo_new_sub_path (cr);
-      cairo_arc (cr,
-                 x + pad + interior_size / 2.,
-                 y + pad + interior_size / 2.,
-                 interior_size / 2.,
-                 0, 2 * G_PI);
-      cairo_fill (cr);
-    }
-
-  cairo_restore (cr);
+  gtk_do_render_option (engine->priv->context, cr, x, y, width, height);
 }
 
 static void
@@ -1331,75 +1066,7 @@ gtk_theming_engine_render_arrow (GtkThemingEngine *engine,
                                  gdouble           y,
                                  gdouble           size)
 {
-  double line_width;
-  GtkStateFlags state;
-  GdkRGBA color;
-
-  if (render_icon_image (engine->priv->context, cr, x, y, size, size))
-    return;
-
-  cairo_save (cr);
-
-  line_width = size / 3.0 / sqrt (2);
-  cairo_set_line_width (cr, line_width);
-  cairo_set_line_join (cr, CAIRO_LINE_JOIN_ROUND);
-  cairo_set_line_cap (cr, CAIRO_LINE_CAP_ROUND);
-
-  cairo_translate (cr, x + size / 2.0, y + size / 2.0);
-  cairo_rotate (cr, angle - G_PI_2);
-  cairo_translate (cr, size / 4.0, 0);
-
-  cairo_scale (cr,
-               (size / (size + line_width)),
-               (size / (size + line_width)));
-
-  cairo_move_to (cr, -size / 2.0, -size / 2.0);
-  cairo_rel_line_to (cr, size / 2.0, size / 2.0);
-  cairo_rel_line_to (cr, - size / 2.0, size / 2.0);
-
-  state = gtk_theming_engine_get_state (engine);
-  gtk_theming_engine_get_color (engine, state, &color);
-  gdk_cairo_set_source_rgba (cr, &color);
-  cairo_stroke (cr);
-
-  cairo_restore (cr);
-}
-
-static void
-add_path_line (cairo_t        *cr,
-               gdouble         x1,
-               gdouble         y1,
-               gdouble         x2,
-               gdouble         y2)
-{
-  /* Adjust endpoints */
-  if (y1 == y2)
-    {
-      y1 += 0.5;
-      y2 += 0.5;
-      x2 += 1;
-    }
-  else if (x1 == x2)
-    {
-      x1 += 0.5;
-      x2 += 0.5;
-      y2 += 1;
-    }
-
-  cairo_move_to (cr, x1, y1);
-  cairo_line_to (cr, x2, y2);
-}
-
-static void
-color_shade (const GdkRGBA *color,
-             gdouble        factor,
-             GdkRGBA       *color_return)
-{
-  GtkHSLA hsla;
-
-  _gtk_hsla_init_from_rgba (&hsla, color);
-  _gtk_hsla_shade (&hsla, &hsla, factor);
-  _gdk_rgba_init_from_hsla (color_return, &hsla);
+  gtk_do_render_arrow (engine->priv->context, cr, angle, x, y, size);
 }
 
 static void
@@ -1410,402 +1077,7 @@ gtk_theming_engine_render_background (GtkThemingEngine *engine,
                                       gdouble           width,
                                       gdouble           height)
 {
-  GtkThemingBackground bg;
-
-  _gtk_theming_background_init (&bg, engine->priv->context,
-                                x, y,
-                                width, height,
-                                gtk_theming_engine_get_junction_sides (engine));
-
-  _gtk_theming_background_render (&bg, cr);
-}
-
-static void
-gtk_theming_engine_hide_border_sides (double         border[4],
-                                      GtkBorderStyle border_style[4],
-                                      guint          hidden_side)
-{
-  guint i;
-
-  for (i = 0; i < 4; i++)
-    {
-      if (hidden_side & (1 << i) ||
-          border_style[i] == GTK_BORDER_STYLE_NONE ||
-          border_style[i] == GTK_BORDER_STYLE_HIDDEN)
-        border[i] = 0;
-    }
-}
-
-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]))
-    {
-      gdk_cairo_set_source_rgba (cr, &colors[0]);
-
-      _gtk_rounded_box_path (border_box, cr);
-      _gtk_rounded_box_path (&padding_box, cr);
-      cairo_fill (cr);
-    }
-  else
-    {
-      for (i = 0; i < 4; i++) 
-        {
-          if (hidden_side & (1 << i))
-            continue;
-
-          for (j = 0; j < 4; j++)
-            { 
-              if (hidden_side & (1 << j))
-                continue;
-
-              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_fill (cr);
-        }
-    }
-}
-
-static void
-set_stroke_style (cairo_t        *cr,
-                  double          line_width,
-                  GtkBorderStyle  style,
-                  double          length)
-{
-  double segments[2];
-  double n;
-
-  cairo_set_line_width (cr, line_width);
-
-  if (style == GTK_BORDER_STYLE_DOTTED)
-    {
-      n = round (0.5 * length / line_width);
-
-      segments[0] = 0;
-      segments[1] = n ? length / n : 2;
-      cairo_set_dash (cr, segments, G_N_ELEMENTS (segments), 0);
-
-      cairo_set_line_cap (cr, CAIRO_LINE_CAP_ROUND);
-      cairo_set_line_join (cr, CAIRO_LINE_JOIN_ROUND);
-    }
-  else
-    {
-      n = length / line_width;
-      /* Optimize the common case of an integer-sized rectangle
-       * Again, we care about focus rectangles.
-       */
-      if (n == nearbyint (n))
-        {
-          segments[0] = 1;
-          segments[1] = 2;
-        }
-      else
-        {
-          n = round ((1. / 3) * n);
-
-          segments[0] = n ? (1. / 3) * length / n : 1;
-          segments[1] = 2 * segments[0];
-        }
-      cairo_set_dash (cr, segments, G_N_ELEMENTS (segments), 0);
-
-      cairo_set_line_cap (cr, CAIRO_LINE_CAP_SQUARE);
-      cairo_set_line_join (cr, CAIRO_LINE_JOIN_MITER);
-    }
-}
-
-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)
-    {
-      double length = 0;
-
-      /* FAST PATH:
-       * Mostly expected to trigger for focus rectangles */
-      for (i = 0; i < 4; i++) 
-        {
-          length += _gtk_rounded_box_guess_length (&stroke_box, i);
-          _gtk_rounded_box_path_side (&stroke_box, cr, i);
-        }
-
-      gdk_cairo_set_source_rgba (cr, &colors[0]);
-      set_stroke_style (cr, border_width[0], stroke_style, length);
-      cairo_stroke (cr);
-    }
-  else
-    {
-      GtkRoundedBox padding_box;
-
-      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]);
-
-      for (i = 0; i < 4; i++) 
-        {
-          if (hidden_side & (1 << i))
-            continue;
-
-          cairo_save (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);
-
-          _gtk_rounded_box_path_side (&stroke_box, cr, i);
-
-          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);
-
-          cairo_restore (cr);
-        }
-    }
-}
-
-static void
-render_border (cairo_t       *cr,
-               GtkRoundedBox *border_box,
-               const double   border_width[4],
-               guint          hidden_side,
-               GdkRGBA        colors[4],
-               GtkBorderStyle border_style[4])
-{
-  guint i, j;
-
-  cairo_save (cr);
-
-  cairo_set_fill_rule (cr, CAIRO_FILL_RULE_EVEN_ODD);
-
-  for (i = 0; i < 4; i++)
-    {
-      if (hidden_side & (1 << i))
-        continue;
-
-      /* NB: code below divides by this value */
-      /* a border smaller than this will not noticably modify
-       * pixels on screen, and since we don't compare with 0,
-       * we'll use this value */
-      if (border_width[i] < 1.0 / 1024)
-        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);
-
-  cairo_restore (cr);
-}
-
-static void
-render_frame_internal (GtkStyleContext  *context,
-                       cairo_t          *cr,
-                       gdouble           x,
-                       gdouble           y,
-                       gdouble           width,
-                       gdouble           height,
-                       guint             hidden_side,
-                       GtkJunctionSides  junction)
-{
-  GtkBorderImage border_image;
-  GtkBorderStyle border_style[4];
-  GtkRoundedBox border_box;
-  double border_width[4];
-  GdkRGBA colors[4];
-
-  border_width[0] = _gtk_css_number_value_get (_gtk_style_context_peek_property (context, GTK_CSS_PROPERTY_BORDER_TOP_WIDTH), 100);
-  border_width[1] = _gtk_css_number_value_get (_gtk_style_context_peek_property (context, GTK_CSS_PROPERTY_BORDER_RIGHT_WIDTH), 100);
-  border_width[2] = _gtk_css_number_value_get (_gtk_style_context_peek_property (context, GTK_CSS_PROPERTY_BORDER_BOTTOM_WIDTH), 100);
-  border_width[3] = _gtk_css_number_value_get (_gtk_style_context_peek_property (context, GTK_CSS_PROPERTY_BORDER_LEFT_WIDTH), 100);
-
-  border_style[0] = _gtk_css_border_style_value_get (_gtk_style_context_peek_property (context, GTK_CSS_PROPERTY_BORDER_TOP_STYLE));
-  border_style[1] = _gtk_css_border_style_value_get (_gtk_style_context_peek_property (context, GTK_CSS_PROPERTY_BORDER_RIGHT_STYLE));
-  border_style[2] = _gtk_css_border_style_value_get (_gtk_style_context_peek_property (context, GTK_CSS_PROPERTY_BORDER_BOTTOM_STYLE));
-  border_style[3] = _gtk_css_border_style_value_get (_gtk_style_context_peek_property (context, GTK_CSS_PROPERTY_BORDER_LEFT_STYLE));
-
-  gtk_theming_engine_hide_border_sides (border_width, border_style, hidden_side);
-
-  if (_gtk_border_image_init (&border_image, context))
-    _gtk_border_image_render (&border_image, border_width, cr, x, y, width, height);
-  else
-    {
-      colors[0] = *_gtk_css_rgba_value_get_rgba (_gtk_style_context_peek_property (context, GTK_CSS_PROPERTY_BORDER_TOP_COLOR));
-      colors[1] = *_gtk_css_rgba_value_get_rgba (_gtk_style_context_peek_property (context, GTK_CSS_PROPERTY_BORDER_RIGHT_COLOR));
-      colors[2] = *_gtk_css_rgba_value_get_rgba (_gtk_style_context_peek_property (context, GTK_CSS_PROPERTY_BORDER_BOTTOM_COLOR));
-      colors[3] = *_gtk_css_rgba_value_get_rgba (_gtk_style_context_peek_property (context, GTK_CSS_PROPERTY_BORDER_LEFT_COLOR));
-
-      _gtk_rounded_box_init_rect (&border_box, x, y, width, height);
-      _gtk_rounded_box_apply_border_radius_for_context (&border_box, context, junction);
-
-      render_border (cr, &border_box, border_width, hidden_side, colors, border_style);
-    }
+  gtk_do_render_background (engine->priv->context, cr, x, y, width, height);
 }
 
 static void
@@ -1816,13 +1088,7 @@ gtk_theming_engine_render_frame (GtkThemingEngine *engine,
                                  gdouble           width,
                                  gdouble           height)
 {
-  GtkJunctionSides junction;
-
-  junction = gtk_theming_engine_get_junction_sides (engine);
-
-  render_frame_internal (engine->priv->context, cr,
-                         x, y, width, height,
-                         0, junction);
+  gtk_do_render_frame (engine->priv->context, cr, x, y, width, height);
 }
 
 static void
@@ -1833,107 +1099,7 @@ gtk_theming_engine_render_expander (GtkThemingEngine *engine,
                                     gdouble           width,
                                     gdouble           height)
 {
-  GtkStateFlags flags;
-  GdkRGBA outline_color, fg_color;
-  double vertical_overshoot;
-  int diameter;
-  double radius;
-  double interp;		/* interpolation factor for center position */
-  double x_double_horz, y_double_horz;
-  double x_double_vert, y_double_vert;
-  double x_double, y_double;
-  gdouble angle;
-  gint line_width;
-  gboolean is_rtl;
-  gdouble progress;
-
-  if (render_icon_image (engine->priv->context, cr, x, y, width, height))
-    return;
-
-  cairo_save (cr);
-  flags = gtk_theming_engine_get_state (engine);
-
-  gtk_theming_engine_get_color (engine, flags, &fg_color);
-  gtk_theming_engine_get_border_color (engine, flags, &outline_color);
-
-  is_rtl = (gtk_theming_engine_get_state (engine) & GTK_STATE_FLAG_DIR_RTL);
-  line_width = 1;
-  progress = (flags & GTK_STATE_FLAG_CHECKED) ? 1 : 0;
-
-  if (!gtk_theming_engine_has_class (engine, GTK_STYLE_CLASS_HORIZONTAL))
-    {
-      if (is_rtl)
-        angle = (G_PI) - ((G_PI / 2) * progress);
-      else
-        angle = (G_PI / 2) * progress;
-    }
-  else
-    {
-      if (is_rtl)
-        angle = (G_PI / 2) + ((G_PI / 2) * progress);
-      else
-        angle = (G_PI / 2) - ((G_PI / 2) * progress);
-    }
-
-  interp = progress;
-
-  /* Compute distance that the stroke extends beyonds the end
-   * of the triangle we draw.
-   */
-  vertical_overshoot = line_width / 2.0 * (1. / tan (G_PI / 8));
-
-  /* For odd line widths, we end the vertical line of the triangle
-   * at a half pixel, so we round differently.
-   */
-  if (line_width % 2 == 1)
-    vertical_overshoot = ceil (0.5 + vertical_overshoot) - 0.5;
-  else
-    vertical_overshoot = ceil (vertical_overshoot);
-
-  /* Adjust the size of the triangle we draw so that the entire stroke fits
-   */
-  diameter = (gint) MAX (3, width - 2 * vertical_overshoot);
-
-  /* If the line width is odd, we want the diameter to be even,
-   * and vice versa, so force the sum to be odd. This relationship
-   * makes the point of the triangle look right.
-   */
-  diameter -= (1 - (diameter + line_width) % 2);
-
-  radius = diameter / 2.;
-
-  /* Adjust the center so that the stroke is properly aligned with
-   * the pixel grid. The center adjustment is different for the
-   * horizontal and vertical orientations. For intermediate positions
-   * we interpolate between the two.
-   */
-  x_double_vert = floor ((x + width / 2) - (radius + line_width) / 2.) + (radius + line_width) / 2.;
-  y_double_vert = (y + height / 2) - 0.5;
-
-  x_double_horz = (x + width / 2) - 0.5;
-  y_double_horz = floor ((y + height / 2) - (radius + line_width) / 2.) + (radius + line_width) / 2.;
-
-  x_double = x_double_vert * (1 - interp) + x_double_horz * interp;
-  y_double = y_double_vert * (1 - interp) + y_double_horz * interp;
-
-  cairo_translate (cr, x_double, y_double);
-  cairo_rotate (cr, angle);
-
-  cairo_move_to (cr, - radius / 2., - radius);
-  cairo_line_to (cr,   radius / 2.,   0);
-  cairo_line_to (cr, - radius / 2.,   radius);
-  cairo_close_path (cr);
-
-  cairo_set_line_width (cr, line_width);
-
-  gdk_cairo_set_source_rgba (cr, &fg_color);
-
-  cairo_fill_preserve (cr);
-
-  gdk_cairo_set_source_rgba (cr, &outline_color);
-  cairo_stroke (cr);
-
-  cairo_restore (cr);
+  gtk_do_render_expander (engine->priv->context, cr, x, y, width, height);
 }
 
 static void
@@ -1944,34 +1110,7 @@ gtk_theming_engine_render_focus (GtkThemingEngine *engine,
                                  gdouble           width,
                                  gdouble           height)
 {
-  GtkBorderStyle border_style[4];
-  GtkRoundedBox border_box;
-  GtkStyleContext *context = engine->priv->context;
-  double border_width[4];
-  GdkRGBA colors[4];
-
-  border_style[0] = _gtk_css_border_style_value_get (_gtk_style_context_peek_property (context, GTK_CSS_PROPERTY_OUTLINE_STYLE));
-  if (border_style[0] != GTK_BORDER_STYLE_NONE)
-    {
-      int offset;
-
-      border_style[1] = border_style[2] = border_style[3] = border_style[0];
-      border_width[0] = _gtk_css_number_value_get (_gtk_style_context_peek_property (context, 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_style_context_peek_property (context, GTK_CSS_PROPERTY_OUTLINE_COLOR));
-      colors[3] = colors[2] = colors[1] = colors[0];
-      offset = _gtk_css_number_value_get (_gtk_style_context_peek_property (context, GTK_CSS_PROPERTY_OUTLINE_OFFSET), 100);
-
-      _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);
-      _gtk_rounded_box_apply_outline_radius_for_context (&border_box, engine->priv->context, GTK_JUNCTION_NONE);
-
-      render_border (cr, &border_box, border_width, 0, colors, border_style);
-    }
+  gtk_do_render_focus (engine->priv->context, cr, x, y, width, height);
 }
 
 static void
@@ -1982,49 +1121,7 @@ gtk_theming_engine_render_line (GtkThemingEngine *engine,
                                 gdouble           x1,
                                 gdouble           y1)
 {
-  GdkRGBA color;
-  GtkStateFlags flags;
-
-  flags = gtk_theming_engine_get_state (engine);
-  cairo_save (cr);
-
-  gtk_theming_engine_get_color (engine, flags, &color);
-
-  cairo_set_line_cap (cr, CAIRO_LINE_CAP_SQUARE);
-  cairo_set_line_width (cr, 1);
-
-  cairo_move_to (cr, x0 + 0.5, y0 + 0.5);
-  cairo_line_to (cr, x1 + 0.5, y1 + 0.5);
-
-  gdk_cairo_set_source_rgba (cr, &color);
-  cairo_stroke (cr);
-
-  cairo_restore (cr);
-}
-
-static void
-prepare_context_for_layout (cairo_t *cr,
-                            gdouble x,
-                            gdouble y,
-                            PangoLayout *layout)
-{
-  const PangoMatrix *matrix;
-
-  matrix = pango_context_get_matrix (pango_layout_get_context (layout));
-
-  cairo_move_to (cr, x, y);
-
-  if (matrix)
-    {
-      cairo_matrix_t cairo_matrix;
-
-      cairo_matrix_init (&cairo_matrix,
-                         matrix->xx, matrix->yx,
-                         matrix->xy, matrix->yy,
-                         matrix->x0, matrix->y0);
-
-      cairo_transform (cr, &cairo_matrix);
-    }
+  gtk_do_render_line (engine->priv->context, cr, x0, y0, x1, y1);
 }
 
 static void
@@ -2034,22 +1131,7 @@ gtk_theming_engine_render_layout (GtkThemingEngine *engine,
                                   gdouble           y,
                                   PangoLayout      *layout)
 {
-  GdkRGBA fg_color;
-  GtkStateFlags flags;
-
-  cairo_save (cr);
-  flags = gtk_theming_engine_get_state (engine);
-  gtk_theming_engine_get_color (engine, flags, &fg_color);
-
-  prepare_context_for_layout (cr, x, y, layout);
-
-  _gtk_css_shadows_value_paint_layout (_gtk_style_context_peek_property (engine->priv->context, GTK_CSS_PROPERTY_TEXT_SHADOW),
-                                       cr, layout);
-
-  gdk_cairo_set_source_rgba (cr, &fg_color);
-  pango_cairo_show_layout (cr, layout);
-
-  cairo_restore (cr);
+  gtk_do_render_layout (engine->priv->context, cr, x, y, layout);
 }
 
 static void
@@ -2061,8 +1143,7 @@ gtk_theming_engine_render_slider (GtkThemingEngine *engine,
                                   gdouble           height,
                                   GtkOrientation    orientation)
 {
-  gtk_theming_engine_render_background (engine, cr, x, y, width, height);
-  gtk_theming_engine_render_frame (engine, cr, x, y, width, height);
+  gtk_do_render_slider (engine->priv->context, cr, x, y, width, height, orientation);
 }
 
 static void
@@ -2076,96 +1157,7 @@ gtk_theming_engine_render_frame_gap (GtkThemingEngine *engine,
                                      gdouble           xy0_gap,
                                      gdouble           xy1_gap)
 {
-  GtkJunctionSides junction;
-  GtkStateFlags state;
-  GtkStyleContext *context;
-  gint border_width;
-  GtkCssValue *corner[4];
-  gdouble x0, y0, x1, y1, xc = 0.0, yc = 0.0, wc = 0.0, hc = 0.0;
-  GtkBorder border;
-
-  context = engine->priv->context;
-  state = gtk_theming_engine_get_state (engine);
-  junction = gtk_theming_engine_get_junction_sides (engine);
-
-  gtk_theming_engine_get_border (engine, state, &border);
-  corner[GTK_CSS_TOP_LEFT] = _gtk_style_context_peek_property (context, GTK_CSS_PROPERTY_BORDER_TOP_LEFT_RADIUS);
-  corner[GTK_CSS_TOP_RIGHT] = _gtk_style_context_peek_property (context, GTK_CSS_PROPERTY_BORDER_TOP_RIGHT_RADIUS);
-  corner[GTK_CSS_BOTTOM_LEFT] = _gtk_style_context_peek_property (context, GTK_CSS_PROPERTY_BORDER_BOTTOM_LEFT_RADIUS);
-  corner[GTK_CSS_BOTTOM_RIGHT] = _gtk_style_context_peek_property (context, GTK_CSS_PROPERTY_BORDER_BOTTOM_RIGHT_RADIUS);
-
-  border_width = MIN (MIN (border.top, border.bottom),
-                      MIN (border.left, border.right));
-
-  cairo_save (cr);
-
-  switch (gap_side)
-    {
-    case GTK_POS_TOP:
-      xc = x + xy0_gap + border_width;
-      yc = y;
-      wc = MAX (xy1_gap - xy0_gap - 2 * border_width, 0);
-      hc = border_width;
-
-      if (xy0_gap < _gtk_css_corner_value_get_x (corner[GTK_CSS_TOP_LEFT], width))
-        junction |= GTK_JUNCTION_CORNER_TOPLEFT;
-
-      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:
-      xc = x + xy0_gap + border_width;
-      yc = y + height - border_width;
-      wc = MAX (xy1_gap - xy0_gap - 2 * border_width, 0);
-      hc = border_width;
-
-      if (xy0_gap < _gtk_css_corner_value_get_x (corner[GTK_CSS_BOTTOM_LEFT], width))
-        junction |= GTK_JUNCTION_CORNER_BOTTOMLEFT;
-
-      if (xy1_gap > width - _gtk_css_corner_value_get_x (corner[GTK_CSS_BOTTOM_RIGHT], width))
-        junction |= GTK_JUNCTION_CORNER_BOTTOMRIGHT;
-
-      break;
-    case GTK_POS_LEFT:
-      xc = x;
-      yc = y + xy0_gap + border_width;
-      wc = border_width;
-      hc = MAX (xy1_gap - xy0_gap - 2 * border_width, 0);
-
-      if (xy0_gap < _gtk_css_corner_value_get_y (corner[GTK_CSS_TOP_LEFT], height))
-        junction |= GTK_JUNCTION_CORNER_TOPLEFT;
-
-      if (xy1_gap > height - _gtk_css_corner_value_get_y (corner[GTK_CSS_BOTTOM_LEFT], height))
-        junction |= GTK_JUNCTION_CORNER_BOTTOMLEFT;
-
-      break;
-    case GTK_POS_RIGHT:
-      xc = x + width - border_width;
-      yc = y + xy0_gap + border_width;
-      wc = border_width;
-      hc = MAX (xy1_gap - xy0_gap - 2 * border_width, 0);
-
-      if (xy0_gap < _gtk_css_corner_value_get_y (corner[GTK_CSS_TOP_RIGHT], height))
-        junction |= GTK_JUNCTION_CORNER_TOPRIGHT;
-
-      if (xy1_gap > height - _gtk_css_corner_value_get_y (corner[GTK_CSS_BOTTOM_RIGHT], height))
-        junction |= GTK_JUNCTION_CORNER_BOTTOMRIGHT;
-
-      break;
-    }
-
-  cairo_clip_extents (cr, &x0, &y0, &x1, &y1);
-  cairo_rectangle (cr, x0, y0, x1 - x0, yc - y0);
-  cairo_rectangle (cr, x0, yc, xc - x0, hc);
-  cairo_rectangle (cr, xc + wc, yc, x1 - (xc + wc), hc);
-  cairo_rectangle (cr, x0, yc + hc, x1 - x0, y1 - (yc + hc));
-  cairo_clip (cr);
-
-  render_frame_internal (context, cr,
-                         x, y, width, height,
-                         0, junction);
-
-  cairo_restore (cr);
+  gtk_do_render_frame_gap (engine->priv->context, cr, x, y, width, height, gap_side, xy0_gap, xy1_gap);
 }
 
 static void
@@ -2177,70 +1169,7 @@ gtk_theming_engine_render_extension (GtkThemingEngine *engine,
                                      gdouble           height,
                                      GtkPositionType   gap_side)
 {
-  GtkThemingBackground bg;
-  GtkJunctionSides junction = 0;
-  guint hidden_side = 0;
-
-  switch (gap_side)
-    {
-    case GTK_POS_LEFT:
-      junction = GTK_JUNCTION_LEFT;
-      hidden_side = (1 << GTK_CSS_LEFT);
-      break;
-    case GTK_POS_RIGHT:
-      junction = GTK_JUNCTION_RIGHT;
-      hidden_side = (1 << GTK_CSS_RIGHT);
-      break;
-    case GTK_POS_TOP:
-      junction = GTK_JUNCTION_TOP;
-      hidden_side = (1 << GTK_CSS_TOP);
-      break;
-    case GTK_POS_BOTTOM:
-      junction = GTK_JUNCTION_BOTTOM;
-      hidden_side = (1 << GTK_CSS_BOTTOM);
-      break;
-    }
-
-  _gtk_theming_background_init (&bg, engine->priv->context, 
-                                x, y,
-                                width, height,
-                                junction);
-  _gtk_theming_background_render (&bg, cr);
-
-  render_frame_internal (engine->priv->context, cr,
-                         x, y, width, height,
-                         hidden_side, junction);
-}
-
-static void
-render_dot (cairo_t       *cr,
-            const GdkRGBA *lighter,
-            const GdkRGBA *darker,
-            gdouble        x,
-            gdouble        y,
-            gdouble        size)
-{
-  size = CLAMP ((gint) size, 2, 3);
-
-  if (size == 2)
-    {
-      gdk_cairo_set_source_rgba (cr, lighter);
-      cairo_rectangle (cr, x, y, 1, 1);
-      cairo_rectangle (cr, x + 1, y + 1, 1, 1);
-      cairo_fill (cr);
-    }
-  else if (size == 3)
-    {
-      gdk_cairo_set_source_rgba (cr, lighter);
-      cairo_rectangle (cr, x, y, 2, 1);
-      cairo_rectangle (cr, x, y, 1, 2);
-      cairo_fill (cr);
-
-      gdk_cairo_set_source_rgba (cr, darker);
-      cairo_rectangle (cr, x + 1, y + 1, 2, 1);
-      cairo_rectangle (cr, x + 2, y, 1, 2);
-      cairo_fill (cr);
-    }
+  gtk_do_render_extension (engine->priv->context, cr, x, y, width, height, gap_side);
 }
 
 static void
@@ -2251,383 +1180,7 @@ gtk_theming_engine_render_handle (GtkThemingEngine *engine,
                                   gdouble           width,
                                   gdouble           height)
 {
-  GtkStateFlags flags;
-  GdkRGBA bg_color, lighter, darker;
-  GtkJunctionSides sides;
-  GtkThemingBackground bg;
-  gint xx, yy;
-  gboolean has_image;
-
-  if (render_icon_image (engine->priv->context, cr, x, y, width, height))
-    return;
-
-  cairo_save (cr);
-  flags = gtk_theming_engine_get_state (engine);
-
-  cairo_set_line_width (cr, 1.0);
-  sides = gtk_theming_engine_get_junction_sides (engine);
-  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_background_init (&bg, engine->priv->context, 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))
-    {
-      /* reduce confusing values to a meaningful state */
-      if ((sides & (GTK_JUNCTION_CORNER_TOPLEFT | GTK_JUNCTION_CORNER_BOTTOMRIGHT)) == (GTK_JUNCTION_CORNER_TOPLEFT | GTK_JUNCTION_CORNER_BOTTOMRIGHT))
-        sides &= ~GTK_JUNCTION_CORNER_TOPLEFT;
-
-      if ((sides & (GTK_JUNCTION_CORNER_TOPRIGHT | GTK_JUNCTION_CORNER_BOTTOMLEFT)) == (GTK_JUNCTION_CORNER_TOPRIGHT | GTK_JUNCTION_CORNER_BOTTOMLEFT))
-        sides &= ~GTK_JUNCTION_CORNER_TOPRIGHT;
-
-      if (sides == 0)
-        sides = GTK_JUNCTION_CORNER_BOTTOMRIGHT;
-
-      /* align drawing area to the connected side */
-      if (sides == GTK_JUNCTION_LEFT)
-        {
-          if (height < width)
-            width = height;
-        }
-      else if (sides == GTK_JUNCTION_CORNER_TOPLEFT)
-        {
-          if (width < height)
-            height = width;
-          else if (height < width)
-            width = height;
-        }
-      else if (sides == GTK_JUNCTION_CORNER_BOTTOMLEFT)
-        {
-          /* make it square, aligning to bottom left */
-          if (width < height)
-            {
-              y += (height - width);
-              height = width;
-            }
-          else if (height < width)
-            width = height;
-        }
-      else if (sides == GTK_JUNCTION_RIGHT)
-        {
-          /* aligning to right */
-          if (height < width)
-            {
-              x += (width - height);
-              width = height;
-            }
-        }
-      else if (sides == GTK_JUNCTION_CORNER_TOPRIGHT)
-        {
-          if (width < height)
-            height = width;
-          else if (height < width)
-            {
-              x += (width - height);
-              width = height;
-            }
-        }
-      else if (sides == GTK_JUNCTION_CORNER_BOTTOMRIGHT)
-        {
-          /* make it square, aligning to bottom right */
-          if (width < height)
-            {
-              y += (height - width);
-              height = width;
-            }
-          else if (height < width)
-            {
-              x += (width - height);
-              width = height;
-            }
-        }
-      else if (sides == GTK_JUNCTION_TOP)
-        {
-          if (width < height)
-            height = width;
-        }
-      else if (sides == GTK_JUNCTION_BOTTOM)
-        {
-          /* align to bottom */
-          if (width < height)
-            {
-              y += (height - width);
-              height = width;
-            }
-        }
-      else
-        g_assert_not_reached ();
-
-      if (sides == GTK_JUNCTION_LEFT ||
-          sides == GTK_JUNCTION_RIGHT)
-        {
-          gint xi;
-
-          xi = x;
-
-          while (xi < x + width)
-            {
-              gdk_cairo_set_source_rgba (cr, &lighter);
-              add_path_line (cr, x, y, x, y + height);
-              cairo_stroke (cr);
-              xi++;
-
-              gdk_cairo_set_source_rgba (cr, &darker);
-              add_path_line (cr, xi, y, xi, y + height);
-              cairo_stroke (cr);
-              xi += 2;
-            }
-        }
-      else if (sides == GTK_JUNCTION_TOP ||
-               sides == GTK_JUNCTION_BOTTOM)
-        {
-          gint yi;
-
-          yi = y;
-
-          while (yi < y + height)
-            {
-              gdk_cairo_set_source_rgba (cr, &lighter);
-              add_path_line (cr, x, yi, x + width, yi);
-              cairo_stroke (cr);
-              yi++;
-
-              gdk_cairo_set_source_rgba (cr, &darker);
-              add_path_line (cr, x, yi, x + width, yi);
-              cairo_stroke (cr);
-              yi += 2;
-            }
-        }
-      else if (sides == GTK_JUNCTION_CORNER_TOPLEFT)
-        {
-          gint xi, yi;
-
-          xi = x + width;
-          yi = y + height;
-
-          while (xi > x + 3)
-            {
-              gdk_cairo_set_source_rgba (cr, &darker);
-              add_path_line (cr, xi, y, x, yi);
-              cairo_stroke (cr);
-
-              --xi;
-              --yi;
-
-              add_path_line (cr, xi, y, x, yi);
-              cairo_stroke (cr);
-
-              --xi;
-              --yi;
-
-              gdk_cairo_set_source_rgba (cr, &lighter);
-              add_path_line (cr, xi, y, x, yi);
-              cairo_stroke (cr);
-
-              xi -= 3;
-              yi -= 3;
-            }
-        }
-      else if (sides == GTK_JUNCTION_CORNER_TOPRIGHT)
-        {
-          gint xi, yi;
-
-          xi = x;
-          yi = y + height;
-
-          while (xi < (x + width - 3))
-            {
-              gdk_cairo_set_source_rgba (cr, &lighter);
-              add_path_line (cr, xi, y, x + width, yi);
-              cairo_stroke (cr);
-
-              ++xi;
-              --yi;
-
-              gdk_cairo_set_source_rgba (cr, &darker);
-              add_path_line (cr, xi, y, x + width, yi);
-              cairo_stroke (cr);
-
-              ++xi;
-              --yi;
-
-              add_path_line (cr, xi, y, x + width, yi);
-              cairo_stroke (cr);
-
-              xi += 3;
-              yi -= 3;
-            }
-        }
-      else if (sides == GTK_JUNCTION_CORNER_BOTTOMLEFT)
-        {
-          gint xi, yi;
-
-          xi = x + width;
-          yi = y;
-
-          while (xi > x + 3)
-            {
-              gdk_cairo_set_source_rgba (cr, &darker);
-              add_path_line (cr, x, yi, xi, y + height);
-              cairo_stroke (cr);
-
-              --xi;
-              ++yi;
-
-              add_path_line (cr, x, yi, xi, y + height);
-              cairo_stroke (cr);
-
-              --xi;
-              ++yi;
-
-              gdk_cairo_set_source_rgba (cr, &lighter);
-              add_path_line (cr, x, yi, xi, y + height);
-              cairo_stroke (cr);
-
-              xi -= 3;
-              yi += 3;
-            }
-        }
-      else if (sides == GTK_JUNCTION_CORNER_BOTTOMRIGHT)
-        {
-          gint xi, yi;
-
-          xi = x;
-          yi = y;
-
-          while (xi < (x + width - 3))
-            {
-              gdk_cairo_set_source_rgba (cr, &lighter);
-              add_path_line (cr, xi, y + height, x + width, yi);
-              cairo_stroke (cr);
-
-              ++xi;
-              ++yi;
-
-              gdk_cairo_set_source_rgba (cr, &darker);
-              add_path_line (cr, xi, y + height, x + width, yi);
-              cairo_stroke (cr);
-
-              ++xi;
-              ++yi;
-
-              add_path_line (cr, xi, y + height, x + width, yi);
-              cairo_stroke (cr);
-
-              xi += 3;
-              yi += 3;
-            }
-        }
-    }
-  else if (gtk_theming_engine_has_class (engine, GTK_STYLE_CLASS_PANE_SEPARATOR))
-    {
-      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
-    {
-      for (yy = y; yy < y + height; yy += 3)
-        for (xx = x; xx < x + width; xx += 6)
-          {
-            render_dot (cr, &lighter, &darker, xx, yy, 2);
-            render_dot (cr, &lighter, &darker, xx + 3, yy + 1, 2);
-          }
-    }
-
-  cairo_restore (cr);
-}
-
-void
-_gtk_theming_engine_paint_spinner (cairo_t       *cr,
-                                   gdouble        radius,
-                                   gdouble        progress)
-{
-  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++)
-    {
-      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_push_group (cr);
-
-      cairo_move_to (cr,
-                     (radius - inset) * xscale,
-                     (radius - inset) * yscale);
-      cairo_line_to (cr,
-                     radius * xscale,
-                     radius * yscale);
-
-      cairo_stroke (cr);
-
-      cairo_pop_group_to_source (cr);
-      cairo_paint_with_alpha (cr, t);
-    }
-
-  cairo_restore (cr);
-}
-
-static void
-render_spinner (GtkThemingEngine *engine,
-                cairo_t          *cr,
-                gdouble           x,
-                gdouble           y,
-                gdouble           width,
-                gdouble           height)
-{
-  GtkStateFlags state;
-  GdkRGBA color;
-  gdouble radius;
-
-  state = gtk_theming_engine_get_state (engine);
-  radius = MIN (width / 2, height / 2);
-
-  gtk_theming_engine_get_color (engine, state, &color);
-
-  cairo_save (cr);
-  cairo_translate (cr, x + width / 2, y + height / 2);
-
-  _gtk_css_shadows_value_paint_spinner (_gtk_style_context_peek_property (engine->priv->context, GTK_CSS_PROPERTY_ICON_SHADOW),
-                                        cr,
-                                        radius,
-                                        -1);
-
-  gdk_cairo_set_source_rgba (cr, &color);
-  _gtk_theming_engine_paint_spinner (cr, radius, -1);
-
-  cairo_restore (cr);
+  gtk_do_render_handle (engine->priv->context, cr, x, y, width, height);
 }
 
 static void
@@ -2638,53 +1191,7 @@ gtk_theming_engine_render_activity (GtkThemingEngine *engine,
                                     gdouble           width,
                                     gdouble           height)
 {
-  if (render_icon_image (engine->priv->context, cr, x, y, width, height))
-    return;
-
-  render_spinner (engine, cr, x, y, width, height);
-}
-
-static GdkPixbuf *
-scale_or_ref (GdkPixbuf *src,
-              gint       width,
-              gint       height)
-{
-  if (width == gdk_pixbuf_get_width (src) &&
-      height == gdk_pixbuf_get_height (src))
-    return g_object_ref (src);
-  else
-    return gdk_pixbuf_scale_simple (src,
-                                    width, height,
-                                    GDK_INTERP_BILINEAR);
-}
-
-static gboolean
-lookup_icon_size (GtkThemingEngine *engine,
-		  GtkIconSize       size,
-		  gint             *width,
-		  gint             *height)
-{
-  return gtk_icon_size_lookup (size, width, height);
-}
-
-static void
-colorshift_source (cairo_t *cr,
-		   gdouble shift)
-{
-  cairo_pattern_t *source;
-
-  cairo_save (cr);
-  cairo_paint (cr);
-
-  source = cairo_pattern_reference (cairo_get_source (cr));
-
-  cairo_set_source_rgb (cr, shift, shift, shift);
-  cairo_set_operator (cr, CAIRO_OPERATOR_COLOR_DODGE);
-
-  cairo_mask (cr, source);
-
-  cairo_pattern_destroy (source);
-  cairo_restore (cr);
+  gtk_do_render_activity (engine->priv->context, cr, x, y, width, height);
 }
 
 static GdkPixbuf *
@@ -2692,95 +1199,7 @@ gtk_theming_engine_render_icon_pixbuf (GtkThemingEngine    *engine,
                                        const GtkIconSource *source,
                                        GtkIconSize          size)
 {
-  GdkPixbuf *scaled;
-  GdkPixbuf *stated;
-  GdkPixbuf *base_pixbuf;
-  GtkStateFlags state;
-  gint width = 1;
-  gint height = 1;
-  cairo_t *cr;
-  cairo_surface_t *surface;
-  gboolean wildcarded;
-  GtkCssImageEffect image_effect;
-
-  G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
-  base_pixbuf = gtk_icon_source_get_pixbuf (source);
-  G_GNUC_END_IGNORE_DEPRECATIONS;
-
-  state = gtk_theming_engine_get_state (engine);
-
-  g_return_val_if_fail (base_pixbuf != NULL, NULL);
-
-  if (size != (GtkIconSize) -1 &&
-      !lookup_icon_size (engine, size, &width, &height))
-    {
-      g_warning (G_STRLOC ": invalid icon size '%d'", size);
-      return NULL;
-    }
-
-  /* If the size was wildcarded, and we're allowed to scale, then scale; otherwise,
-   * leave it alone.
-   */
-  G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
-  wildcarded = gtk_icon_source_get_size_wildcarded (source);
-  G_GNUC_END_IGNORE_DEPRECATIONS;
-  if (size != (GtkIconSize) -1 && wildcarded)
-    scaled = scale_or_ref (base_pixbuf, width, height);
-  else
-    scaled = g_object_ref (base_pixbuf);
-
-  /* If the state was wildcarded, then generate a state. */
-  G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
-  wildcarded = gtk_icon_source_get_state_wildcarded (source);
-  G_GNUC_END_IGNORE_DEPRECATIONS;
-
-  if (!wildcarded)
-    return scaled;
-
-  image_effect = _gtk_css_image_effect_value_get
-    (_gtk_style_context_peek_property (engine->priv->context, GTK_CSS_PROPERTY_GTK_IMAGE_EFFECT));
-
-  if (image_effect == GTK_CSS_IMAGE_EFFECT_DIM ||
-      state & GTK_STATE_FLAG_INSENSITIVE)
-    {
-      surface = cairo_image_surface_create (CAIRO_FORMAT_ARGB32,
-					    gdk_pixbuf_get_width (scaled),
-					    gdk_pixbuf_get_height (scaled));
-      cr = cairo_create (surface);
-      gdk_cairo_set_source_pixbuf (cr, scaled, 0, 0);
-      cairo_paint_with_alpha (cr, 0.5);
-
-      cairo_destroy (cr);
-
-      g_object_unref (scaled);
-      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 (image_effect == GTK_CSS_IMAGE_EFFECT_HIGHLIGHT ||
-	   state & GTK_STATE_FLAG_PRELIGHT)
-    {
-      surface = cairo_image_surface_create (CAIRO_FORMAT_ARGB32,
-					    gdk_pixbuf_get_width (scaled),
-					    gdk_pixbuf_get_height (scaled));
-
-      cr = cairo_create (surface);
-      gdk_cairo_set_source_pixbuf (cr, scaled, 0, 0);
-      colorshift_source (cr, 0.10);
-
-      cairo_destroy (cr);
-
-      g_object_unref (scaled);
-      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;
-
-  return stated;
+  return gtk_do_render_icon_pixbuf (engine->priv->context, source, size);
 }
 
 static void
@@ -2790,15 +1209,7 @@ gtk_theming_engine_render_icon (GtkThemingEngine *engine,
                                 gdouble x,
                                 gdouble y)
 {
-  cairo_save (cr);
-
-  gdk_cairo_set_source_pixbuf (cr, pixbuf, x, y);
-
-  _gtk_css_shadows_value_paint_icon (_gtk_style_context_peek_property (engine->priv->context, GTK_CSS_PROPERTY_ICON_SHADOW), cr);
-
-  cairo_paint (cr);
-
-  cairo_restore (cr);
+  gtk_do_render_icon (engine->priv->context, cr, pixbuf, x, y);
 }
 
 static void
@@ -2808,15 +1219,7 @@ gtk_theming_engine_render_icon_surface (GtkThemingEngine *engine,
 					gdouble x,
 					gdouble y)
 {
-  cairo_save (cr);
-
-  cairo_set_source_surface (cr, surface, x, y);
-
-  _gtk_css_shadows_value_paint_icon (_gtk_style_context_peek_property (engine->priv->context, GTK_CSS_PROPERTY_ICON_SHADOW), cr);
-
-  cairo_paint (cr);
-
-  cairo_restore (cr);
+  gtk_do_render_icon_surface (engine->priv->context, cr, surface, x, y);
 }
 
 G_GNUC_END_IGNORE_DEPRECATIONS
diff --git a/gtk/deprecated/gtkthemingengineprivate.h b/gtk/deprecated/gtkthemingengineprivate.h
index 850c9fe006..fd83351844 100644
--- a/gtk/deprecated/gtkthemingengineprivate.h
+++ b/gtk/deprecated/gtkthemingengineprivate.h
@@ -24,9 +24,6 @@
 
 G_BEGIN_DECLS
 
-void _gtk_theming_engine_paint_spinner (cairo_t       *cr,
-                                        gdouble        radius,
-                                        gdouble        progress);
 void          _gtk_theming_engine_set_context   (GtkThemingEngine *engine,
                                                  GtkStyleContext  *context);
 
diff --git a/gtk/gtkborderimage.c b/gtk/gtkborderimage.c
index 49a619adbf..fb6462045d 100644
--- a/gtk/gtkborderimage.c
+++ b/gtk/gtkborderimage.c
@@ -29,6 +29,7 @@
 #include "gtkcssimagevalueprivate.h"
 #include "gtkcssnumbervalueprivate.h"
 #include "gtkcssrepeatvalueprivate.h"
+#include "gtkstylepropertyprivate.h"
 #include "gtkstylepropertiesprivate.h"
 
 /* this is in case round() is not provided by the compiler, 
diff --git a/gtk/gtkcssshadowvalue.c b/gtk/gtkcssshadowvalue.c
index 6f66f2f44e..42e1d68f63 100644
--- a/gtk/gtkcssshadowvalue.c
+++ b/gtk/gtkcssshadowvalue.c
@@ -26,10 +26,9 @@
 #include "gtkcssnumbervalueprivate.h"
 #include "gtkcssrgbavalueprivate.h"
 #include "gtkstylecontextprivate.h"
+#include "gtkrenderprivate.h"
 #include "gtkpango.h"
 
-#include "deprecated/gtkthemingengineprivate.h"
-
 #include <math.h>
 
 struct _GtkCssValue {
@@ -457,7 +456,7 @@ _gtk_css_shadow_value_paint_spinner (const GtkCssValue *shadow,
   cairo_translate (cr,
                    _gtk_css_number_value_get (shadow->hoffset, 0),
                    _gtk_css_number_value_get (shadow->voffset, 0));
-  _gtk_theming_engine_paint_spinner (cr, radius, progress);
+  gtk_render_paint_spinner (cr, radius, progress);
 
   cr = gtk_css_shadow_value_finish_drawing (shadow, cr);
 
diff --git a/gtk/gtkrender.c b/gtk/gtkrender.c
index 64d9a78519..ca07ecc866 100644
--- a/gtk/gtkrender.c
+++ b/gtk/gtkrender.c
@@ -18,11 +18,186 @@
 #include "config.h"
 
 #include "gtkrender.h"
+#include "gtkrenderprivate.h"
 
+#include <math.h>
+
+#include "gtkborderimageprivate.h"
+#include "gtkcsscornervalueprivate.h"
 #include "gtkcssenginevalueprivate.h"
+#include "gtkcssenumvalueprivate.h"
+#include "gtkcssimagevalueprivate.h"
+#include "gtkcssnumbervalueprivate.h"
+#include "gtkcssrgbavalueprivate.h"
+#include "gtkcssshadowsvalueprivate.h"
+#include "gtkcsstransformvalueprivate.h"
+#include "gtkhslaprivate.h"
 #include "gtkstylecontextprivate.h"
-#include "gtkthemingengine.h"
-#include "gtkthemingengineprivate.h"
+#include "gtkthemingbackgroundprivate.h"
+#include "deprecated/gtkthemingengine.h"
+#include "deprecated/gtkthemingengineprivate.h"
+
+#include "fallback-c89.c"
+
+static gboolean
+render_icon_image (GtkStyleContext *context,
+                   cairo_t         *cr,
+                   double           x,
+                   double           y,
+                   double           width,
+                   double           height)
+{
+  const GtkCssValue *shadows;
+  cairo_matrix_t matrix, transform_matrix;
+  GtkCssImage *image;
+
+  image = _gtk_css_image_value_get_image (_gtk_style_context_peek_property (context, GTK_CSS_PROPERTY_ICON_SOURCE));
+  if (image == NULL)
+    return FALSE;
+
+  shadows = _gtk_style_context_peek_property (context, GTK_CSS_PROPERTY_ICON_SHADOW);
+
+  cairo_translate (cr, x, y);
+
+  if (_gtk_css_transform_value_get_matrix (_gtk_style_context_peek_property (context, GTK_CSS_PROPERTY_ICON_TRANSFORM), &transform_matrix))
+    {
+      /* XXX: Implement -gtk-icon-transform-origin instead of hardcoding "50% 50%" here */
+      cairo_matrix_init_translate (&matrix, width / 2, height / 2);
+      cairo_matrix_multiply (&matrix, &transform_matrix, &matrix);
+      cairo_matrix_translate (&matrix, - width / 2, - height / 2);
+
+      if (_gtk_css_shadows_value_is_none (shadows))
+        {
+          cairo_transform (cr, &matrix);
+          _gtk_css_image_draw (image, cr, width, height);
+        }
+      else
+        {
+          cairo_push_group (cr);
+          cairo_transform (cr, &matrix);
+          _gtk_css_image_draw (image, cr, width, height);
+          cairo_pop_group_to_source (cr);
+          _gtk_css_shadows_value_paint_icon (shadows, cr);
+          cairo_paint (cr);
+        }
+    }
+
+  return TRUE;
+}
+
+void
+gtk_do_render_check (GtkStyleContext *context,
+                     cairo_t         *cr,
+                     gdouble          x,
+                     gdouble          y,
+                     gdouble          width,
+                     gdouble          height)
+{
+  GdkRGBA fg_color, bg_color;
+  GtkStateFlags flags;
+  gint exterior_size, interior_size, thickness, pad;
+  GtkBorderStyle border_style;
+  GtkBorder border;
+  gint border_width;
+
+  if (render_icon_image (context, cr, x, y, width, height))
+    return;
+
+  flags = gtk_style_context_get_state (context);
+  cairo_save (cr);
+
+  gtk_style_context_get_color (context, flags, &fg_color);
+  gtk_style_context_get_background_color (context, flags, &bg_color);
+  gtk_style_context_get_border (context, flags, &border);
+  border_style = _gtk_css_border_style_value_get 
+    (_gtk_style_context_peek_property (context, GTK_CSS_PROPERTY_BORDER_TOP_STYLE));
+
+  border_width = MIN (MIN (border.top, border.bottom),
+                      MIN (border.left, border.right));
+  exterior_size = MIN (width, height);
+
+  if (exterior_size % 2 == 0) /* Ensure odd */
+    exterior_size -= 1;
+
+  /* FIXME: thickness */
+  thickness = 1;
+  pad = thickness + MAX (1, (exterior_size - 2 * thickness) / 9);
+  interior_size = MAX (1, exterior_size - 2 * pad);
+
+  if (interior_size < 7)
+    {
+      interior_size = 7;
+      pad = MAX (0, (exterior_size - interior_size) / 2);
+    }
+
+  x -= (1 + exterior_size - (gint) width) / 2;
+  y -= (1 + exterior_size - (gint) height) / 2;
+
+  if (border_style == GTK_BORDER_STYLE_SOLID)
+    {
+      GdkRGBA border_color;
+
+      cairo_set_line_width (cr, border_width);
+      gtk_style_context_get_border_color (context, flags, &border_color);
+
+      cairo_rectangle (cr, x + 0.5, y + 0.5, exterior_size - 1, exterior_size - 1);
+      gdk_cairo_set_source_rgba (cr, &bg_color);
+      cairo_fill_preserve (cr);
+
+      gdk_cairo_set_source_rgba (cr, &border_color);
+      cairo_stroke (cr);
+    }
+
+  gdk_cairo_set_source_rgba (cr, &fg_color);
+
+  if (flags & GTK_STATE_FLAG_INCONSISTENT)
+    {
+      int line_thickness = MAX (1, (3 + interior_size * 2) / 7);
+
+      cairo_rectangle (cr,
+		       x + pad,
+		       y + pad + (1 + interior_size - line_thickness) / 2,
+		       interior_size,
+		       line_thickness);
+      cairo_fill (cr);
+    }
+  else
+    {
+      if (flags & GTK_STATE_FLAG_ACTIVE)
+        {
+          cairo_translate (cr,
+                           x + pad, y + pad);
+
+          cairo_scale (cr, interior_size / 7., interior_size / 7.);
+
+          cairo_rectangle (cr, 0, 0, 7, 7);
+          cairo_clip (cr);
+
+          cairo_move_to  (cr, 7.0, 0.0);
+          cairo_line_to  (cr, 7.5, 1.0);
+          cairo_curve_to (cr, 5.3, 2.0,
+                          4.3, 4.0,
+                          3.5, 7.0);
+          cairo_curve_to (cr, 3.0, 5.7,
+                          1.3, 4.7,
+                          0.0, 4.7);
+          cairo_line_to  (cr, 0.2, 3.5);
+          cairo_curve_to (cr, 1.1, 3.5,
+                          2.3, 4.3,
+                          3.0, 5.0);
+          cairo_curve_to (cr, 1.0, 3.9,
+                          2.4, 4.1,
+                          3.2, 4.9);
+          cairo_curve_to (cr, 3.5, 3.1,
+                          5.2, 2.0,
+                          7.0, 0.0);
+
+          cairo_fill (cr);
+        }
+    }
+
+  cairo_restore (cr);
+}
 
 /**
  * gtk_render_check:
@@ -76,6 +251,114 @@ gtk_render_check (GtkStyleContext *context,
   cairo_restore (cr);
 }
 
+void
+gtk_do_render_option (GtkStyleContext *context,
+                      cairo_t         *cr,
+                      gdouble          x,
+                      gdouble          y,
+                      gdouble          width,
+                      gdouble          height)
+{
+  GtkStateFlags flags;
+  GdkRGBA fg_color, bg_color;
+  gint exterior_size, interior_size, pad, thickness, border_width;
+  GtkBorderStyle border_style;
+  GtkBorder border;
+
+  if (render_icon_image (context, cr, x, y, width, height))
+    return;
+
+  flags = gtk_style_context_get_state (context);
+
+  cairo_save (cr);
+
+  gtk_style_context_get_color (context, flags, &fg_color);
+  gtk_style_context_get_background_color (context, flags, &bg_color);
+  gtk_style_context_get_border (context, flags, &border);
+  border_style = _gtk_css_border_style_value_get 
+    (_gtk_style_context_peek_property (context, GTK_CSS_PROPERTY_BORDER_TOP_STYLE));
+
+  exterior_size = MIN (width, height);
+  border_width = MIN (MIN (border.top, border.bottom),
+                      MIN (border.left, border.right));
+
+  if (exterior_size % 2 == 0) /* Ensure odd */
+    exterior_size -= 1;
+
+  x -= (1 + exterior_size - width) / 2;
+  y -= (1 + exterior_size - height) / 2;
+
+  if (border_style == GTK_BORDER_STYLE_SOLID)
+    {
+      GdkRGBA border_color;
+
+      cairo_set_line_width (cr, border_width);
+      gtk_style_context_get_border_color (context, flags, &border_color);
+
+      cairo_new_sub_path (cr);
+      cairo_arc (cr,
+                 x + exterior_size / 2.,
+                 y + exterior_size / 2.,
+                 (exterior_size - 1) / 2.,
+                 0, 2 * G_PI);
+
+      gdk_cairo_set_source_rgba (cr, &bg_color);
+      cairo_fill_preserve (cr);
+
+      gdk_cairo_set_source_rgba (cr, &border_color);
+      cairo_stroke (cr);
+    }
+
+  gdk_cairo_set_source_rgba (cr, &fg_color);
+
+  /* FIXME: thickness */
+  thickness = 1;
+
+  if (flags & GTK_STATE_FLAG_INCONSISTENT)
+    {
+      gint line_thickness;
+
+      pad = thickness + MAX (1, (exterior_size - 2 * thickness) / 9);
+      interior_size = MAX (1, exterior_size - 2 * pad);
+
+      if (interior_size < 7)
+        {
+          interior_size = 7;
+          pad = MAX (0, (exterior_size - interior_size) / 2);
+        }
+
+      line_thickness = MAX (1, (3 + interior_size * 2) / 7);
+
+      cairo_rectangle (cr,
+                       x + pad,
+                       y + pad + (interior_size - line_thickness) / 2.,
+                       interior_size,
+                       line_thickness);
+      cairo_fill (cr);
+    }
+  if (flags & GTK_STATE_FLAG_ACTIVE)
+    {
+      pad = thickness + MAX (1, 2 * (exterior_size - 2 * thickness) / 9);
+      interior_size = MAX (1, exterior_size - 2 * pad);
+
+      if (interior_size < 5)
+        {
+          interior_size = 7;
+          pad = MAX (0, (exterior_size - interior_size) / 2);
+        }
+
+      cairo_new_sub_path (cr);
+      cairo_arc (cr,
+                 x + pad + interior_size / 2.,
+                 y + pad + interior_size / 2.,
+                 interior_size / 2.,
+                 0, 2 * G_PI);
+      cairo_fill (cr);
+    }
+
+  cairo_restore (cr);
+}
+
 /**
  * gtk_render_option:
  * @context: a #GtkStyleContext
@@ -125,6 +408,48 @@ gtk_render_option (GtkStyleContext *context,
   cairo_restore (cr);
 }
 
+void
+gtk_do_render_arrow (GtkStyleContext *context,
+                     cairo_t         *cr,
+                     gdouble          angle,
+                     gdouble          x,
+                     gdouble          y,
+                     gdouble          size)
+{
+  double line_width;
+  GtkStateFlags state;
+  GdkRGBA color;
+
+  if (render_icon_image (context, cr, x, y, size, size))
+    return;
+
+  cairo_save (cr);
+
+  line_width = size / 3.0 / sqrt (2);
+  cairo_set_line_width (cr, line_width);
+  cairo_set_line_join (cr, CAIRO_LINE_JOIN_ROUND);
+  cairo_set_line_cap (cr, CAIRO_LINE_CAP_ROUND);
+
+  cairo_translate (cr, x + size / 2.0, y + size / 2.0);
+  cairo_rotate (cr, angle - G_PI_2);
+  cairo_translate (cr, size / 4.0, 0);
+
+  cairo_scale (cr,
+               (size / (size + line_width)),
+               (size / (size + line_width)));
+
+  cairo_move_to (cr, -size / 2.0, -size / 2.0);
+  cairo_rel_line_to (cr, size / 2.0, size / 2.0);
+  cairo_rel_line_to (cr, - size / 2.0, size / 2.0);
+
+  state = gtk_style_context_get_state (context);
+  gtk_style_context_get_color (context, state, &color);
+  gdk_cairo_set_source_rgba (cr, &color);
+  cairo_stroke (cr);
+
+  cairo_restore (cr);
+}
+
 /**
  * gtk_render_arrow:
  * @context: a #GtkStyleContext
@@ -176,6 +501,36 @@ gtk_render_arrow (GtkStyleContext *context,
   cairo_restore (cr);
 }
 
+static void
+color_shade (const GdkRGBA *color,
+             gdouble        factor,
+             GdkRGBA       *color_return)
+{
+  GtkHSLA hsla;
+
+  _gtk_hsla_init_from_rgba (&hsla, color);
+  _gtk_hsla_shade (&hsla, &hsla, factor);
+  _gdk_rgba_init_from_hsla (color_return, &hsla);
+}
+
+void
+gtk_do_render_background (GtkStyleContext *context,
+                          cairo_t         *cr,
+                          gdouble          x,
+                          gdouble          y,
+                          gdouble          width,
+                          gdouble          height)
+{
+  GtkThemingBackground bg;
+
+  _gtk_theming_background_init (&bg, context,
+                                x, y,
+                                width, height,
+                                gtk_style_context_get_junction_sides (context));
+
+  _gtk_theming_background_render (&bg, cr);
+}
+
 /**
  * gtk_render_background:
  * @context: a #GtkStyleContext
@@ -223,6 +578,411 @@ gtk_render_background (GtkStyleContext *context,
   cairo_restore (cr);
 }
 
+static void
+hide_border_sides (double         border[4],
+                   GtkBorderStyle border_style[4],
+                   guint          hidden_side)
+{
+  guint i;
+
+  for (i = 0; i < 4; i++)
+    {
+      if (hidden_side & (1 << i) ||
+          border_style[i] == GTK_BORDER_STYLE_NONE ||
+          border_style[i] == GTK_BORDER_STYLE_HIDDEN)
+        border[i] = 0;
+    }
+}
+
+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]))
+    {
+      gdk_cairo_set_source_rgba (cr, &colors[0]);
+
+      _gtk_rounded_box_path (border_box, cr);
+      _gtk_rounded_box_path (&padding_box, cr);
+      cairo_fill (cr);
+    }
+  else
+    {
+      for (i = 0; i < 4; i++) 
+        {
+          if (hidden_side & (1 << i))
+            continue;
+
+          for (j = 0; j < 4; j++)
+            { 
+              if (hidden_side & (1 << j))
+                continue;
+
+              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_fill (cr);
+        }
+    }
+}
+
+static void
+set_stroke_style (cairo_t        *cr,
+                  double          line_width,
+                  GtkBorderStyle  style,
+                  double          length)
+{
+  double segments[2];
+  double n;
+
+  cairo_set_line_width (cr, line_width);
+
+  if (style == GTK_BORDER_STYLE_DOTTED)
+    {
+      n = round (0.5 * length / line_width);
+
+      segments[0] = 0;
+      segments[1] = n ? length / n : 2;
+      cairo_set_dash (cr, segments, G_N_ELEMENTS (segments), 0);
+
+      cairo_set_line_cap (cr, CAIRO_LINE_CAP_ROUND);
+      cairo_set_line_join (cr, CAIRO_LINE_JOIN_ROUND);
+    }
+  else
+    {
+      n = length / line_width;
+      /* Optimize the common case of an integer-sized rectangle
+       * Again, we care about focus rectangles.
+       */
+      if (n == nearbyint (n))
+        {
+          segments[0] = 1;
+          segments[1] = 2;
+        }
+      else
+        {
+          n = round ((1. / 3) * n);
+
+          segments[0] = n ? (1. / 3) * length / n : 1;
+          segments[1] = 2 * segments[0];
+        }
+      cairo_set_dash (cr, segments, G_N_ELEMENTS (segments), 0);
+
+      cairo_set_line_cap (cr, CAIRO_LINE_CAP_SQUARE);
+      cairo_set_line_join (cr, CAIRO_LINE_JOIN_MITER);
+    }
+}
+
+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)
+    {
+      double length = 0;
+
+      /* FAST PATH:
+       * Mostly expected to trigger for focus rectangles */
+      for (i = 0; i < 4; i++) 
+        {
+          length += _gtk_rounded_box_guess_length (&stroke_box, i);
+          _gtk_rounded_box_path_side (&stroke_box, cr, i);
+        }
+
+      gdk_cairo_set_source_rgba (cr, &colors[0]);
+      set_stroke_style (cr, border_width[0], stroke_style, length);
+      cairo_stroke (cr);
+    }
+  else
+    {
+      GtkRoundedBox padding_box;
+
+      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]);
+
+      for (i = 0; i < 4; i++) 
+        {
+          if (hidden_side & (1 << i))
+            continue;
+
+          cairo_save (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);
+
+          _gtk_rounded_box_path_side (&stroke_box, cr, i);
+
+          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);
+
+          cairo_restore (cr);
+        }
+    }
+}
+
+static void
+render_border (cairo_t       *cr,
+               GtkRoundedBox *border_box,
+               const double   border_width[4],
+               guint          hidden_side,
+               GdkRGBA        colors[4],
+               GtkBorderStyle border_style[4])
+{
+  guint i, j;
+
+  cairo_save (cr);
+
+  cairo_set_fill_rule (cr, CAIRO_FILL_RULE_EVEN_ODD);
+
+  for (i = 0; i < 4; i++)
+    {
+      if (hidden_side & (1 << i))
+        continue;
+
+      /* NB: code below divides by this value */
+      /* a border smaller than this will not noticably modify
+       * pixels on screen, and since we don't compare with 0,
+       * we'll use this value */
+      if (border_width[i] < 1.0 / 1024)
+        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);
+
+  cairo_restore (cr);
+}
+
+static void
+render_frame_internal (GtkStyleContext  *context,
+                       cairo_t          *cr,
+                       gdouble           x,
+                       gdouble           y,
+                       gdouble           width,
+                       gdouble           height,
+                       guint             hidden_side,
+                       GtkJunctionSides  junction)
+{
+  GtkBorderImage border_image;
+  GtkBorderStyle border_style[4];
+  GtkRoundedBox border_box;
+  double border_width[4];
+  GdkRGBA colors[4];
+
+  border_width[0] = _gtk_css_number_value_get (_gtk_style_context_peek_property (context, GTK_CSS_PROPERTY_BORDER_TOP_WIDTH), 100);
+  border_width[1] = _gtk_css_number_value_get (_gtk_style_context_peek_property (context, GTK_CSS_PROPERTY_BORDER_RIGHT_WIDTH), 100);
+  border_width[2] = _gtk_css_number_value_get (_gtk_style_context_peek_property (context, GTK_CSS_PROPERTY_BORDER_BOTTOM_WIDTH), 100);
+  border_width[3] = _gtk_css_number_value_get (_gtk_style_context_peek_property (context, GTK_CSS_PROPERTY_BORDER_LEFT_WIDTH), 100);
+
+  border_style[0] = _gtk_css_border_style_value_get (_gtk_style_context_peek_property (context, GTK_CSS_PROPERTY_BORDER_TOP_STYLE));
+  border_style[1] = _gtk_css_border_style_value_get (_gtk_style_context_peek_property (context, GTK_CSS_PROPERTY_BORDER_RIGHT_STYLE));
+  border_style[2] = _gtk_css_border_style_value_get (_gtk_style_context_peek_property (context, GTK_CSS_PROPERTY_BORDER_BOTTOM_STYLE));
+  border_style[3] = _gtk_css_border_style_value_get (_gtk_style_context_peek_property (context, GTK_CSS_PROPERTY_BORDER_LEFT_STYLE));
+
+  hide_border_sides (border_width, border_style, hidden_side);
+
+  if (_gtk_border_image_init (&border_image, context))
+    _gtk_border_image_render (&border_image, border_width, cr, x, y, width, height);
+  else
+    {
+      colors[0] = *_gtk_css_rgba_value_get_rgba (_gtk_style_context_peek_property (context, GTK_CSS_PROPERTY_BORDER_TOP_COLOR));
+      colors[1] = *_gtk_css_rgba_value_get_rgba (_gtk_style_context_peek_property (context, GTK_CSS_PROPERTY_BORDER_RIGHT_COLOR));
+      colors[2] = *_gtk_css_rgba_value_get_rgba (_gtk_style_context_peek_property (context, GTK_CSS_PROPERTY_BORDER_BOTTOM_COLOR));
+      colors[3] = *_gtk_css_rgba_value_get_rgba (_gtk_style_context_peek_property (context, GTK_CSS_PROPERTY_BORDER_LEFT_COLOR));
+
+      _gtk_rounded_box_init_rect (&border_box, x, y, width, height);
+      _gtk_rounded_box_apply_border_radius_for_context (&border_box, context, junction);
+
+      render_border (cr, &border_box, border_width, hidden_side, colors, border_style);
+    }
+}
+
+void
+gtk_do_render_frame (GtkStyleContext *context,
+                     cairo_t         *cr,
+                     gdouble          x,
+                     gdouble          y,
+                     gdouble          width,
+                     gdouble          height)
+{
+  GtkJunctionSides junction;
+
+  junction = gtk_style_context_get_junction_sides (context);
+
+  render_frame_internal (context, cr,
+                         x, y, width, height,
+                         0, junction);
+}
+
 /**
  * gtk_render_frame:
  * @context: a #GtkStyleContext
@@ -270,6 +1030,117 @@ gtk_render_frame (GtkStyleContext *context,
   cairo_restore (cr);
 }
 
+void
+gtk_do_render_expander (GtkStyleContext *context,
+                        cairo_t         *cr,
+                        gdouble          x,
+                        gdouble          y,
+                        gdouble          width,
+                        gdouble          height)
+{
+  GtkStateFlags flags;
+  GdkRGBA outline_color, fg_color;
+  double vertical_overshoot;
+  int diameter;
+  double radius;
+  double interp;		/* interpolation factor for center position */
+  double x_double_horz, y_double_horz;
+  double x_double_vert, y_double_vert;
+  double x_double, y_double;
+  gdouble angle;
+  gint line_width;
+  gboolean is_rtl;
+  gdouble progress;
+
+  if (render_icon_image (context, cr, x, y, width, height))
+    return;
+
+  cairo_save (cr);
+  flags = gtk_style_context_get_state (context);
+
+  gtk_style_context_get_color (context, flags, &fg_color);
+  gtk_style_context_get_border_color (context, flags, &outline_color);
+
+  is_rtl = (gtk_style_context_get_state (context) & GTK_STATE_FLAG_DIR_RTL);
+  line_width = 1;
+  progress = (flags & GTK_STATE_FLAG_CHECKED) ? 1 : 0;
+
+  if (!gtk_style_context_has_class (context, GTK_STYLE_CLASS_HORIZONTAL))
+    {
+      if (is_rtl)
+        angle = (G_PI) - ((G_PI / 2) * progress);
+      else
+        angle = (G_PI / 2) * progress;
+    }
+  else
+    {
+      if (is_rtl)
+        angle = (G_PI / 2) + ((G_PI / 2) * progress);
+      else
+        angle = (G_PI / 2) - ((G_PI / 2) * progress);
+    }
+
+  interp = progress;
+
+  /* Compute distance that the stroke extends beyonds the end
+   * of the triangle we draw.
+   */
+  vertical_overshoot = line_width / 2.0 * (1. / tan (G_PI / 8));
+
+  /* For odd line widths, we end the vertical line of the triangle
+   * at a half pixel, so we round differently.
+   */
+  if (line_width % 2 == 1)
+    vertical_overshoot = ceil (0.5 + vertical_overshoot) - 0.5;
+  else
+    vertical_overshoot = ceil (vertical_overshoot);
+
+  /* Adjust the size of the triangle we draw so that the entire stroke fits
+   */
+  diameter = (gint) MAX (3, width - 2 * vertical_overshoot);
+
+  /* If the line width is odd, we want the diameter to be even,
+   * and vice versa, so force the sum to be odd. This relationship
+   * makes the point of the triangle look right.
+   */
+  diameter -= (1 - (diameter + line_width) % 2);
+
+  radius = diameter / 2.;
+
+  /* Adjust the center so that the stroke is properly aligned with
+   * the pixel grid. The center adjustment is different for the
+   * horizontal and vertical orientations. For intermediate positions
+   * we interpolate between the two.
+   */
+  x_double_vert = floor ((x + width / 2) - (radius + line_width) / 2.) + (radius + line_width) / 2.;
+  y_double_vert = (y + height / 2) - 0.5;
+
+  x_double_horz = (x + width / 2) - 0.5;
+  y_double_horz = floor ((y + height / 2) - (radius + line_width) / 2.) + (radius + line_width) / 2.;
+
+  x_double = x_double_vert * (1 - interp) + x_double_horz * interp;
+  y_double = y_double_vert * (1 - interp) + y_double_horz * interp;
+
+  cairo_translate (cr, x_double, y_double);
+  cairo_rotate (cr, angle);
+
+  cairo_move_to (cr, - radius / 2., - radius);
+  cairo_line_to (cr,   radius / 2.,   0);
+  cairo_line_to (cr, - radius / 2.,   radius);
+  cairo_close_path (cr);
+
+  cairo_set_line_width (cr, line_width);
+
+  gdk_cairo_set_source_rgba (cr, &fg_color);
+
+  cairo_fill_preserve (cr);
+
+  gdk_cairo_set_source_rgba (cr, &outline_color);
+  cairo_stroke (cr);
+
+  cairo_restore (cr);
+}
+
 /**
  * gtk_render_expander:
  * @context: a #GtkStyleContext
@@ -318,6 +1189,43 @@ gtk_render_expander (GtkStyleContext *context,
   cairo_restore (cr);
 }
 
+void
+gtk_do_render_focus (GtkStyleContext *context,
+                     cairo_t         *cr,
+                     gdouble          x,
+                     gdouble          y,
+                     gdouble          width,
+                     gdouble          height)
+{
+  GtkBorderStyle border_style[4];
+  GtkRoundedBox border_box;
+  double border_width[4];
+  GdkRGBA colors[4];
+
+  border_style[0] = _gtk_css_border_style_value_get (_gtk_style_context_peek_property (context, GTK_CSS_PROPERTY_OUTLINE_STYLE));
+  if (border_style[0] != GTK_BORDER_STYLE_NONE)
+    {
+      int offset;
+
+      border_style[1] = border_style[2] = border_style[3] = border_style[0];
+      border_width[0] = _gtk_css_number_value_get (_gtk_style_context_peek_property (context, 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_style_context_peek_property (context, GTK_CSS_PROPERTY_OUTLINE_COLOR));
+      colors[3] = colors[2] = colors[1] = colors[0];
+      offset = _gtk_css_number_value_get (_gtk_style_context_peek_property (context, GTK_CSS_PROPERTY_OUTLINE_OFFSET), 100);
+
+      _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);
+      _gtk_rounded_box_apply_outline_radius_for_context (&border_box, context, GTK_JUNCTION_NONE);
+
+      render_border (cr, &border_box, border_width, 0, colors, border_style);
+    }
+}
+
 /**
  * gtk_render_focus:
  * @context: a #GtkStyleContext
@@ -364,6 +1272,56 @@ gtk_render_focus (GtkStyleContext *context,
   cairo_restore (cr);
 }
 
+static void
+prepare_context_for_layout (cairo_t *cr,
+                            gdouble x,
+                            gdouble y,
+                            PangoLayout *layout)
+{
+  const PangoMatrix *matrix;
+
+  matrix = pango_context_get_matrix (pango_layout_get_context (layout));
+
+  cairo_move_to (cr, x, y);
+
+  if (matrix)
+    {
+      cairo_matrix_t cairo_matrix;
+
+      cairo_matrix_init (&cairo_matrix,
+                         matrix->xx, matrix->yx,
+                         matrix->xy, matrix->yy,
+                         matrix->x0, matrix->y0);
+
+      cairo_transform (cr, &cairo_matrix);
+    }
+}
+
+void
+gtk_do_render_layout (GtkStyleContext *context,
+                      cairo_t         *cr,
+                      gdouble          x,
+                      gdouble          y,
+                      PangoLayout     *layout)
+{
+  GdkRGBA fg_color;
+  GtkStateFlags flags;
+
+  cairo_save (cr);
+  flags = gtk_style_context_get_state (context);
+  gtk_style_context_get_color (context, flags, &fg_color);
+
+  prepare_context_for_layout (cr, x, y, layout);
+
+  _gtk_css_shadows_value_paint_layout (_gtk_style_context_peek_property (context, GTK_CSS_PROPERTY_TEXT_SHADOW),
+                                       cr, layout);
+
+  gdk_cairo_set_source_rgba (cr, &fg_color);
+  pango_cairo_show_layout (cr, layout);
+
+  cairo_restore (cr);
+}
+
 /**
  * gtk_render_layout:
  * @context: a #GtkStyleContext
@@ -402,6 +1360,34 @@ gtk_render_layout (GtkStyleContext *context,
   cairo_restore (cr);
 }
 
+void
+gtk_do_render_line (GtkStyleContext *context,
+                    cairo_t         *cr,
+                    gdouble          x0,
+                    gdouble          y0,
+                    gdouble          x1,
+                    gdouble          y1)
+{
+  GdkRGBA color;
+  GtkStateFlags flags;
+
+  flags = gtk_style_context_get_state (context);
+  cairo_save (cr);
+
+  gtk_style_context_get_color (context, flags, &color);
+
+  cairo_set_line_cap (cr, CAIRO_LINE_CAP_SQUARE);
+  cairo_set_line_width (cr, 1);
+
+  cairo_move_to (cr, x0 + 0.5, y0 + 0.5);
+  cairo_line_to (cr, x1 + 0.5, y1 + 0.5);
+
+  gdk_cairo_set_source_rgba (cr, &color);
+  cairo_stroke (cr);
+
+  cairo_restore (cr);
+}
+
 /**
  * gtk_render_line:
  * @context: a #GtkStyleContext
@@ -441,6 +1427,19 @@ gtk_render_line (GtkStyleContext *context,
   cairo_restore (cr);
 }
 
+void
+gtk_do_render_slider (GtkStyleContext *context,
+                      cairo_t         *cr,
+                      gdouble          x,
+                      gdouble          y,
+                      gdouble          width,
+                      gdouble          height,
+                      GtkOrientation   orientation)
+{
+  gtk_do_render_background (context, cr, x, y, width, height);
+  gtk_do_render_frame (context, cr, x, y, width, height);
+}
+
 /**
  * gtk_render_slider:
  * @context: a #GtkStyleContext
@@ -491,6 +1490,107 @@ gtk_render_slider (GtkStyleContext *context,
   cairo_restore (cr);
 }
 
+void
+gtk_do_render_frame_gap (GtkStyleContext *context,
+                         cairo_t         *cr,
+                         gdouble          x,
+                         gdouble          y,
+                         gdouble          width,
+                         gdouble          height,
+                         GtkPositionType  gap_side,
+                         gdouble          xy0_gap,
+                         gdouble          xy1_gap)
+{
+  GtkJunctionSides junction;
+  GtkStateFlags state;
+  gint border_width;
+  GtkCssValue *corner[4];
+  gdouble x0, y0, x1, y1, xc = 0.0, yc = 0.0, wc = 0.0, hc = 0.0;
+  GtkBorder border;
+
+  state = gtk_style_context_get_state (context);
+  junction = gtk_style_context_get_junction_sides (context);
+
+  gtk_style_context_get_border (context, state, &border);
+  corner[GTK_CSS_TOP_LEFT] = _gtk_style_context_peek_property (context, GTK_CSS_PROPERTY_BORDER_TOP_LEFT_RADIUS);
+  corner[GTK_CSS_TOP_RIGHT] = _gtk_style_context_peek_property (context, GTK_CSS_PROPERTY_BORDER_TOP_RIGHT_RADIUS);
+  corner[GTK_CSS_BOTTOM_LEFT] = _gtk_style_context_peek_property (context, GTK_CSS_PROPERTY_BORDER_BOTTOM_LEFT_RADIUS);
+  corner[GTK_CSS_BOTTOM_RIGHT] = _gtk_style_context_peek_property (context, GTK_CSS_PROPERTY_BORDER_BOTTOM_RIGHT_RADIUS);
+
+  border_width = MIN (MIN (border.top, border.bottom),
+                      MIN (border.left, border.right));
+
+  cairo_save (cr);
+
+  switch (gap_side)
+    {
+    case GTK_POS_TOP:
+      xc = x + xy0_gap + border_width;
+      yc = y;
+      wc = MAX (xy1_gap - xy0_gap - 2 * border_width, 0);
+      hc = border_width;
+
+      if (xy0_gap < _gtk_css_corner_value_get_x (corner[GTK_CSS_TOP_LEFT], width))
+        junction |= GTK_JUNCTION_CORNER_TOPLEFT;
+
+      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:
+      xc = x + xy0_gap + border_width;
+      yc = y + height - border_width;
+      wc = MAX (xy1_gap - xy0_gap - 2 * border_width, 0);
+      hc = border_width;
+
+      if (xy0_gap < _gtk_css_corner_value_get_x (corner[GTK_CSS_BOTTOM_LEFT], width))
+        junction |= GTK_JUNCTION_CORNER_BOTTOMLEFT;
+
+      if (xy1_gap > width - _gtk_css_corner_value_get_x (corner[GTK_CSS_BOTTOM_RIGHT], width))
+        junction |= GTK_JUNCTION_CORNER_BOTTOMRIGHT;
+
+      break;
+    case GTK_POS_LEFT:
+      xc = x;
+      yc = y + xy0_gap + border_width;
+      wc = border_width;
+      hc = MAX (xy1_gap - xy0_gap - 2 * border_width, 0);
+
+      if (xy0_gap < _gtk_css_corner_value_get_y (corner[GTK_CSS_TOP_LEFT], height))
+        junction |= GTK_JUNCTION_CORNER_TOPLEFT;
+
+      if (xy1_gap > height - _gtk_css_corner_value_get_y (corner[GTK_CSS_BOTTOM_LEFT], height))
+        junction |= GTK_JUNCTION_CORNER_BOTTOMLEFT;
+
+      break;
+    case GTK_POS_RIGHT:
+      xc = x + width - border_width;
+      yc = y + xy0_gap + border_width;
+      wc = border_width;
+      hc = MAX (xy1_gap - xy0_gap - 2 * border_width, 0);
+
+      if (xy0_gap < _gtk_css_corner_value_get_y (corner[GTK_CSS_TOP_RIGHT], height))
+        junction |= GTK_JUNCTION_CORNER_TOPRIGHT;
+
+      if (xy1_gap > height - _gtk_css_corner_value_get_y (corner[GTK_CSS_BOTTOM_RIGHT], height))
+        junction |= GTK_JUNCTION_CORNER_BOTTOMRIGHT;
+
+      break;
+    }
+
+  cairo_clip_extents (cr, &x0, &y0, &x1, &y1);
+  cairo_rectangle (cr, x0, y0, x1 - x0, yc - y0);
+  cairo_rectangle (cr, x0, yc, xc - x0, hc);
+  cairo_rectangle (cr, xc + wc, yc, x1 - (xc + wc), hc);
+  cairo_rectangle (cr, x0, yc + hc, x1 - x0, y1 - (yc + hc));
+  cairo_clip (cr);
+
+  render_frame_internal (context, cr,
+                         x, y, width, height,
+                         0, junction);
+
+  cairo_restore (cr);
+}
+
 /**
  * gtk_render_frame_gap:
  * @context: a #GtkStyleContext
@@ -556,6 +1656,50 @@ gtk_render_frame_gap (GtkStyleContext *context,
   cairo_restore (cr);
 }
 
+void
+gtk_do_render_extension (GtkStyleContext *context,
+                         cairo_t         *cr,
+                         gdouble          x,
+                         gdouble          y,
+                         gdouble          width,
+                         gdouble          height,
+                         GtkPositionType  gap_side)
+{
+  GtkThemingBackground bg;
+  GtkJunctionSides junction = 0;
+  guint hidden_side = 0;
+
+  switch (gap_side)
+    {
+    case GTK_POS_LEFT:
+      junction = GTK_JUNCTION_LEFT;
+      hidden_side = (1 << GTK_CSS_LEFT);
+      break;
+    case GTK_POS_RIGHT:
+      junction = GTK_JUNCTION_RIGHT;
+      hidden_side = (1 << GTK_CSS_RIGHT);
+      break;
+    case GTK_POS_TOP:
+      junction = GTK_JUNCTION_TOP;
+      hidden_side = (1 << GTK_CSS_TOP);
+      break;
+    case GTK_POS_BOTTOM:
+      junction = GTK_JUNCTION_BOTTOM;
+      hidden_side = (1 << GTK_CSS_BOTTOM);
+      break;
+    }
+
+  _gtk_theming_background_init (&bg, context, 
+                                x, y,
+                                width, height,
+                                junction);
+  _gtk_theming_background_render (&bg, cr);
+
+  render_frame_internal (context, cr,
+                         x, y, width, height,
+                         hidden_side, junction);
+}
+
 /**
  * gtk_render_extension:
  * @context: a #GtkStyleContext
@@ -606,6 +1750,368 @@ gtk_render_extension (GtkStyleContext *context,
   cairo_restore (cr);
 }
 
+static void
+render_dot (cairo_t       *cr,
+            const GdkRGBA *lighter,
+            const GdkRGBA *darker,
+            gdouble        x,
+            gdouble        y,
+            gdouble        size)
+{
+  size = CLAMP ((gint) size, 2, 3);
+
+  if (size == 2)
+    {
+      gdk_cairo_set_source_rgba (cr, lighter);
+      cairo_rectangle (cr, x, y, 1, 1);
+      cairo_rectangle (cr, x + 1, y + 1, 1, 1);
+      cairo_fill (cr);
+    }
+  else if (size == 3)
+    {
+      gdk_cairo_set_source_rgba (cr, lighter);
+      cairo_rectangle (cr, x, y, 2, 1);
+      cairo_rectangle (cr, x, y, 1, 2);
+      cairo_fill (cr);
+
+      gdk_cairo_set_source_rgba (cr, darker);
+      cairo_rectangle (cr, x + 1, y + 1, 2, 1);
+      cairo_rectangle (cr, x + 2, y, 1, 2);
+      cairo_fill (cr);
+    }
+}
+
+static void
+add_path_line (cairo_t        *cr,
+               gdouble         x1,
+               gdouble         y1,
+               gdouble         x2,
+               gdouble         y2)
+{
+  /* Adjust endpoints */
+  if (y1 == y2)
+    {
+      y1 += 0.5;
+      y2 += 0.5;
+      x2 += 1;
+    }
+  else if (x1 == x2)
+    {
+      x1 += 0.5;
+      x2 += 0.5;
+      y2 += 1;
+    }
+
+  cairo_move_to (cr, x1, y1);
+  cairo_line_to (cr, x2, y2);
+}
+
+void
+gtk_do_render_handle (GtkStyleContext *context,
+                      cairo_t         *cr,
+                      gdouble          x,
+                      gdouble          y,
+                      gdouble          width,
+                      gdouble          height)
+{
+  GtkStateFlags flags;
+  GdkRGBA bg_color, lighter, darker;
+  GtkJunctionSides sides;
+  GtkThemingBackground bg;
+  gint xx, yy;
+  gboolean has_image;
+
+  if (render_icon_image (context, cr, x, y, width, height))
+    return;
+
+  cairo_save (cr);
+  flags = gtk_style_context_get_state (context);
+
+  cairo_set_line_width (cr, 1.0);
+  sides = gtk_style_context_get_junction_sides (context);
+  gtk_style_context_get_background_color (context, flags, &bg_color);
+
+  color_shade (&bg_color, 0.7, &darker);
+  color_shade (&bg_color, 1.3, &lighter);
+
+  _gtk_theming_background_init (&bg, context, x, y, width, height, sides);
+  has_image = _gtk_theming_background_has_background_image (&bg);
+  _gtk_theming_background_render (&bg, cr);
+
+  gtk_do_render_frame (context, cr, x, y, width, height);
+
+  if (gtk_style_context_has_class (context, GTK_STYLE_CLASS_GRIP))
+    {
+      /* reduce confusing values to a meaningful state */
+      if ((sides & (GTK_JUNCTION_CORNER_TOPLEFT | GTK_JUNCTION_CORNER_BOTTOMRIGHT)) == (GTK_JUNCTION_CORNER_TOPLEFT | GTK_JUNCTION_CORNER_BOTTOMRIGHT))
+        sides &= ~GTK_JUNCTION_CORNER_TOPLEFT;
+
+      if ((sides & (GTK_JUNCTION_CORNER_TOPRIGHT | GTK_JUNCTION_CORNER_BOTTOMLEFT)) == (GTK_JUNCTION_CORNER_TOPRIGHT | GTK_JUNCTION_CORNER_BOTTOMLEFT))
+        sides &= ~GTK_JUNCTION_CORNER_TOPRIGHT;
+
+      if (sides == 0)
+        sides = GTK_JUNCTION_CORNER_BOTTOMRIGHT;
+
+      /* align drawing area to the connected side */
+      if (sides == GTK_JUNCTION_LEFT)
+        {
+          if (height < width)
+            width = height;
+        }
+      else if (sides == GTK_JUNCTION_CORNER_TOPLEFT)
+        {
+          if (width < height)
+            height = width;
+          else if (height < width)
+            width = height;
+        }
+      else if (sides == GTK_JUNCTION_CORNER_BOTTOMLEFT)
+        {
+          /* make it square, aligning to bottom left */
+          if (width < height)
+            {
+              y += (height - width);
+              height = width;
+            }
+          else if (height < width)
+            width = height;
+        }
+      else if (sides == GTK_JUNCTION_RIGHT)
+        {
+          /* aligning to right */
+          if (height < width)
+            {
+              x += (width - height);
+              width = height;
+            }
+        }
+      else if (sides == GTK_JUNCTION_CORNER_TOPRIGHT)
+        {
+          if (width < height)
+            height = width;
+          else if (height < width)
+            {
+              x += (width - height);
+              width = height;
+            }
+        }
+      else if (sides == GTK_JUNCTION_CORNER_BOTTOMRIGHT)
+        {
+          /* make it square, aligning to bottom right */
+          if (width < height)
+            {
+              y += (height - width);
+              height = width;
+            }
+          else if (height < width)
+            {
+              x += (width - height);
+              width = height;
+            }
+        }
+      else if (sides == GTK_JUNCTION_TOP)
+        {
+          if (width < height)
+            height = width;
+        }
+      else if (sides == GTK_JUNCTION_BOTTOM)
+        {
+          /* align to bottom */
+          if (width < height)
+            {
+              y += (height - width);
+              height = width;
+            }
+        }
+      else
+        g_assert_not_reached ();
+
+      if (sides == GTK_JUNCTION_LEFT ||
+          sides == GTK_JUNCTION_RIGHT)
+        {
+          gint xi;
+
+          xi = x;
+
+          while (xi < x + width)
+            {
+              gdk_cairo_set_source_rgba (cr, &lighter);
+              add_path_line (cr, x, y, x, y + height);
+              cairo_stroke (cr);
+              xi++;
+
+              gdk_cairo_set_source_rgba (cr, &darker);
+              add_path_line (cr, xi, y, xi, y + height);
+              cairo_stroke (cr);
+              xi += 2;
+            }
+        }
+      else if (sides == GTK_JUNCTION_TOP ||
+               sides == GTK_JUNCTION_BOTTOM)
+        {
+          gint yi;
+
+          yi = y;
+
+          while (yi < y + height)
+            {
+              gdk_cairo_set_source_rgba (cr, &lighter);
+              add_path_line (cr, x, yi, x + width, yi);
+              cairo_stroke (cr);
+              yi++;
+
+              gdk_cairo_set_source_rgba (cr, &darker);
+              add_path_line (cr, x, yi, x + width, yi);
+              cairo_stroke (cr);
+              yi += 2;
+            }
+        }
+      else if (sides == GTK_JUNCTION_CORNER_TOPLEFT)
+        {
+          gint xi, yi;
+
+          xi = x + width;
+          yi = y + height;
+
+          while (xi > x + 3)
+            {
+              gdk_cairo_set_source_rgba (cr, &darker);
+              add_path_line (cr, xi, y, x, yi);
+              cairo_stroke (cr);
+
+              --xi;
+              --yi;
+
+              add_path_line (cr, xi, y, x, yi);
+              cairo_stroke (cr);
+
+              --xi;
+              --yi;
+
+              gdk_cairo_set_source_rgba (cr, &lighter);
+              add_path_line (cr, xi, y, x, yi);
+              cairo_stroke (cr);
+
+              xi -= 3;
+              yi -= 3;
+            }
+        }
+      else if (sides == GTK_JUNCTION_CORNER_TOPRIGHT)
+        {
+          gint xi, yi;
+
+          xi = x;
+          yi = y + height;
+
+          while (xi < (x + width - 3))
+            {
+              gdk_cairo_set_source_rgba (cr, &lighter);
+              add_path_line (cr, xi, y, x + width, yi);
+              cairo_stroke (cr);
+
+              ++xi;
+              --yi;
+
+              gdk_cairo_set_source_rgba (cr, &darker);
+              add_path_line (cr, xi, y, x + width, yi);
+              cairo_stroke (cr);
+
+              ++xi;
+              --yi;
+
+              add_path_line (cr, xi, y, x + width, yi);
+              cairo_stroke (cr);
+
+              xi += 3;
+              yi -= 3;
+            }
+        }
+      else if (sides == GTK_JUNCTION_CORNER_BOTTOMLEFT)
+        {
+          gint xi, yi;
+
+          xi = x + width;
+          yi = y;
+
+          while (xi > x + 3)
+            {
+              gdk_cairo_set_source_rgba (cr, &darker);
+              add_path_line (cr, x, yi, xi, y + height);
+              cairo_stroke (cr);
+
+              --xi;
+              ++yi;
+
+              add_path_line (cr, x, yi, xi, y + height);
+              cairo_stroke (cr);
+
+              --xi;
+              ++yi;
+
+              gdk_cairo_set_source_rgba (cr, &lighter);
+              add_path_line (cr, x, yi, xi, y + height);
+              cairo_stroke (cr);
+
+              xi -= 3;
+              yi += 3;
+            }
+        }
+      else if (sides == GTK_JUNCTION_CORNER_BOTTOMRIGHT)
+        {
+          gint xi, yi;
+
+          xi = x;
+          yi = y;
+
+          while (xi < (x + width - 3))
+            {
+              gdk_cairo_set_source_rgba (cr, &lighter);
+              add_path_line (cr, xi, y + height, x + width, yi);
+              cairo_stroke (cr);
+
+              ++xi;
+              ++yi;
+
+              gdk_cairo_set_source_rgba (cr, &darker);
+              add_path_line (cr, xi, y + height, x + width, yi);
+              cairo_stroke (cr);
+
+              ++xi;
+              ++yi;
+
+              add_path_line (cr, xi, y + height, x + width, yi);
+              cairo_stroke (cr);
+
+              xi += 3;
+              yi += 3;
+            }
+        }
+    }
+  else if (gtk_style_context_has_class (context, GTK_STYLE_CLASS_PANE_SEPARATOR))
+    {
+      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
+    {
+      for (yy = y; yy < y + height; yy += 3)
+        for (xx = x; xx < x + width; xx += 6)
+          {
+            render_dot (cr, &lighter, &darker, xx, yy, 2);
+            render_dot (cr, &lighter, &darker, xx + 3, yy + 1, 2);
+          }
+    }
+
+  cairo_restore (cr);
+}
+
 /**
  * gtk_render_handle:
  * @context: a #GtkStyleContext
@@ -654,6 +2160,101 @@ gtk_render_handle (GtkStyleContext *context,
   cairo_restore (cr);
 }
 
+void
+gtk_render_paint_spinner (cairo_t *cr,
+                          gdouble  radius,
+                          gdouble  progress)
+{
+  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++)
+    {
+      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_push_group (cr);
+
+      cairo_move_to (cr,
+                     (radius - inset) * xscale,
+                     (radius - inset) * yscale);
+      cairo_line_to (cr,
+                     radius * xscale,
+                     radius * yscale);
+
+      cairo_stroke (cr);
+
+      cairo_pop_group_to_source (cr);
+      cairo_paint_with_alpha (cr, t);
+    }
+
+  cairo_restore (cr);
+}
+
+static void
+render_spinner (GtkStyleContext *context,
+                cairo_t         *cr,
+                gdouble          x,
+                gdouble          y,
+                gdouble          width,
+                gdouble          height)
+{
+  GtkStateFlags state;
+  GdkRGBA color;
+  gdouble radius;
+
+  state = gtk_style_context_get_state (context);
+  radius = MIN (width / 2, height / 2);
+
+  gtk_style_context_get_color (context, state, &color);
+
+  cairo_save (cr);
+  cairo_translate (cr, x + width / 2, y + height / 2);
+
+  _gtk_css_shadows_value_paint_spinner (_gtk_style_context_peek_property (context, GTK_CSS_PROPERTY_ICON_SHADOW),
+                                        cr,
+                                        radius,
+                                        -1);
+
+  gdk_cairo_set_source_rgba (cr, &color);
+  gtk_render_paint_spinner (cr, radius, -1);
+
+  cairo_restore (cr);
+}
+
+void
+gtk_do_render_activity (GtkStyleContext *context,
+                        cairo_t         *cr,
+                        gdouble          x,
+                        gdouble          y,
+                        gdouble          width,
+                        gdouble          height)
+{
+  if (render_icon_image (context, cr, x, y, width, height))
+    return;
+
+  render_spinner (context, cr, x, y, width, height);
+}
+
 /**
  * gtk_render_activity:
  * @context: a #GtkStyleContext
@@ -698,6 +2299,136 @@ gtk_render_activity (GtkStyleContext *context,
   cairo_restore (cr);
 }
 
+static void
+colorshift_source (cairo_t *cr,
+		   gdouble shift)
+{
+  cairo_pattern_t *source;
+
+  cairo_save (cr);
+  cairo_paint (cr);
+
+  source = cairo_pattern_reference (cairo_get_source (cr));
+
+  cairo_set_source_rgb (cr, shift, shift, shift);
+  cairo_set_operator (cr, CAIRO_OPERATOR_COLOR_DODGE);
+
+  cairo_mask (cr, source);
+
+  cairo_pattern_destroy (source);
+  cairo_restore (cr);
+}
+
+static GdkPixbuf *
+scale_or_ref (GdkPixbuf *src,
+              gint       width,
+              gint       height)
+{
+  if (width == gdk_pixbuf_get_width (src) &&
+      height == gdk_pixbuf_get_height (src))
+    return g_object_ref (src);
+  else
+    return gdk_pixbuf_scale_simple (src,
+                                    width, height,
+                                    GDK_INTERP_BILINEAR);
+}
+
+GdkPixbuf *
+gtk_do_render_icon_pixbuf (GtkStyleContext     *context,
+                           const GtkIconSource *source,
+                           GtkIconSize          size)
+{
+  GdkPixbuf *scaled;
+  GdkPixbuf *stated;
+  GdkPixbuf *base_pixbuf;
+  GtkStateFlags state;
+  gint width = 1;
+  gint height = 1;
+  cairo_t *cr;
+  cairo_surface_t *surface;
+  gboolean wildcarded;
+  GtkCssImageEffect image_effect;
+
+  G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
+  base_pixbuf = gtk_icon_source_get_pixbuf (source);
+  G_GNUC_END_IGNORE_DEPRECATIONS;
+
+  state = gtk_style_context_get_state (context);
+
+  g_return_val_if_fail (base_pixbuf != NULL, NULL);
+
+  if (size != (GtkIconSize) -1 &&
+      !gtk_icon_size_lookup (size, &width, &height))
+    {
+      g_warning (G_STRLOC ": invalid icon size '%d'", size);
+      return NULL;
+    }
+
+  /* If the size was wildcarded, and we're allowed to scale, then scale; otherwise,
+   * leave it alone.
+   */
+  G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
+  wildcarded = gtk_icon_source_get_size_wildcarded (source);
+  G_GNUC_END_IGNORE_DEPRECATIONS;
+  if (size != (GtkIconSize) -1 && wildcarded)
+    scaled = scale_or_ref (base_pixbuf, width, height);
+  else
+    scaled = g_object_ref (base_pixbuf);
+
+  /* If the state was wildcarded, then generate a state. */
+  G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
+  wildcarded = gtk_icon_source_get_state_wildcarded (source);
+  G_GNUC_END_IGNORE_DEPRECATIONS;
+
+  if (!wildcarded)
+    return scaled;
+
+  image_effect = _gtk_css_image_effect_value_get
+    (_gtk_style_context_peek_property (context, GTK_CSS_PROPERTY_GTK_IMAGE_EFFECT));
+
+  if (image_effect == GTK_CSS_IMAGE_EFFECT_DIM ||
+      state & GTK_STATE_FLAG_INSENSITIVE)
+    {
+      surface = cairo_image_surface_create (CAIRO_FORMAT_ARGB32,
+					    gdk_pixbuf_get_width (scaled),
+					    gdk_pixbuf_get_height (scaled));
+      cr = cairo_create (surface);
+      gdk_cairo_set_source_pixbuf (cr, scaled, 0, 0);
+      cairo_paint_with_alpha (cr, 0.5);
+
+      cairo_destroy (cr);
+
+      g_object_unref (scaled);
+      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 (image_effect == GTK_CSS_IMAGE_EFFECT_HIGHLIGHT ||
+	   state & GTK_STATE_FLAG_PRELIGHT)
+    {
+      surface = cairo_image_surface_create (CAIRO_FORMAT_ARGB32,
+					    gdk_pixbuf_get_width (scaled),
+					    gdk_pixbuf_get_height (scaled));
+
+      cr = cairo_create (surface);
+      gdk_cairo_set_source_pixbuf (cr, scaled, 0, 0);
+      colorshift_source (cr, 0.10);
+
+      cairo_destroy (cr);
+
+      g_object_unref (scaled);
+      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;
+
+  return stated;
+}
+
 /**
  * gtk_render_icon_pixbuf:
  * @context: a #GtkStyleContext
@@ -733,6 +2464,24 @@ gtk_render_icon_pixbuf (GtkStyleContext     *context,
   return engine_class->render_icon_pixbuf (engine, source, size);
 }
 
+void
+gtk_do_render_icon (GtkStyleContext *context,
+                    cairo_t         *cr,
+                    GdkPixbuf       *pixbuf,
+                    gdouble          x,
+                    gdouble          y)
+{
+  cairo_save (cr);
+
+  gdk_cairo_set_source_pixbuf (cr, pixbuf, x, y);
+
+  _gtk_css_shadows_value_paint_icon (_gtk_style_context_peek_property (context, GTK_CSS_PROPERTY_ICON_SHADOW), cr);
+
+  cairo_paint (cr);
+
+  cairo_restore (cr);
+}
+
 /**
  * gtk_render_icon:
  * @context: a #GtkStyleContext
@@ -770,6 +2519,24 @@ gtk_render_icon (GtkStyleContext *context,
   cairo_restore (cr);
 }
 
+void
+gtk_do_render_icon_surface (GtkStyleContext *context,
+                            cairo_t         *cr,
+                            cairo_surface_t *surface,
+                            gdouble          x,
+                            gdouble          y)
+{
+  cairo_save (cr);
+
+  cairo_set_source_surface (cr, surface, x, y);
+
+  _gtk_css_shadows_value_paint_icon (_gtk_style_context_peek_property (context, GTK_CSS_PROPERTY_ICON_SHADOW), cr);
+
+  cairo_paint (cr);
+
+  cairo_restore (cr);
+}
+
 /**
  * gtk_render_icon_surface:
  * @context: a #GtkStyleContext
diff --git a/gtk/gtkrenderprivate.h b/gtk/gtkrenderprivate.h
new file mode 100644
index 0000000000..82debe69b3
--- /dev/null
+++ b/gtk/gtkrenderprivate.h
@@ -0,0 +1,134 @@
+/* GTK - The GIMP Toolkit
+ * Copyright (C) 2010 Carlos Garnacho <carlosg@gnome.org>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * 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, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GTK_RENDER_PRIVATE_H__
+#define __GTK_RENDER_PRIVATE_H__
+
+#include <cairo.h>
+#include <pango/pango.h>
+#include <gdk/gdk.h>
+
+#include <gtk/gtkenums.h>
+#include <gtk/gtktypes.h>
+
+void        gtk_do_render_check    (GtkStyleContext     *context,
+                                    cairo_t             *cr,
+                                    gdouble              x,
+                                    gdouble              y,
+                                    gdouble              width,
+                                    gdouble              height);
+void        gtk_do_render_option   (GtkStyleContext     *context,
+                                    cairo_t             *cr,
+                                    gdouble              x,
+                                    gdouble              y,
+                                    gdouble              width,
+                                    gdouble              height);
+void        gtk_do_render_arrow    (GtkStyleContext     *context,
+                                    cairo_t             *cr,
+                                    gdouble              angle,
+                                    gdouble              x,
+                                    gdouble              y,
+                                    gdouble              size);
+void        gtk_do_render_background (GtkStyleContext     *context,
+                                    cairo_t             *cr,
+                                    gdouble              x,
+                                    gdouble              y,
+                                    gdouble              width,
+                                    gdouble              height);
+void        gtk_do_render_frame    (GtkStyleContext     *context,
+                                    cairo_t             *cr,
+                                    gdouble              x,
+                                    gdouble              y,
+                                    gdouble              width,
+                                    gdouble              height);
+void        gtk_do_render_expander (GtkStyleContext     *context,
+                                    cairo_t             *cr,
+                                    gdouble              x,
+                                    gdouble              y,
+                                    gdouble              width,
+                                    gdouble              height);
+void        gtk_do_render_focus    (GtkStyleContext     *context,
+                                    cairo_t             *cr,
+                                    gdouble              x,
+                                    gdouble              y,
+                                    gdouble              width,
+                                    gdouble              height);
+void        gtk_do_render_layout   (GtkStyleContext     *context,
+                                    cairo_t             *cr,
+                                    gdouble              x,
+                                    gdouble              y,
+                                    PangoLayout         *layout);
+void        gtk_do_render_line     (GtkStyleContext     *context,
+                                    cairo_t             *cr,
+                                    gdouble              x0,
+                                    gdouble              y0,
+                                    gdouble              x1,
+                                    gdouble              y1);
+void        gtk_do_render_slider   (GtkStyleContext     *context,
+                                    cairo_t             *cr,
+                                    gdouble              x,
+                                    gdouble              y,
+                                    gdouble              width,
+                                    gdouble              height,
+                                    GtkOrientation       orientation);
+void        gtk_do_render_frame_gap (GtkStyleContext     *context,
+                                    cairo_t             *cr,
+                                    gdouble              x,
+                                    gdouble              y,
+                                    gdouble              width,
+                                    gdouble              height,
+                                    GtkPositionType      gap_side,
+                                    gdouble              xy0_gap,
+                                    gdouble              xy1_gap);
+void        gtk_do_render_extension(GtkStyleContext     *context,
+                                    cairo_t             *cr,
+                                    gdouble              x,
+                                    gdouble              y,
+                                    gdouble              width,
+                                    gdouble              height,
+                                    GtkPositionType      gap_side);
+void        gtk_do_render_handle   (GtkStyleContext     *context,
+                                    cairo_t             *cr,
+                                    gdouble              x,
+                                    gdouble              y,
+                                    gdouble              width,
+                                    gdouble              height);
+void        gtk_do_render_activity (GtkStyleContext     *context,
+                                    cairo_t             *cr,
+                                    gdouble              x,
+                                    gdouble              y,
+                                    gdouble              width,
+                                    gdouble              height);
+GdkPixbuf * gtk_do_render_icon_pixbuf (GtkStyleContext     *context,
+                                    const GtkIconSource *source,
+                                    GtkIconSize          size);
+void        gtk_do_render_icon     (GtkStyleContext     *context,
+                                    cairo_t             *cr,
+                                    GdkPixbuf           *pixbuf,
+                                    gdouble              x,
+                                    gdouble              y);
+void        gtk_do_render_icon_surface (GtkStyleContext *context,
+				    cairo_t             *cr,
+				    cairo_surface_t     *surface,
+				    gdouble              x,
+				    gdouble              y);
+
+void        gtk_render_paint_spinner (cairo_t           *cr,
+                                    gdouble              radius,
+                                    gdouble              progress);
+
+#endif /* __GTK_RENDER_PRIVATE_H__ */
diff --git a/gtk/gtkroundedboxprivate.h b/gtk/gtkroundedboxprivate.h
index 753c5c237a..483216acc2 100644
--- a/gtk/gtkroundedboxprivate.h
+++ b/gtk/gtkroundedboxprivate.h
@@ -51,9 +51,9 @@ void            _gtk_rounded_box_apply_border_radius_for_context (GtkRoundedBox
                                                                  GtkStyleContext     *context,
                                                                  GtkJunctionSides     junction);
 
-void            _gtk_rounded_box_apply_outline_radius_for_context (GtkRoundedBox     *box,
-                                                                 GtkStyleContext     *context,
-                                                                 GtkJunctionSides     junction);
+void            _gtk_rounded_box_apply_outline_radius_for_context (GtkRoundedBox       *box,
+                                                                   GtkStyleContext     *context,
+                                                                   GtkJunctionSides     junction);
 
 void            _gtk_rounded_box_grow                           (GtkRoundedBox       *box,
                                                                  double               top,