diff options
| author | Hermet Park <hermetpark@gmail.com> | 2019-11-29 10:48:59 +0900 |
|---|---|---|
| committer | Hermet Park <hermetpark@gmail.com> | 2019-11-29 10:51:19 +0900 |
| commit | 153b5cffd80748aa913a3fa7da0337167496ad10 (patch) | |
| tree | 89852f0c97ebf166ef1402fb5218f78a80c3fd50 | |
| parent | 7c79ca674d7583b19a0c03e3763c69c943056884 (diff) | |
| download | efl-153b5cffd80748aa913a3fa7da0337167496ad10.tar.gz | |
evas vector: operate cached vector file data per evas instances.
each vfd loaders construct vector tree data, these can be belongs to evas instance,
they are not likely shareable.
We should operate vfd separately.
| -rw-r--r-- | src/lib/evas/canvas/evas_vg_private.h | 2 | ||||
| -rw-r--r-- | src/lib/evas/vg/evas_vg_cache.c | 13 |
2 files changed, 8 insertions, 7 deletions
diff --git a/src/lib/evas/canvas/evas_vg_private.h b/src/lib/evas/canvas/evas_vg_private.h index c5ee9c40d2..2a1dbfa0d5 100644 --- a/src/lib/evas/canvas/evas_vg_private.h +++ b/src/lib/evas/canvas/evas_vg_private.h @@ -146,7 +146,7 @@ Vg_Cache_Entry* evas_cache_vg_entry_create(Evas *evas, const Eina_Fi Efl_VG* evas_cache_vg_tree_get(Vg_Cache_Entry *vg_entry, unsigned int frame_num); void evas_cache_vg_entry_value_provider_update(Vg_Cache_Entry *vg_entry, Eina_List *vp_list); void evas_cache_vg_entry_del(Vg_Cache_Entry *vg_entry); -Vg_File_Data * evas_cache_vg_file_open(const Eina_File *file, const char *key); +Vg_File_Data * evas_cache_vg_file_open(const Eina_File *file, const char *key, Evas *e); Eina_Bool evas_cache_vg_file_save(Efl_VG *root, int w, int h, const char *file, const char *key, const Efl_File_Save_Info *info); Eina_Bool evas_cache_vg_entry_file_save(Vg_Cache_Entry *vg_entry, const char *file, const char *key, const Efl_File_Save_Info *info); double evas_cache_vg_anim_duration_get(const Vg_Cache_Entry *vg_entry); diff --git a/src/lib/evas/vg/evas_vg_cache.c b/src/lib/evas/vg/evas_vg_cache.c index 54925bd82d..ed65f50099 100644 --- a/src/lib/evas/vg/evas_vg_cache.c +++ b/src/lib/evas/vg/evas_vg_cache.c @@ -154,9 +154,10 @@ _evas_cache_vg_entry_free_cb(void *data) if (vg_entry->vfd->ref <= 0) { Eina_Strbuf *hash_key = eina_strbuf_new(); - eina_strbuf_append_printf(hash_key, "%s/%s", + eina_strbuf_append_printf(hash_key, "%s/%s/%p", eina_file_filename_get(vg_entry->file), - vg_entry->key); + vg_entry->key, + vg_entry->evas); if (!eina_hash_del(vg_cache->vfd_hash, eina_strbuf_string_get(hash_key), vg_entry->vfd)) ERR("Failed to delete vfd = (%p) from hash", vg_entry->vfd); eina_strbuf_free(hash_key); @@ -281,13 +282,13 @@ evas_cache_vg_shutdown(void) } Vg_File_Data * -evas_cache_vg_file_open(const Eina_File *file, const char *key) +evas_cache_vg_file_open(const Eina_File *file, const char *key, Evas *e) { Vg_File_Data *vfd; Eina_Strbuf *hash_key; hash_key = eina_strbuf_new(); - eina_strbuf_append_printf(hash_key, "%s/%s", eina_file_filename_get(file), key); + eina_strbuf_append_printf(hash_key, "%s/%s/%p", eina_file_filename_get(file), key, e); vfd = eina_hash_find(vg_cache->vfd_hash, eina_strbuf_string_get(hash_key)); if (!vfd) { @@ -340,7 +341,7 @@ evas_cache_vg_entry_create(Evas *evas, eina_strbuf_free(hash_key); vg_entry->ref++; - vg_entry->vfd = evas_cache_vg_file_open(file, key); + vg_entry->vfd = evas_cache_vg_file_open(file, key, vg_entry->evas); //No File?? if (!vg_entry->vfd) { @@ -483,7 +484,7 @@ Eina_Bool evas_cache_vg_entry_file_save(Vg_Cache_Entry *vg_entry, const char *file, const char *key, const Efl_File_Save_Info *info) { Vg_File_Data *vfd = - evas_cache_vg_file_open(vg_entry->file, vg_entry->key); + evas_cache_vg_file_open(vg_entry->file, vg_entry->key, vg_entry->evas); if (!vfd) return EINA_FALSE; |