Merge branch 'cairo-texture'

* cairo-texture:
  [cairo-texture] Remove the construct only restriction on surface size
  [cairo-texture] Silently discard 0x0 surfaces
  Re-indent ClutterPath header
  Add a test case for the new cairo path functions
  Add clutter_path_to_cairo_path and clutter_path_add_cairo_path
  Warn instead of returning in the IN_PAINT check
  Small documentation fixes
  Print a warning when creating a cairo_t while painting
  Do not set the IN_PAINT flag inside the Stage paint
  Set the IN_PAINT private flag
  [docs] Add ClutterCairoTexture to the API reference
  Add ClutterCairoTexture
  Require Cairo as a Clutter dependency

Conflicts:

  Fix merge conflict in clutter/clutter-path.h

clutter/clutter-actor.c

@@ -1453,6 +1453,9 @@ clutter_actor_paint (ClutterActor *self)
 	}
     }
 
+  /* mark that we are in the paint process */
+  CLUTTER_SET_PRIVATE_FLAGS (self, CLUTTER_ACTOR_IN_PAINT);
+
   cogl_push_matrix();
 
   _clutter_actor_apply_modelview_transform (self);
@@ -1492,6 +1495,9 @@ clutter_actor_paint (ClutterActor *self)
     cogl_clip_unset();
 
   cogl_pop_matrix();
+
+  /* paint sequence complete */
+  CLUTTER_UNSET_PRIVATE_FLAGS (self, CLUTTER_ACTOR_IN_PAINT);
 }
 
 /* fixed point, unit based rotation setter, to be used by