Remove need_reparent, reparented, first_damage flags from wl client comp_data

This comes from following commit of upstream.

commit fbe959ccccd5c2af6b62aaaeff1e1fae3117e6d9
Author: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
Date:   Tue Jan 19 12:10:49 2016 -0500

    remove need_reparent, reparented, first_damage flags from wl client
comp_data

    these flags, and related code, have no functional purpose in wayland

Change-Id: Ibe029ad6bbe764025bb4c8eee5e81b5f72dc5aa0

diff --git a/src/bin/server/e_comp_wl.c b/src/bin/server/e_comp_wl.c
index e3813e391e201f416baad59fda8b540400e56090..6978b72727ba81acea26d15f27d88176bf099254 100644 (file)
--- a/src/bin/server/e_comp_wl.c
+++ b/src/bin/server/e_comp_wl.c
@@ -718,10 +718,8 @@ _e_comp_wl_evas_cb_show(void *data, Evas *evas EINA_UNUSED, Evas_Object *obj EIN
 
    if (!ec->override) e_hints_window_visible_set(ec);
 
-   if ((!ec->override) && (!ec->re_manage) && (!ec->comp_data->reparented) &&
-       (!ec->comp_data->need_reparent))
+   if ((!ec->override) && (!ec->re_manage))
      {
-        ec->comp_data->need_reparent = EINA_TRUE;
         ec->visible = EINA_TRUE;
      }
    if (!e_client_util_ignored_get(ec))
@@ -730,17 +728,6 @@ _e_comp_wl_evas_cb_show(void *data, Evas *evas EINA_UNUSED, Evas_Object *obj EIN
         EC_CHANGED(ec);
      }
 
-   if (!ec->comp_data->need_reparent)
-     {
-        if ((ec->hidden) || (ec->iconic))
-          {
-             e_view_client_hide(e_client_view_get(ec));
-//             e_comp_object_damage(ec->frame, 0, 0, ec->w, ec->h);
-          }
-        else
-          e_view_client_show(e_client_view_get(ec));
-     }
-
    topmost = e_comp_wl_topmost_parent_get(ec);
    if (topmost == ec && (ec->comp_data->sub.list || ec->comp_data->sub.below_list))
      e_comp_wl_subsurface_show(ec);

diff --git a/src/bin/server/e_compositor.c b/src/bin/server/e_compositor.c
index 41335ee11d18e350d3416f69a420d23e4e4b8e2d..8c02f618108b201a50d7e9935ec1d7d46cd160cc 100644 (file)
--- a/src/bin/server/e_compositor.c
+++ b/src/bin/server/e_compositor.c
@@ -963,7 +963,6 @@ _e_surface_create(E_Client *ec)
 
    /* set initial client data properties */
    surface->base.mapped = EINA_FALSE;
-   surface->base.need_reparent = !ec->internal;
 
    /* set initial value of scaler */
    surface->base.scaler.buffer_viewport.buffer.transform = WL_OUTPUT_TRANSFORM_NORMAL;

diff --git a/src/bin/windowmgr/e_policy_desk_area.c b/src/bin/windowmgr/e_policy_desk_area.c
index a57b89e612a45a2c0da2adb79ac308662631479d..68c32f52304926731d05f291baf644435129f3f4 100644 (file)
--- a/src/bin/windowmgr/e_policy_desk_area.c
+++ b/src/bin/windowmgr/e_policy_desk_area.c
@@ -1455,11 +1455,6 @@ _desk_area_cb_client_kill_request(struct wl_listener *listener, void *data)
    ELOGF("EDA", "CLIENT KILL REQUEST. eda:%p", ec, eda);
 
    e_comp_ignore_win_del(E_PIXMAP_TYPE_WL, e_pixmap_window_get(ec->pixmap));
-   if (ec->comp_data)
-     {
-        if (ec->comp_data->reparented)
-          e_client_comp_hidden_set(ec, EINA_TRUE);
-     }
 
    e_view_pass_events_set(e_view_client_view_get(e_client_view_get(ec)), true);
    if (ec->visible) e_view_client_hide(e_client_view_get(ec));

diff --git a/src/include/e_comp_wl.h b/src/include/e_comp_wl.h
index 33c398c06034eda0747fab7b7661b5bff5341426..3e51ab0c4b7ddf49798119dfd3ad1980a7353ae9 100644 (file)
--- a/src/include/e_comp_wl.h
+++ b/src/include/e_comp_wl.h
@@ -465,8 +465,8 @@ struct _E_Comp_Wl_Client_Data
    E_DEPRECATED Eina_Bool keep_buffer : 1;
    Eina_Bool mapped : 1;
    EINA_DEPRECATED Eina_Bool has_extern_parent : 1;
-   Eina_Bool need_reparent : 1;
-   Eina_Bool reparented : 1;
+   E_DEPRECATED Eina_Bool need_reparent : 1;
+   E_DEPRECATED Eina_Bool reparented : 1;
    Eina_Bool evas_init : 1;
    E_DEPRECATED Eina_Bool first_damage : 1;
    E_DEPRECATED Eina_Bool set_win_type : 1;