refactoring: change code to use E_APIs to access the E_Comp_Wl_Client_Data structure

Change-Id: I83321cc49c0271fefce0bb758216bbe1c649d4ab

diff --git a/src/e_mod_effect.c b/src/e_mod_effect.c
index 7a60fe546f948ba9cae67c58c8620829f815057e..61da225b6a31c52fc3ea7ae5d248db6c4f28a2b6 100644 (file)
--- a/src/e_mod_effect.c
+++ b/src/e_mod_effect.c
@@ -187,10 +187,10 @@ _eff_event_send(E_Client *ec, Eina_Bool start, E_Effect_Type type)
    unsigned int tizen_effect_type = TIZEN_EFFECT_TYPE_NONE;
 
    if (!_eff) return;
-   if ((!ec) || (!ec->comp_data)) return;
+   if ((!ec) || (!e_comp_wl_data_check(ec))) return;
    if (e_object_is_del(E_OBJECT(ec))) return;
 
-   res_surf = ec->comp_data->surface;
+   res_surf = e_comp_wl_surface_get(ec);
    if (!res_surf) return;
 
    wc = wl_resource_get_client(res_surf);
@@ -290,7 +290,7 @@ _eff_group_get(E_Client *ec)
      }
 
    /* subsurface */
-   if ((ec->comp_data) && (ec->comp_data->sub.data))
+   if (e_comp_wl_sub_data_get(ec))
      group = E_EFFECT_GROUP_NONE;
 
    /* client layer */
@@ -1596,10 +1596,10 @@ _eff_cb_launch(void *data, Evas_Object *obj, const char *signal)
    if (!_eff) return EINA_FALSE;
 
    ec = e_comp_object_client_get(obj);
-   if ((!ec) || (!ec->comp_data)) return EINA_FALSE;
+   if ((!ec) || (!e_comp_wl_data_check(ec))) return EINA_FALSE;
    if (e_object_is_del(E_OBJECT(ec))) return EINA_FALSE;
 
-   res_surf = ec->comp_data->surface;
+   res_surf = e_comp_wl_surface_get(ec);
    if (!res_surf) return EINA_FALSE;
 
    wc = wl_resource_get_client(res_surf);

diff --git a/src/e_mod_effect_rotation.c b/src/e_mod_effect_rotation.c
index 245e3ad74977a7c5de037aaa6713880328a039ca..a2011ea0cd63722465147fc7b5c1e130c8546bcd 100644 (file)
--- a/src/e_mod_effect_rotation.c
+++ b/src/e_mod_effect_rotation.c
@@ -232,14 +232,14 @@ _rotation_effect_targets_get(Rotation_Effect *effect, E_Desk *desk)
 static void
 _rotation_effect_object_transform_pos_map(E_Client *ec, int sx, int sy, int *dx, int *dy)
 {
-   E_Comp_Wl_Buffer_Viewport *vp = &ec->comp_data->scaler.buffer_viewport;
+   E_Comp_Wl_Buffer_Viewport *vp = e_comp_wl_scaler_buffer_viewport_get(ec);
    int transform = e_comp_wl_output_buffer_transform_get(ec);
    int bw, bh, tx, ty;
 
    e_pixmap_size_get(ec->pixmap, &bw, &bh);
 
    /* for subsurface, it should be swap 90 and 270 */
-   if (ec->comp_data->sub.data)
+   if (e_comp_wl_sub_data_get(ec))
      switch (transform)
        {
         case WL_OUTPUT_TRANSFORM_90:          transform = WL_OUTPUT_TRANSFORM_270;         break;
@@ -280,10 +280,10 @@ _rotation_effect_object_transform_apply(Rotation_Effect_Object *eobj)
    int l, remain = sizeof buffer;
 
    if (!(ec = eobj->ec)) return;
-   if (!ec->comp_data) return;
+   if (!e_comp_wl_data_check(ec)) return;
 
    if (! e_comp_wl_output_buffer_transform_get(ec) &&
-       ec->comp_data->scaler.buffer_viewport.buffer.scale == 1)
+       (e_comp_wl_scaler_buffer_viewport_buffer_scale_get(ec) == 1))
      return;
 
    map = e_map_new();