From: Hermet Park Date: Fri, 20 Mar 2020 09:00:24 +0000 (+0000) Subject: canvas3d: remove all feature implementation in edje/edje_cc X-Git-Tag: submit/tizen/20200405.220557~95 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5b34b2dcd9409cb8cdd2282f340d8d9581fc42a3;p=platform%2Fupstream%2Fefl.git canvas3d: remove all feature implementation in edje/edje_cc Reviewed-by: Marcel Hollerbach Reviewed-by: Shinwoo Kim Differential Revision: https://phab.enlightenment.org/D11547 Change-Id: Ib9dc06e5c3197a6bdfc45edac2d7a5db1cb64219 --- diff --git a/src/bin/edje/edje_cc_handlers.c b/src/bin/edje/edje_cc_handlers.c index 27c53a2..fcc889e 100644 --- a/src/bin/edje/edje_cc_handlers.c +++ b/src/bin/edje/edje_cc_handlers.c @@ -1410,18 +1410,18 @@ New_Object_Handler object_handlers[] = {"collections.group.limits", NULL}, {"collections.group.script", ob_collections_group_script}, {"collections.group.lua_script", ob_collections_group_lua_script}, - {"collections.group.externals", NULL}, /* dup */ - {"collections.group.set", ob_images_set}, /* dup */ - {"collections.group.set.image", ob_images_set_image}, /* dup */ - {"collections.group.images", NULL}, /* dup */ - {"collections.group.images.set", ob_images_set}, /* dup */ - {"collections.group.images.set.image", ob_images_set_image}, /* dup */ - {"collections.group.fonts", NULL}, /* dup */ - {"collections.group.styles", NULL}, /* dup */ - {"collections.group.styles.style", ob_styles_style}, /* dup */ - {"collections.group.color_tree", ob_color_tree}, /* dup */ - {"collections.group.color_classes", NULL}, /* dup */ - {"collections.group.color_classes.color_class", ob_color_class}, /* dup */ + {"collections.group.externals", NULL}, /* dup */ + {"collections.group.set", ob_images_set}, /* dup */ + {"collections.group.set.image", ob_images_set_image}, /* dup */ + {"collections.group.images", NULL}, /* dup */ + {"collections.group.images.set", ob_images_set}, /* dup */ + {"collections.group.images.set.image", ob_images_set_image}, /* dup */ + {"collections.group.fonts", NULL}, /* dup */ + {"collections.group.styles", NULL}, /* dup */ + {"collections.group.styles.style", ob_styles_style}, /* dup */ + {"collections.group.color_tree", ob_color_tree}, /* dup */ + {"collections.group.color_classes", NULL}, /* dup */ + {"collections.group.color_classes.color_class", ob_color_class}, /* dup */ {"collections.group.text_classes", NULL}, {"collections.group.text_classes.text_class", ob_text_class}, /* dup */ {"collections.group.size_classes", NULL}, /* dup */ diff --git a/src/bin/edje/edje_cc_out.c b/src/bin/edje/edje_cc_out.c index b15234f..634f10d 100644 --- a/src/bin/edje/edje_cc_out.c +++ b/src/bin/edje/edje_cc_out.c @@ -758,33 +758,6 @@ check_program(Edje_Part_Collection *pc, Edje_Program *ep, Eet_File *ef) pc->part ? pc->part : "", ep->name ? ep->name : "", et->id, (int) pc->parts_count - 1); exit(-1); } - - part = pc->parts[et->id]; - /* verify existence of description in part */ - if (ep->action == EDJE_ACTION_TYPE_STATE_SET) - { - if ((!eina_streq(ep->state, "custom")) && - ((!eina_streq(ep->state, "default")) || (!EINA_DBL_EQ(ep->value, 0.0)))) - { - Edje_Part_Collection_Directory_Entry *de; - Eina_Bool found = EINA_FALSE; - for (i = 0; i < part->other.desc_count; i++) - { - Edje_Part_Description_Common *ed = part->other.desc[i]; - if (eina_streq(ed->state.name, ep->state) && EINA_DBL_EQ(ep->value, ed->state.value)) - { - found = EINA_TRUE; - break; - } - } - if (!found) - { - de = eina_hash_find(edje_collections_lookup, &pc->id); - error_and_abort(NULL, "GROUP %s - state '%s:%g' does not exist for part '%s'; set in program '%s'", - de->entry, ep->state, ep->value, part->name, ep->name); - } - } - } } #endif // diff --git a/src/lib/edje/edje_private.h b/src/lib/edje/edje_private.h index 15cfb61..dd4c541 100644 --- a/src/lib/edje/edje_private.h +++ b/src/lib/edje/edje_private.h @@ -525,11 +525,6 @@ typedef struct _Edje_Signal_Callback_Custom Edje_Signal_Callback_Custom; /*----------*/ -typedef struct Edje_Image_Hash -{ - int id; -} Edje_Image_Hash; - struct _Edje_File { const char *path;