e_compositor: Make e_surface_from_resource not be able to return null

Change-Id: I9913505833bfb7c5b6640bd473347eee17dbbddf

diff --git a/src/bin/server/e_comp_wl_tizen_hwc.c b/src/bin/server/e_comp_wl_tizen_hwc.c
index abb0593..39ec3b3 100644 (file)
--- a/src/bin/server/e_comp_wl_tizen_hwc.c
+++ b/src/bin/server/e_comp_wl_tizen_hwc.c
@@ -206,7 +206,6 @@ _e_comp_wl_tizen_hwc_cb_create_commit_feedback(struct wl_client *client,
    if (e_object_is_del(E_OBJECT(ec))) return;
 
    surface = e_surface_from_resource(surface_resource);
-   EINA_SAFETY_ON_NULL_RETURN(surface);
 
    hwc_commit_feedback = E_NEW(E_Comp_Wl_Tizen_Hwc_Commit_Feedback, 1);
    if (!hwc_commit_feedback)

diff --git a/src/bin/server/e_comp_wl_viewport.c b/src/bin/server/e_comp_wl_viewport.c
index 0496cac..1073bbd 100644 (file)
--- a/src/bin/server/e_comp_wl_viewport.c
+++ b/src/bin/server/e_comp_wl_viewport.c
@@ -1660,13 +1660,6 @@ e_comp_wl_viewport_create(struct wl_resource *resource,
         return EINA_FALSE;
      }
 
-   surface = e_surface_from_resource(surface_resource);
-   if (!surface)
-     {
-        ERR("Could not get E_Surface from wl_resource(%p)", surface_resource);
-        return EINA_FALSE;
-     }
-
    if (!(client = wl_resource_get_client(surface_resource)))
      {
         ERR("Could not get client from wl_surface@%d",
@@ -1689,6 +1682,7 @@ e_comp_wl_viewport_create(struct wl_resource *resource,
         return EINA_FALSE;
      }
 
+   surface = e_surface_from_resource(surface_resource);
    if (!e_surface_viewporter_resource_set(surface, res))
      {
         ERR("E_Surface(%p) already has a viewporter", surface);

diff --git a/src/bin/server/e_compositor.c b/src/bin/server/e_compositor.c
index 6a25d27..f8f5d13 100644 (file)
--- a/src/bin/server/e_compositor.c
+++ b/src/bin/server/e_compositor.c
@@ -191,8 +191,6 @@ e_compositor_util_client_from_surface_resource(struct wl_resource *surface_resou
      return NULL;
 
    surface = _e_surface_from_ds_surface(ds_surface);
-   if (!surface)
-     return NULL;
 
    return surface->ec;
 }
@@ -339,18 +337,7 @@ e_comp_wl_subsurface_commit(E_Client *ec)
 EINTERN E_Surface *
 e_surface_from_resource(struct wl_resource *surface_resource)
 {
-   E_Surface *surface;
-   struct ds_surface *ds_surface;
-
-   ds_surface = ds_surface_from_resource(surface_resource);
-   if (!ds_surface)
-     return NULL;
-
-   surface = _e_surface_from_ds_surface(ds_surface);
-   if (!surface)
-     return NULL;
-
-   return surface;
+   return _e_surface_from_ds_surface(ds_surface_from_resource(surface_resource));
 }
 
 EINTERN void
@@ -986,15 +973,14 @@ _e_surface_ds_surface_set(E_Surface *surface, struct ds_surface *ds_surface)
 static E_Surface *
 _e_surface_from_ds_surface(struct ds_surface *ds_surface)
 {
-   E_Surface *surface = NULL;
+   E_Surface *surface;
    struct wl_listener *listener;
 
    listener = wl_signal_get(&ds_surface->events.destroy,
                             _e_surface_cb_destroy);
-   if (listener)
-     surface = wl_container_of(listener, surface, destroy);
+   assert(listener);
 
-   return surface;
+   return wl_container_of(listener, surface, destroy);
 }
 
 static E_Surface *

diff --git a/src/bin/server/e_subsurface_watcher.c b/src/bin/server/e_subsurface_watcher.c
index 7d1c68c..d3662ed 100644 (file)
--- a/src/bin/server/e_subsurface_watcher.c
+++ b/src/bin/server/e_subsurface_watcher.c
@@ -33,14 +33,9 @@ static E_Subsurface_Watcher *
 _e_subsurface_watcher_from_surface_resource(struct wl_resource *surface_resource)
 {
    E_Subsurface_Watcher *watcher = NULL;
-   E_Surface *surface;
    struct wl_listener *listener;
 
-   surface = e_surface_from_resource(surface_resource);
-   if (!surface)
-     return NULL;
-
-   listener = e_surface_destroy_listener_get(surface, _e_subsurface_watcher_cb_surface_destroy);
+   listener = e_surface_destroy_listener_get(e_surface_from_resource(surface_resource), _e_subsurface_watcher_cb_surface_destroy);
    if (listener)
      watcher = wl_container_of(listener, watcher, surface_destroy);
 

diff --git a/src/bin/server/e_video_shell.c b/src/bin/server/e_video_shell.c
index 24afbfc..37cf64d 100644 (file)
--- a/src/bin/server/e_video_shell.c
+++ b/src/bin/server/e_video_shell.c
@@ -1460,7 +1460,6 @@ _video_surface_cb_get_subsurface(struct wl_client *client, struct wl_resource *r
      }
 
    parent_surface = e_surface_from_resource(parent_surface_resource);
-   assert(parent_surface);
 
    // HACK: The call to e_subsurface_create will assign role to given surface
    // and raise protocol error if it has already role. This is to avoid it.
@@ -1644,8 +1643,6 @@ _video_shell_cb_get_surface(struct wl_client *client, struct wl_resource *resour
    E_Surface *e_surface = e_surface_from_resource(surface_resource);
    E_Video_Surface *surface;
 
-   assert(e_surface);
-
    if (!e_surface_role_set(e_surface, e_video_surface_role_name, resource, WTZ_VIDEO_SHELL_ERROR_ROLE))
      return;