Move ref and unref from QWaylandSurface to private

There shouldn't be a need to call these functions manually, and if there
is then their available in the private implementation.

Also removed some relay functions in QWaylandSurface

Change-Id: I18944c5f1fe87a070baf0c19f1b48aec796774d7

1 files changed, 4 insertions, 10 deletions

diff --git a/src/compositor/compositor_api/qwaylandsurface_p.h b/src/compositor/compositor_api/qwaylandsurface_p.h
index 2b96decf9..8ed73f94a 100644
--- a/src/compositor/compositor_api/qwaylandsurface_p.h
+++ b/src/compositor/compositor_api/qwaylandsurface_p.h
@@ -80,25 +80,18 @@ public:
     QWaylandSurfacePrivate(QWaylandClient *client, quint32 id, int version, QWaylandCompositor *compositor);
     ~QWaylandSurfacePrivate();
 
+    void ref();
+    void deref();
+
     void refView(QWaylandView *view);
     void derefView(QWaylandView *view);
 
-    static QWaylandSurfacePrivate *fromResource(struct ::wl_resource *resource)
-    { return static_cast<QWaylandSurfacePrivate *>(Resource::fromResource(resource)->surface_object); }
-
-    bool mapped() const { return QtWayland::SurfaceBuffer::hasContent(buffer); }
-
     using QtWaylandServer::wl_surface::resource;
 
     void setSize(const QSize &size);
 
-    void sendFrameCallback();
     void removeFrameCallback(QtWayland::FrameCallback *callback);
 
-    void frameStarted();
-
-    QWaylandSurface::Origin origin() const { return buffer ? buffer->origin() : QWaylandSurface::OriginTopLeft; }
-
     void notifyViewsAboutDestruction();
 
     void setInputPanelSurface(QtWayland::InputPanelSurface *ips) { inputPanelSurface = ips; }
@@ -155,6 +148,7 @@ protected: //member variables
     QSize size;
     bool isCursorSurface;
     bool destroyed;
+    bool mapped;
     Qt::ScreenOrientation contentOrientation;
     QWindow::Visibility visibility;