meson: Use sysprof interface defintion from correct prefix

The sysprof interface definition may be installed to a prefix different from where mutter is going to be installed. Fetch the prefix from pkgconfig instead. https://gitlab.gnome.org/GNOME/mutter/merge_requests/993
backends/native: Fix relative motion calculation if monitor isn't found
2020-01-08 14:12:51 +01:00 · 2020-01-07 20:18:46 +00:00 · 2020-01-07 14:20:21 -03:00 · 2020-01-07 14:20:21 -03:00 · 2020-01-07 14:19:33 -03:00 · 2020-01-07 14:02:25 -03:00
335 changed files with 3939 additions and 24784 deletions
--- a/.gitlab-ci/Dockerfile
+++ b/.gitlab-ci/Dockerfile
@@ -1,8 +1,8 @@
 # Rebuild and push with
 #
 #     cd .gitlab-ci/
-#     docker build --no-cache -t registry.gitlab.gnome.org/gnome/mutter/master:v3 .
-#     docker push registry.gitlab.gnome.org/gnome/mutter/master:v3
+#     podman build --format docker --no-cache -t registry.gitlab.gnome.org/gnome/mutter/master:v3 .
+#     podman push registry.gitlab.gnome.org/gnome/mutter/master:v3
 #

 FROM fedora:31
