Revert "when we get a request to close client app, defer resource deletion"

This reverts commit 1cf7c1f1511c446413fdc6fae35d17870bdd1c4e.

didn't fix the issue and obfuscated the code unnecessarily

Change-Id: I7fdfb1ad76152a65af9dbedf147c0ce8dae13c75

diff --git a/src/bin/e_comp_wl.c b/src/bin/e_comp_wl.c
index d5642b5d012cfa06fa4afa76ab07c9800fb53ac8..937693181a2ab536b9ffbb5239509c3254b8a9bd 100644 (file)
--- a/src/bin/e_comp_wl.c
+++ b/src/bin/e_comp_wl.c
@@ -148,9 +148,6 @@ _e_comp_wl_evas_cb_hide(void *data, Evas *evas EINA_UNUSED, Evas_Object *obj EIN
 
    EINA_LIST_FOREACH(ec->e.state.video_child, l, tmp)
      evas_object_hide(tmp->frame);
-
-   if ((ec->comp_data) && (ec->comp_data->delete_me))
-     wl_resource_destroy(ec->comp_data->surface);
 }
 
 static void
@@ -1162,21 +1159,8 @@ unmapped:
 static void
 _e_comp_wl_surface_cb_destroy(struct wl_client *client EINA_UNUSED, struct wl_resource *resource)
 {
-   E_Pixmap *ep;
-   E_Client *ec;
-
    DBG("Surface Cb Destroy: %d", wl_resource_get_id(resource));
-
-   if (!(ep = wl_resource_get_user_data(resource))) return;
-   if (!(ec = e_pixmap_client_get(ep))) return;
-
-   if (ec->comp_data)
-     {
-        ec->comp_data->delete_me = EINA_TRUE;
-        evas_object_hide(ec->frame);
-     }
-   else
-     wl_resource_destroy(resource);
+   wl_resource_destroy(resource);
 }
 
 static void
@@ -1375,6 +1359,7 @@ _e_comp_wl_surface_destroy(struct wl_resource *resource)
    if (!(ec = e_pixmap_client_get(ep)))
      return;
 
+   evas_object_hide(ec->frame);
    e_object_del(E_OBJECT(ec));
 }
 

diff --git a/src/bin/e_comp_wl.h b/src/bin/e_comp_wl.h
index 715afae774f3c6e6e63d26b6878ef64bb9b120d7..5d0143c2475a4ef6c18bc23f248221c5605fa40f 100644 (file)
--- a/src/bin/e_comp_wl.h
+++ b/src/bin/e_comp_wl.h
@@ -253,7 +253,6 @@ struct _E_Comp_Wl_Client_Data
         int32_t x, y;
      } popup;
 
-   Eina_Bool delete_me : 1;
    Eina_Bool keep_buffer : 1;
    Eina_Bool mapped : 1;
    Eina_Bool change_icon : 1;