[mutter/wayland] Revert "ff"

[Jasper St. Pierre <jstpierre src gnome org>]

commit c749f7b6fb9ba270a99a7568f85dfd495ab62e30
Author: Jasper St. Pierre <jstpierre mecheye net>
Date:   Tue Nov 19 11:22:49 2013 -0500

    Revert "ff"
    
    This reverts commit 74462133ca7e85aabaac634517dbd5dd0a7742c2.
    
    Pushed by accident, if it wasn't obvious...

 src/compositor/meta-surface-actor.c           |    4 +++-
 src/compositor/meta-surface-content-wayland.c |   13 -------------
 2 files changed, 3 insertions(+), 14 deletions(-)
---
diff --git a/src/compositor/meta-surface-actor.c b/src/compositor/meta-surface-actor.c
index 536b83d..40177ad 100644
--- a/src/compositor/meta-surface-actor.c
+++ b/src/compositor/meta-surface-actor.c
@@ -20,7 +20,9 @@
 
 struct _MetaSurfaceActorPrivate
 {
-  MetaSurfaceContentWayland *main_content;
+  MetaShapedTexture *texture;
+  MetaWaylandBuffer *buffer;
+  Pixmap pixmap;
 };
 
 G_DEFINE_TYPE (MetaSurfaceActor, meta_surface_actor, CLUTTER_TYPE_ACTOR);