--- a/65
+++ b/65
@@ -1,3 +1,68 @@
+3.35.3
+======
+* backends/native: Correct dy value in pinch gesture event [Yariv; !974]
+* Upload clipping rectangles in parallel [Daniel; !969]
+* More cogl API cleanups [Adam; !978, !977, !973]
+* Fix window recording on HiDPI [Pascal; !976]
+* Fix top-left pixel being insensitive to clicks [Sebastian; #893]
+* Misc. bug fixes and cleanups [Daniel, Adam; !979, !980]
+
+Contributors:
+  Yariv Barkan, Adam Jackson, Sebastian Keller, Pascal Nowack, Daniel van Vugt
+
+Translators:
+  Fran Dieguez [gl], Dz Chen [zh_CN]
+
+3.35.2
+======
+* Don't emit focus event after destruction [Marco; gnome-shell#1704, !860]
+* Add a notion of pixel format planes [Niels; !858]
+* Replace various Cogl/Clutter types with Graphene [Georges; !458]
+* Improve CoglJournal [Georges, Jasper; !402]
+* Split pick and paint [Georges; !865]
+* Remove deprecated/unused cogl/clutter APIs [Adam; !866, !878, !879, !880,
+  !885, !900, !902, !904, !896, !913, !922, !883, !903, !921, !933, !819]
+* Fix hang when opening not-responding dialog on Xorg [Carlos; !876]
+* Allow changing Clutter debug flags at runtime [Georges; !862]
+* Fix frozen grabs on Xorg after weeks of inactivity [Jonas; !886]
+* Fix triggering popups from stylus devices o wayland [Carlos; #886]
+* Fix fallback to GLES2 [Adam; #635]
+* Fix buffer age checks on multiple monitors [Carlos; !906]
+* Adjust to Sysprof API change [Christian; !908]
+* Improve support for (X11) fullscreen games under wayland [Hans; !739]
+* Support shadow framebuffers for offscreen rendering [Olivier; !877]
+* Fix hang after interacting with desktop icons on X11 [Marco; !909]
+* Don't double scale when getting absolute surface coordinates [Xiang; !915]
+* Respect NET_WM_TRANSIENT_FOR for override-redirect windows [Marco; !920]
+* Kill window effects on destroy [Robert; !924]
+* Remove deprecated ClutterTexture [Jonas; !932]
+* Use regions instead of bounding box for clipping and culling [Carlos; !867]
+* Use partial damage for dma-buf and EGLImage buffers on wayland [Robert; #947]
+* Do not stack transients underneath their always-on-top parent [Florian; #587]
+* Add explicit paint/pick contexts [Jonas; !935]
+* Fix KMS freeze after pageflip fallback [Pekka; !953]
+* Fixed crashes [Robert, Carlos, Jonas, Marco, Hans, Tim; !856, !869, !912,
+  !895, !928, #591, !823, !960]
+* Plugged memory leaks [Niels, Robert, Carlos, Marco; !847, !868, !873, #908]
+* Misc. bug fixes and cleanups [Niels, Robert, Jonas, Marco, Carlos, Daniel,
+  Jan, Adam, Cosimo, Florian, Thomas, Georges, Hans, Corentin, Christian,
+  Benjamin; !853, !822, !451, !854, !816, !857, !859, !734, !844, !851, #876,
+  !874, !673, !692, !888, !889, !894, !901, !905, !872, !898, !911, !918, !863,
+  #878, !811, !893, !925, !926, !890, !931, !927, !934, !938, !940, !947, !941,
+  !929, !949, !952, !871, !955, !956, !958, !907, !965, !964, !966]
+
+Contributors:
+  Marco Trevisan (Treviño), Jan Alexander Steffens (heftig),
+  Thomas Hindoe Paaboel Andersen, Benjamin Berg, Cosimo Cecchi, Tim Crawford,
+  Piotr Drąg, Xiang Fan, Olivier Fourdan, Carlos Garnacho, Hans de Goede,
+  Niels De Graef, Christian Hergert, Adam Jackson, Robert Mader,
+  Florian Müllner, Georges Basile Stavracas Neto, Bastien Nocera, Corentin Noël,
+  Pekka Paalanen, Jasper St. Pierre, Christian Rauch, Daniel van Vugt,
+  Jonas Ådahl
+
+Translators:
+  Bruce Cowan [en_GB]
+
 3.35.1
 ======
 * Fix immediate screen blank after releaseing inhibitor [Tim; #573]
--- a/clutter/clutter/cally/cally-actor.c
+++ b/clutter/clutter/cally/cally-actor.c
@@ -310,11 +310,7 @@ cally_actor_finalize (GObject *obj)

  _cally_actor_clean_action_list (cally_actor);

-  if (priv->action_idle_handler)
-    {
-      g_source_remove (priv->action_idle_handler);
-      priv->action_idle_handler = 0;
-    }
+  g_clear_handle_id (&priv->action_idle_handler, g_source_remove);

  if (priv->action_queue)
    {
--- a/clutter/clutter/cally/cally-root.c
+++ b/clutter/clutter/cally/cally-root.c
@@ -75,8 +75,8 @@ struct _CallyRootPrivate
  GSList *stage_list;

  /* signals id */
-  guint stage_added_id;
-  guint stage_removed_id;
+  gulong stage_added_id;
+  gulong stage_removed_id;
 };

 G_DEFINE_TYPE_WITH_PRIVATE (CallyRoot, cally_root,  ATK_TYPE_GOBJECT_ACCESSIBLE)
@@ -149,11 +149,9 @@ cally_root_finalize (GObject *object)

  stage_manager = atk_gobject_accessible_get_object (ATK_GOBJECT_ACCESSIBLE (root));

-  g_signal_handler_disconnect (stage_manager,
-                               root->priv->stage_added_id);
+  g_clear_signal_handler (&root->priv->stage_added_id, stage_manager);

-  g_signal_handler_disconnect (stage_manager,
-                               root->priv->stage_added_id);
+  g_clear_signal_handler (&root->priv->stage_removed_id, stage_manager);

  G_OBJECT_CLASS (cally_root_parent_class)->finalize (object);
 }
--- a/clutter/clutter/cally/cally-text.c
+++ b/clutter/clutter/cally/cally-text.c
@@ -247,11 +247,7 @@ cally_text_finalize   (GObject *obj)
 /*   g_object_unref (cally_text->priv->textutil); */
 /*   cally_text->priv->textutil = NULL; */

-  if (cally_text->priv->insert_idle_handler)
-    {
-      g_source_remove (cally_text->priv->insert_idle_handler);
-      cally_text->priv->insert_idle_handler = 0;
-    }
+  g_clear_handle_id (&cally_text->priv->insert_idle_handler, g_source_remove);

  G_OBJECT_CLASS (cally_text_parent_class)->finalize (obj);
 }
--- a/clutter/clutter/cally/cally-texture.c
+++ b/clutter/clutter/cally/cally-texture.c
@@ -1,98 +0,0 @@
-/* CALLY - The Clutter Accessibility Implementation Library
- *
- * Copyright (C) 2009 Igalia, S.L.
- *
- * Author: Alejandro Piñeiro Iglesias <apinheiro@igalia.com>
- *
- * 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, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/**
- * SECTION:cally-texture
- * @Title: CallyTexture
- * @short_description: Implementation of the ATK interfaces for a #ClutterTexture
- * @see_also: #ClutterTexture
- *
- * #CallyTexture implements the required ATK interfaces of #ClutterTexture
- *
- * In particular it sets a proper role for the texture.
- */
-#include "clutter-build-config.h"
-
-#define CLUTTER_DISABLE_DEPRECATION_WARNINGS
-
-#include "cally-texture.h"
-#include "cally-actor-private.h"
-
-#include "deprecated/clutter-texture.h"
-
-/* AtkObject */
-static void                  cally_texture_real_initialize (AtkObject *obj,
-                                                           gpointer   data);
-
-G_DEFINE_TYPE (CallyTexture, cally_texture, CALLY_TYPE_ACTOR)
-
-static void
-cally_texture_class_init (CallyTextureClass *klass)
-{
-/*   GObjectClass   *gobject_class = G_OBJECT_CLASS (klass); */
-  AtkObjectClass *class         = ATK_OBJECT_CLASS (klass);
-
-  class->initialize      = cally_texture_real_initialize;
-}
-
-static void
-cally_texture_init (CallyTexture *texture)
-{
-  /* nothing to do yet */
-}
-
-/**
- * cally_texture_new:
- * @actor: a #ClutterActor
- *
- * Creates a new #CallyTexture for the given @actor. @actor must be
- * a #ClutterTexture.
- *
- * Return value: the newly created #AtkObject
- *
- * Since: 1.4
- */
-AtkObject*
-cally_texture_new (ClutterActor *actor)
-{
-  GObject   *object     = NULL;
-  AtkObject *accessible = NULL;
-
-  g_return_val_if_fail (CLUTTER_IS_TEXTURE (actor), NULL);
-
-  object = g_object_new (CALLY_TYPE_TEXTURE, NULL);
-
-  accessible = ATK_OBJECT (object);
-  atk_object_initialize (accessible, actor);
-
-  return accessible;
-}
-
-static void
-cally_texture_real_initialize (AtkObject *obj,
-                              gpointer   data)
-{
-  ATK_OBJECT_CLASS (cally_texture_parent_class)->initialize (obj, data);
-
-  /* default role */
-  obj->role = ATK_ROLE_IMAGE;
-}
--- a/clutter/clutter/cally/cally-texture.h
+++ b/clutter/clutter/cally/cally-texture.h
@@ -1,84 +0,0 @@
-/* CALLY - The Clutter Accessibility Implementation Library
- *
- * Copyright (C) 2009 Igalia, S.L.
- *
- * Author: Alejandro Piñeiro Iglesias <apinheiro@igalia.com>
- *
- * 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 __CALLY_TEXTURE_H__
-#define __CALLY_TEXTURE_H__
-
-#if !defined(__CALLY_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
-#error "Only <cally/cally.h> can be included directly."
-#endif
-
-#include <clutter/clutter.h>
-#include <cally/cally-actor.h>
-
-G_BEGIN_DECLS
-
-#define CALLY_TYPE_TEXTURE            (cally_texture_get_type ())
-#define CALLY_TEXTURE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), CALLY_TYPE_TEXTURE, CallyTexture))
-#define CALLY_TEXTURE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), CALLY_TYPE_TEXTURE, CallyTextureClass))
-#define CALLY_IS_TEXTURE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), CALLY_TYPE_TEXTURE))
-#define CALLY_IS_TEXTURE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), CALLY_TYPE_TEXTURE))
-#define CALLY_TEXTURE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), CALLY_TYPE_TEXTURE, CallyTextureClass))
-
-typedef struct _CallyTexture        CallyTexture;
-typedef struct _CallyTextureClass   CallyTextureClass;
-typedef struct _CallyTexturePrivate CallyTexturePrivate;
-
-/**
- * CallyTexture:
- *
- * The <structname>CallyTexture</structname> structure contains only
- * private data and should be accessed using the provided API
- *
- * Since: 1.4
- */
-struct _CallyTexture
-{
-  /*< private >*/
-  CallyActor parent;
-
-  CallyTexturePrivate *priv;
-};
-
-/**
- * CallyTextureClass:
- *
- * The <structname>CallyTextureClass</structname> structure contains
- * only private data
- *
- * Since: 1.4
- */
-struct _CallyTextureClass
-{
-  /*< private >*/
-  CallyActorClass parent_class;
-
-  /* padding for future expansion */
-  gpointer _padding_dummy[8];
-};
-
-CLUTTER_EXPORT
-GType      cally_texture_get_type (void) G_GNUC_CONST;
-CLUTTER_EXPORT
-AtkObject *cally_texture_new      (ClutterActor *actor);
-
-G_END_DECLS
-
-#endif /* __CALLY_TEXTURE_H__ */
--- a/clutter/clutter/cally/cally.c
+++ b/clutter/clutter/cally/cally.c
@@ -39,7 +39,6 @@
 #include "cally-group.h"
 #include "cally-stage.h"
 #include "cally-text.h"
-#include "cally-texture.h"
 #include "cally-rectangle.h"
 #include "cally-clone.h"

@@ -56,7 +55,6 @@ CALLY_ACCESSIBLE_FACTORY (CALLY_TYPE_ACTOR, cally_actor, cally_actor_new)
 CALLY_ACCESSIBLE_FACTORY (CALLY_TYPE_GROUP, cally_group, cally_group_new)
 CALLY_ACCESSIBLE_FACTORY (CALLY_TYPE_STAGE, cally_stage, cally_stage_new)
 CALLY_ACCESSIBLE_FACTORY (CALLY_TYPE_TEXT, cally_text, cally_text_new)
-CALLY_ACCESSIBLE_FACTORY (CALLY_TYPE_TEXTURE, cally_texture, cally_texture_new)
 CALLY_ACCESSIBLE_FACTORY (CALLY_TYPE_RECTANGLE, cally_rectangle, cally_rectangle_new)
 CALLY_ACCESSIBLE_FACTORY (CALLY_TYPE_CLONE, cally_clone, cally_clone_new)

@@ -78,7 +76,6 @@ cally_accessibility_init (void)
  CALLY_ACTOR_SET_FACTORY (CLUTTER_TYPE_GROUP, cally_group);
  CALLY_ACTOR_SET_FACTORY (CLUTTER_TYPE_STAGE, cally_stage);
  CALLY_ACTOR_SET_FACTORY (CLUTTER_TYPE_TEXT, cally_text);
-  CALLY_ACTOR_SET_FACTORY (CLUTTER_TYPE_TEXTURE, cally_texture);
  CALLY_ACTOR_SET_FACTORY (CLUTTER_TYPE_RECTANGLE, cally_rectangle);
  CALLY_ACTOR_SET_FACTORY (CLUTTER_TYPE_CLONE, cally_clone);

--- a/clutter/clutter/cally/cally.h
+++ b/clutter/clutter/cally/cally.h
@@ -32,7 +32,6 @@
 #include "cally-root.h"
 #include "cally-stage.h"
 #include "cally-text.h"
-#include "cally-texture.h"
 #include "cally-util.h"

 #undef __CALLY_H_INSIDE__
--- a/clutter/clutter/clutter-actor-meta.c
+++ b/clutter/clutter/clutter-actor-meta.c
@@ -51,7 +51,7 @@
 struct _ClutterActorMetaPrivate
 {
  ClutterActor *actor;
-  guint destroy_id;
+  gulong destroy_id;

  gchar *name;

@@ -91,11 +91,7 @@ clutter_actor_meta_real_set_actor (ClutterActorMeta *meta,
  if (meta->priv->actor == actor)
    return;

-  if (meta->priv->destroy_id != 0)
-    {
-      g_signal_handler_disconnect (meta->priv->actor, meta->priv->destroy_id);
-      meta->priv->destroy_id = 0;
-    }
+  g_clear_signal_handler (&meta->priv->destroy_id, meta->priv->actor);

  meta->priv->actor = actor;

@@ -162,8 +158,8 @@ clutter_actor_meta_finalize (GObject *gobject)
 {
  ClutterActorMetaPrivate *priv = CLUTTER_ACTOR_META (gobject)->priv;

-  if (priv->destroy_id != 0 && priv->actor != NULL)
-    g_signal_handler_disconnect (priv->actor, priv->destroy_id);
+  if (priv->actor != NULL)
+    g_clear_signal_handler (&priv->destroy_id, priv->actor);

  g_free (priv->name);

--- a/clutter/clutter/clutter-actor-private.h
+++ b/clutter/clutter/clutter-actor-private.h
@@ -315,7 +315,6 @@ void                            _clutter_actor_queue_relayout_on_clones
 void                            _clutter_actor_queue_only_relayout                      (ClutterActor *actor);
 void                            _clutter_actor_queue_update_resource_scale_recursive    (ClutterActor *actor);

-CoglFramebuffer *               _clutter_actor_get_active_framebuffer                   (ClutterActor *actor);
 gboolean                        _clutter_actor_get_real_resource_scale                  (ClutterActor *actor,
                                                                                         float        *resource_scale);

--- a/clutter/clutter/clutter-actor.c
+++ b/clutter/clutter/clutter-actor.c
@@ -643,6 +643,7 @@
 #include "clutter-main.h"
 #include "clutter-marshal.h"
 #include "clutter-mutter.h"
+#include "clutter-paint-context-private.h"
 #include "clutter-paint-nodes.h"
 #include "clutter-paint-node-private.h"
 #include "clutter-paint-volume-private.h"
@@ -808,8 +809,8 @@ struct _ClutterActorPrivate
  gpointer create_child_data;
  GDestroyNotify create_child_notify;

-  guint resolution_changed_id;
-  guint font_changed_id;
+  gulong resolution_changed_id;
+  gulong font_changed_id;

  /* bitfields: KEEP AT THE END */

@@ -1286,10 +1287,12 @@ clutter_actor_verify_map_state (ClutterActor *self)
 static gboolean
 _clutter_actor_transform_local_box_to_stage (ClutterActor          *self,
                                             ClutterStage          *stage,
+                                             ClutterPickContext    *pick_context,
                                             const ClutterActorBox *box,
                                             graphene_point_t       vertices[4])
 {
-  CoglFramebuffer *fb = cogl_get_draw_framebuffer ();
+  CoglFramebuffer *fb =
+   clutter_pick_context_get_framebuffer (pick_context);
  CoglMatrix stage_transform, inv_stage_transform;
  CoglMatrix modelview, transform_to_stage;
  int v;
@@ -1330,6 +1333,7 @@ _clutter_actor_transform_local_box_to_stage (ClutterActor          *self,
 /**
 * clutter_actor_pick_box:
 * @self: The #ClutterActor being "pick" painted.
+ * @pick_context: The #ClutterPickContext
 * @box: A rectangle in the actor's own local coordinates.
 *
 * Logs (does a virtual paint of) a rectangle for picking. Note that @box is
@@ -1340,6 +1344,7 @@ _clutter_actor_transform_local_box_to_stage (ClutterActor          *self,
 */
 void
 clutter_actor_pick_box (ClutterActor          *self,
+                        ClutterPickContext    *pick_context,
                        const ClutterActorBox *box)
 {
  ClutterStage *stage;
@@ -1353,12 +1358,14 @@ clutter_actor_pick_box (ClutterActor          *self,

  stage = CLUTTER_STAGE (_clutter_actor_get_stage_internal (self));

-  if (_clutter_actor_transform_local_box_to_stage (self, stage, box, vertices))
+  if (_clutter_actor_transform_local_box_to_stage (self, stage, pick_context,
+                                                   box, vertices))
    clutter_stage_log_pick (stage, vertices, self);
 }

 static gboolean
 _clutter_actor_push_pick_clip (ClutterActor          *self,
+                               ClutterPickContext    *pick_context,
                               const ClutterActorBox *clip)
 {
  ClutterStage *stage;
@@ -1366,7 +1373,8 @@ _clutter_actor_push_pick_clip (ClutterActor          *self,

  stage = CLUTTER_STAGE (_clutter_actor_get_stage_internal (self));

-  if (!_clutter_actor_transform_local_box_to_stage (self, stage, clip, vertices))
+  if (!_clutter_actor_transform_local_box_to_stage (self, stage, pick_context,
+                                                    clip, vertices))
    return FALSE;

  clutter_stage_push_pick_clip (stage, vertices);
@@ -2028,29 +2036,6 @@ clutter_actor_hide (ClutterActor *self)
  g_object_thaw_notify (G_OBJECT (self));
 }

-/**
- * clutter_actor_hide_all:
- * @self: a #ClutterActor
- *
- * Calls clutter_actor_hide() on all child actors (if any).
- *
- * Since: 0.2
- *
- * Deprecated: 1.10: Using clutter_actor_hide() on the actor will
- *   prevent its children from being painted as well.
- */
-void
-clutter_actor_hide_all (ClutterActor *self)
-{
-  ClutterActorClass *klass;
-
-  g_return_if_fail (CLUTTER_IS_ACTOR (self));
-
-  klass = CLUTTER_ACTOR_GET_CLASS (self);
-  if (klass->hide_all)
-    klass->hide_all (self);
-}
-
 /**
 * clutter_actor_realize:
 * @self: A #ClutterActor
@@ -2344,7 +2329,8 @@ _clutter_actor_rerealize (ClutterActor    *self,
 }

 static void
-clutter_actor_real_pick (ClutterActor *self)
+clutter_actor_real_pick (ClutterActor       *self,
+                         ClutterPickContext *pick_context)
 {
  if (clutter_actor_should_pick_paint (self))
    {
@@ -2355,7 +2341,7 @@ clutter_actor_real_pick (ClutterActor *self)
        .y2 = clutter_actor_get_height (self),
      };

-      clutter_actor_pick_box (self, &box);
+      clutter_actor_pick_box (self, pick_context, &box);
    }

  /* XXX - this thoroughly sucks, but we need to maintain compatibility
@@ -2372,7 +2358,7 @@ clutter_actor_real_pick (ClutterActor *self)
      for (iter = self->priv->first_child;
           iter != NULL;
           iter = iter->priv->next_sibling)
-        clutter_actor_pick (iter);
+        clutter_actor_pick (iter, pick_context);
    }
 }

@@ -3452,11 +3438,11 @@ _clutter_actor_draw_paint_volume_full (ClutterActor       *self,
                                n_vertices,
                                (CoglVertexP3 *)line_ends);

-  cogl_color_set_from_4ub (&cogl_color,
-                           color->red,
-                           color->green,
-                           color->blue,
-                           color->alpha);
+  cogl_color_init_from_4ub (&cogl_color,
+                            color->red,
+                            color->green,
+                            color->blue,
+                            color->alpha);
  cogl_pipeline_set_color (outline, &cogl_color);

  pipeline_node = clutter_pipeline_node_new (outline);
@@ -3614,8 +3600,9 @@ in_clone_paint (void)
 * means there's no point in trying to cull descendants of the current
 * node. */
 static gboolean
-cull_actor (ClutterActor      *self,
-            ClutterCullResult *result_out)
+cull_actor (ClutterActor        *self,
+            ClutterPaintContext *paint_context,
+            ClutterCullResult   *result_out)
 {
  ClutterActorPrivate *priv = self->priv;
  ClutterStage *stage;
@@ -3642,10 +3629,10 @@ cull_actor (ClutterActor      *self,
      return FALSE;
    }

-  if (cogl_get_draw_framebuffer () != _clutter_stage_get_active_framebuffer (stage))
+  if (clutter_paint_context_is_drawing_off_stage (paint_context))
    {
      CLUTTER_NOTE (CLIPPING, "Bail from cull_actor without culling (%s): "
-                    "Current framebuffer doesn't correspond to stage",
+                    "Drawing off stage",
                    _clutter_actor_get_debug_name (self));
      return FALSE;
    }
@@ -3783,7 +3770,8 @@ add_or_remove_flatten_effect (ClutterActor *self)
 }

 static void
-clutter_actor_real_paint (ClutterActor *actor)
+clutter_actor_real_paint (ClutterActor        *actor,
+                          ClutterPaintContext *paint_context)
 {
  ClutterActorPrivate *priv = actor->priv;
  ClutterActor *iter;
@@ -3800,21 +3788,19 @@ clutter_actor_real_paint (ClutterActor *actor)
                    iter->priv->allocation.x2 - iter->priv->allocation.x1,
                    iter->priv->allocation.y2 - iter->priv->allocation.y1);

-      clutter_actor_paint (iter);
+      clutter_actor_paint (iter, paint_context);
    }
 }

 static gboolean
-clutter_actor_paint_node (ClutterActor     *actor,
-                          ClutterPaintNode *root)
+clutter_actor_paint_node (ClutterActor        *actor,
+                          ClutterPaintNode    *root,
+                          ClutterPaintContext *paint_context)
 {
  ClutterActorPrivate *priv = actor->priv;
  ClutterActorBox box;
  ClutterColor bg_color;

-  if (root == NULL)
-    return FALSE;
-
  box.x1 = 0.f;
  box.y1 = 0.f;
  box.x2 = clutter_actor_box_get_width (&priv->allocation);
@@ -3828,7 +3814,7 @@ clutter_actor_paint_node (ClutterActor     *actor,
      CoglFramebuffer *fb;
      CoglBufferBit clear_flags;

-      fb = _clutter_stage_get_active_framebuffer (CLUTTER_STAGE (actor));
+      fb = clutter_paint_context_get_base_framebuffer (paint_context);

      if (clutter_stage_get_use_alpha (CLUTTER_STAGE (actor)))
        {
@@ -3870,7 +3856,7 @@ clutter_actor_paint_node (ClutterActor     *actor,
    }

  if (priv->content != NULL)
-    _clutter_content_paint_content (priv->content, actor, root);
+    _clutter_content_paint_content (priv->content, actor, root, paint_context);

  if (CLUTTER_ACTOR_GET_CLASS (actor)->paint_node != NULL)
    CLUTTER_ACTOR_GET_CLASS (actor)->paint_node (actor, root);
@@ -3886,7 +3872,7 @@ clutter_actor_paint_node (ClutterActor     *actor,
    }
 #endif /* CLUTTER_ENABLE_DEBUG */

-  clutter_paint_node_paint (root);
+  clutter_paint_node_paint (root, paint_context);

  return TRUE;
 }
@@ -3910,7 +3896,8 @@ clutter_actor_paint_node (ClutterActor     *actor,
 * unless it is performing a pick paint.
 */
 void
-clutter_actor_paint (ClutterActor *self)
+clutter_actor_paint (ClutterActor        *self,
+                     ClutterPaintContext *paint_context)
 {
  g_autoptr (ClutterPaintNode) actor_node = NULL;
  g_autoptr (ClutterPaintNode) root_node = NULL;
@@ -4075,7 +4062,7 @@ clutter_actor_paint (ClutterActor *self)
                     CLUTTER_DEBUG_DISABLE_CLIPPED_REDRAWS)))
        _clutter_actor_update_last_paint_volume (self);

-      success = cull_actor (self, &result);
+      success = cull_actor (self, paint_context, &result);

      if (G_UNLIKELY (clutter_paint_debug_flags & CLUTTER_DEBUG_REDRAWS))
        _clutter_actor_paint_cull_result (self, success, result, actor_node);
@@ -4092,7 +4079,7 @@ clutter_actor_paint (ClutterActor *self)
  if (G_UNLIKELY (clutter_paint_debug_flags & CLUTTER_DEBUG_PAINT_VOLUMES))
    _clutter_actor_draw_paint_volume (self, actor_node);

-  clutter_paint_node_paint (root_node);
+  clutter_paint_node_paint (root_node, paint_context);

  /* If we make it here then the actor has run through a complete
     paint run including all the effects so it's no longer dirty */
@@ -4112,7 +4099,8 @@ clutter_actor_paint (ClutterActor *self)
 * Since: 1.8
 */
 void
-clutter_actor_continue_paint (ClutterActor *self)
+clutter_actor_continue_paint (ClutterActor        *self,
+                              ClutterPaintContext *paint_context)
 {
  ClutterActorPrivate *priv;

@@ -4132,6 +4120,7 @@ clutter_actor_continue_paint (ClutterActor *self)
     actual actor */
  if (priv->next_effect_to_paint == NULL)
    {
+      CoglFramebuffer *framebuffer;
      ClutterPaintNode *dummy;

      /* XXX - this will go away in 2.0, when we can get rid of this
@@ -4139,21 +4128,22 @@ clutter_actor_continue_paint (ClutterActor *self)
       * for the entire frame, starting from the Stage; the paint()
       * virtual function can then be called directly.
       */
-      dummy = _clutter_dummy_node_new (self);
+      framebuffer = clutter_paint_context_get_base_framebuffer (paint_context);
+      dummy = _clutter_dummy_node_new (self, framebuffer);
      clutter_paint_node_set_name (dummy, "Root");

      /* XXX - for 1.12, we use the return value of paint_node() to
       * decide whether we should emit the ::paint signal.
       */
-      clutter_actor_paint_node (self, dummy);
+      clutter_actor_paint_node (self, dummy, paint_context);
      clutter_paint_node_unref (dummy);

      /* XXX:2.0 - Call the paint() virtual directly */
      if (g_signal_has_handler_pending (self, actor_signals[PAINT],
                                        0, TRUE))
-        g_signal_emit (self, actor_signals[PAINT], 0);
+        g_signal_emit (self, actor_signals[PAINT], 0, paint_context);
      else
-        CLUTTER_ACTOR_GET_CLASS (self)->paint (self);
+        CLUTTER_ACTOR_GET_CLASS (self)->paint (self, paint_context);
    }
  else
    {
@@ -4180,7 +4170,7 @@ clutter_actor_continue_paint (ClutterActor *self)
            run_flags |= CLUTTER_EFFECT_PAINT_ACTOR_DIRTY;
        }

-      _clutter_effect_paint (priv->current_effect, run_flags);
+      _clutter_effect_paint (priv->current_effect, paint_context, run_flags);

      priv->current_effect = old_current_effect;
    }
@@ -4193,9 +4183,11 @@ clutter_actor_continue_paint (ClutterActor *self)
 * Asks @actor to perform a pick.
 */
 void
-clutter_actor_pick (ClutterActor *actor)
+clutter_actor_pick (ClutterActor       *actor,
+                    ClutterPickContext *pick_context)
 {
  ClutterActorPrivate *priv;
+  CoglFramebuffer *framebuffer;
  ClutterActorBox clip;
  gboolean clip_set = FALSE;

@@ -4215,15 +4207,16 @@ clutter_actor_pick (ClutterActor *actor)
  /* mark that we are in the paint process */
  CLUTTER_SET_PRIVATE_FLAGS (actor, CLUTTER_IN_PICK);

-  cogl_push_matrix ();
+  framebuffer = clutter_pick_context_get_framebuffer (pick_context);
+  cogl_framebuffer_push_matrix (framebuffer);

  if (priv->enable_model_view_transform)
    {
      CoglMatrix matrix;

-      cogl_get_modelview_matrix (&matrix);
+      cogl_framebuffer_get_modelview_matrix (framebuffer, &matrix);
      _clutter_actor_apply_modelview_transform (actor, &matrix);
-      cogl_set_modelview_matrix (&matrix);
+      cogl_framebuffer_set_modelview_matrix (framebuffer, &matrix);
    }

  if (priv->has_clip)
@@ -4244,7 +4237,7 @@ clutter_actor_pick (ClutterActor *actor)
    }

  if (clip_set)
-    clip_set = _clutter_actor_push_pick_clip (actor, &clip);
+    clip_set = _clutter_actor_push_pick_clip (actor, pick_context, &clip);

  priv->next_effect_to_paint = NULL;
  if (priv->effects)
@@ -4253,12 +4246,12 @@ clutter_actor_pick (ClutterActor *actor)
        _clutter_meta_group_peek_metas (priv->effects);
    }

-  clutter_actor_continue_pick (actor);
+  clutter_actor_continue_pick (actor, pick_context);

  if (clip_set)
    _clutter_actor_pop_pick_clip (actor);

-  cogl_pop_matrix ();
+  cogl_framebuffer_pop_matrix (framebuffer);

  /* paint sequence complete */
  CLUTTER_UNSET_PRIVATE_FLAGS (actor, CLUTTER_IN_PICK);
@@ -4275,7 +4268,8 @@ clutter_actor_pick (ClutterActor *actor)
 * is the last effect in the chain.
 */
 void
-clutter_actor_continue_pick (ClutterActor *actor)
+clutter_actor_continue_pick (ClutterActor       *actor,
+                             ClutterPickContext *pick_context)
 {
  ClutterActorPrivate *priv;

@@ -4301,9 +4295,9 @@ clutter_actor_continue_pick (ClutterActor *actor)
       */
      if (g_signal_has_handler_pending (actor, actor_signals[PICK],
                                        0, TRUE))
-        g_signal_emit (actor, actor_signals[PICK], 0);
+        g_signal_emit (actor, actor_signals[PICK], 0, pick_context);
      else
-        CLUTTER_ACTOR_GET_CLASS (actor)->pick (actor);
+        CLUTTER_ACTOR_GET_CLASS (actor)->pick (actor, pick_context);
    }
  else
    {
@@ -4317,7 +4311,7 @@ clutter_actor_continue_pick (ClutterActor *actor)
      priv->current_effect = priv->next_effect_to_paint->data;
      priv->next_effect_to_paint = priv->next_effect_to_paint->next;

-      _clutter_effect_pick (priv->current_effect);
+      _clutter_effect_pick (priv->current_effect, pick_context);

      priv->current_effect = old_current_effect;
    }
@@ -4531,7 +4525,6 @@ clutter_actor_remove_child_internal (ClutterActor                 *self,
      clutter_actor_queue_compute_expand (self);
    }

-  /* clutter_actor_reparent() will emit ::parent-set for us */
  if (emit_parent_set && !CLUTTER_ACTOR_IN_REPARENT (child) &&
      !CLUTTER_ACTOR_IN_DESTRUCTION (child))
    {
@@ -6165,17 +6158,8 @@ clutter_actor_dispose (GObject *object)
      g_assert (!CLUTTER_ACTOR_IS_REALIZED (self));
    }

-  if (priv->resolution_changed_id)
-    {
-      g_signal_handler_disconnect (backend, priv->resolution_changed_id);
-      priv->resolution_changed_id = 0;
-    }
-
-  if (priv->font_changed_id)
-    {
-      g_signal_handler_disconnect (backend, priv->font_changed_id);
-      priv->font_changed_id = 0;
-    }
+  g_clear_signal_handler (&priv->resolution_changed_id, backend);
+  g_clear_signal_handler (&priv->font_changed_id, backend);

  g_clear_object (&priv->pango_context);
  g_clear_object (&priv->actions);
@@ -8567,6 +8551,7 @@ clutter_actor_class_init (ClutterActorClass *klass)
  /**
   * ClutterActor::paint:
   * @actor: the #ClutterActor that received the signal
+   * @paint_context: a #ClutterPaintContext
   *
   * The ::paint signal is emitted each time an actor is being painted.
   *
@@ -8594,7 +8579,8 @@ clutter_actor_class_init (ClutterActorClass *klass)
                  G_SIGNAL_DEPRECATED,
                  G_STRUCT_OFFSET (ClutterActorClass, paint),
                  NULL, NULL, NULL,
-                  G_TYPE_NONE, 0);
+                  G_TYPE_NONE, 1,
+                  CLUTTER_TYPE_PAINT_CONTEXT);
  /**
   * ClutterActor::realize:
   * @actor: the #ClutterActor that received the signal
@@ -8637,6 +8623,7 @@ clutter_actor_class_init (ClutterActorClass *klass)
  /**
   * ClutterActor::pick:
   * @actor: the #ClutterActor that received the signal
+   * @pick_context: a #ClutterPickContext
   *
   * The ::pick signal is emitted each time an actor is being painted
   * in "pick mode". The pick mode is used to identify the actor during
@@ -8658,7 +8645,8 @@ clutter_actor_class_init (ClutterActorClass *klass)
                  G_SIGNAL_RUN_LAST | G_SIGNAL_DEPRECATED,
                  G_STRUCT_OFFSET (ClutterActorClass, pick),
                  NULL, NULL, NULL,
-                  G_TYPE_NONE, 0);
+                  G_TYPE_NONE, 1,
+                  CLUTTER_TYPE_PICK_CONTEXT);

  /**
   * ClutterActor::allocation-changed:
@@ -11727,45 +11715,6 @@ clutter_actor_set_scale_full (ClutterActor *self,
  g_object_thaw_notify (G_OBJECT (self));
 }

-/**
- * clutter_actor_set_scale_with_gravity:
- * @self: A #ClutterActor
- * @scale_x: double factor to scale actor by horizontally.
- * @scale_y: double factor to scale actor by vertically.
- * @gravity: the location of the scale center expressed as a compass
- *   direction.
- *
- * Scales an actor with the given factors around the given
- * center point. The center point is specified as one of the compass
- * directions in #ClutterGravity. For example, setting it to north
- * will cause the top of the actor to remain unchanged and the rest of
- * the actor to expand left, right and downwards.
- *
- * The #ClutterActor:scale-x and #ClutterActor:scale-y properties are
- * animatable.
- *
- * Since: 1.0
- *
- * Deprecated: 1.12: Use clutter_actor_set_pivot_point() to set the
- *   scale center using normalized coordinates instead.
- */
-void
-clutter_actor_set_scale_with_gravity (ClutterActor   *self,
-                                      gdouble         scale_x,
-                                      gdouble         scale_y,
-                                      ClutterGravity  gravity)
-{
-  g_return_if_fail (CLUTTER_IS_ACTOR (self));
-
-  g_object_freeze_notify (G_OBJECT (self));
-
-  clutter_actor_set_scale_factor (self, CLUTTER_X_AXIS, scale_x);
-  clutter_actor_set_scale_factor (self, CLUTTER_Y_AXIS, scale_y);
-  clutter_actor_set_scale_gravity (self, gravity);
-
-  g_object_thaw_notify (G_OBJECT (self));
-}
-
 /**
 * clutter_actor_get_scale:
 * @self: A #ClutterActor
@@ -12156,27 +12105,6 @@ clutter_actor_get_name (ClutterActor *self)
  return self->priv->name;
 }

-/**
- * clutter_actor_get_gid:
- * @self: A #ClutterActor
- *
- * Retrieves the unique id for @self.
- *
- * Return value: Globally unique value for this object instance.
- *
- * Since: 0.6
- *
- * Deprecated: 1.8: The id is not used any longer, and this function
- *   always returns 0.
- */
-guint32
-clutter_actor_get_gid (ClutterActor *self)
-{
-  g_return_val_if_fail (CLUTTER_IS_ACTOR (self), 0);
-
-  return 0;
-}
-
 static inline void
 clutter_actor_set_depth_internal (ClutterActor *self,
                                  float         depth)
@@ -13164,7 +13092,6 @@ clutter_actor_add_child_internal (ClutterActor              *self,
      clutter_actor_queue_compute_expand (self);
    }

-  /* clutter_actor_reparent() will emit ::parent-set for us */
  if (emit_parent_set && !CLUTTER_ACTOR_IN_REPARENT (child))
    {
      child->priv->needs_compute_resource_scale = TRUE;
@@ -13685,89 +13612,6 @@ clutter_actor_unparent (ClutterActor *self)
                                       REMOVE_CHILD_LEGACY_FLAGS);
 }

-/**
- * clutter_actor_reparent:
- * @self: a #ClutterActor
- * @new_parent: the new #ClutterActor parent
- *
- * Resets the parent actor of @self.
- *
- * This function is logically equivalent to calling clutter_actor_unparent()
- * and clutter_actor_set_parent(), but more efficiently implemented, as it
- * ensures the child is not finalized when unparented, and emits the
- * #ClutterActor::parent-set signal only once.
- *
- * In reality, calling this function is less useful than it sounds, as some
- * application code may rely on changes in the intermediate state between
- * removal and addition of the actor from its old parent to the @new_parent.
- * Thus, it is strongly encouraged to avoid using this function in application
- * code.
- *
- * Since: 0.2
- *
- * Deprecated: 1.10: Use clutter_actor_remove_child() and
- *   clutter_actor_add_child() instead; remember to take a reference on
- *   the actor being removed before calling clutter_actor_remove_child()
- *   to avoid the reference count dropping to zero and the actor being
- *   destroyed.
- */
-void
-clutter_actor_reparent (ClutterActor *self,
-                        ClutterActor *new_parent)
-{
-  ClutterActorPrivate *priv;
-
-  g_return_if_fail (CLUTTER_IS_ACTOR (self));
-  g_return_if_fail (CLUTTER_IS_ACTOR (new_parent));
-  g_return_if_fail (self != new_parent);
-
-  if (CLUTTER_ACTOR_IS_TOPLEVEL (self))
-    {
-      g_warning ("Cannot set a parent on a toplevel actor");
-      return;
-    }
-
-  if (CLUTTER_ACTOR_IN_DESTRUCTION (self))
-    {
-      g_warning ("Cannot set a parent currently being destroyed");
-      return;
-    }
-
-  priv = self->priv;
-
-  if (priv->parent != new_parent)
-    {
-      ClutterActor *old_parent;
-
-      CLUTTER_SET_PRIVATE_FLAGS (self, CLUTTER_IN_REPARENT);
-
-      old_parent = priv->parent;
-
-      g_object_ref (self);
-
-      if (old_parent != NULL)
-        {
-          /* this will have to call unparent() */
-          clutter_container_remove_actor (CLUTTER_CONTAINER (old_parent), self);
-        }
-
-      /* Note, will call set_parent() */
-      clutter_container_add_actor (CLUTTER_CONTAINER (new_parent), self);
-
-      priv->needs_compute_resource_scale = TRUE;
-
-      /* we emit the ::parent-set signal once */
-      g_signal_emit (self, actor_signals[PARENT_SET], 0, old_parent);
-
-      CLUTTER_UNSET_PRIVATE_FLAGS (self, CLUTTER_IN_REPARENT);
-
-      /* the IN_REPARENT flag suspends state updates */
-      clutter_actor_update_map_state (self, MAP_STATE_CHECK);
-
-      g_object_unref (self);
-   }
-}
-
 /**
 * clutter_actor_contains:
 * @self: A #ClutterActor
@@ -13935,134 +13779,6 @@ clutter_actor_set_child_at_index (ClutterActor *self,
  clutter_actor_queue_relayout (self);
 }

-/**
- * clutter_actor_raise:
- * @self: A #ClutterActor
- * @below: (allow-none): A #ClutterActor to raise above.
- *
- * Puts @self above @below.
- *
- * Both actors must have the same parent, and the parent must implement
- * the #ClutterContainer interface
- *
- * This function calls clutter_container_raise_child() internally.
- *
- * Deprecated: 1.10: Use clutter_actor_set_child_above_sibling() instead.
- */
-void
-clutter_actor_raise (ClutterActor *self,
-                     ClutterActor *below)
-{
-  ClutterActor *parent;
-
-  g_return_if_fail (CLUTTER_IS_ACTOR (self));
-
-  parent = clutter_actor_get_parent (self);
-  if (parent == NULL)
-    {
-      g_warning ("%s: Actor '%s' is not inside a container",
-                 G_STRFUNC,
-                 _clutter_actor_get_debug_name (self));
-      return;
-    }
-
-  if (below != NULL)
-    {
-      if (parent != clutter_actor_get_parent (below))
-        {
-          g_warning ("%s Actor '%s' is not in the same container as "
-                     "actor '%s'",
-                     G_STRFUNC,
-                     _clutter_actor_get_debug_name (self),
-                     _clutter_actor_get_debug_name (below));
-          return;
-        }
-    }
-
-  clutter_container_raise_child (CLUTTER_CONTAINER (parent), self, below);
-}
-
-/**
- * clutter_actor_lower:
- * @self: A #ClutterActor
- * @above: (allow-none): A #ClutterActor to lower below
- *
- * Puts @self below @above.
- *
- * Both actors must have the same parent, and the parent must implement
- * the #ClutterContainer interface.
- *
- * This function calls clutter_container_lower_child() internally.
- *
- * Deprecated: 1.10: Use clutter_actor_set_child_below_sibling() instead.
- */
-void
-clutter_actor_lower (ClutterActor *self,
-                     ClutterActor *above)
-{
-  ClutterActor *parent;
-
-  g_return_if_fail (CLUTTER_IS_ACTOR (self));
-
-  parent = clutter_actor_get_parent (self);
-  if (parent == NULL)
-    {
-      g_warning ("%s: Actor of type %s is not inside a container",
-                 G_STRFUNC,
-                 _clutter_actor_get_debug_name (self));
-      return;
-    }
-
-  if (above)
-    {
-      if (parent != clutter_actor_get_parent (above))
-        {
-          g_warning ("%s: Actor '%s' is not in the same container as "
-                     "actor '%s'",
-                     G_STRFUNC,
-                     _clutter_actor_get_debug_name (self),
-                     _clutter_actor_get_debug_name (above));
-          return;
-        }
-    }
-
-  clutter_container_lower_child (CLUTTER_CONTAINER (parent), self, above);
-}
-
-/**
- * clutter_actor_raise_top:
- * @self: A #ClutterActor
- *
- * Raises @self to the top.
- *
- * This function calls clutter_actor_raise() internally.
- *
- * Deprecated: 1.10: Use clutter_actor_set_child_above_sibling() with
- *   a %NULL sibling, instead.
- */
-void
-clutter_actor_raise_top (ClutterActor *self)
-{
-  clutter_actor_raise (self, NULL);
-}
-
-/**
- * clutter_actor_lower_bottom:
- * @self: A #ClutterActor
- *
- * Lowers @self to the bottom.
- *
- * This function calls clutter_actor_lower() internally.
- *
- * Deprecated: 1.10: Use clutter_actor_set_child_below_sibling() with
- *   a %NULL sibling, instead.
- */
-void
-clutter_actor_lower_bottom (ClutterActor *self)
-{
-  clutter_actor_lower (self, NULL);
-}
-
 /*
 * Event handling
 */
@@ -14205,34 +13921,6 @@ clutter_actor_get_reactive (ClutterActor *actor)
  return CLUTTER_ACTOR_IS_REACTIVE (actor) ? TRUE : FALSE;
 }

-/**
- * clutter_actor_get_anchor_point:
- * @self: a #ClutterActor
- * @anchor_x: (out): return location for the X coordinate of the anchor point
- * @anchor_y: (out): return location for the Y coordinate of the anchor point
- *
- * Gets the current anchor point of the @actor in pixels.
- *
- * Since: 0.6
- *
- * Deprecated: 1.12: Use #ClutterActor:pivot-point instead
- */
-void
-clutter_actor_get_anchor_point (ClutterActor *self,
-				gfloat       *anchor_x,
-                                gfloat       *anchor_y)
-{
-  const ClutterTransformInfo *info;
-
-  g_return_if_fail (CLUTTER_IS_ACTOR (self));
-
-  info = _clutter_actor_get_transform_info_or_defaults (self);
-  clutter_anchor_coord_get_units (self, &info->anchor,
-                                  anchor_x,
-                                  anchor_y,
-                                  NULL);
-}
-
 /**
 * clutter_actor_set_anchor_point:
 * @self: a #ClutterActor
@@ -15993,7 +15681,7 @@ update_pango_context (ClutterBackend *backend,
 * stored by the #ClutterBackend change.
 *
 * You can use the returned #PangoContext to create a #PangoLayout
- * and render text using cogl_pango_render_layout() to reuse the
+ * and render text using cogl_pango_show_layout() to reuse the
 * glyphs cache also used by Clutter.
 *
 * Return value: (transfer none): the #PangoContext for a #ClutterActor.
@@ -16492,25 +16180,6 @@ clutter_actor_unset_flags (ClutterActor      *self,
  g_object_thaw_notify (obj);
 }

-/**
- * clutter_actor_get_transformation_matrix:
- * @self: a #ClutterActor
- * @matrix: (out caller-allocates): the return location for a #ClutterMatrix
- *
- * Retrieves the transformations applied to @self relative to its
- * parent.
- *
- * Since: 1.0
- *
- * Deprecated: 1.12: Use clutter_actor_get_transform() instead
- */
-void
-clutter_actor_get_transformation_matrix (ClutterActor  *self,
-                                         ClutterMatrix *matrix)
-{
-  clutter_actor_get_transform (self, matrix);
-}
-
 static void
 clutter_actor_set_transform_internal (ClutterActor        *self,
                                      const ClutterMatrix *transform)
@@ -19352,7 +19021,7 @@ transition_closure_free (gpointer data)
       * so that we don't end up inside on_transition_stopped() from
       * a call to g_hash_table_remove().
       */
-      g_signal_handler_disconnect (clos->transition, clos->completed_id);
+      g_clear_signal_handler (&clos->completed_id, clos->transition);

      if (clutter_timeline_is_playing (timeline))
        clutter_timeline_stop (timeline);
@@ -21145,32 +20814,6 @@ clutter_actor_has_mapped_clones (ClutterActor *self)
  return FALSE;
 }

-CoglFramebuffer *
-_clutter_actor_get_active_framebuffer (ClutterActor *self)
-{
-  ClutterStage *stage;
-
-  if (!CLUTTER_ACTOR_IN_PAINT (self))
-    {
-      g_critical ("The active framebuffer of actor '%s' can only be "
-                  "retrieved during the paint sequence. Please, check "
-                  "your code.",
-                  _clutter_actor_get_debug_name (self));
-      return NULL;
-    }
-
-  stage = (ClutterStage *) _clutter_actor_get_stage_internal (self);
-  if (stage == NULL)
-    {
-      g_critical ("The active framebuffer of actor '%s' is only available "
-                  "if the actor is associated to a ClutterStage.",
-                  _clutter_actor_get_debug_name (self));
-      return NULL;
-    }
-
-  return _clutter_stage_get_active_framebuffer (stage);
-}
-
 static void
 clutter_actor_child_model__items_changed (GListModel *model,
                                          guint       position,
--- a/clutter/clutter/clutter-actor.h
+++ b/clutter/clutter/clutter-actor.h
@@ -39,6 +39,8 @@

 #include <clutter/clutter-types.h>
 #include <clutter/clutter-event.h>
+#include <clutter/clutter-paint-context.h>
+#include <clutter/clutter-pick-context.h>

 G_BEGIN_DECLS

@@ -228,12 +230,14 @@ struct _ClutterActorClass
  void (* unrealize)            (ClutterActor          *self);
  void (* map)                  (ClutterActor          *self);
  void (* unmap)                (ClutterActor          *self);
-  void (* paint)                (ClutterActor          *self);
+  void (* paint)                (ClutterActor          *self,
+                                 ClutterPaintContext   *paint_context);
  void (* parent_set)           (ClutterActor          *actor,
                                 ClutterActor          *old_parent);

  void (* destroy)              (ClutterActor          *self);
-  void (* pick)                 (ClutterActor          *actor);
+  void (* pick)                 (ClutterActor          *actor,
+                                 ClutterPickContext    *pick_context);

  gboolean (* queue_redraw)     (ClutterActor          *actor,
                                 ClutterActor          *leaf_that_queued,
@@ -349,13 +353,17 @@ void                            clutter_actor_map
 CLUTTER_EXPORT
 void                            clutter_actor_unmap                             (ClutterActor                *self);
 CLUTTER_EXPORT
-void                            clutter_actor_paint                             (ClutterActor                *self);
+void                            clutter_actor_paint                             (ClutterActor                *self,
+                                                                                 ClutterPaintContext         *paint_context);
 CLUTTER_EXPORT
-void                            clutter_actor_continue_paint                    (ClutterActor                *self);
+void                            clutter_actor_continue_paint                    (ClutterActor                *self,
+                                                                                 ClutterPaintContext         *paint_context);
 CLUTTER_EXPORT
-void                            clutter_actor_pick                              (ClutterActor                *actor);
+void                            clutter_actor_pick                              (ClutterActor                *actor,
+                                                                                 ClutterPickContext          *pick_context);
 CLUTTER_EXPORT
-void                            clutter_actor_continue_pick                     (ClutterActor                *actor);
+void                            clutter_actor_continue_pick                     (ClutterActor                *actor,
+                                                                                 ClutterPickContext          *pick_context);
 CLUTTER_EXPORT
 void                            clutter_actor_queue_redraw                      (ClutterActor                *self);
 CLUTTER_EXPORT
@@ -907,6 +915,7 @@ void                            clutter_actor_bind_model_with_properties

 CLUTTER_EXPORT
 void clutter_actor_pick_box (ClutterActor          *self,
+                             ClutterPickContext    *pick_context,
                             const ClutterActorBox *box);

 G_END_DECLS
--- a/clutter/clutter/clutter-animatable.c
+++ b/clutter/clutter/clutter-animatable.c
@@ -54,7 +54,6 @@
 #include "clutter-debug.h"
 #include "clutter-private.h"

-#include "deprecated/clutter-animatable.h"
 #include "deprecated/clutter-animation.h"

 G_DEFINE_INTERFACE (ClutterAnimatable, clutter_animatable, G_TYPE_OBJECT);
@@ -64,80 +63,6 @@ clutter_animatable_default_init (ClutterAnimatableInterface *iface)
 {
 }

-/**
- * clutter_animatable_animate_property:
- * @animatable: a #ClutterAnimatable
- * @animation: a #ClutterAnimation
- * @property_name: the name of the animated property
- * @initial_value: the initial value of the animation interval
- * @final_value: the final value of the animation interval
- * @progress: the progress factor
- * @value: return location for the animation value
- *
- * Calls the animate_property() virtual function for @animatable.
- *
- * The @initial_value and @final_value #GValue<!-- -->s must contain
- * the same type; @value must have been initialized to the same
- * type of @initial_value and @final_value.
- *
- * All implementation of the #ClutterAnimatable interface must
- * implement this function.
- *
- * Return value: %TRUE if the value has been validated and can
- *   be applied to the #ClutterAnimatable, and %FALSE otherwise
- *
- * Since: 1.0
- *
- * Deprecated: 1.8: Use clutter_animatable_interpolate_value()
- *   instead
- */
-gboolean
-clutter_animatable_animate_property (ClutterAnimatable *animatable,
-                                     ClutterAnimation  *animation,
-                                     const gchar       *property_name,
-                                     const GValue      *initial_value,
-                                     const GValue      *final_value,
-                                     gdouble            progress,
-                                     GValue            *value)
-{
-  ClutterAnimatableInterface *iface;
-  gboolean res;
-
-  g_return_val_if_fail (CLUTTER_IS_ANIMATABLE (animatable), FALSE);
-  g_return_val_if_fail (CLUTTER_IS_ANIMATION (animation), FALSE);
-  g_return_val_if_fail (property_name != NULL, FALSE);
-  g_return_val_if_fail (initial_value != NULL && final_value != NULL, FALSE);
-  g_return_val_if_fail (G_VALUE_TYPE (initial_value) != G_TYPE_INVALID, FALSE);
-  g_return_val_if_fail (G_VALUE_TYPE (final_value) != G_TYPE_INVALID, FALSE);
-  g_return_val_if_fail (value != NULL, FALSE);
-  g_return_val_if_fail (G_VALUE_TYPE (value) == G_VALUE_TYPE (initial_value) &&
-                        G_VALUE_TYPE (value) == G_VALUE_TYPE (final_value),
-                        FALSE);
-
-  iface = CLUTTER_ANIMATABLE_GET_IFACE (animatable);
-  if (iface->animate_property == NULL)
-    {
-      ClutterInterval *interval;
-
-      interval = clutter_animation_get_interval (animation, property_name);
-      if (interval == NULL)
-        return FALSE;
-
-      res = clutter_animatable_interpolate_value (animatable, property_name,
-                                                  interval,
-                                                  progress,
-                                                  value);
-    }
-  else
-    res = iface->animate_property (animatable, animation,
-                                   property_name,
-                                   initial_value, final_value,
-                                   progress,
-                                   value);
-
-  return res;
-}
-
 /**
 * clutter_animatable_find_property:
 * @animatable: a #ClutterAnimatable
--- a/clutter/clutter/clutter-autocleanups.h
+++ b/clutter/clutter/clutter-autocleanups.h
@@ -90,6 +90,7 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterActorBox, clutter_actor_box_free)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterColor, clutter_color_free)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterMargin, clutter_margin_free)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterMatrix, clutter_matrix_free)
+G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterPaintContext, clutter_paint_context_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterPaintNode, clutter_paint_node_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterPaintVolume, clutter_paint_volume_free)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterPathNode, clutter_path_node_free)
--- a/clutter/clutter/clutter-backend-private.h
+++ b/clutter/clutter/clutter-backend-private.h
@@ -141,9 +141,6 @@ gint32                  _clutter_backend_get_units_serial               (Clutter

 PangoDirection          _clutter_backend_get_keymap_direction           (ClutterBackend         *backend);

-CLUTTER_EXPORT
-void                    _clutter_backend_reset_cogl_framebuffer         (ClutterBackend         *backend);
-
 void                    clutter_set_allowed_drivers                     (const char             *drivers);

 CLUTTER_EXPORT
--- a/clutter/clutter/clutter-backend.c
+++ b/clutter/clutter/clutter-backend.c
@@ -1009,27 +1009,6 @@ _clutter_backend_get_keymap_direction (ClutterBackend *backend)
  return PANGO_DIRECTION_NEUTRAL;
 }

-void
-_clutter_backend_reset_cogl_framebuffer (ClutterBackend *backend)
-{
-  if (backend->dummy_onscreen == NULL)
-    {
-      GError *internal_error = NULL;
-
-      backend->dummy_onscreen = cogl_onscreen_new (backend->cogl_context, 1, 1);
-
-      if (!cogl_framebuffer_allocate (COGL_FRAMEBUFFER (backend->dummy_onscreen),
-                                      &internal_error))
-        {
-          g_critical ("Unable to create dummy onscreen: %s", internal_error->message);
-          g_error_free (internal_error);
-          return;
-        }
-    }
-
-  cogl_set_framebuffer (COGL_FRAMEBUFFER (backend->dummy_onscreen));
-}
-
 void
 clutter_set_allowed_drivers (const char *drivers)
 {
--- a/clutter/clutter/clutter-bin-layout.c
+++ b/clutter/clutter/clutter-bin-layout.c
@@ -49,10 +49,10 @@

 #define CLUTTER_DISABLE_DEPRECATION_WARNINGS
 #include "deprecated/clutter-container.h"
-#include "deprecated/clutter-bin-layout.h"

 #include "clutter-actor-private.h"
 #include "clutter-animatable.h"
+#include "clutter-bin-layout.h"
 #include "clutter-child-meta.h"
 #include "clutter-debug.h"
 #include "clutter-enum-types.h"
@@ -698,187 +698,3 @@ clutter_bin_layout_new (ClutterBinAlignment x_align,
                       "y-align", y_align,
                       NULL);
 }
-
-/**
- * clutter_bin_layout_set_alignment:
- * @self: a #ClutterBinLayout
- * @child: (allow-none): a child of @container
- * @x_align: the horizontal alignment policy to be used for the @child
- *   inside @container
- * @y_align: the vertical aligment policy to be used on the @child
- *   inside @container
- *
- * Sets the horizontal and vertical alignment policies to be applied
- * to a @child of @self
- *
- * If @child is %NULL then the @x_align and @y_align values will
- * be set as the default alignment policies
- *
- * Since: 1.2
- *
- * Deprecated: 1.12: Use the #ClutterActor:x-align and
- *   #ClutterActor:y-align properties of #ClutterActor instead.
- */
-void
-clutter_bin_layout_set_alignment (ClutterBinLayout    *self,
-                                  ClutterActor        *child,
-                                  ClutterBinAlignment  x_align,
-                                  ClutterBinAlignment  y_align)
-{
-  ClutterBinLayoutPrivate *priv;
-  ClutterLayoutManager *manager;
-  ClutterLayoutMeta *meta;
-
-  g_return_if_fail (CLUTTER_IS_BIN_LAYOUT (self));
-  g_return_if_fail (child == NULL || CLUTTER_IS_ACTOR (child));
-
-  priv = self->priv;
-
-  if (priv->container == NULL)
-    {
-      if (child == NULL)
-        {
-          set_x_align (self, x_align);
-          set_y_align (self, y_align);
-        }
-      else
-        g_warning ("The layout of type '%s' must be associated to "
-                   "a ClutterContainer before setting the alignment "
-                   "on its children",
-                   G_OBJECT_TYPE_NAME (self));
-
-      return;
-    }
-
-  manager = CLUTTER_LAYOUT_MANAGER (self);
-  meta = clutter_layout_manager_get_child_meta (manager,
-                                                priv->container,
-                                                child);
-  g_assert (CLUTTER_IS_BIN_LAYER (meta));
-
-  set_layer_x_align (CLUTTER_BIN_LAYER (meta), x_align);
-  set_layer_y_align (CLUTTER_BIN_LAYER (meta), y_align);
-}
-
-/**
- * clutter_bin_layout_get_alignment:
- * @self: a #ClutterBinLayout
- * @child: (allow-none): a child of @container
- * @x_align: (out) (allow-none): return location for the horizontal
- *   alignment policy
- * @y_align: (out) (allow-none): return location for the vertical
- *   alignment policy
- *
- * Retrieves the horizontal and vertical alignment policies for
- * a child of @self
- *
- * If @child is %NULL the default alignment policies will be returned
- * instead
- *
- * Since: 1.2
- *
- * Deprecated: 1.12: Use the #ClutterActor:x-align and the
- *   #ClutterActor:y-align properties of #ClutterActor instead.
- */
-void
-clutter_bin_layout_get_alignment (ClutterBinLayout    *self,
-                                  ClutterActor        *child,
-                                  ClutterBinAlignment *x_align,
-                                  ClutterBinAlignment *y_align)
-{
-  ClutterBinLayoutPrivate *priv;
-  ClutterLayoutManager *manager;
-  ClutterLayoutMeta *meta;
-  ClutterBinLayer *layer;
-
-  g_return_if_fail (CLUTTER_IS_BIN_LAYOUT (self));
-
-  priv = self->priv;
-
-  if (priv->container == NULL)
-    {
-      if (child == NULL)
-        {
-          if (x_align)
-            *x_align = priv->x_align;
-
-          if (y_align)
-            *y_align = priv->y_align;
-        }
-      else
-        g_warning ("The layout of type '%s' must be associated to "
-                   "a ClutterContainer before getting the alignment "
-                   "of its children",
-                   G_OBJECT_TYPE_NAME (self));
-
-      return;
-    }
-
-  manager = CLUTTER_LAYOUT_MANAGER (self);
-  meta = clutter_layout_manager_get_child_meta (manager,
-                                                priv->container,
-                                                child);
-  g_assert (CLUTTER_IS_BIN_LAYER (meta));
-
-  layer = CLUTTER_BIN_LAYER (meta);
-
-  if (x_align)
-    *x_align = layer->x_align;
-
-  if (y_align)
-    *y_align = layer->y_align;
-}
-
-/**
- * clutter_bin_layout_add:
- * @self: a #ClutterBinLayout
- * @child: a #ClutterActor
- * @x_align: horizontal alignment policy for @child
- * @y_align: vertical alignment policy for @child
- *
- * Adds a #ClutterActor to the container using @self and
- * sets the alignment policies for it
- *
- * This function is equivalent to clutter_container_add_actor()
- * and clutter_layout_manager_child_set_property() but it does not
- * require a pointer to the #ClutterContainer associated to the
- * #ClutterBinLayout
- *
- * Since: 1.2
- *
- * Deprecated: 1.12: Use clutter_actor_add_child() instead.
- */
-void
-clutter_bin_layout_add (ClutterBinLayout    *self,
-                        ClutterActor        *child,
-                        ClutterBinAlignment  x_align,
-                        ClutterBinAlignment  y_align)
-{
-  ClutterBinLayoutPrivate *priv;
-  ClutterLayoutManager *manager;
-  ClutterLayoutMeta *meta;
-
-  g_return_if_fail (CLUTTER_IS_BIN_LAYOUT (self));
-  g_return_if_fail (CLUTTER_IS_ACTOR (child));
-
-  priv = self->priv;
-
-  if (priv->container == NULL)
-    {
-      g_warning ("The layout of type '%s' must be associated to "
-                 "a ClutterContainer before adding children",
-                 G_OBJECT_TYPE_NAME (self));
-      return;
-    }
-
-  clutter_container_add_actor (priv->container, child);
-
-  manager = CLUTTER_LAYOUT_MANAGER (self);
-  meta = clutter_layout_manager_get_child_meta (manager,
-                                                priv->container,
-                                                child);
-  g_assert (CLUTTER_IS_BIN_LAYER (meta));
-
-  set_layer_x_align (CLUTTER_BIN_LAYER (meta), x_align);
-  set_layer_y_align (CLUTTER_BIN_LAYER (meta), y_align);
-}
--- a/clutter/clutter/clutter-blur-effect.c
+++ b/clutter/clutter/clutter-blur-effect.c
@@ -99,7 +99,8 @@ G_DEFINE_TYPE (ClutterBlurEffect,
               CLUTTER_TYPE_OFFSCREEN_EFFECT);

 static gboolean
-clutter_blur_effect_pre_paint (ClutterEffect *effect)
+clutter_blur_effect_pre_paint (ClutterEffect       *effect,
+                               ClutterPaintContext *paint_context)
 {
  ClutterBlurEffect *self = CLUTTER_BLUR_EFFECT (effect);
  ClutterEffectClass *parent_class;
@@ -124,7 +125,7 @@ clutter_blur_effect_pre_paint (ClutterEffect *effect)
    }

  parent_class = CLUTTER_EFFECT_CLASS (clutter_blur_effect_parent_class);
-  if (parent_class->pre_paint (effect))
+  if (parent_class->pre_paint (effect, paint_context))
    {
      ClutterOffscreenEffect *offscreen_effect =
        CLUTTER_OFFSCREEN_EFFECT (effect);
@@ -157,10 +158,12 @@ clutter_blur_effect_pre_paint (ClutterEffect *effect)
 }

 static void
-clutter_blur_effect_paint_target (ClutterOffscreenEffect *effect)
+clutter_blur_effect_paint_target (ClutterOffscreenEffect *effect,
+                                  ClutterPaintContext    *paint_context)
 {
  ClutterBlurEffect *self = CLUTTER_BLUR_EFFECT (effect);
-  CoglFramebuffer *framebuffer = cogl_get_draw_framebuffer ();
+  CoglFramebuffer *framebuffer =
+    clutter_paint_context_get_framebuffer (paint_context);
  guint8 paint_opacity;

  paint_opacity = clutter_actor_get_paint_opacity (self->actor);
--- a/clutter/clutter/clutter-brightness-contrast-effect.c
+++ b/clutter/clutter/clutter-brightness-contrast-effect.c
@@ -121,16 +121,17 @@ G_DEFINE_TYPE (ClutterBrightnessContrastEffect,
 static gboolean
 will_have_no_effect (ClutterBrightnessContrastEffect *self)
 {
-  return (self->brightness_red == no_change &&
-          self->brightness_green == no_change &&
-          self->brightness_blue == no_change &&
-          self->contrast_red == no_change &&
-          self->contrast_green == no_change &&
-          self->contrast_blue == no_change);
+  return (G_APPROX_VALUE (self->brightness_red, no_change, FLT_EPSILON) &&
+          G_APPROX_VALUE (self->brightness_green, no_change, FLT_EPSILON) &&
+          G_APPROX_VALUE (self->brightness_blue, no_change, FLT_EPSILON) &&
+          G_APPROX_VALUE (self->contrast_red, no_change, FLT_EPSILON) &&
+          G_APPROX_VALUE (self->contrast_green, no_change, FLT_EPSILON) &&
+          G_APPROX_VALUE (self->contrast_blue, no_change, FLT_EPSILON));
 }

 static gboolean
-clutter_brightness_contrast_effect_pre_paint (ClutterEffect *effect)
+clutter_brightness_contrast_effect_pre_paint (ClutterEffect       *effect,
+                                              ClutterPaintContext *paint_context)
 {
  ClutterBrightnessContrastEffect *self = CLUTTER_BRIGHTNESS_CONTRAST_EFFECT (effect);
  ClutterEffectClass *parent_class;
@@ -156,7 +157,7 @@ clutter_brightness_contrast_effect_pre_paint (ClutterEffect *effect)

  parent_class =
    CLUTTER_EFFECT_CLASS (clutter_brightness_contrast_effect_parent_class);
-  if (parent_class->pre_paint (effect))
+  if (parent_class->pre_paint (effect, paint_context))
    {
      ClutterOffscreenEffect *offscreen_effect =
        CLUTTER_OFFSCREEN_EFFECT (effect);
@@ -175,10 +176,12 @@ clutter_brightness_contrast_effect_pre_paint (ClutterEffect *effect)
 }

 static void
-clutter_brightness_contrast_effect_paint_target (ClutterOffscreenEffect *effect)
+clutter_brightness_contrast_effect_paint_target (ClutterOffscreenEffect *effect,
+                                                 ClutterPaintContext    *paint_context)
 {
  ClutterBrightnessContrastEffect *self = CLUTTER_BRIGHTNESS_CONTRAST_EFFECT (effect);
-  CoglFramebuffer *framebuffer = cogl_get_draw_framebuffer ();
+  CoglFramebuffer *framebuffer =
+   clutter_paint_context_get_framebuffer (paint_context);
  ClutterActor *actor;
  guint8 paint_opacity;

@@ -494,9 +497,9 @@ clutter_brightness_contrast_effect_set_brightness_full (ClutterBrightnessContras
 {
  g_return_if_fail (CLUTTER_IS_BRIGHTNESS_CONTRAST_EFFECT (effect));

-  if (red == effect->brightness_red &&
-      green == effect->brightness_green &&
-      blue == effect->brightness_blue)
+  if (G_APPROX_VALUE (red, effect->brightness_red, FLT_EPSILON) &&
+      G_APPROX_VALUE (green, effect->brightness_green, FLT_EPSILON) &&
+      G_APPROX_VALUE (blue, effect->brightness_blue, FLT_EPSILON))
    return;

  effect->brightness_red = red;
@@ -584,9 +587,9 @@ clutter_brightness_contrast_effect_set_contrast_full (ClutterBrightnessContrastE
 {
  g_return_if_fail (CLUTTER_IS_BRIGHTNESS_CONTRAST_EFFECT (effect));

-  if (red == effect->contrast_red &&
-      green == effect->contrast_green &&
-      blue == effect->contrast_blue)
+  if (G_APPROX_VALUE (red, effect->contrast_red, FLT_EPSILON) &&
+      G_APPROX_VALUE (green, effect->contrast_green, FLT_EPSILON) &&
+      G_APPROX_VALUE (blue, effect->contrast_blue, FLT_EPSILON))
    return;

  effect->contrast_red = red;
--- a/clutter/clutter/clutter-canvas.c
+++ b/clutter/clutter/clutter-canvas.c
@@ -328,9 +328,10 @@ clutter_canvas_init (ClutterCanvas *self)
 }

 static void
-clutter_canvas_paint_content (ClutterContent   *content,
-                              ClutterActor     *actor,
-                              ClutterPaintNode *root)
+clutter_canvas_paint_content (ClutterContent      *content,
+                              ClutterActor        *actor,
+                              ClutterPaintNode    *root,
+                              ClutterPaintContext *paint_context)
 {
  ClutterCanvas *self = CLUTTER_CANVAS (content);
  ClutterCanvasPrivate *priv = self->priv;
--- a/clutter/clutter/clutter-click-action.c
+++ b/clutter/clutter/clutter-click-action.c
@@ -105,8 +105,8 @@ struct _ClutterClickActionPrivate
 {
  ClutterActor *stage;

-  guint event_id;
-  guint capture_id;
+  gulong event_id;
+  gulong capture_id;
  guint long_press_id;

  gint long_press_threshold;
@@ -202,11 +202,7 @@ click_action_emit_long_press (gpointer data)
                 CLUTTER_LONG_PRESS_ACTIVATE,
                 &result);

-  if (priv->capture_id != 0)
-    {
-      g_signal_handler_disconnect (priv->stage, priv->capture_id);
-      priv->capture_id = 0;
-    }
+  g_clear_signal_handler (&priv->capture_id, priv->stage);

  click_action_set_pressed (action, FALSE);
  click_action_set_held (action, FALSE);
@@ -261,8 +257,7 @@ click_action_cancel_long_press (ClutterClickAction *action)

      actor = clutter_actor_meta_get_actor (CLUTTER_ACTOR_META (action));

-      g_source_remove (priv->long_press_id);
-      priv->long_press_id = 0;
+      g_clear_handle_id (&priv->long_press_id, g_source_remove);

      g_signal_emit (action, click_signals[LONG_PRESS], 0,
                     actor,
@@ -375,17 +370,9 @@ on_captured_event (ClutterActor       *stage,
      click_action_cancel_long_press (action);

      /* disconnect the capture */
-      if (priv->capture_id != 0)
-        {
-          g_signal_handler_disconnect (priv->stage, priv->capture_id);
-          priv->capture_id = 0;
-        }
+      g_clear_signal_handler (&priv->capture_id, priv->stage);

-      if (priv->long_press_id != 0)
-        {
-          g_source_remove (priv->long_press_id);
-          priv->long_press_id = 0;
-        }
+      g_clear_handle_id (&priv->long_press_id, g_source_remove);

      if (!clutter_actor_contains (actor, clutter_event_get_source (event)))
        return CLUTTER_EVENT_PROPAGATE;
@@ -453,7 +440,7 @@ clutter_click_action_set_actor (ClutterActorMeta *meta,
      ClutterActor *old_actor = clutter_actor_meta_get_actor (meta);

      if (old_actor != NULL)
-        g_signal_handler_disconnect (old_actor, priv->event_id);
+        g_clear_signal_handler (&priv->event_id, old_actor);

      priv->event_id = 0;
    }
@@ -461,17 +448,13 @@ clutter_click_action_set_actor (ClutterActorMeta *meta,
  if (priv->capture_id != 0)
    {
      if (priv->stage != NULL)
-        g_signal_handler_disconnect (priv->stage, priv->capture_id);
+        g_clear_signal_handler (&priv->capture_id, priv->stage);

      priv->capture_id = 0;
      priv->stage = NULL;
    }

-  if (priv->long_press_id != 0)
-    {
-      g_source_remove (priv->long_press_id);
-      priv->long_press_id = 0;
-    }
+  g_clear_handle_id (&priv->long_press_id, g_source_remove);

  click_action_set_pressed (action, FALSE);
  click_action_set_held (action, FALSE);
@@ -545,24 +528,12 @@ clutter_click_action_dispose (GObject *gobject)
 {
  ClutterClickActionPrivate *priv = CLUTTER_CLICK_ACTION (gobject)->priv;

-  if (priv->event_id)
-    {
-      g_signal_handler_disconnect (clutter_actor_meta_get_actor (CLUTTER_ACTOR_META (gobject)),
-                                   priv->event_id);
-      priv->event_id = 0;
-    }
+  g_clear_signal_handler (&priv->event_id,
+                          clutter_actor_meta_get_actor (CLUTTER_ACTOR_META (gobject)));

-  if (priv->capture_id)
-    {
-      g_signal_handler_disconnect (priv->stage, priv->capture_id);
-      priv->capture_id = 0;
-    }
+  g_clear_signal_handler (&priv->capture_id, priv->stage);

-  if (priv->long_press_id)
-    {
-      g_source_remove (priv->long_press_id);
-      priv->long_press_id = 0;
-    }
+  g_clear_handle_id (&priv->long_press_id, g_source_remove);

  G_OBJECT_CLASS (clutter_click_action_parent_class)->dispose (gobject);
 }
@@ -760,11 +731,7 @@ clutter_click_action_release (ClutterClickAction *action)
    return;

  /* disconnect the capture */
-  if (priv->capture_id != 0)
-    {
-      g_signal_handler_disconnect (priv->stage, priv->capture_id);
-      priv->capture_id = 0;
-    }
+  g_clear_signal_handler (&priv->capture_id, priv->stage);

  click_action_cancel_long_press (action);
  click_action_set_held (action, FALSE);
--- a/clutter/clutter/clutter-clone.c
+++ b/clutter/clutter/clutter-clone.c
@@ -152,7 +152,8 @@ clutter_clone_apply_transform (ClutterActor *self, CoglMatrix *matrix)
 }

 static void
-clutter_clone_paint (ClutterActor *actor)
+clutter_clone_paint (ClutterActor        *actor,
+                     ClutterPaintContext *paint_context)
 {
  ClutterClone *self = CLUTTER_CLONE (actor);
  ClutterClonePrivate *priv = self->priv;
@@ -189,7 +190,7 @@ clutter_clone_paint (ClutterActor *actor)
  if (clutter_actor_is_realized (priv->clone_source))
    {
      _clutter_actor_push_clone_paint ();
-      clutter_actor_paint (priv->clone_source);
+      clutter_actor_paint (priv->clone_source, paint_context);
      _clutter_actor_pop_clone_paint ();
    }

@@ -400,8 +401,7 @@ clutter_clone_set_source_internal (ClutterClone *self,

  if (priv->clone_source != NULL)
    {
-      g_signal_handler_disconnect (priv->clone_source, priv->source_destroy_id);
-      priv->source_destroy_id = 0;
+      g_clear_signal_handler (&priv->source_destroy_id, priv->clone_source);
      _clutter_actor_detach_clone (priv->clone_source, CLUTTER_ACTOR (self));
      g_object_unref (priv->clone_source);
      priv->clone_source = NULL;
--- a/clutter/clutter/clutter-colorize-effect.c
+++ b/clutter/clutter/clutter-colorize-effect.c
@@ -105,7 +105,8 @@ G_DEFINE_TYPE (ClutterColorizeEffect,
               CLUTTER_TYPE_OFFSCREEN_EFFECT);

 static gboolean
-clutter_colorize_effect_pre_paint (ClutterEffect *effect)
+clutter_colorize_effect_pre_paint (ClutterEffect       *effect,
+                                   ClutterPaintContext *paint_context)
 {
  ClutterColorizeEffect *self = CLUTTER_COLORIZE_EFFECT (effect);
  ClutterEffectClass *parent_class;
@@ -126,7 +127,7 @@ clutter_colorize_effect_pre_paint (ClutterEffect *effect)
    }

  parent_class = CLUTTER_EFFECT_CLASS (clutter_colorize_effect_parent_class);
-  if (parent_class->pre_paint (effect))
+  if (parent_class->pre_paint (effect, paint_context))
    {
      ClutterOffscreenEffect *offscreen_effect =
        CLUTTER_OFFSCREEN_EFFECT (effect);
@@ -145,10 +146,12 @@ clutter_colorize_effect_pre_paint (ClutterEffect *effect)
 }

 static void
-clutter_colorize_effect_paint_target (ClutterOffscreenEffect *effect)
+clutter_colorize_effect_paint_target (ClutterOffscreenEffect *effect,
+                                      ClutterPaintContext    *paint_context)
 {
  ClutterColorizeEffect *self = CLUTTER_COLORIZE_EFFECT (effect);
-  CoglFramebuffer *framebuffer = cogl_get_draw_framebuffer ();
+  CoglFramebuffer *framebuffer =
+    clutter_paint_context_get_framebuffer (paint_context);
  ClutterActor *actor;
  guint8 paint_opacity;

--- a/clutter/clutter/clutter-constraint.c
+++ b/clutter/clutter/clutter-constraint.c
@@ -48,7 +48,7 @@
 * Constraints provide a way to build user interfaces by using
 * relations between #ClutterActors, without explicit fixed
 * positioning and sizing, similarly to how fluid layout managers like
- * #ClutterBoxLayout and #ClutterTableLayout lay out their children.
+ * #ClutterBoxLayout lay out their children.
 *
 * Constraints are attached to a #ClutterActor, and are available
 * for inspection using clutter_actor_get_constraints().
--- a/clutter/clutter/clutter-container.c
+++ b/clutter/clutter/clutter-container.c
@@ -384,33 +384,6 @@ clutter_container_add_actor (ClutterContainer *container,
  container_add_actor (container, actor);
 }

-/**
- * clutter_container_add_valist: (skip)
- * @container: a #ClutterContainer
- * @first_actor: the first #ClutterActor to add
- * @var_args: list of actors to add, followed by %NULL
- *
- * Alternative va_list version of clutter_container_add().
- *
- * This function will call #ClutterContainerIface.add(), which is a
- * deprecated virtual function. The default implementation will
- * call clutter_actor_add_child().
- *
- * Since: 0.4
- *
- * Deprecated: 1.10: Use clutter_actor_add_child() instead.
- */
-void
-clutter_container_add_valist (ClutterContainer *container,
-                              ClutterActor     *first_actor,
-                              va_list           var_args)
-{
-  g_return_if_fail (CLUTTER_IS_CONTAINER (container));
-  g_return_if_fail (CLUTTER_IS_ACTOR (first_actor));
-
-  container_add_valist (container, first_actor, var_args);
-}
-
 /**
 * clutter_container_remove: (skip)
 * @container: a #ClutterContainer
@@ -474,33 +447,6 @@ clutter_container_remove_actor (ClutterContainer *container,
  container_remove_actor (container, actor);
 }

-/**
- * clutter_container_remove_valist: (skip)
- * @container: a #ClutterContainer
- * @first_actor: the first #ClutterActor to add
- * @var_args: list of actors to remove, followed by %NULL
- *
- * Alternative va_list version of clutter_container_remove().
- *
- * This function will call #ClutterContainerIface.remove(), which is a
- * deprecated virtual function. The default implementation will call
- * clutter_actor_remove_child().
- *
- * Since: 0.4
- *
- * Deprecated: 1.10: Use clutter_actor_remove_child() instead.
- */
-void
-clutter_container_remove_valist (ClutterContainer *container,
-                                 ClutterActor     *first_actor,
-                                 va_list           var_args)
-{
-  g_return_if_fail (CLUTTER_IS_CONTAINER (container));
-  g_return_if_fail (CLUTTER_IS_ACTOR (first_actor));
-
-  container_remove_valist (container, first_actor, var_args);
-}
-
 /**
 * clutter_container_get_children:
 * @container: a #ClutterContainer
--- a/clutter/clutter/clutter-content-private.h
+++ b/clutter/clutter/clutter-content-private.h
@@ -34,9 +34,10 @@ void            _clutter_content_attached               (ClutterContent   *conte
 void            _clutter_content_detached               (ClutterContent   *content,
                                                         ClutterActor     *actor);

-void            _clutter_content_paint_content          (ClutterContent   *content,
-                                                         ClutterActor     *actor,
-                                                         ClutterPaintNode *node);
+void            _clutter_content_paint_content          (ClutterContent      *content,
+                                                         ClutterActor        *actor,
+                                                         ClutterPaintNode    *node,
+                                                         ClutterPaintContext *paint_context);

 G_END_DECLS

--- a/clutter/clutter/clutter-content.c
+++ b/clutter/clutter/clutter-content.c
@@ -96,9 +96,10 @@ clutter_content_real_invalidate_size (ClutterContent *content)
 }

 static void
-clutter_content_real_paint_content (ClutterContent   *content,
-                                    ClutterActor     *actor,
-                                    ClutterPaintNode *context)
+clutter_content_real_paint_content (ClutterContent      *content,
+                                    ClutterActor        *actor,
+                                    ClutterPaintNode    *context,
+                                    ClutterPaintContext *paint_context)
 {
 }

@@ -300,7 +301,8 @@ _clutter_content_detached (ClutterContent *content,
 * _clutter_content_paint_content:
 * @content: a #ClutterContent
 * @actor: a #ClutterActor
- * @context: a #ClutterPaintNode
+ * @node: a #ClutterPaintNode
+ * @paint_context: a #ClutterPaintContext
 *
 * Creates the render tree for the @content and @actor.
 *
@@ -308,11 +310,13 @@ _clutter_content_detached (ClutterContent *content,
 * virtual function.
 */
 void
-_clutter_content_paint_content (ClutterContent   *content,
-                                ClutterActor     *actor,
-                                ClutterPaintNode *node)
+_clutter_content_paint_content (ClutterContent      *content,
+                                ClutterActor        *actor,
+                                ClutterPaintNode    *node,
+                                ClutterPaintContext *paint_context)
 {
-  CLUTTER_CONTENT_GET_IFACE (content)->paint_content (content, actor, node);
+  CLUTTER_CONTENT_GET_IFACE (content)->paint_content (content, actor, node,
+                                                      paint_context);
 }

 /**
--- a/clutter/clutter/clutter-content.h
+++ b/clutter/clutter/clutter-content.h
@@ -65,9 +65,10 @@ struct _ClutterContentInterface
  gboolean      (* get_preferred_size)  (ClutterContent   *content,
                                         gfloat           *width,
                                         gfloat           *height);
-  void          (* paint_content)       (ClutterContent   *content,
-                                         ClutterActor     *actor,
-                                         ClutterPaintNode *node);
+  void          (* paint_content)       (ClutterContent      *content,
+                                         ClutterActor        *actor,
+                                         ClutterPaintNode    *node,
+                                         ClutterPaintContext *paint_context);

  void          (* attached)            (ClutterContent   *content,
                                         ClutterActor     *actor);
--- a/clutter/clutter/clutter-deform-effect.c
+++ b/clutter/clutter/clutter-deform-effect.c
@@ -147,7 +147,7 @@ clutter_deform_effect_set_actor (ClutterActorMeta *meta,
      ClutterActor *old_actor = clutter_actor_meta_get_actor (meta);

      if (old_actor != NULL)
-        g_signal_handler_disconnect (old_actor, priv->allocation_id);
+        g_clear_signal_handler (&priv->allocation_id, old_actor);

      priv->allocation_id = 0;
    }
@@ -166,14 +166,16 @@ clutter_deform_effect_set_actor (ClutterActorMeta *meta,
 }

 static void
-clutter_deform_effect_paint_target (ClutterOffscreenEffect *effect)
+clutter_deform_effect_paint_target (ClutterOffscreenEffect *effect,
+                                    ClutterPaintContext    *paint_context)
 {
  ClutterDeformEffect *self= CLUTTER_DEFORM_EFFECT (effect);
  ClutterDeformEffectPrivate *priv = self->priv;
  CoglHandle material;
  CoglPipeline *pipeline;
  CoglDepthState depth_state;
-  CoglFramebuffer *fb = cogl_get_draw_framebuffer ();
+  CoglFramebuffer *fb =
+    clutter_paint_context_get_framebuffer (paint_context);

  if (priv->is_dirty)
    {
--- a/clutter/clutter/clutter-deprecated.h
+++ b/clutter/clutter/clutter-deprecated.h
@@ -5,20 +5,13 @@

 #include "deprecated/clutter-actor.h"
 #include "deprecated/clutter-alpha.h"
-#include "deprecated/clutter-animatable.h"
 #include "deprecated/clutter-animation.h"
-#include "deprecated/clutter-bin-layout.h"
 #include "deprecated/clutter-box.h"
-#include "deprecated/clutter-cairo-texture.h"
 #include "deprecated/clutter-container.h"
 #include "deprecated/clutter-group.h"
-#include "deprecated/clutter-keysyms.h"
 #include "deprecated/clutter-rectangle.h"
-#include "deprecated/clutter-stage-manager.h"
 #include "deprecated/clutter-stage.h"
 #include "deprecated/clutter-state.h"
-#include "deprecated/clutter-table-layout.h"
-#include "deprecated/clutter-texture.h"
 #include "deprecated/clutter-timeline.h"

 #undef __CLUTTER_DEPRECATED_H_INSIDE__
--- a/clutter/clutter/clutter-desaturate-effect.c
+++ b/clutter/clutter/clutter-desaturate-effect.c
@@ -112,7 +112,8 @@ G_DEFINE_TYPE (ClutterDesaturateEffect,
               CLUTTER_TYPE_OFFSCREEN_EFFECT);

 static gboolean
-clutter_desaturate_effect_pre_paint (ClutterEffect *effect)
+clutter_desaturate_effect_pre_paint (ClutterEffect       *effect,
+                                     ClutterPaintContext *paint_context)
 {
  ClutterDesaturateEffect *self = CLUTTER_DESATURATE_EFFECT (effect);
  ClutterEffectClass *parent_class;
@@ -133,7 +134,7 @@ clutter_desaturate_effect_pre_paint (ClutterEffect *effect)
    }

  parent_class = CLUTTER_EFFECT_CLASS (clutter_desaturate_effect_parent_class);
-  if (parent_class->pre_paint (effect))
+  if (parent_class->pre_paint (effect, paint_context))
    {
      ClutterOffscreenEffect *offscreen_effect =
        CLUTTER_OFFSCREEN_EFFECT (effect);
@@ -152,10 +153,12 @@ clutter_desaturate_effect_pre_paint (ClutterEffect *effect)
 }

 static void
-clutter_desaturate_effect_paint_target (ClutterOffscreenEffect *effect)
+clutter_desaturate_effect_paint_target (ClutterOffscreenEffect *effect,
+                                        ClutterPaintContext    *paint_context)
 {
  ClutterDesaturateEffect *self = CLUTTER_DESATURATE_EFFECT (effect);
-  CoglFramebuffer *framebuffer = cogl_get_draw_framebuffer ();
+  CoglFramebuffer *framebuffer =
+   clutter_paint_context_get_framebuffer (paint_context);
  ClutterActor *actor;
  CoglHandle texture;
  guint8 paint_opacity;
--- a/clutter/clutter/clutter-drag-action.c
+++ b/clutter/clutter/clutter-drag-action.c
@@ -315,11 +315,7 @@ emit_drag_end (ClutterDragAction *action,
    goto out;

  /* disconnect the capture */
-  if (priv->capture_id != 0)
-    {
-      g_signal_handler_disconnect (priv->stage, priv->capture_id);
-      priv->capture_id = 0;
-    }
+  g_clear_signal_handler (&priv->capture_id, priv->stage);

  clutter_stage_set_motion_events_enabled (priv->stage,
                                           priv->motion_events_enabled);
@@ -478,8 +474,8 @@ clutter_drag_action_set_actor (ClutterActorMeta *meta,
      old_actor = clutter_actor_meta_get_actor (meta);
      if (old_actor != NULL)
        {
-          g_signal_handler_disconnect (old_actor, priv->button_press_id);
-          g_signal_handler_disconnect (old_actor, priv->touch_begin_id);
+          g_clear_signal_handler (&priv->button_press_id, old_actor);
+          g_clear_signal_handler (&priv->touch_begin_id, old_actor);
        }

      priv->button_press_id = 0;
@@ -489,7 +485,7 @@ clutter_drag_action_set_actor (ClutterActorMeta *meta,
  if (priv->capture_id != 0)
    {
      if (priv->stage != NULL)
-        g_signal_handler_disconnect (priv->stage, priv->capture_id);
+        g_clear_signal_handler (&priv->capture_id, priv->stage);

      priv->capture_id = 0;
      priv->stage = NULL;
@@ -668,7 +664,7 @@ clutter_drag_action_dispose (GObject *gobject)
                                               priv->motion_events_enabled);

      if (priv->stage != NULL)
-        g_signal_handler_disconnect (priv->stage, priv->capture_id);
+        g_clear_signal_handler (&priv->capture_id, priv->stage);

      priv->capture_id = 0;
      priv->stage = NULL;
@@ -681,8 +677,8 @@ clutter_drag_action_dispose (GObject *gobject)
      actor = clutter_actor_meta_get_actor (CLUTTER_ACTOR_META (gobject));
      if (actor != NULL)
        {
-          g_signal_handler_disconnect (actor, priv->button_press_id);
-          g_signal_handler_disconnect (actor, priv->touch_begin_id);
+          g_clear_signal_handler (&priv->button_press_id, actor);
+          g_clear_signal_handler (&priv->touch_begin_id, actor);
        }

      priv->button_press_id = 0;
--- a/clutter/clutter/clutter-drop-action.c
+++ b/clutter/clutter/clutter-drop-action.c
@@ -107,7 +107,7 @@ drop_target_free (gpointer _data)
 {
  DropTarget *data = _data;

-  g_signal_handler_disconnect (data->stage, data->capture_id);
+  g_clear_signal_handler (&data->capture_id, data->stage);
  g_hash_table_destroy (data->actions);
  g_free (data);
 }
@@ -326,12 +326,10 @@ clutter_drop_action_set_actor (ClutterActorMeta *meta,
    {
      drop_action_unregister (CLUTTER_DROP_ACTION (meta));

-      if (priv->mapped_id != 0)
-        g_signal_handler_disconnect (priv->actor, priv->mapped_id);
+      g_clear_signal_handler (&priv->mapped_id, priv->actor);

      priv->stage = NULL;
      priv->actor = NULL;
-      priv->mapped_id = 0;
    }

  priv->actor = actor;
--- a/clutter/clutter/clutter-effect-private.h
+++ b/clutter/clutter/clutter-effect-private.h
@@ -5,14 +5,18 @@

 G_BEGIN_DECLS

-gboolean        _clutter_effect_pre_paint               (ClutterEffect           *effect);
-void            _clutter_effect_post_paint              (ClutterEffect           *effect);
+gboolean        _clutter_effect_pre_paint               (ClutterEffect           *effect,
+                                                         ClutterPaintContext     *paint_context);
+void            _clutter_effect_post_paint              (ClutterEffect           *effect,
+                                                         ClutterPaintContext     *paint_context);
 gboolean        _clutter_effect_modify_paint_volume     (ClutterEffect           *effect,
                                                         ClutterPaintVolume      *volume);
 gboolean        _clutter_effect_has_custom_paint_volume (ClutterEffect           *effect);
 void            _clutter_effect_paint                   (ClutterEffect           *effect,
+                                                         ClutterPaintContext     *paint_context,
                                                         ClutterEffectPaintFlags  flags);
-void            _clutter_effect_pick                    (ClutterEffect           *effect);
+void            _clutter_effect_pick                    (ClutterEffect           *effect,
+                                                         ClutterPickContext      *pick_context);

 G_END_DECLS

--- a/clutter/clutter/clutter-effect.c
+++ b/clutter/clutter/clutter-effect.c
@@ -177,13 +177,15 @@ G_DEFINE_ABSTRACT_TYPE (ClutterEffect,
                        CLUTTER_TYPE_ACTOR_META);

 static gboolean
-clutter_effect_real_pre_paint (ClutterEffect *effect)
+clutter_effect_real_pre_paint (ClutterEffect       *effect,
+                               ClutterPaintContext *paint_context)
 {
  return TRUE;
 }

 static void
-clutter_effect_real_post_paint (ClutterEffect *effect)
+clutter_effect_real_post_paint (ClutterEffect       *effect,
+                                ClutterPaintContext *paint_context)
 {
 }

@@ -196,6 +198,7 @@ clutter_effect_real_modify_paint_volume (ClutterEffect      *effect,

 static void
 clutter_effect_real_paint (ClutterEffect           *effect,
+                           ClutterPaintContext     *paint_context,
                           ClutterEffectPaintFlags  flags)
 {
  ClutterActorMeta *actor_meta = CLUTTER_ACTOR_META (effect);
@@ -206,23 +209,24 @@ clutter_effect_real_paint (ClutterEffect           *effect,
     effects that haven't migrated to use the 'paint' virtual yet. This
     just calls the old pre and post virtuals before chaining on */

-  pre_paint_succeeded = _clutter_effect_pre_paint (effect);
+  pre_paint_succeeded = _clutter_effect_pre_paint (effect, paint_context);

  actor = clutter_actor_meta_get_actor (actor_meta);
-  clutter_actor_continue_paint (actor);
+  clutter_actor_continue_paint (actor, paint_context);

  if (pre_paint_succeeded)
-    _clutter_effect_post_paint (effect);
+    _clutter_effect_post_paint (effect, paint_context);
 }

 static void
-clutter_effect_real_pick (ClutterEffect *effect)
+clutter_effect_real_pick (ClutterEffect      *effect,
+                          ClutterPickContext *pick_context)
 {
  ClutterActorMeta *actor_meta = CLUTTER_ACTOR_META (effect);
  ClutterActor *actor;

  actor = clutter_actor_meta_get_actor (actor_meta);
-  clutter_actor_continue_pick (actor);
+  clutter_actor_continue_pick (actor, pick_context);
 }

 static void
@@ -262,36 +266,40 @@ clutter_effect_init (ClutterEffect *self)
 }

 gboolean
-_clutter_effect_pre_paint (ClutterEffect *effect)
+_clutter_effect_pre_paint (ClutterEffect       *effect,
+                           ClutterPaintContext *paint_context)
 {
  g_return_val_if_fail (CLUTTER_IS_EFFECT (effect), FALSE);

-  return CLUTTER_EFFECT_GET_CLASS (effect)->pre_paint (effect);
+  return CLUTTER_EFFECT_GET_CLASS (effect)->pre_paint (effect, paint_context);
 }

 void
-_clutter_effect_post_paint (ClutterEffect *effect)
+_clutter_effect_post_paint (ClutterEffect       *effect,
+                            ClutterPaintContext *paint_context)
 {
  g_return_if_fail (CLUTTER_IS_EFFECT (effect));

-  CLUTTER_EFFECT_GET_CLASS (effect)->post_paint (effect);
+  CLUTTER_EFFECT_GET_CLASS (effect)->post_paint (effect, paint_context);
 }

 void
 _clutter_effect_paint (ClutterEffect           *effect,
+                       ClutterPaintContext     *paint_context,
                       ClutterEffectPaintFlags  flags)
 {
  g_return_if_fail (CLUTTER_IS_EFFECT (effect));

-  CLUTTER_EFFECT_GET_CLASS (effect)->paint (effect, flags);
+  CLUTTER_EFFECT_GET_CLASS (effect)->paint (effect, paint_context, flags);
 }

 void
-_clutter_effect_pick (ClutterEffect *effect)
+_clutter_effect_pick (ClutterEffect      *effect,
+                      ClutterPickContext *pick_context)
 {
  g_return_if_fail (CLUTTER_IS_EFFECT (effect));

-  CLUTTER_EFFECT_GET_CLASS (effect)->pick (effect);
+  CLUTTER_EFFECT_GET_CLASS (effect)->pick (effect, pick_context);
 }

 gboolean
--- a/clutter/clutter/clutter-effect.h
+++ b/clutter/clutter/clutter-effect.h
@@ -30,6 +30,8 @@
 #endif

 #include <clutter/clutter-actor-meta.h>
+#include <clutter/clutter-paint-context.h>
+#include <clutter/clutter-pick-context.h>

 G_BEGIN_DECLS

@@ -74,15 +76,19 @@ struct _ClutterEffectClass
  ClutterActorMetaClass parent_class;

  /*< public >*/
-  gboolean (* pre_paint)           (ClutterEffect           *effect);
-  void     (* post_paint)          (ClutterEffect           *effect);
+  gboolean (* pre_paint)           (ClutterEffect           *effect,
+                                    ClutterPaintContext     *paint_context);
+  void     (* post_paint)          (ClutterEffect           *effect,
+                                    ClutterPaintContext     *paint_context);

  gboolean (* modify_paint_volume) (ClutterEffect           *effect,
                                    ClutterPaintVolume      *volume);

  void     (* paint)               (ClutterEffect           *effect,
+                                    ClutterPaintContext     *paint_context,
                                    ClutterEffectPaintFlags  flags);
-  void     (* pick)                (ClutterEffect           *effect);
+  void     (* pick)                (ClutterEffect           *effect,
+                                    ClutterPickContext      *pick_context);

  /*< private >*/
  void (* _clutter_effect4) (void);
--- a/clutter/clutter/clutter-enums.h
+++ b/clutter/clutter/clutter-enums.h
@@ -1183,29 +1183,6 @@ typedef enum /*< prefix=CLUTTER_PAN >*/
  CLUTTER_PAN_AXIS_AUTO
 } ClutterPanAxis;

-
-/**
- * ClutterTableAlignment:
- * @CLUTTER_TABLE_ALIGNMENT_START: Align the child to the top or to the
- *   left of a cell in the table, depending on the axis
- * @CLUTTER_TABLE_ALIGNMENT_CENTER: Align the child to the center of
- *   a cell in the table
- * @CLUTTER_TABLE_ALIGNMENT_END: Align the child to the bottom or to the
- *   right of a cell in the table, depending on the axis
- *
- * The alignment policies available on each axis of the #ClutterTableLayout
- *
- * Since: 1.4
- *
- * Deprecated: 1.22: Use the alignment properties of #ClutterActor
- */
-typedef enum
-{
-  CLUTTER_TABLE_ALIGNMENT_START,
-  CLUTTER_TABLE_ALIGNMENT_CENTER,
-  CLUTTER_TABLE_ALIGNMENT_END
-} ClutterTableAlignment;
-
 /**
 * ClutterTextureFlags:
 * @CLUTTER_TEXTURE_NONE: No flags
--- a/clutter/clutter/clutter-gesture-action.c
+++ b/clutter/clutter/clutter-gesture-action.c
@@ -118,7 +118,7 @@ struct _ClutterGestureActionPrivate
  gint requested_nb_points;
  GArray *points;

-  guint actor_capture_id;
+  gulong actor_capture_id;
  gulong stage_capture_id;

  ClutterGestureTriggerEdge edge;
@@ -308,11 +308,7 @@ cancel_gesture (ClutterGestureAction *action)

  priv->in_gesture = FALSE;

-  if (priv->stage_capture_id != 0)
-    {
-      g_signal_handler_disconnect (priv->stage, priv->stage_capture_id);
-      priv->stage_capture_id = 0;
-    }
+  g_clear_signal_handler (&priv->stage_capture_id, priv->stage);

  actor = clutter_actor_meta_get_actor (CLUTTER_ACTOR_META (action));
  g_signal_emit (action, gesture_signals[GESTURE_CANCEL], 0, actor);
@@ -481,11 +477,8 @@ stage_captured_event_cb (ClutterActor         *stage,
      break;
    }

-  if (priv->points->len == 0 && priv->stage_capture_id)
-    {
-      g_signal_handler_disconnect (priv->stage, priv->stage_capture_id);
-      priv->stage_capture_id = 0;
-    }
+  if (priv->points->len == 0)
+    g_clear_signal_handler (&priv->stage_capture_id, priv->stage);

  return CLUTTER_EVENT_PROPAGATE;
 }
@@ -538,7 +531,7 @@ clutter_gesture_action_set_actor (ClutterActorMeta *meta,
      ClutterActor *old_actor = clutter_actor_meta_get_actor (meta);

      if (old_actor != NULL)
-        g_signal_handler_disconnect (old_actor, priv->actor_capture_id);
+        g_clear_signal_handler (&priv->actor_capture_id, old_actor);

      priv->actor_capture_id = 0;
    }
@@ -546,7 +539,7 @@ clutter_gesture_action_set_actor (ClutterActorMeta *meta,
  if (priv->stage_capture_id != 0)
    {
      if (priv->stage != NULL)
-        g_signal_handler_disconnect (priv->stage, priv->stage_capture_id);
+        g_clear_signal_handler (&priv->stage_capture_id, priv->stage);

      priv->stage_capture_id = 0;
      priv->stage = NULL;
--- a/clutter/clutter/clutter-grid-layout.c
+++ b/clutter/clutter/clutter-grid-layout.c
@@ -44,12 +44,12 @@
 * SECTION:clutter-grid-layout
 * @Short_description: A layout manager for a grid of actors
 * @Title: ClutterGridLayout
- * @See_also: #ClutterTableLayout, #ClutterBoxLayout
+ * @See_also: #ClutterBoxLayout
 *
 * #ClutterGridLayout is a layout manager which arranges its child widgets in
- * rows and columns. It is a very similar to #ClutterTableLayout and
- * #ClutterBoxLayout, but it consistently uses #ClutterActor's
- * alignment and expansion flags instead of custom child properties.
+ * rows and columns. It is a very similar to #ClutterBoxLayout, but it
+ * consistently uses #ClutterActor's alignment and expansion flags instead of
+ * custom child properties.
 *
 * Children are added using clutter_grid_layout_attach(). They can span
 * multiple rows or columns. It is also possible to add a child next to an
--- a/clutter/clutter/clutter-image.c
+++ b/clutter/clutter/clutter-image.c
@@ -118,9 +118,10 @@ clutter_image_init (ClutterImage *self)
 }

 static void
-clutter_image_paint_content (ClutterContent   *content,
-                             ClutterActor     *actor,
-                             ClutterPaintNode *root)
+clutter_image_paint_content (ClutterContent      *content,
+                             ClutterActor        *actor,
+                             ClutterPaintNode    *root,
+                             ClutterPaintContext *paint_context)
 {
  ClutterImagePrivate *priv = CLUTTER_IMAGE (content)->priv;
  ClutterPaintNode *node;
--- a/clutter/clutter/clutter-input-pointer-a11y.c
+++ b/clutter/clutter/clutter-input-pointer-a11y.c
@@ -197,8 +197,8 @@ stop_secondary_click_timeout (ClutterInputDevice *device)
 {
  if (device->ptr_a11y_data->secondary_click_timer)
    {
-      g_source_remove (device->ptr_a11y_data->secondary_click_timer);
-      device->ptr_a11y_data->secondary_click_timer = 0;
+      g_clear_handle_id (&device->ptr_a11y_data->secondary_click_timer,
+                         g_source_remove);

      g_signal_emit_by_name (device->device_manager,
                             "ptr-a11y-timeout-stopped",
@@ -511,8 +511,7 @@ stop_dwell_timeout (ClutterInputDevice *device)
 {
  if (device->ptr_a11y_data->dwell_timer)
    {
-      g_source_remove (device->ptr_a11y_data->dwell_timer);
-      device->ptr_a11y_data->dwell_timer = 0;
+      g_clear_handle_id (&device->ptr_a11y_data->dwell_timer, g_source_remove);
      device->ptr_a11y_data->dwell_gesture_started = FALSE;

      g_signal_emit_by_name (device->device_manager,
--- a/clutter/clutter/clutter-keysyms-update.pl
+++ b/clutter/clutter/clutter-keysyms-update.pl
@@ -58,10 +58,6 @@ die "Could not open file keysymdef.h: $!\n"
 die "Could not open file clutter-keysyms.h: $!\n"
    unless open(OUT_KEYSYMS, ">:utf8", "clutter-keysyms.h");

-# Output: clutter/clutter/deprecated/clutter-keysyms.h
-die "Could not open file clutter-keysyms-compat.h: $!\n"
-    unless open(OUT_KEYSYMS_COMPAT, ">:utf8", "deprecated/clutter-keysyms.h");
-
 my $LICENSE_HEADER= <<EOF;
 /* Clutter
 *
@@ -85,7 +81,6 @@ my $LICENSE_HEADER= <<EOF;
 EOF

 print OUT_KEYSYMS $LICENSE_HEADER;
-print OUT_KEYSYMS_COMPAT $LICENSE_HEADER;

 print OUT_KEYSYMS<<EOF;

@@ -104,23 +99,6 @@ print OUT_KEYSYMS<<EOF;

 EOF

-print OUT_KEYSYMS_COMPAT<<EOF;
-/*
- * Compatibility version of clutter-keysyms.h.
- *
- * Since Clutter 1.4, the key symbol defines have been changed to have
- * a KEY_ prefix. This is a compatibility header that is included when
- * deprecated symbols are enabled. Consider porting to the new names
- * instead.
- */
-
-#ifndef __CLUTTER_KEYSYMS_DEPRECATED_H__
-#define __CLUTTER_KEYSYMS_DEPRECATED_H__
-
-#ifndef CLUTTER_DISABLE_DEPRECATED
-
-EOF
-
 while (<IN_KEYSYMDEF>)
 {
 	next if ( ! /^#define / );
@@ -137,13 +115,8 @@ while (<IN_KEYSYMDEF>)
 	my $element = $keysymelements[1];
 	my $binding = $element;
 	$binding =~ s/^XK_/CLUTTER_KEY_/g;
-	my $compat_binding = $element;
-	$compat_binding =~ s/^XK_/CLUTTER_/g;
-
-	my $deprecation = "CLUTTER_DEPRECATED_MACRO_FOR(\"Deprecated key symbol. Use $binding instead.\")";

 	printf OUT_KEYSYMS "#define %s 0x%03x\n", $binding, hex($keysymelements[2]);
-	printf OUT_KEYSYMS_COMPAT "#define %s 0x%03x %s\n", $compat_binding, hex($keysymelements[2]), $deprecation;
 }

 close IN_KEYSYMDEF;
@@ -187,11 +160,8 @@ while (<IN_XF86KEYSYM>)
 	my $element = $keysymelements[1];
 	my $binding = $element;
 	$binding =~ s/^XF86XK_/CLUTTER_KEY_/g;
-	my $compat_binding = $element;
-	$compat_binding =~ s/^XF86XK_/CLUTTER_/g;

 	printf OUT_KEYSYMS "#define %s 0x%03x\n", $binding, hex($keysymelements[2]);
-	printf OUT_KEYSYMS_COMPAT "#define %s 0x%03x\n", $compat_binding, hex($keysymelements[2]);
 }

 close IN_XF86KEYSYM;
@@ -202,13 +172,6 @@ print OUT_KEYSYMS<<EOF;
 #endif /* __CLUTTER_KEYSYMS_H__ */
 EOF

-print OUT_KEYSYMS_COMPAT<<EOF;
-
-#endif /* CLUTTER_DISABLE_DEPRECATED */
-
-#endif /* __CLUTTER_KEYSYMS_DEPRECATED_H__ */
-EOF
-
 foreach my $f (qw/ keysymdef.h XF86keysym.h /) {
    unlink $f or die "Unable to delete $f: $!";
 }
--- a/clutter/clutter/clutter-layout-manager.c
+++ b/clutter/clutter/clutter-layout-manager.c
@@ -98,11 +98,11 @@
 * |[
 * {
 *   "type" : "ClutterBox",
- *   "layout-manager" : { "type" : "ClutterTableLayout" },
+ *   "layout-manager" : { "type" : "ClutterGridLayout" },
 *   "children" : [
 *     {
- *       "type" : "ClutterTexture",
- *       "filename" : "image-00.png",
+ *       "type" : "ClutterText",
+ *       "text" : "Some text",
 *
 *       "layout::row" : 0,
 *       "layout::column" : 0,
@@ -112,8 +112,8 @@
 *       "layout::y-expand" : true
 *     },
 *     {
- *       "type" : "ClutterTexture",
- *       "filename" : "image-01.png",
+ *       "type" : "ClutterText",
+ *       "text" : "Some more text",
 *
 *       "layout::row" : 0,
 *       "layout::column" : 1,
--- a/clutter/clutter/clutter-main.c
+++ b/clutter/clutter/clutter-main.c
@@ -2311,8 +2311,7 @@ clutter_threads_remove_repaint_func (guint handle_id)
 * that it does not block, otherwise the frame time budget may be lost.
 *
 * A repaint function is useful to ensure that an update of the scenegraph
- * is performed before the scenegraph is repainted; for instance, uploading
- * a frame from a video into a #ClutterTexture. By default, a repaint
+ * is performed before the scenegraph is repainted. By default, a repaint
 * function added using this function will be invoked prior to the frame
 * being processed.
 *
@@ -2361,8 +2360,7 @@ clutter_threads_add_repaint_func (GSourceFunc    func,
 * that it does not block, otherwise the frame time budget may be lost.
 *
 * A repaint function is useful to ensure that an update of the scenegraph
- * is performed before the scenegraph is repainted; for instance, uploading
- * a frame from a video into a #ClutterTexture. The @flags passed to this
+ * is performed before the scenegraph is repainted. The @flags passed to this
 * function will determine the section of the frame processing that will
 * result in @func being called.
 *
--- a/clutter/clutter/clutter-offscreen-effect.c
+++ b/clutter/clutter/clutter-offscreen-effect.c
@@ -74,6 +74,7 @@
 #include "clutter-debug.h"
 #include "clutter-private.h"
 #include "clutter-stage-private.h"
+#include "clutter-paint-context-private.h"
 #include "clutter-paint-volume-private.h"
 #include "clutter-actor-box-private.h"

@@ -117,11 +118,7 @@ clutter_offscreen_effect_set_actor (ClutterActorMeta *meta,
  meta_class->set_actor (meta, actor);

  /* clear out the previous state */
-  if (priv->offscreen != NULL)
-    {
-      cogl_object_unref (priv->offscreen);
-      priv->offscreen = NULL;
-    }
+  g_clear_pointer (&priv->offscreen, cogl_object_unref);

  /* we keep a back pointer here, to avoid going through the ActorMeta */
  priv->actor = clutter_actor_meta_get_actor (meta);
@@ -197,17 +194,8 @@ update_fbo (ClutterEffect *effect,
      ensure_pipeline_filter_for_scale (self, resource_scale);
    }

-  if (priv->texture != NULL)
-    {
-      cogl_object_unref (priv->texture);
-      priv->texture = NULL;
-    }
-
-  if (priv->offscreen != NULL)
-    {
-      cogl_object_unref (priv->offscreen);
-      priv->offscreen = NULL;
-    }
+  g_clear_pointer (&priv->texture, cogl_object_unref);
+  g_clear_pointer (&priv->offscreen, cogl_object_unref);

  priv->texture =
    clutter_offscreen_effect_create_texture (self, target_width, target_height);
@@ -237,7 +225,8 @@ update_fbo (ClutterEffect *effect,
 }

 static gboolean
-clutter_offscreen_effect_pre_paint (ClutterEffect *effect)
+clutter_offscreen_effect_pre_paint (ClutterEffect       *effect,
+                                    ClutterPaintContext *paint_context)
 {
  ClutterOffscreenEffect *self = CLUTTER_OFFSCREEN_EFFECT (effect);
  ClutterOffscreenEffectPrivate *priv = self->priv;
@@ -248,6 +237,7 @@ clutter_offscreen_effect_pre_paint (ClutterEffect *effect)
  CoglColor transparent;
  gfloat stage_width, stage_height;
  gfloat target_width = -1, target_height = -1;
+  CoglFramebuffer *framebuffer;
  gfloat resource_scale;
  gfloat ceiled_resource_scale;
  graphene_point3d_t local_offset;
@@ -312,10 +302,10 @@ clutter_offscreen_effect_pre_paint (ClutterEffect *effect)
  if (!update_fbo (effect, target_width, target_height, resource_scale))
    return FALSE;

-  cogl_get_modelview_matrix (&old_modelview);
+  framebuffer = clutter_paint_context_get_framebuffer (paint_context);
+  cogl_framebuffer_get_modelview_matrix (framebuffer, &old_modelview);

-  /* let's draw offscreen */
-  cogl_push_framebuffer (priv->offscreen);
+  clutter_paint_context_push_framebuffer (paint_context, priv->offscreen);

  /* We don't want the FBO contents to be transformed. That could waste memory
   * (e.g. during zoom), or result in something that's not rectangular (clipped
@@ -325,7 +315,7 @@ clutter_offscreen_effect_pre_paint (ClutterEffect *effect)
   * contents on screen...
   */
  clutter_actor_get_transform (priv->stage, &modelview);
-  cogl_set_modelview_matrix (&modelview);
+  cogl_framebuffer_set_modelview_matrix (priv->offscreen, &modelview);

  /* Save the original viewport for calculating priv->position */
  _clutter_stage_get_viewport (CLUTTER_STAGE (priv->stage),
@@ -337,10 +327,11 @@ clutter_offscreen_effect_pre_paint (ClutterEffect *effect)
  /* Set up the viewport so that it has the same size as the stage (avoid
   * distortion), but translated to account for the FBO offset...
   */
-  cogl_set_viewport (-priv->fbo_offset_x,
-                     -priv->fbo_offset_y,
-                     stage_width,
-                     stage_height);
+  cogl_framebuffer_set_viewport (priv->offscreen,
+                                 -priv->fbo_offset_x,
+                                 -priv->fbo_offset_y,
+                                 stage_width,
+                                 stage_height);

  /* Copy the stage's projection matrix across to the framebuffer */
  _clutter_stage_get_projection_matrix (CLUTTER_STAGE (priv->stage),
@@ -357,14 +348,15 @@ clutter_offscreen_effect_pre_paint (ClutterEffect *effect)
                                          &priv->position,
                                          1);

-  cogl_set_projection_matrix (&projection);
+  cogl_framebuffer_set_projection_matrix (priv->offscreen, &projection);

  cogl_color_init_from_4ub (&transparent, 0, 0, 0, 0);
-  cogl_clear (&transparent,
-              COGL_BUFFER_BIT_COLOR |
-              COGL_BUFFER_BIT_DEPTH);
+  cogl_framebuffer_clear (priv->offscreen,
+                          COGL_BUFFER_BIT_COLOR |
+                          COGL_BUFFER_BIT_DEPTH,
+                          &transparent);

-  cogl_push_matrix ();
+  cogl_framebuffer_push_matrix (priv->offscreen);

  /* Override the actor's opacity to fully opaque - we paint the offscreen
   * texture with the actor's paint opacity, so we need to do this to avoid
@@ -378,10 +370,12 @@ clutter_offscreen_effect_pre_paint (ClutterEffect *effect)
 }

 static void
-clutter_offscreen_effect_real_paint_target (ClutterOffscreenEffect *effect)
+clutter_offscreen_effect_real_paint_target (ClutterOffscreenEffect *effect,
+                                            ClutterPaintContext    *paint_context)
 {
  ClutterOffscreenEffectPrivate *priv = effect->priv;
-  CoglFramebuffer *framebuffer = cogl_get_draw_framebuffer ();
+  CoglFramebuffer *framebuffer =
+    clutter_paint_context_get_framebuffer (paint_context);
  guint8 paint_opacity;

  paint_opacity = clutter_actor_get_paint_opacity (priv->actor);
@@ -407,18 +401,21 @@ clutter_offscreen_effect_real_paint_target (ClutterOffscreenEffect *effect)
 }

 static void
-clutter_offscreen_effect_paint_texture (ClutterOffscreenEffect *effect)
+clutter_offscreen_effect_paint_texture (ClutterOffscreenEffect *effect,
+                                        ClutterPaintContext    *paint_context)
 {
  ClutterOffscreenEffectPrivate *priv = effect->priv;
+  CoglFramebuffer *framebuffer =
+    clutter_paint_context_get_framebuffer (paint_context);
  CoglMatrix modelview;
  float resource_scale;

-  cogl_push_matrix ();
+  cogl_framebuffer_push_matrix (framebuffer);

  /* The current modelview matrix is *almost* perfect already. It's only
   * missing a correction for the expanded FBO and offset rendering within...
   */
-  cogl_get_modelview_matrix (&modelview);
+  cogl_framebuffer_get_modelview_matrix (framebuffer, &modelview);

  if (clutter_actor_get_resource_scale (priv->actor, &resource_scale) &&
      resource_scale != 1.0f)
@@ -431,21 +428,23 @@ clutter_offscreen_effect_paint_texture (ClutterOffscreenEffect *effect)
                         priv->fbo_offset_x,
                         priv->fbo_offset_y,
                         0.0f);
-  cogl_set_modelview_matrix (&modelview);
+  cogl_framebuffer_set_modelview_matrix (framebuffer, &modelview);

  /* paint the target material; this is virtualized for
   * sub-classes that require special hand-holding
   */
-  clutter_offscreen_effect_paint_target (effect);
+  clutter_offscreen_effect_paint_target (effect, paint_context);

-  cogl_pop_matrix ();
+  cogl_framebuffer_pop_matrix (framebuffer);
 }

 static void
-clutter_offscreen_effect_post_paint (ClutterEffect *effect)
+clutter_offscreen_effect_post_paint (ClutterEffect       *effect,
+                                     ClutterPaintContext *paint_context)
 {
  ClutterOffscreenEffect *self = CLUTTER_OFFSCREEN_EFFECT (effect);
  ClutterOffscreenEffectPrivate *priv = self->priv;
+  CoglFramebuffer *framebuffer;

  if (priv->offscreen == NULL ||
      priv->target == NULL ||
@@ -455,14 +454,16 @@ clutter_offscreen_effect_post_paint (ClutterEffect *effect)
  /* Restore the previous opacity override */
  clutter_actor_set_opacity_override (priv->actor, priv->old_opacity_override);

-  cogl_pop_matrix ();
-  cogl_pop_framebuffer ();
+  framebuffer = clutter_paint_context_get_framebuffer (paint_context);
+  cogl_framebuffer_pop_matrix (framebuffer);
+  clutter_paint_context_pop_framebuffer (paint_context);

-  clutter_offscreen_effect_paint_texture (self);
+  clutter_offscreen_effect_paint_texture (self, paint_context);
 }

 static void
 clutter_offscreen_effect_paint (ClutterEffect           *effect,
+                                ClutterPaintContext     *paint_context,
                                ClutterEffectPaintFlags  flags)
 {
  ClutterOffscreenEffect *self = CLUTTER_OFFSCREEN_EFFECT (effect);
@@ -473,13 +474,33 @@ clutter_offscreen_effect_paint (ClutterEffect           *effect,
   */
  if (priv->offscreen == NULL || (flags & CLUTTER_EFFECT_PAINT_ACTOR_DIRTY))
    {
-      /* Chain up to the parent paint method which will call the pre and
-         post paint functions to update the image */
-      CLUTTER_EFFECT_CLASS (clutter_offscreen_effect_parent_class)->
-        paint (effect, flags);
+      ClutterEffectClass *effect_class = CLUTTER_EFFECT_GET_CLASS (effect);
+      gboolean pre_paint_succeeded;
+
+      pre_paint_succeeded = effect_class->pre_paint (effect, paint_context);
+
+      clutter_actor_continue_paint (priv->actor, paint_context);
+
+      if (pre_paint_succeeded)
+        effect_class->post_paint (effect, paint_context);
+      else
+        g_clear_pointer (&priv->offscreen, cogl_object_unref);
    }
  else
-    clutter_offscreen_effect_paint_texture (self);
+    clutter_offscreen_effect_paint_texture (self, paint_context);
+}
+
+static void
+clutter_offscreen_effect_notify (GObject    *gobject,
+                                 GParamSpec *pspec)
+{
+  ClutterOffscreenEffect *offscreen_effect = CLUTTER_OFFSCREEN_EFFECT (gobject);
+  ClutterOffscreenEffectPrivate *priv = offscreen_effect->priv;
+
+  if (strcmp (pspec->name, "enabled") == 0)
+    g_clear_pointer (&priv->offscreen, cogl_object_unref);
+
+  G_OBJECT_CLASS (clutter_offscreen_effect_parent_class)->notify (gobject, pspec);
 }

 static void
@@ -488,14 +509,9 @@ clutter_offscreen_effect_finalize (GObject *gobject)
  ClutterOffscreenEffect *self = CLUTTER_OFFSCREEN_EFFECT (gobject);
  ClutterOffscreenEffectPrivate *priv = self->priv;

-  if (priv->offscreen)
-    cogl_object_unref (priv->offscreen);
-
-  if (priv->target)
-    cogl_object_unref (priv->target);
-
-  if (priv->texture)
-    cogl_object_unref (priv->texture);
+  g_clear_pointer (&priv->offscreen, cogl_object_unref);
+  g_clear_pointer (&priv->texture, cogl_object_unref);
+  g_clear_pointer (&priv->target, cogl_object_unref);

  G_OBJECT_CLASS (clutter_offscreen_effect_parent_class)->finalize (gobject);
 }
@@ -517,6 +533,7 @@ clutter_offscreen_effect_class_init (ClutterOffscreenEffectClass *klass)
  effect_class->paint = clutter_offscreen_effect_paint;

  gobject_class->finalize = clutter_offscreen_effect_finalize;
+  gobject_class->notify = clutter_offscreen_effect_notify;
 }

 static void
@@ -582,17 +599,20 @@ clutter_offscreen_effect_get_target (ClutterOffscreenEffect *effect)
 /**
 * clutter_offscreen_effect_paint_target:
 * @effect: a #ClutterOffscreenEffect
+ * @paint_context: a #ClutterPaintContext
 *
 * Calls the paint_target() virtual function of the @effect
 *
 * Since: 1.4
 */
 void
-clutter_offscreen_effect_paint_target (ClutterOffscreenEffect *effect)
+clutter_offscreen_effect_paint_target (ClutterOffscreenEffect *effect,
+                                       ClutterPaintContext    *paint_context)
 {
  g_return_if_fail (CLUTTER_IS_OFFSCREEN_EFFECT (effect));

-  CLUTTER_OFFSCREEN_EFFECT_GET_CLASS (effect)->paint_target (effect);
+  CLUTTER_OFFSCREEN_EFFECT_GET_CLASS (effect)->paint_target (effect,
+                                                             paint_context);
 }

 /**
--- a/clutter/clutter/clutter-offscreen-effect.h
+++ b/clutter/clutter/clutter-offscreen-effect.h
@@ -79,7 +79,8 @@ struct _ClutterOffscreenEffectClass
  CoglHandle (* create_texture) (ClutterOffscreenEffect *effect,
                                 gfloat                  width,
                                 gfloat                  height);
-  void       (* paint_target)   (ClutterOffscreenEffect *effect);
+  void       (* paint_target)   (ClutterOffscreenEffect *effect,
+                                 ClutterPaintContext    *paint_context);

  /*< private >*/
  void (* _clutter_offscreen1) (void);
@@ -101,7 +102,8 @@ CLUTTER_EXPORT
 CoglHandle      clutter_offscreen_effect_get_texture            (ClutterOffscreenEffect *effect);

 CLUTTER_EXPORT
-void            clutter_offscreen_effect_paint_target           (ClutterOffscreenEffect *effect);
+void            clutter_offscreen_effect_paint_target           (ClutterOffscreenEffect *effect,
+                                                                 ClutterPaintContext    *paint_context);
 CLUTTER_EXPORT
 CoglHandle      clutter_offscreen_effect_create_texture         (ClutterOffscreenEffect *effect,
                                                                 gfloat                  width,
--- a/clutter/clutter/clutter-paint-context-private.h
+++ b/clutter/clutter/clutter-paint-context-private.h
@@ -0,0 +1,29 @@
+/*
+ * Copyright (C) 2019 Red Hat Inc.
+ *
+ * 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 CLUTTER_PAINT_CONTEXT_PRIVATE_H
+#define CLUTTER_PAINT_CONTEXT_PRIVATE_H
+
+#include "clutter-paint-context.h"
+
+ClutterPaintContext * clutter_paint_context_new_for_view (ClutterStageView *view);
+
+gboolean clutter_paint_context_is_drawing_off_stage (ClutterPaintContext *paint_context);
+
+CoglFramebuffer * clutter_paint_context_get_base_framebuffer (ClutterPaintContext *paint_context);
+
+#endif /* CLUTTER_PAINT_CONTEXT_PRIVATE_H */
--- a/clutter/clutter/clutter-paint-context.c
+++ b/clutter/clutter/clutter-paint-context.c
@@ -0,0 +1,161 @@
+/*
+ * Copyright (C) 2019 Red Hat Inc.
+ *
+ * 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/>.
+ */
+
+#include "clutter-build-config.h"
+
+#include "clutter-paint-context-private.h"
+
+struct _ClutterPaintContext
+{
+  grefcount ref_count;
+
+  GList *framebuffers;
+
+  ClutterStageView *view;
+};
+
+G_DEFINE_BOXED_TYPE (ClutterPaintContext, clutter_paint_context,
+                     clutter_paint_context_ref,
+                     clutter_paint_context_unref)
+
+ClutterPaintContext *
+clutter_paint_context_new_for_view (ClutterStageView *view)
+{
+  ClutterPaintContext *paint_context;
+  CoglFramebuffer *framebuffer;
+
+  paint_context = g_new0 (ClutterPaintContext, 1);
+  g_ref_count_init (&paint_context->ref_count);
+  paint_context->view = view;
+
+  framebuffer = clutter_stage_view_get_framebuffer (view);
+  clutter_paint_context_push_framebuffer (paint_context, framebuffer);
+
+  return paint_context;
+}
+
+/**
+ * clutter_paint_context_new_for_framebuffer: (skip)
+ */
+ClutterPaintContext *
+clutter_paint_context_new_for_framebuffer (CoglFramebuffer *framebuffer)
+{
+  ClutterPaintContext *paint_context;
+
+  paint_context = g_new0 (ClutterPaintContext, 1);
+  g_ref_count_init (&paint_context->ref_count);
+
+  clutter_paint_context_push_framebuffer (paint_context, framebuffer);
+
+  return paint_context;
+}
+
+ClutterPaintContext *
+clutter_paint_context_ref (ClutterPaintContext *paint_context)
+{
+  g_ref_count_inc (&paint_context->ref_count);
+  return paint_context;
+}
+
+static void
+clutter_paint_context_dispose (ClutterPaintContext *paint_context)
+{
+  g_list_free_full (paint_context->framebuffers,
+                    cogl_object_unref);
+  paint_context->framebuffers = NULL;
+}
+
+void
+clutter_paint_context_unref (ClutterPaintContext *paint_context)
+{
+  if (g_ref_count_dec (&paint_context->ref_count))
+    {
+      clutter_paint_context_dispose (paint_context);
+      g_free (paint_context);
+    }
+}
+
+void
+clutter_paint_context_destroy (ClutterPaintContext *paint_context)
+{
+  clutter_paint_context_dispose (paint_context);
+  clutter_paint_context_unref (paint_context);
+}
+
+void
+clutter_paint_context_push_framebuffer (ClutterPaintContext *paint_context,
+                                        CoglFramebuffer     *framebuffer)
+{
+  paint_context->framebuffers = g_list_prepend (paint_context->framebuffers,
+                                                cogl_object_ref (framebuffer));
+}
+
+void
+clutter_paint_context_pop_framebuffer (ClutterPaintContext *paint_context)
+{
+  g_return_if_fail (paint_context->framebuffers);
+
+  cogl_object_unref (paint_context->framebuffers->data);
+  paint_context->framebuffers =
+    g_list_delete_link (paint_context->framebuffers,
+                        paint_context->framebuffers);
+}
+
+/**
+ * clutter_paint_context_get_framebuffer:
+ * @paint_context: The #ClutterPaintContext
+ *
+ * Returns: (transfer none): The #CoglFramebuffer used for drawing
+ */
+CoglFramebuffer *
+clutter_paint_context_get_framebuffer (ClutterPaintContext *paint_context)
+{
+  g_return_val_if_fail (paint_context->framebuffers, NULL);
+
+  return paint_context->framebuffers->data;
+}
+
+CoglFramebuffer *
+clutter_paint_context_get_base_framebuffer (ClutterPaintContext *paint_context)
+{
+  return g_list_last (paint_context->framebuffers)->data;
+}
+
+/**
+ * clutter_paint_context_get_stage_view: (skip)
+ */
+ClutterStageView *
+clutter_paint_context_get_stage_view (ClutterPaintContext *paint_context)
+{
+  return paint_context->view;
+}
+
+/**
+ * clutter_paint_context_is_drawing_off_stage: (skip)
+ *
+ * Return %TRUE if the paint context is currently drawing off stage.
+ * This happens if there are any framebuffers pushed, and the base framebuffer
+ * comes from the stage view.
+ */
+gboolean
+clutter_paint_context_is_drawing_off_stage (ClutterPaintContext *paint_context)
+{
+  if (g_list_length (paint_context->framebuffers) > 1)
+    return TRUE;
+
+  return !paint_context->view;
+}
--- a/clutter/clutter/clutter-paint-context.h
+++ b/clutter/clutter/clutter-paint-context.h
@@ -0,0 +1,62 @@
+/*
+ * Copyright (C) 2019 Red Hat Inc.
+ *
+ * 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 CLUTTER_PAINT_CONTEXT_H
+#define CLUTTER_PAINT_CONTEXT_H
+
+#if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
+#error "Only <clutter/clutter.h> can be included directly."
+#endif
+
+#include <glib-object.h>
+
+#include "clutter-macros.h"
+#include "clutter-stage-view.h"
+
+typedef struct _ClutterPaintContext ClutterPaintContext;
+
+#define CLUTTER_TYPE_PAINT_CONTEXT (clutter_paint_context_get_type ())
+
+CLUTTER_EXPORT
+GType clutter_paint_context_get_type (void);
+
+CLUTTER_EXPORT
+ClutterPaintContext * clutter_paint_context_new_for_framebuffer (CoglFramebuffer *framebuffer);
+
+CLUTTER_EXPORT
+ClutterPaintContext * clutter_paint_context_ref (ClutterPaintContext *paint_context);
+
+CLUTTER_EXPORT
+void clutter_paint_context_unref (ClutterPaintContext *paint_context);
+
+CLUTTER_EXPORT
+void clutter_paint_context_destroy (ClutterPaintContext *paint_context);
+
+CLUTTER_EXPORT
+CoglFramebuffer * clutter_paint_context_get_framebuffer (ClutterPaintContext *paint_context);
+
+CLUTTER_EXPORT
+ClutterStageView * clutter_paint_context_get_stage_view (ClutterPaintContext *paint_context);
+
+CLUTTER_EXPORT
+void clutter_paint_context_push_framebuffer (ClutterPaintContext *paint_context,
+                                             CoglFramebuffer     *framebuffer);
+
+CLUTTER_EXPORT
+void clutter_paint_context_pop_framebuffer (ClutterPaintContext *paint_context);
+
+#endif /* CLUTTER_PAINT_CONTEXT_H */
--- a/clutter/clutter/clutter-paint-node-private.h
+++ b/clutter/clutter/clutter-paint-node-private.h
@@ -27,6 +27,7 @@

 #include <glib-object.h>
 #include <json-glib/json-glib.h>
+#include <clutter/clutter-paint-context.h>
 #include <clutter/clutter-paint-node.h>

 G_BEGIN_DECLS
@@ -63,9 +64,12 @@ struct _ClutterPaintNodeClass

  void     (* finalize)  (ClutterPaintNode *node);

-  gboolean (* pre_draw)  (ClutterPaintNode *node);
-  void     (* draw)      (ClutterPaintNode *node);
-  void     (* post_draw) (ClutterPaintNode *node);
+  gboolean (* pre_draw)  (ClutterPaintNode    *node,
+                          ClutterPaintContext *paint_context);
+  void     (* draw)      (ClutterPaintNode    *node,
+                          ClutterPaintContext *paint_context);
+  void     (* post_draw) (ClutterPaintNode    *node,
+                          ClutterPaintContext *paint_context);

  JsonNode*(* serialize) (ClutterPaintNode *node);

@@ -111,7 +115,8 @@ void                    _clutter_paint_node_init_types                  (void);
 gpointer                _clutter_paint_node_create                      (GType gtype);

 ClutterPaintNode *      _clutter_transform_node_new                     (const CoglMatrix            *matrix);
-ClutterPaintNode *      _clutter_dummy_node_new                         (ClutterActor                *actor);
+ClutterPaintNode *      _clutter_dummy_node_new                         (ClutterActor                *actor,
+                                                                         CoglFramebuffer             *framebuffer);

 void                    _clutter_paint_node_dump_tree                   (ClutterPaintNode            *root);

--- a/clutter/clutter/clutter-paint-node.c
+++ b/clutter/clutter/clutter-paint-node.c
@@ -202,18 +202,21 @@ clutter_paint_node_real_finalize (ClutterPaintNode *node)
 }

 static gboolean
-clutter_paint_node_real_pre_draw (ClutterPaintNode *node)
+clutter_paint_node_real_pre_draw (ClutterPaintNode    *node,
+                                  ClutterPaintContext *paint_context)
 {
  return FALSE;
 }

 static void
-clutter_paint_node_real_draw (ClutterPaintNode *node)
+clutter_paint_node_real_draw (ClutterPaintNode    *node,
+                              ClutterPaintContext *paint_context)
 {
 }

 static void
-clutter_paint_node_real_post_draw (ClutterPaintNode *node)
+clutter_paint_node_real_post_draw (ClutterPaintNode    *node,
+                                   ClutterPaintContext *paint_context)
 {
 }

@@ -997,29 +1000,30 @@ clutter_paint_node_add_primitive (ClutterPaintNode *node,
 * its children, if any.
 */
 void
-clutter_paint_node_paint (ClutterPaintNode *node)
+clutter_paint_node_paint (ClutterPaintNode    *node,
+                          ClutterPaintContext *paint_context)
 {
  ClutterPaintNodeClass *klass = CLUTTER_PAINT_NODE_GET_CLASS (node);
  ClutterPaintNode *iter;
  gboolean res;

-  res = klass->pre_draw (node);
+  res = klass->pre_draw (node, paint_context);

  if (res)
    {
-      klass->draw (node);
+      klass->draw (node, paint_context);
    }

  for (iter = node->first_child;
       iter != NULL;
       iter = iter->next_sibling)
    {
-      clutter_paint_node_paint (iter);
+      clutter_paint_node_paint (iter, paint_context);
    }

  if (res)
    {
-      klass->post_draw (node);
+      klass->post_draw (node, paint_context);
    }
 }

@@ -1199,9 +1203,10 @@ clutter_paint_node_get_root (ClutterPaintNode *node)
 * @node: a #ClutterPaintNode
 *
 * Retrieves the #CoglFramebuffer that @node will draw
- * into.
+ * into, if it the root node has a custom framebuffer set.
 *
- * Returns: (transfer none): a #CoglFramebuffer
+ * Returns: (transfer none): a #CoglFramebuffer or %NULL if no custom one is
+ * set.
 */
 CoglFramebuffer *
 clutter_paint_node_get_framebuffer (ClutterPaintNode *node)
@@ -1209,12 +1214,9 @@ clutter_paint_node_get_framebuffer (ClutterPaintNode *node)
  ClutterPaintNode *root = clutter_paint_node_get_root (node);
  ClutterPaintNodeClass *klass;

-  if (root == NULL)
-    return NULL;
-
  klass = CLUTTER_PAINT_NODE_GET_CLASS (root);
  if (klass->get_framebuffer != NULL)
    return klass->get_framebuffer (root);
-
-  return cogl_get_draw_framebuffer ();
+  else
+    return NULL;
 }
--- a/clutter/clutter/clutter-paint-node.h
+++ b/clutter/clutter/clutter-paint-node.h
@@ -50,7 +50,8 @@ CLUTTER_EXPORT
 void                    clutter_paint_node_unref                        (ClutterPaintNode      *node);

 CLUTTER_EXPORT
-void                    clutter_paint_node_paint                        (ClutterPaintNode      *node);
+void                    clutter_paint_node_paint                        (ClutterPaintNode      *node,
+                                                                         ClutterPaintContext   *paint_context);

 CLUTTER_EXPORT
 void                    clutter_paint_node_set_name                     (ClutterPaintNode      *node,
--- a/clutter/clutter/clutter-paint-nodes.c
+++ b/clutter/clutter/clutter-paint-nodes.c
@@ -44,6 +44,7 @@
 #include "clutter-color.h"
 #include "clutter-debug.h"
 #include "clutter-private.h"
+#include "clutter-paint-context-private.h"

 #include "clutter-paint-nodes.h"

@@ -103,11 +104,12 @@ struct _ClutterRootNode
 G_DEFINE_TYPE (ClutterRootNode, clutter_root_node, CLUTTER_TYPE_PAINT_NODE)

 static gboolean
-clutter_root_node_pre_draw (ClutterPaintNode *node)
+clutter_root_node_pre_draw (ClutterPaintNode    *node,
+                            ClutterPaintContext *paint_context)
 {
  ClutterRootNode *rnode = (ClutterRootNode *) node;

-  cogl_push_framebuffer (rnode->framebuffer);
+  clutter_paint_context_push_framebuffer (paint_context, rnode->framebuffer);

  cogl_framebuffer_clear (rnode->framebuffer,
                          rnode->clear_flags,
@@ -117,9 +119,10 @@ clutter_root_node_pre_draw (ClutterPaintNode *node)
 }

 static void
-clutter_root_node_post_draw (ClutterPaintNode *node)
+clutter_root_node_post_draw (ClutterPaintNode    *node,
+                             ClutterPaintContext *paint_context)
 {
-  cogl_pop_framebuffer ();
+  clutter_paint_context_pop_framebuffer (paint_context);
 }

 static void
@@ -163,6 +166,8 @@ clutter_root_node_new (CoglFramebuffer    *framebuffer,
 {
  ClutterRootNode *res;

+  g_return_val_if_fail (framebuffer, NULL);
+
  res = _clutter_paint_node_create (CLUTTER_TYPE_ROOT_NODE);

  cogl_color_init_from_4ub (&res->clear_color,
@@ -172,11 +177,7 @@ clutter_root_node_new (CoglFramebuffer    *framebuffer,
                            clear_color->alpha);
  cogl_color_premultiply (&res->clear_color);

-  if (G_LIKELY (framebuffer != NULL))
-    res->framebuffer = cogl_object_ref (framebuffer);
-  else
-    res->framebuffer = cogl_object_ref (cogl_get_draw_framebuffer ());
-
+  res->framebuffer = cogl_object_ref (framebuffer);
  res->clear_flags = clear_flags;

  return (ClutterPaintNode *) res;
@@ -201,10 +202,12 @@ struct _ClutterTransformNodeClass
 G_DEFINE_TYPE (ClutterTransformNode, clutter_transform_node, CLUTTER_TYPE_PAINT_NODE)

 static gboolean
-clutter_transform_node_pre_draw (ClutterPaintNode *node)
+clutter_transform_node_pre_draw (ClutterPaintNode    *node,
+                                 ClutterPaintContext *paint_context)
 {
  ClutterTransformNode *transform_node = (ClutterTransformNode *) node;
-  CoglFramebuffer *fb = cogl_get_draw_framebuffer ();
+  CoglFramebuffer *fb =
+   clutter_paint_context_get_framebuffer (paint_context);

  cogl_framebuffer_push_matrix (fb);
  cogl_framebuffer_transform (fb, &transform_node->transform);
@@ -213,9 +216,11 @@ clutter_transform_node_pre_draw (ClutterPaintNode *node)
 }

 static void
-clutter_transform_node_post_draw (ClutterPaintNode *node)
+clutter_transform_node_post_draw (ClutterPaintNode    *node,
+                                  ClutterPaintContext *paint_context)
 {
-  CoglFramebuffer *fb = cogl_get_draw_framebuffer ();
+  CoglFramebuffer *fb =
+   clutter_paint_context_get_framebuffer (paint_context);

  cogl_framebuffer_pop_matrix (fb);
 }
@@ -278,7 +283,8 @@ struct _ClutterDummyNode
 G_DEFINE_TYPE (ClutterDummyNode, clutter_dummy_node, CLUTTER_TYPE_PAINT_NODE)

 static gboolean
-clutter_dummy_node_pre_draw (ClutterPaintNode *node)
+clutter_dummy_node_pre_draw (ClutterPaintNode    *node,
+                             ClutterPaintContext *paint_context)
 {
  return TRUE;
 }
@@ -315,6 +321,16 @@ clutter_dummy_node_get_framebuffer (ClutterPaintNode *node)
  return dnode->framebuffer;
 }

+static void
+clutter_dummy_node_finalize (ClutterPaintNode *node)
+{
+  ClutterDummyNode *dnode = (ClutterDummyNode *) node;
+
+  cogl_clear_object (&dnode->framebuffer);
+
+  CLUTTER_PAINT_NODE_CLASS (clutter_dummy_node_parent_class)->finalize (node);
+}
+
 static void
 clutter_dummy_node_class_init (ClutterDummyNodeClass *klass)
 {
@@ -323,6 +339,7 @@ clutter_dummy_node_class_init (ClutterDummyNodeClass *klass)
  node_class->pre_draw = clutter_dummy_node_pre_draw;
  node_class->serialize = clutter_dummy_node_serialize;
  node_class->get_framebuffer = clutter_dummy_node_get_framebuffer;
+  node_class->finalize = clutter_dummy_node_finalize;
 }

 static void
@@ -331,7 +348,8 @@ clutter_dummy_node_init (ClutterDummyNode *self)
 }

 ClutterPaintNode *
-_clutter_dummy_node_new (ClutterActor *actor)
+_clutter_dummy_node_new (ClutterActor    *actor,
+                         CoglFramebuffer *framebuffer)
 {
  ClutterPaintNode *res;
  ClutterDummyNode *dnode;
@@ -340,7 +358,7 @@ _clutter_dummy_node_new (ClutterActor *actor)

  dnode = (ClutterDummyNode *) res;
  dnode->actor = actor;
-  dnode->framebuffer = _clutter_actor_get_active_framebuffer (actor);
+  dnode->framebuffer = cogl_object_ref (framebuffer);

  return res;
 }
@@ -383,22 +401,34 @@ clutter_pipeline_node_finalize (ClutterPaintNode *node)
 }

 static gboolean
-clutter_pipeline_node_pre_draw (ClutterPaintNode *node)
+clutter_pipeline_node_pre_draw (ClutterPaintNode    *node,
+                                ClutterPaintContext *paint_context)
 {
  ClutterPipelineNode *pnode = CLUTTER_PIPELINE_NODE (node);

  if (node->operations != NULL &&
      pnode->pipeline != NULL)
-    {
-      cogl_push_source (pnode->pipeline);
-      return TRUE;
-    }
+    return TRUE;

  return FALSE;
 }

+static CoglFramebuffer *
+get_target_framebuffer (ClutterPaintNode    *node,
+                        ClutterPaintContext *paint_context)
+{
+  CoglFramebuffer *framebuffer;
+
+  framebuffer = clutter_paint_node_get_framebuffer (node);
+  if (framebuffer)
+    return framebuffer;
+
+  return clutter_paint_context_get_framebuffer (paint_context);
+}
+
 static void
-clutter_pipeline_node_draw (ClutterPaintNode *node)
+clutter_pipeline_node_draw (ClutterPaintNode    *node,
+                            ClutterPaintContext *paint_context)
 {
  ClutterPipelineNode *pnode = CLUTTER_PIPELINE_NODE (node);
  CoglFramebuffer *fb;
@@ -410,7 +440,7 @@ clutter_pipeline_node_draw (ClutterPaintNode *node)
  if (node->operations == NULL)
    return;

-  fb = clutter_paint_node_get_framebuffer (node);
+  fb = clutter_paint_context_get_framebuffer (paint_context);

  for (i = 0; i < node->operations->len; i++)
    {
@@ -424,18 +454,20 @@ clutter_pipeline_node_draw (ClutterPaintNode *node)
          break;

        case PAINT_OP_TEX_RECT:
-          cogl_rectangle_with_texture_coords (op->op.texrect[0],
-                                              op->op.texrect[1],
-                                              op->op.texrect[2],
-                                              op->op.texrect[3],
-                                              op->op.texrect[4],
-                                              op->op.texrect[5],
-                                              op->op.texrect[6],
-                                              op->op.texrect[7]);
+          cogl_framebuffer_draw_textured_rectangle (fb,
+                                                    pnode->pipeline,
+                                                    op->op.texrect[0],
+                                                    op->op.texrect[1],
+                                                    op->op.texrect[2],
+                                                    op->op.texrect[3],
+                                                    op->op.texrect[4],
+                                                    op->op.texrect[5],
+                                                    op->op.texrect[6],
+                                                    op->op.texrect[7]);
          break;

        case PAINT_OP_MULTITEX_RECT:
-          cogl_framebuffer_draw_multitextured_rectangle (cogl_get_draw_framebuffer (),
+          cogl_framebuffer_draw_multitextured_rectangle (fb,
                                                         pnode->pipeline,
                                                         op->op.texrect[0],
                                                         op->op.texrect[1],
@@ -446,7 +478,7 @@ clutter_pipeline_node_draw (ClutterPaintNode *node)
          break;

        case PAINT_OP_PATH:
-          cogl_path_fill (op->op.path);
+          cogl_framebuffer_fill_path (fb, pnode->pipeline, op->op.path);
          break;

        case PAINT_OP_PRIMITIVE:
@@ -459,9 +491,9 @@ clutter_pipeline_node_draw (ClutterPaintNode *node)
 }

 static void
-clutter_pipeline_node_post_draw (ClutterPaintNode *node)
+clutter_pipeline_node_post_draw (ClutterPaintNode    *node,
+                                 ClutterPaintContext *paint_context)
 {
-  cogl_pop_source ();
 }

 static JsonNode *
@@ -780,7 +812,8 @@ clutter_text_node_finalize (ClutterPaintNode *node)
 }

 static gboolean
-clutter_text_node_pre_draw (ClutterPaintNode *node)
+clutter_text_node_pre_draw (ClutterPaintNode    *node,
+                            ClutterPaintContext *paint_context)
 {
  ClutterTextNode *tnode = CLUTTER_TEXT_NODE (node);

@@ -788,7 +821,8 @@ clutter_text_node_pre_draw (ClutterPaintNode *node)
 }

 static void
-clutter_text_node_draw (ClutterPaintNode *node)
+clutter_text_node_draw (ClutterPaintNode    *node,
+                        ClutterPaintContext *paint_context)
 {
  ClutterTextNode *tnode = CLUTTER_TEXT_NODE (node);
  PangoRectangle extents;
@@ -798,7 +832,7 @@ clutter_text_node_draw (ClutterPaintNode *node)
  if (node->operations == NULL)
    return;

-  fb = clutter_paint_node_get_framebuffer (node);
+  fb = get_target_framebuffer (node, paint_context);

  pango_layout_get_pixel_extents (tnode->layout, NULL, &extents);

@@ -831,11 +865,11 @@ clutter_text_node_draw (ClutterPaintNode *node)
              clipped = TRUE;
            }

-          cogl_pango_render_layout (tnode->layout,
-                                    op->op.texrect[0],
-                                    op->op.texrect[1],
-                                    &tnode->color,
-                                    0);
+          cogl_pango_show_layout (fb,
+                                  tnode->layout,
+                                  op->op.texrect[0],
+                                  op->op.texrect[1],
+                                  &tnode->color);

          if (clipped)
            cogl_framebuffer_pop_clip (fb);
@@ -974,7 +1008,8 @@ struct _ClutterClipNodeClass
 G_DEFINE_TYPE (ClutterClipNode, clutter_clip_node, CLUTTER_TYPE_PAINT_NODE)

 static gboolean
-clutter_clip_node_pre_draw (ClutterPaintNode *node)
+clutter_clip_node_pre_draw (ClutterPaintNode    *node,
+                            ClutterPaintContext *paint_context)
 {
  gboolean retval = FALSE;
  CoglFramebuffer *fb;
@@ -983,7 +1018,7 @@ clutter_clip_node_pre_draw (ClutterPaintNode *node)
  if (node->operations == NULL)
    return FALSE;

-  fb = clutter_paint_node_get_framebuffer (node);
+  fb = get_target_framebuffer (node, paint_context);

  for (i = 0; i < node->operations->len; i++)
    {
@@ -1018,7 +1053,8 @@ clutter_clip_node_pre_draw (ClutterPaintNode *node)
 }

 static void
-clutter_clip_node_post_draw (ClutterPaintNode *node)
+clutter_clip_node_post_draw (ClutterPaintNode    *node,
+                             ClutterPaintContext *paint_context)
 {
  CoglFramebuffer *fb;
  guint i;
@@ -1026,7 +1062,7 @@ clutter_clip_node_post_draw (ClutterPaintNode *node)
  if (node->operations == NULL)
    return;

-  fb = clutter_paint_node_get_framebuffer (node);
+  fb = get_target_framebuffer (node, paint_context);

  for (i = 0; i < node->operations->len; i++)
    {
@@ -1100,7 +1136,8 @@ struct _ClutterActorNodeClass
 G_DEFINE_TYPE (ClutterActorNode, clutter_actor_node, CLUTTER_TYPE_PAINT_NODE)

 static gboolean
-clutter_actor_node_pre_draw (ClutterPaintNode *node)
+clutter_actor_node_pre_draw (ClutterPaintNode    *node,
+                             ClutterPaintContext *paint_context)
 {
  ClutterActorNode *actor_node = CLUTTER_ACTOR_NODE (node);

@@ -1110,15 +1147,17 @@ clutter_actor_node_pre_draw (ClutterPaintNode *node)
 }

 static void
-clutter_actor_node_draw (ClutterPaintNode *node)
+clutter_actor_node_draw (ClutterPaintNode    *node,
+                         ClutterPaintContext *paint_context)
 {
  ClutterActorNode *actor_node = CLUTTER_ACTOR_NODE (node);

-  clutter_actor_continue_paint (actor_node->actor);
+  clutter_actor_continue_paint (actor_node->actor, paint_context);
 }

 static void
-clutter_actor_node_post_draw (ClutterPaintNode *node)
+clutter_actor_node_post_draw (ClutterPaintNode    *node,
+                              ClutterPaintContext *paint_context)
 {
  ClutterActorNode *actor_node = CLUTTER_ACTOR_NODE (node);

@@ -1143,6 +1182,7 @@ clutter_actor_node_serialize (ClutterPaintNode *node)

  return json_builder_get_root (builder);
 }
+
 static void
 clutter_actor_node_class_init (ClutterActorNodeClass *klass)
 {
@@ -1217,9 +1257,11 @@ struct _ClutterLayerNodeClass
 G_DEFINE_TYPE (ClutterLayerNode, clutter_layer_node, CLUTTER_TYPE_PAINT_NODE)

 static gboolean
-clutter_layer_node_pre_draw (ClutterPaintNode *node)
+clutter_layer_node_pre_draw (ClutterPaintNode *node,
+                             ClutterPaintContext *paint_context)
 {
  ClutterLayerNode *lnode = (ClutterLayerNode *) node;
+  CoglFramebuffer *framebuffer;
  CoglMatrix matrix;

  /* if we were unable to create an offscreen buffer for this node, then
@@ -1235,9 +1277,10 @@ clutter_layer_node_pre_draw (ClutterPaintNode *node)
  /* copy the same modelview from the current framebuffer to the one we
   * are going to use
   */
-  cogl_get_modelview_matrix (&matrix);
+  framebuffer = clutter_paint_context_get_framebuffer (paint_context);
+  cogl_framebuffer_get_modelview_matrix (framebuffer, &matrix);

-  cogl_push_framebuffer (lnode->offscreen);
+  clutter_paint_context_push_framebuffer (paint_context, lnode->offscreen);

  cogl_framebuffer_set_modelview_matrix (lnode->offscreen, &matrix);

@@ -1255,7 +1298,7 @@ clutter_layer_node_pre_draw (ClutterPaintNode *node)
                            COGL_BUFFER_BIT_COLOR | COGL_BUFFER_BIT_DEPTH,
                            0.f, 0.f, 0.f, 0.f);

-  cogl_push_matrix ();
+  cogl_framebuffer_push_matrix (lnode->offscreen);

  /* every draw operation after this point will happen an offscreen
   * framebuffer
@@ -1265,17 +1308,18 @@ clutter_layer_node_pre_draw (ClutterPaintNode *node)
 }

 static void
-clutter_layer_node_post_draw (ClutterPaintNode *node)
+clutter_layer_node_post_draw (ClutterPaintNode    *node,
+                              ClutterPaintContext *paint_context)
 {
  ClutterLayerNode *lnode = CLUTTER_LAYER_NODE (node);
  CoglFramebuffer *fb;
  guint i;

  /* switch to the previous framebuffer */
-  cogl_pop_matrix ();
-  cogl_pop_framebuffer ();
+  cogl_framebuffer_pop_matrix (lnode->offscreen);
+  clutter_paint_context_pop_framebuffer (paint_context);

-  fb = cogl_get_draw_framebuffer ();
+  fb = clutter_paint_context_get_framebuffer (paint_context);

  for (i = 0; i < node->operations->len; i++)
    {
@@ -1289,20 +1333,20 @@ clutter_layer_node_post_draw (ClutterPaintNode *node)

        case PAINT_OP_TEX_RECT:
          /* now we need to paint the texture */
-          cogl_push_source (lnode->state);
-          cogl_rectangle_with_texture_coords (op->op.texrect[0],
-                                              op->op.texrect[1],
-                                              op->op.texrect[2],
-                                              op->op.texrect[3],
-                                              op->op.texrect[4],
-                                              op->op.texrect[5],
-                                              op->op.texrect[6],
-                                              op->op.texrect[7]);
-          cogl_pop_source ();
+          cogl_framebuffer_draw_textured_rectangle (fb,
+                                                    lnode->state,
+                                                    op->op.texrect[0],
+                                                    op->op.texrect[1],
+                                                    op->op.texrect[2],
+                                                    op->op.texrect[3],
+                                                    op->op.texrect[4],
+                                                    op->op.texrect[5],
+                                                    op->op.texrect[6],
+                                                    op->op.texrect[7]);
          break;

        case PAINT_OP_MULTITEX_RECT:
-          cogl_framebuffer_draw_multitextured_rectangle (cogl_get_draw_framebuffer (),
+          cogl_framebuffer_draw_multitextured_rectangle (fb,
                                                         lnode->state,
                                                         op->op.texrect[0],
                                                         op->op.texrect[1],
@@ -1313,9 +1357,7 @@ clutter_layer_node_post_draw (ClutterPaintNode *node)
          break;

        case PAINT_OP_PATH:
-          cogl_push_source (lnode->state);
-          cogl_path_fill (op->op.path);
-          cogl_pop_source ();
+          cogl_framebuffer_fill_path (fb, lnode->state, op->op.path);
          break;

        case PAINT_OP_PRIMITIVE:
--- a/clutter/clutter/clutter-pick-context-private.h
+++ b/clutter/clutter/clutter-pick-context-private.h
@@ -0,0 +1,25 @@
+/*
+ * Copyright (C) 2019 Red Hat Inc.
+ *
+ * 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 CLUTTER_PICK_CONTEXT_PRIVATE_H
+#define CLUTTER_PICK_CONTEXT_PRIVATE_H
+
+#include "clutter-pick-context.h"
+
+ClutterPickContext * clutter_pick_context_new_for_view (ClutterStageView *view);
+
+#endif /* CLUTTER_PICK_CONTEXT_PRIVATE_H */
--- a/clutter/clutter/clutter-pick-context.c
+++ b/clutter/clutter/clutter-pick-context.c
@@ -0,0 +1,83 @@
+/*
+ * Copyright (C) 2019 Red Hat Inc.
+ *
+ * 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/>.
+ */
+
+#include "clutter-build-config.h"
+
+#include "clutter-pick-context-private.h"
+
+struct _ClutterPickContext
+{
+  grefcount ref_count;
+
+  CoglFramebuffer *framebuffer;
+};
+
+G_DEFINE_BOXED_TYPE (ClutterPickContext, clutter_pick_context,
+                     clutter_pick_context_ref,
+                     clutter_pick_context_unref)
+
+ClutterPickContext *
+clutter_pick_context_new_for_view (ClutterStageView *view)
+{
+  ClutterPickContext *pick_context;
+
+  pick_context = g_new0 (ClutterPickContext, 1);
+  g_ref_count_init (&pick_context->ref_count);
+  pick_context->framebuffer =
+    cogl_object_ref (clutter_stage_view_get_framebuffer (view));
+
+  return pick_context;
+}
+
+ClutterPickContext *
+clutter_pick_context_ref (ClutterPickContext *pick_context)
+{
+  g_ref_count_inc (&pick_context->ref_count);
+  return pick_context;
+}
+
+static void
+clutter_pick_context_dispose (ClutterPickContext *pick_context)
+{
+  g_clear_pointer (&pick_context->framebuffer, cogl_object_unref);
+}
+
+void
+clutter_pick_context_unref (ClutterPickContext *pick_context)
+{
+  if (g_ref_count_dec (&pick_context->ref_count))
+    {
+      clutter_pick_context_dispose (pick_context);
+      g_free (pick_context);
+    }
+}
+
+void
+clutter_pick_context_destroy (ClutterPickContext *pick_context)
+{
+  clutter_pick_context_dispose (pick_context);
+  clutter_pick_context_unref (pick_context);
+}
+
+/**
+ * clutter_pick_context_get_framebuffer: (skip)
+ */
+CoglFramebuffer *
+clutter_pick_context_get_framebuffer (ClutterPickContext *pick_context)
+{
+  return pick_context->framebuffer;
+}
--- a/clutter/clutter/deprecated/clutter-stage-manager.h
+++ b/clutter/clutter/deprecated/clutter-stage-manager.h
@@ -1,9 +1,5 @@
 /*
- * Clutter.
- *
- * An OpenGL based 'interactive canvas' library.
- *
- * Copyright (C) 2008 OpenedHand
+ * Copyright (C) 2019 Red Hat Inc.
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Lesser General Public
@@ -17,26 +13,37 @@
 *
 * 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/>.
- *
- * Author: Emmanuele Bassi <ebassi@linux.intel.com>
 */

+#ifndef CLUTTER_PICK_CONTEXT_H
+#define CLUTTER_PICK_CONTEXT_H
+
 #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
 #error "Only <clutter/clutter.h> can be included directly."
 #endif

-#ifndef __CLUTTER_STAGE_MANAGER_DEPRECATED_H__
-#define __CLUTTER_STAGE_MANAGER_DEPRECATED_H__
+#include <glib-object.h>

-#include <clutter/clutter-stage-manager.h>
+#include "clutter-macros.h"
+#include "clutter-stage-view.h"

-G_BEGIN_DECLS
+typedef struct _ClutterPickContext ClutterPickContext;

-CLUTTER_DEPRECATED
-void    clutter_stage_manager_set_default_stage (ClutterStageManager *stage_manager,
-                                                 ClutterStage        *stage);
+#define CLUTTER_TYPE_PICK_CONTEXT (clutter_pick_context_get_type ())

-G_END_DECLS
+CLUTTER_EXPORT
+GType clutter_pick_context_get_type (void);

-#endif /*__CLUTTER_STAGE_MANAGER_DEPRECATED_H__ */
+CLUTTER_EXPORT
+ClutterPickContext * clutter_pick_context_ref (ClutterPickContext *pick_context);

+CLUTTER_EXPORT
+void clutter_pick_context_unref (ClutterPickContext *pick_context);
+
+CLUTTER_EXPORT
+void clutter_pick_context_destroy (ClutterPickContext *pick_context);
+
+CLUTTER_EXPORT
+CoglFramebuffer * clutter_pick_context_get_framebuffer (ClutterPickContext *pick_context);
+
+#endif /* CLUTTER_PICK_CONTEXT_H */
--- a/clutter/clutter/clutter-script.c
+++ b/clutter/clutter/clutter-script.c
@@ -175,7 +175,6 @@

 #include "clutter-actor.h"
 #include "clutter-stage.h"
-#include "clutter-texture.h"

 #include "clutter-script.h"
 #include "clutter-script-private.h"
--- a/clutter/clutter/clutter-shader-effect.c
+++ b/clutter/clutter/clutter-shader-effect.c
@@ -395,7 +395,8 @@ clutter_shader_effect_try_static_source (ClutterShaderEffect *self)
 }

 static void
-clutter_shader_effect_paint_target (ClutterOffscreenEffect *effect)
+clutter_shader_effect_paint_target (ClutterOffscreenEffect *effect,
+                                    ClutterPaintContext    *paint_context)
 {
  ClutterShaderEffect *self = CLUTTER_SHADER_EFFECT (effect);
  ClutterShaderEffectPrivate *priv = self->priv;
@@ -425,7 +426,7 @@ clutter_shader_effect_paint_target (ClutterOffscreenEffect *effect)
 out:
  /* paint the offscreen buffer */
  parent = CLUTTER_OFFSCREEN_EFFECT_CLASS (clutter_shader_effect_parent_class);
-  parent->paint_target (effect);
+  parent->paint_target (effect, paint_context);

 }

--- a/clutter/clutter/clutter-stage-manager.c
+++ b/clutter/clutter/clutter-stage-manager.c
@@ -44,8 +44,6 @@
 #include "clutter-debug.h"
 #include "clutter-private.h"

-#include "deprecated/clutter-stage-manager.h"
-
 enum
 {
  PROP_0,
@@ -183,23 +181,6 @@ clutter_stage_manager_get_default (void)
  return context->stage_manager;
 }

-/**
- * clutter_stage_manager_set_default_stage:
- * @stage_manager: a #ClutterStageManager
- * @stage: a #ClutterStage
- *
- * Sets @stage as the default stage.
- *
- * Since: 0.8
- *
- * Deprecated: 1.2: Calling this function has no effect
- */
-void
-clutter_stage_manager_set_default_stage (ClutterStageManager *stage_manager,
-                                         ClutterStage        *stage)
-{
-}
-
 /*< private >
 * _clutter_stage_manager_set_default_stage:
 * @stage_manager: a #ClutterStageManager
--- a/clutter/clutter/clutter-stage-private.h
+++ b/clutter/clutter/clutter-stage-private.h
@@ -104,8 +104,6 @@ ClutterStageQueueRedrawEntry *_clutter_stage_queue_actor_redraw            (Clut
                                                                            const ClutterPaintVolume     *clip);
 void                          _clutter_stage_queue_redraw_entry_invalidate (ClutterStageQueueRedrawEntry *entry);

-CoglFramebuffer *_clutter_stage_get_active_framebuffer (ClutterStage *stage);
-
 void            _clutter_stage_add_pointer_drag_actor    (ClutterStage       *stage,
                                                          ClutterInputDevice *device,
                                                          ClutterActor       *actor);
--- a/clutter/clutter/clutter-stage-view-private.h
+++ b/clutter/clutter/clutter-stage-view-private.h
@@ -33,5 +33,7 @@ gboolean clutter_stage_view_is_dirty_projection (ClutterStageView *view);
 void clutter_stage_view_set_dirty_projection (ClutterStageView *view,
                                              gboolean          dirty);

+void clutter_stage_view_add_redraw_clip (ClutterStageView      *view,
+                                         cairo_rectangle_int_t *clip);

 #endif /* __CLUTTER_STAGE_VIEW_PRIVATE_H__ */
--- a/clutter/clutter/clutter-stage-window.c
+++ b/clutter/clutter/clutter-stage-window.c
@@ -249,23 +249,6 @@ _clutter_stage_window_get_redraw_clip (ClutterStageWindow *window)
  return NULL;
 }

-gboolean
-_clutter_stage_window_get_redraw_clip_bounds (ClutterStageWindow    *window,
-                                              cairo_rectangle_int_t *stage_clip)
-{
-  cairo_region_t *redraw_clip;
-
-  g_return_val_if_fail (CLUTTER_IS_STAGE_WINDOW (window), FALSE);
-
-  redraw_clip = _clutter_stage_window_get_redraw_clip (window);
-  if (!redraw_clip)
-    return FALSE;
-
-  cairo_region_get_extents (redraw_clip, stage_clip);
-  cairo_region_destroy (redraw_clip);
-  return TRUE;
-}
-
 void
 _clutter_stage_window_set_accept_focus (ClutterStageWindow *window,
                                        gboolean            accept_focus)
--- a/clutter/clutter/clutter-stage-window.h
+++ b/clutter/clutter/clutter-stage-window.h
@@ -98,8 +98,6 @@ void              _clutter_stage_window_add_redraw_clip         (ClutterStageWin
                                                                 cairo_rectangle_int_t *stage_clip);
 gboolean          _clutter_stage_window_has_redraw_clips        (ClutterStageWindow    *window);
 gboolean          _clutter_stage_window_ignoring_redraw_clips   (ClutterStageWindow    *window);
-gboolean          _clutter_stage_window_get_redraw_clip_bounds  (ClutterStageWindow    *window,
-                                                                 cairo_rectangle_int_t *clip);
 cairo_region_t *  _clutter_stage_window_get_redraw_clip         (ClutterStageWindow    *window);

 void              _clutter_stage_window_set_accept_focus        (ClutterStageWindow *window,
--- a/clutter/clutter/clutter-stage.c
+++ b/clutter/clutter/clutter-stage.c
@@ -68,7 +68,9 @@
 #include "clutter-marshal.h"
 #include "clutter-master-clock.h"
 #include "clutter-mutter.h"
+#include "clutter-paint-context-private.h"
 #include "clutter-paint-volume-private.h"
+#include "clutter-pick-context-private.h"
 #include "clutter-private.h"
 #include "clutter-stage-manager-private.h"
 #include "clutter-stage-private.h"
@@ -120,8 +122,6 @@ struct _ClutterStagePrivate

  GList *pending_queue_redraws;

-  CoglFramebuffer *active_framebuffer;
-
  gint sync_delay;

  GTimer *fps_timer;
@@ -443,9 +443,9 @@ is_inside_axis_aligned_rectangle (const graphene_point_t *point,
                                  const graphene_point_t *vertices)
 {
  float min_x = FLT_MAX;
-  float max_x = FLT_MIN;
+  float max_x = -FLT_MAX;
  float min_y = FLT_MAX;
-  float max_y = FLT_MIN;
+  float max_y = -FLT_MAX;
  int i;

  for (i = 0; i < 3; i++)
@@ -838,20 +838,6 @@ _cogl_util_get_eye_planes_for_screen_poly (float *polygon,
  graphene_vec3_normalize (&plane->n, &plane->n);
 }

-static void
-_clutter_stage_update_active_framebuffer (ClutterStage    *stage,
-                                          CoglFramebuffer *framebuffer)
-{
-  ClutterStagePrivate *priv = stage->priv;
-
-  /* We track the CoglFramebuffer that corresponds to the stage itself
-   * so, for example, we can disable culling when rendering to an
-   * offscreen framebuffer.
-   */
-
-  priv->active_framebuffer = framebuffer;
-}
-
 /* XXX: Instead of having a toplevel 2D clip region, it might be
 * better to have a clip volume within the view frustum. This could
 * allow us to avoid projecting actors into window coordinates to
@@ -863,7 +849,6 @@ setup_view_for_pick_or_paint (ClutterStage                *stage,
                              const cairo_rectangle_int_t *clip)
 {
  ClutterStagePrivate *priv = stage->priv;
-  CoglFramebuffer *framebuffer = clutter_stage_view_get_framebuffer (view);
  cairo_rectangle_int_t view_layout;
  float clip_poly[8];
  float viewport[4];
@@ -914,7 +899,6 @@ setup_view_for_pick_or_paint (ClutterStage                *stage,
                                             priv->current_clip_planes);

  _clutter_stage_paint_volume_stack_free_all (stage);
-  _clutter_stage_update_active_framebuffer (stage, framebuffer);
 }

 static void
@@ -922,8 +906,13 @@ clutter_stage_do_paint_view (ClutterStage                *stage,
                             ClutterStageView            *view,
                             const cairo_rectangle_int_t *clip)
 {
+  ClutterPaintContext *paint_context;
+
+  paint_context = clutter_paint_context_new_for_view (view);
+
  setup_view_for_pick_or_paint (stage, view, clip);
-  clutter_actor_paint (CLUTTER_ACTOR (stage));
+  clutter_actor_paint (CLUTTER_ACTOR (stage), paint_context);
+  clutter_paint_context_destroy (paint_context);
 }

 /* This provides a common point of entry for painting the scenegraph
@@ -963,18 +952,20 @@ _clutter_stage_emit_after_paint (ClutterStage *stage)
 * respect the Z order as it uses our empty sort_depth_order.
 */
 static void
-clutter_stage_paint (ClutterActor *self)
+clutter_stage_paint (ClutterActor        *self,
+                     ClutterPaintContext *paint_context)
 {
  ClutterActorIter iter;
  ClutterActor *child;

  clutter_actor_iter_init (&iter, self);
  while (clutter_actor_iter_next (&iter, &child))
-    clutter_actor_paint (child);
+    clutter_actor_paint (child, paint_context);
 }

 static void
-clutter_stage_pick (ClutterActor *self)
+clutter_stage_pick (ClutterActor       *self,
+                    ClutterPickContext *pick_context)
 {
  ClutterActorIter iter;
  ClutterActor *child;
@@ -985,7 +976,7 @@ clutter_stage_pick (ClutterActor *self)
   */
  clutter_actor_iter_init (&iter, self);
  while (clutter_actor_iter_next (&iter, &child))
-    clutter_actor_pick (child);
+    clutter_actor_pick (child, pick_context);
 }

 static gboolean
@@ -1394,11 +1385,10 @@ _clutter_stage_check_updated_pointers (ClutterStage *stage)
  ClutterDeviceManager *device_manager;
  GSList *updating = NULL;
  const GSList *devices;
-  cairo_rectangle_int_t clip;
+  cairo_region_t *clip;
  graphene_point_t point;
-  gboolean has_clip;

-  has_clip = _clutter_stage_window_get_redraw_clip_bounds (priv->impl, &clip);
+  clip = _clutter_stage_window_get_redraw_clip (priv->impl);

  device_manager = clutter_device_manager_get_default ();
  devices = clutter_device_manager_peek_devices (device_manager);
@@ -1421,9 +1411,7 @@ _clutter_stage_check_updated_pointers (ClutterStage *stage)
          if (!clutter_input_device_get_coords (dev, NULL, &point))
            continue;

-          if (!has_clip ||
-              (point.x >= clip.x && point.x < clip.x + clip.width &&
-               point.y >= clip.y && point.y < clip.y + clip.height))
+          if (!clip || cairo_region_contains_point (clip, point.x, point.y))
            updating = g_slist_prepend (updating, dev);
          break;
        default:
@@ -1632,41 +1620,6 @@ clutter_stage_get_redraw_clip (ClutterStage *stage)
  return cairo_region_create_rectangle (&clip);
 }

-/**
- * clutter_stage_get_redraw_clip_bounds:
- * @stage: A #ClutterStage
- * @clip: (out caller-allocates): Return location for the clip bounds
- *
- * Gets the bounds of the current redraw for @stage in stage pixel
- * coordinates. E.g., if only a single actor has queued a redraw then
- * Clutter may redraw the stage with a clip so that it doesn't have to
- * paint every pixel in the stage. This function would then return the
- * bounds of that clip. An application can use this information to
- * avoid some extra work if it knows that some regions of the stage
- * aren't going to be painted. This should only be called while the
- * stage is being painted. If there is no current redraw clip then
- * this function will set @clip to the full extents of the stage.
- *
- * Since: 1.8
- */
-void
-clutter_stage_get_redraw_clip_bounds (ClutterStage          *stage,
-                                      cairo_rectangle_int_t *clip)
-{
-  ClutterStagePrivate *priv;
-
-  g_return_if_fail (CLUTTER_IS_STAGE (stage));
-  g_return_if_fail (clip != NULL);
-
-  priv = stage->priv;
-
-  if (!_clutter_stage_window_get_redraw_clip_bounds (priv->impl, clip))
-    {
-      /* Set clip to the full extents of the stage */
-      _clutter_stage_window_get_geometry (priv->impl, clip);
-    }
-}
-
 static ClutterActor *
 _clutter_stage_do_pick_on_view (ClutterStage     *stage,
                                float             x,
@@ -1676,24 +1629,25 @@ _clutter_stage_do_pick_on_view (ClutterStage     *stage,
 {
  ClutterMainContext *context = _clutter_context_get_default ();
  ClutterStagePrivate *priv = stage->priv;
-  CoglFramebuffer *fb = clutter_stage_view_get_framebuffer (view);
  int i;

  g_assert (context->pick_mode == CLUTTER_PICK_NONE);

  if (mode != priv->cached_pick_mode)
    {
+      ClutterPickContext *pick_context;
+
      _clutter_stage_clear_pick_stack (stage);

-      cogl_push_framebuffer (fb);
+      pick_context = clutter_pick_context_new_for_view (view);

      context->pick_mode = mode;
      setup_view_for_pick_or_paint (stage, view, NULL);
-      clutter_actor_pick (CLUTTER_ACTOR (stage));
+      clutter_actor_pick (CLUTTER_ACTOR (stage), pick_context);
      context->pick_mode = CLUTTER_PICK_NONE;
      priv->cached_pick_mode = mode;

-      cogl_pop_framebuffer ();
+      clutter_pick_context_destroy (pick_context);

      add_pick_stack_weak_refs (stage);
    }
@@ -2203,6 +2157,7 @@ clutter_stage_class_init (ClutterStageClass *klass)
  /**
   * ClutterStage::after-paint:
   * @stage: the stage that received the event
+   * @paint_Context: the paint context
   *
   * The ::after-paint signal is emitted after the stage is painted,
   * but before the results are displayed on the screen.
@@ -2814,7 +2769,6 @@ clutter_stage_read_pixels (ClutterStage *stage,
    return NULL;

  framebuffer = clutter_stage_view_get_framebuffer (view);
-  cogl_push_framebuffer (framebuffer);
  clutter_stage_do_paint_view (stage, view, &clip_rect);

  view_scale = clutter_stage_view_get_scale (view);
@@ -2829,8 +2783,6 @@ clutter_stage_read_pixels (ClutterStage *stage,
                                COGL_PIXEL_FORMAT_RGBA_8888,
                                pixels);

-  cogl_pop_framebuffer ();
-
  return pixels;
 }

@@ -4050,18 +4002,6 @@ clutter_stage_get_motion_events_enabled (ClutterStage *stage)
  return stage->priv->motion_events_enabled;
 }

-/* NB: The presumption shouldn't be that a stage can't be comprised
- * of multiple internal framebuffers, so instead of simply naming
- * this function _clutter_stage_get_framebuffer(), the "active"
- * infix is intended to clarify that it gets the framebuffer that
- * is currently in use/being painted.
- */
-CoglFramebuffer *
-_clutter_stage_get_active_framebuffer (ClutterStage *stage)
-{
-  return stage->priv->active_framebuffer;
-}
-
 void
 _clutter_stage_add_pointer_drag_actor (ClutterStage       *stage,
                                       ClutterInputDevice *device,
@@ -4471,7 +4411,6 @@ capture_view_into (ClutterStage          *stage,

  if (paint)
    {
-      cogl_push_framebuffer (framebuffer);
      _clutter_stage_maybe_setup_viewport (stage, view);
      clutter_stage_do_paint_view (stage, view, rect);
    }
@@ -4496,9 +4435,6 @@ capture_view_into (ClutterStage          *stage,
                                            COGL_READ_PIXELS_COLOR_BUFFER,
                                            bitmap);

-  if (paint)
-    cogl_pop_framebuffer ();
-
  cogl_object_unref (bitmap);
 }

--- a/clutter/clutter/clutter-stage.h
+++ b/clutter/clutter/clutter-stage.h
@@ -206,9 +206,6 @@ guchar *        clutter_stage_read_pixels                       (ClutterStage
                                                                 gint                   height);

 CLUTTER_EXPORT
-void            clutter_stage_get_redraw_clip_bounds            (ClutterStage          *stage,
-                                                                 cairo_rectangle_int_t *clip);
-CLUTTER_EXPORT
 cairo_region_t * clutter_stage_get_redraw_clip                  (ClutterStage          *stage);
 CLUTTER_EXPORT
 void            clutter_stage_ensure_viewport                   (ClutterStage          *stage);
--- a/clutter/clutter/clutter-text.c
+++ b/clutter/clutter/clutter-text.c
@@ -178,17 +178,17 @@ struct _ClutterTextPrivate
  guint password_hint_timeout;

  /* Signal handler for when the backend changes its font settings */
-  guint settings_changed_id;
+  gulong settings_changed_id;

  /* Signal handler for when the :text-direction changes */
-  guint direction_changed_id;
+  gulong direction_changed_id;

  ClutterInputFocus *input_focus;
  ClutterInputContentHintFlags input_hints;
  ClutterInputContentPurpose input_purpose;

  /* Signal handler for when the :resource-scale changes */
-  guint resource_scale_changed_id;
+  gulong resource_scale_changed_id;

  /* bitfields */
  guint alignment               : 2;
@@ -1758,30 +1758,12 @@ clutter_text_dispose (GObject *gobject)
  /* get rid of the entire cache */
  clutter_text_dirty_cache (self);

-  if (priv->direction_changed_id)
-    {
-      g_signal_handler_disconnect (self, priv->direction_changed_id);
-      priv->direction_changed_id = 0;
-    }
+  g_clear_signal_handler (&priv->direction_changed_id, self);
+  g_clear_signal_handler (&priv->resource_scale_changed_id, self);
+  g_clear_signal_handler (&priv->settings_changed_id,
+                          clutter_get_default_backend ());

-  if (priv->resource_scale_changed_id)
-    {
-      g_signal_handler_disconnect (self, priv->resource_scale_changed_id);
-      priv->resource_scale_changed_id = 0;
-    }
-
-  if (priv->settings_changed_id)
-    {
-      g_signal_handler_disconnect (clutter_get_default_backend (),
-                                   priv->settings_changed_id);
-      priv->settings_changed_id = 0;
-    }
-
-  if (priv->password_hint_id)
-    {
-      g_source_remove (priv->password_hint_id);
-      priv->password_hint_id = 0;
-    }
+  g_clear_handle_id (&priv->password_hint_id, g_source_remove);

  clutter_text_set_buffer (self, NULL);

@@ -2009,7 +1991,7 @@ selection_paint (ClutterText     *self,
                                color->blue,
                                paint_opacity * color->alpha / 255);

-      cogl_pango_render_layout (layout, priv->text_x, 0, &cogl_color, 0);
+      cogl_pango_show_layout (fb, layout, priv->text_x, 0, &cogl_color);

      cogl_framebuffer_pop_clip (fb);
    }
@@ -2464,8 +2446,7 @@ clutter_text_key_press (ClutterActor    *actor,

          if (priv->show_password_hint)
            {
-              if (priv->password_hint_id != 0)
-                g_source_remove (priv->password_hint_id);
+              g_clear_handle_id (&priv->password_hint_id, g_source_remove);

              priv->password_hint_visible = TRUE;
              priv->password_hint_id =
@@ -2567,7 +2548,8 @@ clutter_text_compute_layout_offsets (ClutterText           *self,
 #define TEXT_PADDING    2

 static void
-clutter_text_paint (ClutterActor *self)
+clutter_text_paint (ClutterActor        *self,
+                    ClutterPaintContext *paint_context)
 {
  ClutterText *text = CLUTTER_TEXT (self);
  ClutterTextPrivate *priv = text->priv;
@@ -2585,7 +2567,7 @@ clutter_text_paint (ClutterActor *self)
  float alloc_height;
  float resource_scale;

-  fb = cogl_get_draw_framebuffer ();
+  fb = clutter_paint_context_get_framebuffer (paint_context);

  /* Note that if anything in this paint method changes it needs to be
     reflected in the get_paint_volume implementation which is tightly
@@ -2773,7 +2755,7 @@ clutter_text_paint (ClutterActor *self)
                            priv->text_color.green,
                            priv->text_color.blue,
                            real_opacity);
-  cogl_pango_render_layout (layout, priv->text_x, priv->text_y, &color, 0);
+  cogl_pango_show_layout (fb, layout, priv->text_x, priv->text_y, &color);

  selection_paint (text, fb);

--- a/clutter/clutter/clutter-texture.h
+++ b/clutter/clutter/clutter-texture.h
@@ -1,130 +0,0 @@
-/*
- * Clutter.
- *
- * An OpenGL based 'interactive canvas' library.
- *
- * Authored By Matthew Allum  <mallum@openedhand.com>
- *
- * Copyright (C) 2006 OpenedHand
- *
- * 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.1 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/>.
- */
-
-#if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
-#error "Only <clutter/clutter.h> can be included directly."
-#endif
-
-#ifndef __CLUTTER_TEXTURE_H__
-#define __CLUTTER_TEXTURE_H__
-
-#include <cogl/cogl.h>
-#include <clutter/clutter-actor.h>
-
-G_BEGIN_DECLS
-
-#define CLUTTER_TYPE_TEXTURE            (clutter_texture_get_type ())
-#define CLUTTER_TEXTURE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), CLUTTER_TYPE_TEXTURE, ClutterTexture))
-#define CLUTTER_TEXTURE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), CLUTTER_TYPE_TEXTURE, ClutterTextureClass))
-#define CLUTTER_IS_TEXTURE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), CLUTTER_TYPE_TEXTURE))
-#define CLUTTER_IS_TEXTURE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), CLUTTER_TYPE_TEXTURE))
-#define CLUTTER_TEXTURE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), CLUTTER_TYPE_TEXTURE, ClutterTextureClass))
-
-/**
- * ClutterTextureError:
- * @CLUTTER_TEXTURE_ERROR_OUT_OF_MEMORY: OOM condition
- * @CLUTTER_TEXTURE_ERROR_NO_YUV: YUV operation attempted but no YUV support
- *   found
- * @CLUTTER_TEXTURE_ERROR_BAD_FORMAT: The requested format for
- * clutter_texture_set_from_rgb_data is unsupported.
- *
- * Error enumeration for #ClutterTexture
- *
- * Since: 0.4
- */
-typedef enum
-{
-  CLUTTER_TEXTURE_ERROR_OUT_OF_MEMORY,
-  CLUTTER_TEXTURE_ERROR_NO_YUV,
-  CLUTTER_TEXTURE_ERROR_BAD_FORMAT
-} ClutterTextureError;
-
-/**
- * CLUTTER_TEXTURE_ERROR:
- *
- * Error domain for #ClutterTexture errors
- *
- * Since: 0.4
- */
-#define CLUTTER_TEXTURE_ERROR   (clutter_texture_error_quark ())
-CLUTTER_EXPORT
-GQuark clutter_texture_error_quark (void);
-
-typedef struct _ClutterTexture        ClutterTexture;
-typedef struct _ClutterTextureClass   ClutterTextureClass;
-typedef struct _ClutterTexturePrivate ClutterTexturePrivate;
-
-/**
- * ClutterTexture:
- *
- * The #ClutterTexture structure contains only private data
- * and should be accessed using the provided API
- *
- * Since: 0.2
- */
-struct _ClutterTexture
-{
-  /*< private >*/
-  ClutterActor         parent;
-
-  ClutterTexturePrivate *priv;
-};
-
-/**
- * ClutterTextureClass:
- * @size_change: handler for the #ClutterTexture::size-change signal
- * @pixbuf_change: handler for the #ClutterTexture::pixbuf-change signal
- * @load_finished: handler for the #ClutterTexture::load-finished signal
- *
- * The #ClutterTextureClass structure contains only private data
- *
- * Since: 0.2
- */
-struct _ClutterTextureClass
-{
-  /*< private >*/
-  ClutterActorClass parent_class;
-
-  /*< public >*/
-  void (* size_change)   (ClutterTexture *texture,
-                          gint            width,
-                          gint            height);
-  void (* pixbuf_change) (ClutterTexture *texture);
-  void (* load_finished) (ClutterTexture *texture,
-                          const GError   *error);
-
-  /*< private >*/
-  /* padding, for future expansion */
-  void (*_clutter_texture1) (void);
-  void (*_clutter_texture2) (void);
-  void (*_clutter_texture3) (void);
-  void (*_clutter_texture4) (void);
-  void (*_clutter_texture5) (void);
-};
-
-CLUTTER_EXPORT
-GType clutter_texture_get_type (void) G_GNUC_CONST;
-
-G_END_DECLS
-
-#endif /* __CLUTTER_TEXTURE_H__ */
--- a/clutter/clutter/clutter-timeline.c
+++ b/clutter/clutter/clutter-timeline.c
@@ -1038,15 +1038,15 @@ clutter_timeline_do_frame (ClutterTimeline *timeline)
       * to correpondingly reduce elapsed_time_delta to reflect the correct
       * range of times */
      if (priv->direction == CLUTTER_TIMELINE_FORWARD)
-	{
-	  elapsed_time_delta -= (priv->elapsed_time - priv->duration);
-	  priv->elapsed_time = priv->duration;
-	}
+        {
+          elapsed_time_delta -= (priv->elapsed_time - priv->duration);
+          priv->elapsed_time = priv->duration;
+        }
      else if (priv->direction == CLUTTER_TIMELINE_BACKWARD)
-	{
-	  elapsed_time_delta -= - priv->elapsed_time;
-	  priv->elapsed_time = 0;
-	}
+        {
+          elapsed_time_delta -= - priv->elapsed_time;
+          priv->elapsed_time = 0;
+        }

      end_msecs = priv->elapsed_time;

@@ -1756,12 +1756,12 @@ _clutter_timeline_do_tick (ClutterTimeline *timeline,
        }

      if (msecs != 0)
-	{
-	  /* Avoid accumulating error */
+        {
+          /* Avoid accumulating error */
          priv->last_frame_time += msecs;
-	  priv->msecs_delta = msecs;
-	  clutter_timeline_do_frame (timeline);
-	}
+          priv->msecs_delta = msecs;
+          clutter_timeline_do_frame (timeline);
+        }
    }
 }

--- a/clutter/clutter/clutter.h
+++ b/clutter/clutter/clutter.h
@@ -103,7 +103,6 @@
 #include "clutter-stage-manager.h"
 #include "clutter-stage-view.h"
 #include "clutter-tap-action.h"
-#include "clutter-texture.h"
 #include "clutter-text.h"
 #include "clutter-timeline.h"
 #include "clutter-transition-group.h"
--- a/clutter/clutter/cogl/clutter-stage-cogl.c
+++ b/clutter/clutter/cogl/clutter-stage-cogl.c
@@ -869,7 +869,6 @@ clutter_stage_cogl_redraw_view (ClutterStageWindow *stage_window,
        }
    }

-  cogl_push_framebuffer (fb);
  if (use_clipped_redraw && clip_region_empty)
    {
      CLUTTER_NOTE (CLIPPING, "Empty stage output paint\n");
@@ -879,27 +878,34 @@ clutter_stage_cogl_redraw_view (ClutterStageWindow *stage_window,
      cairo_rectangle_int_t clip_rect;
      cairo_rectangle_int_t scissor_rect;

-      cairo_region_get_extents (fb_clip_region, &clip_rect);
-
-      calculate_scissor_region (&clip_rect,
-                                subpixel_compensation,
-                                fb_width, fb_height,
-                                &scissor_rect);
-
-      CLUTTER_NOTE (CLIPPING,
-                    "Stage clip pushed: x=%d, y=%d, width=%d, height=%d\n",
-                    scissor_rect.x,
-                    scissor_rect.y,
-                    scissor_rect.width,
-                    scissor_rect.height);
-
      stage_cogl->using_clipped_redraw = TRUE;

-      cogl_framebuffer_push_scissor_clip (fb,
-                                          scissor_rect.x,
-                                          scissor_rect.y,
-                                          scissor_rect.width,
-                                          scissor_rect.height);
+      if (cairo_region_num_rectangles (fb_clip_region) == 1)
+        {
+          cairo_region_get_extents (fb_clip_region, &clip_rect);
+
+          calculate_scissor_region (&clip_rect,
+                                    subpixel_compensation,
+                                    fb_width, fb_height,
+                                    &scissor_rect);
+
+          CLUTTER_NOTE (CLIPPING,
+                        "Stage clip pushed: x=%d, y=%d, width=%d, height=%d\n",
+                        scissor_rect.x,
+                        scissor_rect.y,
+                        scissor_rect.width,
+                        scissor_rect.height);
+
+          cogl_framebuffer_push_scissor_clip (fb,
+                                              scissor_rect.x,
+                                              scissor_rect.y,
+                                              scissor_rect.width,
+                                              scissor_rect.height);
+        }
+      else
+        {
+          cogl_framebuffer_push_region_clip (fb, fb_clip_region);
+        }

      paint_stage (stage_cogl, view, fb_clip_region);

@@ -953,7 +959,6 @@ clutter_stage_cogl_redraw_view (ClutterStageWindow *stage_window,
          cairo_region_destroy (view_region);
        }
    }
-  cogl_pop_framebuffer ();

  cairo_region_get_extents (redraw_clip, &redraw_rect);

--- a/clutter/clutter/cogl/clutter-stage-cogl.h
+++ b/clutter/clutter/cogl/clutter-stage-cogl.h
@@ -5,12 +5,6 @@
 #include <clutter/clutter-backend.h>
 #include <clutter/clutter-stage.h>

-#ifdef COGL_HAS_X11_SUPPORT
-#include <X11/Xlib.h>
-#include <X11/Xatom.h>
-#include <X11/Xutil.h>
-#endif
-
 #include "clutter/clutter-stage-window.h"

 G_BEGIN_DECLS
--- a/clutter/clutter/deprecated/clutter-actor.h
+++ b/clutter/clutter/deprecated/clutter-actor.h
@@ -33,16 +33,9 @@

 G_BEGIN_DECLS

-CLUTTER_DEPRECATED
-guint32         clutter_actor_get_gid                           (ClutterActor          *self);
-
 CLUTTER_DEPRECATED
 ClutterActor *  clutter_get_actor_by_gid                        (guint32                id_);

-CLUTTER_DEPRECATED_FOR(clutter_actor_remove_child() and clutter_actor_add_child())
-void            clutter_actor_reparent                          (ClutterActor          *self,
-                                                                 ClutterActor          *new_parent);
-
 CLUTTER_DEPRECATED_FOR(clutter_actor_add_child)
 void            clutter_actor_set_parent                        (ClutterActor          *self,
                                                                 ClutterActor          *parent);
@@ -50,20 +43,6 @@ void            clutter_actor_set_parent                        (ClutterActor
 CLUTTER_DEPRECATED_FOR(clutter_actor_remove_child)
 void            clutter_actor_unparent                          (ClutterActor          *self);

-CLUTTER_DEPRECATED_FOR(clutter_actor_set_child_above_sibling)
-void            clutter_actor_raise                             (ClutterActor          *self,
-                                                                 ClutterActor          *below);
-
-CLUTTER_DEPRECATED_FOR(clutter_actor_set_child_below_sibling)
-void            clutter_actor_lower                             (ClutterActor          *self,
-                                                                 ClutterActor          *above);
-
-CLUTTER_DEPRECATED_FOR(clutter_actor_set_child_above_sibling() with NULL sibling)
-void            clutter_actor_raise_top                         (ClutterActor          *self);
-
-CLUTTER_DEPRECATED_FOR(clutter_actor_set_child_below_sibling() with NULL sibling)
-void            clutter_actor_lower_bottom                      (ClutterActor          *self);
-
 CLUTTER_DEPRECATED
 void            clutter_actor_push_internal                     (ClutterActor          *self);

@@ -73,9 +52,6 @@ void            clutter_actor_pop_internal                      (ClutterActor
 CLUTTER_DEPRECATED
 void            clutter_actor_show_all                          (ClutterActor          *self);

-CLUTTER_DEPRECATED
-void            clutter_actor_hide_all                          (ClutterActor          *self);
-
 CLUTTER_DEPRECATED_FOR(clutter_actor_set_z_position)
 void            clutter_actor_set_depth                         (ClutterActor          *self,
                                                                 gfloat                 depth);
@@ -109,11 +85,6 @@ void            clutter_actor_set_scale_full                    (ClutterActor
                                                                 gdouble                scale_y,
                                                                 gfloat                 center_x,
                                                                 gfloat                 center_y);
-CLUTTER_DEPRECATED_FOR(clutter_actor_set_scale and clutter_actor_set_pivot_point)
-void            clutter_actor_set_scale_with_gravity            (ClutterActor          *self,
-                                                                 gdouble                scale_x,
-                                                                 gdouble                scale_y,
-                                                                 ClutterGravity         gravity);
 CLUTTER_DEPRECATED_FOR(clutter_actor_get_pivot_point)
 void            clutter_actor_get_scale_center                  (ClutterActor          *self,
                                                                 gfloat                *center_x,
@@ -130,10 +101,6 @@ void            clutter_actor_move_anchor_point                 (ClutterActor
                                                                 gfloat                 anchor_x,
                                                                 gfloat                 anchor_y);
 CLUTTER_DEPRECATED
-void            clutter_actor_get_anchor_point                  (ClutterActor          *self,
-                                                                 gfloat                *anchor_x,
-                                                                 gfloat                *anchor_y);
-CLUTTER_DEPRECATED
 ClutterGravity  clutter_actor_get_anchor_point_gravity          (ClutterActor          *self);
 CLUTTER_DEPRECATED
 void            clutter_actor_set_anchor_point_from_gravity     (ClutterActor          *self,
@@ -141,9 +108,6 @@ void            clutter_actor_set_anchor_point_from_gravity     (ClutterActor
 CLUTTER_DEPRECATED
 void            clutter_actor_move_anchor_point_from_gravity    (ClutterActor          *self,
                                                                 ClutterGravity         gravity);
-CLUTTER_DEPRECATED
-void            clutter_actor_get_transformation_matrix         (ClutterActor          *self,
-                                                                 ClutterMatrix         *matrix);

 G_END_DECLS

--- a/clutter/clutter/deprecated/clutter-alpha.c
+++ b/clutter/clutter/deprecated/clutter-alpha.c
@@ -43,9 +43,8 @@
 *
 * You should provide a #ClutterTimeline and bind it to the #ClutterAlpha
 * instance using clutter_alpha_set_timeline(). You should also set an
- * "animation mode", either by using the #ClutterAnimationMode values that
- * Clutter itself provides or by registering custom functions using
- * clutter_alpha_register_func().
+ * "animation mode", by using the #ClutterAnimationMode values that
+ * Clutter provides.
 *
 * Instead of a #ClutterAnimationMode you may provide a function returning
 * the alpha value depending on the progress of the timeline, using
@@ -362,9 +361,8 @@ clutter_alpha_class_init (ClutterAlphaClass *klass)
  /**
   * ClutterAlpha:mode:
   *
-   * The progress function logical id - either a value from the
-   * #ClutterAnimationMode enumeration or a value returned by
-   * clutter_alpha_register_func().
+   * The progress function logical id - a value from the
+   * #ClutterAnimationMode enumeration.
   *
   * If %CLUTTER_CUSTOM_MODE is used then the function set using
   * clutter_alpha_set_closure() or clutter_alpha_set_func()
@@ -679,44 +677,6 @@ clutter_alpha_new_full (ClutterTimeline *timeline,
                       NULL);
 }

-/**
- * clutter_alpha_new_with_func:
- * @timeline: a #ClutterTimeline
- * @func: a #ClutterAlphaFunc
- * @data: data to pass to the function, or %NULL
- * @destroy: function to call when removing the alpha function, or %NULL
- *
- * Creates a new #ClutterAlpha instances and sets the timeline
- * and the alpha function.
- *
- * This function will not register @func as a global alpha function.
- *
- * See also clutter_alpha_set_timeline() and clutter_alpha_set_func().
- *
- * Return value: the newly created #ClutterAlpha
- *
- * Since: 1.0
- *
- * Deprecated: 1.12: Use #ClutterTimeline instead
- */
-ClutterAlpha *
-clutter_alpha_new_with_func (ClutterTimeline  *timeline,
-                             ClutterAlphaFunc  func,
-                             gpointer          data,
-                             GDestroyNotify    destroy)
-{
-  ClutterAlpha *retval;
-
-  g_return_val_if_fail (CLUTTER_IS_TIMELINE (timeline), NULL);
-  g_return_val_if_fail (func != NULL, NULL);
-
-  retval = clutter_alpha_new ();
-  clutter_alpha_set_timeline (retval, timeline);
-  clutter_alpha_set_func (retval, func, data, destroy);
-
-  return retval;
-}
-
 /**
 * clutter_alpha_get_mode:
 * @alpha: a #ClutterAlpha
@@ -771,8 +731,7 @@ clutter_alpha_easing_func (ClutterAlpha *alpha,
 * @mode: a #ClutterAnimationMode
 *
 * Sets the progress function of @alpha using the symbolic value
- * of @mode, as taken by the #ClutterAnimationMode enumeration or
- * using the value returned by clutter_alpha_register_func().
+ * of @mode, as taken by the #ClutterAnimationMode enumeration.
 *
 * Since: 1.0
 *
@@ -826,9 +785,7 @@ clutter_alpha_set_mode (ClutterAlpha *alpha,

      if (G_UNLIKELY (clutter_alphas == NULL))
        {
-          g_warning ("No alpha functions defined for ClutterAlpha to use. "
-                     "Use clutter_alpha_register_func() to register an "
-                     "alpha function.");
+          g_warning ("No alpha functions defined for ClutterAlpha to use. ");
          return;
        }

@@ -860,81 +817,3 @@ clutter_alpha_set_mode (ClutterAlpha *alpha,

  g_object_notify_by_pspec (G_OBJECT (alpha), obj_props[PROP_MODE]);
 }
-
-static gulong
-register_alpha_internal (AlphaData *alpha_data)
-{
-  if (G_UNLIKELY (clutter_alphas == NULL))
-    clutter_alphas = g_ptr_array_new ();
-
-  g_ptr_array_add (clutter_alphas, alpha_data);
-
-  return clutter_alphas->len + CLUTTER_ANIMATION_LAST;
-}
-
-/**
- * clutter_alpha_register_func: (skip)
- * @func: a #ClutterAlphaFunc
- * @data: user data to pass to @func, or %NULL
- *
- * Registers a global alpha function and returns its logical id
- * to be used by clutter_alpha_set_mode() or by #ClutterAnimation.
- *
- * The logical id is always greater than %CLUTTER_ANIMATION_LAST.
- *
- * Return value: the logical id of the alpha function
- *
- * Since: 1.0
- *
- * Deprecated: 1.12: There is no direct replacement for this
- *   function. Use clutter_timeline_set_progress_func() on each
- *   specific #ClutterTimeline instance
- */
-gulong
-clutter_alpha_register_func (ClutterAlphaFunc func,
-                             gpointer         data)
-{
-  AlphaData *alpha_data;
-
-  g_return_val_if_fail (func != NULL, 0);
-
-  alpha_data = g_slice_new (AlphaData);
-  alpha_data->closure_set = FALSE;
-  alpha_data->func = func;
-  alpha_data->data = data;
-
-  return register_alpha_internal (alpha_data);
-}
-
-/**
- * clutter_alpha_register_closure: (rename-to clutter_alpha_register_func)
- * @closure: a #GClosure
- *
- * #GClosure variant of clutter_alpha_register_func().
- *
- * Registers a global alpha function and returns its logical id
- * to be used by clutter_alpha_set_mode() or by #ClutterAnimation.
- *
- * The logical id is always greater than %CLUTTER_ANIMATION_LAST.
- *
- * Return value: the logical id of the alpha function
- *
- * Since: 1.0
- *
- * Deprecated: 1.12: There is no direct replacement for this
- *   function. Use clutter_timeline_set_progress_func() on each
- *   specific #ClutterTimeline instance
- */
-gulong
-clutter_alpha_register_closure (GClosure *closure)
-{
-  AlphaData *alpha_data;
-
-  g_return_val_if_fail (closure != NULL, 0);
-
-  alpha_data = g_slice_new (AlphaData);
-  alpha_data->closure_set = TRUE;
-  alpha_data->closure = closure;
-
-  return register_alpha_internal (alpha_data);
-}
--- a/clutter/clutter/deprecated/clutter-alpha.h
+++ b/clutter/clutter/deprecated/clutter-alpha.h
@@ -113,12 +113,6 @@ CLUTTER_DEPRECATED
 ClutterAlpha *   clutter_alpha_new_full         (ClutterTimeline  *timeline,
                                                 gulong            mode);
 CLUTTER_DEPRECATED
-ClutterAlpha *   clutter_alpha_new_with_func    (ClutterTimeline  *timeline,
-                                                 ClutterAlphaFunc  func,
-                                                 gpointer          data,
-                                                 GDestroyNotify    destroy);
-
-CLUTTER_DEPRECATED
 gdouble          clutter_alpha_get_alpha        (ClutterAlpha     *alpha);
 CLUTTER_DEPRECATED
 void             clutter_alpha_set_func         (ClutterAlpha     *alpha,
@@ -139,12 +133,6 @@ void             clutter_alpha_set_mode         (ClutterAlpha     *alpha,
 CLUTTER_DEPRECATED
 gulong           clutter_alpha_get_mode         (ClutterAlpha     *alpha);

-CLUTTER_DEPRECATED
-gulong           clutter_alpha_register_func    (ClutterAlphaFunc  func,
-                                                 gpointer          data);
-CLUTTER_DEPRECATED
-gulong           clutter_alpha_register_closure (GClosure         *closure);
-
 G_END_DECLS

 #endif /* __CLUTTER_ALPHA_H__ */
--- a/clutter/clutter/deprecated/clutter-animatable.h
+++ b/clutter/clutter/deprecated/clutter-animatable.h
@@ -1,47 +0,0 @@
-/*
- * Clutter.
- *
- * An OpenGL based 'interactive canvas' library.
- *
- * Copyright (C) 2009  Intel Corporation.
- *
- * 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/>.
- *
- * Author:
- *   Emmanuele Bassi <ebassi@linux.intel.com>
- */
-
-#ifndef __CLUTTER_ANIMATABLE_DEPRECATED_H__
-#define __CLUTTER_ANIMATABLE_DEPRECATED_H__
-
-#if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
-#error "Only <clutter/clutter.h> can be included directly."
-#endif
-
-#include <clutter/clutter-animatable.h>
-
-G_BEGIN_DECLS
-
-CLUTTER_DEPRECATED_FOR(clutter_animatable_interpolate_value)
-gboolean        clutter_animatable_animate_property     (ClutterAnimatable *animatable,
-                                                         ClutterAnimation  *animation,
-                                                         const gchar       *property_name,
-                                                         const GValue      *initial_value,
-                                                         const GValue      *final_value,
-                                                         gdouble            progress,
-                                                         GValue            *value);
-
-G_END_DECLS
-
-#endif /* __CLUTTER_ANIMATABLE_DEPRECATED_H__ */
--- a/clutter/clutter/deprecated/clutter-animation.c
+++ b/clutter/clutter/deprecated/clutter-animation.c
@@ -50,9 +50,6 @@
 * emitted if #ClutterAnimation:loop is set to %TRUE - that is, a looping
 * animation never completes.
 *
- * If your animation depends on user control you can force its completion
- * using clutter_animation_completed().
- *
 * If the #GObject instance bound to a #ClutterAnimation implements the
 * #ClutterAnimatable interface it is possible for that instance to
 * control the way the initial and final states are interpolated.
@@ -638,231 +635,6 @@ clutter_animation_update_property_internal (ClutterAnimation *animation,
                        g_object_ref_sink (interval));
 }

-static GParamSpec *
-clutter_animation_validate_bind (ClutterAnimation *animation,
-                                 const char       *property_name,
-                                 GType             argtype)
-{
-  ClutterAnimationPrivate *priv;
-  GParamSpec *pspec;
-  GType pspec_type;
-
-  priv = animation->priv;
-
-  if (G_UNLIKELY (!priv->object))
-    {
-      g_warning ("Cannot bind property '%s': the animation has no "
-                 "object set. You need to call clutter_animation_set_object() "
-                 "first to be able to bind a property",
-                 property_name);
-      return NULL;
-    }
-
-  if (G_UNLIKELY (clutter_animation_has_property (animation, property_name)))
-    {
-      g_warning ("Cannot bind property '%s': the animation already has "
-                 "a bound property with the same name",
-                 property_name);
-      return NULL;
-    }
-
-  if (CLUTTER_IS_ANIMATABLE (priv->object))
-    {
-      ClutterAnimatable *animatable = CLUTTER_ANIMATABLE (priv->object);
-
-      pspec = clutter_animatable_find_property (animatable, property_name);
-    }
-  else
-    {
-      GObjectClass *klass = G_OBJECT_GET_CLASS (priv->object);
-
-      pspec = g_object_class_find_property (klass, property_name);
-    }
-
-  if (pspec == NULL)
-    {
-      g_warning ("Cannot bind property '%s': objects of type '%s' have "
-                 "no such property",
-                 property_name,
-                 g_type_name (G_OBJECT_TYPE (priv->object)));
-      return NULL;
-    }
-
-  if (!(pspec->flags & G_PARAM_WRITABLE))
-    {
-      g_warning ("Cannot bind property '%s': the property is not writable",
-                 property_name);
-      return NULL;
-    }
-
-  pspec_type = G_PARAM_SPEC_VALUE_TYPE (pspec);
-
-  if (g_value_type_transformable (argtype, pspec_type))
-    return pspec;
-  else
-    {
-      g_warning ("Cannot bind property '%s': the interval value of "
-                 "type '%s' is not compatible with the property value "
-                 "of type '%s'",
-                 property_name,
-                 g_type_name (argtype),
-                 g_type_name (pspec_type));
-      return NULL;
-    }
-}
-
-/**
- * clutter_animation_bind_interval:
- * @animation: a #ClutterAnimation
- * @property_name: the property to control
- * @interval: (transfer full): a #ClutterInterval
- *
- * Binds @interval to the @property_name of the #GObject
- * attached to @animation. The #ClutterAnimation will take
- * ownership of the passed #ClutterInterval.  For more information
- * about animations, see clutter_actor_animate().
- *
- * If you need to update the interval instance use
- * clutter_animation_update_interval() instead.
- *
- * Return value: (transfer none): The animation itself.
- * Since: 1.0
- * Deprecated: 1.12: Use #ClutterPropertyTransition instead
- */
-ClutterAnimation *
-clutter_animation_bind_interval (ClutterAnimation *animation,
-                                 const gchar      *property_name,
-                                 ClutterInterval  *interval)
-{
-  GParamSpec *pspec;
-
-  g_return_val_if_fail (CLUTTER_IS_ANIMATION (animation), NULL);
-  g_return_val_if_fail (property_name != NULL, NULL);
-  g_return_val_if_fail (CLUTTER_IS_INTERVAL (interval), NULL);
-
-  pspec = clutter_animation_validate_bind (animation, property_name,
-                                           clutter_interval_get_value_type (interval));
-  if (pspec == NULL)
-    return NULL;
-
-  clutter_animation_bind_property_internal (animation, property_name,
-                                            pspec,
-                                            interval);
-
-  return animation;
-}
-
-
-/**
- * clutter_animation_bind:
- * @animation: a #ClutterAnimation
- * @property_name: the property to control
- * @final: The final value of the property
- *
- * Adds a single property with name @property_name to the
- * animation @animation.  For more information about animations,
- * see clutter_actor_animate().
- *
- * This method returns the animation primarily to make chained
- * calls convenient in language bindings.
- *
- * Return value: (transfer none): The animation itself.
- *
- * Since: 1.0
- * Deprecated: 1.12: Use #ClutterPropertyTransition instead
- */
-ClutterAnimation *
-clutter_animation_bind (ClutterAnimation *animation,
-                        const gchar      *property_name,
-                        const GValue     *final)
-{
-  ClutterAnimationPrivate *priv;
-  GParamSpec *pspec;
-  ClutterInterval *interval;
-  GType type;
-  GValue initial = G_VALUE_INIT;
-  GValue real_final = G_VALUE_INIT;
-
-  g_return_val_if_fail (CLUTTER_IS_ANIMATION (animation), NULL);
-  g_return_val_if_fail (property_name != NULL, NULL);
-
-  priv = animation->priv;
-
-  type = G_VALUE_TYPE (final);
-  pspec = clutter_animation_validate_bind (animation, property_name, type);
-  if (pspec == NULL)
-    return NULL;
-
-  g_value_init (&real_final, G_PARAM_SPEC_VALUE_TYPE (pspec));
-  if (!g_value_transform (final, &real_final))
-    {
-      g_value_unset (&real_final);
-      g_warning ("Unable to transform the value of type '%s' to a value "
-                 "of '%s' compatible with the property '%s'of the object "
-                 "of type '%s'",
-                 g_type_name (type),
-                 g_type_name (G_PARAM_SPEC_VALUE_TYPE (pspec)),
-                 property_name,
-                 G_OBJECT_TYPE_NAME (priv->object));
-      return NULL;
-    }
-
-  g_value_init (&initial, G_PARAM_SPEC_VALUE_TYPE (pspec));
-
-  if (CLUTTER_IS_ANIMATABLE (priv->object))
-    clutter_animatable_get_initial_state (CLUTTER_ANIMATABLE (priv->object),
-                                          property_name,
-                                          &initial);
-  else
-    g_object_get_property (priv->object, property_name, &initial);
-
-  interval = clutter_interval_new_with_values (G_PARAM_SPEC_VALUE_TYPE (pspec),
-                                               &initial,
-                                               &real_final);
-
-  g_value_unset (&initial);
-  g_value_unset (&real_final);
-
-  clutter_animation_bind_property_internal (animation, property_name,
-                                            pspec,
-                                            interval);
-
-  return animation;
-}
-
-
-/**
- * clutter_animation_unbind_property:
- * @animation: a #ClutterAnimation
- * @property_name: name of the property
- *
- * Removes @property_name from the list of animated properties.
- *
- * Since: 1.0
- * Deprecated: 1.12: Use #ClutterPropertyTransition instead
- */
-void
-clutter_animation_unbind_property (ClutterAnimation *animation,
-                                   const gchar      *property_name)
-{
-  ClutterAnimationPrivate *priv;
-
-  g_return_if_fail (CLUTTER_IS_ANIMATION (animation));
-  g_return_if_fail (property_name != NULL);
-
-  priv = animation->priv;
-
-  if (!clutter_animation_has_property (animation, property_name))
-    {
-      g_warning ("Cannot unbind property '%s': the animation has "
-                 "no bound property with that name",
-                 property_name);
-      return;
-    }
-
-  g_hash_table_remove (priv->properties, property_name);
-}
-
 /**
 * clutter_animation_has_property:
 * @animation: a #ClutterAnimation
@@ -890,137 +662,6 @@ clutter_animation_has_property (ClutterAnimation *animation,
  return g_hash_table_lookup (priv->properties, property_name) != NULL;
 }

-/**
- * clutter_animation_update_interval:
- * @animation: a #ClutterAnimation
- * @property_name: name of the property
- * @interval: a #ClutterInterval
- *
- * Changes the @interval for @property_name. The #ClutterAnimation
- * will take ownership of the passed #ClutterInterval.
- *
- * Since: 1.0
- * Deprecated: 1.12: Use #ClutterPropertyTransition instead
- */
-void
-clutter_animation_update_interval (ClutterAnimation *animation,
-                                   const gchar      *property_name,
-                                   ClutterInterval  *interval)
-{
-  ClutterAnimationPrivate *priv;
-  GParamSpec *pspec;
-  GType pspec_type, int_type;
-
-  g_return_if_fail (CLUTTER_IS_ANIMATION (animation));
-  g_return_if_fail (property_name != NULL);
-  g_return_if_fail (CLUTTER_IS_INTERVAL (interval));
-
-  priv = animation->priv;
-
-  if (!clutter_animation_has_property (animation, property_name))
-    {
-      g_warning ("Cannot update property '%s': the animation has "
-                 "no bound property with that name",
-                 property_name);
-      return;
-    }
-
-  if (CLUTTER_IS_ANIMATABLE (priv->object))
-    {
-      ClutterAnimatable *animatable = CLUTTER_ANIMATABLE (priv->object);
-
-      pspec = clutter_animatable_find_property (animatable, property_name);
-    }
-  else
-    {
-      GObjectClass *klass = G_OBJECT_GET_CLASS (priv->object);
-
-      pspec = g_object_class_find_property (klass, property_name);
-    }
-
-  if (pspec == NULL)
-    {
-      g_warning ("Cannot update property '%s': objects of type '%s' have "
-                 "no such property",
-                 property_name,
-                 g_type_name (G_OBJECT_TYPE (priv->object)));
-      return;
-    }
-
-  pspec_type = G_PARAM_SPEC_VALUE_TYPE (pspec);
-  int_type = clutter_interval_get_value_type (interval);
-
-  if (!g_value_type_compatible (int_type, pspec_type) ||
-      !g_value_type_transformable (int_type, pspec_type))
-    {
-      g_warning ("Cannot update property '%s': the interval value of "
-                 "type '%s' is not compatible with the property value "
-                 "of type '%s'",
-                 property_name,
-                 g_type_name (int_type),
-                 g_type_name (pspec_type));
-      return;
-    }
-
-  clutter_animation_update_property_internal (animation, property_name,
-                                              pspec,
-                                              interval);
-}
-
-/**
- * clutter_animation_update:
- * @animation: a #ClutterAnimation
- * @property_name: name of the property
- * @final: The final value of the property
- *
- * Updates the @final value of the interval for @property_name
- *
- * Return value: (transfer none): The animation itself.
- *
- * Since: 1.0
- * Deprecated: 1.12: Use #ClutterPropertyTransition instead
- */
-ClutterAnimation *
-clutter_animation_update (ClutterAnimation *animation,
-                          const gchar      *property_name,
-                          const GValue     *final)
-{
-  ClutterInterval *interval;
-  GType int_type;
-
-  g_return_val_if_fail (CLUTTER_IS_ANIMATION (animation), NULL);
-  g_return_val_if_fail (property_name != NULL, NULL);
-  g_return_val_if_fail (final != NULL, NULL);
-  g_return_val_if_fail (G_VALUE_TYPE (final) != G_TYPE_INVALID, NULL);
-
-  interval = clutter_animation_get_interval (animation, property_name);
-  if (interval == NULL)
-    {
-      g_warning ("Cannot update property '%s': the animation has "
-                 "no bound property with that name",
-                 property_name);
-      return NULL;
-    }
-
-  int_type = clutter_interval_get_value_type (interval);
-
-  if (!g_value_type_compatible (G_VALUE_TYPE (final), int_type) ||
-      !g_value_type_transformable (G_VALUE_TYPE (final), int_type))
-    {
-      g_warning ("Cannot update property '%s': the interval value of "
-                 "type '%s' is not compatible with the property value "
-                 "of type '%s'",
-                 property_name,
-                 g_type_name (int_type),
-                 g_type_name (G_VALUE_TYPE (final)));
-      return NULL;
-    }
-
-  clutter_interval_set_final_value (interval, final);
-
-  return animation;
-}
-
 /**
 * clutter_animation_get_interval:
 * @animation: a #ClutterAnimation
@@ -1284,10 +925,6 @@ out:
 * set the duration with clutter_animation_set_duration() and the
 * easing mode using clutter_animation_set_mode().
 *
- * Use clutter_animation_bind() or clutter_animation_bind_interval()
- * to define the properties to be animated. The interval and the
- * animated properties can be updated at runtime.
- *
 * The clutter_actor_animate() and relative family of functions provide
 * an easy way to animate a #ClutterActor and automatically manage the
 * lifetime of a #ClutterAnimation instance, so you should consider using
@@ -1341,25 +978,6 @@ clutter_animation_set_object (ClutterAnimation *animation,
  g_object_notify_by_pspec (G_OBJECT (animation), obj_props[PROP_OBJECT]);
 }

-/**
- * clutter_animation_get_object:
- * @animation: a #ClutterAnimation
- *
- * Retrieves the #GObject attached to @animation.
- *
- * Return value: (transfer none): a #GObject
- *
- * Since: 1.0
- * Deprecated: 1.12: Use #ClutterPropertyTransition instead
- */
-GObject *
-clutter_animation_get_object (ClutterAnimation *animation)
-{
-  g_return_val_if_fail (CLUTTER_IS_ANIMATION (animation), NULL);
-
-  return animation->priv->object;
-}
-
 /**
 * clutter_animation_set_mode:
 * @animation: a #ClutterAnimation
@@ -1650,76 +1268,6 @@ clutter_animation_get_timeline (ClutterAnimation *animation)
  return clutter_animation_get_timeline_internal (animation);
 }

-/**
- * clutter_animation_set_alpha:
- * @animation: a #ClutterAnimation
- * @alpha: a #ClutterAlpha, or %NULL to unset the current #ClutterAlpha
- *
- * Sets @alpha as the #ClutterAlpha used by @animation.
- *
- * If @alpha is not %NULL, the #ClutterAnimation will take ownership
- * of the #ClutterAlpha instance.
- *
- * Since: 1.0
- *
- * Deprecated: 1.10: Use clutter_animation_get_timeline() and
- *   clutter_timeline_set_progress_mode() instead.
- */
-void
-clutter_animation_set_alpha (ClutterAnimation *animation,
-                             ClutterAlpha     *alpha)
-{
-  g_return_if_fail (CLUTTER_IS_ANIMATION (animation));
-  g_return_if_fail (alpha == NULL || CLUTTER_IS_ALPHA (alpha));
-
-  clutter_animation_set_alpha_internal (animation, alpha);
-}
-
-/**
- * clutter_animation_get_alpha:
- * @animation: a #ClutterAnimation
- *
- * Retrieves the #ClutterAlpha used by @animation.
- *
- * Return value: (transfer none): the alpha object used by the animation
- *
- * Since: 1.0
- *
- * Deprecated: 1.10: Use clutter_animation_get_timeline() and
- *   clutter_timeline_get_progress_mode() instead.
- */
-ClutterAlpha *
-clutter_animation_get_alpha (ClutterAnimation *animation)
-{
-  g_return_val_if_fail (CLUTTER_IS_ANIMATION (animation), NULL);
-
-  return clutter_animation_get_alpha_internal (animation);
-}
-
-/**
- * clutter_animation_completed:
- * @animation: a #ClutterAnimation
- *
- * Emits the ::completed signal on @animation
- *
- * When using this function with a #ClutterAnimation created
- * by the clutter_actor_animate() family of functions, @animation
- * will be unreferenced and it will not be valid anymore,
- * unless g_object_ref() was called before calling this function
- * or unless a reference was taken inside a handler for the
- * #ClutterAnimation::completed signal
- *
- * Since: 1.0
- * Deprecated: 1.12: Use #ClutterPropertyTransition instead
- */
-void
-clutter_animation_completed (ClutterAnimation *animation)
-{
-  g_return_if_fail (CLUTTER_IS_ANIMATION (animation));
-
-  g_signal_emit (animation, animation_signals[COMPLETED], 0);
-}
-
 /*
 * starts the timeline
 */
@@ -1853,55 +1401,6 @@ done:
  g_value_unset (&real_value);
 }

-static void
-clutter_animation_setupv (ClutterAnimation    *animation,
-                          gint                 n_properties,
-                          const gchar * const  properties[],
-                          const GValue        *values)
-{
-  ClutterAnimationPrivate *priv = animation->priv;
-  ClutterAnimatable *animatable = NULL;
-  GObjectClass *klass = NULL;
-  gint i;
-
-  if (CLUTTER_IS_ANIMATABLE (priv->object))
-    animatable = CLUTTER_ANIMATABLE (priv->object);
-  else
-    klass = G_OBJECT_GET_CLASS (priv->object);
-
-  for (i = 0; i < n_properties; i++)
-    {
-      const gchar *property_name = properties[i];
-      GParamSpec *pspec;
-      gboolean is_fixed = FALSE;
-
-      if (g_str_has_prefix (property_name, "fixed::"))
-        {
-          property_name += 7; /* strlen("fixed::") */
-          is_fixed = TRUE;
-        }
-
-      if (animatable != NULL)
-        pspec = clutter_animatable_find_property (animatable, property_name);
-      else
-        pspec = g_object_class_find_property (klass, property_name);
-
-      if (pspec == NULL)
-        {
-          g_warning ("Cannot bind property '%s': objects of type '%s' do "
-                     "not have this property",
-                     property_name,
-                     g_type_name (G_OBJECT_TYPE (priv->object)));
-          break;
-        }
-
-      clutter_animation_setup_property (animation, property_name,
-                                        &values[i],
-                                        pspec,
-                                        is_fixed);
-    }
-}
-
 static const struct
 {
  const gchar *name;
@@ -2055,67 +1554,6 @@ animation_create_for_actor (ClutterActor *actor)
  return animation;
 }

-/**
- * clutter_actor_animate_with_alpha:
- * @actor: a #ClutterActor
- * @alpha: a #ClutterAlpha
- * @first_property_name: the name of a property
- * @...: a %NULL terminated list of property names and
- *   property values
- *
- * Animates the given list of properties of @actor between the current
- * value for each property and a new final value. The animation has a
- * definite behaviour given by the passed @alpha.
- *
- * See clutter_actor_animate() for further details.
- *
- * This function is useful if you want to use an existing #ClutterAlpha
- * to animate @actor.
- *
- * Return value: (transfer none): a #ClutterAnimation object. The object is owned by the
- *   #ClutterActor and should not be unreferenced with g_object_unref()
- *
- * Since: 1.0
- *
- * Deprecated: 1.10: Use the implicit transition for animatable properties
- *   in #ClutterActor instead. See clutter_actor_save_easing_state(),
- *   clutter_actor_set_easing_mode(), clutter_actor_set_easing_duration(),
- *   clutter_actor_set_easing_delay(), and clutter_actor_restore_easing_state().
- */
-ClutterAnimation *
-clutter_actor_animate_with_alpha (ClutterActor *actor,
-                                  ClutterAlpha *alpha,
-                                  const gchar  *first_property_name,
-                                  ...)
-{
-  ClutterAnimation *animation;
-  ClutterTimeline *timeline;
-  va_list args;
-
-  g_return_val_if_fail (CLUTTER_IS_ACTOR (actor), NULL);
-  g_return_val_if_fail (CLUTTER_IS_ALPHA (alpha), NULL);
-  g_return_val_if_fail (first_property_name != NULL, NULL);
-
-  timeline = clutter_alpha_get_timeline (alpha);
-  if (timeline == NULL)
-    {
-      g_warning ("The passed ClutterAlpha does not have an "
-                 "associated ClutterTimeline.");
-      return NULL;
-    }
-
-  animation = animation_create_for_actor (actor);
-  clutter_animation_set_alpha_internal (animation, alpha);
-
-  va_start (args, first_property_name);
-  clutter_animation_setup_valist (animation, first_property_name, args);
-  va_end (args);
-
-  clutter_animation_start (animation);
-
-  return animation;
-}
-
 /**
 * clutter_actor_animate_with_timeline:
 * @actor: a #ClutterActor
@@ -2359,263 +1797,3 @@ clutter_actor_animate (ClutterActor *actor,

  return animation;
 }
-
-/**
- * clutter_actor_animatev:
- * @actor: a #ClutterActor
- * @mode: an animation mode logical id
- * @duration: duration of the animation, in milliseconds
- * @n_properties: number of property names and values
- * @properties: (array length=n_properties) (element-type utf8): a vector
- *    containing the property names to set
- * @values: (array length=n_properties): a vector containing the
- *    property values to set
- *
- * Animates the given list of properties of @actor between the current
- * value for each property and a new final value. The animation has a
- * definite duration and a speed given by the @mode.
- *
- * This is the vector-based variant of clutter_actor_animate(), useful
- * for language bindings.
- *
- * Unlike clutter_actor_animate(), this function will not
- * allow you to specify "signal::" names and callbacks.
- *
- * Return value: (transfer none): a #ClutterAnimation object. The object is
- *   owned by the #ClutterActor and should not be unreferenced with
- *   g_object_unref()
- *
- * Since: 1.0
- * Deprecated: 1.12: Use the implicit transition for animatable properties
- *   in #ClutterActor instead. See clutter_actor_save_easing_state(),
- *   clutter_actor_set_easing_mode(), clutter_actor_set_easing_duration(),
- *   clutter_actor_set_easing_delay(), and clutter_actor_restore_easing_state().
- */
-ClutterAnimation *
-clutter_actor_animatev (ClutterActor        *actor,
-                        gulong               mode,
-                        guint                duration,
-                        gint                 n_properties,
-                        const gchar * const  properties[],
-                        const GValue        *values)
-{
-  ClutterAnimation *animation;
-
-  g_return_val_if_fail (CLUTTER_IS_ACTOR (actor), NULL);
-  g_return_val_if_fail (mode != CLUTTER_CUSTOM_MODE, NULL);
-  g_return_val_if_fail (duration > 0, NULL);
-  g_return_val_if_fail (properties != NULL, NULL);
-  g_return_val_if_fail (values != NULL, NULL);
-
-  animation = animation_create_for_actor (actor);
-  clutter_animation_set_mode (animation, mode);
-  clutter_animation_set_duration (animation, duration);
-  clutter_animation_setupv (animation, n_properties, properties, values);
-  clutter_animation_start (animation);
-
-  return animation;
-}
-
-/**
- * clutter_actor_animate_with_timelinev:
- * @actor: a #ClutterActor
- * @mode: an animation mode logical id
- * @timeline: a #ClutterTimeline
- * @n_properties: number of property names and values
- * @properties: (array length=n_properties) (element-type utf8): a vector
- *    containing the property names to set
- * @values: (array length=n_properties): a vector containing the
- *    property values to set
- *
- * Animates the given list of properties of @actor between the current
- * value for each property and a new final value. The animation has a
- * definite duration given by @timeline and a speed given by the @mode.
- *
- * See clutter_actor_animate() for further details.
- *
- * This function is useful if you want to use an existing timeline
- * to animate @actor.
- *
- * This is the vector-based variant of clutter_actor_animate_with_timeline(),
- * useful for language bindings.
- *
- * Unlike clutter_actor_animate_with_timeline(), this function
- * will not allow you to specify "signal::" names and callbacks.
- *
- * Return value: (transfer none): a #ClutterAnimation object. The object is
- *    owned by the #ClutterActor and should not be unreferenced with
- *    g_object_unref()
- *
- * Since: 1.0
- * Deprecated: 1.12: Use the implicit transition for animatable properties
- *   in #ClutterActor instead. See clutter_actor_save_easing_state(),
- *   clutter_actor_set_easing_mode(), clutter_actor_set_easing_duration(),
- *   clutter_actor_set_easing_delay(), and clutter_actor_restore_easing_state().
- */
-ClutterAnimation *
-clutter_actor_animate_with_timelinev (ClutterActor        *actor,
-                                      gulong               mode,
-                                      ClutterTimeline     *timeline,
-                                      gint                 n_properties,
-                                      const gchar * const  properties[],
-                                      const GValue        *values)
-{
-  ClutterAnimation *animation;
-
-  g_return_val_if_fail (CLUTTER_IS_ACTOR (actor), NULL);
-  g_return_val_if_fail (CLUTTER_IS_TIMELINE (timeline), NULL);
-  g_return_val_if_fail (properties != NULL, NULL);
-  g_return_val_if_fail (values != NULL, NULL);
-
-  animation = animation_create_for_actor (actor);
-  clutter_animation_set_mode (animation, mode);
-  clutter_animation_set_timeline (animation, timeline);
-  clutter_animation_setupv (animation, n_properties, properties, values);
-  clutter_animation_start (animation);
-
-  return animation;
-}
-
-/**
- * clutter_actor_animate_with_alphav:
- * @actor: a #ClutterActor
- * @alpha: a #ClutterAlpha
- * @n_properties: number of property names and values
- * @properties: (array length=n_properties) (element-type utf8): a vector
- *    containing the property names to set
- * @values: (array length=n_properties): a vector containing the
- *    property values to set
- *
- * Animates the given list of properties of @actor between the current
- * value for each property and a new final value. The animation has a
- * definite behaviour given by the passed @alpha.
- *
- * See clutter_actor_animate() for further details.
- *
- * This function is useful if you want to use an existing #ClutterAlpha
- * to animate @actor.
- *
- * This is the vector-based variant of clutter_actor_animate_with_alpha(),
- * useful for language bindings.
- *
- * Unlike clutter_actor_animate_with_alpha(), this function will
- * not allow you to specify "signal::" names and callbacks.
- *
- * Return value: (transfer none): a #ClutterAnimation object. The object is owned by the
- *   #ClutterActor and should not be unreferenced with g_object_unref()
- *
- * Since: 1.0
- *
- * Deprecated: 1.10: Use the implicit transition for animatable properties
- *   in #ClutterActor instead. See clutter_actor_save_easing_state(),
- *   clutter_actor_set_easing_mode(), clutter_actor_set_easing_duration(),
- *   clutter_actor_set_easing_delay(), and clutter_actor_restore_easing_state().
- */
-ClutterAnimation *
-clutter_actor_animate_with_alphav (ClutterActor        *actor,
-                                   ClutterAlpha        *alpha,
-                                   gint                 n_properties,
-                                   const gchar * const  properties[],
-                                   const GValue        *values)
-{
-  ClutterAnimation *animation;
-  ClutterTimeline *timeline;
-
-  g_return_val_if_fail (CLUTTER_IS_ACTOR (actor), NULL);
-  g_return_val_if_fail (CLUTTER_IS_ALPHA (alpha), NULL);
-  g_return_val_if_fail (properties != NULL, NULL);
-  g_return_val_if_fail (values != NULL, NULL);
-
-  timeline = clutter_alpha_get_timeline (alpha);
-  if (timeline == NULL)
-    {
-      g_warning ("The passed ClutterAlpha does not have an "
-                 "associated ClutterTimeline.");
-      return NULL;
-    }
-
-  animation = animation_create_for_actor (actor);
-  clutter_animation_set_alpha_internal (animation, alpha);
-  clutter_animation_setupv (animation, n_properties, properties, values);
-  clutter_animation_start (animation);
-
-  return animation;
-}
-
-/**
- * clutter_actor_get_animation:
- * @actor: a #ClutterActor
- *
- * Retrieves the #ClutterAnimation used by @actor, if clutter_actor_animate()
- * has been called on @actor.
- *
- * Return value: (transfer none): a #ClutterAnimation, or %NULL
- *
- * Since: 1.0
- * Deprecated: 1.12: Use the implicit transition for animatable properties
- *   in #ClutterActor instead, and clutter_actor_get_transition() to retrieve
- *   the transition.
- */
-ClutterAnimation *
-clutter_actor_get_animation (ClutterActor *actor)
-{
-  g_return_val_if_fail (CLUTTER_IS_ACTOR (actor), NULL);
-
-  return g_object_get_qdata (G_OBJECT (actor), quark_object_animation);
-}
-
-/**
- * clutter_actor_detach_animation:
- * @actor: a #ClutterActor
- *
- * Detaches the #ClutterAnimation used by @actor, if clutter_actor_animate()
- * has been called on @actor.
- *
- * Once the animation has been detached, it loses a reference. If it was
- * the only reference then the #ClutterAnimation becomes invalid.
- *
- * The #ClutterAnimation::completed signal will not be emitted.
- *
- * Since: 1.4
- * Deprecated: 1.12: Use the implicit transition for animatable properties
- *   in #ClutterActor instead, and clutter_actor_remove_transition() to
- *   remove the transition.
- */
-void
-clutter_actor_detach_animation (ClutterActor *actor)
-{
-  ClutterAnimation *animation;
-  ClutterAnimationPrivate *priv;
-
-  g_return_if_fail (CLUTTER_IS_ACTOR (actor));
-
-  animation = g_object_get_qdata (G_OBJECT (actor), quark_object_animation);
-  if (animation == NULL)
-    return;
-
-  priv = animation->priv;
-
-  g_assert (priv->object == G_OBJECT (actor));
-
-  /* we can't call get_timeline_internal() here because it would be
-   * pointless to create a timeline on an animation we want to detach
-   */
-  if (priv->alpha != NULL)
-    {
-      ClutterTimeline *timeline;
-
-      timeline = clutter_alpha_get_timeline (priv->alpha);
-      if (timeline != NULL)
-        clutter_timeline_stop (timeline);
-    }
-
-  /* disconnect the ::destroy handler added by animation_create_for_actor() */
-  g_signal_handlers_disconnect_by_func (actor,
-                                        G_CALLBACK (on_actor_destroy),
-                                        animation);
-
-  clutter_animation_set_object (animation, NULL);
-
-  /* drop the reference on the animation */
-  g_object_unref (animation);
-}
--- a/clutter/clutter/deprecated/clutter-animation.h
+++ b/clutter/clutter/deprecated/clutter-animation.h
@@ -103,8 +103,6 @@ ClutterAnimation *      clutter_animation_new                   (void);
 CLUTTER_DEPRECATED_FOR(clutter_transition_set_animatable)
 void                    clutter_animation_set_object            (ClutterAnimation     *animation,
                                                                 GObject              *object);
-CLUTTER_DEPRECATED_FOR(clutter_transition_get_animatable)
-GObject *               clutter_animation_get_object            (ClutterAnimation     *animation);
 CLUTTER_DEPRECATED_FOR(clutter_timeline_set_progress_mode)
 void                    clutter_animation_set_mode              (ClutterAnimation     *animation,
                                                                 gulong                mode);
@@ -125,38 +123,12 @@ void                    clutter_animation_set_timeline          (ClutterAnimatio
                                                                 ClutterTimeline      *timeline);
 CLUTTER_DEPRECATED
 ClutterTimeline *       clutter_animation_get_timeline          (ClutterAnimation     *animation);
-CLUTTER_DEPRECATED_FOR(clutter_animation_set_timeline)
-void                    clutter_animation_set_alpha             (ClutterAnimation     *animation,
-                                                                 ClutterAlpha         *alpha);
-CLUTTER_DEPRECATED_FOR(clutter_animation_get_timeline)
-ClutterAlpha *          clutter_animation_get_alpha             (ClutterAnimation     *animation);
-CLUTTER_DEPRECATED
-ClutterAnimation *      clutter_animation_bind                  (ClutterAnimation     *animation,
-                                                                 const gchar          *property_name,
-                                                                 const GValue         *final);
-CLUTTER_DEPRECATED_FOR(clutter_transition_set_interval)
-ClutterAnimation *      clutter_animation_bind_interval         (ClutterAnimation     *animation,
-                                                                 const gchar          *property_name,
-                                                                 ClutterInterval      *interval);
 CLUTTER_DEPRECATED
 gboolean                clutter_animation_has_property          (ClutterAnimation     *animation,
                                                                 const gchar          *property_name);
 CLUTTER_DEPRECATED
-ClutterAnimation *      clutter_animation_update                (ClutterAnimation     *animation,
-                                                                 const gchar          *property_name,
-                                                                 const GValue         *final);
-CLUTTER_DEPRECATED
-void                    clutter_animation_update_interval       (ClutterAnimation     *animation,
-                                                                 const gchar          *property_name,
-                                                                 ClutterInterval      *interval);
-CLUTTER_DEPRECATED
-void                    clutter_animation_unbind_property       (ClutterAnimation     *animation,
-                                                                 const gchar          *property_name);
-CLUTTER_DEPRECATED
 ClutterInterval     *   clutter_animation_get_interval          (ClutterAnimation     *animation,
                                                                 const gchar          *property_name);
-CLUTTER_DEPRECATED
-void                    clutter_animation_completed             (ClutterAnimation     *animation);

 /*
 * ClutterActor API
@@ -174,36 +146,6 @@ ClutterAnimation *      clutter_actor_animate_with_timeline     (ClutterActor
                                                                 ClutterTimeline      *timeline,
                                                                 const gchar          *first_property_name,
                                                                 ...) G_GNUC_NULL_TERMINATED;
-CLUTTER_DEPRECATED
-ClutterAnimation *      clutter_actor_animatev                  (ClutterActor         *actor,
-                                                                 gulong                mode,
-                                                                 guint                 duration,
-                                                                 gint                  n_properties,
-                                                                 const gchar * const   properties[],
-                                                                 const GValue         *values);
-CLUTTER_DEPRECATED
-ClutterAnimation *      clutter_actor_animate_with_timelinev    (ClutterActor         *actor,
-                                                                 gulong                mode,
-                                                                 ClutterTimeline      *timeline,
-                                                                 gint                  n_properties,
-                                                                 const gchar * const   properties[],
-                                                                 const GValue         *values);
-CLUTTER_DEPRECATED_FOR(clutter_actor_animate_with_timeline)
-ClutterAnimation *      clutter_actor_animate_with_alpha        (ClutterActor         *actor,
-                                                                 ClutterAlpha         *alpha,
-                                                                 const gchar          *first_property_name,
-                                                                 ...) G_GNUC_NULL_TERMINATED;
-CLUTTER_DEPRECATED_FOR(clutter_actor_animate_with_timelinev)
-ClutterAnimation *      clutter_actor_animate_with_alphav       (ClutterActor         *actor,
-                                                                 ClutterAlpha         *alpha,
-                                                                 gint                  n_properties,
-                                                                 const gchar * const   properties[],
-                                                                 const GValue         *values);
-
-CLUTTER_DEPRECATED
-ClutterAnimation *      clutter_actor_get_animation             (ClutterActor         *actor);
-CLUTTER_DEPRECATED
-void                    clutter_actor_detach_animation          (ClutterActor         *actor);

 G_END_DECLS

--- a/clutter/clutter/deprecated/clutter-bin-layout.h
+++ b/clutter/clutter/deprecated/clutter-bin-layout.h
@@ -1,56 +0,0 @@
-/*
- * Clutter.
- *
- * An OpenGL based 'interactive canvas' library.
- *
- * Copyright (C) 2009  Intel Corporation.
- *
- * 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/>.
- *
- * Author:
- *   Emmanuele Bassi <ebassi@linux.intel.com>
- */
-
-#if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
-#error "Only <clutter/clutter.h> can be included directly."
-#endif
-
-#ifndef __CLUTTER_BIN_LAYOUT_DEPRECATED_H__
-#define __CLUTTER_BIN_LAYOUT_DEPRECATED_H__
-
-#include <clutter/clutter-bin-layout.h>
-
-G_BEGIN_DECLS
-
-CLUTTER_DEPRECATED
-void            clutter_bin_layout_set_alignment        (ClutterBinLayout    *self,
-                                                         ClutterActor        *child,
-                                                         ClutterBinAlignment  x_align,
-                                                         ClutterBinAlignment  y_align);
-
-CLUTTER_DEPRECATED
-void            clutter_bin_layout_get_alignment        (ClutterBinLayout    *self,
-                                                         ClutterActor        *child,
-                                                         ClutterBinAlignment *x_align,
-                                                         ClutterBinAlignment *y_align);
-
-CLUTTER_DEPRECATED
-void            clutter_bin_layout_add                  (ClutterBinLayout    *self,
-                                                         ClutterActor        *child,
-                                                         ClutterBinAlignment  x_align,
-                                                         ClutterBinAlignment  y_align);
-
-G_END_DECLS
-
-#endif /* __CLUTTER_BIN_LAYOUT_DEPRECATED_H__ */
--- a/clutter/clutter/deprecated/clutter-cairo-texture.c
+++ b/clutter/clutter/deprecated/clutter-cairo-texture.c
--- a/clutter/clutter/deprecated/clutter-cairo-texture.h
+++ b/clutter/clutter/deprecated/clutter-cairo-texture.h
@@ -1,139 +0,0 @@
-/*
- * Clutter
- *
- * An OpenGL based 'interactive canvas' library.
- *
- * Authored By: Emmanuele Bassi <ebassi@linux.intel.com>
- *              Matthew Allum <mallum@o-hand.com>
- *              Chris Lord <chris@o-hand.com>
- *              Iain Holmes <iain@o-hand.com>
- *              Neil Roberts <neil@linux.intel.com>
- *
- * Copyright (C) 2008, 2009, 2010  Intel Corporation.
- *
- * 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/>.
- */
-
-#if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
-#error "Only <clutter/clutter.h> can be included directly."
-#endif
-
-#ifndef __CLUTTER_CAIRO_TEXTURE_H__
-#define __CLUTTER_CAIRO_TEXTURE_H__
-
-#include <clutter/clutter-texture.h>
-
-G_BEGIN_DECLS
-
-#define CLUTTER_TYPE_CAIRO_TEXTURE              (clutter_cairo_texture_get_type ())
-#define CLUTTER_CAIRO_TEXTURE(obj)              (G_TYPE_CHECK_INSTANCE_CAST ((obj), CLUTTER_TYPE_CAIRO_TEXTURE, ClutterCairoTexture))
-#define CLUTTER_CAIRO_TEXTURE_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), CLUTTER_TYPE_CAIRO_TEXTURE, ClutterCairoTextureClass))
-#define CLUTTER_IS_CAIRO_TEXTURE(obj)           (G_TYPE_CHECK_INSTANCE_TYPE ((obj), CLUTTER_TYPE_CAIRO_TEXTURE))
-#define CLUTTER_IS_CAIRO_TEXTURE_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), CLUTTER_TYPE_CAIRO_TEXTURE))
-#define CLUTTER_CAIRO_TEXTURE_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), CLUTTER_TYPE_CAIRO_TEXTURE, ClutterCairoTextureClass))
-
-typedef struct _ClutterCairoTexture             ClutterCairoTexture;
-typedef struct _ClutterCairoTextureClass        ClutterCairoTextureClass;
-typedef struct _ClutterCairoTexturePrivate      ClutterCairoTexturePrivate;
-
-/**
- * ClutterCairoTexture:
- *
- * The #ClutterCairoTexture struct contains only private data.
- *
- * Since: 1.0
- *
- * Deprecated: 1.12: Use #ClutterCanvas instead
- */
-struct _ClutterCairoTexture
-{
-  /*< private >*/
-  ClutterTexture parent_instance;
-
-  ClutterCairoTexturePrivate *priv;
-};
-
-/**
- * ClutterCairoTextureClass:
- * @create_surface: class handler for the #ClutterCairoTexture::create-surface
- *   signal
- * @draw: class handler for the #ClutterCairoTexture::draw signal
- *
- * The #ClutterCairoTextureClass struct contains only private data.
- *
- * Since: 1.0
- *
- * Deprecated: 1.12: Use #ClutterCanvas instead
- */
-struct _ClutterCairoTextureClass
-{
-  /*< private >*/
-  ClutterTextureClass parent_class;
-
-  /*< public >*/
-  cairo_surface_t *(* create_surface) (ClutterCairoTexture *texture,
-                                       guint                width,
-                                       guint                height);
-
-  gboolean         (* draw)           (ClutterCairoTexture *texture,
-                                       cairo_t             *cr);
-
-  /*< private >*/
-  void (*_clutter_cairo_3) (void);
-  void (*_clutter_cairo_4) (void);
-};
-
-CLUTTER_DEPRECATED_FOR(clutter_canvas_get_type)
-GType clutter_cairo_texture_get_type (void) G_GNUC_CONST;
-
-CLUTTER_DEPRECATED_FOR(clutter_canvas_new)
-ClutterActor *  clutter_cairo_texture_new                       (guint                  width,
-                                                                 guint                  height);
-
-CLUTTER_DEPRECATED_FOR(clutter_canvas_set_size)
-void            clutter_cairo_texture_set_surface_size          (ClutterCairoTexture   *self,
-                                                                 guint                  width,
-                                                                 guint                  height);
-CLUTTER_DEPRECATED_FOR(clutter_canvas_get_size)
-void            clutter_cairo_texture_get_surface_size          (ClutterCairoTexture   *self,
-                                                                 guint                 *width,
-                                                                 guint                 *height);
-CLUTTER_DEPRECATED
-void            clutter_cairo_texture_set_auto_resize           (ClutterCairoTexture   *self,
-                                                                 gboolean               value);
-CLUTTER_DEPRECATED
-gboolean        clutter_cairo_texture_get_auto_resize           (ClutterCairoTexture   *self);
-
-CLUTTER_DEPRECATED
-void            clutter_cairo_texture_clear                     (ClutterCairoTexture   *self);
-
-CLUTTER_DEPRECATED
-void            clutter_cairo_texture_invalidate_rectangle      (ClutterCairoTexture   *self,
-                                                                 cairo_rectangle_int_t *rect);
-CLUTTER_DEPRECATED
-void            clutter_cairo_texture_invalidate                (ClutterCairoTexture   *self);
-
-CLUTTER_DEPRECATED_FOR(clutter_cairo_texture_invalidate_rectangle)
-cairo_t *       clutter_cairo_texture_create_region             (ClutterCairoTexture   *self,
-                                                                 gint                   x_offset,
-                                                                 gint                   y_offset,
-                                                                 gint                   width,
-                                                                 gint                   height);
-
-CLUTTER_DEPRECATED_FOR(clutter_cairo_texture_invalidate)
-cairo_t *       clutter_cairo_texture_create                    (ClutterCairoTexture   *self);
-
-G_END_DECLS
-
-#endif /* __CLUTTER_CAIRO_TEXTURE_DEPRECATED_H__ */
--- a/clutter/clutter/deprecated/clutter-container.h
+++ b/clutter/clutter/deprecated/clutter-container.h
@@ -43,11 +43,6 @@ CLUTTER_DEPRECATED_FOR(clutter_actor_add_child)
 void            clutter_container_add_actor                     (ClutterContainer *container,
                                                                 ClutterActor     *actor);

-CLUTTER_DEPRECATED_FOR(clutter_actor_add_child)
-void            clutter_container_add_valist                    (ClutterContainer *container,
-                                                                 ClutterActor     *first_actor,
-                                                                 va_list           var_args);
-
 CLUTTER_DEPRECATED_FOR(clutter_actor_remove_child)
 void            clutter_container_remove                        (ClutterContainer *container,
                                                                 ClutterActor     *first_actor,
@@ -57,11 +52,6 @@ CLUTTER_DEPRECATED_FOR(clutter_actor_remove_child)
 void            clutter_container_remove_actor                  (ClutterContainer *container,
                                                                 ClutterActor     *actor);

-CLUTTER_DEPRECATED_FOR(clutter_actor_remove_child)
-void            clutter_container_remove_valist                 (ClutterContainer *container,
-                                                                 ClutterActor     *first_actor,
-                                                                 va_list           var_args);
-
 CLUTTER_DEPRECATED_FOR(clutter_actor_get_children)
 GList *         clutter_container_get_children                  (ClutterContainer *container);

--- a/clutter/clutter/deprecated/clutter-group.c
+++ b/clutter/clutter/deprecated/clutter-group.c
@@ -277,28 +277,30 @@ clutter_container_iface_init (ClutterContainerIface *iface)
 }

 static void
-clutter_group_real_paint (ClutterActor *actor)
+clutter_group_real_paint (ClutterActor        *actor,
+                          ClutterPaintContext *paint_context)
 {
  ClutterGroupPrivate *priv = CLUTTER_GROUP (actor)->priv;

  CLUTTER_NOTE (PAINT, "ClutterGroup paint enter '%s'",
                _clutter_actor_get_debug_name (actor));

-  g_list_foreach (priv->children, (GFunc) clutter_actor_paint, NULL);
+  g_list_foreach (priv->children, (GFunc) clutter_actor_paint, paint_context);

  CLUTTER_NOTE (PAINT, "ClutterGroup paint leave '%s'",
                _clutter_actor_get_debug_name (actor));
 }

 static void
-clutter_group_real_pick (ClutterActor *actor)
+clutter_group_real_pick (ClutterActor       *actor,
+                         ClutterPickContext *pick_context)
 {
  ClutterGroupPrivate *priv = CLUTTER_GROUP (actor)->priv;

  /* Chain up so we get a bounding box pained (if we are reactive) */
-  CLUTTER_ACTOR_CLASS (clutter_group_parent_class)->pick (actor);
+  CLUTTER_ACTOR_CLASS (clutter_group_parent_class)->pick (actor, pick_context);

-  g_list_foreach (priv->children, (GFunc) clutter_actor_pick, NULL);
+  g_list_foreach (priv->children, (GFunc) clutter_actor_pick, pick_context);
 }

 static void
--- a/clutter/clutter/deprecated/clutter-keysyms.h
+++ b/clutter/clutter/deprecated/clutter-keysyms.h
--- a/clutter/clutter/deprecated/clutter-rectangle.c
+++ b/clutter/clutter/deprecated/clutter-rectangle.c
@@ -78,10 +78,12 @@ static const ClutterColor default_border_color = {   0,   0,   0, 255 };
 G_DEFINE_TYPE_WITH_PRIVATE (ClutterRectangle, clutter_rectangle, CLUTTER_TYPE_ACTOR)

 static void
-clutter_rectangle_paint (ClutterActor *self)
+clutter_rectangle_paint (ClutterActor        *self,
+                         ClutterPaintContext *paint_context)
 {
  ClutterRectanglePrivate *priv = CLUTTER_RECTANGLE (self)->priv;
-  CoglFramebuffer *framebuffer = cogl_get_draw_framebuffer ();
+  CoglFramebuffer *framebuffer =
+    clutter_paint_context_get_framebuffer (paint_context);
  static CoglPipeline *default_color_pipeline = NULL;
  CoglPipeline *content_pipeline;
  ClutterActorBox alloc;
--- a/clutter/clutter/deprecated/clutter-state.c
+++ b/clutter/clutter/deprecated/clutter-state.c
@@ -1217,143 +1217,6 @@ clutter_state_get_states (ClutterState *state)
  return g_hash_table_get_keys (state->priv->states);
 }

-/**
- * clutter_state_get_keys:
- * @state: a #ClutterState instance.
- * @source_state_name: (allow-none): the source transition name to query,
- *   or %NULL for all source states
- * @target_state_name: (allow-none): the target transition name to query,
- *   or %NULL for all target states
- * @object: (allow-none): the specific object instance to list keys for,
- *   or %NULL for all managed objects
- * @property_name: (allow-none): the property name to search for, or %NULL
- *   for all properties.
- *
- * Returns a list of pointers to opaque structures with accessor functions
- * that describe the keys added to an animator.
- *
- * Return value: (transfer container) (element-type Clutter.StateKey): a
- *   newly allocated #GList of #ClutterStateKey<!-- -->s. The contents of
- *   the returned list are owned by the #ClutterState and should not be
- *   modified or freed. Use g_list_free() to free the resources allocated
- *   by the returned list when done using it
- *
- * Since: 1.4
- * Deprecated: 1.12: Use #ClutterKeyframeTransition and
- *   #ClutterTransitionGroup instead
- */
-GList *
-clutter_state_get_keys (ClutterState *state,
-                        const gchar  *source_state_name,
-                        const gchar  *target_state_name,
-                        GObject      *object,
-                        const gchar  *property_name)
-{
-  GList *s, *state_list;
-  GList *targets = NULL;
-  State *source_state = NULL;
-
-  g_return_val_if_fail (CLUTTER_IS_STATE (state), NULL);
-
-  source_state_name = g_intern_string (source_state_name);
-  target_state_name = g_intern_string (target_state_name);
-  property_name = g_intern_string (property_name);
-
-  if (target_state_name != NULL)
-    state_list = g_list_append (NULL, (gpointer) target_state_name);
-  else
-    state_list = clutter_state_get_states (state);
-
-  if (source_state_name)
-    source_state = clutter_state_fetch_state (state, source_state_name, FALSE);
-
-  for (s = state_list; s != NULL; s = s->next)
-    {
-      State *target_state;
-
-      target_state = clutter_state_fetch_state (state, s->data, FALSE);
-      if (target_state != NULL)
-        {
-          GList *k;
-
-          for (k = target_state->keys; k; k = k->next)
-            {
-              ClutterStateKey *key = k->data;
-
-              if ((object == NULL || (object == key->object)) &&
-                  (source_state_name == NULL ||
-                   source_state == key->source_state) &&
-                  (property_name == NULL ||
-                   (property_name == key->property_name)))
-                {
-                  targets = g_list_prepend (targets, key);
-                }
-            }
-        }
-    }
-
-  g_list_free (state_list);
-
-  return g_list_reverse (targets);
-}
-
-
-/**
- * clutter_state_remove_key:
- * @state: a #ClutterState instance.
- * @source_state_name: (allow-none): the source state name to query,
- *   or %NULL for all source states
- * @target_state_name: (allow-none): the target state name to query,
- *   or %NULL for all target states
- * @object: (allow-none): the specific object instance to list keys for,
- *   or %NULL for all managed objects
- * @property_name: (allow-none): the property name to search for,
- *   or %NULL for all properties.
- *
- * Removes all keys matching the search criteria passed in arguments.
- *
- * Since: 1.4
- * Deprecated: 1.12: Use #ClutterKeyframeTransition and
- *   #ClutterTransitionGroup instead
- */
-void
-clutter_state_remove_key (ClutterState *state,
-                          const gchar  *source_state_name,
-                          const gchar  *target_state_name,
-                          GObject      *object,
-                          const gchar  *property_name)
-{
-  g_return_if_fail (CLUTTER_IS_STATE (state));
-
-  clutter_state_remove_key_internal (state,
-                                     source_state_name, target_state_name,
-                                     object, property_name,
-                                     FALSE);
-}
-
-/**
- * clutter_state_get_timeline:
- * @state: a #ClutterState
- *
- * Gets the timeline driving the #ClutterState
- *
- * Return value: (transfer none): the #ClutterTimeline that drives
- *   the state change animations. The returned timeline is owned
- *   by the #ClutterState and it should not be unreferenced directly
- *
- * Since: 1.4
- * Deprecated: 1.12: Use #ClutterKeyframeTransition and
- *   #ClutterTransitionGroup instead
- */
-ClutterTimeline *
-clutter_state_get_timeline (ClutterState *state)
-{
-  g_return_val_if_fail (CLUTTER_IS_STATE (state), NULL);
-
-  return state->priv->timeline;
-}
-
-
 static void
 clutter_state_set_property (GObject      *object,
 			    guint         prop_id,
@@ -1510,227 +1373,12 @@ G_DEFINE_BOXED_TYPE (ClutterStateKey, clutter_state_key,
                     clutter_state_key_copy,
                     clutter_state_key_free);

-/**
- * clutter_state_key_get_pre_delay:
- * @state_key: a #ClutterStateKey
- *
- * Retrieves the pause before transitioning starts as a fraction of
- * the total transition time.
- *
- * Return value: the pre delay used before starting the transition.
- *
- * Since: 1.4
- * Deprecated: 1.12: Use #ClutterKeyframeTransition and
- *   #ClutterTransitionGroup instead
- */
-gdouble
-clutter_state_key_get_pre_delay (const ClutterStateKey *state_key)
-{
-  g_return_val_if_fail (state_key != NULL, 0.0);
-
-  return state_key->pre_delay;
-}
-
-/**
- * clutter_state_key_get_post_delay:
- * @state_key: a #ClutterStateKey
- *
- * Retrieves the duration of the pause after transitioning is complete
- * as a fraction of the total transition time.
- *
- * Return value: the post delay, used after doing the transition.
- *
- * Since: 1.4
- * Deprecated: 1.12: Use #ClutterKeyframeTransition and
- *   #ClutterTransitionGroup instead
- */
-gdouble
-clutter_state_key_get_post_delay (const ClutterStateKey *state_key)
-{
-  g_return_val_if_fail (state_key != NULL, 0.0);
-
-  return state_key->post_delay;
-}
-
-/**
- * clutter_state_key_get_mode:
- * @state_key: a #ClutterStateKey
- *
- * Retrieves the easing mode used for @state_key.
- *
- * Return value: the mode of a #ClutterStateKey
- *
- * Since: 1.4
- * Deprecated: 1.12: Use #ClutterKeyframeTransition and
- *   #ClutterTransitionGroup instead
- */
-gulong
-clutter_state_key_get_mode (const ClutterStateKey *state_key)
-{
-  g_return_val_if_fail (state_key != NULL, 0);
-
-  return state_key->mode;
-}
-
-/**
- * clutter_state_key_get_value:
- * @state_key: a #ClutterStateKey
- * @value: a #GValue initialized with the correct type for the @state_key
- *
- * Retrieves a copy of the value for a #ClutterStateKey.
- *
- * The #GValue needs to be already initialized for the value type
- * of the property or to a type that allow transformation from the value
- * type of the key.
- *
- * Use g_value_unset() when done.
- *
- * Return value: %TRUE if the value was successfully retrieved,
- *   and %FALSE otherwise
- *
- * Since: 1.4
- * Deprecated: 1.12: Use #ClutterKeyframeTransition and
- *   #ClutterTransitionGroup instead
- */
-gboolean
-clutter_state_key_get_value (const ClutterStateKey *state_key,
-                             GValue                *value)
-{
-  g_return_val_if_fail (state_key != NULL, FALSE);
-  g_return_val_if_fail (value != NULL, FALSE);
-  g_return_val_if_fail (G_VALUE_TYPE (value) != G_TYPE_INVALID, FALSE);
-
-  if (!g_type_is_a (G_VALUE_TYPE (&state_key->value), G_VALUE_TYPE (value)))
-    {
-      if (g_value_type_compatible (G_VALUE_TYPE (&state_key->value),
-                                   G_VALUE_TYPE (value)))
-        {
-          g_value_copy (&state_key->value, value);
-          return TRUE;
-        }
-
-      if (g_value_type_transformable (G_VALUE_TYPE (&state_key->value),
-                                      G_VALUE_TYPE (value)))
-        {
-          if (g_value_transform (&state_key->value, value))
-            return TRUE;
-        }
-
-      g_warning ("%s: Unable to convert from %s to %s for the "
-                 "property '%s' of object %s in the state key",
-                 G_STRLOC,
-                 g_type_name (G_VALUE_TYPE (&state_key->value)),
-                 g_type_name (G_VALUE_TYPE (value)),
-                 state_key->property_name,
-                 G_OBJECT_TYPE_NAME (state_key->object));
-
-      return FALSE;
-    }
-  else
-    g_value_copy (&state_key->value, value);
-
-  return TRUE;
-}
-
-/**
- * clutter_state_key_get_object:
- * @state_key: a #ClutterStateKey
- *
- * Retrieves the object instance this #ClutterStateKey applies to.
- *
- * Return value: (transfer none): the object this state key applies to.
- *
- * Since: 1.4
- * Deprecated: 1.12: Use #ClutterKeyframeTransition and
- *   #ClutterTransitionGroup instead
- */
-GObject *
-clutter_state_key_get_object (const ClutterStateKey *state_key)
-{
-  g_return_val_if_fail (state_key, NULL);
-
-  return state_key->object;
-}
-
-/**
- * clutter_state_key_get_property_name:
- * @state_key: a #ClutterStateKey
- *
- * Retrieves the name of the property this #ClutterStateKey applies to
- *
- * Return value: the name of the property. The returned string is owned
- *   by the #ClutterStateKey and should never be modified or freed
- *
- * Since: 1.4
- * Deprecated: 1.12: Use #ClutterKeyframeTransition and
- *   #ClutterTransitionGroup instead
- */
-const gchar *
-clutter_state_key_get_property_name (const ClutterStateKey *state_key)
-{
-  g_return_val_if_fail (state_key, NULL);
-
-  return state_key->property_name;
-}
-
-/**
- * clutter_state_key_get_source_state_name:
- * @state_key: a #ClutterStateKey
- *
- * Retrieves the name of the source state of the @state_key
- *
- * Return value: the name of the source state for this key, or %NULL
- *   if this is the generic state key for the given property when
- *   transitioning to the target state. The returned string is owned
- *   by the #ClutterStateKey and should never be modified or freed
- *
- * Since: 1.4
- * Deprecated: 1.12: Use #ClutterKeyframeTransition and
- *   #ClutterTransitionGroup instead
- */
-const gchar *
-clutter_state_key_get_source_state_name (const ClutterStateKey *state_key)
-{
-  g_return_val_if_fail (state_key, NULL);
-
-  if (state_key->source_state != NULL)
-    return state_key->source_state->name;
-
-  return NULL;
-}
-
-/**
- * clutter_state_key_get_target_state_name:
- * @state_key: a #ClutterStateKey
- *
- * Get the name of the source state this #ClutterStateKey contains,
- * or NULL if this is the generic state key for the given property
- * when transitioning to the target state.
- *
- * Return value: the name of the source state for this key, or NULL if
- *   the key is generic
- *
- * Since: 1.4
- * Deprecated: 1.12: Use #ClutterKeyframeTransition and
- *   #ClutterTransitionGroup instead
- */
-const gchar *
-clutter_state_key_get_target_state_name (const ClutterStateKey *state_key)
-{
-  g_return_val_if_fail (state_key, NULL);
-
-  return state_key->target_state->name;
-}
-
 /**
 * clutter_state_key_get_property_type:
 * @key: a #ClutterStateKey
 *
 * Retrieves the #GType of the property a key applies to
 *
- * You can use this type to initialize the #GValue to pass to
- * clutter_state_key_get_value()
- *
 * Return value: the #GType of the property
 *
 * Since: 1.4
--- a/clutter/clutter/deprecated/clutter-state.h
+++ b/clutter/clutter/deprecated/clutter-state.h
@@ -131,20 +131,6 @@ void              clutter_state_set           (ClutterState    *state,
 CLUTTER_DEPRECATED
 GList           * clutter_state_get_states    (ClutterState    *state);
 CLUTTER_DEPRECATED
-GList           * clutter_state_get_keys      (ClutterState    *state,
-                                               const gchar     *source_state_name,
-                                               const gchar     *target_state_name,
-                                               GObject         *object,
-                                               const gchar     *property_name);
-CLUTTER_DEPRECATED
-void              clutter_state_remove_key    (ClutterState    *state,
-                                               const gchar     *source_state_name,
-                                               const gchar     *target_state_name,
-                                               GObject         *object,
-                                               const gchar     *property_name);
-CLUTTER_DEPRECATED
-ClutterTimeline * clutter_state_get_timeline  (ClutterState    *state);
-CLUTTER_DEPRECATED
 const gchar *     clutter_state_get_state     (ClutterState    *state);

 /*
@@ -154,24 +140,7 @@ const gchar *     clutter_state_get_state     (ClutterState    *state);
 CLUTTER_DEPRECATED
 GType                 clutter_state_key_get_type              (void) G_GNUC_CONST;
 CLUTTER_DEPRECATED
-gdouble               clutter_state_key_get_pre_delay         (const ClutterStateKey *state_key);
-CLUTTER_DEPRECATED
-gdouble               clutter_state_key_get_post_delay        (const ClutterStateKey *state_key);
-CLUTTER_DEPRECATED
-gulong                clutter_state_key_get_mode              (const ClutterStateKey *state_key);
-CLUTTER_DEPRECATED
-gboolean              clutter_state_key_get_value             (const ClutterStateKey *state_key,
-                                                               GValue                *value);
-CLUTTER_DEPRECATED
 GType                 clutter_state_key_get_property_type     (const ClutterStateKey *key);
-CLUTTER_DEPRECATED
-GObject *             clutter_state_key_get_object            (const ClutterStateKey *state_key);
-CLUTTER_DEPRECATED
-const gchar *         clutter_state_key_get_property_name     (const ClutterStateKey *state_key);
-CLUTTER_DEPRECATED
-const gchar *         clutter_state_key_get_source_state_name (const ClutterStateKey *state_key);
-CLUTTER_DEPRECATED
-const gchar *         clutter_state_key_get_target_state_name (const ClutterStateKey *state_key);

 G_END_DECLS

--- a/clutter/clutter/deprecated/clutter-table-layout.c
+++ b/clutter/clutter/deprecated/clutter-table-layout.c
--- a/clutter/clutter/deprecated/clutter-table-layout.h
+++ b/clutter/clutter/deprecated/clutter-table-layout.h
@@ -1,172 +0,0 @@
-/*
- * Clutter.
- *
- * An OpenGL based 'interactive canvas' library.
- *
- * Copyright (C) 2010  Intel Corporation.
- *
- * 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/>.
- *
- * Author:
- *   Jose Dapena Paz <jdapena@igalia.com>
- *
- * Based on the MX MxTable actor by:
- *   Thomas Wood <thomas.wood@intel.com>
- */
-
-#if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
-#error "Only <clutter/clutter.h> can be included directly."
-#endif
-
-#ifndef __CLUTTER_TABLE_LAYOUT_H__
-#define __CLUTTER_TABLE_LAYOUT_H__
-
-#include <clutter/clutter-layout-manager.h>
-
-G_BEGIN_DECLS
-
-#define CLUTTER_TYPE_TABLE_LAYOUT                 (clutter_table_layout_get_type ())
-#define CLUTTER_TABLE_LAYOUT(obj)                 (G_TYPE_CHECK_INSTANCE_CAST ((obj), CLUTTER_TYPE_TABLE_LAYOUT, ClutterTableLayout))
-#define CLUTTER_IS_TABLE_LAYOUT(obj)              (G_TYPE_CHECK_INSTANCE_TYPE ((obj), CLUTTER_TYPE_TABLE_LAYOUT))
-#define CLUTTER_TABLE_LAYOUT_CLASS(klass)         (G_TYPE_CHECK_CLASS_CAST ((klass), CLUTTER_TYPE_TABLE_LAYOUT, ClutterTableLayoutClass))
-#define CLUTTER_IS_TABLE_LAYOUT_CLASS(klass)      (G_TYPE_CHECK_CLASS_TYPE ((klass), CLUTTER_TYPE_TABLE_LAYOUT))
-#define CLUTTER_TABLE_LAYOUT_GET_CLASS(obj)       (G_TYPE_INSTANCE_GET_CLASS ((obj), CLUTTER_TYPE_TABLE_LAYOUT, ClutterTableLayoutClass))
-
-typedef struct _ClutterTableLayout                ClutterTableLayout;
-typedef struct _ClutterTableLayoutPrivate         ClutterTableLayoutPrivate;
-typedef struct _ClutterTableLayoutClass           ClutterTableLayoutClass;
-
-/**
- * ClutterTableLayout:
- *
- * The #ClutterTableLayout structure contains only private data
- * and should be accessed using the provided API
- *
- * Since: 1.4
- *
- * Deprecated: 1.18: Use #ClutterGridLayout instead
- */
-struct _ClutterTableLayout
-{
-  /*< private >*/
-  ClutterLayoutManager parent_instance;
-
-  ClutterTableLayoutPrivate *priv;
-};
-
-/**
- * ClutterTableLayoutClass:
- *
- * The #ClutterTableLayoutClass structure contains only private
- * data and should be accessed using the provided API
- *
- * Since: 1.4
- *
- * Deprecated: 1.18: Use #ClutterGridLayout instead
- */
-struct _ClutterTableLayoutClass
-{
-  /*< private >*/
-  ClutterLayoutManagerClass parent_class;
-};
-
-CLUTTER_DEPRECATED_FOR (clutter_grid_layout_get_type)
-GType clutter_table_layout_get_type (void) G_GNUC_CONST;
-
-CLUTTER_DEPRECATED_FOR (clutter_grid_layout_new)
-ClutterLayoutManager *clutter_table_layout_new                 (void);
-
-CLUTTER_DEPRECATED_FOR (clutter_grid_layout_attach)
-void                  clutter_table_layout_pack                (ClutterTableLayout    *layout,
-                                                                ClutterActor          *actor,
-                                                                gint                   column,
-                                                                gint                   row);
-
-CLUTTER_DEPRECATED_FOR (clutter_grid_layout_set_column_spacing)
-void                  clutter_table_layout_set_column_spacing  (ClutterTableLayout    *layout,
-                                                                guint                  spacing);
-CLUTTER_DEPRECATED_FOR (clutter_grid_layout_set_row_spacing)
-void                  clutter_table_layout_set_row_spacing     (ClutterTableLayout    *layout,
-                                                                guint                  spacing);
-CLUTTER_DEPRECATED_FOR (clutter_grid_layout_get_column_spacing)
-guint                 clutter_table_layout_get_column_spacing  (ClutterTableLayout    *layout);
-CLUTTER_DEPRECATED_FOR (clutter_grid_layout_get_row_spacing)
-guint                 clutter_table_layout_get_row_spacing     (ClutterTableLayout    *layout);
-
-CLUTTER_DEPRECATED
-void                  clutter_table_layout_set_span            (ClutterTableLayout    *layout,
-                                                                ClutterActor          *actor,
-                                                                gint                   column_span,
-                                                                gint                   row_span);
-CLUTTER_DEPRECATED
-void                  clutter_table_layout_get_span            (ClutterTableLayout    *layout,
-                                                                ClutterActor          *actor,
-                                                                gint                  *column_span,
-                                                                gint                  *row_span);
-
-CLUTTER_DEPRECATED
-void                  clutter_table_layout_set_alignment       (ClutterTableLayout    *layout,
-                                                                ClutterActor          *actor,
-                                                                ClutterTableAlignment  x_align,
-                                                                ClutterTableAlignment  y_align);
-CLUTTER_DEPRECATED
-void                  clutter_table_layout_get_alignment       (ClutterTableLayout    *layout,
-                                                                ClutterActor          *actor,
-                                                                ClutterTableAlignment *x_align,
-                                                                ClutterTableAlignment *y_align);
-CLUTTER_DEPRECATED
-void                  clutter_table_layout_set_fill            (ClutterTableLayout    *layout,
-                                                                ClutterActor          *actor,
-                                                                gboolean               x_fill,
-                                                                gboolean               y_fill);
-CLUTTER_DEPRECATED
-void                  clutter_table_layout_get_fill            (ClutterTableLayout    *layout,
-                                                                ClutterActor          *actor,
-                                                                gboolean              *x_fill,
-                                                                gboolean              *y_fill);
-CLUTTER_DEPRECATED
-void                  clutter_table_layout_set_expand          (ClutterTableLayout    *layout,
-                                                                ClutterActor          *actor,
-                                                                gboolean               x_expand,
-                                                                gboolean               y_expand);
-CLUTTER_DEPRECATED
-void                  clutter_table_layout_get_expand          (ClutterTableLayout    *layout,
-                                                                ClutterActor          *actor,
-                                                                gboolean              *x_expand,
-                                                                gboolean              *y_expand);
-
-CLUTTER_DEPRECATED
-gint                  clutter_table_layout_get_row_count       (ClutterTableLayout    *layout);
-CLUTTER_DEPRECATED
-gint                  clutter_table_layout_get_column_count    (ClutterTableLayout    *layout);
-
-CLUTTER_DEPRECATED
-void                  clutter_table_layout_set_use_animations  (ClutterTableLayout    *layout,
-                                                                gboolean               animate);
-CLUTTER_DEPRECATED
-gboolean              clutter_table_layout_get_use_animations  (ClutterTableLayout    *layout);
-CLUTTER_DEPRECATED
-void                  clutter_table_layout_set_easing_mode     (ClutterTableLayout    *layout,
-                                                                gulong                 mode);
-CLUTTER_DEPRECATED
-gulong                clutter_table_layout_get_easing_mode     (ClutterTableLayout    *layout);
-CLUTTER_DEPRECATED
-void                  clutter_table_layout_set_easing_duration (ClutterTableLayout    *layout,
-                                                                guint                  msecs);
-CLUTTER_DEPRECATED
-guint                 clutter_table_layout_get_easing_duration (ClutterTableLayout    *layout);
-
-G_END_DECLS
-
-#endif /* __CLUTTER_TABLE_LAYOUT_H__ */
--- a/clutter/clutter/deprecated/clutter-texture.c
+++ b/clutter/clutter/deprecated/clutter-texture.c
--- a/clutter/clutter/deprecated/clutter-texture.h
+++ b/clutter/clutter/deprecated/clutter-texture.h
@@ -1,128 +0,0 @@
-/*
- * Clutter.
- *
- * An OpenGL based 'interactive canvas' library.
- *
- * Authored By Matthew Allum  <mallum@openedhand.com>
- *
- * Copyright (C) 2006 OpenedHand
- *
- * 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.1 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/>.
- */
-
-#if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
-#error "Only <clutter/clutter.h> can be included directly."
-#endif
-
-#ifndef __CLUTTER_TEXTURE_DEPRECATED_H__
-#define __CLUTTER_TEXTURE_DEPRECATED_H__
-
-#include <clutter/clutter-texture.h>
-
-G_BEGIN_DECLS
-
-CLUTTER_DEPRECATED_FOR(clutter_image_new)
-ClutterActor *          clutter_texture_new                    (void);
-
-CLUTTER_DEPRECATED_FOR(ClutterImage and platform-specific image loading)
-ClutterActor *          clutter_texture_new_from_file           (const gchar            *filename,
-                                                                 GError                **error);
-
-CLUTTER_DEPRECATED_FOR(ClutterImage and platform-specific image loading)
-gboolean                clutter_texture_set_from_file           (ClutterTexture         *texture,
-                                                                 const gchar            *filename,
-                                                                 GError                **error);
-CLUTTER_DEPRECATED_FOR(clutter_image_set_data)
-gboolean                clutter_texture_set_from_rgb_data       (ClutterTexture         *texture,
-                                                                 const guchar           *data,
-                                                                 gboolean                has_alpha,
-                                                                 gint                    width,
-                                                                 gint                    height,
-                                                                 gint                    rowstride,
-                                                                 gint                    bpp,
-                                                                 ClutterTextureFlags     flags,
-                                                                 GError                **error);
-CLUTTER_DEPRECATED_FOR(clutter_image_set_area)
-gboolean                clutter_texture_set_area_from_rgb_data  (ClutterTexture         *texture,
-                                                                 const guchar           *data,
-                                                                 gboolean                has_alpha,
-                                                                 gint                    x,
-                                                                 gint                    y,
-                                                                 gint                    width,
-                                                                 gint                    height,
-                                                                 gint                    rowstride,
-                                                                 gint                    bpp,
-                                                                 ClutterTextureFlags     flags,
-                                                                 GError                **error);
-CLUTTER_DEPRECATED_FOR(ClutterImage and clutter_content_get_preferred_size)
-void                    clutter_texture_get_base_size           (ClutterTexture         *texture,
-                                                                 gint                   *width,
-                                                                 gint                   *height);
-CLUTTER_DEPRECATED_FOR(ClutterImage and clutter_actor_set_content_scaling_filters)
-void                    clutter_texture_set_filter_quality      (ClutterTexture         *texture,
-                                                                 ClutterTextureQuality   filter_quality);
-CLUTTER_DEPRECATED_FOR(ClutterImage and clutter_actor_get_content_scaling_filters)
-ClutterTextureQuality   clutter_texture_get_filter_quality      (ClutterTexture         *texture);
-CLUTTER_DEPRECATED
-CoglHandle              clutter_texture_get_cogl_texture        (ClutterTexture         *texture);
-CLUTTER_DEPRECATED
-void                    clutter_texture_set_cogl_texture        (ClutterTexture         *texture,
-                                                                 CoglHandle              cogl_tex);
-CLUTTER_DEPRECATED
-CoglHandle              clutter_texture_get_cogl_material       (ClutterTexture         *texture);
-CLUTTER_DEPRECATED
-void                    clutter_texture_set_cogl_material       (ClutterTexture         *texture,
-                                                                 CoglHandle              cogl_material);
-CLUTTER_DEPRECATED
-void                    clutter_texture_set_sync_size           (ClutterTexture         *texture,
-                                                                 gboolean                sync_size);
-CLUTTER_DEPRECATED
-gboolean                clutter_texture_get_sync_size           (ClutterTexture         *texture);
-CLUTTER_DEPRECATED_FOR(ClutterImage and clutter_actor_set_content_repeat)
-void                    clutter_texture_set_repeat              (ClutterTexture         *texture,
-                                                                 gboolean                repeat_x,
-                                                                 gboolean                repeat_y);
-CLUTTER_DEPRECATED_FOR(ClutterImage and clutter_actor_get_content_repeat)
-void                    clutter_texture_get_repeat              (ClutterTexture         *texture,
-                                                                 gboolean               *repeat_x,
-                                                                 gboolean               *repeat_y);
-CLUTTER_DEPRECATED
-gint                    clutter_texture_get_max_tile_waste      (ClutterTexture         *texture);
-CLUTTER_DEPRECATED_FOR(ClutterImage and clutter_actor_set_content_gravity)
-void                    clutter_texture_set_keep_aspect_ratio   (ClutterTexture         *texture,
-                                                                 gboolean                keep_aspect);
-CLUTTER_DEPRECATED_FOR(ClutterImage and clutter_actor_get_content_gravity)
-gboolean                clutter_texture_get_keep_aspect_ratio   (ClutterTexture         *texture);
-CLUTTER_DEPRECATED
-void                    clutter_texture_set_load_async          (ClutterTexture         *texture,
-                                                                 gboolean                load_async);
-CLUTTER_DEPRECATED
-gboolean                clutter_texture_get_load_async          (ClutterTexture         *texture);
-CLUTTER_DEPRECATED
-void                    clutter_texture_set_load_data_async     (ClutterTexture         *texture,
-                                                                 gboolean                load_async);
-CLUTTER_DEPRECATED
-gboolean                clutter_texture_get_load_data_async     (ClutterTexture         *texture);
-CLUTTER_DEPRECATED
-void                    clutter_texture_set_pick_with_alpha     (ClutterTexture         *texture,
-                                                                 gboolean                pick_with_alpha);
-CLUTTER_DEPRECATED
-gboolean                clutter_texture_get_pick_with_alpha     (ClutterTexture         *texture);
-
-CLUTTER_DEPRECATED_FOR(ClutterOffscreenEffect)
-ClutterActor *          clutter_texture_new_from_actor          (ClutterActor           *actor);
-
-G_END_DECLS
-
-#endif /* __CLUTTER_TEXTURE_DEPRECATED_H__ */
--- a/clutter/clutter/egl/clutter-egl.h
+++ b/clutter/clutter/egl/clutter-egl.h
@@ -37,12 +37,6 @@

 #include <glib.h>

-#ifdef COGL_HAS_XLIB_SUPPORT
-#include <X11/Xlib.h>
-#include <X11/Xatom.h>
-#include <X11/Xutil.h>
-#endif
-
 #include "clutter-egl-headers.h"
 #include <clutter/clutter.h>

--- a/clutter/clutter/meson.build
+++ b/clutter/clutter/meson.build
@@ -58,11 +58,13 @@ clutter_headers = [
  'clutter-mutter.h',
  'clutter-offscreen-effect.h',
  'clutter-page-turn-effect.h',
+  'clutter-paint-context.h',
  'clutter-paint-nodes.h',
  'clutter-paint-node.h',
  'clutter-pan-action.h',
  'clutter-path-constraint.h',
  'clutter-path.h',
+  'clutter-pick-context.h',
  'clutter-property-transition.h',
  'clutter-rotate-action.h',
  'clutter-script.h',
@@ -77,7 +79,6 @@ clutter_headers = [
  'clutter-stage-manager.h',
  'clutter-stage-view.h',
  'clutter-tap-action.h',
-  'clutter-texture.h',
  'clutter-text.h',
  'clutter-text-buffer.h',
  'clutter-timeline.h',
@@ -147,11 +148,13 @@ clutter_sources = [
  'clutter-master-clock-default.c',
  'clutter-offscreen-effect.c',
  'clutter-page-turn-effect.c',
+  'clutter-paint-context.c',
  'clutter-paint-nodes.c',
  'clutter-paint-node.c',
  'clutter-pan-action.c',
  'clutter-path-constraint.c',
  'clutter-path.c',
+  'clutter-pick-context.c',
  'clutter-property-transition.c',
  'clutter-rotate-action.c',
  'clutter-script.c',
@@ -201,6 +204,7 @@ clutter_private_headers = [
  'clutter-master-clock.h',
  'clutter-master-clock-default.h',
  'clutter-offscreen-effect-private.h',
+  'clutter-paint-context-private.h',
  'clutter-paint-node-private.h',
  'clutter-paint-volume-private.h',
  'clutter-private.h',
@@ -220,20 +224,13 @@ clutter_nonintrospected_sources = [
 clutter_deprecated_headers = [
  'deprecated/clutter-actor.h',
  'deprecated/clutter-alpha.h',
-  'deprecated/clutter-animatable.h',
  'deprecated/clutter-animation.h',
-  'deprecated/clutter-bin-layout.h',
  'deprecated/clutter-box.h',
-  'deprecated/clutter-cairo-texture.h',
  'deprecated/clutter-container.h',
  'deprecated/clutter-group.h',
-  'deprecated/clutter-keysyms.h',
  'deprecated/clutter-rectangle.h',
-  'deprecated/clutter-stage-manager.h',
  'deprecated/clutter-stage.h',
  'deprecated/clutter-state.h',
-  'deprecated/clutter-table-layout.h',
-  'deprecated/clutter-texture.h',
  'deprecated/clutter-timeline.h',
 ]

@@ -241,12 +238,9 @@ clutter_deprecated_sources = [
  'deprecated/clutter-alpha.c',
  'deprecated/clutter-animation.c',
  'deprecated/clutter-box.c',
-  'deprecated/clutter-cairo-texture.c',
  'deprecated/clutter-group.c',
  'deprecated/clutter-rectangle.c',
  'deprecated/clutter-state.c',
-  'deprecated/clutter-table-layout.c',
-  'deprecated/clutter-texture.c',
 ]

 clutter_backend_sources = []
@@ -309,7 +303,6 @@ cally_headers = [
    'cally/cally-root.h',
    'cally/cally-stage.h',
    'cally/cally-text.h',
-    'cally/cally-texture.h',
    'cally/cally-util.h',
 ]

@@ -322,7 +315,6 @@ cally_sources = [
    'cally/cally-root.c',
    'cally/cally-stage.c',
    'cally/cally-text.c',
-    'cally/cally-texture.c',
    'cally/cally-util.c',
 ]

--- a/cogl/cogl-pango/cogl-pango-render.c
+++ b/cogl/cogl-pango/cogl-pango-render.c
@@ -454,34 +454,6 @@ cogl_pango_show_layout (CoglFramebuffer *fb,
    }
 }

-void
-cogl_pango_render_layout_subpixel (PangoLayout *layout,
-                                   int x,
-                                   int y,
-                                   const CoglColor *color,
-                                   int flags)
-{
-  cogl_pango_show_layout (cogl_get_draw_framebuffer (),
-                          layout,
-                          x / (float) PANGO_SCALE,
-                          y / (float) PANGO_SCALE,
-                          color);
-}
-
-void
-cogl_pango_render_layout (PangoLayout *layout,
-                          int x,
-                          int y,
-                          const CoglColor *color,
-                          int flags)
-{
-  cogl_pango_render_layout_subpixel (layout,
-                                     x * PANGO_SCALE,
-                                     y * PANGO_SCALE,
-                                     color,
-                                     flags);
-}
-
 void
 cogl_pango_show_layout_line (CoglFramebuffer *fb,
                             PangoLayoutLine *line,
@@ -519,19 +491,6 @@ cogl_pango_show_layout_line (CoglFramebuffer *fb,
  priv->display_list = NULL;
 }

-void
-cogl_pango_render_layout_line (PangoLayoutLine *line,
-                               int x,
-                               int y,
-                               const CoglColor *color)
-{
-  cogl_pango_show_layout_line (cogl_get_draw_framebuffer (),
-                               line,
-                               x / (float) PANGO_SCALE,
-                               y / (float) PANGO_SCALE,
-                               color);
-}
-
 void
 _cogl_pango_renderer_clear_glyph_cache (CoglPangoRenderer *renderer)
 {
--- a/cogl/cogl-pango/cogl-pango.h
+++ b/cogl/cogl-pango/cogl-pango.h
@@ -229,71 +229,6 @@ typedef struct _CoglPangoRendererClass CoglPangoRendererClass;

 GType cogl_pango_renderer_get_type (void) G_GNUC_CONST;

-/**
- * cogl_pango_render_layout_subpixel:
- * @layout: a #PangoLayout
- * @x: X coordinate (in Pango units) to render the layout at
- * @y: Y coordinate (in Pango units) to render the layout at
- * @color: color to use when rendering the layout
- * @flags:
- *
- * Draws a solidly coloured @layout on the given @framebuffer at (@x,
- * @y) within the @framebuffer<!-- -->'s current model-view coordinate
- * space.
- *
- * Since: 1.0
- * Deprecated: 1.16: Use cogl_pango_show_layout() instead
- */
-COGL_DEPRECATED_FOR (cogl_pango_show_layout)
-void
-cogl_pango_render_layout_subpixel (PangoLayout *layout,
-                                   int x,
-                                   int y,
-                                   const CoglColor *color,
-                                   int flags);
-
-/**
- * cogl_pango_render_layout:
- * @layout: a #PangoLayout
- * @x: X coordinate to render the layout at
- * @y: Y coordinate to render the layout at
- * @color: color to use when rendering the layout
- * @flags:
- *
- * Draws a solidly coloured @layout on the given @framebuffer at (@x,
- * @y) within the @framebuffer<!-- -->'s current model-view coordinate
- * space.
- *
- * Since: 1.0
- * Deprecated: 1.16: Use cogl_pango_show_layout() instead
- */
-COGL_DEPRECATED_FOR (cogl_pango_show_layout)
-void
-cogl_pango_render_layout (PangoLayout *layout,
-                          int x,
-                          int y,
-                          const CoglColor *color,
-                          int flags);
-
-/**
- * cogl_pango_render_layout_line:
- * @line: a #PangoLayoutLine
- * @x: X coordinate to render the line at
- * @y: Y coordinate to render the line at
- * @color: color to use when rendering the line
- *
- * Renders @line at the given coordinates using the given color.
- *
- * Since: 1.0
- * Deprecated: 1.16: Use cogl_pango_show_layout() instead
- */
-COGL_DEPRECATED_FOR (cogl_pango_show_layout_line)
-void
-cogl_pango_render_layout_line (PangoLayoutLine *line,
-                               int x,
-                               int y,
-                               const CoglColor *color);
-
 G_END_DECLS

 #endif /* __COGL_PANGO_H__ */
--- a/cogl/cogl-pango/cogl-pango.symbols
+++ b/cogl/cogl-pango/cogl-pango.symbols
@@ -7,6 +7,3 @@ cogl_pango_font_map_new
 cogl_pango_font_map_set_resolution  
 cogl_pango_font_map_set_use_mipmapping
 cogl_pango_renderer_get_type
-cogl_pango_render_layout
-cogl_pango_render_layout_line
-cogl_pango_render_layout_subpixel
--- a/cogl/cogl-path/cogl-path-functions.h
+++ b/cogl/cogl-path/cogl-path-functions.h
@@ -422,26 +422,6 @@ cogl_path_set_fill_rule (CoglPath *path, CoglPathFillRule fill_rule);
 CoglPathFillRule
 cogl_path_get_fill_rule (CoglPath *path);

-#define cogl_path_fill cogl2_path_fill
-/**
- * cogl_path_fill:
- *
- * Fills the interior of the constructed shape using the current
- * drawing color.
- *
- * The interior of the shape is determined using the fill rule of the
- * path. See %CoglPathFillRule for details.
- *
- * <note>The result of referencing sliced textures in your current
- * pipeline when filling a path are undefined. You should pass
- * the %COGL_TEXTURE_NO_SLICING flag when loading any texture you will
- * use while filling a path.</note>
- *
- * Since: 2.0
- */
-void
-cogl_path_fill (CoglPath *path);
-
 /**
 * cogl_framebuffer_fill_path:
 * @framebuffer: A #CoglFramebuffer
@@ -466,19 +446,6 @@ cogl_framebuffer_fill_path (CoglFramebuffer *framebuffer,
                            CoglPipeline *pipeline,
                            CoglPath *path);

-#define cogl_path_stroke cogl2_path_stroke
-/**
- * cogl_path_stroke:
- *
- * Strokes the constructed shape using the current drawing color and a
- * width of 1 pixel (regardless of the current transformation
- * matrix).
- *
- * Since: 2.0
- */
-void
-cogl_path_stroke (CoglPath *path);
-
 /**
 * cogl_framebuffer_stroke_path:
 * @framebuffer: A #CoglFramebuffer
@@ -513,22 +480,6 @@ void
 cogl_framebuffer_push_path_clip (CoglFramebuffer *framebuffer,
                                 CoglPath *path);

-#define cogl_clip_push_from_path cogl2_clip_push_from_path
-/**
- * cogl_clip_push_from_path:
- * @path: The path to clip with.
- *
- * Sets a new clipping area using the silhouette of the specified,
- * filled @path.  The clipping area is intersected with the previous
- * clipping area. To restore the previous clipping area, call
- * call cogl_clip_pop().
- *
- * Since: 1.8
- * Stability: Unstable
- */
-void
-cogl_clip_push_from_path (CoglPath *path);
-
 G_END_DECLS

 #endif /* __COGL_PATH_FUNCTIONS_H__ */
--- a/cogl/cogl-path/cogl-path.c
+++ b/cogl/cogl-path/cogl-path.c
@@ -385,38 +385,6 @@ _cogl_path_fill_nodes (CoglPath *path,
    }
 }

-/* TODO: Update to the protoype used in the Cogl master branch.
- * This is experimental API but not in sync with the cogl_path_fill()
- * api in Cogl master which takes explicit framebuffer and pipeline
- * arguments */
-void
-cogl2_path_fill (CoglPath *path)
-{
-  g_return_if_fail (cogl_is_path (path));
-
-  _cogl_path_fill_nodes (path,
-                         cogl_get_draw_framebuffer (),
-                         cogl_get_source (),
-                         0 /* flags */);
-}
-
-/* TODO: Update to the protoype used in the Cogl master branch.
- * This is experimental API but not in sync with the cogl_path_fill()
- * api in Cogl master which takes explicit framebuffer and pipeline
- * arguments */
-void
-cogl2_path_stroke (CoglPath *path)
-{
-  g_return_if_fail (cogl_is_path (path));
-
-  if (path->data->path_nodes->len == 0)
-    return;
-
-  _cogl_path_stroke_nodes (path,
-                           cogl_get_draw_framebuffer (),
-                           cogl_get_source ());
-}
-
 void
 cogl2_path_move_to (CoglPath *path,
                    float x,
@@ -1504,12 +1472,6 @@ cogl_framebuffer_push_path_clip (CoglFramebuffer *framebuffer,
      COGL_FRAMEBUFFER_STATE_CLIP;
 }

-void
-cogl_clip_push_from_path (CoglPath *path)
-{
-  cogl_framebuffer_push_path_clip (cogl_get_draw_framebuffer (), path);
-}
-
 static void
 _cogl_path_build_stroke_attribute_buffer (CoglPath *path)
 {
--- a/cogl/cogl/cogl-attribute-private.h
+++ b/cogl/cogl/cogl-attribute-private.h
@@ -90,17 +90,16 @@ typedef enum
  COGL_DRAW_SKIP_JOURNAL_FLUSH = 1 << 0,
  COGL_DRAW_SKIP_PIPELINE_VALIDATION = 1 << 1,
  COGL_DRAW_SKIP_FRAMEBUFFER_FLUSH = 1 << 2,
-  COGL_DRAW_SKIP_LEGACY_STATE = 1 << 3,
  /* By default the vertex attribute drawing code will assume that if
     there is a color attribute array enabled then we can't determine
     if the colors will be opaque so we need to enabling
     blending. However when drawing from the journal we know what the
     contents of the color array is so we can override this by passing
     this flag. */
-  COGL_DRAW_COLOR_ATTRIBUTE_IS_OPAQUE = 1 << 4,
+  COGL_DRAW_COLOR_ATTRIBUTE_IS_OPAQUE = 1 << 3,
  /* This forcibly disables the debug option to divert all drawing to
   * wireframes */
-  COGL_DRAW_SKIP_DEBUG_WIREFRAME = 1 << 5
+  COGL_DRAW_SKIP_DEBUG_WIREFRAME = 1 << 4
 } CoglDrawFlags;

 /* During CoglContext initialization we register the "cogl_color_in"
--- a/cogl/cogl/cogl-attribute.c
+++ b/cogl/cogl/cogl-attribute.c
@@ -650,15 +650,6 @@ _cogl_flush_attributes_state (CoglFramebuffer *framebuffer,
   * when the framebuffer really does get drawn to. */
  _cogl_framebuffer_mark_clear_clip_dirty (framebuffer);

-  if (G_UNLIKELY (!(flags & COGL_DRAW_SKIP_LEGACY_STATE)) &&
-      G_UNLIKELY (ctx->legacy_state_set) &&
-      _cogl_get_enable_legacy_state ())
-    {
-      copy = cogl_pipeline_copy (pipeline);
-      pipeline = copy;
-      _cogl_pipeline_apply_legacy_state (pipeline);
-    }
-
  ctx->driver_vtable->flush_attributes_state (framebuffer,
                                              pipeline,
                                              &layers_state,
--- a/Show More
+++ b/Show More