e_comp_wl: remove unnecessary comp_data backup 70/211370/4
authorJuyeon Lee <juyeonne.lee@samsung.com>
Fri, 2 Aug 2019 04:58:00 +0000 (13:58 +0900)
committerGwanglim Lee <gl77.lee@samsung.com>
Tue, 6 Aug 2019 01:30:54 +0000 (01:30 +0000)
Change-Id: I71094d42b28ddd3a4e933d781bd2c84cd358ec22

src/bin/e_comp_wl.c
src/bin/e_pixmap.c

index be0a614..30cfd6b 100644 (file)
@@ -3301,24 +3301,12 @@ _e_comp_wl_client_cb_new(void *data EINA_UNUSED, E_Client *ec)
 
    ec->comp_data->need_reparent = !ec->internal;
 
-   ec->comp_data->scaler.buffer_viewport.buffer.transform = WL_OUTPUT_TRANSFORM_NORMAL;
-   ec->comp_data->scaler.buffer_viewport.buffer.scale = 1;
-   ec->comp_data->scaler.buffer_viewport.buffer.src_width = wl_fixed_from_int(-1);
-   ec->comp_data->scaler.buffer_viewport.surface.width = -1;
-
    E_Comp_Client_Data *p_cdata = e_pixmap_cdata_get(ec->pixmap);
-   EINA_SAFETY_ON_NULL_RETURN(p_cdata);
-   ec->comp_data->accepts_focus = p_cdata->accepts_focus;
-   ec->comp_data->conformant = p_cdata->conformant;
-   ec->comp_data->aux_hint = p_cdata->aux_hint;
-   ec->comp_data->win_type = p_cdata->win_type;
-   ec->comp_data->layer = p_cdata->layer;
-   ec->comp_data->fetch.win_type = p_cdata->fetch.win_type;
-   ec->comp_data->fetch.layer = p_cdata->fetch.layer;
-   ec->comp_data->video_client = p_cdata->video_client;
+   EINA_SAFETY_ON_NULL_GOTO(p_cdata, end);
 
    e_pixmap_cdata_set(ec->pixmap, ec->comp_data);
 
+end:
    TRACE_DS_END();
 }
 
index b1dc51f..316fc90 100644 (file)
@@ -172,7 +172,6 @@ _e_pixmap_new(E_Pixmap_Type type)
    cp->cdata->pending.buffer_viewport.buffer.src_width = wl_fixed_from_int(-1);
    cp->cdata->pending.buffer_viewport.surface.width = -1;
    cp->cdata->pending.buffer_viewport.changed = 0;
-   cp->cdata->accepts_focus = 1;
    cp->own_cdata = EINA_TRUE;
    return cp;
 }
@@ -961,7 +960,6 @@ e_pixmap_cdata_set(E_Pixmap *cp, E_Comp_Client_Data *cdata)
                   cd->wl_surface = cp->cdata->wl_surface;
                   cd->scaler.viewport = cp->cdata->scaler.viewport;
                   cd->pending.buffer_viewport = cp->cdata->pending.buffer_viewport;
-                  cd->opaque_state = cp->cdata->opaque_state;
                }
 
              E_FREE(cp->cdata);