comp_wl: Deprecate video_client field

The `video_client` field has been no longer used since HWC layer policy
was deprecated.

Change-Id: I07dc6490240ed049a21a511be005ed3361f6496e

diff --git a/src/bin/debug/e_info_server.c b/src/bin/debug/e_info_server.c
index d2478f6a3d4a777cc361a3ff3892eaf52302fb69..686c868f3621b6c0cdf1723dfbf30156972f89f8 100644 (file)
--- a/src/bin/debug/e_info_server.c
+++ b/src/bin/debug/e_info_server.c
@@ -1555,7 +1555,7 @@ _get_win_prop_Video_Client(const Evas_Object *evas_obj)
    ec = evas_object_data_get(evas_obj, "E_Client");
    EINA_SAFETY_ON_NULL_RETURN_VAL(ec, NULL);
 
-   if (asprintf(&str, "%d", ec->comp_data ? (ec->comp_data->video_client || e_client_video_hw_composition_check((E_Client *)ec)) : 0) < 0)
+   if (asprintf(&str, "%d", e_client_video_hw_composition_check((E_Client *)ec)) < 0)
      return NULL;
 
    return str;
@@ -3196,7 +3196,7 @@ _e_info_server_cb_subsurface(const Eldbus_Service_Interface *iface EINA_UNUSED,
              if (mask_rect)
                mask_rect_view = (Ecore_Window)e_alpha_mask_rect_view_get(mask_rect);
              maskobj = e_comp_object_mask_has(ec->frame);
-             video = (ec->comp_data->video_client || e_client_video_hw_composition_check(ec)) ? 1 : 0;
+             video = e_client_video_hw_composition_check(ec);
              name = e_client_util_name_get(ec);
              if (!name)
                name = "NO NAME";

diff --git a/src/bin/server/e_comp_wl.c b/src/bin/server/e_comp_wl.c
index eab3d905e38b7c368eb700d57bbe11db2830ee97..aa459bf9c0eba31447c107bcce742c2cebb9e403 100644 (file)
--- a/src/bin/server/e_comp_wl.c
+++ b/src/bin/server/e_comp_wl.c
@@ -2950,17 +2950,11 @@ _e_comp_wl_surface_state_commit(E_Client *ec, E_Comp_Wl_Surface_State *state)
 
    e_comp_wl_subsurface_check_alpha_mask_rect(ec);
 
-   buffer = e_surface_buffer_try_get(surface);
-   if ((cdata->video_client) &&
-       (buffer && (buffer->type == E_COMP_WL_BUFFER_TYPE_VIDEO)))
-     {
-        e_pixmap_image_clear(ec->pixmap, 1);
-     }
-
    state->buffer_viewport.changed = 0;
 
    wl_signal_emit(&cdata->state_commit_signal, &cdata->surface);
 
+   buffer = e_surface_buffer_try_get(surface);
    if (buffer &&
        ec->exp_iconify.buffer_flush &&
        e_policy_visibility_client_is_iconic(ec))
@@ -3579,8 +3573,7 @@ e_comp_wl_surface_commit(E_Client *ec)
    _e_comp_wl_surface_state_commit(ec, &ec->comp_data->pending);
    if (!e_view_client_damage_exists(e_client_view_get(ec)))
      {
-        if ((ec->comp_data->video_client) ||
-            (!e_client_video_hw_composition_check(ec)))
+        if (!e_client_video_hw_composition_check(ec))
           e_pixmap_image_clear(ec->pixmap, 1);
      }
 
@@ -4366,19 +4359,13 @@ e_comp_wl_sub_data_stand_alone_get(E_Client *ec)
 E_API Eina_Bool
 e_comp_wl_is_video_client(E_Client *ec)
 {
-   if (!ec) return EINA_FALSE;
-   if (!ec->comp_data) return EINA_FALSE;
-
-   return ec->comp_data->video_client;
+   return EINA_FALSE;
 }
 
 E_API void
 e_comp_wl_video_client_set(E_Client *ec, Eina_Bool set)
 {
-   EINA_SAFETY_ON_NULL_RETURN(ec);
-   EINA_SAFETY_ON_NULL_RETURN(ec->comp_data);
-
-   ec->comp_data->video_client = set;
+   // This is left blank intentionally.
 }
 
 E_API struct wl_resource *

diff --git a/src/bin/server/e_comp_wl_subsurface.c b/src/bin/server/e_comp_wl_subsurface.c
index d53ffbffc55644ed8fead1e9943bbe39eca3a43a..f192439d8dafa2246fe2aba2870fccbfcd6f6111 100644 (file)
--- a/src/bin/server/e_comp_wl_subsurface.c
+++ b/src/bin/server/e_comp_wl_subsurface.c
@@ -200,8 +200,7 @@ _e_comp_wl_subsurface_video_has(E_Client *ec)
    if (e_object_is_del(E_OBJECT(ec))) return EINA_FALSE;
    if (!ec->comp_data) return EINA_FALSE;
 
-   if ((ec->comp_data->video_client) ||
-       (e_client_video_hw_composition_check(ec)))
+   if (e_client_video_hw_composition_check(ec))
      return EINA_TRUE;
 
    if (ec->comp_data->has_video_client)
@@ -655,7 +654,7 @@ e_comp_wl_normal_subsurface_has(E_Client *ec)
    /* if a leaf client is not video cliet */
    if (ec->comp_data->sub.data && !ec->comp_data->sub.below_list &&
        !ec->comp_data->sub.below_list_pending &&
-       ((!ec->comp_data->video_client) && (!e_client_video_hw_composition_check(ec))))
+       !e_client_video_hw_composition_check(ec))
      {
         /* FIXME
          * This is a workaround patch to fix the problem that some E_Client

diff --git a/src/bin/server/e_compositor.c b/src/bin/server/e_compositor.c
index 8722616e853134b1c49aa8449d905fdafe2a4c43..12dad40b4d25a6097687179166eac32a6b151fca 100644 (file)
--- a/src/bin/server/e_compositor.c
+++ b/src/bin/server/e_compositor.c
@@ -1160,18 +1160,8 @@ _e_surface_root_surface_get(E_Surface *surface)
 static void
 _e_surface_buffer_video_content_type_check_and_set(E_Surface *surface, E_Comp_Wl_Buffer *buffer)
 {
-   E_Client *ec = surface->ec;
-
-   if (ec->comp_data->video_client)
-     {
-        buffer->type = E_COMP_WL_BUFFER_TYPE_VIDEO;
-        buffer->w = buffer->h = 1;
-        buffer->format = 0;
-     }
-   else if (e_client_video_hw_composition_check(ec))
-     {
-        buffer->type = E_COMP_WL_BUFFER_TYPE_VIDEO;
-     }
+   if (e_client_video_hw_composition_check(surface->ec))
+     buffer->type = E_COMP_WL_BUFFER_TYPE_VIDEO;
 }
 
 static void

diff --git a/src/include/e_comp_wl.h b/src/include/e_comp_wl.h
index a412777199782fc444876c8954fcdd964df80070..7ae4f820dc21cf5b4384b25dc6efacc449d03db0 100644 (file)
--- a/src/include/e_comp_wl.h
+++ b/src/include/e_comp_wl.h
@@ -472,7 +472,7 @@ struct _E_Comp_Wl_Client_Data
    E_DEPRECATED Eina_Bool frame_update : 1;
    E_DEPRECATED Eina_Bool focus_update : 1;
    E_DEPRECATED Eina_Bool opaque_state : 1;
-   Eina_Bool video_client : 1; // Deprecated
+   E_DEPRECATED Eina_Bool video_client : 1;
    Eina_Bool has_video_client : 1;
    Eina_Bool never_hwc : 1;          //  force window not to do hwc
    Eina_Bool first_commit : 1;       // TRUE : once client committed
@@ -625,8 +625,8 @@ E_API void        e_comp_wl_sub_data_position_set(E_Client *ec, int x, int y);
 E_API E_Client   *e_comp_wl_sub_data_remote_surface_offscreen_parent_get(E_Client *ec);
 E_API Eina_Bool   e_comp_wl_sub_data_stand_alone_get(E_Client *ec);
 
-E_API Eina_Bool e_comp_wl_is_video_client(E_Client *ec);
-E_API void      e_comp_wl_video_client_set(E_Client *ec, Eina_Bool set);
+E_DEPRECATED E_API Eina_Bool e_comp_wl_is_video_client(E_Client *ec);
+E_DEPRECATED E_API void      e_comp_wl_video_client_set(E_Client *ec, Eina_Bool set);
 
 E_API struct wl_resource *e_comp_wl_surface_get(E_Client *ec);
 E_API struct wl_resource *e_comp_wl_wl_surface_get(E_Client *ec);