raster pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=0779adcf0bab592b3d91a7f1434c2bc508ee18b1
commit 0779adcf0bab592b3d91a7f1434c2bc508ee18b1 Author: Carsten Haitzler (Rasterman) <[email protected]> Date: Sun Aug 14 13:50:03 2016 +0900 edje - remove unused fields from part desc and calc params fill spread and angle have never been used - resevred intitially for gradient objects, but never put into use, so remove to get rid of junk/memory footprint etc. @optimize --- src/bin/edje/edje_cc_handlers.c | 52 -------------------------------------- src/lib/edje/edje_calc.c | 3 --- src/lib/edje/edje_data.c | 4 --- src/lib/edje/edje_edit.c | 4 --- src/lib/edje/edje_private.h | 55 +++++++++++++++++++---------------------- 5 files changed, 25 insertions(+), 93 deletions(-) diff --git a/src/bin/edje/edje_cc_handlers.c b/src/bin/edje/edje_cc_handlers.c index e8cc12e..0dc7911 100644 --- a/src/bin/edje/edje_cc_handlers.c +++ b/src/bin/edje/edje_cc_handlers.c @@ -378,7 +378,6 @@ static void st_collections_group_parts_part_description_fill_origin_relative(voi static void st_collections_group_parts_part_description_fill_origin_offset(void); static void st_collections_group_parts_part_description_fill_size_relative(void); static void st_collections_group_parts_part_description_fill_size_offset(void); -static void st_collections_group_parts_part_description_fill_spread(void); static void st_collections_group_parts_part_description_fill_type(void); static void st_collections_group_parts_part_description_color_class(void); static void st_collections_group_parts_part_description_color(void); @@ -868,7 +867,6 @@ New_Statement_Handler statement_handlers[] = {"collections.group.parts.part.description.fill.origin.offset", st_collections_group_parts_part_description_fill_origin_offset}, {"collections.group.parts.part.description.fill.size.relative", st_collections_group_parts_part_description_fill_size_relative}, {"collections.group.parts.part.description.fill.size.offset", st_collections_group_parts_part_description_fill_size_offset}, - {"collections.group.parts.part.description.fill.spread", st_collections_group_parts_part_description_fill_spread}, {"collections.group.parts.part.description.fill.type", st_collections_group_parts_part_description_fill_type}, {"collections.group.parts.part.description.color_class", st_collections_group_parts_part_description_color_class}, {"collections.group.parts.part.description.color", st_collections_group_parts_part_description_color}, @@ -1640,8 +1638,6 @@ _edje_part_description_fill(Edje_Part_Description_Spec_Fill *fill) fill->pos_abs_y = 0; fill->rel_y = FROM_DOUBLE(1.0); fill->abs_y = 0; - fill->angle = 0; - fill->spread = 0; fill->type = EDJE_FILL_TYPE_SCALE; } @@ -9649,54 +9645,6 @@ st_collections_group_parts_part_description_fill_smooth(void) /** @page edcref - - @property - spread - @parameters - TODO - @effect - TODO - @endproperty -*/ -static void -st_collections_group_parts_part_description_fill_spread(void) -{ -#if 0 - Edje_Part_Collection *pc; - Edje_Part *ep; - Edje_Part_Description_Image *ed; -#endif - - check_arg_count(1); - - /* XXX this will need to include IMAGES when spread support is added to evas images */ - { - ERR("parse error %s:%i. fill.spread not supported yet.", - file_in, line - 1); - exit(-1); - } - -#if 0 - pc = eina_list_data_get(eina_list_last(edje_collections)); - - ep = pc->parts[pc->parts_count - 1]; - - if (ep->type != EDJE_PART_TYPE_IMAGE) - { - ERR("parse error %s:%i. image attributes in non-IMAGE part.", - file_in, line - 1); - exit(-1); - } - - ed = (Edje_Part_Description_Image*) ep->default_desc; - if (ep->other.desc_count) ed = (Edje_Part_Description_Image*) ep->other.desc[ep->other.desc_count - 1]; - - ed->image.fill.spread = parse_int_range(0, 0, 1); -#endif -} - -/** - @page edcref @property type @parameters diff --git a/src/lib/edje/edje_calc.c b/src/lib/edje/edje_calc.c index d1e015d..a7bb865 100644 --- a/src/lib/edje/edje_calc.c +++ b/src/lib/edje/edje_calc.c @@ -2209,9 +2209,6 @@ _edje_part_recalc_single_fill(Edje_Real_Part *ep, + TO_INT(SCALE(fill->pos_rel_y, fh)); params->type.common.fill.h = fill->abs_y + TO_INT(SCALE(fill->rel_y, fh)); - - params->type.common.fill.angle = fill->angle; - params->type.common.fill.spread = fill->spread; } static void diff --git a/src/lib/edje/edje_data.c b/src/lib/edje/edje_data.c index b5e7b7f..8470076 100644 --- a/src/lib/edje/edje_data.c +++ b/src/lib/edje/edje_data.c @@ -1474,8 +1474,6 @@ _edje_edd_init(void) EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_part_description_image, Edje_Part_Description_Image, "image.fill.pos_abs_y", image.fill.pos_abs_y, EET_T_INT); EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_part_description_image, Edje_Part_Description_Image, "image.fill.rel_y", image.fill.rel_y, EDJE_T_FLOAT); EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_part_description_image, Edje_Part_Description_Image, "image.fill.abs_y", image.fill.abs_y, EET_T_INT); - EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_part_description_image, Edje_Part_Description_Image, "image.fill.angle", image.fill.angle, EET_T_INT); - EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_part_description_image, Edje_Part_Description_Image, "image.fill.spread", image.fill.spread, EET_T_INT); EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_part_description_image, Edje_Part_Description_Image, "image.fill.type", image.fill.type, EET_T_CHAR); EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_part_description_image, Edje_Part_Description_Image, "image.filter.code", filter.code, EET_T_STRING); EET_DATA_DESCRIPTOR_ADD_LIST_STRING(_edje_edd_edje_part_description_image, Edje_Part_Description_Image, "image.filter.sources", filter.sources); // @since 1.15 @@ -1498,8 +1496,6 @@ _edje_edd_init(void) EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_part_description_proxy, Edje_Part_Description_Proxy, "proxy.fill.pos_abs_y", proxy.fill.pos_abs_y, EET_T_INT); EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_part_description_proxy, Edje_Part_Description_Proxy, "proxy.fill.rel_y", proxy.fill.rel_y, EDJE_T_FLOAT); EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_part_description_proxy, Edje_Part_Description_Proxy, "proxy.fill.abs_y", proxy.fill.abs_y, EET_T_INT); - EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_part_description_proxy, Edje_Part_Description_Proxy, "proxy.fill.angle", proxy.fill.angle, EET_T_INT); - EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_part_description_proxy, Edje_Part_Description_Proxy, "proxy.fill.spread", proxy.fill.spread, EET_T_INT); EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_part_description_proxy, Edje_Part_Description_Proxy, "proxy.fill.type", proxy.fill.type, EET_T_CHAR); EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_part_description_proxy, Edje_Part_Description_Proxy, "proxy.source_visible", proxy.source_visible, EET_T_CHAR); EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_part_description_proxy, Edje_Part_Description_Proxy, "proxy.source_clip", proxy.source_clip, EET_T_CHAR); diff --git a/src/lib/edje/edje_edit.c b/src/lib/edje/edje_edit.c index 460a2e9..0296df8 100644 --- a/src/lib/edje/edje_edit.c +++ b/src/lib/edje/edje_edit.c @@ -6366,8 +6366,6 @@ edje_edit_state_add(Evas_Object *obj, const char *part, const char *name, double img->image.fill.pos_abs_y = 0; img->image.fill.rel_y = 1.0; img->image.fill.abs_y = 0; - img->image.fill.angle = 0; - img->image.fill.spread = 0; img->image.fill.type = EDJE_FILL_TYPE_SCALE; } else if (rp->part->type == EDJE_PART_TYPE_PROXY) @@ -6390,8 +6388,6 @@ edje_edit_state_add(Evas_Object *obj, const char *part, const char *name, double pro->proxy.fill.pos_abs_y = 0; pro->proxy.fill.rel_y = 1.0; pro->proxy.fill.abs_y = 0; - pro->proxy.fill.angle = 0; - pro->proxy.fill.spread = 0; pro->proxy.fill.type = EDJE_FILL_TYPE_SCALE; } else if (rp->part->type == EDJE_PART_TYPE_EXTERNAL) diff --git a/src/lib/edje/edje_private.h b/src/lib/edje/edje_private.h index 6557de6..31db5f0 100644 --- a/src/lib/edje/edje_private.h +++ b/src/lib/edje/edje_private.h @@ -1321,8 +1321,6 @@ struct _Edje_Part_Description_Spec_Fill int abs_x; /* size of fill added to relative fill */ int pos_abs_y; /* fill offset y added to fill offset */ int abs_y; /* size of fill added to relative fill */ - int angle; /* angle of fill -- currently only used by grads */ - int spread; /* spread of fill -- currently only used by grads */ char smooth; /* fill with smooth scaling or not */ unsigned char type; /* fill coordinate from container (SCALE) or from source image (TILE) */ }; @@ -1798,7 +1796,6 @@ struct _Edje_Calc_Params_Physics struct _Edje_Calc_Params { - // int x, y, w, h; // 16 struct { FLOAT_T x, y, w, h; // 32 } eval; @@ -1808,43 +1805,41 @@ struct _Edje_Calc_Params Edje_Color color; // 4 union { struct { - struct { - int x, y, w, h; // 16 - int angle; // 4 - int spread; // 4 - } fill; // 24 - - union { - struct { - int l, r, t, b; // 16 - FLOAT_T border_scale_by; - } image; // 16 - } spec; // 16 - } common; // 40 + struct { + int x, y, w, h; // 16 + } fill; // 16 + + union { + struct { + unsigned short l, r, t, b; // 8 + FLOAT_T border_scale_by; // 8 + } image; // 16 + } spec; // 16 + } common; // 32 struct { - Edje_Alignment align; /* text alignment within bounds */ // 16 - double ellipsis; // 8 - int size; // 4 - Edje_Color color2, color3; // 8 + Edje_Alignment align; /* text alignment within bounds */ // 16 + double ellipsis; // 8 + int size; // 4 + Edje_Color color2, color3; // 8 } text; // 36 struct { - int frame; //4 - FLOAT_T data[6]; - Edje_3D_Vec point; - Edje_3D_Vec scale_3d; - } node; // 4 - } type; // 40 - const Edje_Calc_Params_Map *map; // 88 + FLOAT_T data[6]; // 48 + Edje_3D_Vec point; // 24 + Edje_3D_Vec scale_3d; // 24 + int frame; // 4 + } node; // 100 + } type; // 100 + const Edje_Calc_Params_Map *map; // 4/8 #ifdef HAVE_EPHYSICS - const Edje_Calc_Params_Physics *physics; // 90 + const Edje_Calc_Params_Physics *physics; // 4/8 #endif - Edje_Real_Part *clip_to; /* state clip override @since 1.15 */ + Edje_Real_Part *clip_to; /* state clip override @since 1.15 */ // 4/8 unsigned char persp_on : 1; unsigned char lighted : 1; unsigned char mapped : 1; unsigned char visible : 1; unsigned char smooth : 1; // 1 -}; // 271 +}; // 197/209(rounded up for alignment: 200/212) struct _Edje_Real_Part_Set { --
