From 7e4f58faa301d51eebcffa8ba8ee18dcfe6db765 Mon Sep 17 00:00:00 2001
From: Marius Vlad <marius.vlad@collabora.com>
Date: Wed, 10 Jul 2019 21:06:15 +0300
Subject: [PATCH] libweston: Migrate functions that operate on 'weston_view'

Signed-off-by: Marius Vlad <marius.vlad@collabora.com>
---
 include/libweston/libweston.h  | 13 -------------
 libweston/libweston-internal.h | 17 +++++++++++++++++
 tests/surface-global-test.c    |  1 +
 3 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/include/libweston/libweston.h b/include/libweston/libweston.h
index 4a6385b7..80c8116d 100644
--- a/include/libweston/libweston.h
+++ b/include/libweston/libweston.h
@@ -1620,18 +1620,11 @@ weston_view_update_transform(struct weston_view *view);
 void
 weston_view_geometry_dirty(struct weston_view *view);
 
-void
-weston_view_to_global_fixed(struct weston_view *view,
-			    wl_fixed_t sx, wl_fixed_t sy,
-			    wl_fixed_t *x, wl_fixed_t *y);
 void
 weston_view_to_global_float(struct weston_view *view,
 			    float sx, float sy, float *x, float *y);
 
 void
-weston_view_from_global_float(struct weston_view *view,
-			      float x, float y, float *vx, float *vy);
-void
 weston_view_from_global(struct weston_view *view,
 			int32_t x, int32_t y, int32_t *vx, int32_t *vy);
 void
@@ -1851,9 +1844,6 @@ weston_view_set_mask_infinite(struct weston_view *view);
 bool
 weston_view_is_mapped(struct weston_view *view);
 
-bool
-weston_view_is_opaque(struct weston_view *ev, pixman_region32_t *region);
-
 void
 weston_view_schedule_repaint(struct weston_view *view);
 
@@ -1870,9 +1860,6 @@ weston_surface_damage(struct weston_surface *surface);
 void
 weston_view_damage_below(struct weston_view *view);
 
-void
-weston_view_move_to_plane(struct weston_view *view,
-			  struct weston_plane *plane);
 void
 weston_view_unmap(struct weston_view *view);
 
diff --git a/libweston/libweston-internal.h b/libweston/libweston-internal.h
index e5e63785..c9d2fb70 100644
--- a/libweston/libweston-internal.h
+++ b/libweston/libweston-internal.h
@@ -274,4 +274,21 @@ weston_spring_done(struct weston_spring *spring);
 
 void
 weston_spring_update(struct weston_spring *spring, const struct timespec *time);
+
+/* weston_view */
+
+void
+weston_view_to_global_fixed(struct weston_view *view,
+			    wl_fixed_t sx, wl_fixed_t sy,
+			    wl_fixed_t *x, wl_fixed_t *y);
+void
+weston_view_from_global_float(struct weston_view *view,
+			      float x, float y, float *vx, float *vy);
+bool
+weston_view_is_opaque(struct weston_view *ev, pixman_region32_t *region);
+
+void
+weston_view_move_to_plane(struct weston_view *view,
+			  struct weston_plane *plane);
+
 #endif
diff --git a/tests/surface-global-test.c b/tests/surface-global-test.c
index 548f5523..2c9c8079 100644
--- a/tests/surface-global-test.c
+++ b/tests/surface-global-test.c
@@ -29,6 +29,7 @@
 #include <stdint.h>
 
 #include <libweston/libweston.h>
+#include "libweston-internal.h"
 #include "compositor/weston.h"
 
 static void