kimcinoo
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

no need to alloc path and part strings if its cached and thus shared 

anyway... so detect and re-cycle :)


SVN revision: 18677
This commit is contained in:
Carsten Haitzler 2005-11-28 09:54:06 +00:00
parent aa94c430d3
commit e5856869df
3 changed files with 42 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
legacy/edje/src/lib/edje_load.c
View File

@ -39,10 +39,18 @@ edje_object_file_set(Evas_Object *obj, const char *file, const char *part)
_edje_file_del(ed);
if (ed->path) free(ed->path);
ed->path = strdup(file);
if (ed->part) free(ed->part);
ed->part = strdup(part);
if (ed->path)
{
if (!ed->no_free_path) free(ed->path);
}
if (ed->part)
{
if (!ed->no_free_part) free(ed->part);
}
ed->path = file;
ed->part = part;
// ed->path = strdup(file);
// ed->part = strdup(part);
ed->load_error = EDJE_LOAD_ERROR_NONE;
_edje_file_add(ed);
@ -51,7 +59,7 @@ edje_object_file_set(Evas_Object *obj, const char *file, const char *part)
{
Evas_List *l;
int errors = 0;
/* check for invalid loops */
for (l = ed->collection->parts; (l && ! errors); l = l->next)
{
@ -137,6 +145,10 @@ edje_object_file_set(Evas_Object *obj, const char *file, const char *part)
if (!rp)
{
ed->load_error = EDJE_LOAD_ERROR_RESOURCE_ALLOCATION_FAILED;
ed->no_free_path = 0;
ed->no_free_part = 0;
ed->path = strdup(ed->path);
ed->part = strdup(ed->part);
return 0;
}
rp->part = ep;
@ -318,12 +330,25 @@ edje_object_file_set(Evas_Object *obj, const char *file, const char *part)
_edje_unref(ed);
ed->load_error = EDJE_LOAD_ERROR_NONE;
_edje_emit(ed, "load", NULL);
ed->path = ed->file->path;
ed->part = ed->collection->part;
ed->no_free_path = 1;
ed->no_free_part = 1;
return 1;
}
else
{
ed->no_free_path = 0;
ed->no_free_part = 0;
ed->path = strdup(ed->path);
ed->part = strdup(ed->part);
return 0;
}
/* we should never get here anyway */
ed->no_free_path = 0;
ed->no_free_part = 0;
ed->path = NULL;
ed->part = NULL;
ed->load_error = EDJE_LOAD_ERROR_NONE;
return 1;
}

14
legacy/edje/src/lib/edje_main.c
View File

@ -82,10 +82,16 @@ _edje_del(Edje *ed)
}
_edje_message_del(ed);
_edje_file_del(ed);
if (ed->path) free(ed->path);
ed->path = NULL;
if (ed->part) free(ed->part);
ed->part = NULL;
if (ed->path)
{
if (!ed->no_free_path) free(ed->path);
ed->path = NULL;
}
if (ed->part)
{
if (!ed->no_free_part) free(ed->part);
ed->part = NULL;
}
if ((ed->actions) || (ed->pending_actions))
{
_edje_animators = evas_list_remove(_edje_animators, ed);

2
legacy/edje/src/lib/edje_private.h
View File

@ -474,6 +474,8 @@ struct _Edje
unsigned short walking_actions : 1;
unsigned short block_break : 1;
unsigned short delete_me : 1;
unsigned short no_free_path : 1;
unsigned short no_free_part : 1;
double paused_at;
Evas *evas; /* the Evas this Edje belongs to */
Evas_Object *obj; /* the smart object */