viewport: Remove duplicated code

Use e_comp_wl_topmost_parent_get(), and remove _topmost_parent_get()
which did the exact same functionality.

Change-Id: I5ffd2315dcae247003a51d162c72046d9898f94b

diff --git a/src/bin/e_comp_wl_viewport.c b/src/bin/e_comp_wl_viewport.c
index 2c28f42c895daec67b18b42b3ac5c265b40e99be..463682be09c0767864802f080e6ce5063e6aa228 100644 (file)
--- a/src/bin/e_comp_wl_viewport.c
+++ b/src/bin/e_comp_wl_viewport.c
@@ -104,23 +104,6 @@ static E_Viewport* _e_comp_wl_viewport_get_viewport(struct wl_resource *resource
 static void _e_comp_wl_viewport_cb_parent_resize(void *data, Evas *e, Evas_Object *obj, void *event_info);
 static void _e_comp_wl_viewport_parent_check(E_Viewport *viewport);
 
-static E_Client*
-_topmost_parent_get(E_Client *ec)
-{
-   E_Client *parent;
-
-   parent = e_comp_wl_subsurface_parent_get(ec);
-   while (parent)
-     {
-        if (!e_comp_wl_subsurface_check(parent))
-          return parent;
-
-        parent = e_comp_wl_subsurface_parent_get(parent);
-     }
-
-   return ec;
-}
-
 static void
 _destroy_viewport(E_Viewport *viewport)
 {
@@ -218,7 +201,7 @@ static void
 _client_cb_move(void *data, E_Client *ec)
 {
    E_Viewport *viewport = data;
-   E_Client *topmost = _topmost_parent_get(ec);
+   E_Client *topmost = e_comp_wl_topmost_parent_get(ec);
 
    if (ec != topmost && ec != viewport->epc) return;
 
@@ -231,7 +214,7 @@ static void
 _client_cb_resize(void *data, E_Client *ec)
 {
    E_Viewport *viewport = data;
-   E_Client *topmost = _topmost_parent_get(ec);
+   E_Client *topmost = e_comp_wl_topmost_parent_get(ec);
 
    if (ec != topmost && ec != viewport->epc) return;
 
@@ -1019,7 +1002,7 @@ _get_parent_transform(E_Viewport *viewport)
 
    ptransform = e_comp_wl_output_buffer_transform_get(epc);
 
-   topmost = _topmost_parent_get(epc);
+   topmost = e_comp_wl_topmost_parent_get(epc);
 
    if (ptransform != 0 && epc == topmost)
      {
@@ -1644,7 +1627,7 @@ _e_comp_wl_viewport_cb_apply_viewport(struct wl_listener *listener, void *data)
 {
    E_Viewport *viewport = container_of(listener, E_Viewport, surface_apply_viewport_listener);
    E_Client *ec = viewport->ec;
-   E_Client *topmost = _topmost_parent_get(ec);
+   E_Client *topmost = e_comp_wl_topmost_parent_get(ec);
    E_Comp_Wl_Buffer_Viewport *vp = &ec->comp_data->scaler.buffer_viewport;
    Eina_Bool changed = EINA_FALSE;
 
@@ -1687,7 +1670,7 @@ _e_comp_wl_viewport_cb_topmost_rotate(void *data, int type, void *event)
 {
    E_Viewport *viewport = data;
    E_Client *ec = viewport->ec;
-   E_Client *topmost = _topmost_parent_get(ec);
+   E_Client *topmost = e_comp_wl_topmost_parent_get(ec);
    E_Event_Client *ev = event;
 
    if (topmost != ev->ec)