e_hwc_windows: use e_client_cdata_get

Change-Id: I41f58c21cbae9e6d77ef3273e4704fa8dd0300a3

diff --git a/src/bin/e_hwc_windows.c b/src/bin/e_hwc_windows.c
index cf441c86d4c35357428f3055379e41c06a38a9ec..e41b9047803aa50374d8644050674bb86a4c951a 100644 (file)
--- a/src/bin/e_hwc_windows.c
+++ b/src/bin/e_hwc_windows.c
@@ -84,11 +84,11 @@ static E_Comp_Wl_Buffer *
 _e_hwc_windows_comp_wl_buffer_get(E_Hwc_Window *hwc_window)
 {
    E_Client *ec = hwc_window->ec;
-   E_Comp_Wl_Client_Data *cdata = NULL;
+   E_Comp_Wl_Client_Data *cdata;
 
    if (!ec) return NULL;
 
-   cdata = ec->comp_data;
+   cdata = e_client_cdata_get(ec);
    if (!cdata) return NULL;
 
    return cdata->buffer_ref.buffer;
@@ -248,12 +248,14 @@ _e_hwc_windows_presentation_feedback_take(E_Hwc_Window *hwc_window)
    else
      {
         E_Client *ec;
+        E_Comp_Wl_Client_Data *cdata;
 
         ec = hwc_window->ec;
         if (!ec) return;
-        if (!ec->comp_data) return;
+        cdata = e_client_cdata_get(ec);
+        if (!cdata) return;
 
-        container = &ec->comp_data->presentation_container;
+        container = &cdata->presentation_container;
      }
 
    if (!container) return;
@@ -1249,15 +1251,17 @@ _e_hwc_windows_target_window_render_flush_post_cb(void *data, Evas *e EINA_UNUSE
    EINA_LIST_FOREACH(rendered_windows, l, hwc_window)
      {
         E_Client *ec = NULL;
+        E_Comp_Wl_Client_Data *cdata;
 
         hwc_window->on_rendered_target = EINA_FALSE;
 
         ec = hwc_window->ec;
         if (!ec) continue;
 
-        if (buffer_comp_info && ec->comp_data)
+        cdata = e_client_cdata_get(ec);
+        if (buffer_comp_info && cdata)
           e_presentation_time_container_feedback_merge(&buffer_comp_info->presentation_container,
-                                                       &ec->comp_data->presentation_container);
+                                                       &cdata->presentation_container);
 
         buffer = e_pixmap_ref_resource_get(ec->pixmap);
         if (!buffer)
@@ -3031,6 +3035,7 @@ _e_hwc_windows_pp_commit(E_Hwc *hwc)
    E_Hwc_Windows_Buffer_Comp_Info *pp_buffer_comp_info, *buffer_comp_info;
    tdm_error terror = TDM_ERROR_NONE;
    E_Client *ec;
+   E_Comp_Wl_Client_Data *cdata;
 
    EINA_SAFETY_ON_NULL_RETURN_VAL(hwc, EINA_FALSE);
 
@@ -3079,9 +3084,10 @@ _e_hwc_windows_pp_commit(E_Hwc *hwc)
         if (hwc->pp_hwc_window)
           {
              ec = hwc->pp_hwc_window->ec;
-             if ((ec) && (ec->comp_data))
+             cdata = e_client_cdata_get(ec);
+             if (ec && cdata)
                e_presentation_time_container_feedback_merge(&pp_buffer_comp_info->presentation_container,
-                                                            &ec->comp_data->presentation_container);
+                                                            &cdata->presentation_container);
           }
         else
           {